summaryrefslogtreecommitdiff
authorharlekin <harlekin>2003-04-10 21:14:03 (UTC)
committer harlekin <harlekin>2003-04-10 21:14:03 (UTC)
commit6f7b120de8f4b883e709386882f3fe8ed925d0da (patch) (side-by-side diff)
tree2935f95a527e146a78b8459dbb02711093864df1
parent91867cb8a9a35c89a357bb6f20677f680709e357 (diff)
downloadopie-6f7b120de8f4b883e709386882f3fe8ed925d0da.zip
opie-6f7b120de8f4b883e709386882f3fe8ed925d0da.tar.gz
opie-6f7b120de8f4b883e709386882f3fe8ed925d0da.tar.bz2
qpetoolbar and qpemenubar are depreciated
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/mainwin.cpp130
-rw-r--r--noncore/settings/aqpkg/mainwin.h6
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
@@ -18,11 +18,11 @@
#include <linux/limits.h>
#include <unistd.h>
#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>
#include <qpe/resource.h>
#include <qaction.h>
@@ -60,34 +60,34 @@ MainWindow :: MainWindow()
// Create UI widgets
initMainWidget();
initProgressWidget();
-
+
// Build menu and tool bars
setToolBarsMovable( FALSE );
- 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 );
findBar->setHorizontalStretchable( true );
findEdit = new QLineEdit( findBar );
QWhatsThis::add( findEdit, tr( "Type the text to search for here." ) );
findBar->setStretchableWidget( findEdit );
connect( findEdit, SIGNAL( textChanged( const QString & ) ), this, SLOT( findPackage( const QString & ) ) );
// Quick jump toolbar
- jumpBar = new QPEToolBar( this );
+ jumpBar = new QToolBar( this );
addToolBar( jumpBar, QMainWindow::Top, true );
jumpBar->setHorizontalStretchable( true );
QWidget *w = new QWidget( jumpBar );
jumpBar->setStretchableWidget( w );
-
+
QGridLayout *layout = new QGridLayout( w );
char text[2];
text[1] = '\0';
@@ -97,18 +97,18 @@ MainWindow :: MainWindow()
LetterPushButton *b = new LetterPushButton( text, w );
connect( b, SIGNAL( released( QString ) ), this, SLOT( letterPushed( QString ) ) );
layout->addWidget( b, i / 13, i % 13);
}
-
+
QAction *a = new QAction( QString::null, Resource::loadPixmap( "close" ), QString::null, 0, w, 0 );
a->setWhatsThis( tr( "Click here to hide the Quick Jump toolbar." ) );
connect( a, SIGNAL( activated() ), this, SLOT( hideJumpBar() ) );
a->addTo( jumpBar );
jumpBar->hide();
-
+
// Packages menu
QPopupMenu *popup = new QPopupMenu( this );
-
+
a = new QAction( tr( "Update lists" ), Resource::loadPixmap( "aqpkg/update" ), QString::null, 0, this, 0 );
a->setWhatsThis( tr( "Click here to update package lists from servers." ) );
connect( a, SIGNAL( activated() ), this, SLOT( updateServer() ) );
a->addTo( popup );
@@ -143,9 +143,9 @@ MainWindow :: MainWindow()
mb->insertItem( tr( "Actions" ), popup );
// View menu
popup = new QPopupMenu( this );
-
+
actionUninstalled = new QAction( tr( "Show packages not installed" ), QString::null, 0, this, 0 );
actionUninstalled->setToggleAction( TRUE );
actionUninstalled->setWhatsThis( tr( "Click here to show packages available which have not been installed." ) );
connect( actionUninstalled, SIGNAL( activated() ), this, SLOT( filterUninstalledPackages() ) );
@@ -196,11 +196,11 @@ MainWindow :: MainWindow()
a = new QAction( tr( "Quick Jump keypad" ), Resource::loadPixmap( "aqpkg/keyboard" ), QString::null, 0, this, 0 );
a->setWhatsThis( tr( "Click here to display/hide keypad to allow quick movement through the package list." ) );
connect( a, SIGNAL( activated() ), this, SLOT( displayJumpBar() ) );
a->addTo( popup );
-
+
mb->insertItem( tr( "View" ), popup );
-
+
// Finish find toolbar creation
a = new QAction( QString::null, Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
a->setWhatsThis( tr( "Click here to hide the find toolbar." ) );
connect( a, SIGNAL( activated() ), this, SLOT( hideFindBar() ) );
@@ -212,9 +212,9 @@ MainWindow :: MainWindow()
stack->addWidget( progressWindow, 2 );
stack->addWidget( networkPkgWindow, 1 );
setCentralWidget( stack );
stack->raiseWidget( progressWindow );
-
+
// Delayed call to finish initialization
QTimer::singleShot( 100, this, SLOT( init() ) );
}
@@ -225,36 +225,36 @@ MainWindow :: ~MainWindow()
void MainWindow :: initMainWidget()
{
networkPkgWindow = new QWidget( this );
-
+
QLabel *l = new QLabel( tr( "Servers:" ), networkPkgWindow );
-
+
serversList = new QComboBox( networkPkgWindow );
connect( serversList, SIGNAL( activated( int ) ), this, SLOT( serverSelected( int ) ) );
QWhatsThis::add( serversList, tr( "Click here to select a package feed." ) );
-
+
installedIcon = Resource::loadPixmap( "installed" );
updatedIcon = Resource::loadPixmap( "aqpkg/updated" );
-
+
packagesList = new QListView( networkPkgWindow );
packagesList->addColumn( tr( "Packages" ), 225 );
QWhatsThis::add( packagesList, tr( "This is a listing of all packages for the server feed selected above.\n\nA blue dot next to the package name indicates that the package is currently installed.\n\nA blue dot with a star indicates that a newer version of the package is available from the server feed.\n\nClick inside the box at the left to select a package." ) );
QVBoxLayout *vbox = new QVBoxLayout( networkPkgWindow, 0, -1 );
QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1 );
hbox1->addWidget( l );
hbox1->addWidget( serversList );
-
+
vbox->addWidget( packagesList );
downloadEnabled = TRUE;
}
void MainWindow :: initProgressWidget()
{
progressWindow = new QWidget( this );
-
+
QVBoxLayout *layout = new QVBoxLayout( progressWindow, 4, 4 );
m_status = new QLabel( progressWindow );
m_status->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
@@ -275,32 +275,32 @@ void MainWindow :: init()
#endif
stack->raiseWidget( progressWindow );
-
+
mgr = new DataManager();
connect( mgr, SIGNAL( progressSetSteps( int ) ), this, SLOT( setProgressSteps( int ) ) );
connect( mgr, SIGNAL( progressSetMessage( const QString & ) ),
this, SLOT( setProgressMessage( const QString & ) ) );
connect( mgr, SIGNAL( progressUpdate( int ) ), this, SLOT( updateProgress( int ) ) );
mgr->loadServers();
-
+
showUninstalledPkgs = false;
showInstalledPkgs = false;
showUpgradedPkgs = false;
categoryFilterEnabled = false;
updateData();
-
+
stack->raiseWidget( networkPkgWindow );
}
/*
void MainWindow :: setDocument( const QString &doc )
{
// Remove path from package
QString package = Utils::getPackageNameFromIpkFilename( doc );
// std::cout << "Selecting package " << package << std::endl;
-
+
// First select local server
for ( int i = 0 ; i < serversList->count() ; ++i )
{
if ( serversList->text( i ) == LOCAL_IPKGS )
@@ -351,9 +351,9 @@ void MainWindow :: closeEvent( QCloseEvent *e )
{
e->accept();
}
}
-
+
void MainWindow :: displayFindBar()
{
findBar->show();
findEdit->setFocus();
@@ -393,9 +393,9 @@ void MainWindow :: filterUninstalledPackages()
showInstalledPkgs = FALSE;
showUpgradedPkgs = FALSE;
}
serverSelected( -1 );
-
+
actionInstalled->setOn( FALSE );
actionUpdated->setOn( FALSE );
}
@@ -407,9 +407,9 @@ void MainWindow :: filterInstalledPackages()
showUninstalledPkgs = FALSE;
showUpgradedPkgs = FALSE;
}
serverSelected( -1 );
-
+
actionUninstalled->setOn( FALSE );
actionUpdated->setOn( FALSE );
}
@@ -421,9 +421,9 @@ void MainWindow :: filterUpgradedPackages()
showUninstalledPkgs = FALSE;
showInstalledPkgs = FALSE;
}
serverSelected( -1 );
-
+
actionUninstalled->setOn( FALSE );
actionInstalled->setOn( FALSE );
}
@@ -436,9 +436,9 @@ bool MainWindow :: setFilterCategory()
categoryFilter = dlg.getSelectedFilter();
if ( categoryFilter == "" )
return false;
-
+
categoryFilterEnabled = true;
serverSelected( -1 );
actionFilter->setOn( TRUE );
return true;
@@ -467,9 +467,9 @@ bool MainWindow :: filterByCategory( bool val )
{
if ( !setFilterCategory() )
return false;
}
-
+
categoryFilterEnabled = true;
serverSelected( -1 );
return true;
}
@@ -530,35 +530,35 @@ void MainWindow :: updateProgress( int progress )
void MainWindow :: updateData()
{
m_progress->setTotalSteps( mgr->getServerList().count() );
-
+
serversList->clear();
packagesList->clear();
int activeItem = -1;
int i = 0;
QString serverName;
-
+
QListIterator<Server> it( mgr->getServerList() );
Server *server;
-
+
for ( ; it.current(); ++it, ++i )
{
server = it.current();
serverName = server->getServerName();
m_status->setText( tr( "Building server list:\n\t%1" ).arg( serverName ) );
m_progress->setProgress( i );
qApp->processEvents();
-
+
// cout << "Adding " << it->getServerName() << " to combobox" << endl;
if ( !server->isServerActive() )
{
// cout << serverName << " is not active" << endl;
i--;
continue;
}
-
+
serversList->insertItem( serverName );
if ( serverName == currentlySelectedServer )
activeItem = i;
}
@@ -577,18 +577,18 @@ void MainWindow :: serverSelected( int index )
void MainWindow :: serverSelected( int, bool raiseProgress )
{
QPixmap nullIcon( installedIcon.size() );
nullIcon.fill( colorGroup().base() );
-
+
// display packages
QString serverName = serversList->currentText();
currentlySelectedServer = serverName;
Server *s = mgr->getServer( serverName );
QList<Package> &list = s->getPackageList();
QListIterator<Package> it( list );
-
+
// Display progress widget while loading list
bool doProgress = ( list.count() > 200 );
if ( doProgress )
{
@@ -622,11 +622,11 @@ void MainWindow :: serverSelected( int, bool raiseProgress )
m_progress->setProgress( i );
}
qApp->processEvents();
}
-
+
QString text = "";
-
+
package = it.current();
// Apply show only uninstalled packages filter
if ( showUninstalledPkgs && package->isInstalled() )
@@ -657,9 +657,9 @@ void MainWindow :: serverSelected( int, bool raiseProgress )
QCheckListItem *item = new QCheckListItem( packagesList, package->getPackageName(),
QCheckListItem::CheckBox );
-
+
if ( package->isInstalled() )
{
// If a different version of package is available, show update available icon
// Otherwise, show installed icon
@@ -672,9 +672,9 @@ void MainWindow :: serverSelected( int, bool raiseProgress )
else
{
item->setPixmap( 0, installedIcon );
}
-
+
QString destName = "";
if ( package->getLocalPackage() )
{
if ( package->getLocalPackage()->getInstalledTo() )
@@ -691,18 +691,18 @@ void MainWindow :: serverSelected( int, bool raiseProgress )
else
{
item->setPixmap( 0, nullIcon );
}
-
+
if ( !package->isPackageStoredLocally() )
{
new QCheckListItem( item, QString( tr( "Description - %1" ).arg( package->getDescription() ) ) );
new QCheckListItem( item, QString( tr( "Size - %1" ).arg( package->getPackageSize() ) ) );
new QCheckListItem( item, QString( tr( "Section - %1" ).arg( package->getSection() ) ) );
}
else
new QCheckListItem( item, QString( tr( "Filename - %1" ).arg( package->getFilename() ) ) );
-
+
if ( serverName == LOCAL_SERVER )
{
new QCheckListItem( item, QString( tr( "V. Installed - %1" ).arg( package->getVersion() ) ) );
}
@@ -753,12 +753,12 @@ void MainWindow :: searchForPackage( const QString &text )
// vector<InstallData> workingPackages;
QCheckListItem *start = (QCheckListItem *)packagesList->currentItem();
// if ( start != 0 )
// start = (QCheckListItem *)start->nextSibling();
-
+
if ( start == 0 )
start = (QCheckListItem *)packagesList->firstChild();
-
+
for ( QCheckListItem *item = start; item != 0 ;
item = (QCheckListItem *)item->nextSibling() )
{
// cout << "checking " << item->text().lower() << endl;
@@ -768,9 +768,9 @@ void MainWindow :: searchForPackage( const QString &text )
packagesList->ensureItemVisible( item );
packagesList->setCurrentItem( item );
break;
}
- }
+ }
}
}
void MainWindow :: updateServer()
@@ -792,9 +792,9 @@ void MainWindow :: updateServer()
tr( "Update lists" ) );
connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) );
stack->addWidget( dlg, 3 );
stack->raiseWidget( dlg );
-
+
// delete progDlg;
}
void MainWindow :: upgradePackages()
@@ -807,9 +807,9 @@ void MainWindow :: upgradePackages()
QMessageBox::Yes,
QMessageBox::No | QMessageBox::Escape | QMessageBox::Default ,
0, this );
warn.adjustSize();
-
+
if ( warn.exec() == QMessageBox::Yes )
{
// First, write out ipkg_conf file so that ipkg can use it
mgr->writeOutIpkgConf();
@@ -842,17 +842,17 @@ void MainWindow :: downloadPackage()
if ( item->isOn() )
found = true;
}
}
-
+
// If user selected some packages then download the and store the locally
// otherwise, display dialog asking user what package to download from an http server
// and whether to install it
if ( found )
downloadSelectedPackages();
else
downloadRemotePackage();
-
+
}
else
{
doUpdate = false;
@@ -869,9 +869,9 @@ void MainWindow :: downloadPackage()
// if (there is a (installed), remove it
pos = name.find( "(installed)" );
if ( pos > 0 )
name.truncate( pos - 1 );
-
+
Package *p = mgr->getServer( serversList->currentText() )->getPackage( name );
QString msgtext;
msgtext = tr( "Are you sure you wish to delete\n%1?" ).arg( (const char *)p->getPackageName() );
@@ -970,9 +970,9 @@ void MainWindow :: downloadRemotePackage()
void MainWindow :: applyChanges()
{
stickyOption = "";
-
+
// First, write out ipkg_conf file so that ipkg can use it
mgr->writeOutIpkgConf();
// Now for each selected item
@@ -994,12 +994,12 @@ void MainWindow :: applyChanges()
{
// Nothing to do
QMessageBox::information( this, tr( "Nothing to do" ),
tr( "No packages selected" ), tr( "OK" ) );
-
+
return;
}
-
+
// do the stuff
InstallDlgImpl *dlg = new InstallDlgImpl( workingPackages, mgr, tr( "Apply changes" ) );
connect( dlg, SIGNAL( reloadData( InstallDlgImpl * ) ), this, SLOT( reloadData( InstallDlgImpl * ) ) );
stack->addWidget( dlg, 3 );
@@ -1039,9 +1039,9 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
if ( !p->isPackageStoredLocally() )
newitem->packageName = p->getInstalledPackageName();
else
newitem->packageName = name;
-
+
if ( p->getInstalledTo() )
{
newitem->destination = p->getInstalledTo();
// cout << "dest - " << p->getInstalledTo()->getDestinationName() << endl;
@@ -1057,9 +1057,9 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
// If the version requested is older and user selected a local ipk file, then reinstall the file
if ( p->isPackageStoredLocally() && val == -1 )
val = 0;
-
+
if ( val == -2 )
{
// Error - should handle
}
@@ -1114,9 +1114,9 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
// newitem->option = stickyOption;
}
}
-
+
// Check if we are reinstalling the same version
if ( newitem->option != "R" )
newitem->recreateLinks = true;
else
@@ -1129,27 +1129,27 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item )
void MainWindow :: reloadData( InstallDlgImpl *dlg )
{
stack->raiseWidget( progressWindow );
-
+
if ( dlg )
{
dlg->close();
delete dlg;
}
-
+
mgr->reloadServerData();
serverSelected( -1, FALSE );
-
+
#ifdef QWS
m_status->setText( tr( "Updating Launcher..." ) );
-
+
// Finally let the main system update itself
QCopEnvelope e("QPE/System", "linkChanged(QString)");
QString lf = QString::null;
e << lf;
#endif
-
+
stack->raiseWidget( networkPkgWindow );
}
void MainWindow :: letterPushed( QString t )
@@ -1180,7 +1180,7 @@ void MainWindow :: letterPushed( QString t )
}
item = (QCheckListItem *)item->nextSibling();
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
@@ -30,9 +30,9 @@ class QCheckListItem;
class QComboBox;
class QLabel;
class QLineEdit;
class QListView;
-class QPEToolBar;
+class QToolBar;
class QProgressBar;
class QWidgetStack;
class MainWindow :public QMainWindow
@@ -50,10 +50,10 @@ private:
DataManager *mgr;
QWidgetStack *stack;
- QPEToolBar *findBar;
- QPEToolBar *jumpBar;
+ QToolBar *findBar;
+ QToolBar *jumpBar;
QLineEdit *findEdit;
QAction *actionFindNext;
QAction *actionFilter;
QAction *actionUpgrade;