| -rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 130 | ||||
| -rw-r--r-- | noncore/settings/aqpkg/mainwin.h | 6 |
2 files changed, 68 insertions, 68 deletions
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp index b597e03..6ea619c 100644 --- a/noncore/settings/aqpkg/mainwin.cpp +++ b/noncore/settings/aqpkg/mainwin.cpp @@ -21,5 +21,5 @@ #include <qpe/qcopenvelope_qws.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/qpeapplication.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpe/config.h> @@ -63,3 +63,3 @@ MainWindow :: MainWindow() initProgressWidget(); - + // Build menu and tool bars @@ -67,10 +67,10 @@ MainWindow :: MainWindow() - QPEToolBar *bar = new QPEToolBar( this ); + QToolBar *bar = new QToolBar( this ); bar->setHorizontalStretchable( TRUE ); - QPEMenuBar *mb = new QPEMenuBar( bar ); + QMenuBar *mb = new QMenuBar( bar ); mb->setMargin( 0 ); - bar = new QPEToolBar( this ); + bar = new QToolBar( this ); // Find toolbar - findBar = new QPEToolBar( this ); + findBar = new QToolBar( this ); addToolBar( findBar, QMainWindow::Top, true ); @@ -83,3 +83,3 @@ MainWindow :: MainWindow() // Quick jump toolbar - jumpBar = new QPEToolBar( this ); + jumpBar = new QToolBar( this ); addToolBar( jumpBar, QMainWindow::Top, true ); @@ -88,3 +88,3 @@ MainWindow :: MainWindow() jumpBar->setStretchableWidget( w ); - + QGridLayout *layout = new QGridLayout( w ); @@ -100,3 +100,3 @@ MainWindow :: MainWindow() } - + QAction *a = new QAction( QString::null, Resource::loadPixmap( "close" ), QString::null, 0, w, 0 ); @@ -106,6 +106,6 @@ MainWindow :: MainWindow() jumpBar->hide(); - + // Packages menu QPopupMenu *popup = new QPopupMenu( this ); - + a = new QAction( tr( "Update lists" ), Resource::loadPixmap( "aqpkg/update" ), QString::null, 0, this, 0 ); @@ -146,3 +146,3 @@ MainWindow :: MainWindow() popup = new QPopupMenu( this ); - + actionUninstalled = new QAction( tr( "Show packages not installed" ), QString::null, 0, this, 0 ); @@ -199,5 +199,5 @@ MainWindow :: MainWindow() a->addTo( popup ); - + mb->insertItem( tr( "View" ), popup ); - + // Finish find toolbar creation @@ -215,3 +215,3 @@ MainWindow :: MainWindow() stack->raiseWidget( progressWindow ); - + // Delayed call to finish initialization @@ -228,5 +228,5 @@ void MainWindow :: initMainWidget() networkPkgWindow = new QWidget( this ); - + QLabel *l = new QLabel( tr( "Servers:" ), networkPkgWindow ); - + serversList = new QComboBox( networkPkgWindow ); @@ -234,6 +234,6 @@ void MainWindow :: initMainWidget() QWhatsThis::add( serversList, tr( "Click here to select a package feed." ) ); - + installedIcon = Resource::loadPixmap( "installed" ); updatedIcon = Resource::loadPixmap( "aqpkg/updated" ); - + packagesList = new QListView( networkPkgWindow ); @@ -246,3 +246,3 @@ void MainWindow :: initMainWidget() hbox1->addWidget( serversList ); - + vbox->addWidget( packagesList ); @@ -255,3 +255,3 @@ void MainWindow :: initProgressWidget() progressWindow = new QWidget( this ); - + QVBoxLayout *layout = new QVBoxLayout( progressWindow, 4, 4 ); @@ -278,3 +278,3 @@ void MainWindow :: init() stack->raiseWidget( progressWindow ); - + mgr = new DataManager(); @@ -285,3 +285,3 @@ void MainWindow :: init() mgr->loadServers(); - + showUninstalledPkgs = false; @@ -292,3 +292,3 @@ void MainWindow :: init() updateData(); - + stack->raiseWidget( networkPkgWindow ); @@ -301,3 +301,3 @@ void MainWindow :: setDocument( const QString &doc ) // std::cout << "Selecting package " << package << std::endl; - + // First select local server @@ -354,3 +354,3 @@ void MainWindow :: closeEvent( QCloseEvent *e ) } - + void MainWindow :: displayFindBar() @@ -396,3 +396,3 @@ void MainWindow :: filterUninstalledPackages() serverSelected( -1 ); - + actionInstalled->setOn( FALSE ); @@ -410,3 +410,3 @@ void MainWindow :: filterInstalledPackages() serverSelected( -1 ); - + actionUninstalled->setOn( FALSE ); @@ -424,3 +424,3 @@ void MainWindow :: filterUpgradedPackages() serverSelected( -1 ); - + actionUninstalled->setOn( FALSE ); @@ -439,3 +439,3 @@ bool MainWindow :: setFilterCategory() return false; - + categoryFilterEnabled = true; @@ -470,3 +470,3 @@ bool MainWindow :: filterByCategory( bool val ) } - + categoryFilterEnabled = true; @@ -533,3 +533,3 @@ void MainWindow :: updateData() m_progress->setTotalSteps( mgr->getServerList().count() ); - + serversList->clear(); @@ -540,6 +540,6 @@ void MainWindow :: updateData() QString serverName; - + QListIterator<Server> it( mgr->getServerList() ); Server *server; - + for ( ; it.current(); ++it, ++i ) @@ -551,3 +551,3 @@ void MainWindow :: updateData() qApp->processEvents(); - + // cout << "Adding " << it->getServerName() << " to combobox" << endl; @@ -559,3 +559,3 @@ void MainWindow :: updateData() } - + serversList->insertItem( serverName ); @@ -580,3 +580,3 @@ void MainWindow :: serverSelected( int, bool raiseProgress ) nullIcon.fill( colorGroup().base() ); - + // display packages @@ -589,3 +589,3 @@ void MainWindow :: serverSelected( int, bool raiseProgress ) QListIterator<Package> it( list ); - + // Display progress widget while loading list @@ -625,5 +625,5 @@ void MainWindow :: serverSelected( int, bool raiseProgress ) } - + QString text = ""; - + package = it.current(); @@ -660,3 +660,3 @@ void MainWindow :: serverSelected( int, bool raiseProgress ) QCheckListItem::CheckBox ); - + if ( package->isInstalled() ) @@ -675,3 +675,3 @@ void MainWindow :: serverSelected( int, bool raiseProgress ) } - + QString destName = ""; @@ -694,3 +694,3 @@ void MainWindow :: serverSelected( int, bool raiseProgress ) } - + if ( !package->isPackageStoredLocally() ) @@ -703,3 +703,3 @@ void MainWindow :: serverSelected( int, bool raiseProgress ) new QCheckListItem( item, QString( tr( "Filename - %1" ).arg( package->getFilename() ) ) ); - + if ( serverName == LOCAL_SERVER ) @@ -756,6 +756,6 @@ void MainWindow :: searchForPackage( const QString &text ) // start = (QCheckListItem *)start->nextSibling(); - + if ( start == 0 ) start = (QCheckListItem *)packagesList->firstChild(); - + for ( QCheckListItem *item = start; item != 0 ; @@ -771,3 +771,3 @@ void MainWindow :: searchForPackage( const QString &text ) } - } + } } @@ -795,3 +795,3 @@ void MainWindow :: updateServer() stack->raiseWidget( dlg ); - + // delete progDlg; @@ -810,3 +810,3 @@ void MainWindow :: upgradePackages() warn.adjustSize(); - + if ( warn.exec() == QMessageBox::Yes ) @@ -845,3 +845,3 @@ void MainWindow :: downloadPackage() } - + // If user selected some packages then download the and store the locally @@ -853,3 +853,3 @@ void MainWindow :: downloadPackage() downloadRemotePackage(); - + } @@ -872,3 +872,3 @@ void MainWindow :: downloadPackage() name.truncate( pos - 1 ); - + Package *p = mgr->getServer( serversList->currentText() )->getPackage( name ); @@ -973,3 +973,3 @@ void MainWindow :: applyChanges() stickyOption = ""; - + // First, write out ipkg_conf file so that ipkg can use it @@ -997,6 +997,6 @@ void MainWindow :: applyChanges() tr( "No packages selected" ), tr( "OK" ) ); - + return; } - + // do the stuff @@ -1042,3 +1042,3 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) newitem->packageName = name; - + if ( p->getInstalledTo() ) @@ -1060,3 +1060,3 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) val = 0; - + if ( val == -2 ) @@ -1117,3 +1117,3 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) - + // Check if we are reinstalling the same version @@ -1132,3 +1132,3 @@ void MainWindow :: reloadData( InstallDlgImpl *dlg ) stack->raiseWidget( progressWindow ); - + if ( dlg ) @@ -1138,9 +1138,9 @@ void MainWindow :: reloadData( InstallDlgImpl *dlg ) } - + mgr->reloadServerData(); serverSelected( -1, FALSE ); - + #ifdef QWS m_status->setText( tr( "Updating Launcher..." ) ); - + // Finally let the main system update itself @@ -1150,3 +1150,3 @@ void MainWindow :: reloadData( InstallDlgImpl *dlg ) #endif - + stack->raiseWidget( networkPkgWindow ); @@ -1183,3 +1183,3 @@ void MainWindow :: letterPushed( QString t ) if ( !item ) - item = (QCheckListItem *)packagesList->firstChild(); + item = (QCheckListItem *)packagesList->firstChild(); } while ( item != start); diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h index b2de871..4b044de 100644 --- a/noncore/settings/aqpkg/mainwin.h +++ b/noncore/settings/aqpkg/mainwin.h @@ -33,3 +33,3 @@ class QLineEdit; class QListView; -class QPEToolBar; +class QToolBar; class QProgressBar; @@ -53,4 +53,4 @@ private: - QPEToolBar *findBar; - QPEToolBar *jumpBar; + QToolBar *findBar; + QToolBar *jumpBar; QLineEdit *findEdit; |