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
@@ -122,13 +122,13 @@ void MainWindow::makeMenu()
 
   QAction *cfgact;
 
   cfgact = new QAction( tr( "Setups" ),
 			QString::null, 0, this, 0 );
   connect( cfgact, SIGNAL( activated() ),
-	   SLOT( showSettings() ) );
+	   SLOT( showSettingsSetup() ) );
   cfgact->addTo( cfgMenu );
 		
   cfgact = new QAction( tr( "Servers" ),
 			QString::null, 0, this, 0 );
   connect( cfgact, SIGNAL( activated() ),
 	   SLOT( showSettingsSrv() ) );
@@ -221,13 +221,13 @@ void MainWindow::makeMenu()
   destBar->setHorizontalStretchable( TRUE );
   destination = new QComboBox( false, destBar );
   destination->insertStringList( settings->getDestinationNames() );
   setComboName(destination,settings->getDestinationName());
   connect( destination, SIGNAL(activated(int)),
   			 settings, SLOT(activeDestinationChange(int)) );
-  spacer = new QLabel( " ", destBar );
+//  spacer = new QLabel( " ", destBar );
 //  spacer->setBackgroundMode( PaletteForeground );
   CheckBoxLink = new QCheckBox( tr("Link"), destBar);
 //  CheckBoxLink->setBackgroundMode( PaletteForeground );
   CheckBoxLink->setChecked( settings->createLinks() );
   connect( CheckBoxLink, SIGNAL(toggled(bool)),
      				 settings, SLOT(linkEnabled(bool)) );
@@ -235,13 +235,13 @@ void MainWindow::makeMenu()
   connect( destAction, SIGNAL( toggled(bool) ), SLOT( destShow(bool) ) );
   a = new QAction( tr( "Close Destinations" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), SLOT( destClose() ) );
   a->addTo( destBar );
   destBar->setStretchableWidget( CheckBoxLink );
   destAction->setToggleAction( true );
- // destAction->addTo( viewMenu );
+  destAction->addTo( viewMenu );
 
 //   helpMenu
   helpMenu->insertSeparator();
 	a = new QAction( tr( "Package Actions" ), QString::null, 0, this, 0 );
  	a->addTo( helpMenu );
   helpMenu->insertSeparator();
@@ -382,26 +382,32 @@ void MainWindow::setSubSections()
 {
   subsection->clear();
   subsection->insertStringList( packageListServers.getSubSections() );
 }
 
 
-void MainWindow::showSettings()
+void MainWindow::showSettings(int i)
 {
-  if ( settings->showDialog( 0 ) )
+  if ( settings->showDialog( i ) )
+  {
     updateList();
+  }
+ 	setComboName(destination,settings->getDestinationName());
+  CheckBoxLink->setChecked( settings->createLinks() );
+}
+void MainWindow::showSettingsSetup()
+{
+	showSettings(0);
 }
 void MainWindow::showSettingsSrv()
 {
-  if ( settings->showDialog( 1 ) )
-    updateList();
+	showSettings(1);
 }
 void MainWindow::showSettingsDst()
 {
-  if ( settings->showDialog( 2 ) )
-    updateList();
+	showSettings(2);
 }
 
 void MainWindow::sectionShow(bool b)
 {
 	if (b) sectionBar->show();
   else sectionBar->hide();