summaryrefslogtreecommitdiff
path: root/noncore
authordrw <drw>2003-01-24 02:28:59 (UTC)
committer drw <drw>2003-01-24 02:28:59 (UTC)
commit342c113c3b7b3a319f49498b82def9f761c1264f (patch) (side-by-side diff)
tree596c76aded38645435ecc9c1a1a90d603e681465 /noncore
parenta6ad63972673fdb2ed9fba33c7c2e5e9cb3968b1 (diff)
downloadopie-342c113c3b7b3a319f49498b82def9f761c1264f.zip
opie-342c113c3b7b3a319f49498b82def9f761c1264f.tar.gz
opie-342c113c3b7b3a319f49498b82def9f761c1264f.tar.bz2
Make the quick jump to keypad a toolbar like the find bar (option in config dialog will be removed).
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/mainwin.cpp92
-rw-r--r--noncore/settings/aqpkg/mainwin.h3
2 files changed, 65 insertions, 30 deletions
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp
index ae073ef..a25f5a7 100644
--- a/noncore/settings/aqpkg/mainwin.cpp
+++ b/noncore/settings/aqpkg/mainwin.cpp
@@ -58,15 +58,6 @@ MainWindow :: MainWindow()
{
setCaption( tr( "AQPkg - Package Manager" ) );
-#ifdef QWS
- // read download directory from config file
- Config cfg( "aqpkg" );
- cfg.setGroup( "settings" );
- currentlySelectedServer = cfg.readEntry( "selectedServer", "local" );
- showJumpTo = cfg.readBoolEntry( "showJumpTo", "true" );
-
-#endif
-
// Create UI widgets
initMainWidget();
initProgressWidget();
@@ -88,11 +79,45 @@ MainWindow :: MainWindow()
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 );
+ addToolBar( jumpBar, QMainWindow::Top, true );
+ jumpBar->setHorizontalStretchable( true );
+ QWidget *w = new QWidget( jumpBar );
+ jumpBar->setStretchableWidget( w );
+ QGridLayout *layout = new QGridLayout( w );
+ //QVBoxLayout *vbox = new QVBoxLayout( w, 0, -1 );
+ //QHBoxLayout *hbox3 = new QHBoxLayout( vbox, -1 );
+ //QHBoxLayout *hbox4 = new QHBoxLayout( vbox, -1 );
+
+ char text[2];
+ text[1] = '\0';
+ for ( int i = 0 ; i < 26 ; ++i )
+ {
+ text[0] = 'A' + i;
+ LetterPushButton *b = new LetterPushButton( text, w );
+ connect( b, SIGNAL( released( QString ) ), this, SLOT( letterPushed( QString ) ) );
+ layout->addWidget( b, i / 13, i % 13);
+/*
+ if ( i < 13 )
+ hbox3->addWidget( b );
+ else
+ hbox4->addWidget( b );
+*/
+ }
+
+ 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 );
- QAction *a = new QAction( tr( "Update lists" ), Resource::loadPixmap( "aqpkg/update" ), QString::null, 0, this, 0 );
+ 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 );
@@ -168,6 +193,14 @@ MainWindow :: MainWindow()
actionFindNext->addTo( popup );
actionFindNext->addTo( findBar );
+
+ popup->insertSeparator();
+
+ 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 );
@@ -237,26 +270,6 @@ void MainWindow :: initMainWidget()
QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1 );
hbox1->addWidget( l );
hbox1->addWidget( serversList );
-
-
- QHBoxLayout *hbox3 = new QHBoxLayout( vbox, -1 );
- QHBoxLayout *hbox4 = new QHBoxLayout( vbox, -1 );
-
- if ( showJumpTo )
- {
- char text[2];
- text[1] = '\0';
- for ( int i = 0 ; i < 26 ; ++i )
- {
- text[0] = 'A' + i;
- LetterPushButton *b = new LetterPushButton( text, networkPkgWindow );
- connect( b, SIGNAL( released( QString ) ), this, SLOT( letterPushed( QString ) ) );
- if ( i < 13 )
- hbox3->addWidget( b );
- else
- hbox4->addWidget( b );
- }
- }
vbox->addWidget( packagesList );
@@ -279,6 +292,15 @@ void MainWindow :: initProgressWidget()
void MainWindow :: init()
{
+#ifdef QWS
+ // read download directory from config file
+ Config cfg( "aqpkg" );
+ cfg.setGroup( "settings" );
+ currentlySelectedServer = cfg.readEntry( "selectedServer", "local" );
+// showJumpTo = cfg.readBoolEntry( "showJumpTo", "true" );
+
+#endif
+
stack->raiseWidget( progressWindow );
mgr = new DataManager();
@@ -353,6 +375,11 @@ void MainWindow :: displayFindBar()
findEdit->setFocus();
}
+void MainWindow :: displayJumpBar()
+{
+ jumpBar->show();
+}
+
void MainWindow :: repeatFind()
{
searchForPackage( findEdit->text() );
@@ -369,6 +396,11 @@ void MainWindow :: hideFindBar()
findBar->hide();
}
+void MainWindow :: hideJumpBar()
+{
+ jumpBar->hide();
+}
+
void MainWindow :: displayAbout()
{
QMessageBox::about( this, tr( "About AQPkg" ), tr( VERSION_TEXT ) );
diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h
index be30668..b49c819 100644
--- a/noncore/settings/aqpkg/mainwin.h
+++ b/noncore/settings/aqpkg/mainwin.h
@@ -48,6 +48,7 @@ private:
QWidgetStack *stack;
QPEToolBar *findBar;
+ QPEToolBar *jumpBar;
QLineEdit *findEdit;
QAction *actionFindNext;
QAction *actionFilter;
@@ -104,9 +105,11 @@ public slots:
// void setDocument( const QString &doc );
void displayHelp();
void displayFindBar();
+ void displayJumpBar();
void repeatFind();
void findPackage( const QString & );
void hideFindBar();
+ void hideJumpBar();
void displayAbout();
void displaySettings();
void filterUninstalledPackages();