1 files changed, 44 insertions, 13 deletions

diff --git a/noncore/unsupported/oipkg/pksettings.cpp b/noncore/unsupported/oipkg/pksettings.cpp
index be01837..6c8dc2a 100644
--- a/noncore/unsupported/oipkg/pksettings.cpp
+++ b/noncore/unsupported/oipkg/pksettings.cpp
@@ -32,4 +32,5 @@
 #include <unistd.h>
 #include "debug.h"
+//#include "utils.h"
 
 PackageManagerSettings::PackageManagerSettings( QWidget* parent,  const char* name, WFlags fl )
@@ -57,4 +58,5 @@ PackageManagerSettings::PackageManagerSettings( QWidget* parent,  const char* na
   destinationurlDic.setAutoDelete(TRUE);
   readSettings();
+        activeLinkDestination->hide();
 }
 
@@ -77,6 +79,8 @@ void PackageManagerSettings::newServer()
     activeServers->insertItem(servername->text());
   }
+  changed = true;
   servers->setSelected(i,TRUE);
   editServer(i);
+  changed = true;
 }
 
@@ -98,4 +102,5 @@ void PackageManagerSettings::newDestination()
   destinations->setSelected(i,TRUE);
   editDestination(i);
+  changed = true;
 }
 
@@ -118,4 +123,5 @@ void PackageManagerSettings::editServer(int i)
   connect( servername, SIGNAL(textChanged(const QString&)), this, SLOT(serverNameChanged(const QString&)) );
   connect( serverurl, SIGNAL(textChanged(const QString&)), this, SLOT(serverUrlChanged(const QString&)) );
+  changed = true;
 }
 
@@ -138,4 +144,5 @@ void PackageManagerSettings::editDestination(int i)
   connect( destinationname, SIGNAL(textChanged(const QString&)), this, SLOT(destNameChanged(const QString&)) );
   connect( destinationurl, SIGNAL(textChanged(const QString&)), this, SLOT(destUrlChanged(const QString&)) );
+  changed = true;
 }
 
@@ -152,4 +159,5 @@ void PackageManagerSettings::removeServer()
   servername->setEnabled(FALSE);
   serverurl->setEnabled(FALSE);
+  changed = true;
 }
 
@@ -167,4 +175,5 @@ void PackageManagerSettings::removeDestination()
   destinationname->setEnabled(FALSE);
   destinationurl->setEnabled(FALSE);
+  changed = true;
 }
 
@@ -174,5 +183,7 @@ void PackageManagerSettings::serverNameChanged(const QString& t)
   servers->changeItem( t, editedserver );
   activeServers->changeItem( t, editedserver );
+  changed = true;
   connect( servers, SIGNAL(highlighted(int)), this, SLOT(editServer(int)) );
+  changed = true;
 }
 
@@ -184,4 +195,5 @@ void PackageManagerSettings::destNameChanged(const QString& t)
   activeLinkDestination->changeItem( t, editeddestination );
   connect( destinations, SIGNAL(highlighted(int)), this, SLOT(editDestination(int)) );
+  changed = true;
 }
 
@@ -189,4 +201,5 @@ void PackageManagerSettings::serverUrlChanged(const QString& t)
 {
   serverurlDic.replace(editedserver, new QString(t));
+  changed = true;
 }
 
@@ -194,4 +207,5 @@ void PackageManagerSettings::destUrlChanged(const QString& t)
 {
   destinationurlDic.replace(editeddestination, new QString(t));
+  changed = true;
 }
 
@@ -266,9 +280,9 @@ void PackageManagerSettings::installationSettingChange(int cs)
   currentSetting = cs;
   readInstallationSetting( cs );
+  changed = true;
 }
 
 void PackageManagerSettings::writeInstallationSettings()
 {
-  if ( ! changed ) return ;
   {
     Config cfg( "oipkg", Config::User );
@@ -286,17 +300,16 @@ void PackageManagerSettings::readInstallationSetting(int setting)
   Config cfg( "oipkg", Config::User );
   cfg.setGroup( "Setting_" + QString::number( setting ) );
-  CheckBoxLink->setChecked( cfg.readBoolEntry( "link", false ) );
+  CheckBoxLink->setChecked( cfg.readBoolEntry( "link", true ) );
   QString dest = cfg.readEntry( "dest" );
   QString linkdest = cfg.readEntry( "linkdest" );
   pvDebug(3, "dest="+dest);
   pvDebug(3, "linkdest="+linkdest);
-
   for ( int i = 0; i < activeDestination->count(); i++)
-    {
-      if ( activeDestination->text( i ) == dest )
-                                activeDestination->setCurrentItem( i );
-      if ( activeLinkDestination->text( i ) == linkdest )
-                                activeLinkDestination->setCurrentItem( i );
-    }
+  {
+          if ( activeDestination->text( i ) == dest )
+                        activeDestination->setCurrentItem( i );
+                if ( activeLinkDestination->text( i ) == linkdest )
+                        activeLinkDestination->setCurrentItem( i );
+   }
 }
 
@@ -304,5 +317,4 @@ void PackageManagerSettings::writeCurrentInstallationSetting()
 {
   Config cfg( "oipkg", Config::User );
-  changed = false;
   cfg.setGroup( "Setting_"  + QString::number(currentSetting) );
   cfg.writeEntry( "link", CheckBoxLink->isChecked() );
@@ -333,4 +345,5 @@ bool PackageManagerSettings::readIpkgConfig(const QString& conffile)
 {
   QFile conf(conffile);
+  changed = false;
   if ( conf.open(IO_ReadOnly) ) {
     QTextStream s(&conf);
@@ -425,5 +438,5 @@ void PackageManagerSettings::readSettings()
 void PackageManagerSettings::writeSettings()
 {
-  writeIpkgConfig("/etc/ipkg.conf");
+  if ( changed ) writeIpkgConfig("/etc/ipkg.conf");
   writeInstallationSettings();
 }
@@ -436,5 +449,5 @@ bool PackageManagerSettings::showDialog( int i )
   if ( ret ) writeSettings();
   else readSettings();
-  return ret;
+  return (changed && ret);
 }
 /** Returns the installation destination */
@@ -470,4 +483,13 @@ QStringList PackageManagerSettings::getActiveServers()
   return sl;
 }
+ QStringList PackageManagerSettings::getServers()
+{
+          QStringList sl;
+  for (int i=0; i<(int)activeServers->count(); i++)
+    {
+                        sl += activeServers->text(i);
+    }
+  return sl;
+}
 
 /** returns the destination listed in ipkg.conf */
@@ -507,5 +529,14 @@ QStringList PackageManagerSettings::getDestinationNames()
 void PackageManagerSettings::linkEnabled( bool b )
 {
-  changed = true;
   activeLinkDestination->setEnabled( b );
 }
+
+void PackageManagerSettings::activeServerChanged()
+{
+        changed = true;
+}
+
+QComboBox* PackageManagerSettings::getDestCombo()
+{
+        return new QComboBox(activeDestination);
+}