author | tille <tille> | 2002-04-24 19:15:02 (UTC) |
---|---|---|
committer | tille <tille> | 2002-04-24 19:15:02 (UTC) |
commit | 17eb865ad8248b1f47c565b074b9b6bbbd44935b (patch) (unidiff) | |
tree | c494b5050ce910df3c74e2a21c5579571792d926 /noncore/unsupported/oipkg | |
parent | 997b7685dcc48cc36737240ca53331f83b66dbeb (diff) | |
download | opie-17eb865ad8248b1f47c565b074b9b6bbbd44935b.zip opie-17eb865ad8248b1f47c565b074b9b6bbbd44935b.tar.gz opie-17eb865ad8248b1f47c565b074b9b6bbbd44935b.tar.bz2 |
added find
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.cpp | 190 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.h | 26 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/oipkg.pro | 1 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelist.cpp | 17 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelist.h | 7 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pkwindow.ui | 147 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 2 |
7 files changed, 170 insertions, 220 deletions
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp index cb2b4cd..997f449 100644 --- a/noncore/unsupported/oipkg/mainwindow.cpp +++ b/noncore/unsupported/oipkg/mainwindow.cpp | |||
@@ -11,10 +11,12 @@ | |||
11 | #include <qmessagebox.h> | 11 | #include <qmessagebox.h> |
12 | #include <qpopupmenu.h> | 12 | #include <qpopupmenu.h> |
13 | #include <qtoolbutton.h> | 13 | #include <qtoolbutton.h> |
14 | #include <qstring.h> | 14 | #include <qstring.h> |
15 | #include <qlabel.h> | ||
15 | #include <qlistview.h> | 16 | #include <qlistview.h> |
16 | #include <qtextview.h> | 17 | #include <qtextview.h> |
18 | #include <qlineedit.h> | ||
17 | #include <qtabwidget.h> | 19 | #include <qtabwidget.h> |
18 | #include <qcombobox.h> | 20 | #include <qcombobox.h> |
19 | #include <qlayout.h> | 21 | #include <qlayout.h> |
20 | 22 | ||
@@ -24,28 +26,33 @@ | |||
24 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) : | 26 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) : |
25 | QMainWindow( parent, name, f ) | 27 | QMainWindow( parent, name, f ) |
26 | { | 28 | { |
27 | setCaption( tr("Package Manager") ); | 29 | setCaption( tr("Package Manager") ); |
28 | table = new PackageWindow( this,0,0 ); | 30 | |
29 | setCentralWidget( table ); | 31 | listViewPackages = new QListView( this,0,0 ); |
32 | setCentralWidget( listViewPackages ); | ||
33 | |||
30 | makeMenu(); | 34 | makeMenu(); |
31 | 35 | ||
32 | QFontMetrics fm = fontMetrics(); | 36 | QFontMetrics fm = fontMetrics(); |
37 | int wlw = width()*2; | ||
33 | int w0 = fm.width(tr("Package"))+30; | 38 | int w0 = fm.width(tr("Package"))+30; |
39 | // int w0 = fm.width(tr("Package"))+30; | ||
34 | int w2 = fm.width("00000")+4; | 40 | int w2 = fm.width("00000")+4; |
35 | table->ListViewPackages->setColumnWidth(0,w0); | 41 | int w1 = wlw-w2-w0-20; |
36 | table->ListViewPackages->setColumnWidth(1,228-w2-w0); // ### screen-biased | 42 | listViewPackages->addColumn( tr("Package"), w0 ); |
37 | table->ListViewPackages->setColumnWidth(2,w2); | 43 | listViewPackages->addColumn( tr("Description"), w1 ); |
38 | table->ListViewPackages->setColumnWidthMode(0,QListView::Manual); | 44 | listViewPackages->addColumn( tr("Size"), w2 ); |
39 | table->ListViewPackages->setColumnWidthMode(1,QListView::Manual); | 45 | listViewPackages->setColumnWidthMode(0,QListView::Manual); |
40 | table->ListViewPackages->setColumnWidthMode(2,QListView::Manual); | 46 | listViewPackages->setColumnWidthMode(1,QListView::Manual); |
41 | table->ListViewPackages->setSelectionMode( QListView::Multi ); | 47 | listViewPackages->setColumnWidthMode(2,QListView::Manual); |
42 | 48 | listViewPackages->setSelectionMode( QListView::Multi ); | |
43 | connect( table->section, SIGNAL( activated(int) ), | 49 | |
50 | connect( section, SIGNAL( activated(int) ), | ||
44 | this, SLOT( sectionChanged() ) ); | 51 | this, SLOT( sectionChanged() ) ); |
45 | connect( table->subsection, SIGNAL(activated(int) ), | 52 | connect( subsection, SIGNAL(activated(int) ), |
46 | this, SLOT( subSectionChanged() ) ); | 53 | this, SLOT( subSectionChanged() ) ); |
47 | connect( table->ListViewPackages, SIGNAL( clicked( QListViewItem* ) ), | 54 | connect( listViewPackages, SIGNAL( pressed( QListViewItem* ) ), |
48 | this, SLOT( setCurrent( QListViewItem* ) ) ); | 55 | this, SLOT( setCurrent( QListViewItem* ) ) ); |
49 | 56 | ||
50 | settings = new PackageManagerSettings(this,0,TRUE); | 57 | settings = new PackageManagerSettings(this,0,TRUE); |
51 | 58 | ||
@@ -62,30 +69,29 @@ void MainWindow::makeMenu() | |||
62 | 69 | ||
63 | QPEToolBar *toolBar = new QPEToolBar( this ); | 70 | QPEToolBar *toolBar = new QPEToolBar( this ); |
64 | QPEMenuBar *menuBar = new QPEMenuBar( toolBar ); | 71 | QPEMenuBar *menuBar = new QPEMenuBar( toolBar ); |
65 | QPopupMenu *srvMenu = new QPopupMenu( menuBar ); | 72 | QPopupMenu *srvMenu = new QPopupMenu( menuBar ); |
73 | QPopupMenu *viewMenu = new QPopupMenu( menuBar ); | ||
66 | QPopupMenu *cfgMenu = new QPopupMenu( menuBar ); | 74 | QPopupMenu *cfgMenu = new QPopupMenu( menuBar ); |
67 | // QPopupMenu *sectMenu = new QPopupMenu( menuBar ); | 75 | // QPopupMenu *sectMenu = new QPopupMenu( menuBar ); |
68 | 76 | ||
69 | //#define TOOLBAR | 77 | popupMenu = new QPopupMenu( this ); |
70 | #ifdef TOOLBAR | ||
71 | QPEToolBar *secBar = new QPEToolBar( this ); | ||
72 | QComboBox *sections = new QComboBox( false, this ); | ||
73 | secBar->addTo( sections ); | ||
74 | #endif | ||
75 | 78 | ||
76 | contextMenu = new QPopupMenu( this ); | 79 | contextMenu = new QPopupMenu( this ); |
77 | 80 | ||
78 | setToolBarsMovable( false ); | 81 | setToolBarsMovable( false ); |
79 | toolBar->setHorizontalStretchable( true ); | 82 | toolBar->setHorizontalStretchable( true ); |
80 | menuBar->insertItem( tr( "Package" ), srvMenu ); | 83 | menuBar->insertItem( tr( "Package" ), srvMenu ); |
84 | menuBar->insertItem( tr( "View" ), viewMenu ); | ||
81 | menuBar->insertItem( tr( "Settings" ), cfgMenu ); | 85 | menuBar->insertItem( tr( "Settings" ), cfgMenu ); |
82 | // menuBar->insertItem( tr( "Sections" ), sectMenu ); | 86 | // menuBar->insertItem( tr( "Sections" ), sectMenu ); |
83 | 87 | ||
84 | toolBar->setStretchableWidget (srvMenu); | 88 | QLabel *spacer = new QLabel( "", toolBar ); |
89 | spacer->setBackgroundColor( toolBar->backgroundColor() ); | ||
90 | toolBar->setStretchableWidget( spacer ); | ||
85 | 91 | ||
86 | 92 | ||
87 | runAction = new QAction( tr( "Run" ), | 93 | runAction = new QAction( tr( "Commit" ), |
88 | Resource::loadPixmap( "oipkg/install" ), | 94 | Resource::loadPixmap( "oipkg/install" ), |
89 | QString::null, 0, this, 0 ); | 95 | QString::null, 0, this, 0 ); |
90 | connect( runAction, SIGNAL( activated() ), | 96 | connect( runAction, SIGNAL( activated() ), |
91 | this, SLOT( runIpkg() ) ); | 97 | this, SLOT( runIpkg() ) ); |
@@ -101,38 +107,84 @@ void MainWindow::makeMenu() | |||
101 | this , SLOT( updateList() ) ); | 107 | this , SLOT( updateList() ) ); |
102 | updateAction->addTo( toolBar ); | 108 | updateAction->addTo( toolBar ); |
103 | updateAction->addTo( srvMenu ); | 109 | updateAction->addTo( srvMenu ); |
104 | 110 | ||
105 | // detailsAction = new QAction( tr( "Details" ), | 111 | detailsAction = new QAction( tr( "Details" ), |
106 | // Resource::loadIconSet( "oipkg/details" ), | 112 | Resource::loadIconSet( "find" ), |
107 | // QString::null, 0, this, 0 ); | 113 | QString::null, 0, this, 0 ); |
108 | // connect( detailsAction, SIGNAL( activated() ), | 114 | connect( detailsAction, SIGNAL( activated() ), |
109 | // this , SLOT( showDetails() ) ); | 115 | this , SLOT( showDetails() ) ); |
110 | // detailsAction->addTo( toolBar ); | 116 | detailsAction->addTo( toolBar ); |
111 | // detailsAction->addTo( srvMenu ); | 117 | detailsAction->addTo( srvMenu ); |
112 | 118 | ||
113 | QAction *cfgact; | 119 | QAction *cfgact; |
114 | 120 | ||
115 | cfgact = new QAction( tr( "Setups" ), | 121 | cfgact = new QAction( tr( "Setups" ), |
116 | Resource::loadIconSet( "" ), | 122 | // Resource::loadIconSet( "" ), |
117 | QString::null, 0, this, 0 ); | 123 | QString::null, 0, this, 0 ); |
118 | connect( cfgact, SIGNAL( activated() ), | 124 | connect( cfgact, SIGNAL( activated() ), |
119 | SLOT( showSettings() ) ); | 125 | SLOT( showSettings() ) ); |
120 | cfgact->addTo( cfgMenu ); | 126 | cfgact->addTo( cfgMenu ); |
121 | 127 | ||
122 | cfgact = new QAction( tr( "Servers" ), | 128 | cfgact = new QAction( tr( "Servers" ), |
123 | Resource::loadIconSet( "" ), | 129 | // Resource::loadIconSet( "" ), |
124 | QString::null, 0, this, 0 ); | 130 | QString::null, 0, this, 0 ); |
125 | connect( cfgact, SIGNAL( activated() ), | 131 | connect( cfgact, SIGNAL( activated() ), |
126 | SLOT( showSettingsSrv() ) ); | 132 | SLOT( showSettingsSrv() ) ); |
127 | cfgact->addTo( cfgMenu ); | 133 | cfgact->addTo( cfgMenu ); |
128 | cfgact = new QAction( tr( "Destinations" ), | 134 | cfgact = new QAction( tr( "Destinations" ), |
129 | Resource::loadIconSet( "" ), | 135 | //Resource::loadIconSet( "" ), |
130 | QString::null, 0, this, 0 ); | 136 | QString::null, 0, this, 0 ); |
131 | connect( cfgact, SIGNAL( activated() ), | 137 | connect( cfgact, SIGNAL( activated() ), |
132 | SLOT( showSettingsDst() ) ); | 138 | SLOT( showSettingsDst() ) ); |
133 | cfgact->addTo( cfgMenu ); | 139 | cfgact->addTo( cfgMenu ); |
134 | 140 | ||
141 | QAction *a; | ||
142 | |||
143 | sectionBar = new QPEToolBar( this ); | ||
144 | addToolBar( sectionBar, "Section", QMainWindow::Top, TRUE ); | ||
145 | sectionBar->setHorizontalStretchable( true ); | ||
146 | QLabel *label = new QLabel( tr("Section: "), sectionBar ); | ||
147 | label->setBackgroundColor( sectionBar->backgroundColor() ); | ||
148 | section = new QComboBox( false, sectionBar ); | ||
149 | // section->setBackgroundMode( PaletteBackground ); | ||
150 | label = new QLabel( " / ", sectionBar ); | ||
151 | label->setBackgroundColor( sectionBar->backgroundColor() ); | ||
152 | subsection = new QComboBox( false, sectionBar ); | ||
153 | sectionBar->setStretchableWidget( label ); | ||
154 | |||
155 | a = new QAction( tr( "Close Section" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); | ||
156 | connect( a, SIGNAL( activated() ), this, SLOT( sectionClose() ) ); | ||
157 | a->addTo( sectionBar ); | ||
158 | |||
159 | sectionAction = new QAction( tr( "Sections" ), QString::null, 0, this, 0 ); | ||
160 | connect( sectionAction, SIGNAL( toggled(bool) ), this, SLOT( sectionShow(bool) ) ); | ||
161 | sectionAction->setToggleAction( true ); | ||
162 | sectionAction->setOn( true ); | ||
163 | sectionAction->addTo( viewMenu ); | ||
164 | |||
165 | findBar = new QPEToolBar(this); | ||
166 | addToolBar( findBar, "Search", QMainWindow::Top, TRUE ); | ||
167 | label = new QLabel( tr("Filter: "), findBar ); | ||
168 | label->setBackgroundColor( findBar->backgroundColor() ); | ||
169 | findBar->setHorizontalStretchable( TRUE ); | ||
170 | findEdit = new QLineEdit( findBar, "findEdit" ); | ||
171 | findBar->setStretchableWidget( findEdit ); | ||
172 | connect( findEdit, SIGNAL( textChanged( const QString & ) ), | ||
173 | this, SLOT( displayList() ) ); | ||
174 | //a = new QAction( tr( "Filter" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 ); | ||
175 | // connect( a, SIGNAL( activated() ), this, SLOT( filterList() ) ); | ||
176 | // a->addTo( findBar ); | ||
177 | // a->addTo( edit ); | ||
178 | a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); | ||
179 | connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) ); | ||
180 | a->addTo( findBar ); | ||
181 | findAction = new QAction( tr( "Find" ), QString::null, 0, this, 0 ); | ||
182 | connect( findAction, SIGNAL( toggled(bool) ), this, SLOT( findShow(bool) ) ); | ||
183 | findAction->setToggleAction( true ); | ||
184 | findAction->setOn( true ); | ||
185 | findAction->addTo( viewMenu ); | ||
186 | |||
135 | } | 187 | } |
136 | 188 | ||
137 | MainWindow::~MainWindow() | 189 | MainWindow::~MainWindow() |
138 | { | 190 | { |
@@ -140,14 +192,14 @@ MainWindow::~MainWindow() | |||
140 | 192 | ||
141 | void MainWindow::runIpkg() | 193 | void MainWindow::runIpkg() |
142 | { | 194 | { |
143 | ipkg->commit( packageList ); | 195 | ipkg->commit( packageList ); |
144 | updateList(); | 196 | updateList(); //to remove |
145 | } | 197 | } |
146 | 198 | ||
147 | void MainWindow::updateList() | 199 | void MainWindow::updateList() |
148 | { | 200 | { |
149 | // todo: packageList.clear(); | 201 | packageList.clear(); |
150 | ipkg->update(); | 202 | ipkg->update(); |
151 | getList(); | 203 | getList(); |
152 | } | 204 | } |
153 | 205 | ||
@@ -158,68 +210,66 @@ void MainWindow::getList() | |||
158 | } | 210 | } |
159 | 211 | ||
160 | void MainWindow::filterList() | 212 | void MainWindow::filterList() |
161 | { | 213 | { |
162 | packageList.filterPackages(); | 214 | QString f = ""; |
215 | if ( findAction->isOn() ) f = findEdit->text(); | ||
216 | packageList.filterPackages( f ); | ||
163 | } | 217 | } |
164 | 218 | ||
165 | void MainWindow::displayList() | 219 | void MainWindow::displayList() |
166 | { | 220 | { |
167 | table->ListViewPackages->clear(); | 221 | filterList(); |
222 | listViewPackages->clear(); | ||
168 | Package *pack = packageList.first(); | 223 | Package *pack = packageList.first(); |
169 | while( pack ) | 224 | while( pack ) |
170 | { | 225 | { |
171 | if ( pack && (pack->name() != "") ) | 226 | if ( pack && (pack->name() != "") ) |
172 | { | 227 | listViewPackages->insertItem( new PackageListItem( listViewPackages, pack ) ); |
173 | table->ListViewPackages->insertItem( | ||
174 | new PackageListItem( table->ListViewPackages, pack ) ); | ||
175 | } | ||
176 | pack = packageList.next(); | 228 | pack = packageList.next(); |
177 | } | 229 | } |
178 | } | 230 | } |
179 | 231 | ||
180 | void MainWindow::sectionChanged() | 232 | void MainWindow::sectionChanged() |
181 | { | 233 | { |
182 | disconnect( table->section, SIGNAL( activated(int) ), | 234 | disconnect( section, SIGNAL( activated(int) ), |
183 | this, SLOT( sectionChanged() ) ); | 235 | this, SLOT( sectionChanged() ) ); |
184 | disconnect( table->subsection, SIGNAL(activated(int) ), | 236 | disconnect( subsection, SIGNAL(activated(int) ), |
185 | this, SLOT( subSectionChanged() ) ); | 237 | this, SLOT( subSectionChanged() ) ); |
186 | table->subsection->clear(); | 238 | subsection->clear(); |
187 | packageList.setSection( table->section->currentText() ); | 239 | packageList.setSection( section->currentText() ); |
188 | setSubSections(); | 240 | setSubSections(); |
189 | filterList(); | 241 | connect( section, SIGNAL( activated(int) ), |
190 | connect( table->section, SIGNAL( activated(int) ), | ||
191 | this, SLOT( sectionChanged() ) ); | 242 | this, SLOT( sectionChanged() ) ); |
192 | connect( table->subsection, SIGNAL(activated(int) ), | 243 | connect( subsection, SIGNAL(activated(int) ), |
193 | this, SLOT( subSectionChanged() ) ); | 244 | this, SLOT( subSectionChanged() ) ); |
194 | displayList(); | 245 | displayList(); |
195 | } | 246 | } |
196 | 247 | ||
197 | void MainWindow::subSectionChanged() | 248 | void MainWindow::subSectionChanged() |
198 | { | 249 | { |
199 | disconnect( table->section, SIGNAL( activated(int) ), | 250 | disconnect( section, SIGNAL( activated(int) ), |
200 | this, SLOT( sectionChanged() ) ); | 251 | this, SLOT( sectionChanged() ) ); |
201 | disconnect( table->subsection, SIGNAL(activated(int) ), | 252 | disconnect( subsection, SIGNAL(activated(int) ), |
202 | this, SLOT( subSectionChanged() ) ); | 253 | this, SLOT( subSectionChanged() ) ); |
203 | packageList.setSubSection( table->subsection->currentText() ); | 254 | packageList.setSubSection( subsection->currentText() ); |
204 | filterList(); | 255 | connect( section, SIGNAL( activated(int) ), |
205 | connect( table->section, SIGNAL( activated(int) ), | ||
206 | this, SLOT( sectionChanged() ) ); | 256 | this, SLOT( sectionChanged() ) ); |
207 | connect( table->subsection, SIGNAL(activated(int) ), | 257 | connect( subsection, SIGNAL(activated(int) ), |
208 | this, SLOT( subSectionChanged() ) ); | 258 | this, SLOT( subSectionChanged() ) ); |
209 | displayList(); | 259 | displayList(); |
210 | } | 260 | } |
211 | 261 | ||
212 | void MainWindow::setSections() | 262 | void MainWindow::setSections() |
213 | { | 263 | { |
214 | table->section->clear(); | 264 | section->clear(); |
215 | table->section->insertStringList( packageList.getSections() ); | 265 | section->insertStringList( packageList.getSections() ); |
216 | } | 266 | } |
217 | 267 | ||
218 | void MainWindow::setSubSections() | 268 | void MainWindow::setSubSections() |
219 | { | 269 | { |
220 | table->subsection->clear(); | 270 | subsection->clear(); |
221 | table->subsection->insertStringList( packageList.getSubSections() ); | 271 | subsection->insertStringList( packageList.getSubSections() ); |
222 | } | 272 | } |
223 | 273 | ||
224 | 274 | ||
225 | void MainWindow::showSettings() | 275 | void MainWindow::showSettings() |
@@ -266,7 +316,33 @@ void MainWindow::toggleActivePackage() | |||
266 | 316 | ||
267 | void MainWindow::setCurrent( QListViewItem* p ) | 317 | void MainWindow::setCurrent( QListViewItem* p ) |
268 | { | 318 | { |
269 | pvDebug(2, "MainWindow::setCurrent "); | 319 | pvDebug(2, "MainWindow::setCurrent "); |
270 | //+((Package*)p)->name()); | 320 | return; |
321 | pvDebug(2, "name "+((Package*)p)->name()); | ||
271 | activePackage = (Package*)p; | 322 | activePackage = (Package*)p; |
272 | } | 323 | } |
324 | |||
325 | void MainWindow::sectionShow(bool b) | ||
326 | { | ||
327 | if (b) sectionBar->show(); | ||
328 | else sectionBar->hide(); | ||
329 | sectionAction->setOn( b ); | ||
330 | } | ||
331 | |||
332 | void MainWindow::sectionClose() | ||
333 | { | ||
334 | sectionAction->setOn( false ); | ||
335 | } | ||
336 | |||
337 | void MainWindow::findShow(bool b) | ||
338 | { | ||
339 | if (b) findBar->show(); | ||
340 | else findBar->hide(); | ||
341 | findAction->setOn( b ); | ||
342 | } | ||
343 | |||
344 | void MainWindow::findClose() | ||
345 | { | ||
346 | findAction->setOn( false ); | ||
347 | } | ||
348 | |||
diff --git a/noncore/unsupported/oipkg/mainwindow.h b/noncore/unsupported/oipkg/mainwindow.h index 95dcc90..0c1e474 100644 --- a/noncore/unsupported/oipkg/mainwindow.h +++ b/noncore/unsupported/oipkg/mainwindow.h | |||
@@ -9,9 +9,13 @@ | |||
9 | #include "pmipkg.h" | 9 | #include "pmipkg.h" |
10 | #include "pksettings.h" | 10 | #include "pksettings.h" |
11 | #include "pkdesc.h" | 11 | #include "pkdesc.h" |
12 | 12 | ||
13 | #include "pkwindow.h" | 13 | class QComboBox; |
14 | class QPEToolBar; | ||
15 | class QLineEdit; | ||
16 | class QListView; | ||
17 | |||
14 | 18 | ||
15 | class MainWindow : public QMainWindow | 19 | class MainWindow : public QMainWindow |
16 | { | 20 | { |
17 | Q_OBJECT | 21 | Q_OBJECT |
@@ -20,18 +24,12 @@ class MainWindow : public QMainWindow | |||
20 | public: | 24 | public: |
21 | MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); | 25 | MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); |
22 | ~MainWindow(); | 26 | ~MainWindow(); |
23 | 27 | ||
24 | |||
25 | protected: | ||
26 | PackageWindow *table; | ||
27 | |||
28 | |||
29 | protected slots: | 28 | protected slots: |
30 | void runIpkg(); | 29 | void runIpkg(); |
31 | void getList(); | 30 | void getList(); |
32 | void updateList(); | 31 | void updateList(); |
33 | void filterList(); | ||
34 | void displayList(); | 32 | void displayList(); |
35 | void subSectionChanged(); | 33 | void subSectionChanged(); |
36 | void sectionChanged(); | 34 | void sectionChanged(); |
37 | void showSettings(); | 35 | void showSettings(); |
@@ -41,8 +39,13 @@ protected slots: | |||
41 | public slots: | 39 | public slots: |
42 | void showDetails(); | 40 | void showDetails(); |
43 | void toggleActivePackage(); | 41 | void toggleActivePackage(); |
44 | void setCurrent( QListViewItem* ); | 42 | void setCurrent( QListViewItem* ); |
43 | void sectionClose(); | ||
44 | void sectionShow(bool); | ||
45 | void findClose(); | ||
46 | void findShow(bool); | ||
47 | void filterList(); | ||
45 | 48 | ||
46 | private: | 49 | private: |
47 | void makeMenu(); | 50 | void makeMenu(); |
48 | void setSections(); | 51 | void setSections(); |
@@ -55,8 +58,17 @@ private: | |||
55 | Package *activePackage; | 58 | Package *activePackage; |
56 | QAction *runAction; | 59 | QAction *runAction; |
57 | QAction *detailsAction; | 60 | QAction *detailsAction; |
58 | QAction *updateAction; | 61 | QAction *updateAction; |
62 | QAction *findAction; | ||
63 | QAction *sectionAction; | ||
64 | QListView *listViewPackages; | ||
59 | QPopupMenu *contextMenu; | 65 | QPopupMenu *contextMenu; |
66 | QPEToolBar *findBar; | ||
67 | QLineEdit *findEdit; | ||
68 | QPEToolBar *sectionBar; | ||
69 | QComboBox *section; | ||
70 | QComboBox *subsection; | ||
71 | QPopupMenu *popupMenu; | ||
60 | }; | 72 | }; |
61 | 73 | ||
62 | #endif | 74 | #endif |
diff --git a/noncore/unsupported/oipkg/oipkg.pro b/noncore/unsupported/oipkg/oipkg.pro index c61af0f..c16cc73 100644 --- a/noncore/unsupported/oipkg/oipkg.pro +++ b/noncore/unsupported/oipkg/oipkg.pro | |||
@@ -20,8 +20,7 @@ DEPENDPATH += $(OPIEDIR)/include | |||
20 | LIBS += -lqpe | 20 | LIBS += -lqpe |
21 | INTERFACES= pkdesc.ui \ | 21 | INTERFACES= pkdesc.ui \ |
22 | pkfind.ui \ | 22 | pkfind.ui \ |
23 | runwindow.ui \ | 23 | runwindow.ui \ |
24 | pkwindow.ui \ | ||
25 | pksettingsbase.ui | 24 | pksettingsbase.ui |
26 | TARGET = oipkg | 25 | TARGET = oipkg |
27 | 26 | ||
diff --git a/noncore/unsupported/oipkg/packagelist.cpp b/noncore/unsupported/oipkg/packagelist.cpp index 5f6934d..944bb83 100644 --- a/noncore/unsupported/oipkg/packagelist.cpp +++ b/noncore/unsupported/oipkg/packagelist.cpp | |||
@@ -24,10 +24,8 @@ PackageList::PackageList() | |||
24 | cfg.writeEntry( "statusDir", statusDir ); | 24 | cfg.writeEntry( "statusDir", statusDir ); |
25 | cfg.writeEntry( "listsDir", listsDir ); | 25 | cfg.writeEntry( "listsDir", listsDir ); |
26 | } | 26 | } |
27 | } | 27 | } |
28 | pvDebug( 5, "PackageList::PackageList statusDir "+statusDir); | ||
29 | pvDebug( 5, "PackageList::PackageList listsDir "+listsDir); | ||
30 | sections << "All"; | 28 | sections << "All"; |
31 | subSections.insert("All", new QStringList() ); | 29 | subSections.insert("All", new QStringList() ); |
32 | QStringList *ss = subSections["All"]; | 30 | QStringList *ss = subSections["All"]; |
33 | *ss << "All"; | 31 | *ss << "All"; |
@@ -62,18 +60,21 @@ void PackageList::insertPackage( Package* pack ) | |||
62 | }; | 60 | }; |
63 | updateSections( pack ); | 61 | updateSections( pack ); |
64 | } | 62 | } |
65 | 63 | ||
66 | void PackageList::filterPackages() | 64 | void PackageList::filterPackages( QString f ) |
67 | { | 65 | { |
68 | packageList.clear(); | 66 | packageList.clear(); |
69 | QDictIterator<Package> filterIter( origPackageList ); | 67 | QDictIterator<Package> filterIter( origPackageList ); |
70 | filterIter.toFirst(); | 68 | filterIter.toFirst(); |
71 | Package *pack= filterIter.current() ; | 69 | Package *pack= filterIter.current() ; |
72 | while ( pack ) | 70 | while ( pack ) |
73 | { | 71 | { |
74 | if ( ((aktSection=="All")||(pack->getSection()==aktSection)) && | 72 | if ( |
75 | ((aktSubSection=="All")||(pack->getSubSection()==aktSubSection)) ) | 73 | ((aktSection=="All")||(pack->getSection()==aktSection)) && |
74 | ((aktSubSection=="All")||(pack->getSubSection()==aktSubSection)) && | ||
75 | pack->name().contains( f ) | ||
76 | ) | ||
76 | { | 77 | { |
77 | packageList.insert( pack->name(), pack ); | 78 | packageList.insert( pack->name(), pack ); |
78 | } | 79 | } |
79 | ++filterIter; | 80 | ++filterIter; |
@@ -213,4 +214,10 @@ void PackageList::setSettings( PackageManagerSettings *s ) | |||
213 | Package* PackageList::getByName( QString n ) | 214 | Package* PackageList::getByName( QString n ) |
214 | { | 215 | { |
215 | origPackageList[n]; | 216 | origPackageList[n]; |
216 | } | 217 | } |
218 | |||
219 | void PackageList::clear() | ||
220 | { | ||
221 | origPackageList.clear(); | ||
222 | packageList.clear(); | ||
223 | } | ||
diff --git a/noncore/unsupported/oipkg/packagelist.h b/noncore/unsupported/oipkg/packagelist.h index 68b89f0..4ce97af 100644 --- a/noncore/unsupported/oipkg/packagelist.h +++ b/noncore/unsupported/oipkg/packagelist.h | |||
@@ -13,8 +13,10 @@ | |||
13 | #endif | 13 | #endif |
14 | 14 | ||
15 | class PackageList { | 15 | class PackageList { |
16 | public: | 16 | public: |
17 | //static QString all = QObject::tr("All"); | ||
18 | |||
17 | PackageList(); | 19 | PackageList(); |
18 | PackageList( PackageManagerSettings* ); | 20 | PackageList( PackageManagerSettings* ); |
19 | ~PackageList(); | 21 | ~PackageList(); |
20 | void insertPackage( Package* ); | 22 | void insertPackage( Package* ); |
@@ -24,11 +26,12 @@ public: | |||
24 | 26 | ||
25 | QStringList getSections(); | 27 | QStringList getSections(); |
26 | QStringList getSubSections(); | 28 | QStringList getSubSections(); |
27 | void setSettings( PackageManagerSettings* ); | 29 | void setSettings( PackageManagerSettings* ); |
28 | void filterPackages(); | 30 | void filterPackages( QString ); |
29 | /** No descriptions */ | ||
30 | Package* getByName( QString ); | 31 | Package* getByName( QString ); |
32 | /** No descriptions */ | ||
33 | void clear(); | ||
31 | 34 | ||
32 | public slots: | 35 | public slots: |
33 | void setSection(QString); | 36 | void setSection(QString); |
34 | void setSubSection(QString); | 37 | void setSubSection(QString); |
diff --git a/noncore/unsupported/oipkg/pkwindow.ui b/noncore/unsupported/oipkg/pkwindow.ui deleted file mode 100644 index 9e44338..0000000 --- a/noncore/unsupported/oipkg/pkwindow.ui +++ b/dev/null | |||
@@ -1,147 +0,0 @@ | |||
1 | <!DOCTYPE UI><UI> | ||
2 | <class>PackageWindow</class> | ||
3 | <widget> | ||
4 | <class>QWidget</class> | ||
5 | <property stdset="1"> | ||
6 | <name>name</name> | ||
7 | <cstring>PackageWindow</cstring> | ||
8 | </property> | ||
9 | <property stdset="1"> | ||
10 | <name>geometry</name> | ||
11 | <rect> | ||
12 | <x>0</x> | ||
13 | <y>0</y> | ||
14 | <width>254</width> | ||
15 | <height>298</height> | ||
16 | </rect> | ||
17 | </property> | ||
18 | <property stdset="1"> | ||
19 | <name>caption</name> | ||
20 | <string>PackageWindow</string> | ||
21 | </property> | ||
22 | <property> | ||
23 | <name>layoutMargin</name> | ||
24 | </property> | ||
25 | <property> | ||
26 | <name>layoutSpacing</name> | ||
27 | </property> | ||
28 | <vbox> | ||
29 | <property stdset="1"> | ||
30 | <name>margin</name> | ||
31 | <number>2</number> | ||
32 | </property> | ||
33 | <property stdset="1"> | ||
34 | <name>spacing</name> | ||
35 | <number>2</number> | ||
36 | </property> | ||
37 | <widget> | ||
38 | <class>QLayoutWidget</class> | ||
39 | <property stdset="1"> | ||
40 | <name>name</name> | ||
41 | <cstring>Layout5</cstring> | ||
42 | </property> | ||
43 | <property> | ||
44 | <name>layoutSpacing</name> | ||
45 | </property> | ||
46 | <hbox> | ||
47 | <property stdset="1"> | ||
48 | <name>margin</name> | ||
49 | <number>0</number> | ||
50 | </property> | ||
51 | <property stdset="1"> | ||
52 | <name>spacing</name> | ||
53 | <number>1</number> | ||
54 | </property> | ||
55 | <widget> | ||
56 | <class>QLabel</class> | ||
57 | <property stdset="1"> | ||
58 | <name>name</name> | ||
59 | <cstring>LabelSection</cstring> | ||
60 | </property> | ||
61 | <property stdset="1"> | ||
62 | <name>text</name> | ||
63 | <string>Section:</string> | ||
64 | </property> | ||
65 | </widget> | ||
66 | <widget> | ||
67 | <class>QComboBox</class> | ||
68 | <property stdset="1"> | ||
69 | <name>name</name> | ||
70 | <cstring>section</cstring> | ||
71 | </property> | ||
72 | <property stdset="1"> | ||
73 | <name>sizePolicy</name> | ||
74 | <sizepolicy> | ||
75 | <hsizetype>0</hsizetype> | ||
76 | <vsizetype>0</vsizetype> | ||
77 | </sizepolicy> | ||
78 | </property> | ||
79 | </widget> | ||
80 | <widget> | ||
81 | <class>QComboBox</class> | ||
82 | <property stdset="1"> | ||
83 | <name>name</name> | ||
84 | <cstring>subsection</cstring> | ||
85 | </property> | ||
86 | <property stdset="1"> | ||
87 | <name>sizePolicy</name> | ||
88 | <sizepolicy> | ||
89 | <hsizetype>0</hsizetype> | ||
90 | <vsizetype>0</vsizetype> | ||
91 | </sizepolicy> | ||
92 | </property> | ||
93 | </widget> | ||
94 | </hbox> | ||
95 | </widget> | ||
96 | <widget> | ||
97 | <class>QListView</class> | ||
98 | <column> | ||
99 | <property> | ||
100 | <name>text</name> | ||
101 | <string>Package</string> | ||
102 | </property> | ||
103 | <property> | ||
104 | <name>clickable</name> | ||
105 | <bool>true</bool> | ||
106 | </property> | ||
107 | <property> | ||
108 | <name>resizeable</name> | ||
109 | <bool>true</bool> | ||
110 | </property> | ||
111 | </column> | ||
112 | <column> | ||
113 | <property> | ||
114 | <name>text</name> | ||
115 | <string>Description</string> | ||
116 | </property> | ||
117 | <property> | ||
118 | <name>clickable</name> | ||
119 | <bool>true</bool> | ||
120 | </property> | ||
121 | <property> | ||
122 | <name>resizeable</name> | ||
123 | <bool>true</bool> | ||
124 | </property> | ||
125 | </column> | ||
126 | <column> | ||
127 | <property> | ||
128 | <name>text</name> | ||
129 | <string>Size</string> | ||
130 | </property> | ||
131 | <property> | ||
132 | <name>clickable</name> | ||
133 | <bool>true</bool> | ||
134 | </property> | ||
135 | <property> | ||
136 | <name>resizeable</name> | ||
137 | <bool>true</bool> | ||
138 | </property> | ||
139 | </column> | ||
140 | <property stdset="1"> | ||
141 | <name>name</name> | ||
142 | <cstring>ListViewPackages</cstring> | ||
143 | </property> | ||
144 | </widget> | ||
145 | </vbox> | ||
146 | </widget> | ||
147 | </UI> | ||
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp index 94ca824..b2ddf95 100644 --- a/noncore/unsupported/oipkg/pmipkg.cpp +++ b/noncore/unsupported/oipkg/pmipkg.cpp | |||
@@ -32,9 +32,9 @@ PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlag | |||
32 | : QObject ( p ) | 32 | : QObject ( p ) |
33 | { | 33 | { |
34 | settings = s; | 34 | settings = s; |
35 | runwindow = new RunWindow ( p, name, f ); | 35 | runwindow = new RunWindow ( p, name, f ); |
36 | linkDest = new QCopChannel( "QPE/MakeLinks", this ); | 36 | linkDest = new QCopChannel( "QPE/oipkg", this ); |
37 | connect( linkDest, SIGNAL(received(const QCString &, const QByteArray &)), | 37 | connect( linkDest, SIGNAL(received(const QCString &, const QByteArray &)), |
38 | this, SLOT(linkDestination( const QString &, const QByteArray&)) ); | 38 | this, SLOT(linkDestination( const QString &, const QByteArray&)) ); |
39 | } | 39 | } |
40 | 40 | ||