Diffstat (limited to 'noncore/settings/aqpkg/mainwin.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp index 42093cf..dbe694e 100644 --- a/noncore/settings/aqpkg/mainwin.cpp +++ b/noncore/settings/aqpkg/mainwin.cpp | |||
@@ -57,27 +57,33 @@ | |||
57 | #include "global.h" | 57 | #include "global.h" |
58 | #include "inputdlg.h" | 58 | #include "inputdlg.h" |
59 | #include "ipkg.h" | 59 | #include "ipkg.h" |
60 | #include "installdlgimpl.h" | 60 | #include "installdlgimpl.h" |
61 | #include "letterpushbutton.h" | 61 | #include "letterpushbutton.h" |
62 | #include "mainwin.h" | 62 | #include "mainwin.h" |
63 | #include "packagewin.h" | 63 | #include "packagewin.h" |
64 | #include "settingsimpl.h" | 64 | #include "settingsimpl.h" |
65 | #include "utils.h" | 65 | #include "utils.h" |
66 | 66 | ||
67 | extern int compareVersions( const char *v1, const char *v2 ); | 67 | extern int compareVersions( const char *v1, const char *v2 ); |
68 | 68 | ||
69 | MainWindow :: MainWindow() | 69 | MainWindow :: MainWindow( QWidget* parent, const char* name, WFlags fl ) |
70 | :QMainWindow( 0x0, 0x0, WStyle_ContextHelp ) | 70 | :QMainWindow( parent, name, fl || WStyle_ContextHelp ) |
71 | { | 71 | { |
72 | // Disable suspend mode | ||
73 | QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::DisableSuspend; | ||
74 | |||
75 | LOCAL_SERVER = QObject::tr( "Installed packages" ); | ||
76 | LOCAL_IPKGS = QObject::tr( "Local packages" ); | ||
77 | |||
72 | setCaption( tr( "AQPkg - Package Manager" ) ); | 78 | setCaption( tr( "AQPkg - Package Manager" ) ); |
73 | 79 | ||
74 | // Create UI widgets | 80 | // Create UI widgets |
75 | initMainWidget(); | 81 | initMainWidget(); |
76 | initProgressWidget(); | 82 | initProgressWidget(); |
77 | 83 | ||
78 | // Build menu and tool bars | 84 | // Build menu and tool bars |
79 | setToolBarsMovable( FALSE ); | 85 | setToolBarsMovable( FALSE ); |
80 | 86 | ||
81 | QToolBar *bar = new QToolBar( this ); | 87 | QToolBar *bar = new QToolBar( this ); |
82 | bar->setHorizontalStretchable( TRUE ); | 88 | bar->setHorizontalStretchable( TRUE ); |
83 | QMenuBar *mb = new QMenuBar( bar ); | 89 | QMenuBar *mb = new QMenuBar( bar ); |
@@ -225,24 +231,27 @@ MainWindow :: MainWindow() | |||
225 | stack->addWidget( progressWindow, 2 ); | 231 | stack->addWidget( progressWindow, 2 ); |
226 | stack->addWidget( networkPkgWindow, 1 ); | 232 | stack->addWidget( networkPkgWindow, 1 ); |
227 | setCentralWidget( stack ); | 233 | setCentralWidget( stack ); |
228 | stack->raiseWidget( progressWindow ); | 234 | stack->raiseWidget( progressWindow ); |
229 | 235 | ||
230 | // Delayed call to finish initialization | 236 | // Delayed call to finish initialization |
231 | QTimer::singleShot( 100, this, SLOT( init() ) ); | 237 | QTimer::singleShot( 100, this, SLOT( init() ) ); |
232 | } | 238 | } |
233 | 239 | ||
234 | MainWindow :: ~MainWindow() | 240 | MainWindow :: ~MainWindow() |
235 | { | 241 | { |
236 | delete mgr; | 242 | delete mgr; |
243 | |||
244 | // Reenable suspend mode | ||
245 | QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; | ||
237 | } | 246 | } |
238 | 247 | ||
239 | void MainWindow :: initMainWidget() | 248 | void MainWindow :: initMainWidget() |
240 | { | 249 | { |
241 | networkPkgWindow = new QWidget( this ); | 250 | networkPkgWindow = new QWidget( this ); |
242 | 251 | ||
243 | QLabel *l = new QLabel( tr( "Servers:" ), networkPkgWindow ); | 252 | QLabel *l = new QLabel( tr( "Servers:" ), networkPkgWindow ); |
244 | 253 | ||
245 | serversList = new QComboBox( networkPkgWindow ); | 254 | serversList = new QComboBox( networkPkgWindow ); |
246 | connect( serversList, SIGNAL(activated(int)), this, SLOT(serverSelected(int)) ); | 255 | connect( serversList, SIGNAL(activated(int)), this, SLOT(serverSelected(int)) ); |
247 | QWhatsThis::add( serversList, tr( "Click here to select a package feed." ) ); | 256 | QWhatsThis::add( serversList, tr( "Click here to select a package feed." ) ); |
248 | 257 | ||
@@ -1003,25 +1012,24 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) | |||
1003 | QString dest = "root"; | 1012 | QString dest = "root"; |
1004 | if ( !p->isInstalled() ) | 1013 | if ( !p->isInstalled() ) |
1005 | { | 1014 | { |
1006 | InstallData *newitem = new InstallData(); | 1015 | InstallData *newitem = new InstallData(); |
1007 | newitem->option = "I"; | 1016 | newitem->option = "I"; |
1008 | newitem->packageName = name; | 1017 | newitem->packageName = name; |
1009 | return newitem; | 1018 | return newitem; |
1010 | } | 1019 | } |
1011 | else | 1020 | else |
1012 | { | 1021 | { |
1013 | InstallData *newitem = new InstallData(); | 1022 | InstallData *newitem = new InstallData(); |
1014 | newitem->option = "D"; | 1023 | newitem->option = "D"; |
1015 | |||
1016 | // If local file, remove using package name, not filename | 1024 | // If local file, remove using package name, not filename |
1017 | if ( p->isPackageStoredLocally() ) | 1025 | if ( p->isPackageStoredLocally() ) |
1018 | name = item->text(); | 1026 | name = item->text(); |
1019 | 1027 | ||
1020 | if ( !p->isPackageStoredLocally() ) | 1028 | if ( !p->isPackageStoredLocally() ) |
1021 | newitem->packageName = p->getInstalledPackageName(); | 1029 | newitem->packageName = p->getInstalledPackageName(); |
1022 | else | 1030 | else |
1023 | newitem->packageName = name; | 1031 | newitem->packageName = name; |
1024 | 1032 | ||
1025 | if ( p->getInstalledTo() ) | 1033 | if ( p->getInstalledTo() ) |
1026 | { | 1034 | { |
1027 | newitem->destination = p->getInstalledTo(); | 1035 | newitem->destination = p->getInstalledTo(); |
@@ -1037,25 +1045,24 @@ InstallData *MainWindow :: dealWithItem( QCheckListItem *item ) | |||
1037 | // If the version requested is older and user selected a local ipk file, then reinstall the file | 1045 | // If the version requested is older and user selected a local ipk file, then reinstall the file |
1038 | if ( p->isPackageStoredLocally() && val == -1 ) | 1046 | if ( p->isPackageStoredLocally() && val == -1 ) |
1039 | val = 0; | 1047 | val = 0; |
1040 | 1048 | ||
1041 | if ( val == -2 ) | 1049 | if ( val == -2 ) |
1042 | { | 1050 | { |
1043 | // Error - should handle | 1051 | // Error - should handle |
1044 | } | 1052 | } |
1045 | else if ( val == -1 ) | 1053 | else if ( val == -1 ) |
1046 | { | 1054 | { |
1047 | // Version available is older - remove only | 1055 | // Version available is older - remove only |
1048 | newitem->option = "D"; | 1056 | newitem->option = "D"; |
1049 | |||
1050 | // If local file, remove using package name, not filename | 1057 | // If local file, remove using package name, not filename |
1051 | if ( p->isPackageStoredLocally() ) | 1058 | if ( p->isPackageStoredLocally() ) |
1052 | name = item->text(); | 1059 | name = item->text(); |
1053 | } | 1060 | } |
1054 | else | 1061 | else |
1055 | { | 1062 | { |
1056 | QString caption; | 1063 | QString caption; |
1057 | QString text; | 1064 | QString text; |
1058 | QString secondButton; | 1065 | QString secondButton; |
1059 | QString secondOption; | 1066 | QString secondOption; |
1060 | if ( val == 0 ) | 1067 | if ( val == 0 ) |
1061 | { | 1068 | { |