summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/mainwindow.cpp24
-rw-r--r--noncore/unsupported/oipkg/mainwindow.h3
-rw-r--r--noncore/unsupported/oipkg/pksettings.cpp26
-rw-r--r--noncore/unsupported/oipkg/pksettings.h3
-rw-r--r--noncore/unsupported/oipkg/pksettingsbase.ui4
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
@@ -127,3 +127,3 @@ void MainWindow::makeMenu()
connect( cfgact, SIGNAL( activated() ),
- SLOT( showSettings() ) );
+ SLOT( showSettingsSetup() ) );
cfgact->addTo( cfgMenu );
@@ -226,3 +226,3 @@ void MainWindow::makeMenu()
settings, SLOT(activeDestinationChange(int)) );
- spacer = new QLabel( " ", destBar );
+// spacer = new QLabel( " ", destBar );
// spacer->setBackgroundMode( PaletteForeground );
@@ -240,3 +240,3 @@ void MainWindow::makeMenu()
destAction->setToggleAction( true );
- // destAction->addTo( viewMenu );
+ destAction->addTo( viewMenu );
@@ -387,6 +387,14 @@ 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);
}
@@ -394,4 +402,3 @@ void MainWindow::showSettingsSrv()
{
- if ( settings->showDialog( 1 ) )
- updateList();
+ showSettings(1);
}
@@ -399,4 +406,3 @@ 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
@@ -54,3 +54,4 @@ protected slots:
void sectionChanged();
- void showSettings();
+ void showSettings(int);
+ void showSettingsSetup();
void showSettingsSrv();
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
@@ -61,2 +61,9 @@ PackageManagerSettings::PackageManagerSettings( QWidget* parent, const char* na
serverChanged = false;
+
+ // get rid of setups
+// Settings->hide();
+ settingName->hide();
+ newsetting->hide();
+ renamesetting->hide();
+ removesetting->hide();
}
@@ -534,3 +541,3 @@ QStringList PackageManagerSettings::getDestinationNames()
}
-
+
@@ -540,2 +547,3 @@ void PackageManagerSettings::linkEnabled( bool b )
activeLinkDestination->setEnabled( b );
+ CheckBoxLink->setChecked( b );
}
@@ -547,7 +555,2 @@ void PackageManagerSettings::activeServerChanged()
-QComboBox* PackageManagerSettings::getDestCombo()
-{
- return new QComboBox(activeDestination);
-}
-
void PackageManagerSettings::createLinksToDest()
@@ -566,5 +569,8 @@ 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
@@ -26,4 +26,2 @@ public:
QString getDestinationUrlByName(QString);
- QComboBox* getDestCombo();
-// void setIpkg( PmIpkg* );
@@ -53,2 +51,3 @@ public slots:
void activeServerChanged();
+ void activeDestinationChange(int);
signals:
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
@@ -13,3 +13,3 @@
<y>0</y>
- <width>337</width>
+ <width>333</width>
<height>454</height>
@@ -217,3 +217,3 @@
<name>text</name>
- <string>Used servers:</string>
+ <string>Used servers: (Highlighted feeds are active)</string>
</property>