5 files changed, 36 insertions, 24 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
@@ -126,5 +126,5 @@ void MainWindow::makeMenu()
 			QString::null, 0, this, 0 );
   connect( cfgact, SIGNAL( activated() ),
-	   SLOT( showSettings() ) );
+	   SLOT( showSettingsSetup() ) );
   cfgact->addTo( cfgMenu );
 		
@@ -225,5 +225,5 @@ void MainWindow::makeMenu()
   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);
@@ -239,5 +239,5 @@ void MainWindow::makeMenu()
   destBar->setStretchableWidget( CheckBoxLink );
   destAction->setToggleAction( true );
- // destAction->addTo( viewMenu );
+  destAction->addTo( viewMenu );
 
 //   helpMenu
@@ -386,18 +386,24 @@ void MainWindow::setSubSections()
 
 
-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);
 }
 
diff --git a/noncore/unsupported/oipkg/mainwindow.h b/noncore/unsupported/oipkg/mainwindow.h
index 090ddd3..354c585 100644
--- a/noncore/unsupported/oipkg/mainwindow.h
+++ b/noncore/unsupported/oipkg/mainwindow.h
@@ -53,5 +53,6 @@ protected slots:
   void subSectionChanged();
   void sectionChanged();
-  void showSettings();
+  void showSettings(int);
+  void showSettingsSetup();
   void showSettingsSrv();
   void showSettingsDst();
diff --git a/noncore/unsupported/oipkg/pksettings.cpp b/noncore/unsupported/oipkg/pksettings.cpp
index 59d5a3e..14c1944 100644
--- a/noncore/unsupported/oipkg/pksettings.cpp
+++ b/noncore/unsupported/oipkg/pksettings.cpp
@@ -60,4 +60,11 @@ PackageManagerSettings::PackageManagerSettings( QWidget* parent,  const char* na
 	activeLinkDestination->hide();
   serverChanged = false;
+
+  // get rid of setups
+//  Settings->hide();
+  settingName->hide();
+  newsetting->hide();
+  renamesetting->hide();
+  removesetting->hide();
 }
 
@@ -533,5 +540,5 @@ QStringList PackageManagerSettings::getDestinationNames()
   return sl;
 }
-
+                               
 
 void PackageManagerSettings::linkEnabled( bool b )
@@ -539,4 +546,5 @@ void PackageManagerSettings::linkEnabled( bool b )
 	pvDebug(2,"PackageManagerSettings::linkEnabled "+QString(b?"yes":"no"));
   activeLinkDestination->setEnabled( b );
+  CheckBoxLink->setChecked( b );
 }
 
@@ -546,9 +554,4 @@ void PackageManagerSettings::activeServerChanged()
 }
 
-QComboBox* PackageManagerSettings::getDestCombo()
-{
-	return new QComboBox(activeDestination);
-}
-
 void PackageManagerSettings::createLinksToDest()
 {
@@ -565,6 +568,9 @@ void PackageManagerSettings::removeLinksToDest()
 }
 
-//void PackageManagerSettings::setIpkg( PmIpkg* i )
-//{
-//	ipkg = i;
-//}
+void PackageManagerSettings::activeDestinationChange(int i)
+{
+	pvDebug(5,"activeDestinationChange "+QString::number(i));
+	if (i > activeDestination->count()) return;
+	activeDestination->setCurrentItem(i);
+	pvDebug(5,"dest name "+ activeDestination->currentText());
+}
diff --git a/noncore/unsupported/oipkg/pksettings.h b/noncore/unsupported/oipkg/pksettings.h
index 8f9fe62..d66c4e8 100644
--- a/noncore/unsupported/oipkg/pksettings.h
+++ b/noncore/unsupported/oipkg/pksettings.h
@@ -25,6 +25,4 @@ public:
   QStringList getDestinationNames();
   QString getDestinationUrlByName(QString);
-  QComboBox* getDestCombo();
-//  void setIpkg( PmIpkg* );
 
 public slots:
@@ -52,4 +50,5 @@ public slots:
   void renameInstallationSetting();
   void activeServerChanged();
+  void activeDestinationChange(int);
 signals:
 //  void doCreateLinks( QString dest );
diff --git a/noncore/unsupported/oipkg/pksettingsbase.ui b/noncore/unsupported/oipkg/pksettingsbase.ui
index 5b83248..e95ed83 100644
--- a/noncore/unsupported/oipkg/pksettingsbase.ui
+++ b/noncore/unsupported/oipkg/pksettingsbase.ui
@@ -12,5 +12,5 @@
             <x>0</x>
             <y>0</y>
-            <width>337</width>
+            <width>333</width>
             <height>454</height>
         </rect>
@@ -216,5 +216,5 @@
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Used servers:</string>
+                                    <string>Used servers: (Highlighted feeds are active)</string>
                                 </property>
                             </widget>