summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/mainwindow.cpp5
-rw-r--r--noncore/unsupported/oipkg/packagelistitem.cpp1
-rw-r--r--noncore/unsupported/oipkg/pksettings.cpp114
-rw-r--r--noncore/unsupported/oipkg/pksettings.h10
-rw-r--r--noncore/unsupported/oipkg/pksettingsbase.ui138
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
@@ -97,5 +97,5 @@ void MainWindow::makeMenu()
menuBar->insertItem( tr( "Help" ), helpMenu );
- QLabel *spacer;
+// QLabel *spacer;
// spacer = new QLabel( "", toolBar );
// spacer->setBackgroundColor( toolBar->backgroundColor() );
@@ -225,6 +225,5 @@ void MainWindow::makeMenu()
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 );
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
@@ -113,5 +113,4 @@ QPixmap PackageListItem::statePixmap() const
bool installed = package->installed();
bool old = package->isOld();
- bool versions = package->hasVersions();
bool verinstalled = package->otherInstalled();
if ( !package->toProcess() ) {
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
@@ -46,9 +46,9 @@ PackageManagerSettings::PackageManagerSettings( QWidget* parent, const char* na
// 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);
@@ -63,8 +63,8 @@ PackageManagerSettings::PackageManagerSettings( QWidget* parent, const char* na
// get rid of setups
// Settings->hide();
- settingName->hide();
- newsetting->hide();
- renamesetting->hide();
- removesetting->hide();
+// settingName->hide();
+// newsetting->hide();
+// renamesetting->hide();
+// removesetting->hide();
}
@@ -253,9 +253,9 @@ void PackageManagerSettings::readInstallationSettings()
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 );
}
@@ -263,37 +263,37 @@ void PackageManagerSettings::readInstallationSettings()
-/**
- * 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()
@@ -343,15 +343,15 @@ void PackageManagerSettings::writeCurrentInstallationSetting()
}
-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;
+//}
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
@@ -31,5 +31,5 @@ public slots:
void writeCurrentInstallationSetting();
void readInstallationSetting(int);
- void installationSettingSetName(const QString &);
+// void installationSettingSetName(const QString &);
void removeLinksToDest();
void createLinksToDest();
@@ -45,8 +45,8 @@ public slots:
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);
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
@@ -70,53 +70,4 @@
<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>
@@ -257,93 +208,4 @@
</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>