author | drw <drw> | 2003-01-09 01:27:35 (UTC) |
---|---|---|
committer | drw <drw> | 2003-01-09 01:27:35 (UTC) |
commit | c3cfc32f957f8bcbfc8c5c2231b6894c3b94ec94 (patch) (unidiff) | |
tree | 4a4158f8635815f7e7401f0e24f5b63b1b51f33e | |
parent | ece2fe6c6d61df31a4a2e8799878f5a49a2c529e (diff) | |
download | opie-c3cfc32f957f8bcbfc8c5c2231b6894c3b94ec94.zip opie-c3cfc32f957f8bcbfc8c5c2231b6894c3b94ec94.tar.gz opie-c3cfc32f957f8bcbfc8c5c2231b6894c3b94ec94.tar.bz2 |
Updates to main view, menu reorganization, etc.
-rw-r--r-- | noncore/settings/aqpkg/main.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 198 | ||||
-rw-r--r-- | noncore/settings/aqpkg/mainwin.h | 14 | ||||
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 44 | ||||
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.h | 9 |
5 files changed, 182 insertions, 85 deletions
diff --git a/noncore/settings/aqpkg/main.cpp b/noncore/settings/aqpkg/main.cpp index 1f8cf42..53c392e 100644 --- a/noncore/settings/aqpkg/main.cpp +++ b/noncore/settings/aqpkg/main.cpp | |||
@@ -51,5 +51,5 @@ int main(int argc, char *argv[]) | |||
51 | MainWindow *win = new MainWindow(); | 51 | MainWindow *win = new MainWindow(); |
52 | a.setMainWidget(win); | 52 | a.setMainWidget(win); |
53 | win->show(); | 53 | win->showMaximized(); |
54 | 54 | ||
55 | a.exec(); | 55 | a.exec(); |
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp index e577285..4aa83b5 100644 --- a/noncore/settings/aqpkg/mainwin.cpp +++ b/noncore/settings/aqpkg/mainwin.cpp | |||
@@ -19,8 +19,14 @@ | |||
19 | using namespace std; | 19 | using namespace std; |
20 | 20 | ||
21 | #include <qpe/qpemenubar.h> | ||
22 | #include <qpe/qpetoolbar.h> | ||
23 | #include <qpe/resource.h> | ||
24 | |||
25 | #include <qaction.h> | ||
21 | #include <qmenubar.h> | 26 | #include <qmenubar.h> |
22 | #include <qmessagebox.h> | 27 | #include <qmessagebox.h> |
23 | #include <qpopupmenu.h> | 28 | #include <qpopupmenu.h> |
24 | #include <qtimer.h> | 29 | #include <qtimer.h> |
30 | #include <qwidgetstack.h> | ||
25 | 31 | ||
26 | #include "mainwin.h" | 32 | #include "mainwin.h" |
@@ -33,55 +39,126 @@ using namespace std; | |||
33 | #include "global.h" | 39 | #include "global.h" |
34 | 40 | ||
35 | MainWindow :: MainWindow( QWidget *p, char *name ) | 41 | MainWindow :: MainWindow() |
36 | :QMainWindow( p, name ) | 42 | :QMainWindow( 0x0, 0x0, WStyle_ContextHelp ) |
37 | { | 43 | { |
38 | #ifdef QWS | ||
39 | showMaximized(); | ||
40 | #endif | ||
41 | |||
42 | setCaption( tr( "AQPkg - Package Manager" ) ); | 44 | setCaption( tr( "AQPkg - Package Manager" ) ); |
43 | 45 | ||
44 | // Create our menu | ||
45 | help = new QPopupMenu( this ); | ||
46 | help->insertItem( tr( "General" ), this, SLOT(displayHelp()) ); | ||
47 | help->insertItem( tr( "About" ), this, SLOT(displayAbout()) ); | ||
48 | |||
49 | settings = new QPopupMenu( this ); | ||
50 | settings->insertItem( tr( "Settings" ), this, SLOT(displaySettings()) ); | ||
51 | |||
52 | edit = new QPopupMenu( this ); | ||
53 | edit->insertItem( tr( "Find" ), this, SLOT(searchForPackage()) ); | ||
54 | edit->insertItem( tr( "Find Next" ), this, SLOT(repeatSearchForPackage()) ); | ||
55 | |||
56 | filter = new QPopupMenu( this ); | ||
57 | mnuShowUninstalledPkgsId = filter->insertItem( tr( "Show Non-Installed Packages" ), this, SLOT(filterUninstalledPackages()) ); | ||
58 | mnuShowInstalledPkgsId = filter->insertItem( tr( "Show Installed Packages" ), this, SLOT(filterInstalledPackages()) ); | ||
59 | mnuShowUpgradedPkgsId = filter->insertItem( tr( "Show Updated Packages" ), this, SLOT(filterUpgradedPackages()) ); | ||
60 | filter->insertSeparator(); | ||
61 | mnuFilterByCategory = filter->insertItem( tr( "Filter By Category" ), this, SLOT(filterCategory()) ); | ||
62 | mnuSetFilterCategory = filter->insertItem( tr( "Set Filter Category" ), this, SLOT(setFilterCategory()) ); | ||
63 | |||
64 | // Create the main menu | ||
65 | menu = menuBar(); //new QMenuBar( this ); | ||
66 | menu->insertItem( tr( "Settings" ), settings ); | ||
67 | menu->insertItem( tr( "Edit" ), edit ); | ||
68 | menu->insertItem( tr( "Filter" ), filter ); | ||
69 | menu->insertItem( tr( "Help" ), help ); | ||
70 | |||
71 | // Create UI widgets | 46 | // Create UI widgets |
72 | stack = new QWidgetStack( this ); | 47 | progressWindow = new ProgressWidget( this ); |
48 | networkPkgWindow = new NetworkPackageManager( this ); | ||
73 | 49 | ||
74 | progressWindow = new ProgressWidget( stack ); | 50 | // Build menu and tool bars |
75 | stack->addWidget( progressWindow, 2 ); | 51 | setToolBarsMovable( FALSE ); |
76 | 52 | ||
77 | networkPkgWindow = new NetworkPackageManager( stack ); | 53 | QPEToolBar *bar = new QPEToolBar( this ); |
78 | connect( networkPkgWindow, SIGNAL( appRaiseMainWidget() ), this, SLOT( raiseMainWidget() ) ); | 54 | bar->setHorizontalStretchable( TRUE ); |
79 | connect( networkPkgWindow, SIGNAL( appRaiseProgressWidget() ), this, SLOT( raiseProgressWidget() ) ); | 55 | QPEMenuBar *mb = new QPEMenuBar( bar ); |
80 | connect( networkPkgWindow, SIGNAL( progressSetSteps( int ) ), progressWindow, SLOT( setSteps( int ) ) ); | 56 | mb->setMargin( 0 ); |
81 | connect( networkPkgWindow, SIGNAL( progressSetMessage( const QString & ) ), | 57 | bar = new QPEToolBar( this ); |
82 | progressWindow, SLOT( setMessage( const QString & ) ) ); | 58 | |
83 | connect( networkPkgWindow, SIGNAL( progressUpdate( int ) ), progressWindow, SLOT( update( int ) ) ); | 59 | // Packages menu |
84 | stack->addWidget( networkPkgWindow, 1 ); | 60 | QPopupMenu *popup = new QPopupMenu( this ); |
61 | |||
62 | QAction *a = new QAction( tr( "Update lists" ), Resource::loadPixmap( "aqpkg/update" ), QString::null, 0, this, 0 ); | ||
63 | a->setWhatsThis( tr( "Click here to update package lists from servers." ) ); | ||
64 | connect( a, SIGNAL( activated() ), networkPkgWindow, SLOT( updateServer() ) ); | ||
65 | a->addTo( popup ); | ||
66 | a->addTo( bar ); | ||
67 | |||
68 | actionUpgrade = new QAction( tr( "Upgrade" ), Resource::loadPixmap( "aqpkg/upgrade" ), QString::null, 0, this, 0 ); | ||
69 | actionUpgrade->setWhatsThis( tr( "Click here to upgrade all installed packages if a newer version is available." ) ); | ||
70 | connect( actionUpgrade, SIGNAL( activated() ), networkPkgWindow, SLOT( upgradePackages() ) ); | ||
71 | actionUpgrade->addTo( popup ); | ||
72 | actionUpgrade->addTo( bar ); | ||
73 | |||
74 | iconDownload = Resource::loadPixmap( "aqpkg/download" ); | ||
75 | iconRemove = Resource::loadPixmap( "aqpkg/remove" ); | ||
76 | actionDownload = new QAction( tr( "Download" ), iconDownload, QString::null, 0, this, 0 ); | ||
77 | actionDownload->setWhatsThis( tr( "Click here to download the currently selected package(s)." ) ); | ||
78 | connect( actionDownload, SIGNAL( activated() ), networkPkgWindow, SLOT( downloadPackage() ) ); | ||
79 | actionDownload->addTo( popup ); | ||
80 | actionDownload->addTo( bar ); | ||
81 | |||
82 | a = new QAction( tr( "Apply changes" ), Resource::loadPixmap( "aqpkg/apply" ), QString::null, 0, this, 0 ); | ||
83 | a->setWhatsThis( tr( "Click here to install, remove or upgrade currently selected package(s)." ) ); | ||
84 | connect( a, SIGNAL( activated() ), networkPkgWindow, SLOT( applyChanges() ) ); | ||
85 | a->addTo( popup ); | ||
86 | a->addTo( bar ); | ||
87 | |||
88 | mb->insertItem( tr( "Packages" ), popup ); | ||
89 | |||
90 | // Search menu | ||
91 | popup = new QPopupMenu( this ); | ||
92 | |||
93 | a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 ); | ||
94 | a->setWhatsThis( tr( "Click here to search for a specific package." ) ); | ||
95 | connect( a, SIGNAL( activated() ), this, SLOT( searchForPackage() ) ); | ||
96 | a->addTo( popup ); | ||
97 | |||
98 | a = new QAction( tr( "Find next" ), Resource::loadPixmap( "next" ), QString::null, 0, this, 0 ); | ||
99 | a->setWhatsThis( tr( "Click here to search for the next package." ) ); | ||
100 | connect( a, SIGNAL( activated() ), this, SLOT( repeatSearchForPackage() ) ); | ||
101 | a->addTo( popup ); | ||
102 | |||
103 | // Show 'quick jump' keypad? | ||
104 | |||
105 | popup->insertSeparator(); | ||
106 | |||
107 | a = new QAction( tr( "Filter by category" ), Resource::loadPixmap( "aqpkg/filter" ), QString::null, 0, this, 0 ); | ||
108 | a->setWhatsThis( tr( "Click here to list packages belonging to one category." ) ); | ||
109 | connect( a, SIGNAL( activated() ), this, SLOT( filterCategory() ) ); | ||
110 | a->addTo( popup ); | ||
111 | |||
112 | a = new QAction( tr( "Set filter category" ), QString::null, 0, this, 0 ); | ||
113 | a->setWhatsThis( tr( "Click here to change package category to used filter." ) ); | ||
114 | connect( a, SIGNAL( activated() ), this, SLOT( setFilterCategory() ) ); | ||
115 | a->addTo( popup ); | ||
116 | |||
117 | mb->insertItem( tr( "Search" ), popup ); | ||
118 | |||
119 | |||
120 | // View menu | ||
121 | popup = new QPopupMenu( this ); | ||
122 | |||
123 | a = new QAction( tr( "Show packages not installed" ), QString::null, 0, this, 0 ); | ||
124 | a->setWhatsThis( tr( "Click here to show packages available which have not been installed." ) ); | ||
125 | connect( a, SIGNAL( activated() ), this, SLOT( filterUninstalledPackages() ) ); | ||
126 | a->addTo( popup ); | ||
127 | |||
128 | a = new QAction( tr( "Show installed packages" ), QString::null, 0, this, 0 ); | ||
129 | a->setWhatsThis( tr( "Click here to show packages currently installed on this device." ) ); | ||
130 | connect( a, SIGNAL( activated() ), this, SLOT( filterInstalledPackages() ) ); | ||
131 | a->addTo( popup ); | ||
132 | |||
133 | a = new QAction( tr( "Show updated packages" ), QString::null, 0, this, 0 ); | ||
134 | a->setWhatsThis( tr( "Click here to show packages currently installed on this device which have a newer version available." ) ); | ||
135 | connect( a, SIGNAL( activated() ), this, SLOT( filterUpgradedPackages() ) ); | ||
136 | a->addTo( popup ); | ||
85 | 137 | ||
138 | popup->insertSeparator(); | ||
139 | |||
140 | a = new QAction( tr( "Configure" ), Resource::loadPixmap( "aqpkg/config" ), QString::null, 0, this, 0 ); | ||
141 | a->setWhatsThis( tr( "Click here to configure this application." ) ); | ||
142 | connect( a, SIGNAL( activated() ), this, SLOT( displaySettings() ) ); | ||
143 | a->addTo( popup ); | ||
144 | |||
145 | popup->insertSeparator(); | ||
146 | |||
147 | a = new QAction( tr( "Help" ), Resource::loadPixmap( "help_icon" ), QString::null, 0, this, 0 ); | ||
148 | a->setWhatsThis( tr( "Click here for help." ) ); | ||
149 | connect( a, SIGNAL( activated() ), this, SLOT( displayHelp() ) ); | ||
150 | a->addTo( popup ); | ||
151 | |||
152 | a = new QAction( tr( "About" ), Resource::loadPixmap( "UtilsIcon" ), QString::null, 0, this, 0 ); | ||
153 | a->setWhatsThis( tr( "Click here for software version information." ) ); | ||
154 | connect( a, SIGNAL( activated() ), this, SLOT( displayAbout() ) ); | ||
155 | a->addTo( popup ); | ||
156 | |||
157 | mb->insertItem( tr( "View" ), popup ); | ||
158 | |||
159 | // Create widget stack and add UI widgets | ||
160 | stack = new QWidgetStack( this ); | ||
161 | stack->addWidget( progressWindow, 2 ); | ||
162 | stack->addWidget( networkPkgWindow, 1 ); | ||
86 | setCentralWidget( stack ); | 163 | setCentralWidget( stack ); |
87 | stack->raiseWidget( progressWindow ); | 164 | stack->raiseWidget( progressWindow ); |
@@ -89,5 +166,4 @@ MainWindow :: MainWindow( QWidget *p, char *name ) | |||
89 | // Delayed call to finish initialization | 166 | // Delayed call to finish initialization |
90 | QTimer::singleShot( 100, this, SLOT( init() ) ); | 167 | QTimer::singleShot( 100, this, SLOT( init() ) ); |
91 | |||
92 | } | 168 | } |
93 | 169 | ||
@@ -100,4 +176,5 @@ void MainWindow :: init() | |||
100 | { | 176 | { |
101 | stack->raiseWidget( progressWindow ); | 177 | stack->raiseWidget( progressWindow ); |
178 | |||
102 | mgr = new DataManager(); | 179 | mgr = new DataManager(); |
103 | connect( mgr, SIGNAL( progressSetSteps( int ) ), progressWindow, SLOT( setSteps( int ) ) ); | 180 | connect( mgr, SIGNAL( progressSetSteps( int ) ), progressWindow, SLOT( setSteps( int ) ) ); |
@@ -106,6 +183,16 @@ void MainWindow :: init() | |||
106 | connect( mgr, SIGNAL( progressUpdate( int ) ), progressWindow, SLOT( update( int ) ) ); | 183 | connect( mgr, SIGNAL( progressUpdate( int ) ), progressWindow, SLOT( update( int ) ) ); |
107 | mgr->loadServers(); | 184 | mgr->loadServers(); |
185 | |||
108 | networkPkgWindow->setDataManager( mgr ); | 186 | networkPkgWindow->setDataManager( mgr ); |
109 | networkPkgWindow->updateData(); | 187 | networkPkgWindow->updateData(); |
188 | connect( networkPkgWindow, SIGNAL( appRaiseMainWidget() ), this, SLOT( raiseMainWidget() ) ); | ||
189 | connect( networkPkgWindow, SIGNAL( appRaiseProgressWidget() ), this, SLOT( raiseProgressWidget() ) ); | ||
190 | connect( networkPkgWindow, SIGNAL( appEnableUpgrade( bool ) ), this, SLOT( enableUpgrade( bool ) ) ); | ||
191 | connect( networkPkgWindow, SIGNAL( appEnableDownload( bool ) ), this, SLOT( enableDownload( bool ) ) ); | ||
192 | connect( networkPkgWindow, SIGNAL( progressSetSteps( int ) ), progressWindow, SLOT( setSteps( int ) ) ); | ||
193 | connect( networkPkgWindow, SIGNAL( progressSetMessage( const QString & ) ), | ||
194 | progressWindow, SLOT( setMessage( const QString & ) ) ); | ||
195 | connect( networkPkgWindow, SIGNAL( progressUpdate( int ) ), progressWindow, SLOT( update( int ) ) ); | ||
196 | |||
110 | stack->raiseWidget( networkPkgWindow ); | 197 | stack->raiseWidget( networkPkgWindow ); |
111 | } | 198 | } |
@@ -246,2 +333,23 @@ void MainWindow :: raiseProgressWidget() | |||
246 | stack->raiseWidget( progressWindow ); | 333 | stack->raiseWidget( progressWindow ); |
247 | } | 334 | } |
335 | |||
336 | void MainWindow :: enableUpgrade( bool enabled ) | ||
337 | { | ||
338 | actionUpgrade->setEnabled( enabled ); | ||
339 | } | ||
340 | |||
341 | void MainWindow :: enableDownload( bool enabled ) | ||
342 | { | ||
343 | if ( enabled ) | ||
344 | { | ||
345 | actionDownload->setIconSet( iconDownload ); | ||
346 | actionDownload->setText( tr( "Download" ) ); | ||
347 | actionDownload->setWhatsThis( tr( "Click here to download the currently selected package(s)." ) ); | ||
348 | } | ||
349 | else | ||
350 | { | ||
351 | actionDownload->setIconSet( iconRemove ); | ||
352 | actionDownload->setText( tr( "Remove" ) ); | ||
353 | actionDownload->setWhatsThis( tr( "Click here to uninstall the currently selected package(s)." ) ); | ||
354 | } | ||
355 | } | ||
diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h index 39799f9..028ef5b 100644 --- a/noncore/settings/aqpkg/mainwin.h +++ b/noncore/settings/aqpkg/mainwin.h | |||
@@ -20,6 +20,10 @@ | |||
20 | 20 | ||
21 | #include <qmainwindow.h> | 21 | #include <qmainwindow.h> |
22 | #include <qwidgetstack.h> | 22 | #include <qpixmap.h> |
23 | //#include <qwidgetstack.h> | ||
23 | 24 | ||
25 | class QWidgetStack; | ||
26 | class QPEToolBar; | ||
27 | class QAction; | ||
24 | class ProgressWidget; | 28 | class ProgressWidget; |
25 | class NetworkPackageManager; | 29 | class NetworkPackageManager; |
@@ -31,5 +35,5 @@ class MainWindow :public QMainWindow | |||
31 | public: | 35 | public: |
32 | 36 | ||
33 | MainWindow( QWidget *p = 0, char *name = 0 ); | 37 | MainWindow(); |
34 | ~MainWindow(); | 38 | ~MainWindow(); |
35 | 39 | ||
@@ -43,4 +47,8 @@ private: | |||
43 | QPopupMenu *filter; | 47 | QPopupMenu *filter; |
44 | QWidgetStack *stack; | 48 | QWidgetStack *stack; |
49 | QAction *actionUpgrade; | ||
50 | QAction *actionDownload; | ||
51 | QPixmap iconDownload; | ||
52 | QPixmap iconRemove; | ||
45 | 53 | ||
46 | NetworkPackageManager *networkPkgWindow; | 54 | NetworkPackageManager *networkPkgWindow; |
@@ -67,4 +75,6 @@ public slots: | |||
67 | void raiseMainWidget(); | 75 | void raiseMainWidget(); |
68 | void raiseProgressWidget(); | 76 | void raiseProgressWidget(); |
77 | void enableUpgrade( bool ); | ||
78 | void enableDownload( bool ); | ||
69 | 79 | ||
70 | private slots: | 80 | private slots: |
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp index ee37157..91afe02 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.cpp +++ b/noncore/settings/aqpkg/networkpkgmgr.cpp | |||
@@ -66,7 +66,4 @@ NetworkPackageManager::NetworkPackageManager( QWidget *parent, const char *name | |||
66 | 66 | ||
67 | initGui(); | 67 | initGui(); |
68 | setupConnections(); | ||
69 | |||
70 | //updateData(); | ||
71 | } | 68 | } |
72 | 69 | ||
@@ -148,9 +145,7 @@ void NetworkPackageManager :: initGui() | |||
148 | QLabel *l = new QLabel( tr( "Servers" ), this ); | 145 | QLabel *l = new QLabel( tr( "Servers" ), this ); |
149 | serversList = new QComboBox( this ); | 146 | serversList = new QComboBox( this ); |
147 | connect( serversList, SIGNAL(activated( int )), this, SLOT(serverSelected( int ))); | ||
148 | |||
150 | packagesList = new QListView( this ); | 149 | packagesList = new QListView( this ); |
151 | update = new QPushButton( tr( "Refresh Lists" ), this ); | ||
152 | download = new QPushButton( tr( "Download" ), this ); | ||
153 | upgrade = new QPushButton( tr( "Upgrade" ), this ); | ||
154 | apply = new QPushButton( tr( "Apply" ), this ); | ||
155 | 150 | ||
156 | QVBoxLayout *vbox = new QVBoxLayout( this, 0, -1 ); | 151 | QVBoxLayout *vbox = new QVBoxLayout( this, 0, -1 ); |
@@ -182,18 +177,5 @@ void NetworkPackageManager :: initGui() | |||
182 | packagesList->addColumn( tr( "Packages" ) ); | 177 | packagesList->addColumn( tr( "Packages" ) ); |
183 | 178 | ||
184 | QHBoxLayout *hbox2 = new QHBoxLayout( vbox, -1 ); | 179 | downloadEnabled = TRUE; |
185 | hbox2->addWidget( update ); | ||
186 | hbox2->addWidget( download ); | ||
187 | hbox2->addWidget( upgrade ); | ||
188 | hbox2->addWidget( apply ); | ||
189 | } | ||
190 | |||
191 | void NetworkPackageManager :: setupConnections() | ||
192 | { | ||
193 | connect( serversList, SIGNAL(activated( int )), this, SLOT(serverSelected( int ))); | ||
194 | connect( apply, SIGNAL(released()), this, SLOT(applyChanges()) ); | ||
195 | connect( download, SIGNAL(released()), this, SLOT(downloadPackage()) ); | ||
196 | connect( upgrade, SIGNAL( released()), this, SLOT(upgradePackages()) ); | ||
197 | connect( update, SIGNAL(released()), this, SLOT(updateServer()) ); | ||
198 | } | 180 | } |
199 | 181 | ||
@@ -341,20 +323,18 @@ void NetworkPackageManager :: serverSelected( int, bool raiseProgress ) | |||
341 | if ( serverName == LOCAL_SERVER ) | 323 | if ( serverName == LOCAL_SERVER ) |
342 | { | 324 | { |
343 | upgrade->setEnabled( false ); | 325 | downloadEnabled = TRUE; |
344 | download->setText( tr( "Download" ) ); | 326 | emit appEnableUpgrade( FALSE ); |
345 | download->setEnabled( true ); | ||
346 | } | 327 | } |
347 | else if ( serverName == LOCAL_IPKGS ) | 328 | else if ( serverName == LOCAL_IPKGS ) |
348 | { | 329 | { |
349 | upgrade->setEnabled( false ); | 330 | downloadEnabled = FALSE; |
350 | download->setEnabled( true ); | 331 | emit appEnableUpgrade( FALSE ); |
351 | download->setText( tr( "Remove" ) ); | ||
352 | } | 332 | } |
353 | else | 333 | else |
354 | { | 334 | { |
355 | upgrade->setEnabled( true ); | 335 | downloadEnabled = TRUE; |
356 | download->setEnabled( true ); | 336 | emit appEnableUpgrade( TRUE ); |
357 | download->setText( tr( "Download" ) ); | ||
358 | } | 337 | } |
338 | emit appEnableDownload( downloadEnabled ); | ||
359 | 339 | ||
360 | // Display this widget once everything is done | 340 | // Display this widget once everything is done |
@@ -422,5 +402,5 @@ void NetworkPackageManager :: downloadPackage() | |||
422 | { | 402 | { |
423 | bool doUpdate = true; | 403 | bool doUpdate = true; |
424 | if ( download->text() == tr( "Download" ) ) | 404 | if ( downloadEnabled ) |
425 | { | 405 | { |
426 | // See if any packages are selected | 406 | // See if any packages are selected |
@@ -446,5 +426,5 @@ void NetworkPackageManager :: downloadPackage() | |||
446 | 426 | ||
447 | } | 427 | } |
448 | else if ( download->text() == tr( "Remove" ) ) | 428 | else |
449 | { | 429 | { |
450 | doUpdate = false; | 430 | doUpdate = false; |
diff --git a/noncore/settings/aqpkg/networkpkgmgr.h b/noncore/settings/aqpkg/networkpkgmgr.h index 6b552ee..efef898 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.h +++ b/noncore/settings/aqpkg/networkpkgmgr.h | |||
@@ -54,8 +54,4 @@ private: | |||
54 | QComboBox *serversList; | 54 | QComboBox *serversList; |
55 | QListView *packagesList; | 55 | QListView *packagesList; |
56 | QPushButton *update; | ||
57 | QPushButton *upgrade; | ||
58 | QPushButton *download; | ||
59 | QPushButton *apply; | ||
60 | 56 | ||
61 | QString currentlySelectedServer; | 57 | QString currentlySelectedServer; |
@@ -69,6 +65,7 @@ private: | |||
69 | bool showUpgradedPkgs; | 65 | bool showUpgradedPkgs; |
70 | 66 | ||
67 | bool downloadEnabled; | ||
68 | |||
71 | void initGui(); | 69 | void initGui(); |
72 | void setupConnections(); | ||
73 | void showProgressDialog( char *initialText ); | 70 | void showProgressDialog( char *initialText ); |
74 | void downloadSelectedPackages(); | 71 | void downloadSelectedPackages(); |
@@ -82,4 +79,6 @@ signals: | |||
82 | void appRaiseMainWidget(); | 79 | void appRaiseMainWidget(); |
83 | void appRaiseProgressWidget(); | 80 | void appRaiseProgressWidget(); |
81 | void appEnableUpgrade( bool ); | ||
82 | void appEnableDownload( bool ); | ||
84 | void progressSetSteps( int ); | 83 | void progressSetSteps( int ); |
85 | void progressSetMessage( const QString & ); | 84 | void progressSetMessage( const QString & ); |