summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show 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.cpp24
-rw-r--r--noncore/unsupported/oipkg/pksettings.h3
-rw-r--r--noncore/unsupported/oipkg/pksettingsbase.ui4
5 files changed, 35 insertions, 23 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
@@ -125,7 +125,7 @@ void MainWindow::makeMenu()
cfgact = new QAction( tr( "Setups" ),
QString::null, 0, this, 0 );
connect( cfgact, SIGNAL( activated() ),
- SLOT( showSettings() ) );
+ SLOT( showSettingsSetup() ) );
cfgact->addTo( cfgMenu );
cfgact = new QAction( tr( "Servers" ),
@@ -224,7 +224,7 @@ void MainWindow::makeMenu()
setComboName(destination,settings->getDestinationName());
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);
// CheckBoxLink->setBackgroundMode( PaletteForeground );
@@ -238,7 +238,7 @@ void MainWindow::makeMenu()
a->addTo( destBar );
destBar->setStretchableWidget( CheckBoxLink );
destAction->setToggleAction( true );
- // destAction->addTo( viewMenu );
+ destAction->addTo( viewMenu );
// helpMenu
helpMenu->insertSeparator();
@@ -385,20 +385,26 @@ void MainWindow::setSubSections()
}
-void MainWindow::showSettings()
+void MainWindow::showSettings(int i)
+{
+ if ( settings->showDialog( i ) )
{
- if ( settings->showDialog( 0 ) )
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);
}
void MainWindow::sectionShow(bool b)
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
@@ -52,7 +52,8 @@ protected slots:
void displayList();
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
@@ -59,6 +59,13 @@ PackageManagerSettings::PackageManagerSettings( QWidget* parent, const char* na
readSettings();
activeLinkDestination->hide();
serverChanged = false;
+
+ // get rid of setups
+// Settings->hide();
+ settingName->hide();
+ newsetting->hide();
+ renamesetting->hide();
+ removesetting->hide();
}
PackageManagerSettings::~PackageManagerSettings()
@@ -538,6 +545,7 @@ void PackageManagerSettings::linkEnabled( bool b )
{
pvDebug(2,"PackageManagerSettings::linkEnabled "+QString(b?"yes":"no"));
activeLinkDestination->setEnabled( b );
+ CheckBoxLink->setChecked( b );
}
void PackageManagerSettings::activeServerChanged()
@@ -545,11 +553,6 @@ void PackageManagerSettings::activeServerChanged()
changed = true;
}
-QComboBox* PackageManagerSettings::getDestCombo()
-{
- return new QComboBox(activeDestination);
-}
-
void PackageManagerSettings::createLinksToDest()
{
pvDebug(2,"creating links...");
@@ -564,7 +567,10 @@ void PackageManagerSettings::removeLinksToDest()
// ipkg->removeLinks( destinationurl );
}
-//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
@@ -24,8 +24,6 @@ public:
QStringList getDestinationUrls();
QStringList getDestinationNames();
QString getDestinationUrlByName(QString);
- QComboBox* getDestCombo();
-// void setIpkg( PmIpkg* );
public slots:
void writeInstallationSettings();
@@ -51,6 +49,7 @@ public slots:
void removeInstallationSetting();
void renameInstallationSetting();
void activeServerChanged();
+ void activeDestinationChange(int);
signals:
// void doCreateLinks( QString dest );
// void doRemoveLinks( 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
@@ -11,7 +11,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>337</width>
+ <width>333</width>
<height>454</height>
</rect>
</property>
@@ -215,7 +215,7 @@
</property>
<property stdset="1">
<name>text</name>
- <string>Used servers:</string>
+ <string>Used servers: (Highlighted feeds are active)</string>
</property>
</widget>
<spacer>