Diffstat (limited to 'noncore/unsupported/oipkg/mainwindow.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.cpp | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp index d1be8d0..11fc91b 100644 --- a/noncore/unsupported/oipkg/mainwindow.cpp +++ b/noncore/unsupported/oipkg/mainwindow.cpp | |||
@@ -127,3 +127,3 @@ void MainWindow::makeMenu() | |||
127 | connect( cfgact, SIGNAL( activated() ), | 127 | connect( cfgact, SIGNAL( activated() ), |
128 | SLOT( showSettings() ) ); | 128 | SLOT( showSettingsSetup() ) ); |
129 | cfgact->addTo( cfgMenu ); | 129 | cfgact->addTo( cfgMenu ); |
@@ -226,3 +226,3 @@ void MainWindow::makeMenu() | |||
226 | settings, SLOT(activeDestinationChange(int)) ); | 226 | settings, SLOT(activeDestinationChange(int)) ); |
227 | spacer = new QLabel( " ", destBar ); | 227 | // spacer = new QLabel( " ", destBar ); |
228 | // spacer->setBackgroundMode( PaletteForeground ); | 228 | // spacer->setBackgroundMode( PaletteForeground ); |
@@ -240,3 +240,3 @@ void MainWindow::makeMenu() | |||
240 | destAction->setToggleAction( true ); | 240 | destAction->setToggleAction( true ); |
241 | // destAction->addTo( viewMenu ); | 241 | destAction->addTo( viewMenu ); |
242 | 242 | ||
@@ -387,11 +387,18 @@ void MainWindow::setSubSections() | |||
387 | 387 | ||
388 | void MainWindow::showSettings() | 388 | void MainWindow::showSettings(int i) |
389 | { | ||
390 | if ( settings->showDialog( i ) ) | ||
389 | { | 391 | { |
390 | if ( settings->showDialog( 0 ) ) | ||
391 | updateList(); | 392 | updateList(); |
392 | } | 393 | } |
394 | setComboName(destination,settings->getDestinationName()); | ||
395 | CheckBoxLink->setChecked( settings->createLinks() ); | ||
396 | } | ||
397 | void MainWindow::showSettingsSetup() | ||
398 | { | ||
399 | showSettings(0); | ||
400 | } | ||
393 | void MainWindow::showSettingsSrv() | 401 | void MainWindow::showSettingsSrv() |
394 | { | 402 | { |
395 | if ( settings->showDialog( 1 ) ) | 403 | showSettings(1); |
396 | updateList(); | ||
397 | } | 404 | } |
@@ -399,4 +406,3 @@ void MainWindow::showSettingsDst() | |||
399 | { | 406 | { |
400 | if ( settings->showDialog( 2 ) ) | 407 | showSettings(2); |
401 | updateList(); | ||
402 | } | 408 | } |