summaryrefslogtreecommitdiff
Unidiff
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
@@ -125,7 +125,7 @@ void MainWindow::makeMenu()
125 cfgact = new QAction( tr( "Setups" ), 125 cfgact = new QAction( tr( "Setups" ),
126 QString::null, 0, this, 0 ); 126 QString::null, 0, this, 0 );
127 connect( cfgact, SIGNAL( activated() ), 127 connect( cfgact, SIGNAL( activated() ),
128 SLOT( showSettings() ) ); 128 SLOT( showSettingsSetup() ) );
129 cfgact->addTo( cfgMenu ); 129 cfgact->addTo( cfgMenu );
130 130
131 cfgact = new QAction( tr( "Servers" ), 131 cfgact = new QAction( tr( "Servers" ),
@@ -224,7 +224,7 @@ void MainWindow::makeMenu()
224 setComboName(destination,settings->getDestinationName()); 224 setComboName(destination,settings->getDestinationName());
225 connect( destination, SIGNAL(activated(int)), 225 connect( destination, SIGNAL(activated(int)),
226 settings, SLOT(activeDestinationChange(int)) ); 226 settings, SLOT(activeDestinationChange(int)) );
227 spacer = new QLabel( " ", destBar ); 227// spacer = new QLabel( " ", destBar );
228// spacer->setBackgroundMode( PaletteForeground ); 228// spacer->setBackgroundMode( PaletteForeground );
229 CheckBoxLink = new QCheckBox( tr("Link"), destBar); 229 CheckBoxLink = new QCheckBox( tr("Link"), destBar);
230// CheckBoxLink->setBackgroundMode( PaletteForeground ); 230// CheckBoxLink->setBackgroundMode( PaletteForeground );
@@ -238,7 +238,7 @@ void MainWindow::makeMenu()
238 a->addTo( destBar ); 238 a->addTo( destBar );
239 destBar->setStretchableWidget( CheckBoxLink ); 239 destBar->setStretchableWidget( CheckBoxLink );
240 destAction->setToggleAction( true ); 240 destAction->setToggleAction( true );
241 // destAction->addTo( viewMenu ); 241 destAction->addTo( viewMenu );
242 242
243// helpMenu 243// helpMenu
244 helpMenu->insertSeparator(); 244 helpMenu->insertSeparator();
@@ -385,20 +385,26 @@ void MainWindow::setSubSections()
385} 385}
386 386
387 387
388void MainWindow::showSettings() 388void MainWindow::showSettings(int i)
389{ 389{
390 if ( settings->showDialog( 0 ) ) 390 if ( settings->showDialog( i ) )
391 {
391 updateList(); 392 updateList();
393 }
394 setComboName(destination,settings->getDestinationName());
395 CheckBoxLink->setChecked( settings->createLinks() );
396}
397void MainWindow::showSettingsSetup()
398{
399 showSettings(0);
392} 400}
393void MainWindow::showSettingsSrv() 401void MainWindow::showSettingsSrv()
394{ 402{
395 if ( settings->showDialog( 1 ) ) 403 showSettings(1);
396 updateList();
397} 404}
398void MainWindow::showSettingsDst() 405void MainWindow::showSettingsDst()
399{ 406{
400 if ( settings->showDialog( 2 ) ) 407 showSettings(2);
401 updateList();
402} 408}
403 409
404void MainWindow::sectionShow(bool b) 410void 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:
52 void displayList(); 52 void displayList();
53 void subSectionChanged(); 53 void subSectionChanged();
54 void sectionChanged(); 54 void sectionChanged();
55 void showSettings(); 55 void showSettings(int);
56 void showSettingsSetup();
56 void showSettingsSrv(); 57 void showSettingsSrv();
57 void showSettingsDst(); 58 void showSettingsDst();
58 59
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
59 readSettings(); 59 readSettings();
60 activeLinkDestination->hide(); 60 activeLinkDestination->hide();
61 serverChanged = false; 61 serverChanged = false;
62
63 // get rid of setups
64// Settings->hide();
65 settingName->hide();
66 newsetting->hide();
67 renamesetting->hide();
68 removesetting->hide();
62} 69}
63 70
64PackageManagerSettings::~PackageManagerSettings() 71PackageManagerSettings::~PackageManagerSettings()
@@ -532,12 +539,13 @@ QStringList PackageManagerSettings::getDestinationNames()
532 } 539 }
533 return sl; 540 return sl;
534} 541}
535 542
536 543
537void PackageManagerSettings::linkEnabled( bool b ) 544void PackageManagerSettings::linkEnabled( bool b )
538{ 545{
539 pvDebug(2,"PackageManagerSettings::linkEnabled "+QString(b?"yes":"no")); 546 pvDebug(2,"PackageManagerSettings::linkEnabled "+QString(b?"yes":"no"));
540 activeLinkDestination->setEnabled( b ); 547 activeLinkDestination->setEnabled( b );
548 CheckBoxLink->setChecked( b );
541} 549}
542 550
543void PackageManagerSettings::activeServerChanged() 551void PackageManagerSettings::activeServerChanged()
@@ -545,11 +553,6 @@ void PackageManagerSettings::activeServerChanged()
545 changed = true; 553 changed = true;
546} 554}
547 555
548QComboBox* PackageManagerSettings::getDestCombo()
549{
550 return new QComboBox(activeDestination);
551}
552
553void PackageManagerSettings::createLinksToDest() 556void PackageManagerSettings::createLinksToDest()
554{ 557{
555 pvDebug(2,"creating links..."); 558 pvDebug(2,"creating links...");
@@ -564,7 +567,10 @@ void PackageManagerSettings::removeLinksToDest()
564 //ipkg->removeLinks( destinationurl ); 567 //ipkg->removeLinks( destinationurl );
565} 568}
566 569
567//void PackageManagerSettings::setIpkg( PmIpkg* i ) 570void PackageManagerSettings::activeDestinationChange(int i)
568//{ 571{
569 //ipkg = i; 572 pvDebug(5,"activeDestinationChange "+QString::number(i));
570//} 573 if (i > activeDestination->count()) return;
574 activeDestination->setCurrentItem(i);
575 pvDebug(5,"dest name "+ activeDestination->currentText());
576}
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:
24 QStringList getDestinationUrls(); 24 QStringList getDestinationUrls();
25 QStringList getDestinationNames(); 25 QStringList getDestinationNames();
26 QString getDestinationUrlByName(QString); 26 QString getDestinationUrlByName(QString);
27 QComboBox* getDestCombo();
28// void setIpkg( PmIpkg* );
29 27
30public slots: 28public slots:
31 void writeInstallationSettings(); 29 void writeInstallationSettings();
@@ -51,6 +49,7 @@ public slots:
51 void removeInstallationSetting(); 49 void removeInstallationSetting();
52 void renameInstallationSetting(); 50 void renameInstallationSetting();
53 void activeServerChanged(); 51 void activeServerChanged();
52 void activeDestinationChange(int);
54signals: 53signals:
55// void doCreateLinks( QString dest ); 54// void doCreateLinks( QString dest );
56// void doRemoveLinks( QString dest ); 55// 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 @@
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>337</width> 14 <width>333</width>
15 <height>454</height> 15 <height>454</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
@@ -215,7 +215,7 @@
215 </property> 215 </property>
216 <property stdset="1"> 216 <property stdset="1">
217 <name>text</name> 217 <name>text</name>
218 <string>Used servers:</string> 218 <string>Used servers: (Highlighted feeds are active)</string>
219 </property> 219 </property>
220 </widget> 220 </widget>
221 <spacer> 221 <spacer>