author | tille <tille> | 2002-07-17 10:59:08 (UTC) |
---|---|---|
committer | tille <tille> | 2002-07-17 10:59:08 (UTC) |
commit | 1a6f157f6a83a73907dcd4c4da1d7b24cb19dc5c (patch) (side-by-side diff) | |
tree | 3acd973e7c21d98aae401134aaa7fb1b8c84aa30 /noncore | |
parent | 3fed427aa17245af52574795a62249607f90b0bf (diff) | |
download | opie-1a6f157f6a83a73907dcd4c4da1d7b24cb19dc5c.zip opie-1a6f157f6a83a73907dcd4c4da1d7b24cb19dc5c.tar.gz opie-1a6f157f6a83a73907dcd4c4da1d7b24cb19dc5c.tar.bz2 |
added destination toolbar
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.cpp | 24 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.h | 3 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pksettings.cpp | 24 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pksettings.h | 3 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pksettingsbase.ui | 4 |
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 @@ -116,25 +116,25 @@ void MainWindow::makeMenu() Resource::loadIconSet( "oipkg/update" ), QString::null, 0, this, 0 ); connect( updateAction, SIGNAL( activated() ), this , SLOT( updateList() ) ); updateAction->addTo( toolBar ); updateAction->addTo( srvMenu ); QAction *cfgact; 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" ), QString::null, 0, this, 0 ); connect( cfgact, SIGNAL( activated() ), SLOT( showSettingsSrv() ) ); cfgact->addTo( cfgMenu ); cfgact = new QAction( tr( "Destinations" ), QString::null, 0, this, 0 ); connect( cfgact, SIGNAL( activated() ), SLOT( showSettingsDst() ) ); cfgact->addTo( cfgMenu ); @@ -215,39 +215,39 @@ void MainWindow::makeMenu() //DEST destBar = new QPEToolBar(this); addToolBar( destBar, "Destination", QMainWindow::Top, TRUE ); label = new QLabel( tr("Destination: "), destBar ); // label->setBackgroundMode( PaletteForeground ); destBar->setHorizontalStretchable( TRUE ); destination = new QComboBox( false, destBar ); destination->insertStringList( settings->getDestinationNames() ); 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 ); CheckBoxLink->setChecked( settings->createLinks() ); connect( CheckBoxLink, SIGNAL(toggled(bool)), settings, SLOT(linkEnabled(bool)) ); destAction = new QAction( tr( "Destinations" ), QString::null, 0, this, 0 ); connect( destAction, SIGNAL( toggled(bool) ), SLOT( destShow(bool) ) ); a = new QAction( tr( "Close Destinations" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); connect( a, SIGNAL( activated() ), SLOT( destClose() ) ); a->addTo( destBar ); destBar->setStretchableWidget( CheckBoxLink ); destAction->setToggleAction( true ); - // destAction->addTo( viewMenu ); + destAction->addTo( viewMenu ); // helpMenu helpMenu->insertSeparator(); a = new QAction( tr( "Package Actions" ), QString::null, 0, this, 0 ); a->addTo( helpMenu ); helpMenu->insertSeparator(); a = new QAction( tr( "Install" ), Resource::loadPixmap( "oipkg/install" ), QString::null, 0, this, 0 ); a->addTo( helpMenu ); a = new QAction( tr( "Remove" ), Resource::loadPixmap( "oipkg/uninstall" ), QString::null, 0, this, 0 ); a->addTo( helpMenu ); @@ -376,38 +376,44 @@ void MainWindow::setSections() { section->clear(); section->insertStringList( packageListServers.getSections() ); } void MainWindow::setSubSections() { subsection->clear(); subsection->insertStringList( packageListServers.getSubSections() ); } -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) { if (b) sectionBar->show(); else sectionBar->hide(); sectionAction->setOn( b ); } void MainWindow::sectionClose() { sectionAction->setOn( false ); 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 @@ -43,25 +43,26 @@ public: MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); ~MainWindow(); void makeChannel(); QCopChannel *channel; protected slots: void runIpkg(); void updateList(); void displayList(); void subSectionChanged(); void sectionChanged(); - void showSettings(); + void showSettings(int); + void showSettingsSetup(); void showSettingsSrv(); void showSettingsDst(); public slots: void sectionClose(); void sectionShow(bool); void findClose(); void findShow(bool); void searchClose(); void searchShow(bool); void destClose(); void destShow(bool); 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 @@ -50,24 +50,31 @@ PackageManagerSettings::PackageManagerSettings( QWidget* parent, const char* na 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); destinationurl->setEnabled(FALSE); destinationurlDic.setAutoDelete(TRUE); readSettings(); activeLinkDestination->hide(); serverChanged = false; + + // get rid of setups +// Settings->hide(); + settingName->hide(); + newsetting->hide(); + renamesetting->hide(); + removesetting->hide(); } PackageManagerSettings::~PackageManagerSettings() { } void PackageManagerSettings::newServer() { int i = servers->count(); if ( servername->isEnabled() || serverurl->text().isEmpty() ) { serverurlDic.insert(i,new QString("http://")); @@ -529,42 +536,41 @@ QStringList PackageManagerSettings::getDestinationNames() for (int i=0; i<(int)destinations->count(); i++) { sl += destinations->text(i); } return sl; } void PackageManagerSettings::linkEnabled( bool b ) { pvDebug(2,"PackageManagerSettings::linkEnabled "+QString(b?"yes":"no")); activeLinkDestination->setEnabled( b ); + CheckBoxLink->setChecked( b ); } void PackageManagerSettings::activeServerChanged() { changed = true; } -QComboBox* PackageManagerSettings::getDestCombo() -{ - return new QComboBox(activeDestination); -} - void PackageManagerSettings::createLinksToDest() { pvDebug(2,"creating links..."); // emit doCreateLinks( destinationurl->text() ); // ipkg->createLinks( destinationurl ); } void PackageManagerSettings::removeLinksToDest() { pvDebug(2,"removing links..."); // emit doRemoveLinks( destinationurl->text() ); // 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 @@ -15,26 +15,24 @@ public: ~PackageManagerSettings(); bool showDialog( int ) ; QString getDestinationUrl(); QString getDestinationName(); QString getLinkDestinationName(); bool createLinks(); QStringList getServers(); QStringList getActiveServers(); QStringList getDestinationUrls(); QStringList getDestinationNames(); QString getDestinationUrlByName(QString); - QComboBox* getDestCombo(); -// void setIpkg( PmIpkg* ); public slots: void writeInstallationSettings(); void readInstallationSettings(); void writeCurrentInstallationSetting(); void readInstallationSetting(int); void installationSettingSetName(const QString &); void removeLinksToDest(); void createLinksToDest(); void newServer(); void editServer(int); void removeDestination(); @@ -42,24 +40,25 @@ public slots: void editDestination(int); void linkEnabled(bool); void removeServer(); 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 activeServerChanged(); + void activeDestinationChange(int); signals: // void doCreateLinks( QString dest ); // void doRemoveLinks( QString dest ); private: QIntDict<QString> serverurlDic; QIntDict<QString> destinationurlDic; int ipkg_old; int editedserver; int editeddestination; int currentSetting; int installationSettingsCount; 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 @@ -2,25 +2,25 @@ <class>PackageManagerSettingsBase</class> <widget> <class>QDialog</class> <property stdset="1"> <name>name</name> <cstring>Form4</cstring> </property> <property stdset="1"> <name>geometry</name> <rect> <x>0</x> <y>0</y> - <width>337</width> + <width>333</width> <height>454</height> </rect> </property> <property stdset="1"> <name>caption</name> <string>Package Servers</string> </property> <property> <name>layoutMargin</name> </property> <property> <name>layoutSpacing</name> @@ -206,25 +206,25 @@ <property stdset="1"> <name>spacing</name> <number>6</number> </property> <widget> <class>QLabel</class> <property stdset="1"> <name>name</name> <cstring>TextLabel1_2</cstring> </property> <property stdset="1"> <name>text</name> - <string>Used servers:</string> + <string>Used servers: (Highlighted feeds are active)</string> </property> </widget> <spacer> <property> <name>name</name> <cstring>Spacer4</cstring> </property> <property stdset="1"> <name>orientation</name> <enum>Horizontal</enum> </property> <property stdset="1"> |