author | tille <tille> | 2002-05-03 09:40:11 (UTC) |
---|---|---|
committer | tille <tille> | 2002-05-03 09:40:11 (UTC) |
commit | 6bf450ac622d22ba7e9156e474a7abb714167eba (patch) (unidiff) | |
tree | ff89dd745715e0b540e6c8f17b6af4dec4c3c84a /noncore/unsupported | |
parent | 6ebb8228b660634b4ca8a2a5bf05aef828e39f31 (diff) | |
download | opie-6bf450ac622d22ba7e9156e474a7abb714167eba.zip opie-6bf450ac622d22ba7e9156e474a7abb714167eba.tar.gz opie-6bf450ac622d22ba7e9156e474a7abb714167eba.tar.bz2 |
added install dialog with ipkg options (that are shown ;)
-rw-r--r-- | noncore/unsupported/oipkg/TODO | 2 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/installdialog.cpp | 104 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/installdialog.h | 46 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.cpp | 5 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/oipkg.pro | 2 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelistremote.cpp | 2 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pksettings.cpp | 11 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pksettings.h | 1 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.cpp | 96 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pmipkg.h | 7 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/settings.h | 1 |
11 files changed, 202 insertions, 75 deletions
diff --git a/noncore/unsupported/oipkg/TODO b/noncore/unsupported/oipkg/TODO index 1aa9e6b..b1ae6e3 100644 --- a/noncore/unsupported/oipkg/TODO +++ b/noncore/unsupported/oipkg/TODO | |||
@@ -12,3 +12,3 @@ | |||
12 | * different types of filters and searches | 12 | * different types of filters and searches |
13 | i.e. name, desc, files etc | 13 | i.e. name, desc, files etc |
14 | * get packages from doclnk \ No newline at end of file | 14 | * mark packages from doclnk and ipkgfind installed if installed \ No newline at end of file |
diff --git a/noncore/unsupported/oipkg/installdialog.cpp b/noncore/unsupported/oipkg/installdialog.cpp new file mode 100644 index 0000000..72f436a --- a/dev/null +++ b/noncore/unsupported/oipkg/installdialog.cpp | |||
@@ -0,0 +1,104 @@ | |||
1 | /**************************************************************************** | ||
2 | ** Form implementation generated from reading ui file 'installdialog.ui' | ||
3 | ** | ||
4 | ** Created: Thu May 2 22:19:02 2002 | ||
5 | ** by: The User Interface Compiler (uic) | ||
6 | ** | ||
7 | ** WARNING! All changes made in this file will be lost! | ||
8 | ****************************************************************************/ | ||
9 | #include "installdialog.h" | ||
10 | |||
11 | #include <qcheckbox.h> | ||
12 | #include <qgroupbox.h> | ||
13 | #include <qheader.h> | ||
14 | #include <qlistview.h> | ||
15 | #include <qpushbutton.h> | ||
16 | #include <qlayout.h> | ||
17 | #include <qvariant.h> | ||
18 | #include <qtooltip.h> | ||
19 | #include <qwhatsthis.h> | ||
20 | |||
21 | |||
22 | InstallDialog::InstallDialog( PackageManagerSettings* s, QWidget* parent, const char* name, bool modal, WFlags fl ) | ||
23 | : QDialog( parent, name, modal, fl ) | ||
24 | { | ||
25 | settings = s; | ||
26 | if ( !name ) | ||
27 | setName( "InstallDialog" ); | ||
28 | resize( 223, 269 ); | ||
29 | setCaption( tr( "Install" ) ); | ||
30 | InstallDialogLayout = new QGridLayout( this ); | ||
31 | InstallDialogLayout->setSpacing( 2 ); | ||
32 | InstallDialogLayout->setMargin( 2 ); | ||
33 | |||
34 | ListViewPackages = new PackageListView( this,"listViewPackages",settings ); | ||
35 | |||
36 | InstallDialogLayout->addWidget( ListViewPackages, 0, 0 ); | ||
37 | |||
38 | GroupBoxOptions = new QGroupBox( this, "GroupBoxOptions" ); | ||
39 | GroupBoxOptions->setTitle( tr( "Ipkg options" ) ); | ||
40 | GroupBoxOptions->setColumnLayout(0, Qt::Vertical ); | ||
41 | GroupBoxOptions->layout()->setSpacing( 0 ); | ||
42 | GroupBoxOptions->layout()->setMargin( 0 ); | ||
43 | GroupBoxOptionsLayout = new QGridLayout( GroupBoxOptions->layout() ); | ||
44 | GroupBoxOptionsLayout->setAlignment( Qt::AlignTop ); | ||
45 | GroupBoxOptionsLayout->setSpacing( 2 ); | ||
46 | GroupBoxOptionsLayout->setMargin( 2 ); | ||
47 | |||
48 | _force_depends = new QCheckBox( GroupBoxOptions, "_force_depends" ); | ||
49 | QFont _force_depends_font( _force_depends->font() ); | ||
50 | _force_depends_font.setPointSize( 8 ); | ||
51 | _force_depends->setFont( _force_depends_font ); | ||
52 | _force_depends->setText( tr( "-force-depends" ) ); | ||
53 | //_force_depends->setChecked( true ); | ||
54 | |||
55 | GroupBoxOptionsLayout->addWidget( _force_depends, 0, 0 ); | ||
56 | |||
57 | _force_reinstall = new QCheckBox( GroupBoxOptions, "_force_reinstall" ); | ||
58 | QFont _force_reinstall_font( _force_reinstall->font() ); | ||
59 | _force_reinstall_font.setPointSize( 8 ); | ||
60 | _force_reinstall->setFont( _force_reinstall_font ); | ||
61 | _force_reinstall->setText( tr( "-force-reinstall" ) ); | ||
62 | |||
63 | GroupBoxOptionsLayout->addWidget( _force_reinstall, 1, 0 ); | ||
64 | |||
65 | _force_remove = new QCheckBox( GroupBoxOptions, "_force_remove" ); | ||
66 | QFont _force_remove_font( _force_remove->font() ); | ||
67 | _force_remove_font.setPointSize( 8 ); | ||
68 | _force_remove->setFont( _force_remove_font ); | ||
69 | _force_remove->setText( tr( "-force-removal-of-essential-packages" ) ); | ||
70 | |||
71 | GroupBoxOptionsLayout->addWidget( _force_remove, 2, 0 ); | ||
72 | |||
73 | InstallDialogLayout->addWidget( GroupBoxOptions, 1, 0 ); | ||
74 | } | ||
75 | |||
76 | /* | ||
77 | * Destroys the object and frees any allocated resources | ||
78 | */ | ||
79 | InstallDialog::~InstallDialog() | ||
80 | { | ||
81 | // no need to delete child widgets, Qt does it all for us | ||
82 | } | ||
83 | |||
84 | /* | ||
85 | * Main event handler. Reimplemented to handle application | ||
86 | * font changes | ||
87 | */ | ||
88 | bool InstallDialog::event( QEvent* ev ) | ||
89 | { | ||
90 | bool ret = QDialog::event( ev ); | ||
91 | if ( ev->type() == QEvent::ApplicationFontChange ) { | ||
92 | QFont _force_depends_font( _force_depends->font() ); | ||
93 | _force_depends_font.setPointSize( 8 ); | ||
94 | _force_depends->setFont( _force_depends_font ); | ||
95 | QFont _force_reinstall_font( _force_reinstall->font() ); | ||
96 | _force_reinstall_font.setPointSize( 8 ); | ||
97 | _force_reinstall->setFont( _force_reinstall_font ); | ||
98 | QFont _force_remove_font( _force_remove->font() ); | ||
99 | _force_remove_font.setPointSize( 8 ); | ||
100 | _force_remove->setFont( _force_remove_font ); | ||
101 | } | ||
102 | return ret; | ||
103 | } | ||
104 | |||
diff --git a/noncore/unsupported/oipkg/installdialog.h b/noncore/unsupported/oipkg/installdialog.h new file mode 100644 index 0000000..f2164ac --- a/dev/null +++ b/noncore/unsupported/oipkg/installdialog.h | |||
@@ -0,0 +1,46 @@ | |||
1 | /**************************************************************************** | ||
2 | ** Form interface generated from reading ui file 'installdialog.ui' | ||
3 | ** | ||
4 | ** Created: Thu May 2 22:19:01 2002 | ||
5 | ** by: The User Interface Compiler (uic) | ||
6 | ** | ||
7 | ** WARNING! All changes made in this file will be lost! | ||
8 | ****************************************************************************/ | ||
9 | #ifndef INSTALLDIALOG_H | ||
10 | #define INSTALLDIALOG_H | ||
11 | |||
12 | #include "pksettings.h" | ||
13 | #include "packagelistview.h" | ||
14 | #include <qvariant.h> | ||
15 | #include <qdialog.h> | ||
16 | class QVBoxLayout; | ||
17 | class QHBoxLayout; | ||
18 | class QGridLayout; | ||
19 | class QCheckBox; | ||
20 | class QGroupBox; | ||
21 | class QListView; | ||
22 | class QListViewItem; | ||
23 | |||
24 | class InstallDialog : public QDialog | ||
25 | { | ||
26 | Q_OBJECT | ||
27 | |||
28 | public: | ||
29 | InstallDialog( PackageManagerSettings* s, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); | ||
30 | ~InstallDialog(); | ||
31 | |||
32 | PackageListView* ListViewPackages; | ||
33 | QGroupBox* GroupBoxOptions; | ||
34 | QCheckBox* _force_depends; | ||
35 | QCheckBox* _force_reinstall; | ||
36 | QCheckBox* _force_remove; | ||
37 | |||
38 | protected: | ||
39 | QGridLayout* InstallDialogLayout; | ||
40 | QGridLayout* GroupBoxOptionsLayout; | ||
41 | bool event( QEvent* ); | ||
42 | private: | ||
43 | PackageManagerSettings* settings; | ||
44 | }; | ||
45 | |||
46 | #endif // INSTALLDIALOG_H | ||
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp index b668660..259a789 100644 --- a/noncore/unsupported/oipkg/mainwindow.cpp +++ b/noncore/unsupported/oipkg/mainwindow.cpp | |||
@@ -237,4 +237,5 @@ void MainWindow::makeMenu() | |||
237 | MainWindow::~MainWindow() | 237 | MainWindow::~MainWindow() |
238 | { | 238 | { |
239 | pvDebug(7,"MainWindow::~MainWindow "); | ||
239 | Config cfg( "oipkg", Config::User ); | 240 | Config cfg( "oipkg", Config::User ); |
240 | cfg.setGroup( "gui" ); | 241 | cfg.setGroup( "gui" ); |
@@ -243,4 +244,5 @@ MainWindow::~MainWindow() | |||
243 | cfg.writeEntry( "sectionBar", !sectionBar->isHidden() ); | 244 | cfg.writeEntry( "sectionBar", !sectionBar->isHidden() ); |
244 | cfg.writeEntry( "destBar", !destBar->isHidden() ); | 245 | cfg.writeEntry( "destBar", !destBar->isHidden() ); |
246 | pvDebug(7,"MainWindow::~MainWindow "); | ||
245 | 247 | ||
246 | } | 248 | } |
@@ -251,5 +253,6 @@ void MainWindow::runIpkg() | |||
251 | ipkg->loadList( packageListSearch ); | 253 | ipkg->loadList( packageListSearch ); |
252 | ipkg->loadList( packageListDocLnk ); | 254 | ipkg->loadList( packageListDocLnk ); |
253 | ipkg->commit( packageListServers ); | 255 | ipkg->loadList( packageListServers ); |
256 | ipkg->commit(); | ||
254 | // ##### If we looked in the list of files, we could send out accurate | 257 | // ##### If we looked in the list of files, we could send out accurate |
255 | // ##### messages. But we don't bother yet, and just do an "all". | 258 | // ##### messages. But we don't bother yet, and just do an "all". |
diff --git a/noncore/unsupported/oipkg/oipkg.pro b/noncore/unsupported/oipkg/oipkg.pro index 6ee1963..9e2f5f8 100644 --- a/noncore/unsupported/oipkg/oipkg.pro +++ b/noncore/unsupported/oipkg/oipkg.pro | |||
@@ -7,4 +7,5 @@ HEADERS = mainwindow.h \ | |||
7 | pmipkg.h \ | 7 | pmipkg.h \ |
8 | packagelistdoclnk.h \ | 8 | packagelistdoclnk.h \ |
9 | installdialog.h \ | ||
9 | utils.h \ | 10 | utils.h \ |
10 | packagelistitem.h \ | 11 | packagelistitem.h \ |
@@ -19,4 +20,5 @@ SOURCES = main.cpp \ | |||
19 | packagelistdoclnk.cpp \ | 20 | packagelistdoclnk.cpp \ |
20 | packagelistview.cpp \ | 21 | packagelistview.cpp \ |
22 | installdialog.cpp \ | ||
21 | packagelistremote.cpp \ | 23 | packagelistremote.cpp \ |
22 | packagelistlocal.cpp \ | 24 | packagelistlocal.cpp \ |
diff --git a/noncore/unsupported/oipkg/packagelistremote.cpp b/noncore/unsupported/oipkg/packagelistremote.cpp index 1ec7292..3c6ede7 100644 --- a/noncore/unsupported/oipkg/packagelistremote.cpp +++ b/noncore/unsupported/oipkg/packagelistremote.cpp | |||
@@ -42,5 +42,5 @@ void PackageListRemote::update() | |||
42 | cmd += "\""; | 42 | cmd += "\""; |
43 | 43 | ||
44 | pvDebug(2,"search :"+cmd); | 44 | pvDebug(4,"search :"+cmd); |
45 | r = system(cmd.latin1()); | 45 | r = system(cmd.latin1()); |
46 | readFileEntries( redirect ); | 46 | readFileEntries( redirect ); |
diff --git a/noncore/unsupported/oipkg/pksettings.cpp b/noncore/unsupported/oipkg/pksettings.cpp index 7e2ef10..24c7beb 100644 --- a/noncore/unsupported/oipkg/pksettings.cpp +++ b/noncore/unsupported/oipkg/pksettings.cpp | |||
@@ -59,4 +59,5 @@ PackageManagerSettings::PackageManagerSettings( QWidget* parent, const char* na | |||
59 | readSettings(); | 59 | readSettings(); |
60 | activeLinkDestination->hide(); | 60 | activeLinkDestination->hide(); |
61 | serverChanged = false; | ||
61 | } | 62 | } |
62 | 63 | ||
@@ -120,5 +121,5 @@ void PackageManagerSettings::editServer(int i) | |||
120 | 121 | ||
121 | editedserver = i; | 122 | editedserver = i; |
122 | 123 | serverChanged = true; | |
123 | connect( servername, SIGNAL(textChanged(const QString&)), this, SLOT(serverNameChanged(const QString&)) ); | 124 | connect( servername, SIGNAL(textChanged(const QString&)), this, SLOT(serverNameChanged(const QString&)) ); |
124 | connect( serverurl, SIGNAL(textChanged(const QString&)), this, SLOT(serverUrlChanged(const QString&)) ); | 125 | connect( serverurl, SIGNAL(textChanged(const QString&)), this, SLOT(serverUrlChanged(const QString&)) ); |
@@ -135,6 +136,7 @@ void PackageManagerSettings::editDestination(int i) | |||
135 | destinationname->setEnabled(TRUE); | 136 | destinationname->setEnabled(TRUE); |
136 | destinationurl->setEnabled(TRUE); | 137 | destinationurl->setEnabled(TRUE); |
137 | createLinksButton->setEnabled(TRUE); | 138 | //since it does not work anyway |
138 | removeLinksButton->setEnabled(TRUE); | 139 | // createLinksButton->setEnabled(TRUE); |
140 | // removeLinksButton->setEnabled(TRUE); | ||
139 | } | 141 | } |
140 | 142 | ||
@@ -185,7 +187,7 @@ void PackageManagerSettings::serverNameChanged(const QString& t) | |||
185 | servers->changeItem( t, editedserver ); | 187 | servers->changeItem( t, editedserver ); |
186 | activeServers->changeItem( t, editedserver ); | 188 | activeServers->changeItem( t, editedserver ); |
187 | changed = true; | ||
188 | connect( servers, SIGNAL(highlighted(int)), this, SLOT(editServer(int)) ); | 189 | connect( servers, SIGNAL(highlighted(int)), this, SLOT(editServer(int)) ); |
189 | changed = true; | 190 | changed = true; |
191 | serverChanged = true; | ||
190 | } | 192 | } |
191 | 193 | ||
@@ -204,4 +206,5 @@ void PackageManagerSettings::serverUrlChanged(const QString& t) | |||
204 | serverurlDic.replace(editedserver, new QString(t)); | 206 | serverurlDic.replace(editedserver, new QString(t)); |
205 | changed = true; | 207 | changed = true; |
208 | serverChanged = true; | ||
206 | } | 209 | } |
207 | 210 | ||
diff --git a/noncore/unsupported/oipkg/pksettings.h b/noncore/unsupported/oipkg/pksettings.h index 1632d4a..dcc1e3a 100644 --- a/noncore/unsupported/oipkg/pksettings.h +++ b/noncore/unsupported/oipkg/pksettings.h | |||
@@ -65,4 +65,5 @@ private: | |||
65 | int installationSettingsCount; | 65 | int installationSettingsCount; |
66 | bool changed; | 66 | bool changed; |
67 | bool serverChanged; | ||
67 | 68 | ||
68 | bool readIpkgConfig(const QString&); | 69 | bool readIpkgConfig(const QString&); |
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp index be9d6da..fd8279b 100644 --- a/noncore/unsupported/oipkg/pmipkg.cpp +++ b/noncore/unsupported/oipkg/pmipkg.cpp | |||
@@ -58,11 +58,11 @@ int PmIpkg::runIpkg(const QString& args, const QString& dest ) | |||
58 | cmd += " -force-defaults "; | 58 | cmd += " -force-defaults "; |
59 | 59 | ||
60 | if (_force_depends) | 60 | if (installDialog->_force_depends) |
61 | { | 61 | { |
62 | if (_force_depends->isChecked()) | 62 | if (installDialog->_force_depends->isChecked()) |
63 | cmd += " -force-depends "; | 63 | cmd += " -force-depends "; |
64 | if (_force_reinstall->isChecked()) | 64 | if (installDialog->_force_reinstall->isChecked()) |
65 | cmd += " -force-reinstall "; | 65 | cmd += " -force-reinstall "; |
66 | if (_force_remove->isChecked()) | 66 | if (installDialog->_force_remove->isChecked()) |
67 | cmd += " -force-removal-of-essential-packages "; | 67 | cmd += " -force-removal-of-essential-packages "; |
68 | } | 68 | } |
@@ -174,18 +174,15 @@ void PmIpkg::processLinkDir( QString file, QString dest ) | |||
174 | if (linkOpp==createLink) destDir.mkdir( destFile, true ); | 174 | if (linkOpp==createLink) destDir.mkdir( destFile, true ); |
175 | QDir d( file ); | 175 | QDir d( file ); |
176 | d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks ); | 176 | // d.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks ); |
177 | const QFileInfoList *list = d.entryInfoList(); | 177 | const QFileInfoList *list = d.entryInfoList(); |
178 | QFileInfoListIterator it( *list ); | 178 | QFileInfoListIterator it( *list ); |
179 | QFileInfo *fi; | 179 | QFileInfo *fi; |
180 | qDebug( "while %i",list->count()); | ||
180 | while ( (fi=it.current()) ) | 181 | while ( (fi=it.current()) ) |
181 | { | 182 | { |
183 | pvDebug(4, "processLinkDir "+fi->absFilePath()); | ||
182 | processLinkDir( fi->absFilePath(), dest ); | 184 | processLinkDir( fi->absFilePath(), dest ); |
183 | ++it; | 185 | ++it; |
184 | } | 186 | } |
185 | // if (linkOpp==removeLink) | ||
186 | // { | ||
187 | // pvDebug(2,"remove destDir "+ destFile ); | ||
188 | // destDir.remove( destFile, true ); | ||
189 | // } | ||
190 | } else | 187 | } else |
191 | if ( fileInfo.isFile() ) | 188 | if ( fileInfo.isFile() ) |
@@ -202,8 +199,10 @@ void PmIpkg::processLinkDir( QString file, QString dest ) | |||
202 | if( linkOpp==removeLink ) | 199 | if( linkOpp==removeLink ) |
203 | { | 200 | { |
204 | pvDebug(4,"removing "+destFile+" no "+file); | ||
205 | QFileInfo toRemoveLink( destFile ); | 201 | QFileInfo toRemoveLink( destFile ); |
206 | if ( !QFile::exists( file ) && toRemoveLink.isSymLink() ) | 202 | if ( !QFile::exists( file ) && toRemoveLink.isSymLink() ) |
203 | { | ||
204 | pvDebug(4,"removing "+destFile+" no "+file); | ||
207 | unlink( linkFile ); | 205 | unlink( linkFile ); |
206 | } | ||
208 | } | 207 | } |
209 | } | 208 | } |
@@ -224,10 +223,7 @@ void PmIpkg::loadList( PackageList pl ) | |||
224 | } | 223 | } |
225 | 224 | ||
226 | void PmIpkg::commit( PackageList pl ) | 225 | void PmIpkg::commit() |
227 | { | 226 | { |
228 | int sizecount = 0; | 227 | int sizecount = 0; |
229 | // QString rem="<b>"+tr("To remove:")+"</b><br>\n"; | ||
230 | // QString inst="<b>"+tr("To install:")+"</b><br>\n"; | ||
231 | loadList(pl); | ||
232 | for (uint i=0; i < to_remove.count(); i++) | 228 | for (uint i=0; i < to_remove.count(); i++) |
233 | sizecount += 1; | 229 | sizecount += 1; |
@@ -240,55 +236,24 @@ void PmIpkg::commit( PackageList pl ) | |||
240 | void PmIpkg::startDialog() | 236 | void PmIpkg::startDialog() |
241 | { | 237 | { |
242 | installDialog = new QDialog(0,0,true); | 238 | installDialog = new InstallDialog(settings,0,0,true); |
243 | QGridLayout *RunWindowLayout = new QGridLayout( installDialog ); | 239 | QCheckListItem *toRemoveItem; |
244 | RunWindowLayout->setSpacing( 2 ); | 240 | toRemoveItem= new QCheckListItem( installDialog->ListViewPackages, QObject::tr("To remove") ); |
245 | RunWindowLayout->setMargin( 2 ); | 241 | toRemoveItem->setOpen( true ); |
246 | 242 | for (Package *it=to_remove.first(); it != 0; it=to_remove.next() ) | |
247 | PackageListView *plv = new PackageListView(installDialog, "install",settings); | 243 | { |
248 | plv->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding, plv->sizePolicy().mayShrinkVertically()) ); | 244 | toRemoveItem->insertItem( new PackageListItem(installDialog->ListViewPackages, it,settings) ); |
249 | RunWindowLayout->addWidget( plv, 1, 0 ); | 245 | } |
250 | QCheckListItem *toRemoveItem; | 246 | QCheckListItem *toInstallItem; |
251 | toRemoveItem= new QCheckListItem( plv, QObject::tr("To remove") ); | 247 | toInstallItem = new QCheckListItem( installDialog->ListViewPackages, QObject::tr("To install") ); |
252 | toRemoveItem->setOpen( true ); | 248 | toInstallItem->setOpen( true ); |
253 | for (Package *it=to_remove.first(); it != 0; it=to_remove.next() ) | 249 | for (Package *it=to_install.first(); it != 0; it=to_install.next() ) |
254 | { | 250 | { |
255 | toRemoveItem->insertItem( new PackageListItem(plv, it,settings) ); | 251 | toInstallItem->insertItem( new PackageListItem(installDialog->ListViewPackages, it,settings) ); |
256 | } | 252 | } |
257 | QCheckListItem *toInstallItem; | ||
258 | toInstallItem = new QCheckListItem( plv, QObject::tr("To install") ); | ||
259 | toInstallItem->setOpen( true ); | ||
260 | for (Package *it=to_install.first(); it != 0; it=to_install.next() ) | ||
261 | { | ||
262 | toInstallItem->insertItem( new PackageListItem(plv, it,settings) ); | ||
263 | } | ||
264 | |||
265 | QGroupBox *GroupBox1 = new QGroupBox( installDialog, "Ipkg" ); | ||
266 | GroupBox1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, (QSizePolicy::SizeType)3, GroupBox1->sizePolicy().mayShrinkVertically() ) ); | ||
267 | GroupBox1->setTitle( tr( "Ipkg options" ) ); | ||
268 | GroupBox1->setColumnLayout(0, Qt::Vertical ); | ||
269 | GroupBox1->layout()->setSpacing( 0 ); | ||
270 | GroupBox1->layout()->setMargin( 0 ); | ||
271 | QGridLayout *GroupBox1Layout = new QGridLayout( GroupBox1->layout() ); | ||
272 | GroupBox1Layout->setAlignment( Qt::AlignTop ); | ||
273 | GroupBox1Layout->setSpacing( 3 ); | ||
274 | GroupBox1Layout->setMargin( 3 ); | ||
275 | _force_depends = new QCheckBox( GroupBox1, "_force_depends" ); | ||
276 | _force_depends->setText( tr( "-force-depends" ) ); | ||
277 | _force_depends->setAutoResize( TRUE ); | ||
278 | _force_depends->setChecked(true); | ||
279 | GroupBox1Layout->addWidget( _force_depends, 0, 0 ); | ||
280 | _force_reinstall = new QCheckBox( GroupBox1, "_force_reinstall" ); | ||
281 | _force_reinstall->setText( tr( "-force-reinstall" ) ); | ||
282 | _force_reinstall->setAutoResize( TRUE ); | ||
283 | GroupBox1Layout->addWidget( _force_reinstall, 1, 0 ); | ||
284 | _force_remove = new QCheckBox( GroupBox1, "_force_remove" ); | ||
285 | _force_remove->setText( tr( "-force-removal-of-essential-packages" ) ); | ||
286 | _force_remove->setAutoResize( TRUE ); | ||
287 | GroupBox1Layout->addWidget( _force_remove, 1, 0 ); | ||
288 | RunWindowLayout->addWidget( GroupBox1 , 3, 0 ); | ||
289 | installDialog->showMaximized(); | 253 | installDialog->showMaximized(); |
290 | if ( installDialog->exec() ) doIt(); | 254 | if ( installDialog->exec() ) doIt(); |
291 | installDialog->close(); | 255 | installDialog->close(); |
292 | out(tr("<b>All done.</b>")); | 256 | out(tr("<b>All done.</b>")); |
257 | to_install.clear(); | ||
293 | } | 258 | } |
294 | 259 | ||
@@ -358,4 +323,5 @@ void PmIpkg::install() | |||
358 | } | 323 | } |
359 | out("<br>"); | 324 | out("<br>"); |
325 | to_install.clear(); | ||
360 | } | 326 | } |
361 | 327 | ||
@@ -366,5 +332,6 @@ void PmIpkg::createLinks( const QString &dest ) | |||
366 | QString url = settings->getDestinationUrlByName( dest ); | 332 | QString url = settings->getDestinationUrlByName( dest ); |
367 | url = url==""?dest:url; | 333 | url = url==""?dest:url; |
368 | processLinkDir( "/", url ); | 334 | processLinkDir( "/opt", url ); |
335 | processLinkDir( "/usr", url ); | ||
369 | } | 336 | } |
370 | 337 | ||
@@ -375,5 +342,6 @@ void PmIpkg::removeLinks( const QString &dest ) | |||
375 | QString url = settings->getDestinationUrlByName( dest ); | 342 | QString url = settings->getDestinationUrlByName( dest ); |
376 | url = url==""?dest:url; | 343 | url = url==""?dest:url; |
377 | processLinkDir( "/", url ); | 344 | processLinkDir( "/opt", url ); |
345 | processLinkDir( "/usr", url ); | ||
378 | } | 346 | } |
379 | 347 | ||
diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h index 3799969..d2490e8 100644 --- a/noncore/unsupported/oipkg/pmipkg.h +++ b/noncore/unsupported/oipkg/pmipkg.h | |||
@@ -10,4 +10,5 @@ | |||
10 | #include "runwindow.h" | 10 | #include "runwindow.h" |
11 | #include "packagelist.h" | 11 | #include "packagelist.h" |
12 | #include "installdialog.h" | ||
12 | #include "debug.h" | 13 | #include "debug.h" |
13 | 14 | ||
@@ -25,5 +26,5 @@ public: | |||
25 | int linkOpp; | 26 | int linkOpp; |
26 | void loadList( PackageList ); | 27 | void loadList( PackageList ); |
27 | void commit( PackageList ); | 28 | void commit(); |
28 | void update(); | 29 | void update(); |
29 | void showButtons(bool b=true); | 30 | void showButtons(bool b=true); |
@@ -40,11 +41,9 @@ public slots: | |||
40 | 41 | ||
41 | private: | 42 | private: |
42 | //int sizecount; | ||
43 | PackageManagerSettings* settings; | 43 | PackageManagerSettings* settings; |
44 | RunWindow *runwindow; | 44 | RunWindow *runwindow; |
45 | QDialog *installDialog; | 45 | InstallDialog *installDialog; |
46 | QList<Package> to_remove; | 46 | QList<Package> to_remove; |
47 | QList<Package> to_install; | 47 | QList<Package> to_install; |
48 | // bool runwindowopen; | ||
49 | QString fileNameToInstall; | 48 | QString fileNameToInstall; |
50 | QCheckBox *_force_reinstall; | 49 | QCheckBox *_force_reinstall; |
diff --git a/noncore/unsupported/oipkg/settings.h b/noncore/unsupported/oipkg/settings.h index bab7a4f..f01cb69 100644 --- a/noncore/unsupported/oipkg/settings.h +++ b/noncore/unsupported/oipkg/settings.h | |||
@@ -56,4 +56,5 @@ private: | |||
56 | int installationSettingsCount; | 56 | int installationSettingsCount; |
57 | bool changed; | 57 | bool changed; |
58 | bool serverChanged; | ||
58 | 59 | ||
59 | bool readIpkgConfig(const QString&); | 60 | bool readIpkgConfig(const QString&); |