removed setups settings

5 files changed, 64 insertions, 204 deletions

diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 11fc91b..04362d3 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -95,9 +95,9 @@ void MainWindow::makeMenu()
   menuBar->insertItem( tr( "View" ), viewMenu );
   menuBar->insertItem( tr( "Settings" ), cfgMenu );
   menuBar->insertItem( tr( "Help" ), helpMenu );
 
-  QLabel *spacer;
+//  QLabel *spacer;
 //  spacer = new QLabel( "", toolBar );
 //  spacer->setBackgroundColor( toolBar->backgroundColor() );
 //  toolBar->setStretchableWidget( spacer );
 
@@ -223,10 +223,9 @@ void MainWindow::makeMenu()
   destination->insertStringList( settings->getDestinationNames() );
   setComboName(destination,settings->getDestinationName());
   connect( destination, SIGNAL(activated(int)),
   			 settings, SLOT(activeDestinationChange(int)) );
-//  spacer = new QLabel( " ", destBar );
-//  spacer->setBackgroundMode( PaletteForeground );
+//  space->setBackgroundMode( PaletteForeground );
   CheckBoxLink = new QCheckBox( tr("Link"), destBar);
 //  CheckBoxLink->setBackgroundMode( PaletteForeground );
   CheckBoxLink->setChecked( settings->createLinks() );
   connect( CheckBoxLink, SIGNAL(toggled(bool)),
diff --git a/noncore/unsupported/oipkg/packagelistitem.cpp b/noncore/unsupported/oipkg/packagelistitem.cpp
index b5e86f5..03bf477 100644
--- a/noncore/unsupported/oipkg/packagelistitem.cpp
+++ b/noncore/unsupported/oipkg/packagelistitem.cpp
@@ -111,9 +111,8 @@ void PackageListItem::paintFocus( QPainter *p, const QColorGroup & cg,
 QPixmap PackageListItem::statePixmap() const
 {
   bool installed = package->installed();
   bool old = package->isOld();
-  bool versions = package->hasVersions();
   bool verinstalled = package->otherInstalled();
   if ( !package->toProcess() ) {
     if ( !installed )
     	if (old)
diff --git a/noncore/unsupported/oipkg/pksettings.cpp b/noncore/unsupported/oipkg/pksettings.cpp
index 14c1944..acabaed 100644
--- a/noncore/unsupported/oipkg/pksettings.cpp
+++ b/noncore/unsupported/oipkg/pksettings.cpp
@@ -44,13 +44,13 @@ PackageManagerSettings::PackageManagerSettings( QWidget* parent,  const char* na
   connect( destinations, SIGNAL(highlighted(int)), this, SLOT(editDestination(int)) );
   //   connect( CheckBoxLink, SIGNAL(toggled(bool)),
   //    				 activeLinkDestination, SLOT(setEnabled(bool)) );
 
-  connect( settingName, SIGNAL(activated(int)), this, SLOT(installationSettingChange(int)) );
-  connect( settingName, SIGNAL(textChanged(const QString &)), this, SLOT(installationSettingSetName(const QString &)) );
-  connect( newsetting, SIGNAL(clicked()), this, SLOT(newInstallationSetting()) );
-  connect( renamesetting, SIGNAL(clicked()), this, SLOT(renameInstallationSetting()) );
-  connect( removesetting, SIGNAL(clicked()), this, SLOT(removeInstallationSetting()) );
+//  connect( settingName, SIGNAL(activated(int)), this, SLOT(installationSettingChange(int)) );
+//  connect( settingName, SIGNAL(textChanged(const QString &)), this, SLOT(installationSettingSetName(const QString &)) );
+//  connect( newsetting, SIGNAL(clicked()), this, SLOT(newInstallationSetting()) );
+//  connect( renamesetting, SIGNAL(clicked()), this, SLOT(renameInstallationSetting()) );
+ // connect( removesetting, SIGNAL(clicked()), this, SLOT(removeInstallationSetting()) );
   servername->setEnabled(FALSE);
   serverurl->setEnabled(FALSE);
   serverurlDic.setAutoDelete(TRUE);
   destinationname->setEnabled(FALSE);
@@ -61,12 +61,12 @@ PackageManagerSettings::PackageManagerSettings( QWidget* parent,  const char* na
   serverChanged = false;
 
   // get rid of setups
 //  Settings->hide();
-  settingName->hide();
-  newsetting->hide();
-  renamesetting->hide();
-  removesetting->hide();
+//  settingName->hide();
+//  newsetting->hide();
+//  renamesetting->hide();
+//  removesetting->hide();
 }
 
 PackageManagerSettings::~PackageManagerSettings()
 {
@@ -251,51 +251,51 @@ void PackageManagerSettings::readInstallationSettings()
 
   installationSettingsCount = cfg.readNumEntry( "count", -1 );
   currentSetting  = cfg.readNumEntry( "current", 0 );// o should be -1
 
-  for (int i = 0; i < installationSettingsCount; i++)
-    {
-      cfg.setGroup( "Setting_" + QString::number(i) );
-      settingName->insertItem( cfg.readEntry( "name", "???" ), i );
-    };
+//  for (int i = 0; i < installationSettingsCount; i++)
+//    {
+//      cfg.setGroup( "Setting_" + QString::number(i) );
+//      settingName->insertItem( cfg.readEntry( "name", "???" ), i );
+//    };
   readInstallationSetting( currentSetting );
 }
 
 
 
-/**
- *  remove from conf file
- */
-void PackageManagerSettings::removeInstallationSetting()
-{
-  settingName->removeItem( settingName->currentItem() );
-  Config cfg( "oipkg", Config::User );
-  cfg.setGroup( "Setting_" + QString::number( installationSettingsCount ) );
-  cfg.clearGroup();
-  installationSettingsCount--;
-  changed = true;
-  settingName->setEditable( false );
-}
-
-/**
- *  write to confgile
- */
-void PackageManagerSettings::newInstallationSetting()
-{
-  installationSettingsCount++;
-  settingName->insertItem( "New", installationSettingsCount );
-  settingName->setCurrentItem( installationSettingsCount );
-  settingName->setEditable( true );
-  changed = true;
-}
-
-void PackageManagerSettings::installationSettingChange(int cs)
-{
-  writeCurrentInstallationSetting();
-  currentSetting = cs;
-  readInstallationSetting( cs );
-  changed = true;
-}
+///**
+// *  remove from conf file
+// */
+//void PackageManagerSettings::removeInstallationSetting()
+//{
+//  settingName->removeItem( settingName->currentItem() );
+//  Config cfg( "oipkg", Config::User );
+//  cfg.setGroup( "Setting_" + QString::number( installationSettingsCount ) );
+//  cfg.clearGroup();
+//  installationSettingsCount--;
+//  changed = true;
+//  settingName->setEditable( false );
+//}
+
+///**
+// *  write to confgile
+// */
+//void PackageManagerSettings::newInstallationSetting()
+//{
+//  installationSettingsCount++;
+//  settingName->insertItem( "New", installationSettingsCount );
+//  settingName->setCurrentItem( installationSettingsCount );
+//  settingName->setEditable( true );
+//  changed = true;
+//}
+
+//void PackageManagerSettings::installationSettingChange(int cs)
+//{
+//  writeCurrentInstallationSetting();
+//  currentSetting = cs;
+//  readInstallationSetting( cs );
+//  changed = true;
+//}
 
 void PackageManagerSettings::writeInstallationSettings()
 {
   {
@@ -341,19 +341,19 @@ void PackageManagerSettings::writeCurrentInstallationSetting()
   }
   cfg.writeEntry( "server_count", srvc );
 }
 
-void PackageManagerSettings::renameInstallationSetting()
-{
-  settingName->setEditable( true );
-  changed = true;
-}
+//void PackageManagerSettings::renameInstallationSetting()
+//{
+//  settingName->setEditable( true );
+//  changed = true;
+//}
 
-void PackageManagerSettings::installationSettingSetName(const QString &name)
-{
-  settingName->changeItem( name,  settingName->currentItem() );
-  changed = true;
-}
+//void PackageManagerSettings::installationSettingSetName(const QString &name)
+//{
+//  settingName->changeItem( name,  settingName->currentItem() );
+//  changed = true;
+//}
 
 
 bool PackageManagerSettings::readIpkgConfig(const QString& conffile)
 {
diff --git a/noncore/unsupported/oipkg/pksettings.h b/noncore/unsupported/oipkg/pksettings.h
index d66c4e8..db991f6 100644
--- a/noncore/unsupported/oipkg/pksettings.h
+++ b/noncore/unsupported/oipkg/pksettings.h
@@ -29,9 +29,9 @@ public slots:
   void writeInstallationSettings();
   void readInstallationSettings();
   void writeCurrentInstallationSetting();
   void readInstallationSetting(int);
-  void installationSettingSetName(const QString &);
+//  void installationSettingSetName(const QString &);
 	void removeLinksToDest();
 	void createLinksToDest();
   void newServer();
   void editServer(int);
@@ -43,12 +43,12 @@ public slots:
   void serverNameChanged(const QString&);
   void serverUrlChanged(const QString&);
   void destNameChanged(const QString&);
   void destUrlChanged(const QString&);
-  void installationSettingChange(int);
-  void newInstallationSetting();
-  void removeInstallationSetting();
-  void renameInstallationSetting();
+//  void installationSettingChange(int);
+//  void newInstallationSetting();
+//  void removeInstallationSetting();
+//  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 e95ed83..5bc5b46 100644
--- a/noncore/unsupported/oipkg/pksettingsbase.ui
+++ b/noncore/unsupported/oipkg/pksettingsbase.ui
@@ -68,57 +68,8 @@
                     <property stdset="1">
                         <name>spacing</name>
                         <number>3</number>
                     </property>
-                    <widget row="0"  column="0" >
-                        <class>QLayoutWidget</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>Layout3_2</cstring>
-                        </property>
-                        <hbox>
-                            <property stdset="1">
-                                <name>margin</name>
-                                <number>0</number>
-                            </property>
-                            <property stdset="1">
-                                <name>spacing</name>
-                                <number>6</number>
-                            </property>
-                            <widget>
-                                <class>QLabel</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>Settings</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Installation Setups</string>
-                                </property>
-                            </widget>
-                            <spacer>
-                                <property>
-                                    <name>name</name>
-                                    <cstring>Spacer2_2_2</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>orientation</name>
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property stdset="1">
-                                    <name>sizeType</name>
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property>
-                                    <name>sizeHint</name>
-                                    <size>
-                                        <width>20</width>
-                                        <height>20</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                        </hbox>
-                    </widget>
                     <widget row="5"  column="0" >
                         <class>QLayoutWidget</class>
                         <property stdset="1">
                             <name>name</name>
@@ -255,97 +206,8 @@
                             <name>selectionMode</name>
                             <enum>Multi</enum>
                         </property>
                     </widget>
-                    <widget row="1"  column="0" >
-                        <class>QComboBox</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>settingName</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>enabled</name>
-                            <bool>true</bool>
-                        </property>
-                        <property stdset="1">
-                            <name>focusPolicy</name>
-                            <enum>NoFocus</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>editable</name>
-                            <bool>false</bool>
-                        </property>
-                    </widget>
-                    <widget row="2"  column="0" >
-                        <class>QLayoutWidget</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>Layout11</cstring>
-                        </property>
-                        <hbox>
-                            <property stdset="1">
-                                <name>margin</name>
-                                <number>0</number>
-                            </property>
-                            <property stdset="1">
-                                <name>spacing</name>
-                                <number>6</number>
-                            </property>
-                            <widget>
-                                <class>QPushButton</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>newsetting</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>enabled</name>
-                                    <bool>false</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>New</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>autoDefault</name>
-                                    <bool>false</bool>
-                                </property>
-                            </widget>
-                            <widget>
-                                <class>QPushButton</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>renamesetting</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>enabled</name>
-                                    <bool>false</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Rename</string>
-                                </property>
-                            </widget>
-                            <widget>
-                                <class>QPushButton</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>removesetting</cstring>
-                                </property>
-                                <property stdset="1">
-                                    <name>enabled</name>
-                                    <bool>false</bool>
-                                </property>
-                                <property stdset="1">
-                                    <name>text</name>
-                                    <string>Remove</string>
-                                </property>
-                                <property stdset="1">
-                                    <name>autoDefault</name>
-                                    <bool>false</bool>
-                                </property>
-                            </widget>
-                        </hbox>
-                    </widget>
                 </grid>
             </widget>
             <widget>
                 <class>QWidget</class>