summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/installdlgimpl.cpp55
-rw-r--r--noncore/settings/aqpkg/instoptions.ui218
-rw-r--r--noncore/settings/aqpkg/instoptionsimpl.cpp21
-rw-r--r--noncore/settings/aqpkg/instoptionsimpl.h1
4 files changed, 163 insertions, 132 deletions
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index db9a259..485fe3d 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -18,4 +18,5 @@
18#ifdef QWS 18#ifdef QWS
19#include <qpe/config.h> 19#include <qpe/config.h>
20#include <qpe/qpeapplication.h>
20#endif 21#endif
21 22
@@ -92,13 +93,13 @@ InstallDlgImpl::InstallDlgImpl( vector<InstallData> &packageList, DataManager *d
92 else if ( item.option == "U" || item.option == "R" ) 93 else if ( item.option == "U" || item.option == "R" )
93 { 94 {
94 updateList.push_back( item ); 95 updateList.push_back( item );
95 QString type = " (Upgrade)"; 96 QString type = " (Upgrade)";
96 if ( item.option == "R" ) 97 if ( item.option == "R" )
97 type = " (ReInstall)"; 98 type = " (ReInstall)";
98 upgrade += " " + item.packageName + type + "\n"; 99 upgrade += " " + item.packageName + type + "\n";
99 } 100 }
100 } 101 }
101 102
102 output->setText( remove + install + upgrade ); 103 output->setText( remove + install + upgrade );
103} 104}
104 105
@@ -117,25 +118,17 @@ InstallDlgImpl::~InstallDlgImpl()
117bool InstallDlgImpl :: showDlg() 118bool InstallDlgImpl :: showDlg()
118{ 119{
119 showMaximized(); 120 showMaximized();
120 bool ret = exec(); 121 bool ret = exec();
121 122
122 return ret; 123 return ret;
123} 124}
124 125
125void InstallDlgImpl :: optionsSelected() 126void InstallDlgImpl :: optionsSelected()
126{ 127{
127 InstallOptionsDlgImpl opt( flags, this, "Option", true ); 128 InstallOptionsDlgImpl opt( flags, this, "Option", true );
128 opt.exec(); 129 opt.exec();
129 130
130 // set options selected from dialog 131 // set options selected from dialog
131 flags = 0; 132 flags = opt.getFlags();
132 if ( opt.forceDepends->isChecked() )
133 flags |= FORCE_DEPENDS;
134 if ( opt.forceReinstall->isChecked() )
135 flags |= FORCE_REINSTALL;
136 if ( opt.forceRemove->isChecked() )
137 flags |= FORCE_REMOVE;
138 if ( opt.forceOverwrite->isChecked() )
139 flags |= FORCE_OVERWRITE;
140 133
141#ifdef QWS 134#ifdef QWS
@@ -148,11 +141,14 @@ void InstallDlgImpl :: optionsSelected()
148void InstallDlgImpl :: installSelected() 141void InstallDlgImpl :: installSelected()
149{ 142{
150 if ( btnInstall->text() == "Close" ) 143
151 { 144 if ( btnInstall->text() == "Close" )
152 done( 1 ); 145 {
153 return; 146 done( 1 );
154 } 147 return;
148 }
155 149
156 btnInstall->setEnabled( false ); 150 // Disable buttons
151 btnOptions->setEnabled( false );
152 btnInstall->setEnabled( false );
157 153
158 if ( pIpkg ) 154 if ( pIpkg )
@@ -184,5 +180,5 @@ void InstallDlgImpl :: installSelected()
184 180
185 // First run through the remove list, then the install list then the upgrade list 181 // First run through the remove list, then the install list then the upgrade list
186 vector<InstallData>::iterator it; 182 vector<InstallData>::iterator it;
187 pIpkg->setOption( "remove" ); 183 pIpkg->setOption( "remove" );
188 for ( it = removeList.begin() ; it != removeList.end() ; ++it ) 184 for ( it = removeList.begin() ; it != removeList.end() ; ++it )
@@ -231,5 +227,6 @@ void InstallDlgImpl :: installSelected()
231 } 227 }
232 228
233 btnInstall->setEnabled( true ); 229 btnOptions->setEnabled( true );
230 btnInstall->setEnabled( true );
234 btnInstall->setText( tr( "Close" ) ); 231 btnInstall->setText( tr( "Close" ) );
235} 232}
diff --git a/noncore/settings/aqpkg/instoptions.ui b/noncore/settings/aqpkg/instoptions.ui
index 52897dd..00eab1e 100644
--- a/noncore/settings/aqpkg/instoptions.ui
+++ b/noncore/settings/aqpkg/instoptions.ui
@@ -12,6 +12,6 @@
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>154</width> 14 <width>283</width>
15 <height>205</height> 15 <height>274</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
@@ -24,124 +24,136 @@
24 <bool>false</bool> 24 <bool>false</bool>
25 </property> 25 </property>
26 <widget> 26 <vbox>
27 <class>QGroupBox</class>
28 <property stdset="1"> 27 <property stdset="1">
29 <name>name</name> 28 <name>margin</name>
30 <cstring>GroupBox1</cstring> 29 <number>11</number>
31 </property> 30 </property>
32 <property stdset="1"> 31 <property stdset="1">
33 <name>geometry</name> 32 <name>spacing</name>
34 <rect> 33 <number>6</number>
35 <x>11</x>
36 <y>11</y>
37 <width>136</width>
38 <height>120</height>
39 </rect>
40 </property>
41 <property stdset="1">
42 <name>title</name>
43 <string>Options</string>
44 </property> 34 </property>
45 <widget> 35 <widget>
46 <class>QCheckBox</class> 36 <class>QGroupBox</class>
47 <property stdset="1"> 37 <property stdset="1">
48 <name>name</name> 38 <name>name</name>
49 <cstring>forceDepends</cstring> 39 <cstring>GroupBox1</cstring>
50 </property> 40 </property>
51 <property stdset="1"> 41 <property stdset="1">
52 <name>geometry</name> 42 <name>title</name>
53 <rect> 43 <string>Options</string>
54 <x>11</x>
55 <y>19</y>
56 <width>114</width>
57 <height>19</height>
58 </rect>
59 </property>
60 <property stdset="1">
61 <name>text</name>
62 <string>Force Depends</string>
63 </property> 44 </property>
45 <widget>
46 <class>QCheckBox</class>
47 <property stdset="1">
48 <name>name</name>
49 <cstring>forceDepends</cstring>
50 </property>
51 <property stdset="1">
52 <name>geometry</name>
53 <rect>
54 <x>12</x>
55 <y>20</y>
56 <width>110</width>
57 <height>19</height>
58 </rect>
59 </property>
60 <property stdset="1">
61 <name>text</name>
62 <string>Force Depends</string>
63 </property>
64 </widget>
65 <widget>
66 <class>QCheckBox</class>
67 <property stdset="1">
68 <name>name</name>
69 <cstring>forceReinstall</cstring>
70 </property>
71 <property stdset="1">
72 <name>geometry</name>
73 <rect>
74 <x>12</x>
75 <y>45</y>
76 <width>107</width>
77 <height>19</height>
78 </rect>
79 </property>
80 <property stdset="1">
81 <name>text</name>
82 <string>Force Reinstall</string>
83 </property>
84 </widget>
85 <widget>
86 <class>QCheckBox</class>
87 <property stdset="1">
88 <name>name</name>
89 <cstring>forceRemove</cstring>
90 </property>
91 <property stdset="1">
92 <name>geometry</name>
93 <rect>
94 <x>12</x>
95 <y>70</y>
96 <width>105</width>
97 <height>19</height>
98 </rect>
99 </property>
100 <property stdset="1">
101 <name>text</name>
102 <string>Force Remove</string>
103 </property>
104 </widget>
105 <widget>
106 <class>QCheckBox</class>
107 <property stdset="1">
108 <name>name</name>
109 <cstring>forceOverwrite</cstring>
110 </property>
111 <property stdset="1">
112 <name>geometry</name>
113 <rect>
114 <x>12</x>
115 <y>95</y>
116 <width>114</width>
117 <height>19</height>
118 </rect>
119 </property>
120 <property stdset="1">
121 <name>text</name>
122 <string>Force Overwrite</string>
123 </property>
124 </widget>
125 <widget>
126 <class>QCheckBox</class>
127 <property stdset="1">
128 <name>name</name>
129 <cstring>verboseWget</cstring>
130 </property>
131 <property stdset="1">
132 <name>geometry</name>
133 <rect>
134 <x>12</x>
135 <y>120</y>
136 <width>104</width>
137 <height>19</height>
138 </rect>
139 </property>
140 <property stdset="1">
141 <name>text</name>
142 <string>Verbose WGet</string>
143 </property>
144 </widget>
64 </widget> 145 </widget>
65 <widget> 146 <widget>
66 <class>QCheckBox</class> 147 <class>QPushButton</class>
67 <property stdset="1"> 148 <property stdset="1">
68 <name>name</name> 149 <name>name</name>
69 <cstring>forceReinstall</cstring> 150 <cstring>btnOK</cstring>
70 </property>
71 <property stdset="1">
72 <name>geometry</name>
73 <rect>
74 <x>11</x>
75 <y>44</y>
76 <width>114</width>
77 <height>19</height>
78 </rect>
79 </property>
80 <property stdset="1">
81 <name>text</name>
82 <string>Force Reinstall</string>
83 </property>
84 </widget>
85 <widget>
86 <class>QCheckBox</class>
87 <property stdset="1">
88 <name>name</name>
89 <cstring>forceOverwrite</cstring>
90 </property>
91 <property stdset="1">
92 <name>geometry</name>
93 <rect>
94 <x>11</x>
95 <y>94</y>
96 <width>114</width>
97 <height>19</height>
98 </rect>
99 </property> 151 </property>
100 <property stdset="1"> 152 <property stdset="1">
101 <name>text</name> 153 <name>text</name>
102 <string>Force Overwrite</string> 154 <string>OK</string>
103 </property> 155 </property>
104 </widget> 156 </widget>
105 <widget> 157 </vbox>
106 <class>QCheckBox</class>
107 <property stdset="1">
108 <name>name</name>
109 <cstring>forceRemove</cstring>
110 </property>
111 <property stdset="1">
112 <name>geometry</name>
113 <rect>
114 <x>11</x>
115 <y>69</y>
116 <width>114</width>
117 <height>19</height>
118 </rect>
119 </property>
120 <property stdset="1">
121 <name>text</name>
122 <string>Force Remove</string>
123 </property>
124 </widget>
125 </widget>
126 <widget>
127 <class>QPushButton</class>
128 <property stdset="1">
129 <name>name</name>
130 <cstring>btnOK</cstring>
131 </property>
132 <property stdset="1">
133 <name>geometry</name>
134 <rect>
135 <x>11</x>
136 <y>166</y>
137 <width>136</width>
138 <height>28</height>
139 </rect>
140 </property>
141 <property stdset="1">
142 <name>text</name>
143 <string>OK</string>
144 </property>
145 </widget>
146</widget> 158</widget>
147<connections> 159<connections>
diff --git a/noncore/settings/aqpkg/instoptionsimpl.cpp b/noncore/settings/aqpkg/instoptionsimpl.cpp
index dd996e0..3a37eec 100644
--- a/noncore/settings/aqpkg/instoptionsimpl.cpp
+++ b/noncore/settings/aqpkg/instoptionsimpl.cpp
@@ -38,4 +38,6 @@ InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, QWidget * parent, const
38 if ( flags & FORCE_OVERWRITE ) 38 if ( flags & FORCE_OVERWRITE )
39 forceOverwrite->setChecked( true ); 39 forceOverwrite->setChecked( true );
40 if ( flags & VERBOSE_WGET )
41 verboseWget->setChecked( true );
40// if ( flags & MAKE_LINKS ) 42// if ( flags & MAKE_LINKS )
41 // makeLinks->setChecked( true ); 43 // makeLinks->setChecked( true );
@@ -48,2 +50,21 @@ InstallOptionsDlgImpl::~InstallOptionsDlgImpl()
48{ 50{
49} 51}
52
53
54int InstallOptionsDlgImpl :: getFlags()
55{
56 int flags = 0;
57
58 if ( forceDepends->isChecked() )
59 flags |= FORCE_DEPENDS;
60 if ( forceReinstall->isChecked() )
61 flags |= FORCE_REINSTALL;
62 if ( forceRemove->isChecked() )
63 flags |= FORCE_REMOVE;
64 if ( forceOverwrite->isChecked() )
65 flags |= FORCE_OVERWRITE;
66 if ( verboseWget->isChecked() )
67 flags |= VERBOSE_WGET;
68
69 return flags;
70} \ No newline at end of file
diff --git a/noncore/settings/aqpkg/instoptionsimpl.h b/noncore/settings/aqpkg/instoptionsimpl.h
index 08ec616..893f9bb 100644
--- a/noncore/settings/aqpkg/instoptionsimpl.h
+++ b/noncore/settings/aqpkg/instoptionsimpl.h
@@ -25,4 +25,5 @@ public:
25 InstallOptionsDlgImpl( int flags, QWidget * parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); 25 InstallOptionsDlgImpl( int flags, QWidget * parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
26 ~InstallOptionsDlgImpl(); 26 ~InstallOptionsDlgImpl();
27 int getFlags();
27 28
28protected: 29protected: