Skip to content

Commit

Permalink
Fix bad button position in setup dialog
Browse files Browse the repository at this point in the history
  • Loading branch information
Umcaruje committed Jan 29, 2016
1 parent f528e3d commit 3b5f837
Showing 1 changed file with 17 additions and 21 deletions.
38 changes: 17 additions & 21 deletions src/gui/SetupDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
"disabled" ).toInt() ),
m_warnAfterSetup( !ConfigManager::inst()->value( "app",
"nomsgaftersetup" ).toInt() ),
m_displaydBV( ConfigManager::inst()->value( "app",
m_displaydBV( ConfigManager::inst()->value( "app",
"displaydbv" ).toInt() ),
m_MMPZ( !ConfigManager::inst()->value( "app", "nommpz" ).toInt() ),
m_disableBackup( !ConfigManager::inst()->value( "app",
Expand Down Expand Up @@ -411,8 +411,8 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
pathScroll->move( 0, 30 );
pathSelectors->resize( 360, pathsHeight - 50 );

const int txtLength = 285;
const int btnStart = 305;
const int txtLength = 284;
const int btnStart = 297;


// working-dir
Expand Down Expand Up @@ -461,7 +461,7 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
"Background artwork" ).toUpper(), paths );
backgroundArtwork_tw->setFixedHeight( 48 );

m_baLineEdit = new QLineEdit( m_backgroundArtwork,
m_baLineEdit = new QLineEdit( m_backgroundArtwork,
backgroundArtwork_tw );
m_baLineEdit->setGeometry( 10, 20, txtLength, 16 );
connect( m_baLineEdit, SIGNAL( textChanged( const QString & ) ), this,
Expand Down Expand Up @@ -616,7 +616,7 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
sf_select_btn->move( btnStart, 16 );
connect( sf_select_btn, SIGNAL( clicked() ), this,
SLOT( openDefaultSoundfont() ) );
#endif
#endif

pathSelectors->setLayout( pathSelectorLayout );

Expand All @@ -632,11 +632,11 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
#ifdef LMMS_HAVE_STK
pathSelectorLayout->addSpacing( 10 );
pathSelectorLayout->addWidget( stk_tw );
#endif
#endif
#ifdef LMMS_HAVE_FLUIDSYNTH
pathSelectorLayout->addSpacing( 10 );
pathSelectorLayout->addWidget( sf_tw );
#endif
#endif
pathSelectorLayout->addWidget( fl_tw );
pathSelectorLayout->addSpacing( 10 );
pathSelectorLayout->addWidget( artwork_tw );
Expand Down Expand Up @@ -778,7 +778,7 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
m_audioInterfaces->addItem( it.key() );
}

QString audioDevName =
QString audioDevName =
ConfigManager::inst()->value( "mixer", "audiodev" );
if( audioDevName.length() == 0 )
{
Expand Down Expand Up @@ -872,15 +872,15 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
m_midiInterfaces->addItem( it.key() );
}

QString midiDevName =
QString midiDevName =
ConfigManager::inst()->value( "mixer", "mididev" );
if( midiDevName.length() == 0 )
{
midiDevName = Engine::mixer()->midiClientName();
ConfigManager::inst()->setValue(
"mixer", "mididev", midiDevName );
}
m_midiInterfaces->setCurrentIndex(
m_midiInterfaces->setCurrentIndex(
m_midiInterfaces->findText( midiDevName ) );
m_midiIfaceSetupWidgets[midiDevName]->show();

Expand All @@ -894,9 +894,9 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
midi_layout->addStretch();


m_tabBar->addTab( general, tr( "General settings" ), 0, false, true
m_tabBar->addTab( general, tr( "General settings" ), 0, false, true
)->setIcon( embed::getIconPixmap( "setup_general" ) );
m_tabBar->addTab( paths, tr( "Paths" ), 1, false, true
m_tabBar->addTab( paths, tr( "Paths" ), 1, false, true
)->setIcon( embed::getIconPixmap(
"setup_directories" ) );
m_tabBar->addTab( performance, tr( "Performance settings" ), 2, false,
Expand Down Expand Up @@ -1014,7 +1014,7 @@ void SetupDialog::accept()
#endif
#ifdef LMMS_HAVE_STK
ConfigManager::inst()->setSTKDir( m_stkDir );
#endif
#endif
ConfigManager::inst()->setBackgroundArtwork( m_backgroundArtwork );

// tell all audio-settings-widget to save their settings
Expand Down Expand Up @@ -1379,9 +1379,9 @@ void SetupDialog::openDefaultSoundfont()
{
#ifdef LMMS_HAVE_FLUIDSYNTH
QString new_file = FileDialog::getOpenFileName( this,
tr( "Choose default SoundFont" ), m_defaultSoundfont,
tr( "Choose default SoundFont" ), m_defaultSoundfont,
"SoundFont2 Files (*.sf2)" );

if( new_file != QString::null )
{
m_sfLineEdit->setText( new_file );
Expand Down Expand Up @@ -1412,9 +1412,9 @@ void SetupDialog::openBackgroundArtwork()
m_artworkDir :
m_backgroundArtwork;
QString new_file = FileDialog::getOpenFileName( this,
tr( "Choose background artwork" ), dir,
tr( "Choose background artwork" ), dir,
"Image Files (" + fileTypes + ")" );

if( new_file != QString::null )
{
m_baLineEdit->setText( new_file );
Expand Down Expand Up @@ -1526,7 +1526,3 @@ void SetupDialog::displayMIDIHelp()
"controls to setup the selected "
"MIDI-interface." ) );
}




0 comments on commit 3b5f837

Please sign in to comment.