author | tille <tille> | 2002-04-23 22:41:02 (UTC) |
---|---|---|
committer | tille <tille> | 2002-04-23 22:41:02 (UTC) |
commit | f90935204b16126b40d4c562b26e37148ca03536 (patch) (unidiff) | |
tree | 40a3e25d9e5078a3871ae7ba5b1fb86245ead187 /noncore/unsupported/oipkg | |
parent | ab7037fb8c10cc2ee37a3728caab7d4da4cdc1b3 (diff) | |
download | opie-f90935204b16126b40d4c562b26e37148ca03536.zip opie-f90935204b16126b40d4c562b26e37148ca03536.tar.gz opie-f90935204b16126b40d4c562b26e37148ca03536.tar.bz2 |
fixes: update and link creation
-rw-r--r-- | noncore/unsupported/oipkg/TODO | 6 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/main.cpp | 4 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.cpp | 26 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.h | 2 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/oipkg.pro | 4 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/package.cpp | 2 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelist.cpp | 7 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelist.h | 2 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pksettingsbase.ui | 8 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 148 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.h | 18 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/runwindow.ui | 4 |
12 files changed, 142 insertions, 89 deletions
diff --git a/noncore/unsupported/oipkg/TODO b/noncore/unsupported/oipkg/TODO index 714baa4..d81e873 100644 --- a/noncore/unsupported/oipkg/TODO +++ b/noncore/unsupported/oipkg/TODO | |||
@@ -1,8 +1,10 @@ | |||
1 | * search | 1 | * search |
2 | * parse "to install" and "to remove" from status | ||
3 | * Settings Class | 2 | * Settings Class |
3 | * make oipkg determine dest of "to remove" apps | ||
4 | * tr() ;) | ||
4 | * Dialog to display ipkg output live | 5 | * Dialog to display ipkg output live |
6 | * parse "to install" and "to remove" from status | ||
5 | * install local file | 7 | * install local file |
6 | * make oipkg determine dest of to remove apps | 8 | * install to dest with click on packet |
7 | * error handling | 9 | * error handling |
8 | * manage links | 10 | * manage links |
diff --git a/noncore/unsupported/oipkg/main.cpp b/noncore/unsupported/oipkg/main.cpp index 264fd55..4af59b0 100644 --- a/noncore/unsupported/oipkg/main.cpp +++ b/noncore/unsupported/oipkg/main.cpp | |||
@@ -1,19 +1,19 @@ | |||
1 | 1 | ||
2 | #include "mainwindow.h" | 2 | #include "mainwindow.h" |
3 | 3 | ||
4 | #include <qpe/qpeapplication.h> | 4 | #include <qpe/qpeapplication.h> |
5 | #include <qstring.h> | 5 | #include <qstring.h> |
6 | int debugLevel; | 6 | int debugLevel; |
7 | 7 | ||
8 | int main( int argc, char ** argv ) | 8 | int main( int argc, char ** argv ) |
9 | { | 9 | { |
10 | debugLevel = 1; | 10 | debugLevel = 2; |
11 | if (argc > 2) | 11 | if (argc > 0) |
12 | { | 12 | { |
13 | debugLevel = QString ( argv[1] ).toInt(); | 13 | debugLevel = QString ( argv[1] ).toInt(); |
14 | } | 14 | } |
15 | QPEApplication a( argc, argv ); | 15 | QPEApplication a( argc, argv ); |
16 | MainWindow mw; | 16 | MainWindow mw; |
17 | a.showMainDocumentWidget( &mw ); | 17 | a.showMainDocumentWidget( &mw ); |
18 | return a.exec(); | 18 | return a.exec(); |
19 | } | 19 | } |
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp index b485a03..cb2b4cd 100644 --- a/noncore/unsupported/oipkg/mainwindow.cpp +++ b/noncore/unsupported/oipkg/mainwindow.cpp | |||
@@ -30,63 +30,70 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) : | |||
30 | makeMenu(); | 30 | makeMenu(); |
31 | 31 | ||
32 | QFontMetrics fm = fontMetrics(); | 32 | QFontMetrics fm = fontMetrics(); |
33 | int w0 = fm.width(tr("Package"))+30; | 33 | int w0 = fm.width(tr("Package"))+30; |
34 | int w2 = fm.width("00000")+4; | 34 | int w2 = fm.width("00000")+4; |
35 | table->ListViewPackages->setColumnWidth(0,w0); | 35 | table->ListViewPackages->setColumnWidth(0,w0); |
36 | table->ListViewPackages->setColumnWidth(1,228-w2-w0); // ### screen-biased | 36 | table->ListViewPackages->setColumnWidth(1,228-w2-w0); // ### screen-biased |
37 | table->ListViewPackages->setColumnWidth(2,w2); | 37 | table->ListViewPackages->setColumnWidth(2,w2); |
38 | table->ListViewPackages->setColumnWidthMode(0,QListView::Manual); | 38 | table->ListViewPackages->setColumnWidthMode(0,QListView::Manual); |
39 | table->ListViewPackages->setColumnWidthMode(1,QListView::Manual); | 39 | table->ListViewPackages->setColumnWidthMode(1,QListView::Manual); |
40 | table->ListViewPackages->setColumnWidthMode(2,QListView::Manual); | 40 | table->ListViewPackages->setColumnWidthMode(2,QListView::Manual); |
41 | table->ListViewPackages->setSelectionMode( QListView::Multi ); | 41 | table->ListViewPackages->setSelectionMode( QListView::Multi ); |
42 | 42 | ||
43 | connect( table->section, SIGNAL( activated(int) ), | 43 | connect( table->section, SIGNAL( activated(int) ), |
44 | this, SLOT( sectionChanged() ) ); | 44 | this, SLOT( sectionChanged() ) ); |
45 | connect( table->subsection, SIGNAL(activated(int) ), | 45 | connect( table->subsection, SIGNAL(activated(int) ), |
46 | this, SLOT( subSectionChanged() ) ); | 46 | this, SLOT( subSectionChanged() ) ); |
47 | connect( table->ListViewPackages, SIGNAL( clicked( QListViewItem* ) ), | 47 | connect( table->ListViewPackages, SIGNAL( clicked( QListViewItem* ) ), |
48 | this, SLOT( setCurrent( QListViewItem* ) ) ); | 48 | this, SLOT( setCurrent( QListViewItem* ) ) ); |
49 | 49 | ||
50 | settings = new PackageManagerSettings(this,0,TRUE); | 50 | settings = new PackageManagerSettings(this,0,TRUE); |
51 | 51 | ||
52 | ipkg = new PmIpkg( settings, this ); | 52 | ipkg = new PmIpkg( settings, this ); |
53 | packageList.setSettings( settings ); | 53 | packageList.setSettings( settings ); |
54 | newList(); | 54 | getList(); |
55 | setSections(); | 55 | setSections(); |
56 | setSubSections(); | 56 | setSubSections(); |
57 | displayList(); | 57 | displayList(); |
58 | } | 58 | } |
59 | 59 | ||
60 | void MainWindow::makeMenu() | 60 | void MainWindow::makeMenu() |
61 | { | 61 | { |
62 | 62 | ||
63 | QPEToolBar *toolBar = new QPEToolBar( this ); | 63 | QPEToolBar *toolBar = new QPEToolBar( this ); |
64 | QPEMenuBar *menuBar = new QPEMenuBar( toolBar ); | 64 | QPEMenuBar *menuBar = new QPEMenuBar( toolBar ); |
65 | QPopupMenu *srvMenu = new QPopupMenu( menuBar ); | 65 | QPopupMenu *srvMenu = new QPopupMenu( menuBar ); |
66 | QPopupMenu *cfgMenu = new QPopupMenu( menuBar ); | 66 | QPopupMenu *cfgMenu = new QPopupMenu( menuBar ); |
67 | // QPopupMenu *sectMenu = new QPopupMenu( menuBar ); | 67 | // QPopupMenu *sectMenu = new QPopupMenu( menuBar ); |
68 | 68 | ||
69 | //#define TOOLBAR | ||
70 | #ifdef TOOLBAR | ||
71 | QPEToolBar *secBar = new QPEToolBar( this ); | ||
72 | QComboBox *sections = new QComboBox( false, this ); | ||
73 | secBar->addTo( sections ); | ||
74 | #endif | ||
75 | |||
69 | contextMenu = new QPopupMenu( this ); | 76 | contextMenu = new QPopupMenu( this ); |
70 | 77 | ||
71 | setToolBarsMovable( false ); | 78 | setToolBarsMovable( false ); |
72 | toolBar->setHorizontalStretchable( true ); | 79 | toolBar->setHorizontalStretchable( true ); |
73 | menuBar->insertItem( tr( "Package" ), srvMenu ); | 80 | menuBar->insertItem( tr( "Package" ), srvMenu ); |
74 | menuBar->insertItem( tr( "Settings" ), cfgMenu ); | 81 | menuBar->insertItem( tr( "Settings" ), cfgMenu ); |
75 | // menuBar->insertItem( tr( "Sections" ), sectMenu ); | 82 | // menuBar->insertItem( tr( "Sections" ), sectMenu ); |
76 | 83 | ||
77 | toolBar->setStretchableWidget (srvMenu); | 84 | toolBar->setStretchableWidget (srvMenu); |
78 | 85 | ||
79 | 86 | ||
80 | runAction = new QAction( tr( "Run" ), | 87 | runAction = new QAction( tr( "Run" ), |
81 | Resource::loadPixmap( "oipkg/install" ), | 88 | Resource::loadPixmap( "oipkg/install" ), |
82 | QString::null, 0, this, 0 ); | 89 | QString::null, 0, this, 0 ); |
83 | connect( runAction, SIGNAL( activated() ), | 90 | connect( runAction, SIGNAL( activated() ), |
84 | this, SLOT( runIpkg() ) ); | 91 | this, SLOT( runIpkg() ) ); |
85 | runAction->addTo( toolBar ); | 92 | runAction->addTo( toolBar ); |
86 | runAction->addTo( srvMenu ); | 93 | runAction->addTo( srvMenu ); |
87 | 94 | ||
88 | srvMenu->insertSeparator (); | 95 | srvMenu->insertSeparator (); |
89 | 96 | ||
90 | updateAction = new QAction( tr( "Update" ), | 97 | updateAction = new QAction( tr( "Update" ), |
91 | Resource::loadIconSet( "oipkg/repeat" ), | 98 | Resource::loadIconSet( "oipkg/repeat" ), |
92 | QString::null, 0, this, 0 ); | 99 | QString::null, 0, this, 0 ); |
@@ -113,61 +120,62 @@ void MainWindow::makeMenu() | |||
113 | cfgact->addTo( cfgMenu ); | 120 | cfgact->addTo( cfgMenu ); |
114 | 121 | ||
115 | cfgact = new QAction( tr( "Servers" ), | 122 | cfgact = new QAction( tr( "Servers" ), |
116 | Resource::loadIconSet( "" ), | 123 | Resource::loadIconSet( "" ), |
117 | QString::null, 0, this, 0 ); | 124 | QString::null, 0, this, 0 ); |
118 | connect( cfgact, SIGNAL( activated() ), | 125 | connect( cfgact, SIGNAL( activated() ), |
119 | SLOT( showSettingsSrv() ) ); | 126 | SLOT( showSettingsSrv() ) ); |
120 | cfgact->addTo( cfgMenu ); | 127 | cfgact->addTo( cfgMenu ); |
121 | cfgact = new QAction( tr( "Destinations" ), | 128 | cfgact = new QAction( tr( "Destinations" ), |
122 | Resource::loadIconSet( "" ), | 129 | Resource::loadIconSet( "" ), |
123 | QString::null, 0, this, 0 ); | 130 | QString::null, 0, this, 0 ); |
124 | connect( cfgact, SIGNAL( activated() ), | 131 | connect( cfgact, SIGNAL( activated() ), |
125 | SLOT( showSettingsDst() ) ); | 132 | SLOT( showSettingsDst() ) ); |
126 | cfgact->addTo( cfgMenu ); | 133 | cfgact->addTo( cfgMenu ); |
127 | 134 | ||
128 | } | 135 | } |
129 | 136 | ||
130 | MainWindow::~MainWindow() | 137 | MainWindow::~MainWindow() |
131 | { | 138 | { |
132 | } | 139 | } |
133 | 140 | ||
134 | void MainWindow::runIpkg() | 141 | void MainWindow::runIpkg() |
135 | { | 142 | { |
136 | ipkg->commit( packageList ); | 143 | ipkg->commit( packageList ); |
137 | ipkg->runIpkg("update"); | 144 | updateList(); |
138 | packageList.update(); | ||
139 | } | 145 | } |
140 | 146 | ||
141 | void MainWindow::updateList() | 147 | void MainWindow::updateList() |
142 | { | 148 | { |
143 | ipkg->runIpkg("update"); | 149 | // todo: packageList.clear(); |
144 | packageList.update(); | 150 | ipkg->update(); |
151 | getList(); | ||
145 | } | 152 | } |
146 | 153 | ||
147 | void MainWindow::newList() | 154 | void MainWindow::getList() |
148 | { | 155 | { |
149 | packageList.update(); | 156 | packageList.update(); |
157 | displayList(); | ||
150 | } | 158 | } |
151 | 159 | ||
152 | void MainWindow::filterList() | 160 | void MainWindow::filterList() |
153 | { | 161 | { |
154 | packageList.filterPackages(); | 162 | packageList.filterPackages(); |
155 | } | 163 | } |
156 | 164 | ||
157 | void MainWindow::displayList() | 165 | void MainWindow::displayList() |
158 | { | 166 | { |
159 | table->ListViewPackages->clear(); | 167 | table->ListViewPackages->clear(); |
160 | Package *pack = packageList.first(); | 168 | Package *pack = packageList.first(); |
161 | while( pack ) | 169 | while( pack ) |
162 | { | 170 | { |
163 | if ( pack && (pack->name() != "") ) | 171 | if ( pack && (pack->name() != "") ) |
164 | { | 172 | { |
165 | table->ListViewPackages->insertItem( | 173 | table->ListViewPackages->insertItem( |
166 | new PackageListItem( table->ListViewPackages, pack ) ); | 174 | new PackageListItem( table->ListViewPackages, pack ) ); |
167 | } | 175 | } |
168 | pack = packageList.next(); | 176 | pack = packageList.next(); |
169 | } | 177 | } |
170 | } | 178 | } |
171 | 179 | ||
172 | void MainWindow::sectionChanged() | 180 | void MainWindow::sectionChanged() |
173 | { | 181 | { |
@@ -196,59 +204,59 @@ void MainWindow::subSectionChanged() | |||
196 | filterList(); | 204 | filterList(); |
197 | connect( table->section, SIGNAL( activated(int) ), | 205 | connect( table->section, SIGNAL( activated(int) ), |
198 | this, SLOT( sectionChanged() ) ); | 206 | this, SLOT( sectionChanged() ) ); |
199 | connect( table->subsection, SIGNAL(activated(int) ), | 207 | connect( table->subsection, SIGNAL(activated(int) ), |
200 | this, SLOT( subSectionChanged() ) ); | 208 | this, SLOT( subSectionChanged() ) ); |
201 | displayList(); | 209 | displayList(); |
202 | } | 210 | } |
203 | 211 | ||
204 | void MainWindow::setSections() | 212 | void MainWindow::setSections() |
205 | { | 213 | { |
206 | table->section->clear(); | 214 | table->section->clear(); |
207 | table->section->insertStringList( packageList.getSections() ); | 215 | table->section->insertStringList( packageList.getSections() ); |
208 | } | 216 | } |
209 | 217 | ||
210 | void MainWindow::setSubSections() | 218 | void MainWindow::setSubSections() |
211 | { | 219 | { |
212 | table->subsection->clear(); | 220 | table->subsection->clear(); |
213 | table->subsection->insertStringList( packageList.getSubSections() ); | 221 | table->subsection->insertStringList( packageList.getSubSections() ); |
214 | } | 222 | } |
215 | 223 | ||
216 | 224 | ||
217 | void MainWindow::showSettings() | 225 | void MainWindow::showSettings() |
218 | { | 226 | { |
219 | if ( settings->showDialog( 0 ) ) | 227 | if ( settings->showDialog( 0 ) ) |
220 | newList(); | 228 | getList(); |
221 | } | 229 | } |
222 | void MainWindow::showSettingsSrv() | 230 | void MainWindow::showSettingsSrv() |
223 | { | 231 | { |
224 | if ( settings->showDialog( 1 ) ) | 232 | if ( settings->showDialog( 1 ) ) |
225 | newList(); | 233 | getList(); |
226 | } | 234 | } |
227 | void MainWindow::showSettingsDst() | 235 | void MainWindow::showSettingsDst() |
228 | { | 236 | { |
229 | if ( settings->showDialog( 2 ) ) | 237 | if ( settings->showDialog( 2 ) ) |
230 | newList(); | 238 | getList(); |
231 | } | 239 | } |
232 | 240 | ||
233 | 241 | ||
234 | void MainWindow::showDetails() | 242 | void MainWindow::showDetails() |
235 | { | 243 | { |
236 | if ( activePackage ) return; | 244 | if ( activePackage ) return; |
237 | if ( details ) | 245 | if ( details ) |
238 | { | 246 | { |
239 | details = new PackageDetails( this ); | 247 | details = new PackageDetails( this ); |
240 | connect( details->install, SIGNAL(clicked()), SLOT( toggleActivePackage() ) ); | 248 | connect( details->install, SIGNAL(clicked()), SLOT( toggleActivePackage() ) ); |
241 | connect( details->remove, SIGNAL(clicked()), SLOT( toggleActivePackage() ) ); | 249 | connect( details->remove, SIGNAL(clicked()), SLOT( toggleActivePackage() ) ); |
242 | connect( details->ignore, SIGNAL(clicked()), details, SLOT(close())); | 250 | connect( details->ignore, SIGNAL(clicked()), details, SLOT(close())); |
243 | details->description->setTextFormat(RichText); | 251 | details->description->setTextFormat(RichText); |
244 | } | 252 | } |
245 | 253 | ||
246 | details->setCaption("Package: " + activePackage->name()); | 254 | details->setCaption("Package: " + activePackage->name()); |
247 | details->description->setText(activePackage->details() ); | 255 | details->description->setText(activePackage->details() ); |
248 | details->install->setEnabled(!activePackage->installed()); | 256 | details->install->setEnabled(!activePackage->installed()); |
249 | details->remove->setEnabled(activePackage->installed()); | 257 | details->remove->setEnabled(activePackage->installed()); |
250 | details->showMaximized(); | 258 | details->showMaximized(); |
251 | } | 259 | } |
252 | 260 | ||
253 | void MainWindow::toggleActivePackage() | 261 | void MainWindow::toggleActivePackage() |
254 | { | 262 | { |
diff --git a/noncore/unsupported/oipkg/mainwindow.h b/noncore/unsupported/oipkg/mainwindow.h index 77604fd..95dcc90 100644 --- a/noncore/unsupported/oipkg/mainwindow.h +++ b/noncore/unsupported/oipkg/mainwindow.h | |||
@@ -7,49 +7,49 @@ | |||
7 | 7 | ||
8 | #include "packagelist.h" | 8 | #include "packagelist.h" |
9 | #include "pmipkg.h" | 9 | #include "pmipkg.h" |
10 | #include "pksettings.h" | 10 | #include "pksettings.h" |
11 | #include "pkdesc.h" | 11 | #include "pkdesc.h" |
12 | 12 | ||
13 | #include "pkwindow.h" | 13 | #include "pkwindow.h" |
14 | 14 | ||
15 | class MainWindow : public QMainWindow | 15 | class MainWindow : public QMainWindow |
16 | { | 16 | { |
17 | Q_OBJECT | 17 | Q_OBJECT |
18 | 18 | ||
19 | 19 | ||
20 | public: | 20 | public: |
21 | MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); | 21 | MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); |
22 | ~MainWindow(); | 22 | ~MainWindow(); |
23 | 23 | ||
24 | 24 | ||
25 | protected: | 25 | protected: |
26 | PackageWindow *table; | 26 | PackageWindow *table; |
27 | 27 | ||
28 | 28 | ||
29 | protected slots: | 29 | protected slots: |
30 | void runIpkg(); | 30 | void runIpkg(); |
31 | void newList(); | 31 | void getList(); |
32 | void updateList(); | 32 | void updateList(); |
33 | void filterList(); | 33 | void filterList(); |
34 | void displayList(); | 34 | void displayList(); |
35 | void subSectionChanged(); | 35 | void subSectionChanged(); |
36 | void sectionChanged(); | 36 | void sectionChanged(); |
37 | void showSettings(); | 37 | void showSettings(); |
38 | void showSettingsSrv(); | 38 | void showSettingsSrv(); |
39 | void showSettingsDst(); | 39 | void showSettingsDst(); |
40 | 40 | ||
41 | public slots: | 41 | public slots: |
42 | void showDetails(); | 42 | void showDetails(); |
43 | void toggleActivePackage(); | 43 | void toggleActivePackage(); |
44 | void setCurrent( QListViewItem* ); | 44 | void setCurrent( QListViewItem* ); |
45 | 45 | ||
46 | private: | 46 | private: |
47 | void makeMenu(); | 47 | void makeMenu(); |
48 | void setSections(); | 48 | void setSections(); |
49 | void setSubSections(); | 49 | void setSubSections(); |
50 | 50 | ||
51 | PmIpkg* ipkg; | 51 | PmIpkg* ipkg; |
52 | PackageManagerSettings *settings; | 52 | PackageManagerSettings *settings; |
53 | PackageDetails* details; | 53 | PackageDetails* details; |
54 | PackageList packageList; | 54 | PackageList packageList; |
55 | Package *activePackage; | 55 | Package *activePackage; |
diff --git a/noncore/unsupported/oipkg/oipkg.pro b/noncore/unsupported/oipkg/oipkg.pro index 04230f5..c61af0f 100644 --- a/noncore/unsupported/oipkg/oipkg.pro +++ b/noncore/unsupported/oipkg/oipkg.pro | |||
@@ -1,27 +1,27 @@ | |||
1 | DESTDIR = $(OPIEDIR)/bin | 1 | DESTDIR = $(OPIEDIR)/bin |
2 | TEMPLATE= app | 2 | TEMPLATE= app |
3 | CONFIG = qt warn_on release | 3 | #CONFIG = qt warn_on release |
4 | #CONFIG = qt warn_on debug | 4 | CONFIG = qt warn_on debug |
5 | HEADERS = mainwindow.h \ | 5 | HEADERS = mainwindow.h \ |
6 | pksettings.h \ | 6 | pksettings.h \ |
7 | pmipkg.h \ | 7 | pmipkg.h \ |
8 | packagelistitem.h \ | 8 | packagelistitem.h \ |
9 | packagelist.h \ | 9 | packagelist.h \ |
10 | package.h | 10 | package.h |
11 | SOURCES = main.cpp \ | 11 | SOURCES = main.cpp \ |
12 | mainwindow.cpp \ | 12 | mainwindow.cpp \ |
13 | pksettings.cpp \ | 13 | pksettings.cpp \ |
14 | pmipkg.cpp \ | 14 | pmipkg.cpp \ |
15 | packagelistitem.cpp \ | 15 | packagelistitem.cpp \ |
16 | packagelist.cpp \ | 16 | packagelist.cpp \ |
17 | package.cpp | 17 | package.cpp |
18 | INCLUDEPATH += $(OPIEDIR)/include | 18 | INCLUDEPATH += $(OPIEDIR)/include |
19 | DEPENDPATH+= $(OPIEDIR)/include | 19 | DEPENDPATH+= $(OPIEDIR)/include |
20 | LIBS += -lqpe | 20 | LIBS += -lqpe |
21 | INTERFACES= pkdesc.ui \ | 21 | INTERFACES= pkdesc.ui \ |
22 | pkfind.ui \ | 22 | pkfind.ui \ |
23 | runwindow.ui \ | 23 | runwindow.ui \ |
24 | pkwindow.ui \ | 24 | pkwindow.ui \ |
25 | pksettingsbase.ui | 25 | pksettingsbase.ui |
26 | TARGET = oipkg | 26 | TARGET = oipkg |
27 | 27 | ||
diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp index 82ea1c8..e317308 100644 --- a/noncore/unsupported/oipkg/package.cpp +++ b/noncore/unsupported/oipkg/package.cpp | |||
@@ -135,49 +135,49 @@ QString Package::shortDesc() | |||
135 | QString Package::size() | 135 | QString Package::size() |
136 | { | 136 | { |
137 | return _size; | 137 | return _size; |
138 | } | 138 | } |
139 | 139 | ||
140 | bool Package::toProcess() | 140 | bool Package::toProcess() |
141 | { | 141 | { |
142 | return _toProcess; | 142 | return _toProcess; |
143 | } | 143 | } |
144 | 144 | ||
145 | bool Package::toRemove() | 145 | bool Package::toRemove() |
146 | { | 146 | { |
147 | if ( _toProcess && installed() ) return true; | 147 | if ( _toProcess && installed() ) return true; |
148 | else return false; | 148 | else return false; |
149 | } | 149 | } |
150 | 150 | ||
151 | bool Package::toInstall() | 151 | bool Package::toInstall() |
152 | { | 152 | { |
153 | if ( _toProcess && !installed() ) return true; | 153 | if ( _toProcess && !installed() ) return true; |
154 | else return false; | 154 | else return false; |
155 | } | 155 | } |
156 | 156 | ||
157 | void Package::toggleProcess() | 157 | void Package::toggleProcess() |
158 | { | 158 | { |
159 | _toProcess = !(_toProcess); | 159 | _toProcess = ! _toProcess; |
160 | } | 160 | } |
161 | 161 | ||
162 | 162 | ||
163 | 163 | ||
164 | void Package::copyValues( Package* pack ) | 164 | void Package::copyValues( Package* pack ) |
165 | { | 165 | { |
166 | if (_size.isEmpty() && !pack->_size.isEmpty()) _size = QString( pack->_size ); | 166 | if (_size.isEmpty() && !pack->_size.isEmpty()) _size = QString( pack->_size ); |
167 | if (_section.isEmpty() && !pack->_section.isEmpty()) _section = QString( pack->_section ); | 167 | if (_section.isEmpty() && !pack->_section.isEmpty()) _section = QString( pack->_section ); |
168 | if (_subsection.isEmpty()&& !pack->_subsection.isEmpty()) _subsection = QString( pack->_subsection ); | 168 | if (_subsection.isEmpty()&& !pack->_subsection.isEmpty()) _subsection = QString( pack->_subsection ); |
169 | if (_shortDesc.isEmpty() && !pack->_shortDesc.isEmpty()) _shortDesc = QString( pack->_shortDesc ); | 169 | if (_shortDesc.isEmpty() && !pack->_shortDesc.isEmpty()) _shortDesc = QString( pack->_shortDesc ); |
170 | if (_desc.isEmpty() && !pack->_desc.isEmpty()) _desc = QString( pack->_desc ); | 170 | if (_desc.isEmpty() && !pack->_desc.isEmpty()) _desc = QString( pack->_desc ); |
171 | if (_name.isEmpty() && !pack->_name.isEmpty()) _name = QString( pack->_name ); | 171 | if (_name.isEmpty() && !pack->_name.isEmpty()) _name = QString( pack->_name ); |
172 | if (!installed() && _status.isEmpty() && !pack->_status.isEmpty()) _status = QString( pack->_status ); | 172 | if (!installed() && _status.isEmpty() && !pack->_status.isEmpty()) _status = QString( pack->_status ); |
173 | } | 173 | } |
174 | 174 | ||
175 | QString Package::getSection() | 175 | QString Package::getSection() |
176 | { | 176 | { |
177 | return _section; | 177 | return _section; |
178 | } | 178 | } |
179 | 179 | ||
180 | void Package::setSection( QString s) | 180 | void Package::setSection( QString s) |
181 | { | 181 | { |
182 | int i = s.find("/"); | 182 | int i = s.find("/"); |
183 | if ( i > 0 ) | 183 | if ( i > 0 ) |
diff --git a/noncore/unsupported/oipkg/packagelist.cpp b/noncore/unsupported/oipkg/packagelist.cpp index d72ef75..5f6934d 100644 --- a/noncore/unsupported/oipkg/packagelist.cpp +++ b/noncore/unsupported/oipkg/packagelist.cpp | |||
@@ -184,32 +184,33 @@ void PackageList::readFileEntries( QString filename ) | |||
184 | Package *p = new Package( packEntry ); | 184 | Package *p = new Package( packEntry ); |
185 | if ( p ) | 185 | if ( p ) |
186 | { | 186 | { |
187 | insertPackage( p ); | 187 | insertPackage( p ); |
188 | packEntry.clear(); | 188 | packEntry.clear(); |
189 | } | 189 | } |
190 | } | 190 | } |
191 | }else{ | 191 | }else{ |
192 | packEntry << line; | 192 | packEntry << line; |
193 | }; | 193 | }; |
194 | } | 194 | } |
195 | return; | 195 | return; |
196 | } | 196 | } |
197 | 197 | ||
198 | 198 | ||
199 | void PackageList::update() | 199 | void PackageList::update() |
200 | { | 200 | { |
201 | pvDebug( 3, "parseStatus"); | 201 | pvDebug( 3, "parseStatus"); |
202 | parseStatus(); | 202 | parseStatus(); |
203 | pvDebug( 3, "parseList"); | 203 | pvDebug( 3, "parseList"); |
204 | parseList(); | 204 | parseList(); |
205 | pvDebug( 3, "finished parsing"); | 205 | pvDebug( 3, "finished parsing"); |
206 | } | 206 | } |
207 | 207 | ||
208 | |||
209 | |||
210 | /** No descriptions */ | ||
211 | void PackageList::setSettings( PackageManagerSettings *s ) | 208 | void PackageList::setSettings( PackageManagerSettings *s ) |
212 | { | 209 | { |
213 | settings = s; | 210 | settings = s; |
214 | } | 211 | } |
215 | 212 | ||
213 | Package* PackageList::getByName( QString n ) | ||
214 | { | ||
215 | origPackageList[n]; | ||
216 | } | ||
diff --git a/noncore/unsupported/oipkg/packagelist.h b/noncore/unsupported/oipkg/packagelist.h index eda8d22..68b89f0 100644 --- a/noncore/unsupported/oipkg/packagelist.h +++ b/noncore/unsupported/oipkg/packagelist.h | |||
@@ -5,48 +5,50 @@ | |||
5 | #include "package.h" | 5 | #include "package.h" |
6 | #include "pksettings.h" | 6 | #include "pksettings.h" |
7 | #include "debug.h" | 7 | #include "debug.h" |
8 | 8 | ||
9 | #define HACK | 9 | #define HACK |
10 | #ifdef HACK | 10 | #ifdef HACK |
11 | static QString listsDir="/usr/lib/ipkg/"; | 11 | static QString listsDir="/usr/lib/ipkg/"; |
12 | static QString statusDir="/usr/lib/ipkg/"; | 12 | static QString statusDir="/usr/lib/ipkg/"; |
13 | #endif | 13 | #endif |
14 | 14 | ||
15 | class PackageList { | 15 | class PackageList { |
16 | public: | 16 | public: |
17 | PackageList(); | 17 | PackageList(); |
18 | PackageList( PackageManagerSettings* ); | 18 | PackageList( PackageManagerSettings* ); |
19 | ~PackageList(); | 19 | ~PackageList(); |
20 | void insertPackage( Package* ); | 20 | void insertPackage( Package* ); |
21 | Package* find( QString ); | 21 | Package* find( QString ); |
22 | Package* next(); | 22 | Package* next(); |
23 | Package* first(); | 23 | Package* first(); |
24 | 24 | ||
25 | QStringList getSections(); | 25 | QStringList getSections(); |
26 | QStringList getSubSections(); | 26 | QStringList getSubSections(); |
27 | void setSettings( PackageManagerSettings* ); | 27 | void setSettings( PackageManagerSettings* ); |
28 | void filterPackages(); | 28 | void filterPackages(); |
29 | /** No descriptions */ | ||
30 | Package* getByName( QString ); | ||
29 | 31 | ||
30 | public slots: | 32 | public slots: |
31 | void setSection(QString); | 33 | void setSection(QString); |
32 | void setSubSection(QString); | 34 | void setSubSection(QString); |
33 | void update(); | 35 | void update(); |
34 | 36 | ||
35 | private: | 37 | private: |
36 | int currentPackage; | 38 | int currentPackage; |
37 | int packageCount; | 39 | int packageCount; |
38 | 40 | ||
39 | PackageManagerSettings *settings; | 41 | PackageManagerSettings *settings; |
40 | QDict<Package> packageList; | 42 | QDict<Package> packageList; |
41 | QDict<Package> origPackageList; | 43 | QDict<Package> origPackageList; |
42 | QDictIterator<Package> packageIter; | 44 | QDictIterator<Package> packageIter; |
43 | 45 | ||
44 | bool empty; | 46 | bool empty; |
45 | #ifndef HACK | 47 | #ifndef HACK |
46 | QString listsDir; | 48 | QString listsDir; |
47 | QString statusDir; | 49 | QString statusDir; |
48 | #endif | 50 | #endif |
49 | QString aktSection; | 51 | QString aktSection; |
50 | QString aktSubSection; | 52 | QString aktSubSection; |
51 | QStringList sections; | 53 | QStringList sections; |
52 | QDict<QStringList> subSections; | 54 | QDict<QStringList> subSections; |
diff --git a/noncore/unsupported/oipkg/pksettingsbase.ui b/noncore/unsupported/oipkg/pksettingsbase.ui index 2efd2f3..ea507a8 100644 --- a/noncore/unsupported/oipkg/pksettingsbase.ui +++ b/noncore/unsupported/oipkg/pksettingsbase.ui | |||
@@ -1,38 +1,38 @@ | |||
1 | <!DOCTYPE UI><UI> | 1 | <!DOCTYPE UI><UI> |
2 | <class>PackageManagerSettingsBase</class> | 2 | <class>PackageManagerSettingsBase</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>Form4</cstring> | 7 | <cstring>Form4</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>357</width> | 14 | <width>353</width> |
15 | <height>454</height> | 15 | <height>454</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>Package Servers</string> | 20 | <string>Package Servers</string> |
21 | </property> | 21 | </property> |
22 | <property> | 22 | <property> |
23 | <name>layoutMargin</name> | 23 | <name>layoutMargin</name> |
24 | </property> | 24 | </property> |
25 | <property> | 25 | <property> |
26 | <name>layoutSpacing</name> | 26 | <name>layoutSpacing</name> |
27 | </property> | 27 | </property> |
28 | <grid> | 28 | <grid> |
29 | <property stdset="1"> | 29 | <property stdset="1"> |
30 | <name>margin</name> | 30 | <name>margin</name> |
31 | <number>3</number> | 31 | <number>3</number> |
32 | </property> | 32 | </property> |
33 | <property stdset="1"> | 33 | <property stdset="1"> |
34 | <name>spacing</name> | 34 | <name>spacing</name> |
35 | <number>3</number> | 35 | <number>3</number> |
36 | </property> | 36 | </property> |
37 | <widget row="0" column="0" > | 37 | <widget row="0" column="0" > |
38 | <class>QTabWidget</class> | 38 | <class>QTabWidget</class> |
@@ -277,83 +277,83 @@ | |||
277 | </widget> | 277 | </widget> |
278 | <widget row="2" column="0" > | 278 | <widget row="2" column="0" > |
279 | <class>QLayoutWidget</class> | 279 | <class>QLayoutWidget</class> |
280 | <property stdset="1"> | 280 | <property stdset="1"> |
281 | <name>name</name> | 281 | <name>name</name> |
282 | <cstring>Layout11</cstring> | 282 | <cstring>Layout11</cstring> |
283 | </property> | 283 | </property> |
284 | <hbox> | 284 | <hbox> |
285 | <property stdset="1"> | 285 | <property stdset="1"> |
286 | <name>margin</name> | 286 | <name>margin</name> |
287 | <number>0</number> | 287 | <number>0</number> |
288 | </property> | 288 | </property> |
289 | <property stdset="1"> | 289 | <property stdset="1"> |
290 | <name>spacing</name> | 290 | <name>spacing</name> |
291 | <number>6</number> | 291 | <number>6</number> |
292 | </property> | 292 | </property> |
293 | <widget> | 293 | <widget> |
294 | <class>QPushButton</class> | 294 | <class>QPushButton</class> |
295 | <property stdset="1"> | 295 | <property stdset="1"> |
296 | <name>name</name> | 296 | <name>name</name> |
297 | <cstring>newsetting</cstring> | 297 | <cstring>newsetting</cstring> |
298 | </property> | 298 | </property> |
299 | <property stdset="1"> | 299 | <property stdset="1"> |
300 | <name>enabled</name> | 300 | <name>enabled</name> |
301 | <bool>true</bool> | 301 | <bool>false</bool> |
302 | </property> | 302 | </property> |
303 | <property stdset="1"> | 303 | <property stdset="1"> |
304 | <name>text</name> | 304 | <name>text</name> |
305 | <string>New</string> | 305 | <string>New</string> |
306 | </property> | 306 | </property> |
307 | <property stdset="1"> | 307 | <property stdset="1"> |
308 | <name>autoDefault</name> | 308 | <name>autoDefault</name> |
309 | <bool>false</bool> | 309 | <bool>false</bool> |
310 | </property> | 310 | </property> |
311 | </widget> | 311 | </widget> |
312 | <widget> | 312 | <widget> |
313 | <class>QPushButton</class> | 313 | <class>QPushButton</class> |
314 | <property stdset="1"> | 314 | <property stdset="1"> |
315 | <name>name</name> | 315 | <name>name</name> |
316 | <cstring>renamesetting</cstring> | 316 | <cstring>renamesetting</cstring> |
317 | </property> | 317 | </property> |
318 | <property stdset="1"> | 318 | <property stdset="1"> |
319 | <name>enabled</name> | 319 | <name>enabled</name> |
320 | <bool>true</bool> | 320 | <bool>false</bool> |
321 | </property> | 321 | </property> |
322 | <property stdset="1"> | 322 | <property stdset="1"> |
323 | <name>text</name> | 323 | <name>text</name> |
324 | <string>Rename</string> | 324 | <string>Rename</string> |
325 | </property> | 325 | </property> |
326 | </widget> | 326 | </widget> |
327 | <widget> | 327 | <widget> |
328 | <class>QPushButton</class> | 328 | <class>QPushButton</class> |
329 | <property stdset="1"> | 329 | <property stdset="1"> |
330 | <name>name</name> | 330 | <name>name</name> |
331 | <cstring>removesetting</cstring> | 331 | <cstring>removesetting</cstring> |
332 | </property> | 332 | </property> |
333 | <property stdset="1"> | 333 | <property stdset="1"> |
334 | <name>enabled</name> | 334 | <name>enabled</name> |
335 | <bool>true</bool> | 335 | <bool>false</bool> |
336 | </property> | 336 | </property> |
337 | <property stdset="1"> | 337 | <property stdset="1"> |
338 | <name>text</name> | 338 | <name>text</name> |
339 | <string>Remove</string> | 339 | <string>Remove</string> |
340 | </property> | 340 | </property> |
341 | <property stdset="1"> | 341 | <property stdset="1"> |
342 | <name>autoDefault</name> | 342 | <name>autoDefault</name> |
343 | <bool>false</bool> | 343 | <bool>false</bool> |
344 | </property> | 344 | </property> |
345 | </widget> | 345 | </widget> |
346 | </hbox> | 346 | </hbox> |
347 | </widget> | 347 | </widget> |
348 | </grid> | 348 | </grid> |
349 | </widget> | 349 | </widget> |
350 | <widget> | 350 | <widget> |
351 | <class>QWidget</class> | 351 | <class>QWidget</class> |
352 | <property stdset="1"> | 352 | <property stdset="1"> |
353 | <name>name</name> | 353 | <name>name</name> |
354 | <cstring>tab</cstring> | 354 | <cstring>tab</cstring> |
355 | </property> | 355 | </property> |
356 | <attribute> | 356 | <attribute> |
357 | <name>title</name> | 357 | <name>title</name> |
358 | <string>Servers</string> | 358 | <string>Servers</string> |
359 | </attribute> | 359 | </attribute> |
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp index 528365e..681f2d4 100644 --- a/noncore/unsupported/oipkg/pmipkg.cpp +++ b/noncore/unsupported/oipkg/pmipkg.cpp | |||
@@ -3,181 +3,217 @@ | |||
3 | #include "pkfind.h" | 3 | #include "pkfind.h" |
4 | #include "pksettings.h" | 4 | #include "pksettings.h" |
5 | #include "package.h" | 5 | #include "package.h" |
6 | #include "packagelistitem.h" | 6 | #include "packagelistitem.h" |
7 | 7 | ||
8 | #include <qpe/process.h> | 8 | #include <qpe/process.h> |
9 | #include <qpe/resource.h> | 9 | #include <qpe/resource.h> |
10 | #include <qpe/stringutil.h> | 10 | #include <qpe/stringutil.h> |
11 | #include <qpe/qcopenvelope_qws.h> | 11 | #include <qpe/qcopenvelope_qws.h> |
12 | #include <qdir.h> | 12 | #include <qdir.h> |
13 | #include <qfile.h> | 13 | #include <qfile.h> |
14 | #include <qmultilineedit.h> | 14 | #include <qmultilineedit.h> |
15 | #include <qstring.h> | 15 | #include <qstring.h> |
16 | #include <qtextstream.h> | 16 | #include <qtextstream.h> |
17 | #include <qtextview.h> | 17 | #include <qtextview.h> |
18 | 18 | ||
19 | #include <stdlib.h> | 19 | #include <stdlib.h> |
20 | #include <unistd.h> | 20 | #include <unistd.h> |
21 | 21 | ||
22 | #include "mainwindow.h" | 22 | #include "mainwindow.h" |
23 | #include "runwindow.h" | 23 | #include "runwindow.h" |
24 | 24 | ||
25 | 25 | ||
26 | PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlags f ) | 26 | PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlags f ) |
27 | : RunWindow ( p, name, f ) | 27 | // : RunWindow ( p, name, f ) |
28 | //: QObject ( p ) | 28 | : QObject ( p ) |
29 | { | 29 | { |
30 | settings = s; | 30 | settings = s; |
31 | 31 | runwindow = new RunWindow ( p, name, f ); | |
32 | linkDest = new QCopChannel( "QPE/MakeLinks", this ); | 32 | linkDest = new QCopChannel( "QPE/MakeLinks", this ); |
33 | connect( linkDest, SIGNAL(received(const QCString &, const QByteArray &)), | 33 | connect( linkDest, SIGNAL(received(const QCString &, const QByteArray &)), |
34 | this, SLOT(linkDestination( const QString &, const QString&)) ); | 34 | this, SLOT(linkDestination( const QString &, const QByteArray&)) ); |
35 | } | 35 | } |
36 | 36 | ||
37 | PmIpkg::~PmIpkg() | 37 | PmIpkg::~PmIpkg() |
38 | { | 38 | { |
39 | } | 39 | } |
40 | 40 | ||
41 | //#define PROC | ||
42 | #define SYSTEM | ||
41 | int PmIpkg::runIpkg(const QString& args) | 43 | int PmIpkg::runIpkg(const QString& args) |
42 | { | 44 | { |
43 | pvDebug(4,"PmIpkg::runIpkg"); | 45 | pvDebug(2,"PmIpkg::runIpkg "+args); |
46 | #ifdef PROC | ||
47 | QStringList cmd = "/usr/bin/ipkg "; | ||
48 | #endif | ||
49 | #ifdef SYSTEM | ||
44 | QString cmd = "/usr/bin/ipkg "; | 50 | QString cmd = "/usr/bin/ipkg "; |
51 | #endif | ||
45 | cmd += " -dest "+settings->getDestinationName(); | 52 | cmd += " -dest "+settings->getDestinationName(); |
46 | cmd += " -force-defaults "; | 53 | cmd += " -force-defaults "; |
47 | 54 | ||
48 | outPut->setText( outPut->text()+"<br><br>Starting to "+ args+"<br>\n"); | 55 | out( "Starting to "+ args+"<br>\n"); |
49 | QString redirect = "/tmp/ipkg.pipe"; | 56 | cmd += args; |
50 | cmd += args+" | tee "+redirect+" 2>&1&"; | 57 | out( "running:<br>\n"+cmd+"<br>\n" ); |
51 | 58 | int r = 0; | |
52 | outPut->setText( outPut->text() + "running:<br>\n"+cmd+"<br>\n" ); | 59 | #ifdef PROC |
53 | pvDebug( 0, "Execute >"+cmd+"<" ); | 60 | QString o = "start"; |
54 | int r = system(cmd.latin1()); | 61 | Process ipkg( cmd ); |
62 | QString description; | ||
63 | ipkg.exec("",o); | ||
64 | out( o ); | ||
65 | #endif | ||
66 | #ifdef SYSTEM | ||
67 | QString redirect = "/tmp/oipkg.pipe"; | ||
68 | cmd += " | tee "+redirect+" 2>&1"; | ||
69 | r = system(cmd.latin1()); | ||
55 | QFile f( redirect ); | 70 | QFile f( redirect ); |
56 | if ( f.open(IO_ReadOnly) ) { | 71 | while ( ! f.open(IO_ReadOnly) ) {}; |
72 | // if ( f.open(IO_ReadOnly) ) {}; | ||
73 | { | ||
57 | QTextStream t( &f ); | 74 | QTextStream t( &f ); |
58 | QString fp; | 75 | QString fp; |
59 | while ( !t.eof() ) | 76 | while ( !t.eof() ) |
60 | { | 77 | { |
61 | outPut->setText( outPut->text() + t.readLine() +"\n<br>" ); | 78 | out( t.readLine() +"<br>" ); |
62 | } | 79 | } |
63 | } | 80 | } |
64 | f.close(); | 81 | f.close(); |
65 | outPut->setText( outPut->text() + "\n<br><br>Finished!"); | 82 | out( "Finished!<br>"); |
66 | outPut->setContentsPos(0,outPut->contentsHeight()); | 83 | #endif |
67 | |||
68 | if ( r == 0 ) | ||
69 | { | ||
70 | QString param = args.left( args.find(" ") ); | ||
71 | QString file = args.right( args.length() - args.find(" ") ); | ||
72 | if ( param == "install" && settings->createLinks() ) | ||
73 | makeLinks( file); | ||
74 | } | ||
75 | 84 | ||
76 | return r; | 85 | return r; |
77 | } | 86 | } |
78 | 87 | ||
79 | void PmIpkg::makeLinks(QString file) | 88 | void PmIpkg::makeLinks(QString file) |
80 | { | 89 | { |
81 | outPut->setText( outPut->text() + "<br>creating links<br>" ); | 90 | out( "<br>creating links<br>" ); |
82 | QString dest = settings->getDestinationUrl(); | 91 | QString dest = settings->getDestinationUrl(); |
83 | system(("ipkg -d "+dest+" files "+file+"> /tmp/oipkg.pipe").latin1()); | 92 | out("for package "+file+" in "+dest+"<br>"); |
93 | system(("ipkg -d "+dest+" files "+file+"> /tmp/oipkg.pipe 2>&1").latin1()); | ||
84 | QFile f( "/tmp/oipkg.pipe" ); | 94 | QFile f( "/tmp/oipkg.pipe" ); |
85 | if ( ! f.open(IO_ReadOnly) )return; | 95 | while ( ! f.open(IO_ReadOnly) ) {}; |
86 | QTextStream t( &f ); | 96 | QTextStream t( &f ); |
87 | QString fp; | 97 | QString fp; |
88 | while ( !t.eof() ) | 98 | while ( !t.eof() ) |
89 | { | 99 | { |
90 | processLinkDir( t.readLine(), dest ); | 100 | fp = t.readLine(); |
101 | processLinkDir( fp, dest ); | ||
91 | } | 102 | } |
92 | f.close(); | 103 | f.close(); |
93 | } | 104 | } |
94 | 105 | ||
95 | void PmIpkg::processLinkDir( QString file, QString dest ) | 106 | void PmIpkg::processLinkDir( QString file, QString dest ) |
96 | { | 107 | { |
97 | QString destFile = file.right( file.length() - dest.length() ); | 108 | QString destFile = file.right( file.length() - dest.length() ); |
98 | QFileInfo fileInfo( file ); | 109 | QFileInfo fileInfo( file ); |
99 | if ( fileInfo.isFile() ) | ||
100 | { | ||
101 | const char *instFile = strdup( (file).ascii() ); | ||
102 | const char *linkFile = strdup( (destFile).ascii()); | ||
103 | outPut->setText( outPut->text() + "linking: "+file+" -> "+destFile ); | ||
104 | symlink( instFile, linkFile ); | ||
105 | } | ||
106 | if ( fileInfo.isDir() ) | 110 | if ( fileInfo.isDir() ) |
107 | { | 111 | { |
108 | QDir destDir( destFile ); | 112 | QDir destDir( destFile ); |
109 | destDir.mkdir( destFile, true ); | 113 | destDir.mkdir( destFile, true ); |
110 | QDir d( file ); | 114 | QDir d( file ); |
111 | d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks ); | 115 | d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks ); |
112 | |||
113 | const QFileInfoList *list = d.entryInfoList(); | 116 | const QFileInfoList *list = d.entryInfoList(); |
114 | QFileInfoListIterator it( *list ); | 117 | QFileInfoListIterator it( *list ); |
115 | QFileInfo *fi; | 118 | QFileInfo *fi; |
116 | while ( (fi=it.current()) ) { | 119 | while ( (fi=it.current()) ) |
120 | { | ||
121 | out( "<b>"+fi->absFilePath()+"</b>" ); | ||
117 | processLinkDir( fi->absFilePath(), dest ); | 122 | processLinkDir( fi->absFilePath(), dest ); |
118 | ++it; | 123 | ++it; |
119 | } | 124 | } |
125 | } else | ||
126 | if ( fileInfo.isFile() ) | ||
127 | { | ||
128 | const char *instFile = strdup( (file).ascii() ); | ||
129 | const char *linkFile = strdup( (destFile).ascii()); | ||
130 | out( "linking: "+file+" -> "+destFile ); | ||
131 | qDebug( "linking: %s -> %s", instFile, linkFile ); | ||
132 | symlink( instFile, linkFile ); | ||
120 | } | 133 | } |
121 | } | 134 | } |
122 | 135 | ||
123 | void PmIpkg::commit( PackageList pl ) | 136 | void PmIpkg::commit( PackageList pl ) |
124 | { | 137 | { |
125 | showMaximized(); | 138 | runwindow->showMaximized(); |
126 | exec(); | 139 | // exec(); |
127 | outPut->setText( "<b>Starting...</b><br>\n"); | 140 | runwindow->outPut->setText(""); |
141 | out( "<h1>Starting...</h1><br>\n"); | ||
128 | QStringList to_remove, to_install; | 142 | QStringList to_remove, to_install; |
129 | 143 | ||
130 | QString rem="To remove:<br>\n"; | 144 | QString rem="<b>To remove:</b><br>\n"; |
131 | QString inst="To install:<br>\n";; | 145 | QString inst="<b>To install:</b><br>\n";; |
132 | for( Package *pack = pl.first();pack ; (pack = pl.next()) ) | 146 | for( Package *pack = pl.first();pack ; (pack = pl.next()) ) |
133 | { | 147 | { |
134 | if ( pack && (pack->name() != "") && pack) | 148 | if ( pack && (pack->name() != "") && pack) |
135 | { | 149 | { |
136 | if ( pack->toInstall() ) | 150 | if ( pack->toInstall() ) |
137 | { | 151 | { |
138 | to_install.append( pack->name() ); | 152 | to_install.append( pack->name() ); |
139 | inst += pack->name()+"\n"; | 153 | inst += pack->name()+"<br>"; |
140 | } | 154 | } |
141 | if ( pack->toRemove() ) | 155 | if ( pack->toRemove() ) |
142 | { | 156 | { |
143 | to_remove.append( pack->name() ); | 157 | to_remove.append( pack->name() ); |
144 | rem += pack->name()+"\n"; | 158 | rem += pack->name()+"<br>"; |
145 | } | 159 | } |
146 | } | 160 | } |
147 | } | 161 | } |
148 | 162 | ||
149 | outPut->setText( outPut->text()+inst+rem); | 163 | out("<p>"+inst+"</p>"+"<p>"+rem+"</p>"); |
150 | bool ok=TRUE; | 164 | bool ok=TRUE; |
151 | 165 | ||
152 | qDebug("to remove=%i; to install=%i",to_remove.count(),to_install.count()); | 166 | qDebug("to remove=%i; to install=%i",to_remove.count(),to_install.count()); |
153 | 167 | ||
154 | int jobs = to_remove.count()+to_install.count(); | 168 | int jobs = to_remove.count()+to_install.count(); |
155 | if ( jobs < 1 ) return; | 169 | if ( jobs < 1 ) return; |
156 | 170 | ||
157 | if ( to_remove.count() ) | 171 | if ( to_remove.count() ) |
158 | for (QStringList::ConstIterator it=to_remove.begin(); it!=to_remove.end(); ++it) | 172 | for (QStringList::ConstIterator it=to_remove.begin(); it!=to_remove.end(); ++it) |
159 | if ( runIpkg("remove " + *it) != 0 ) ok = false; | 173 | if ( runIpkg("remove " + *it) != 0 ) ok = false; |
160 | if ( to_install.count() ) | 174 | if ( to_install.count() ) |
161 | for (QStringList::ConstIterator it=to_install.begin(); it!=to_install.end(); ++it) | 175 | for (QStringList::ConstIterator it=to_install.begin(); it!=to_install.end(); ++it) |
162 | if ( runIpkg("install " + *it) != 0 ) ok = false; | 176 | { |
177 | if ( runIpkg("install " + *it) == 0 ) | ||
178 | { | ||
179 | if ( settings->createLinks() ) | ||
180 | makeLinks( *it ); | ||
181 | }else{ | ||
182 | ok = false; | ||
183 | } | ||
184 | } | ||
163 | 185 | ||
164 | // ##### If we looked in the list of files, we could send out accurate | 186 | // ##### If we looked in the list of files, we could send out accurate |
165 | // ##### messages. But we don't bother yet, and just do an "all". | 187 | // ##### messages. But we don't bother yet, and just do an "all". |
166 | QCopEnvelope e("QPE/System", "linkChanged(QString)"); | 188 | QCopEnvelope e("QPE/System", "linkChanged(QString)"); |
167 | QString lf = QString::null; | 189 | QString lf = QString::null; |
168 | e << lf; | 190 | e << lf; |
169 | } | 191 | } |
170 | 192 | ||
171 | void PmIpkg::linkDestination( QString src, QString dest ) | 193 | void PmIpkg::linkDestination( const QString msg, const QByteArray dest ) |
194 | // add 3rd package parameter | ||
172 | { | 195 | { |
173 | QDir d( src ); | 196 | qDebug("msg="+msg+" -- "+QString(dest) ); |
174 | d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks ); | 197 | // QDir d( src ); |
175 | if (! d.exists() ) return; | 198 | // d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks ); |
176 | const QFileInfoList *list = d.entryInfoList(); | 199 | //// if (! d.exists() ) return; |
177 | QFileInfoListIterator it( *list ); | 200 | // const QFileInfoList *list = d.entryInfoList(); |
178 | QFileInfo *fi; | 201 | // QFileInfoListIterator it( *list ); |
179 | while ( (fi=it.current()) ) { | 202 | // QFileInfo *fi; |
180 | processLinkDir( fi->absFilePath(), dest ); | 203 | // while ( (fi=it.current()) ) { |
181 | ++it; | 204 | // processLinkDir( fi->absFilePath(), dest ); |
205 | // ++it; | ||
206 | // } | ||
207 | } | ||
208 | |||
209 | void PmIpkg::update() | ||
210 | { | ||
211 | runwindow->showMaximized(); | ||
212 | runIpkg( "update" ); | ||
182 | } | 213 | } |
214 | |||
215 | void PmIpkg::out( QString o ) | ||
216 | { | ||
217 | runwindow->outPut->setText( runwindow->outPut->text()+o ); | ||
218 | runwindow->outPut->setContentsPos(0,runwindow->outPut->contentsHeight()); | ||
183 | } | 219 | } |
diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h index 98efaa6..e6486ff 100644 --- a/noncore/unsupported/oipkg/pmipkg.h +++ b/noncore/unsupported/oipkg/pmipkg.h | |||
@@ -1,42 +1,46 @@ | |||
1 | #ifndef PMIPKG_H | 1 | #ifndef PMIPKG_H |
2 | #define PMIPKG_H | 2 | #define PMIPKG_H |
3 | 3 | ||
4 | 4 | ||
5 | #include <qobject.h> | 5 | #include <qobject.h> |
6 | #include <qstring.h> | 6 | #include <qstring.h> |
7 | #include <qwidget.h> | 7 | #include <qwidget.h> |
8 | #include "pksettings.h" | 8 | #include "pksettings.h" |
9 | #include "runwindow.h" | 9 | #include "runwindow.h" |
10 | #include "packagelist.h" | 10 | #include "packagelist.h" |
11 | #include "debug.h" | 11 | #include "debug.h" |
12 | 12 | ||
13 | //#define DIA | ||
13 | 14 | ||
14 | #include <qpe/qcopenvelope_qws.h> | 15 | #include <qpe/qcopenvelope_qws.h> |
15 | 16 | ||
16 | class PmIpkg : public RunWindow | 17 | |
17 | //class PmIpkg : public QObject | 18 | //class PmIpkg : public RunWindow |
19 | class PmIpkg : public QObject | ||
18 | { | 20 | { |
19 | Q_OBJECT | 21 | Q_OBJECT |
20 | public: | 22 | public: |
21 | PmIpkg( PackageManagerSettings* , QWidget* p=0, const char * name=0, WFlags f=0 ); | 23 | PmIpkg( PackageManagerSettings* , QWidget* p=0, const char * name=0, WFlags f=0 ); |
22 | //PmIpkg( QObject*, PackageManagerSettings* ); | 24 | //PmIpkg( QObject*, PackageManagerSettings* ); |
23 | ~PmIpkg(); | 25 | ~PmIpkg(); |
24 | 26 | ||
27 | void commit( PackageList ); | ||
28 | void update(); | ||
25 | PackageList* getPackageList(); | 29 | PackageList* getPackageList(); |
26 | 30 | ||
27 | private: | 31 | private: |
28 | PackageManagerSettings* settings; | 32 | PackageManagerSettings* settings; |
33 | RunWindow *runwindow; | ||
29 | QCopChannel *linkDest; | 34 | QCopChannel *linkDest; |
30 | void processLinkDir( QString, QString ); | ||
31 | |||
32 | 35 | ||
33 | public: | ||
34 | void makeLinks(QString); | 36 | void makeLinks(QString); |
37 | void processLinkDir( QString, QString ); | ||
38 | |||
35 | int runIpkg(const QString& args); | 39 | int runIpkg(const QString& args); |
36 | void commit( PackageList ); | 40 | void out( QString ); |
37 | 41 | ||
38 | public slots: | 42 | public slots: |
39 | void linkDestination( QString, QString ); | 43 | void linkDestination( const QString, const QByteArray ); |
40 | }; | 44 | }; |
41 | 45 | ||
42 | #endif | 46 | #endif |
diff --git a/noncore/unsupported/oipkg/runwindow.ui b/noncore/unsupported/oipkg/runwindow.ui index 23f58cf..9113f2d 100644 --- a/noncore/unsupported/oipkg/runwindow.ui +++ b/noncore/unsupported/oipkg/runwindow.ui | |||
@@ -1,63 +1,63 @@ | |||
1 | <!DOCTYPE UI><UI> | 1 | <!DOCTYPE UI><UI> |
2 | <class>RunWindow</class> | 2 | <class>RunWindow</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>RunWindow</cstring> | 7 | <cstring>RunWindow</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>201</width> | 14 | <width>197</width> |
15 | <height>291</height> | 15 | <height>291</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>running...</string> | 20 | <string>running...</string> |
21 | </property> | 21 | </property> |
22 | <property> | 22 | <property> |
23 | <name>layoutMargin</name> | 23 | <name>layoutMargin</name> |
24 | </property> | 24 | </property> |
25 | <property> | 25 | <property> |
26 | <name>layoutSpacing</name> | 26 | <name>layoutSpacing</name> |
27 | </property> | 27 | </property> |
28 | <grid> | 28 | <grid> |
29 | <property stdset="1"> | 29 | <property stdset="1"> |
30 | <name>margin</name> | 30 | <name>margin</name> |
31 | <number>5</number> | 31 | <number>5</number> |
32 | </property> | 32 | </property> |
33 | <property stdset="1"> | 33 | <property stdset="1"> |
34 | <name>spacing</name> | 34 | <name>spacing</name> |
35 | <number>2</number> | 35 | <number>2</number> |
36 | </property> | 36 | </property> |
37 | <widget row="0" column="0" > | 37 | <widget row="0" column="0" > |
38 | <class>QProgressBar</class> | 38 | <class>QProgressBar</class> |
39 | <property stdset="1"> | 39 | <property stdset="1"> |
40 | <name>name</name> | 40 | <name>name</name> |
41 | <cstring>progress</cstring> | 41 | <cstring>progress</cstring> |
42 | </property> | 42 | </property> |
43 | <property stdset="1"> | 43 | <property stdset="1"> |
44 | <name>progress</name> | 44 | <name>progress</name> |
45 | <number>0</number> | 45 | <number>42</number> |
46 | </property> | 46 | </property> |
47 | </widget> | 47 | </widget> |
48 | <widget row="1" column="0" > | 48 | <widget row="1" column="0" > |
49 | <class>QTextView</class> | 49 | <class>QTextView</class> |
50 | <property stdset="1"> | 50 | <property stdset="1"> |
51 | <name>name</name> | 51 | <name>name</name> |
52 | <cstring>outPut</cstring> | 52 | <cstring>outPut</cstring> |
53 | </property> | 53 | </property> |
54 | <property stdset="1"> | 54 | <property stdset="1"> |
55 | <name>font</name> | 55 | <name>font</name> |
56 | <font> | 56 | <font> |
57 | <pointsize>6</pointsize> | 57 | <pointsize>6</pointsize> |
58 | </font> | 58 | </font> |
59 | </property> | 59 | </property> |
60 | </widget> | 60 | </widget> |
61 | </grid> | 61 | </grid> |
62 | </widget> | 62 | </widget> |
63 | </UI> | 63 | </UI> |