-rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 9 | ||||
-rw-r--r-- | noncore/settings/aqpkg/mainwin.h | 1 | ||||
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 31 | ||||
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.h | 1 |
4 files changed, 40 insertions, 2 deletions
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp index 206d11c..9f19dfa 100644 --- a/noncore/settings/aqpkg/mainwin.cpp +++ b/noncore/settings/aqpkg/mainwin.cpp | |||
@@ -15,24 +15,25 @@ | |||
15 | * * | 15 | * * |
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | 17 | ||
18 | #include <qmenubar.h> | 18 | #include <qmenubar.h> |
19 | #include <qpopupmenu.h> | 19 | #include <qpopupmenu.h> |
20 | #include <qmessagebox.h> | 20 | #include <qmessagebox.h> |
21 | 21 | ||
22 | #include "mainwin.h" | 22 | #include "mainwin.h" |
23 | #include "datamgr.h" | 23 | #include "datamgr.h" |
24 | #include "networkpkgmgr.h" | 24 | #include "networkpkgmgr.h" |
25 | #include "settingsimpl.h" | 25 | #include "settingsimpl.h" |
26 | #include "helpwindow.h" | 26 | #include "helpwindow.h" |
27 | #include "utils.h" | ||
27 | #include "global.h" | 28 | #include "global.h" |
28 | 29 | ||
29 | MainWindow :: MainWindow( QWidget *p, char *name ) | 30 | MainWindow :: MainWindow( QWidget *p, char *name ) |
30 | :QMainWindow( p, name ) | 31 | :QMainWindow( p, name ) |
31 | { | 32 | { |
32 | #ifdef QWS | 33 | #ifdef QWS |
33 | showMaximized(); | 34 | showMaximized(); |
34 | #endif | 35 | #endif |
35 | 36 | ||
36 | setCaption( "AQPkg - Package Manager" ); | 37 | setCaption( "AQPkg - Package Manager" ); |
37 | 38 | ||
38 | // Create our menu | 39 | // Create our menu |
@@ -56,24 +57,32 @@ MainWindow :: MainWindow( QWidget *p, char *name ) | |||
56 | networkPkgWindow = new NetworkPackageManager( mgr, stack ); | 57 | networkPkgWindow = new NetworkPackageManager( mgr, stack ); |
57 | stack->addWidget( networkPkgWindow, 1 ); | 58 | stack->addWidget( networkPkgWindow, 1 ); |
58 | 59 | ||
59 | setCentralWidget( stack ); | 60 | setCentralWidget( stack ); |
60 | stack->raiseWidget( networkPkgWindow ); | 61 | stack->raiseWidget( networkPkgWindow ); |
61 | } | 62 | } |
62 | 63 | ||
63 | MainWindow :: ~MainWindow() | 64 | MainWindow :: ~MainWindow() |
64 | { | 65 | { |
65 | delete networkPkgWindow; | 66 | delete networkPkgWindow; |
66 | } | 67 | } |
67 | 68 | ||
69 | void MainWindow :: setDocument( const QString &doc ) | ||
70 | { | ||
71 | // Remove path from package | ||
72 | QString package = Utils::getPackageNameFromIpkFilename( doc ); | ||
73 | cout << "Selecting package " << package << endl; | ||
74 | networkPkgWindow->selectLocalPackage( package ); | ||
75 | } | ||
76 | |||
68 | void MainWindow :: displaySettings() | 77 | void MainWindow :: displaySettings() |
69 | { | 78 | { |
70 | SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true ); | 79 | SettingsImpl *dlg = new SettingsImpl( mgr, this, "Settings", true ); |
71 | if ( dlg->showDlg( 0 ) ) | 80 | if ( dlg->showDlg( 0 ) ) |
72 | networkPkgWindow->updateData(); | 81 | networkPkgWindow->updateData(); |
73 | delete dlg; | 82 | delete dlg; |
74 | } | 83 | } |
75 | 84 | ||
76 | void MainWindow :: displayHelp() | 85 | void MainWindow :: displayHelp() |
77 | { | 86 | { |
78 | HelpWindow *dlg = new HelpWindow( this ); | 87 | HelpWindow *dlg = new HelpWindow( this ); |
79 | dlg->exec(); | 88 | dlg->exec(); |
diff --git a/noncore/settings/aqpkg/mainwin.h b/noncore/settings/aqpkg/mainwin.h index 2a182fc..a9e290c 100644 --- a/noncore/settings/aqpkg/mainwin.h +++ b/noncore/settings/aqpkg/mainwin.h | |||
@@ -31,17 +31,18 @@ class MainWindow :public QMainWindow | |||
31 | public: | 31 | public: |
32 | 32 | ||
33 | MainWindow( QWidget *p = 0, char *name = 0 ); | 33 | MainWindow( QWidget *p = 0, char *name = 0 ); |
34 | ~MainWindow(); | 34 | ~MainWindow(); |
35 | 35 | ||
36 | private: | 36 | private: |
37 | DataManager *mgr; | 37 | DataManager *mgr; |
38 | 38 | ||
39 | QWidgetStack *stack; | 39 | QWidgetStack *stack; |
40 | NetworkPackageManager *networkPkgWindow; | 40 | NetworkPackageManager *networkPkgWindow; |
41 | 41 | ||
42 | public slots: | 42 | public slots: |
43 | void setDocument( const QString &doc ); | ||
43 | void displayHelp(); | 44 | void displayHelp(); |
44 | void displayAbout(); | 45 | void displayAbout(); |
45 | void displaySettings(); | 46 | void displaySettings(); |
46 | }; | 47 | }; |
47 | #endif | 48 | #endif |
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp index 6874ded..a374266 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.cpp +++ b/noncore/settings/aqpkg/networkpkgmgr.cpp | |||
@@ -51,26 +51,27 @@ NetworkPackageManager::NetworkPackageManager( DataManager *dataManager, QWidget | |||
51 | #ifdef QWS | 51 | #ifdef QWS |
52 | // read download directory from config file | 52 | // read download directory from config file |
53 | Config cfg( "aqpkg" ); | 53 | Config cfg( "aqpkg" ); |
54 | cfg.setGroup( "settings" ); | 54 | cfg.setGroup( "settings" ); |
55 | currentlySelectedServer = cfg.readEntry( "selectedServer", "local" ); | 55 | currentlySelectedServer = cfg.readEntry( "selectedServer", "local" ); |
56 | showJumpTo = cfg.readBoolEntry( "showJumpTo", "true" ); | 56 | showJumpTo = cfg.readBoolEntry( "showJumpTo", "true" ); |
57 | #endif | 57 | #endif |
58 | 58 | ||
59 | 59 | ||
60 | initGui(); | 60 | initGui(); |
61 | setupConnections(); | 61 | setupConnections(); |
62 | 62 | ||
63 | progressDlg = 0; | 63 | updateData(); |
64 | timerId = startTimer( 100 ); | 64 | // progressDlg = 0; |
65 | // timerId = startTimer( 100 ); | ||
65 | } | 66 | } |
66 | 67 | ||
67 | NetworkPackageManager::~NetworkPackageManager() | 68 | NetworkPackageManager::~NetworkPackageManager() |
68 | { | 69 | { |
69 | } | 70 | } |
70 | 71 | ||
71 | void NetworkPackageManager :: timerEvent ( QTimerEvent * ) | 72 | void NetworkPackageManager :: timerEvent ( QTimerEvent * ) |
72 | { | 73 | { |
73 | killTimer( timerId ); | 74 | killTimer( timerId ); |
74 | 75 | ||
75 | // showProgressDialog(); | 76 | // showProgressDialog(); |
76 | // Add server names to listbox | 77 | // Add server names to listbox |
@@ -97,24 +98,50 @@ void NetworkPackageManager :: updateData() | |||
97 | } | 98 | } |
98 | serversList->insertItem( it->getServerName() ); | 99 | serversList->insertItem( it->getServerName() ); |
99 | if ( it->getServerName() == currentlySelectedServer ) | 100 | if ( it->getServerName() == currentlySelectedServer ) |
100 | activeItem = i; | 101 | activeItem = i; |
101 | } | 102 | } |
102 | 103 | ||
103 | // set selected server to be active server | 104 | // set selected server to be active server |
104 | if ( activeItem != -1 ) | 105 | if ( activeItem != -1 ) |
105 | serversList->setCurrentItem( activeItem ); | 106 | serversList->setCurrentItem( activeItem ); |
106 | serverSelected( 0 ); | 107 | serverSelected( 0 ); |
107 | } | 108 | } |
108 | 109 | ||
110 | void NetworkPackageManager :: selectLocalPackage( const QString &pkg ) | ||
111 | { | ||
112 | // First select local server | ||
113 | for ( int i = 0 ; i < serversList->count() ; ++i ) | ||
114 | { | ||
115 | if ( serversList->text( i ) == LOCAL_IPKGS ) | ||
116 | { | ||
117 | serversList->setCurrentItem( i ); | ||
118 | break; | ||
119 | } | ||
120 | } | ||
121 | serverSelected( 0 ); | ||
122 | |||
123 | // Now set the check box of the selected package | ||
124 | for ( QCheckListItem *item = (QCheckListItem *)packagesList->firstChild(); | ||
125 | item != 0 ; | ||
126 | item = (QCheckListItem *)item->nextSibling() ) | ||
127 | { | ||
128 | if ( item->text().startsWith( pkg ) ) | ||
129 | { | ||
130 | item->setOn( true ); | ||
131 | break; | ||
132 | } | ||
133 | } | ||
134 | } | ||
135 | |||
109 | 136 | ||
110 | void NetworkPackageManager :: initGui() | 137 | void NetworkPackageManager :: initGui() |
111 | { | 138 | { |
112 | QLabel *l = new QLabel( "Servers", this ); | 139 | QLabel *l = new QLabel( "Servers", this ); |
113 | serversList = new QComboBox( this ); | 140 | serversList = new QComboBox( this ); |
114 | packagesList = new QListView( this ); | 141 | packagesList = new QListView( this ); |
115 | update = new QPushButton( "Refresh List", this ); | 142 | update = new QPushButton( "Refresh List", this ); |
116 | download = new QPushButton( "Download", this ); | 143 | download = new QPushButton( "Download", this ); |
117 | upgrade = new QPushButton( "Upgrade", this ); | 144 | upgrade = new QPushButton( "Upgrade", this ); |
118 | apply = new QPushButton( "Apply", this ); | 145 | apply = new QPushButton( "Apply", this ); |
119 | 146 | ||
120 | QVBoxLayout *vbox = new QVBoxLayout( this, 0, -1, "VBox" ); | 147 | QVBoxLayout *vbox = new QVBoxLayout( this, 0, -1, "VBox" ); |
diff --git a/noncore/settings/aqpkg/networkpkgmgr.h b/noncore/settings/aqpkg/networkpkgmgr.h index fba8155..3c437b4 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.h +++ b/noncore/settings/aqpkg/networkpkgmgr.h | |||
@@ -29,24 +29,25 @@ | |||
29 | class InstallData; | 29 | class InstallData; |
30 | 30 | ||
31 | /** NetworkPackageManager is the base class of the project */ | 31 | /** NetworkPackageManager is the base class of the project */ |
32 | class NetworkPackageManager : public QWidget | 32 | class NetworkPackageManager : public QWidget |
33 | { | 33 | { |
34 | Q_OBJECT | 34 | Q_OBJECT |
35 | public: | 35 | public: |
36 | /** construtor */ | 36 | /** construtor */ |
37 | NetworkPackageManager( DataManager *dataManager, QWidget* parent=0, const char *name=0); | 37 | NetworkPackageManager( DataManager *dataManager, QWidget* parent=0, const char *name=0); |
38 | /** destructor */ | 38 | /** destructor */ |
39 | ~NetworkPackageManager(); | 39 | ~NetworkPackageManager(); |
40 | 40 | ||
41 | void selectLocalPackage( const QString &pkg ); | ||
41 | void updateData(); | 42 | void updateData(); |
42 | 43 | ||
43 | private: | 44 | private: |
44 | DataManager *dataMgr; | 45 | DataManager *dataMgr; |
45 | 46 | ||
46 | QComboBox *serversList; | 47 | QComboBox *serversList; |
47 | QListView *packagesList; | 48 | QListView *packagesList; |
48 | QPushButton *update; | 49 | QPushButton *update; |
49 | QPushButton *upgrade; | 50 | QPushButton *upgrade; |
50 | QPushButton *download; | 51 | QPushButton *download; |
51 | QPushButton *apply; | 52 | QPushButton *apply; |
52 | 53 | ||