summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/aqpkg/installdlgimpl.cpp15
-rw-r--r--noncore/settings/aqpkg/instoptions.ui78
-rw-r--r--noncore/settings/aqpkg/instoptionsimpl.cpp21
-rw-r--r--noncore/settings/aqpkg/instoptionsimpl.h1
4 files changed, 73 insertions, 42 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
@@ -8,24 +8,25 @@
8 8
9/*************************************************************************** 9/***************************************************************************
10 * * 10 * *
11 * This program is free software; you can redistribute it and/or modify * 11 * This program is free software; you can redistribute it and/or modify *
12 * it under the terms of the GNU General Public License as published by * 12 * it under the terms of the GNU General Public License as published by *
13 * the Free Software Foundation; either version 2 of the License, or * 13 * the Free Software Foundation; either version 2 of the License, or *
14 * (at your option) any later version. * 14 * (at your option) any later version. *
15 * * 15 * *
16 ***************************************************************************/ 16 ***************************************************************************/
17 17
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
22#include <qmultilineedit.h> 23#include <qmultilineedit.h>
23#include <qdialog.h> 24#include <qdialog.h>
24#include <qcombobox.h> 25#include <qcombobox.h>
25#include <qcheckbox.h> 26#include <qcheckbox.h>
26#include <qpushbutton.h> 27#include <qpushbutton.h>
27 28
28 29
29#include "datamgr.h" 30#include "datamgr.h"
30#include "instoptionsimpl.h" 31#include "instoptionsimpl.h"
31#include "destination.h" 32#include "destination.h"
@@ -119,49 +120,44 @@ bool InstallDlgImpl :: showDlg()
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
142 Config cfg( "aqpkg" ); 135 Config cfg( "aqpkg" );
143 cfg.setGroup( "settings" ); 136 cfg.setGroup( "settings" );
144 cfg.writeEntry( "installFlags", flags ); 137 cfg.writeEntry( "installFlags", flags );
145#endif 138#endif
146} 139}
147 140
148void InstallDlgImpl :: installSelected() 141void InstallDlgImpl :: installSelected()
149{ 142{
143
150 if ( btnInstall->text() == "Close" ) 144 if ( btnInstall->text() == "Close" )
151 { 145 {
152 done( 1 ); 146 done( 1 );
153 return; 147 return;
154 } 148 }
155 149
150 // Disable buttons
151 btnOptions->setEnabled( false );
156 btnInstall->setEnabled( false ); 152 btnInstall->setEnabled( false );
157 153
158 if ( pIpkg ) 154 if ( pIpkg )
159 { 155 {
160 output->setText( "" ); 156 output->setText( "" );
161 157
162 connect( pIpkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &))); 158 connect( pIpkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &)));
163 pIpkg->runIpkg(); 159 pIpkg->runIpkg();
164 } 160 }
165 else 161 else
166 { 162 {
167 output->setText( "" ); 163 output->setText( "" );
@@ -221,22 +217,23 @@ void InstallDlgImpl :: installSelected()
221 pIpkg->setPackage( it->packageName ); 217 pIpkg->setPackage( it->packageName );
222 218
223 int tmpFlags = flags; 219 int tmpFlags = flags;
224 if ( it->destination->linkToRoot() && it->recreateLinks ) 220 if ( it->destination->linkToRoot() && it->recreateLinks )
225 tmpFlags |= MAKE_LINKS; 221 tmpFlags |= MAKE_LINKS;
226 pIpkg->setFlags( tmpFlags ); 222 pIpkg->setFlags( tmpFlags );
227 pIpkg->runIpkg(); 223 pIpkg->runIpkg();
228 } 224 }
229 225
230 delete pIpkg; 226 delete pIpkg;
231 } 227 }
232 228
229 btnOptions->setEnabled( true );
233 btnInstall->setEnabled( true ); 230 btnInstall->setEnabled( true );
234 btnInstall->setText( tr( "Close" ) ); 231 btnInstall->setText( tr( "Close" ) );
235} 232}
236 233
237void InstallDlgImpl :: displayText(const QString &text ) 234void InstallDlgImpl :: displayText(const QString &text )
238{ 235{
239 QString t = output->text() + "\n" + text; 236 QString t = output->text() + "\n" + text;
240 output->setText( t ); 237 output->setText( t );
241 output->setCursorPosition( output->numLines(), 0 ); 238 output->setCursorPosition( output->numLines(), 0 );
242} 239}
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
@@ -2,154 +2,166 @@
2<class>InstallOptionsDlg</class> 2<class>InstallOptionsDlg</class>
3<widget> 3<widget>
4 <class>QDialog</class> 4 <class>QDialog</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>InstallOptionsDlg</cstring> 7 <cstring>InstallOptionsDlg</cstring>
8 </property> 8 </property>
9 <property stdset="1"> 9 <property stdset="1">
10 <name>geometry</name> 10 <name>geometry</name>
11 <rect> 11 <rect>
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>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Options</string> 20 <string>Options</string>
21 </property> 21 </property>
22 <property stdset="1"> 22 <property stdset="1">
23 <name>sizeGripEnabled</name> 23 <name>sizeGripEnabled</name>
24 <bool>false</bool> 24 <bool>false</bool>
25 </property> 25 </property>
26 <vbox>
27 <property stdset="1">
28 <name>margin</name>
29 <number>11</number>
30 </property>
31 <property stdset="1">
32 <name>spacing</name>
33 <number>6</number>
34 </property>
26 <widget> 35 <widget>
27 <class>QGroupBox</class> 36 <class>QGroupBox</class>
28 <property stdset="1"> 37 <property stdset="1">
29 <name>name</name> 38 <name>name</name>
30 <cstring>GroupBox1</cstring> 39 <cstring>GroupBox1</cstring>
31 </property> 40 </property>
32 <property stdset="1"> 41 <property stdset="1">
33 <name>geometry</name>
34 <rect>
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> 42 <name>title</name>
43 <string>Options</string> 43 <string>Options</string>
44 </property> 44 </property>
45 <widget> 45 <widget>
46 <class>QCheckBox</class> 46 <class>QCheckBox</class>
47 <property stdset="1"> 47 <property stdset="1">
48 <name>name</name> 48 <name>name</name>
49 <cstring>forceDepends</cstring> 49 <cstring>forceDepends</cstring>
50 </property> 50 </property>
51 <property stdset="1"> 51 <property stdset="1">
52 <name>geometry</name> 52 <name>geometry</name>
53 <rect> 53 <rect>
54 <x>11</x> 54 <x>12</x>
55 <y>19</y> 55 <y>20</y>
56 <width>114</width> 56 <width>110</width>
57 <height>19</height> 57 <height>19</height>
58 </rect> 58 </rect>
59 </property> 59 </property>
60 <property stdset="1"> 60 <property stdset="1">
61 <name>text</name> 61 <name>text</name>
62 <string>Force Depends</string> 62 <string>Force Depends</string>
63 </property> 63 </property>
64 </widget> 64 </widget>
65 <widget> 65 <widget>
66 <class>QCheckBox</class> 66 <class>QCheckBox</class>
67 <property stdset="1"> 67 <property stdset="1">
68 <name>name</name> 68 <name>name</name>
69 <cstring>forceReinstall</cstring> 69 <cstring>forceReinstall</cstring>
70 </property> 70 </property>
71 <property stdset="1"> 71 <property stdset="1">
72 <name>geometry</name> 72 <name>geometry</name>
73 <rect> 73 <rect>
74 <x>11</x> 74 <x>12</x>
75 <y>44</y> 75 <y>45</y>
76 <width>114</width> 76 <width>107</width>
77 <height>19</height> 77 <height>19</height>
78 </rect> 78 </rect>
79 </property> 79 </property>
80 <property stdset="1"> 80 <property stdset="1">
81 <name>text</name> 81 <name>text</name>
82 <string>Force Reinstall</string> 82 <string>Force Reinstall</string>
83 </property> 83 </property>
84 </widget> 84 </widget>
85 <widget> 85 <widget>
86 <class>QCheckBox</class> 86 <class>QCheckBox</class>
87 <property stdset="1"> 87 <property stdset="1">
88 <name>name</name> 88 <name>name</name>
89 <cstring>forceOverwrite</cstring> 89 <cstring>forceRemove</cstring>
90 </property> 90 </property>
91 <property stdset="1"> 91 <property stdset="1">
92 <name>geometry</name> 92 <name>geometry</name>
93 <rect> 93 <rect>
94 <x>11</x> 94 <x>12</x>
95 <y>94</y> 95 <y>70</y>
96 <width>114</width> 96 <width>105</width>
97 <height>19</height> 97 <height>19</height>
98 </rect> 98 </rect>
99 </property> 99 </property>
100 <property stdset="1"> 100 <property stdset="1">
101 <name>text</name> 101 <name>text</name>
102 <string>Force Overwrite</string> 102 <string>Force Remove</string>
103 </property> 103 </property>
104 </widget> 104 </widget>
105 <widget> 105 <widget>
106 <class>QCheckBox</class> 106 <class>QCheckBox</class>
107 <property stdset="1"> 107 <property stdset="1">
108 <name>name</name> 108 <name>name</name>
109 <cstring>forceRemove</cstring> 109 <cstring>forceOverwrite</cstring>
110 </property> 110 </property>
111 <property stdset="1"> 111 <property stdset="1">
112 <name>geometry</name> 112 <name>geometry</name>
113 <rect> 113 <rect>
114 <x>11</x> 114 <x>12</x>
115 <y>69</y> 115 <y>95</y>
116 <width>114</width> 116 <width>114</width>
117 <height>19</height> 117 <height>19</height>
118 </rect> 118 </rect>
119 </property> 119 </property>
120 <property stdset="1"> 120 <property stdset="1">
121 <name>text</name> 121 <name>text</name>
122 <string>Force Remove</string> 122 <string>Force Overwrite</string>
123 </property> 123 </property>
124 </widget> 124 </widget>
125 </widget>
126 <widget> 125 <widget>
127 <class>QPushButton</class> 126 <class>QCheckBox</class>
128 <property stdset="1"> 127 <property stdset="1">
129 <name>name</name> 128 <name>name</name>
130 <cstring>btnOK</cstring> 129 <cstring>verboseWget</cstring>
131 </property> 130 </property>
132 <property stdset="1"> 131 <property stdset="1">
133 <name>geometry</name> 132 <name>geometry</name>
134 <rect> 133 <rect>
135 <x>11</x> 134 <x>12</x>
136 <y>166</y> 135 <y>120</y>
137 <width>136</width> 136 <width>104</width>
138 <height>28</height> 137 <height>19</height>
139 </rect> 138 </rect>
140 </property> 139 </property>
141 <property stdset="1"> 140 <property stdset="1">
142 <name>text</name> 141 <name>text</name>
142 <string>Verbose WGet</string>
143 </property>
144 </widget>
145 </widget>
146 <widget>
147 <class>QPushButton</class>
148 <property stdset="1">
149 <name>name</name>
150 <cstring>btnOK</cstring>
151 </property>
152 <property stdset="1">
153 <name>text</name>
143 <string>OK</string> 154 <string>OK</string>
144 </property> 155 </property>
145 </widget> 156 </widget>
157 </vbox>
146</widget> 158</widget>
147<connections> 159<connections>
148 <connection> 160 <connection>
149 <sender>btnOK</sender> 161 <sender>btnOK</sender>
150 <signal>clicked()</signal> 162 <signal>clicked()</signal>
151 <receiver>InstallOptionsDlg</receiver> 163 <receiver>InstallOptionsDlg</receiver>
152 <slot>accept()</slot> 164 <slot>accept()</slot>
153 </connection> 165 </connection>
154</connections> 166</connections>
155</UI> 167</UI>
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
@@ -28,22 +28,43 @@
28 28
29InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, QWidget * parent, const char* name, bool modal, WFlags fl ) 29InstallOptionsDlgImpl::InstallOptionsDlgImpl( int flags, QWidget * parent, const char* name, bool modal, WFlags fl )
30 : InstallOptionsDlg( parent, name, modal, fl ) 30 : InstallOptionsDlg( parent, name, modal, fl )
31{ 31{
32 if ( flags & FORCE_DEPENDS ) 32 if ( flags & FORCE_DEPENDS )
33 forceDepends->setChecked( true ); 33 forceDepends->setChecked( true );
34 if ( flags & FORCE_REINSTALL ) 34 if ( flags & FORCE_REINSTALL )
35 forceReinstall->setChecked( true ); 35 forceReinstall->setChecked( true );
36 if ( flags & FORCE_REMOVE ) 36 if ( flags & FORCE_REMOVE )
37 forceRemove->setChecked( true ); 37 forceRemove->setChecked( true );
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 );
42 44
43 showMaximized(); 45 showMaximized();
44 46
45} 47}
46 48
47InstallOptionsDlgImpl::~InstallOptionsDlgImpl() 49InstallOptionsDlgImpl::~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
@@ -15,19 +15,20 @@
15 * * 15 * *
16 ***************************************************************************/ 16 ***************************************************************************/
17#ifndef INSTALLOPTIONSIMPL_H 17#ifndef INSTALLOPTIONSIMPL_H
18#define INSTALLOPTIONSIMPL_H 18#define INSTALLOPTIONSIMPL_H
19 19
20#include "instoptions.h" 20#include "instoptions.h"
21 21
22class InstallOptionsDlgImpl : public InstallOptionsDlg 22class InstallOptionsDlgImpl : public InstallOptionsDlg
23{ 23{
24public: 24public:
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:
29 30
30private: 31private:
31}; 32};
32 33
33#endif 34#endif