summaryrefslogtreecommitdiff
authordrw <drw>2003-01-24 02:28:59 (UTC)
committer drw <drw>2003-01-24 02:28:59 (UTC)
commit342c113c3b7b3a319f49498b82def9f761c1264f (patch) (unidiff)
tree596c76aded38645435ecc9c1a1a90d603e681465
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 (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()
58{ 58{
59 setCaption( tr( "AQPkg - Package Manager" ) ); 59 setCaption( tr( "AQPkg - Package Manager" ) );
60 60
61#ifdef QWS
62 // read download directory from config file
63 Config cfg( "aqpkg" );
64 cfg.setGroup( "settings" );
65 currentlySelectedServer = cfg.readEntry( "selectedServer", "local" );
66 showJumpTo = cfg.readBoolEntry( "showJumpTo", "true" );
67
68#endif
69
70 // Create UI widgets 61 // Create UI widgets
71 initMainWidget(); 62 initMainWidget();
72 initProgressWidget(); 63 initProgressWidget();
@@ -88,11 +79,45 @@ MainWindow :: MainWindow()
88 QWhatsThis::add( findEdit, tr( "Type the text to search for here." ) ); 79 QWhatsThis::add( findEdit, tr( "Type the text to search for here." ) );
89 findBar->setStretchableWidget( findEdit ); 80 findBar->setStretchableWidget( findEdit );
90 connect( findEdit, SIGNAL( textChanged( const QString & ) ), this, SLOT( findPackage( const QString & ) ) ); 81 connect( findEdit, SIGNAL( textChanged( const QString & ) ), this, SLOT( findPackage( const QString & ) ) );
82
83 // Quick jump toolbar
84 jumpBar = new QPEToolBar( this );
85 addToolBar( jumpBar, QMainWindow::Top, true );
86 jumpBar->setHorizontalStretchable( true );
87 QWidget *w = new QWidget( jumpBar );
88 jumpBar->setStretchableWidget( w );
91 89
90 QGridLayout *layout = new QGridLayout( w );
91 //QVBoxLayout *vbox = new QVBoxLayout( w, 0, -1 );
92 //QHBoxLayout *hbox3 = new QHBoxLayout( vbox, -1 );
93 //QHBoxLayout *hbox4 = new QHBoxLayout( vbox, -1 );
94
95 char text[2];
96 text[1] = '\0';
97 for ( int i = 0 ; i < 26 ; ++i )
98 {
99 text[0] = 'A' + i;
100 LetterPushButton *b = new LetterPushButton( text, w );
101 connect( b, SIGNAL( released( QString ) ), this, SLOT( letterPushed( QString ) ) );
102 layout->addWidget( b, i / 13, i % 13);
103/*
104 if ( i < 13 )
105 hbox3->addWidget( b );
106 else
107 hbox4->addWidget( b );
108*/
109 }
110
111 QAction *a = new QAction( QString::null, Resource::loadPixmap( "close" ), QString::null, 0, w, 0 );
112 a->setWhatsThis( tr( "Click here to hide the Quick Jump toolbar." ) );
113 connect( a, SIGNAL( activated() ), this, SLOT( hideJumpBar() ) );
114 a->addTo( jumpBar );
115 jumpBar->hide();
116
92 // Packages menu 117 // Packages menu
93 QPopupMenu *popup = new QPopupMenu( this ); 118 QPopupMenu *popup = new QPopupMenu( this );
94 119
95 QAction *a = new QAction( tr( "Update lists" ), Resource::loadPixmap( "aqpkg/update" ), QString::null, 0, this, 0 ); 120 a = new QAction( tr( "Update lists" ), Resource::loadPixmap( "aqpkg/update" ), QString::null, 0, this, 0 );
96 a->setWhatsThis( tr( "Click here to update package lists from servers." ) ); 121 a->setWhatsThis( tr( "Click here to update package lists from servers." ) );
97 connect( a, SIGNAL( activated() ), this, SLOT( updateServer() ) ); 122 connect( a, SIGNAL( activated() ), this, SLOT( updateServer() ) );
98 a->addTo( popup ); 123 a->addTo( popup );
@@ -168,6 +193,14 @@ MainWindow :: MainWindow()
168 actionFindNext->addTo( popup ); 193 actionFindNext->addTo( popup );
169 actionFindNext->addTo( findBar ); 194 actionFindNext->addTo( findBar );
170 195
196
197 popup->insertSeparator();
198
199 a = new QAction( tr( "Quick Jump keypad" ), Resource::loadPixmap( "aqpkg/keyboard" ), QString::null, 0, this, 0 );
200 a->setWhatsThis( tr( "Click here to display/hide keypad to allow quick movement through the package list." ) );
201 connect( a, SIGNAL( activated() ), this, SLOT( displayJumpBar() ) );
202 a->addTo( popup );
203
171 mb->insertItem( tr( "View" ), popup ); 204 mb->insertItem( tr( "View" ), popup );
172 205
173 206
@@ -237,26 +270,6 @@ void MainWindow :: initMainWidget()
237 QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1 ); 270 QHBoxLayout *hbox1 = new QHBoxLayout( vbox, -1 );
238 hbox1->addWidget( l ); 271 hbox1->addWidget( l );
239 hbox1->addWidget( serversList ); 272 hbox1->addWidget( serversList );
240
241
242 QHBoxLayout *hbox3 = new QHBoxLayout( vbox, -1 );
243 QHBoxLayout *hbox4 = new QHBoxLayout( vbox, -1 );
244
245 if ( showJumpTo )
246 {
247 char text[2];
248 text[1] = '\0';
249 for ( int i = 0 ; i < 26 ; ++i )
250 {
251 text[0] = 'A' + i;
252 LetterPushButton *b = new LetterPushButton( text, networkPkgWindow );
253 connect( b, SIGNAL( released( QString ) ), this, SLOT( letterPushed( QString ) ) );
254 if ( i < 13 )
255 hbox3->addWidget( b );
256 else
257 hbox4->addWidget( b );
258 }
259 }
260 273
261 vbox->addWidget( packagesList ); 274 vbox->addWidget( packagesList );
262 275
@@ -279,6 +292,15 @@ void MainWindow :: initProgressWidget()
279 292
280void MainWindow :: init() 293void MainWindow :: init()
281{ 294{
295#ifdef QWS
296 // read download directory from config file
297 Config cfg( "aqpkg" );
298 cfg.setGroup( "settings" );
299 currentlySelectedServer = cfg.readEntry( "selectedServer", "local" );
300// showJumpTo = cfg.readBoolEntry( "showJumpTo", "true" );
301
302#endif
303
282 stack->raiseWidget( progressWindow ); 304 stack->raiseWidget( progressWindow );
283 305
284 mgr = new DataManager(); 306 mgr = new DataManager();
@@ -353,6 +375,11 @@ void MainWindow :: displayFindBar()
353 findEdit->setFocus(); 375 findEdit->setFocus();
354} 376}
355 377
378void MainWindow :: displayJumpBar()
379{
380 jumpBar->show();
381}
382
356void MainWindow :: repeatFind() 383void MainWindow :: repeatFind()
357{ 384{
358 searchForPackage( findEdit->text() ); 385 searchForPackage( findEdit->text() );
@@ -369,6 +396,11 @@ void MainWindow :: hideFindBar()
369 findBar->hide(); 396 findBar->hide();
370} 397}
371 398
399void MainWindow :: hideJumpBar()
400{
401 jumpBar->hide();
402}
403
372void MainWindow :: displayAbout() 404void MainWindow :: displayAbout()
373{ 405{
374 QMessageBox::about( this, tr( "About AQPkg" ), tr( VERSION_TEXT ) ); 406 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:
48 QWidgetStack *stack; 48 QWidgetStack *stack;
49 49
50 QPEToolBar *findBar; 50 QPEToolBar *findBar;
51 QPEToolBar *jumpBar;
51 QLineEdit *findEdit; 52 QLineEdit *findEdit;
52 QAction *actionFindNext; 53 QAction *actionFindNext;
53 QAction *actionFilter; 54 QAction *actionFilter;
@@ -104,9 +105,11 @@ public slots:
104// void setDocument( const QString &doc ); 105// void setDocument( const QString &doc );
105 void displayHelp(); 106 void displayHelp();
106 void displayFindBar(); 107 void displayFindBar();
108 void displayJumpBar();
107 void repeatFind(); 109 void repeatFind();
108 void findPackage( const QString & ); 110 void findPackage( const QString & );
109 void hideFindBar(); 111 void hideFindBar();
112 void hideJumpBar();
110 void displayAbout(); 113 void displayAbout();
111 void displaySettings(); 114 void displaySettings();
112 void filterUninstalledPackages(); 115 void filterUninstalledPackages();