summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/TODO13
-rw-r--r--noncore/unsupported/oipkg/installdialog.cpp4
-rw-r--r--noncore/unsupported/oipkg/main.cpp2
-rw-r--r--noncore/unsupported/oipkg/mainwindow.cpp3
-rw-r--r--noncore/unsupported/oipkg/oipkg.pro3
-rw-r--r--noncore/unsupported/oipkg/package.cpp23
-rw-r--r--noncore/unsupported/oipkg/package.h15
-rw-r--r--noncore/unsupported/oipkg/packagelist.cpp10
-rw-r--r--noncore/unsupported/oipkg/packagelist.h8
-rw-r--r--noncore/unsupported/oipkg/packagelistdoclnk.cpp8
-rw-r--r--noncore/unsupported/oipkg/packagelistdoclnk.h4
-rw-r--r--noncore/unsupported/oipkg/packagelistitem.cpp2
-rw-r--r--noncore/unsupported/oipkg/packagelistview.cpp6
-rw-r--r--noncore/unsupported/oipkg/pksettings.cpp1
-rw-r--r--noncore/unsupported/oipkg/pksettings.h2
-rw-r--r--noncore/unsupported/oipkg/pmipkg.cpp72
-rw-r--r--noncore/unsupported/oipkg/pmipkg.h10
-rw-r--r--noncore/unsupported/oipkg/settings.h2
18 files changed, 139 insertions, 49 deletions
diff --git a/noncore/unsupported/oipkg/TODO b/noncore/unsupported/oipkg/TODO
index e7b017c..6e0e6ca 100644
--- a/noncore/unsupported/oipkg/TODO
+++ b/noncore/unsupported/oipkg/TODO
@@ -1,13 +1,20 @@
1* check for networt before installing from network 1* check for network before installing from network
2* Settings Class 2* Settings Class / new setting dialog
3* parse "to install" and "to remove" from status 3* parse "to install" and "to remove" from status, and change status
4 i.e. improve status handling / modify status file
5 dest keyword in status? -> cworth
4* install local file dialog 6* install local file dialog
7* parse lists files after opening feed / doclnk
5* qcop 8* qcop
6* error handling 9* error handling
7* manage links 10* manage links
8* dependency checking 11* dependency checking
9* create dest if it does not exist 12* create dest if it does not exist
10* allow reinstalling 13* allow reinstalling
11* different types of filters and searches 14* different types of filters and searches
12 i.e. name, desc, files etc 15 i.e. name, desc, files etc
13* display new list after update 16* display new list after update
17* make sure oipkg installs to the correct dest when getting packet to install from list
18 dest keyword?
19* cancel button while installing
20* duplicate button for settings-servers
diff --git a/noncore/unsupported/oipkg/installdialog.cpp b/noncore/unsupported/oipkg/installdialog.cpp
index a2c9702..bb50103 100644
--- a/noncore/unsupported/oipkg/installdialog.cpp
+++ b/noncore/unsupported/oipkg/installdialog.cpp
@@ -10,98 +10,98 @@
10 10
11#include <qcheckbox.h> 11#include <qcheckbox.h>
12#include <qgroupbox.h> 12#include <qgroupbox.h>
13#include <qheader.h> 13#include <qheader.h>
14#include <qlistview.h> 14#include <qlistview.h>
15#include <qpushbutton.h> 15#include <qpushbutton.h>
16#include <qlayout.h> 16#include <qlayout.h>
17#include <qvariant.h> 17#include <qvariant.h>
18#include <qtooltip.h> 18#include <qtooltip.h>
19#include <qwhatsthis.h> 19#include <qwhatsthis.h>
20 20
21 21
22InstallDialog::InstallDialog( PackageManagerSettings* s, QWidget* parent, const char* name, bool modal, WFlags fl ) 22InstallDialog::InstallDialog( PackageManagerSettings* s, QWidget* parent, const char* name, bool modal, WFlags fl )
23 : QDialog( parent, name, modal, fl ) 23 : QDialog( parent, name, modal, fl )
24{ 24{
25 settings = s; 25 settings = s;
26 if ( !name ) 26 if ( !name )
27 setName( "InstallDialog" ); 27 setName( "InstallDialog" );
28 resize( 223, 269 ); 28 resize( 223, 269 );
29 setCaption( tr( "Install" ) ); 29 setCaption( tr( "Install" ) );
30 InstallDialogLayout = new QGridLayout( this ); 30 InstallDialogLayout = new QGridLayout( this );
31 InstallDialogLayout->setSpacing( 2 ); 31 InstallDialogLayout->setSpacing( 2 );
32 InstallDialogLayout->setMargin( 2 ); 32 InstallDialogLayout->setMargin( 2 );
33 33
34 ListViewPackages = new PackageListView( this,"listViewPackages",settings ); 34 ListViewPackages = new PackageListView( this,"listViewPackages",settings );
35 35
36 InstallDialogLayout->addWidget( ListViewPackages, 0, 0 ); 36 InstallDialogLayout->addWidget( ListViewPackages, 0, 0 );
37 37
38 GroupBoxOptions = new QGroupBox( this, "GroupBoxOptions" ); 38 GroupBoxOptions = new QGroupBox( this, "GroupBoxOptions" );
39 GroupBoxOptions->setTitle( tr( "Ipkg options" ) ); 39 GroupBoxOptions->setTitle( tr( "Ipkg options" ) );
40 GroupBoxOptions->setColumnLayout(0, Qt::Vertical ); 40 GroupBoxOptions->setColumnLayout(0, Qt::Vertical );
41 GroupBoxOptions->layout()->setSpacing( 0 ); 41 GroupBoxOptions->layout()->setSpacing( 0 );
42 GroupBoxOptions->layout()->setMargin( 0 ); 42 GroupBoxOptions->layout()->setMargin( 0 );
43 GroupBoxOptionsLayout = new QGridLayout( GroupBoxOptions->layout() ); 43 GroupBoxOptionsLayout = new QGridLayout( GroupBoxOptions->layout() );
44 GroupBoxOptionsLayout->setAlignment( Qt::AlignTop ); 44 GroupBoxOptionsLayout->setAlignment( Qt::AlignTop );
45 GroupBoxOptionsLayout->setSpacing( 2 ); 45 GroupBoxOptionsLayout->setSpacing( 2 );
46 GroupBoxOptionsLayout->setMargin( 2 ); 46 GroupBoxOptionsLayout->setMargin( 2 );
47 47
48 _force_depends = new QCheckBox( GroupBoxOptions, "_force_depends" ); 48 _force_depends = new QCheckBox( GroupBoxOptions, "_force_depends" );
49 QFont _force_depends_font( _force_depends->font() ); 49 QFont _force_depends_font( _force_depends->font() );
50 _force_depends_font.setPointSize( 8 ); 50 _force_depends_font.setPointSize( 8 );
51 _force_depends->setFont( _force_depends_font ); 51 _force_depends->setFont( _force_depends_font );
52 _force_depends->setText( tr( "-force-depends" ) ); 52 _force_depends->setText( tr( "-force-depends" ) );
53 //_force_depends->setChecked( true ); 53 //_force_depends->setChecked( true );
54 54
55 GroupBoxOptionsLayout->addWidget( _force_depends, 0, 0 ); 55 GroupBoxOptionsLayout->addWidget( _force_depends, 0, 0 );
56 56
57 _force_reinstall = new QCheckBox( GroupBoxOptions, "_force_reinstall" ); 57 _force_reinstall = new QCheckBox( GroupBoxOptions, "_force_reinstall" );
58 QFont _force_reinstall_font( _force_reinstall->font() ); 58 QFont _force_reinstall_font( _force_reinstall->font() );
59 _force_reinstall_font.setPointSize( 8 ); 59 _force_reinstall_font.setPointSize( 8 );
60 _force_reinstall->setFont( _force_reinstall_font ); 60 _force_reinstall->setFont( _force_reinstall_font );
61 _force_reinstall->setText( tr( "-force-reinstall" ) ); 61 _force_reinstall->setText( tr( "-force-reinstall" ) );
62 62
63 GroupBoxOptionsLayout->addWidget( _force_reinstall, 1, 0 ); 63 GroupBoxOptionsLayout->addWidget( _force_reinstall, 1, 0 );
64 64
65 _force_remove = new QCheckBox( GroupBoxOptions, "_force_remove" ); 65 _force_remove = new QCheckBox( GroupBoxOptions, "_force_remove" );
66 QFont _force_remove_font( _force_remove->font() ); 66 QFont _force_remove_font( _force_remove->font() );
67 _force_remove_font.setPointSize( 8 ); 67 _force_remove_font.setPointSize( 8 );
68 _force_remove->setFont( _force_remove_font ); 68 _force_remove->setFont( _force_remove_font );
69 _force_remove->setText( tr( "-force-removal-of-essential-packages" ) ); 69 _force_remove->setText( tr( "-force-removal-of-essential-packages" ) );
70 70
71 GroupBoxOptionsLayout->addWidget( _force_remove, 2, 0 ); 71 GroupBoxOptionsLayout->addWidget( _force_remove, 2, 0 );
72 72
73 InstallDialogLayout->addWidget( GroupBoxOptions, 1, 0 ); 73 InstallDialogLayout->addWidget( GroupBoxOptions, 1, 0 );
74 toRemoveItem = new QCheckListItem( ListViewPackages, QObject::tr("To remove") ); 74 toRemoveItem = new QCheckListItem( ListViewPackages, tr("To remove") );
75 toInstallItem = new QCheckListItem( ListViewPackages, QObject::tr("To install") ); 75 toInstallItem = new QCheckListItem( ListViewPackages, tr("To install") );
76 76
77} 77}
78 78
79/* 79/*
80 * Destroys the object and frees any allocated resources 80 * Destroys the object and frees any allocated resources
81 */ 81 */
82InstallDialog::~InstallDialog() 82InstallDialog::~InstallDialog()
83{ 83{
84 // no need to delete child widgets, Qt does it all for us 84 // no need to delete child widgets, Qt does it all for us
85} 85}
86 86
87/* 87/*
88 * Main event handler. Reimplemented to handle application 88 * Main event handler. Reimplemented to handle application
89 * font changes 89 * font changes
90 */ 90 */
91bool InstallDialog::event( QEvent* ev ) 91bool InstallDialog::event( QEvent* ev )
92{ 92{
93 bool ret = QDialog::event( ev ); 93 bool ret = QDialog::event( ev );
94 if ( ev->type() == QEvent::ApplicationFontChange ) { 94 if ( ev->type() == QEvent::ApplicationFontChange ) {
95 QFont _force_depends_font( _force_depends->font() ); 95 QFont _force_depends_font( _force_depends->font() );
96 _force_depends_font.setPointSize( 8 ); 96 _force_depends_font.setPointSize( 8 );
97 _force_depends->setFont( _force_depends_font ); 97 _force_depends->setFont( _force_depends_font );
98 QFont _force_reinstall_font( _force_reinstall->font() ); 98 QFont _force_reinstall_font( _force_reinstall->font() );
99 _force_reinstall_font.setPointSize( 8 ); 99 _force_reinstall_font.setPointSize( 8 );
100 _force_reinstall->setFont( _force_reinstall_font ); 100 _force_reinstall->setFont( _force_reinstall_font );
101 QFont _force_remove_font( _force_remove->font() ); 101 QFont _force_remove_font( _force_remove->font() );
102 _force_remove_font.setPointSize( 8 ); 102 _force_remove_font.setPointSize( 8 );
103 _force_remove->setFont( _force_remove_font ); 103 _force_remove->setFont( _force_remove_font );
104 } 104 }
105 return ret; 105 return ret;
106} 106}
107 107
diff --git a/noncore/unsupported/oipkg/main.cpp b/noncore/unsupported/oipkg/main.cpp
index de25e27..f72540c 100644
--- a/noncore/unsupported/oipkg/main.cpp
+++ b/noncore/unsupported/oipkg/main.cpp
@@ -1,25 +1,25 @@
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//#include <qmessagebox.h> 6//#include <qmessagebox.h>
7int debugLevel; 7int debugLevel;
8 8
9int main( int argc, char ** argv ) 9int main( int argc, char ** argv )
10{ 10{
11 printf("This is oipkg\n"); 11 printf("This is oipkg\n");
12 printf("$ID$\n"); 12 printf("$Id$\n");
13 debugLevel = 2; 13 debugLevel = 2;
14 if (argc > 1) 14 if (argc > 1)
15 { 15 {
16 debugLevel = QString ( argv[1] ).toInt(); 16 debugLevel = QString ( argv[1] ).toInt();
17 qDebug("setting debug level to %i",debugLevel); 17 qDebug("setting debug level to %i",debugLevel);
18 } 18 }
19 QPEApplication a( argc, argv ); 19 QPEApplication a( argc, argv );
20 MainWindow mw; 20 MainWindow mw;
21// if (argc > 2) 21// if (argc > 2)
22 // QMessageBox::information( &mw, "oipkg","While ipkg is working\noipkg is hanging.\nPlease be patient!"); 22 // QMessageBox::information( &mw, "oipkg","While ipkg is working\noipkg is hanging.\nPlease be patient!");
23 a.showMainDocumentWidget( &mw ); 23 a.showMainDocumentWidget( &mw );
24 return a.exec(); 24 return a.exec();
25} 25}
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 27c9f4c..11ab406 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -1,99 +1,102 @@
1// adadpted form qpe/qipkg 1// adadpted form qpe/qipkg
2 2
3 3
4#include "mainwindow.h" 4#include "mainwindow.h"
5 5
6#include <qpe/qpemenubar.h> 6#include <qpe/qpemenubar.h>
7#include <qpe/qpemessagebox.h> 7#include <qpe/qpemessagebox.h>
8#include <qpe/resource.h> 8#include <qpe/resource.h>
9#include <qpe/config.h> 9#include <qpe/config.h>
10#include <qpe/qpetoolbar.h> 10#include <qpe/qpetoolbar.h>
11#include <qpe/qcopenvelope_qws.h> 11#include <qpe/qcopenvelope_qws.h>
12#include <qaction.h> 12#include <qaction.h>
13#include <qmessagebox.h> 13#include <qmessagebox.h>
14#include <qpopupmenu.h> 14#include <qpopupmenu.h>
15#include <qtoolbutton.h> 15#include <qtoolbutton.h>
16#include <qstring.h> 16#include <qstring.h>
17#include <qlabel.h> 17#include <qlabel.h>
18#include <qfile.h> 18#include <qfile.h>
19#include <qlistview.h> 19#include <qlistview.h>
20#include <qtextview.h> 20#include <qtextview.h>
21#include <qcheckbox.h> 21#include <qcheckbox.h>
22#include <qlineedit.h> 22#include <qlineedit.h>
23#include <qtabwidget.h> 23#include <qtabwidget.h>
24#include <qcombobox.h> 24#include <qcombobox.h>
25#include <qmessagebox.h> 25#include <qmessagebox.h>
26#include <qpushbutton.h> 26#include <qpushbutton.h>
27#include <qlayout.h> 27#include <qlayout.h>
28 28
29#include "pksettingsbase.h" 29#include "pksettingsbase.h"
30#include "utils.h" 30#include "utils.h"
31#include "packagelistitem.h" 31#include "packagelistitem.h"
32 32
33 33
34MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) : 34MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) :
35 QMainWindow( parent, name, f ) 35 QMainWindow( parent, name, f )
36// packageListServers( QObject(parent), name ),
37// packageListSearch( parent, name ),
38// packageListDocLnk( parent, name )
36 { 39 {
37 setCaption( tr("Package Manager") ); 40 setCaption( tr("Package Manager") );
38 settings = new PackageManagerSettings(this,0,TRUE); 41 settings = new PackageManagerSettings(this,0,TRUE);
39 listViewPackages = new PackageListView( this,"listViewPackages",settings ); 42 listViewPackages = new PackageListView( this,"listViewPackages",settings );
40 setCentralWidget( listViewPackages ); 43 setCentralWidget( listViewPackages );
41 listViewPackages->addList( tr("feeds"), &packageListServers ); 44 listViewPackages->addList( tr("feeds"), &packageListServers );
42 listViewPackages->addList( tr("ipkgfind"), &packageListSearch ); 45 listViewPackages->addList( tr("ipkgfind"), &packageListSearch );
43 listViewPackages->addList( tr("documents"), &packageListDocLnk ); 46 listViewPackages->addList( tr("documents"), &packageListDocLnk );
44 ipkg = new PmIpkg( settings, this ); 47 ipkg = new PmIpkg( settings, this );
45 packageListServers.setSettings( settings ); 48 packageListServers.setSettings( settings );
46 packageListSearch.setSettings( settings ); 49 packageListSearch.setSettings( settings );
47 packageListDocLnk.setSettings( settings ); 50 packageListDocLnk.setSettings( settings );
48 pvDebug(9,"packageListServers.update"); 51 pvDebug(9,"packageListServers.update");
49 packageListServers.update(); 52 packageListServers.update();
50 pvDebug(9,"packageListDocLnk.update"); 53 pvDebug(9,"packageListDocLnk.update");
51 packageListDocLnk.update(); 54 packageListDocLnk.update();
52 pvDebug(9,"makeMenu"); 55 pvDebug(9,"makeMenu");
53 makeMenu(); 56 makeMenu();
54 makeChannel(); 57 makeChannel();
55 //opie is hardcoded default ;) 58 //opie is hardcoded default ;)
56 //pvDebug(9,"section->setCurrentItem"); 59 //pvDebug(9,"section->setCurrentItem");
57// for (int i=0;i<section->count();i++) 60// for (int i=0;i<section->count();i++)
58 // if (section->text(i)=="opie") 61 // if (section->text(i)=="opie")
59 // section->setCurrentItem(i); 62 // section->setCurrentItem(i);
60// sectionChanged(); 63// sectionChanged();
61 64
62 connect( section, SIGNAL(activated(int)), SLOT(sectionChanged()) ); 65 connect( section, SIGNAL(activated(int)), SLOT(sectionChanged()) );
63 connect( subsection, SIGNAL(activated(int)), SLOT(subSectionChanged()) ); 66 connect( subsection, SIGNAL(activated(int)), SLOT(subSectionChanged()) );
64 67
65 connect( settings->removeLinksButton, SIGNAL( clicked()), 68 connect( settings->removeLinksButton, SIGNAL( clicked()),
66 SLOT(removeLinks()) ); 69 SLOT(removeLinks()) );
67 connect( settings->createLinksButton, SIGNAL( clicked()), 70 connect( settings->createLinksButton, SIGNAL( clicked()),
68 SLOT(createLinks()) ); 71 SLOT(createLinks()) );
69 72
70 pvDebug(9,"displayList"); 73 pvDebug(9,"displayList");
71 displayList(); 74 displayList();
72} 75}
73 76
74void MainWindow::makeMenu() 77void MainWindow::makeMenu()
75{ 78{
76 79
77 QPEToolBar *toolBar = new QPEToolBar( this ); 80 QPEToolBar *toolBar = new QPEToolBar( this );
78 QPEMenuBar *menuBar = new QPEMenuBar( toolBar ); 81 QPEMenuBar *menuBar = new QPEMenuBar( toolBar );
79 QPopupMenu *srvMenu = new QPopupMenu( menuBar ); 82 QPopupMenu *srvMenu = new QPopupMenu( menuBar );
80 QPopupMenu *viewMenu = new QPopupMenu( menuBar ); 83 QPopupMenu *viewMenu = new QPopupMenu( menuBar );
81 QPopupMenu *cfgMenu = new QPopupMenu( menuBar ); 84 QPopupMenu *cfgMenu = new QPopupMenu( menuBar );
82 // QPopupMenu *sectMenu = new QPopupMenu( menuBar ); 85 // QPopupMenu *sectMenu = new QPopupMenu( menuBar );
83 86
84 setToolBarsMovable( false ); 87 setToolBarsMovable( false );
85 toolBar->setHorizontalStretchable( true ); 88 toolBar->setHorizontalStretchable( true );
86 menuBar->insertItem( tr( "Package" ), srvMenu ); 89 menuBar->insertItem( tr( "Package" ), srvMenu );
87 menuBar->insertItem( tr( "View" ), viewMenu ); 90 menuBar->insertItem( tr( "View" ), viewMenu );
88 menuBar->insertItem( tr( "Settings" ), cfgMenu ); 91 menuBar->insertItem( tr( "Settings" ), cfgMenu );
89 // menuBar->insertItem( tr( "Sections" ), sectMenu ); 92 // menuBar->insertItem( tr( "Sections" ), sectMenu );
90 93
91 QLabel *spacer; 94 QLabel *spacer;
92// spacer = new QLabel( "", toolBar ); 95// spacer = new QLabel( "", toolBar );
93// spacer->setBackgroundColor( toolBar->backgroundColor() ); 96// spacer->setBackgroundColor( toolBar->backgroundColor() );
94// toolBar->setStretchableWidget( spacer ); 97// toolBar->setStretchableWidget( spacer );
95 98
96 99
97 runAction = new QAction( tr( "Apply" ), 100 runAction = new QAction( tr( "Apply" ),
98 Resource::loadPixmap( "oipkg/install" ), 101 Resource::loadPixmap( "oipkg/install" ),
99 QString::null, 0, this, 0 ); 102 QString::null, 0, this, 0 );
diff --git a/noncore/unsupported/oipkg/oipkg.pro b/noncore/unsupported/oipkg/oipkg.pro
index 9e2f5f8..7f60ed8 100644
--- a/noncore/unsupported/oipkg/oipkg.pro
+++ b/noncore/unsupported/oipkg/oipkg.pro
@@ -1,36 +1,37 @@
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 packagelistdoclnk.h \ 8 packagelistdoclnk.h \
9 installdialog.h \ 9 installdialog.h \
10 utils.h \ 10 utils.h \
11 packagelistitem.h \ 11 packagelistitem.h \
12 packagelistremote.h \ 12 packagelistremote.h \
13 packagelist.h \ 13 packagelist.h \
14 packagelistlocal.h \ 14 packagelistlocal.h \
15 packagelistview.h \ 15 packagelistview.h \
16 package.h 16 package.h
17 SOURCES = main.cpp \ 17 SOURCES = main.cpp \
18 mainwindow.cpp \ 18 mainwindow.cpp \
19 utils.cpp \ 19 utils.cpp \
20 packagelistdoclnk.cpp \ 20 packagelistdoclnk.cpp \
21 packagelistview.cpp \ 21 packagelistview.cpp \
22 installdialog.cpp \ 22 installdialog.cpp \
23 packagelistremote.cpp \ 23 packagelistremote.cpp \
24 packagelistlocal.cpp \ 24 packagelistlocal.cpp \
25 pksettings.cpp \ 25 pksettings.cpp \
26 pmipkg.cpp \ 26 pmipkg.cpp \
27 packagelistitem.cpp \ 27 packagelistitem.cpp \
28 packagelist.cpp \ 28 packagelist.cpp \
29 package.cpp 29 package.cpp
30INCLUDEPATH += $(OPIEDIR)/include 30INCLUDEPATH += $(OPIEDIR)/include
31 DEPENDPATH+= $(OPIEDIR)/ioclude 31 DEPENDPATH+= $(OPIEDIR)/ioclude
32LIBS += -lqpe 32LIBS += -lqpe
33LIBS += -lopie
33 INTERFACES= runwindow.ui \ 34 INTERFACES= runwindow.ui \
34 pksettingsbase.ui 35 pksettingsbase.ui
35 TARGET = oipkg 36 TARGET = oipkg
36 37
diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp
index 4a09b40..97f7813 100644
--- a/noncore/unsupported/oipkg/package.cpp
+++ b/noncore/unsupported/oipkg/package.cpp
@@ -1,124 +1,133 @@
1#include "package.h" 1#include "package.h"
2 2
3#include <qpe/process.h> 3#include <qpe/process.h>
4#include <qpe/stringutil.h> 4#include <qpe/stringutil.h>
5#include <qfile.h> 5#include <qfile.h>
6#include <qtextstream.h> 6#include <qtextstream.h>
7#include <stdlib.h> 7#include <stdlib.h>
8#include <unistd.h> 8#include <unistd.h>
9 9
10#include "debug.h" 10#include "debug.h"
11 11
12//Package::~Package() 12Package::Package( QObject *parent=0, const char *name=0 )
13//{ 13 : QObject(parent,name)
14//} 14{
15
16}
17
18Package::~Package()
19{
20}
15 21
16Package::Package( PackageManagerSettings *s ) 22Package::Package( PackageManagerSettings *s, QObject *parent=0, const char *name=0 )
23 : QObject(parent,name)
17{ 24{
25 Package(parent,name);
18 init(s); 26 init(s);
19} 27}
20 28
21void Package::init( PackageManagerSettings *s ) 29void Package::init( PackageManagerSettings *s )
22{ 30{
23 settings = s; 31 settings = s;
24 _size = ""; 32 _size = "";
25 _section = ""; 33 _section = "";
26 _subsection = ""; 34 _subsection = "";
27 _shortDesc = ""; 35 _shortDesc = "";
28 _desc = ""; 36 _desc = "";
29 _name = ""; 37 _name = "";
30 _toProcess = false; 38 _toProcess = false;
31 _useFileName = false; 39 _useFileName = false;
32 _old = false; 40 _old = false;
33 _status = ""; 41 _status = "";
34 _dest = settings->getDestinationName(); 42 _dest = settings->getDestinationName();
35 _link = settings->createLinks(); 43 _link = settings->createLinks();
36 _versions=0; 44 _versions=0;
37 _version=""; 45 _version="";
38} 46}
39 47
40Package::Package( QStringList pack, PackageManagerSettings *s ) 48Package::Package( QStringList pack, PackageManagerSettings *s , QObject *parent=0, const char *name=0 )
49 : QObject(parent,name)
41 { 50 {
42 init(s); 51 init(s);
43 parsePackage( pack ); 52 parsePackage( pack );
44} 53}
45 54
46Package::Package( QString n, PackageManagerSettings *s ) 55Package::Package( QString n, PackageManagerSettings *s, QObject *parent=0, const char *name=0 )
47 { 56 {
48 init(s); 57 init(s);
49 if ( !QFile::exists( n ) ) 58 if ( !QFile::exists( n ) )
50 { 59 {
51 _name = QString( n ); 60 _name = QString( n );
52 }else{ 61 }else{
53 pvDebug(4,"remote file: "+n); 62 pvDebug(4,"remote file: "+n);
54 parseIpkgFile( n ); 63 parseIpkgFile( n );
55 _useFileName = true; 64 _useFileName = true;
56 _fileName = QString( n ); 65 _fileName = QString( n );
57 } 66 }
58} 67}
59 68
60Package::Package( Package *pi ) 69Package::Package( Package *pi, QObject *parent=0, const char *name=0 )
61{ 70{
62 init(pi->settings); 71 init(pi->settings);
63 copyValues( pi ); 72 copyValues( pi );
64} 73}
65 74
66 75
67void Package::setValue( QString n, QString t ) 76void Package::setValue( QString n, QString t )
68{ 77{
69 if ( n == "Package" ) 78 if ( n == "Package" )
70 { 79 {
71 _name = QString( t ); 80 _name = QString( t );
72 }else if ( n == "Installed-Size" ) 81 }else if ( n == "Installed-Size" )
73 { 82 {
74 _size = t; 83 _size = t;
75// }else if ( n == "Priority") 84// }else if ( n == "Priority")
76// { 85// {
77 86
78 }else if ( n == "Section") 87 }else if ( n == "Section")
79 { 88 {
80 setSection( t ); 89 setSection( t );
81// }else if ( n == "Maintainer") 90// }else if ( n == "Maintainer")
82// { 91// {
83// 92//
84// }else if ( n == "Architecture") 93// }else if ( n == "Architecture")
85// { 94// {
86 95
87 }else if ( n == "Version") 96 }else if ( n == "Version")
88 { 97 {
89 _version = t; 98 _version = t;
90// }else if ( n == "Pre-Depends") 99// }else if ( n == "Pre-Depends")
91// { 100// {
92// 101//
93// }else if ( n == "Depends") 102// }else if ( n == "Depends")
94// { 103// {
95 104
96 }else if ( n == "Filename") 105 }else if ( n == "Filename")
97 { 106 {
98 _fileName = t; 107 _fileName = t;
99// }else if ( n == "Size") 108// }else if ( n == "Size")
100 // { 109 // {
101 // 110 //
102 //}else if ( n == "MD5Sum") 111 //}else if ( n == "MD5Sum")
103 //{ 112 //{
104 113
105 }else if ( n == "Description") 114 }else if ( n == "Description")
106 { 115 {
107 setDesc( t ); 116 setDesc( t );
108 }else if ( n == "Status") 117 }else if ( n == "Status")
109 { 118 {
110 if ( installed() ) return; 119 if ( installed() ) return;
111 _status = t; 120 _status = t;
112// }else if ( n == "Essential") 121// }else if ( n == "Essential")
113// { 122// {
114 123
115 }else{ 124 }else{
116 _values.insert(n,new QString(t)); 125 _values.insert(n,new QString(t));
117 } 126 }
118} 127}
119 128
120QString Package::name() 129QString Package::name()
121{ 130{
122 if (_displayName.isEmpty() ) return _name; 131 if (_displayName.isEmpty() ) return _name;
123 else return _displayName; 132 else return _displayName;
124} 133}
diff --git a/noncore/unsupported/oipkg/package.h b/noncore/unsupported/oipkg/package.h
index 68090dc..f50b9b5 100644
--- a/noncore/unsupported/oipkg/package.h
+++ b/noncore/unsupported/oipkg/package.h
@@ -1,85 +1,86 @@
1#ifndef PK_ITEM_H 1#ifndef PK_ITEM_H
2#define PK_ITEM_H 2#define PK_ITEM_H
3 3
4#include <qstring.h> 4#include <qstring.h>
5#include <qlistview.h> 5#include <qlistview.h>
6#include <qpainter.h> 6#include <qpainter.h>
7#include <qpixmap.h> 7#include <qpixmap.h>
8#include <qdict.h> 8#include <qdict.h>
9#include <qobject.h> 9#include <qobject.h>
10 10
11#include "pksettings.h" 11#include "pksettings.h"
12 12
13class Package //: public QObject 13class Package : public QObject
14{ 14{
15 // Q_OBJECT 15 Q_OBJECT
16 public: 16 public:
17 Package(PackageManagerSettings *); 17 Package(QObject *parent=0, const char *name=0);
18 // ~Package(); 18 Package(PackageManagerSettings *s, QObject *parent=0, const char *name=0);
19 Package( QStringList, PackageManagerSettings * ); 19 ~Package();
20 Package( QString, PackageManagerSettings * ); 20 Package( QStringList, PackageManagerSettings *s, QObject *parent=0, const char *name=0 );
21 Package( Package* ); 21 Package( QString, PackageManagerSettings *s, QObject *parent=0, const char *name=0 );
22 Package( Package*s, QObject *parent=0, const char *name=0 );
22 23
23 void setValue( QString, QString ); 24 void setValue( QString, QString );
24 void copyValues( Package* ); 25 void copyValues( Package* );
25 26
26 QString name(); 27 QString name();
27 QString installName(); 28 QString installName();
28 bool installed(); 29 bool installed();
29 bool otherInstalled(); 30 bool otherInstalled();
30 31
31 void setDesc( QString ); 32 void setDesc( QString );
32 QString shortDesc(); 33 QString shortDesc();
33 QString desc(); 34 QString desc();
34 QString size(); 35 QString size();
35 QString sizeUnits(); 36 QString sizeUnits();
36 QString version(); 37 QString version();
37 void setSection( QString ); 38 void setSection( QString );
38 QString section(); 39 QString section();
39 QString subSection(); 40 QString subSection();
40 QString details(); 41 QString details();
41 bool toProcess(); 42 bool toProcess();
42 bool toInstall(); 43 bool toInstall();
43 bool toRemove(); 44 bool toRemove();
44 void processed(); 45 void processed();
45 QString dest(); 46 QString dest();
46 void setDest( QString d ); 47 void setDest( QString d );
47 void setOn(); 48 void setOn();
48 bool link(); 49 bool link();
49 void setLink(bool); 50 void setLink(bool);
50 bool isOld(); 51 bool isOld();
51 bool hasVersions(); 52 bool hasVersions();
52 void parseIpkgFile( QString ); 53 void parseIpkgFile( QString );
53 void instalFromFile(bool iff=true); 54 void instalFromFile(bool iff=true);
54 void setName(QString); 55 void setName(QString);
55 QDict<QString>* getFields(); 56 QDict<QString>* getFields();
56 QString status(); 57 QString status();
57 58
58 QDict<Package>* getOtherVersions(); 59 QDict<Package>* getOtherVersions();
59 void setOtherVersions(QDict<Package>*); 60 void setOtherVersions(QDict<Package>*);
60 61
61public slots: 62public slots:
62 void toggleProcess(); 63 void toggleProcess();
63 64
64private: 65private:
65 PackageManagerSettings *settings; 66 PackageManagerSettings *settings;
66 QString _displayName; 67 QString _displayName;
67 QString _name; 68 QString _name;
68 QString _fileName; 69 QString _fileName;
69 bool _old; 70 bool _old;
70 bool _hasVersions; 71 bool _hasVersions;
71 bool _toProcess; 72 bool _toProcess;
72 bool _link; 73 bool _link;
73 QString _status; 74 QString _status;
74 QString _size; 75 QString _size;
75 QString _section; 76 QString _section;
76 QString _subsection; 77 QString _subsection;
77 QString _shortDesc; 78 QString _shortDesc;
78 QString _desc; 79 QString _desc;
79 QString _version; 80 QString _version;
80 QString _dest; 81 QString _dest;
81 QDict<QString> _values; 82 QDict<QString> _values;
82 QDict<Package> *_versions; 83 QDict<Package> *_versions;
83 bool _useFileName; 84 bool _useFileName;
84 void parsePackage( QStringList ); 85 void parsePackage( QStringList );
85 void init(PackageManagerSettings *); 86 void init(PackageManagerSettings *);
diff --git a/noncore/unsupported/oipkg/packagelist.cpp b/noncore/unsupported/oipkg/packagelist.cpp
index 1b572e0..3cc0443 100644
--- a/noncore/unsupported/oipkg/packagelist.cpp
+++ b/noncore/unsupported/oipkg/packagelist.cpp
@@ -1,95 +1,95 @@
1#include "packagelist.h" 1#include "packagelist.h"
2 2
3#include <assert.h> 3#include <assert.h>
4#include <qfile.h> 4#include <qfile.h>
5#include <qfileinfo.h> 5#include <qfileinfo.h>
6#include <qtextstream.h> 6#include <qtextstream.h>
7 7
8#include "debug.h" 8#include "debug.h"
9 9
10static QDict<Package> *packageListAll; 10static QDict<Package> *packageListAll;
11static int packageListAllRefCount = 0; 11static int packageListAllRefCount = 0;
12 12
13PackageList::PackageList() 13PackageList::PackageList(QObject *parent=0, const char *name=0)
14 : packageIter( packageList ) 14 : QObject(parent,name), packageIter( packageList )
15{ 15{
16 empty=true; 16 empty=true;
17 if (!packageListAll) packageListAll = new QDict<Package>(); 17 if (!packageListAll) packageListAll = new QDict<Package>();
18 packageListAllRefCount++; 18 packageListAllRefCount++;
19 sections << "All"; 19 sections << "All";
20 subSections.insert("All", new QStringList() ); 20 subSections.insert("All", new QStringList() );
21 QStringList *ss = subSections["All"]; 21 QStringList *ss = subSections["All"];
22 *ss << "All"; 22 *ss << "All";
23 aktSection = "All"; 23 aktSection = "All";
24 aktSubSection = "All"; 24 aktSubSection = "All";
25} 25}
26 26
27PackageList::PackageList( PackageManagerSettings* s) 27PackageList::PackageList( PackageManagerSettings* s, QObject *parent, const char *name)
28 : packageIter( packageList ) 28 : QObject(parent,name), packageIter( packageList )
29{ 29{
30 settings = s; 30 settings = s;
31 PackageList(); 31 PackageList(parent, name);
32} 32}
33 33
34PackageList::~PackageList() 34PackageList::~PackageList()
35{ 35{
36 if (--packageListAllRefCount < 1 ) delete packageListAll; 36 if (--packageListAllRefCount < 1 ) delete packageListAll;
37} 37}
38 38
39/** Inserts a package into the list */ 39/** Inserts a package into the list */
40void PackageList::insertPackage( Package* pack ) 40void PackageList::insertPackage( Package* pack )
41{ 41{
42 if (!pack) return; 42 if (!pack) return;
43 Package* p = packageListAll->find( pack->name() ); 43 Package* p = packageListAll->find( pack->name() );
44 if ( p ) 44 if ( p )
45 { 45 {
46 if ( (p->version() == pack->version()) 46 if ( (p->version() == pack->version())
47 // && (p->dest() == pack->dest()) 47 // && (p->dest() == pack->dest())
48 ) 48 )
49 { 49 {
50 p->copyValues( pack ); 50 p->copyValues( pack );
51 delete pack; 51 delete pack;
52 pack = p; 52 pack = p;
53 } else { 53 } else {
54 QDict<Package> *packver = p->getOtherVersions(); 54 QDict<Package> *packver = p->getOtherVersions();
55 // p->setName( pack->name()+"["+p->version()+"]" ); 55 // p->setName( pack->name()+"["+p->version()+"]" );
56 if (!packver) 56 if (!packver)
57 { 57 {
58 packver = new QDict<Package>(); 58 packver = new QDict<Package>();
59 packver->insert( pack->name(), p ); 59 packver->insert( pack->name(), p );
60 p->setOtherVersions( packver ); 60 p->setOtherVersions( packver );
61 } 61 }
62 pack->setName( pack->name()+"["+pack->version()+"]" ); 62 pack->setName( pack->name()+"["+pack->version()+"]" );
63 pack->setOtherVersions( packver ); 63 pack->setOtherVersions( packver );
64 packver->insert( pack->name(), pack ); 64 packver->insert( pack->name(), pack );
65 packageListAll->insert( pack->name(), pack ); 65 packageListAll->insert( pack->name(), pack );
66 packageList.insert( pack->name(), pack ); 66 packageList.insert( pack->name(), pack );
67 origPackageList.insert( pack->name(), pack ); 67 origPackageList.insert( pack->name(), pack );
68 } 68 }
69 }else{ 69 }else{
70 packageListAll->insert( pack->name(), pack ); 70 packageListAll->insert( pack->name(), pack );
71 packageList.insert( pack->name(), pack ); 71 packageList.insert( pack->name(), pack );
72 origPackageList.insert( pack->name(), pack ); 72 origPackageList.insert( pack->name(), pack );
73 }; 73 };
74 empty=false; 74 empty=false;
75 updateSections( pack ); 75 updateSections( pack );
76} 76}
77 77
78void PackageList::filterPackages( QString f ) 78void PackageList::filterPackages( QString f )
79 { 79 {
80 packageList.clear(); 80 packageList.clear();
81 QDictIterator<Package> filterIter( origPackageList ); 81 QDictIterator<Package> filterIter( origPackageList );
82 filterIter.toFirst(); 82 filterIter.toFirst();
83 Package *pack= filterIter.current() ; 83 Package *pack= filterIter.current() ;
84 while ( pack ) 84 while ( pack )
85 { 85 {
86 if ( 86 if (
87 ((aktSection=="All")||(pack->section()==aktSection)) && 87 ((aktSection=="All")||(pack->section()==aktSection)) &&
88 ((aktSubSection=="All")||(pack->subSection()==aktSubSection)) && 88 ((aktSubSection=="All")||(pack->subSection()==aktSubSection)) &&
89 pack->name().contains( f ) 89 pack->name().contains( f )
90 ) 90 )
91 { 91 {
92 packageList.insert( pack->name(), pack ); 92 packageList.insert( pack->name(), pack );
93 } 93 }
94 ++filterIter; 94 ++filterIter;
95 pack = filterIter.current(); 95 pack = filterIter.current();
diff --git a/noncore/unsupported/oipkg/packagelist.h b/noncore/unsupported/oipkg/packagelist.h
index d0f8897..78dcd92 100644
--- a/noncore/unsupported/oipkg/packagelist.h
+++ b/noncore/unsupported/oipkg/packagelist.h
@@ -1,60 +1,60 @@
1#ifndef PACKAGELIST_H 1#ifndef PACKAGELIST_H
2#define PACKAGELIST_H 2#define PACKAGELIST_H
3 3
4#include <qdict.h> 4#include <qdict.h>
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
9class PackageList //:QObject 9class PackageList :QObject
10{ 10{
11 // Q_OBJECT 11 Q_OBJECT
12public: 12public:
13 //static QString all = QObject::tr("All"); 13 //static QString all = QObject::tr("All");
14 14
15 PackageList(); 15 PackageList (QObject *parent=0, const char *name=0);
16 PackageList( PackageManagerSettings* ); 16 PackageList( PackageManagerSettings *s, QObject *parent=0, const char *name=0);
17 virtual ~PackageList(); 17 virtual ~PackageList();
18 void insertPackage( Package* ); 18 void insertPackage( Package* );
19 Package* find( QString ); 19 Package* find( QString );
20 Package* next(); 20 Package* next();
21 Package* first(); 21 Package* first();
22 22
23 QStringList getSections(); 23 QStringList getSections();
24 QStringList getSubSections(); 24 QStringList getSubSections();
25 void setSettings( PackageManagerSettings* ); 25 void setSettings( PackageManagerSettings* );
26 void filterPackages( QString ); 26 void filterPackages( QString );
27 Package* getByName( QString ); 27 Package* getByName( QString );
28 void clear(); 28 void clear();
29 void allPackages(); 29 void allPackages();
30 30
31 QDict<Package> *versions; 31 QDict<Package> *versions;
32 32
33public slots: 33public slots:
34 void setSection(QString); 34 void setSection(QString);
35 void setSubSection(QString); 35 void setSubSection(QString);
36 // virtual void update(); 36 // virtual void update();
37 37
38protected: 38protected:
39 int currentPackage; 39 int currentPackage;
40 int packageCount; 40 int packageCount;
41 41
42 PackageManagerSettings *settings; 42 PackageManagerSettings *settings;
43 QDict<Package> packageList; 43 QDict<Package> packageList;
44 QDict<Package> origPackageList; 44 QDict<Package> origPackageList;
45 QDictIterator<Package> packageIter; 45 QDictIterator<Package> packageIter;
46 46
47 bool empty; 47 bool empty;
48 QString aktSection; 48 QString aktSection;
49 QString aktSubSection; 49 QString aktSubSection;
50 QStringList sections; 50 QStringList sections;
51 QDict<QStringList> subSections; 51 QDict<QStringList> subSections;
52 QDict<bool> sectionsDict; 52 QDict<bool> sectionsDict;
53 53
54 54
55 void updateSections( Package* ); 55 void updateSections( Package* );
56 void readFileEntries( QString file, QString dest="" ); 56 void readFileEntries( QString file, QString dest="" );
57}; 57};
58 58
59 59
60#endif 60#endif
diff --git a/noncore/unsupported/oipkg/packagelistdoclnk.cpp b/noncore/unsupported/oipkg/packagelistdoclnk.cpp
index f31f742..b42cfdd 100644
--- a/noncore/unsupported/oipkg/packagelistdoclnk.cpp
+++ b/noncore/unsupported/oipkg/packagelistdoclnk.cpp
@@ -1,45 +1,45 @@
1 1
2#include "packagelistdoclnk.h" 2#include "packagelistdoclnk.h"
3 3
4#include <qpe/applnk.h> 4#include <qpe/applnk.h>
5#include <qpe/config.h> 5#include <qpe/config.h>
6#include <qlist.h> 6#include <qlist.h>
7 7
8#include "package.h" 8#include "package.h"
9#include "pksettings.h" 9#include "pksettings.h"
10 10
11PackageListDocLnk::PackageListDocLnk(PackageManagerSettings* s) 11PackageListDocLnk::PackageListDocLnk(PackageManagerSettings* s, QObject *parent=0, const char *name=0)
12 : PackageList(s) 12 : PackageList(s)
13{ 13{
14 PackageListDocLnk(); 14 PackageListDocLnk(parent, name);
15} 15}
16 16
17PackageListDocLnk::PackageListDocLnk() 17PackageListDocLnk::PackageListDocLnk(QObject *parent=0, const char *name=0)
18 : PackageList() 18 : PackageList(parent, name)
19{ 19{
20 Config cfg( "oipkg", Config::User ); 20 Config cfg( "oipkg", Config::User );
21 cfg.setGroup( "Common" ); 21 cfg.setGroup( "Common" );
22 docLnkDir = cfg.readEntry( "docLnkDir", "/root/" ); 22 docLnkDir = cfg.readEntry( "docLnkDir", "/root/" );
23 pvDebug(2,"opening DocLnkSet "+docLnkDir); 23 pvDebug(2,"opening DocLnkSet "+docLnkDir);
24 doclnkset = new DocLnkSet(docLnkDir,"application/ipkg"); 24 doclnkset = new DocLnkSet(docLnkDir,"application/ipkg");
25} 25}
26 26
27PackageListDocLnk::~PackageListDocLnk() 27PackageListDocLnk::~PackageListDocLnk()
28{ 28{
29 Config cfg( "oipkg", Config::User ); 29 Config cfg( "oipkg", Config::User );
30 cfg.setGroup( "Common" ); 30 cfg.setGroup( "Common" );
31 cfg.writeEntry( "docLnkDir", docLnkDir ); 31 cfg.writeEntry( "docLnkDir", docLnkDir );
32 delete doclnkset; 32 delete doclnkset;
33} 33}
34 34
35 35
36 36
37void PackageListDocLnk::update() 37void PackageListDocLnk::update()
38{ 38{
39 pvDebug(2,"PackageListDocLnk::update "); 39 pvDebug(2,"PackageListDocLnk::update ");
40 QList<DocLnk> packlist = doclnkset->children(); 40 QList<DocLnk> packlist = doclnkset->children();
41 for (DocLnk *pack =packlist.first(); pack != 0; pack=packlist.next() ) 41 for (DocLnk *pack =packlist.first(); pack != 0; pack=packlist.next() )
42 { 42 {
43 insertPackage( new Package(pack->file(), settings ) ); 43 insertPackage( new Package(pack->file(), settings ) );
44 } 44 }
45} 45}
diff --git a/noncore/unsupported/oipkg/packagelistdoclnk.h b/noncore/unsupported/oipkg/packagelistdoclnk.h
index fe73658..a63fb59 100644
--- a/noncore/unsupported/oipkg/packagelistdoclnk.h
+++ b/noncore/unsupported/oipkg/packagelistdoclnk.h
@@ -1,23 +1,23 @@
1#ifndef PACKAGELISTDOCLNK_H 1#ifndef PACKAGELISTDOCLNK_H
2#define PACKAGELISTDOCLNK_H 2#define PACKAGELISTDOCLNK_H
3 3
4#include "packagelist.h" 4#include "packagelist.h"
5#include "debug.h" 5#include "debug.h"
6 6
7class DocLnkSet; 7class DocLnkSet;
8 8
9class PackageListDocLnk : public PackageList 9class PackageListDocLnk : public PackageList
10{ 10{
11public: 11public:
12 PackageListDocLnk(); 12 PackageListDocLnk(QObject *parent=0, const char *name=0);
13 PackageListDocLnk( PackageManagerSettings* s); 13 PackageListDocLnk( PackageManagerSettings *s, QObject *parent=0, const char *name=0);
14 virtual ~PackageListDocLnk(); 14 virtual ~PackageListDocLnk();
15public slots: 15public slots:
16 void update(); 16 void update();
17private: 17private:
18 DocLnkSet *doclnkset; 18 DocLnkSet *doclnkset;
19 QString docLnkDir; 19 QString docLnkDir;
20}; 20};
21 21
22 22
23#endif 23#endif
diff --git a/noncore/unsupported/oipkg/packagelistitem.cpp b/noncore/unsupported/oipkg/packagelistitem.cpp
index 55047d5..0c9c676 100644
--- a/noncore/unsupported/oipkg/packagelistitem.cpp
+++ b/noncore/unsupported/oipkg/packagelistitem.cpp
@@ -98,69 +98,69 @@ void PackageListItem::paintFocus( QPainter *p, const QColorGroup & cg,
98 // (makes you wonder what we're getting from QCheckListItem) 98 // (makes you wonder what we're getting from QCheckListItem)
99 QListViewItem::paintFocus(p,cg,r); 99 QListViewItem::paintFocus(p,cg,r);
100} 100}
101 101
102QPixmap PackageListItem::statePixmap() const 102QPixmap PackageListItem::statePixmap() const
103{ 103{
104 bool installed = package->installed(); 104 bool installed = package->installed();
105 bool old = package->isOld(); 105 bool old = package->isOld();
106 bool versions = package->hasVersions(); 106 bool versions = package->hasVersions();
107 bool verinstalled = package->otherInstalled(); 107 bool verinstalled = package->otherInstalled();
108 if ( !package->toProcess() ) { 108 if ( !package->toProcess() ) {
109 if ( !installed ) 109 if ( !installed )
110 if (old) 110 if (old)
111 { 111 {
112 if (verinstalled) return *pm_uninstalled_old_installed_new; 112 if (verinstalled) return *pm_uninstalled_old_installed_new;
113 else return *pm_uninstalled_old; 113 else return *pm_uninstalled_old;
114 } 114 }
115 else 115 else
116 { 116 {
117 if (verinstalled) return *pm_uninstalled_installed_old; 117 if (verinstalled) return *pm_uninstalled_installed_old;
118 else return *pm_uninstalled; 118 else return *pm_uninstalled;
119 } 119 }
120 else 120 else
121 if (old) return *pm_installed_old; 121 if (old) return *pm_installed_old;
122 else return *pm_installed; 122 else return *pm_installed;
123 } else { //toProcess() == true 123 } else { //toProcess() == true
124 if ( !installed ) 124 if ( !installed )
125 return *pm_install; 125 return *pm_install;
126 else 126 else
127 return *pm_uninstall; 127 return *pm_uninstall;
128 } 128 }
129} 129}
130 130
131QString PackageListItem::key( int column, bool ascending ) const 131QString PackageListItem::key( int column, bool ascending ) const
132{ 132{
133 if ( column == 2 ) { 133 if ( column == 2 ) {
134 QString t = text(2); 134 QString t = text(2);
135 double bytes=t.toDouble(); 135 double bytes=t.toDouble();
136 if ( t.contains('M') ) bytes*=1024*1024; 136 if ( t.contains('M') ) bytes*=1024*1024;
137 else if ( t.contains('K') || t.contains('k') ) bytes*=1024; 137 else if ( t.contains('K') || t.contains('k') ) bytes*=1024;
138 if ( !ascending ) bytes=999999999-bytes; 138 if ( !ascending ) bytes=999999999-bytes;
139 return QString().sprintf("%09d",(int)bytes); 139 return QString().sprintf("%09d",(int)bytes);
140 } else { 140 } else {
141 return QListViewItem::key(column,ascending); 141 return QListViewItem::key(column,ascending);
142 } 142 }
143} 143}
144 144
145void PackageListItem::setOn( bool b ) 145void PackageListItem::setOn( bool b )
146{ 146{
147 QCheckListItem::setOn( b ); 147 QCheckListItem::setOn( b );
148 package->toggleProcess(); 148 package->toggleProcess();
149 package->setLink( settings->createLinks() ); 149 package->setLink( settings->createLinks() );
150 displayDetails(); 150 displayDetails();
151} 151}
152 152
153void PackageListItem::displayDetails() 153void PackageListItem::displayDetails()
154{ 154{
155 QString sod; 155 QString sod;
156 sod += package->sizeUnits().isEmpty()?QString(""):QString(package->sizeUnits()); 156 sod += package->sizeUnits().isEmpty()?QString(""):QString(package->sizeUnits());
157 //sod += QString(package->dest().isEmpty()?"":QObject::tr(" on ")+package->dest()); 157 //sod += QString(package->dest().isEmpty()?"":QObject::tr(" on ")+package->dest());
158 sod += package->dest().isEmpty()?QString(""):QString(QObject::tr(" on ")+package->dest()); 158 sod += package->dest().isEmpty()?QString(""):QString(QObject::tr(" on ")+package->dest());
159 sod = sod.isEmpty()?QString(""):QString(" ("+sod+")"); 159 sod = sod.isEmpty()?QString(""):QString(" ("+sod+")");
160 setText(0, package->name()+sod ); 160 setText(0, package->name()+sod );
161 nameItem->setText( 0, QObject::tr("Name: ")+package->name()); 161 nameItem->setText( 0, QObject::tr("Name: ")+package->name());
162 linkItem->setText( 0, QObject::tr("Link: ")+QString(package->link()?QObject::tr("Yes"):QObject::tr("No")) ); 162 linkItem->setText( 0, QObject::tr("Link: ")+package->link()?QObject::tr("Yes"):QObject::tr("No"));
163 destItem->setText( 0, QObject::tr("Destination: ")+package->dest() ); 163 destItem->setText( 0, QObject::tr("Destination: ")+package->dest() );
164 statusItem->setText( 0, QObject::tr("Status: ")+package->status() ); 164 statusItem->setText( 0, QObject::tr("Status: ")+package->status() );
165 repaint(); 165 repaint();
166} 166}
diff --git a/noncore/unsupported/oipkg/packagelistview.cpp b/noncore/unsupported/oipkg/packagelistview.cpp
index 70aa48a..2bb74e9 100644
--- a/noncore/unsupported/oipkg/packagelistview.cpp
+++ b/noncore/unsupported/oipkg/packagelistview.cpp
@@ -1,144 +1,144 @@
1#include "packagelistview.h" 1#include "packagelistview.h"
2 2
3#include <qpopupmenu.h> 3#include <qpopupmenu.h>
4#include <qaction.h> 4#include <qaction.h>
5 5
6#include "packagelistitem.h" 6#include "packagelistitem.h"
7#include "pksettings.h" 7#include "pksettings.h"
8 8
9PackageListView::PackageListView(QWidget *p, const char* n, PackageManagerSettings *s) 9PackageListView::PackageListView(QWidget *p, const char* n, PackageManagerSettings *s)
10 : QListView(p,n) 10 : QListView(p,n)
11{ 11{
12 settings = s; 12 settings = s;
13 popupMenu = new QPopupMenu( this ); 13 popupMenu = new QPopupMenu( this );
14 destsMenu = new QPopupMenu( popupMenu ); 14 destsMenu = new QPopupMenu( popupMenu );
15 popupTimer = new QTimer( this ); 15 popupTimer = new QTimer( this );
16 setSelectionMode(QListView::NoSelection); 16 setSelectionMode(QListView::NoSelection);
17 addColumn( tr("Package") ); 17 addColumn( tr("Package") );
18 setRootIsDecorated( true ); 18 setRootIsDecorated( true );
19 19
20 connect( popupTimer, SIGNAL(timeout()), 20 connect( popupTimer, SIGNAL(timeout()),
21 this, SLOT(showPopup()) ); 21 this, SLOT(showPopup()) );
22 connect( this, SIGNAL( pressed( QListViewItem* ) ), 22 connect( this, SIGNAL( pressed( QListViewItem* ) ),
23 this, SLOT( setCurrent( QListViewItem* ) ) ); 23 this, SLOT( setCurrent( QListViewItem* ) ) );
24 connect( this, SIGNAL( clicked( QListViewItem* ) ), 24 connect( this, SIGNAL( clicked( QListViewItem* ) ),
25 this, SLOT( stopTimer( QListViewItem* ) ) ); 25 this, SLOT( stopTimer( QListViewItem* ) ) );
26 26
27} 27}
28 28
29//PackageListView::~PackageListView() 29//PackageListView::~PackageListView()
30//{ 30//{
31//} 31//}
32 32
33void PackageListView::setCurrent( QListViewItem* p ) 33void PackageListView::setCurrent( QListViewItem* p )
34{ 34{
35 if ( !p ) return; 35 if ( !p ) return;
36 activePackageListItem = (PackageListItem*)p; 36 activePackageListItem = (PackageListItem*)p;
37 activePackage = activePackageListItem->getPackage(); 37 activePackage = activePackageListItem->getPackage();
38 if (!activePackage) 38 if (!activePackage)
39 { 39 {
40 // QDictIterator<QCheckListItem> it( rootItems ); 40 // QDictIterator<QCheckListItem> it( rootItems );
41 // while ( it.current() ) 41 // while ( it.current() )
42// { 42// {
43 // if ( it.current()==p ) 43 // if ( it.current()==p )
44 // pvDebug(2,"current item"); 44 // pvDebug(2,"current item");
45 // ++it; 45 // ++it;
46 // } 46 // }
47 47
48 return; 48 return;
49 } 49 }
50 popupTimer->start( 750, true ); 50 popupTimer->start( 750, true );
51} 51}
52 52
53 53
54void PackageListView::showPopup() 54void PackageListView::showPopup()
55{ 55{
56 popupMenu->clear(); 56 popupMenu->clear();
57 destsMenu->clear(); 57 destsMenu->clear();
58 58
59 QAction *popupAction; 59 QAction *popupAction;
60 if ( !activePackage->installed() ) 60 if ( !activePackage->installed() )
61 { 61 {
62 popupMenu->insertItem( QObject::tr("Install to"), destsMenu ); 62 popupMenu->insertItem( tr("Install to"), destsMenu );
63 QStringList dests = settings->getDestinationNames(); 63 QStringList dests = settings->getDestinationNames();
64 QString ad = settings->getDestinationName(); 64 QString ad = settings->getDestinationName();
65 for (uint i = 0; i < dests.count(); i++ ) 65 for (uint i = 0; i < dests.count(); i++ )
66 { 66 {
67 popupAction = new QAction( dests[i], QString::null, 0, this, 0 ); 67 popupAction = new QAction( dests[i], QString::null, 0, this, 0 );
68 popupAction->addTo( destsMenu ); 68 popupAction->addTo( destsMenu );
69 if ( dests[i] == ad && activePackage->toInstall() ) 69 if ( dests[i] == ad && activePackage->toInstall() )
70 { 70 {
71 popupAction->setToggleAction( true ); 71 popupAction->setToggleAction( true );
72 popupAction->setOn(true); 72 popupAction->setOn(true);
73 }; 73 };
74 } 74 }
75 connect( destsMenu, SIGNAL( activated( int ) ), 75 connect( destsMenu, SIGNAL( activated( int ) ),
76 this, SLOT( changePackageDest( int ) ) ); 76 this, SLOT( changePackageDest( int ) ) );
77 }else{ 77 }else{
78 popupAction = new QAction( QObject::tr("Remove"),QString::null, 0, this, 0 ); 78 popupAction = new QAction( tr("Remove"),QString::null, 0, this, 0 );
79 popupAction->addTo( popupMenu ); 79 popupAction->addTo( popupMenu );
80 connect( popupAction, SIGNAL( activated() ), 80 connect( popupAction, SIGNAL( activated() ),
81 this , SLOT( toggleProcess() ) ); 81 this , SLOT( toggleProcess() ) );
82 popupAction = new QAction( QObject::tr("Reinstall"),QString::null, 0, this, 0 ); 82 popupAction = new QAction( tr("Reinstall"),QString::null, 0, this, 0 );
83 popupAction->addTo( popupMenu ); 83 popupAction->addTo( popupMenu );
84 popupAction->setEnabled( false ); 84 popupAction->setEnabled( false );
85 } 85 }
86 popupMenu->popup( QCursor::pos() ); 86 popupMenu->popup( QCursor::pos() );
87} 87}
88 88
89void PackageListView::stopTimer( QListViewItem* ) 89void PackageListView::stopTimer( QListViewItem* )
90{ 90{
91 popupTimer->stop(); 91 popupTimer->stop();
92} 92}
93 93
94 94
95void PackageListView::changePackageDest( int i ) 95void PackageListView::changePackageDest( int i )
96{ 96{
97 activePackage->setDest( destsMenu->text(i) ); 97 activePackage->setDest( destsMenu->text(i) );
98 activePackage->setOn(); 98 activePackage->setOn();
99 activePackage->setLink( settings->createLinks() ); 99 activePackage->setLink( settings->createLinks() );
100 activePackageListItem->displayDetails(); 100 activePackageListItem->displayDetails();
101} 101}
102 102
103void PackageListView::toggleProcess() 103void PackageListView::toggleProcess()
104{ 104{
105 activePackage->toggleProcess() ; 105 activePackage->toggleProcess() ;
106 activePackageListItem->displayDetails(); 106 activePackageListItem->displayDetails();
107} 107}
108 108
109void PackageListView::display() 109void PackageListView::display()
110{ 110{
111 QDictIterator<PackageList> list( PackageLists ); 111 QDictIterator<PackageList> list( PackageLists );
112 PackageList *packlist; 112 PackageList *packlist;
113 Package *pack; 113 Package *pack;
114 PackageListItem *item; 114 PackageListItem *item;
115 QCheckListItem *rootItem; 115 QCheckListItem *rootItem;
116 QListViewItem* it; 116 QListViewItem* it;
117 QListViewItem* itdel; 117 QListViewItem* itdel;
118 while ( list.current() ) { 118 while ( list.current() ) {
119 packlist = list.current(); 119 packlist = list.current();
120 rootItem = rootItems.find( list.currentKey() ); 120 rootItem = rootItems.find( list.currentKey() );
121 //rootItem->clear(); 121 //rootItem->clear();
122 it=rootItem->firstChild(); 122 it=rootItem->firstChild();
123 while ( it ) 123 while ( it )
124 { 124 {
125 itdel = it; 125 itdel = it;
126 it = it->nextSibling(); 126 it = it->nextSibling();
127 delete itdel; 127 delete itdel;
128 } 128 }
129 pack = packlist->first(); 129 pack = packlist->first();
130 while( pack ) 130 while( pack )
131 { 131 {
132 item = new PackageListItem( rootItem, pack, settings ); 132 item = new PackageListItem( rootItem, pack, settings );
133 pack = packlist->next(); 133 pack = packlist->next();
134 } 134 }
135 ++list; 135 ++list;
136 } 136 }
137} 137}
138 138
139void PackageListView::addList( QString n, PackageList* pl) 139void PackageListView::addList( QString n, PackageList* pl)
140{ 140{
141 PackageLists.insert(n, pl); 141 PackageLists.insert(n, pl);
142 QCheckListItem *item = new QCheckListItem(this,n); 142 QCheckListItem *item = new QCheckListItem(this,n);
143 rootItems.insert(n, item); 143 rootItems.insert(n, item);
144} 144}
diff --git a/noncore/unsupported/oipkg/pksettings.cpp b/noncore/unsupported/oipkg/pksettings.cpp
index 09975b0..59d5a3e 100644
--- a/noncore/unsupported/oipkg/pksettings.cpp
+++ b/noncore/unsupported/oipkg/pksettings.cpp
@@ -180,128 +180,129 @@ void PackageManagerSettings::removeDestination()
180 destinationname->setEnabled(FALSE); 180 destinationname->setEnabled(FALSE);
181 destinationurl->setEnabled(FALSE); 181 destinationurl->setEnabled(FALSE);
182 changed = true; 182 changed = true;
183} 183}
184 184
185void PackageManagerSettings::serverNameChanged(const QString& t) 185void PackageManagerSettings::serverNameChanged(const QString& t)
186{ 186{
187 disconnect( servers, SIGNAL(highlighted(int)), this, SLOT(editServer(int)) ); 187 disconnect( servers, SIGNAL(highlighted(int)), this, SLOT(editServer(int)) );
188 servers->changeItem( t, editedserver ); 188 servers->changeItem( t, editedserver );
189 activeServers->changeItem( t, editedserver ); 189 activeServers->changeItem( t, editedserver );
190 connect( servers, SIGNAL(highlighted(int)), this, SLOT(editServer(int)) ); 190 connect( servers, SIGNAL(highlighted(int)), this, SLOT(editServer(int)) );
191 changed = true; 191 changed = true;
192 serverChanged = true; 192 serverChanged = true;
193} 193}
194 194
195void PackageManagerSettings::destNameChanged(const QString& t) 195void PackageManagerSettings::destNameChanged(const QString& t)
196{ 196{
197 disconnect( destinations, SIGNAL(highlighted(int)), this, SLOT(editDestination(int)) ); 197 disconnect( destinations, SIGNAL(highlighted(int)), this, SLOT(editDestination(int)) );
198 destinations->changeItem( t, editeddestination ); 198 destinations->changeItem( t, editeddestination );
199 activeDestination->changeItem( t, editeddestination ); 199 activeDestination->changeItem( t, editeddestination );
200 activeLinkDestination->changeItem( t, editeddestination ); 200 activeLinkDestination->changeItem( t, editeddestination );
201 connect( destinations, SIGNAL(highlighted(int)), this, SLOT(editDestination(int)) ); 201 connect( destinations, SIGNAL(highlighted(int)), this, SLOT(editDestination(int)) );
202 changed = true; 202 changed = true;
203} 203}
204 204
205void PackageManagerSettings::serverUrlChanged(const QString& t) 205void PackageManagerSettings::serverUrlChanged(const QString& t)
206{ 206{
207 serverurlDic.replace(editedserver, new QString(t)); 207 serverurlDic.replace(editedserver, new QString(t));
208 changed = true; 208 changed = true;
209 serverChanged = true; 209 serverChanged = true;
210} 210}
211 211
212void PackageManagerSettings::destUrlChanged(const QString& t) 212void PackageManagerSettings::destUrlChanged(const QString& t)
213{ 213{
214 destinationurlDic.replace(editeddestination, new QString(t)); 214 destinationurlDic.replace(editeddestination, new QString(t));
215 changed = true; 215 changed = true;
216} 216}
217 217
218void PackageManagerSettings::writeIpkgConfig(const QString& conffile) 218void PackageManagerSettings::writeIpkgConfig(const QString& conffile)
219{ 219{
220 QFile conf(conffile); 220 QFile conf(conffile);
221 if ( ! conf.open(IO_WriteOnly) ) return; 221 if ( ! conf.open(IO_WriteOnly) ) return;
222 QTextStream s(&conf); 222 QTextStream s(&conf);
223 s << "# Written by qpie Package Manager\n"; 223 s << "# Written by qpie Package Manager\n";
224 for (int i=0; i<(int)activeServers->count(); i++) 224 for (int i=0; i<(int)activeServers->count(); i++)
225 { 225 {
226 QString url = serverurlDic[i] ? *serverurlDic[i] : QString("???"); 226 QString url = serverurlDic[i] ? *serverurlDic[i] : QString("???");
227 if ( !activeServers->isSelected(i) ) 227 if ( !activeServers->isSelected(i) )
228 s << "#"; 228 s << "#";
229 s << "src " << activeServers->text(i) << " " << url << "\n"; 229 s << "src " << activeServers->text(i) << " " << url << "\n";
230 } 230 }
231 for (int i=0; i<(int)destinations->count(); i++) 231 for (int i=0; i<(int)destinations->count(); i++)
232 { 232 {
233 QString url = destinationurlDic[i] ? *destinationurlDic[i] : QString("???"); 233 QString url = destinationurlDic[i] ? *destinationurlDic[i] : QString("???");
234 s << "dest " << destinations->text(i) << " " << url << "\n"; 234 s << "dest " << destinations->text(i) << " " << url << "\n";
235 } 235 }
236 conf.close(); 236 conf.close();
237} 237}
238 238
239 239
240void PackageManagerSettings::readInstallationSettings() 240void PackageManagerSettings::readInstallationSettings()
241{ 241{
242 Config cfg( "oipkg", Config::User ); 242 Config cfg( "oipkg", Config::User );
243 cfg.setGroup( "Settings" ); 243 cfg.setGroup( "Settings" );
244
244 installationSettingsCount = cfg.readNumEntry( "count", -1 ); 245 installationSettingsCount = cfg.readNumEntry( "count", -1 );
245 currentSetting = cfg.readNumEntry( "current", 0 );// o should be -1 246 currentSetting = cfg.readNumEntry( "current", 0 );// o should be -1
246 247
247 for (int i = 0; i < installationSettingsCount; i++) 248 for (int i = 0; i < installationSettingsCount; i++)
248 { 249 {
249 cfg.setGroup( "Setting_" + QString::number(i) ); 250 cfg.setGroup( "Setting_" + QString::number(i) );
250 settingName->insertItem( cfg.readEntry( "name", "???" ), i ); 251 settingName->insertItem( cfg.readEntry( "name", "???" ), i );
251 }; 252 };
252 readInstallationSetting( currentSetting ); 253 readInstallationSetting( currentSetting );
253} 254}
254 255
255 256
256 257
257/** 258/**
258 * remove from conf file 259 * remove from conf file
259 */ 260 */
260void PackageManagerSettings::removeInstallationSetting() 261void PackageManagerSettings::removeInstallationSetting()
261{ 262{
262 settingName->removeItem( settingName->currentItem() ); 263 settingName->removeItem( settingName->currentItem() );
263 Config cfg( "oipkg", Config::User ); 264 Config cfg( "oipkg", Config::User );
264 cfg.setGroup( "Setting_" + QString::number( installationSettingsCount ) ); 265 cfg.setGroup( "Setting_" + QString::number( installationSettingsCount ) );
265 cfg.clearGroup(); 266 cfg.clearGroup();
266 installationSettingsCount--; 267 installationSettingsCount--;
267 changed = true; 268 changed = true;
268 settingName->setEditable( false ); 269 settingName->setEditable( false );
269} 270}
270 271
271/** 272/**
272 * write to confgile 273 * write to confgile
273 */ 274 */
274void PackageManagerSettings::newInstallationSetting() 275void PackageManagerSettings::newInstallationSetting()
275{ 276{
276 installationSettingsCount++; 277 installationSettingsCount++;
277 settingName->insertItem( "New", installationSettingsCount ); 278 settingName->insertItem( "New", installationSettingsCount );
278 settingName->setCurrentItem( installationSettingsCount ); 279 settingName->setCurrentItem( installationSettingsCount );
279 settingName->setEditable( true ); 280 settingName->setEditable( true );
280 changed = true; 281 changed = true;
281} 282}
282 283
283void PackageManagerSettings::installationSettingChange(int cs) 284void PackageManagerSettings::installationSettingChange(int cs)
284{ 285{
285 writeCurrentInstallationSetting(); 286 writeCurrentInstallationSetting();
286 currentSetting = cs; 287 currentSetting = cs;
287 readInstallationSetting( cs ); 288 readInstallationSetting( cs );
288 changed = true; 289 changed = true;
289} 290}
290 291
291void PackageManagerSettings::writeInstallationSettings() 292void PackageManagerSettings::writeInstallationSettings()
292{ 293{
293 { 294 {
294 Config cfg( "oipkg", Config::User ); 295 Config cfg( "oipkg", Config::User );
295 cfg.setGroup( "Settings" ); 296 cfg.setGroup( "Settings" );
296 cfg.writeEntry( "count", installationSettingsCount ); 297 cfg.writeEntry( "count", installationSettingsCount );
297 cfg.writeEntry( "current", currentSetting ); 298 cfg.writeEntry( "current", currentSetting );
298 } 299 }
299 writeCurrentInstallationSetting(); 300 writeCurrentInstallationSetting();
300} 301}
301 302
302 303
303void PackageManagerSettings::readInstallationSetting(int setting) 304void PackageManagerSettings::readInstallationSetting(int setting)
304{ 305{
305 if ( setting < 0 ) return; 306 if ( setting < 0 ) return;
306 Config cfg( "oipkg", Config::User ); 307 Config cfg( "oipkg", Config::User );
307 cfg.setGroup( "Setting_" + QString::number( setting ) ); 308 cfg.setGroup( "Setting_" + QString::number( setting ) );
diff --git a/noncore/unsupported/oipkg/pksettings.h b/noncore/unsupported/oipkg/pksettings.h
index dcc1e3a..8f9fe62 100644
--- a/noncore/unsupported/oipkg/pksettings.h
+++ b/noncore/unsupported/oipkg/pksettings.h
@@ -1,75 +1,75 @@
1#ifndef PACKAGEMANAGERSETTINGS_H 1#ifndef PACKAGEMANAGERSETTINGS_H
2#define PACKAGEMANAGERSETTINGS_H 2#define PACKAGEMANAGERSETTINGS_H
3 3
4#include "pksettingsbase.h" 4#include "pksettingsbase.h"
5//#include "pmipkg.h" 5//#include "pmipkg.h"
6#include <qintdict.h> 6#include <qintdict.h>
7#include <qobject.h> 7#include <qobject.h>
8 8
9 9
10class PackageManagerSettings : public PackageManagerSettingsBase 10class PackageManagerSettings : public PackageManagerSettingsBase
11{ 11{
12 // Q_OBJECT 12 Q_OBJECT
13public: 13public:
14 PackageManagerSettings( QWidget* , const char* , WFlags ); 14 PackageManagerSettings( QWidget* , const char* , WFlags );
15 ~PackageManagerSettings(); 15 ~PackageManagerSettings();
16 16
17 bool showDialog( int ) ; 17 bool showDialog( int ) ;
18 QString getDestinationUrl(); 18 QString getDestinationUrl();
19 QString getDestinationName(); 19 QString getDestinationName();
20 QString getLinkDestinationName(); 20 QString getLinkDestinationName();
21 bool createLinks(); 21 bool createLinks();
22 QStringList getServers(); 22 QStringList getServers();
23 QStringList getActiveServers(); 23 QStringList getActiveServers();
24 QStringList getDestinationUrls(); 24 QStringList getDestinationUrls();
25 QStringList getDestinationNames(); 25 QStringList getDestinationNames();
26 QString getDestinationUrlByName(QString); 26 QString getDestinationUrlByName(QString);
27 QComboBox* getDestCombo(); 27 QComboBox* getDestCombo();
28// void setIpkg( PmIpkg* ); 28// void setIpkg( PmIpkg* );
29 29
30public slots: 30public slots:
31 void writeInstallationSettings(); 31 void writeInstallationSettings();
32 void readInstallationSettings(); 32 void readInstallationSettings();
33 void writeCurrentInstallationSetting(); 33 void writeCurrentInstallationSetting();
34 void readInstallationSetting(int); 34 void readInstallationSetting(int);
35 void installationSettingSetName(const QString &); 35 void installationSettingSetName(const QString &);
36 void removeLinksToDest(); 36 void removeLinksToDest();
37 void createLinksToDest(); 37 void createLinksToDest();
38 void newServer(); 38 void newServer();
39 void editServer(int); 39 void editServer(int);
40 void removeDestination(); 40 void removeDestination();
41 void newDestination(); 41 void newDestination();
42 void editDestination(int); 42 void editDestination(int);
43 void linkEnabled(bool); 43 void linkEnabled(bool);
44 void removeServer(); 44 void removeServer();
45 void serverNameChanged(const QString&); 45 void serverNameChanged(const QString&);
46 void serverUrlChanged(const QString&); 46 void serverUrlChanged(const QString&);
47 void destNameChanged(const QString&); 47 void destNameChanged(const QString&);
48 void destUrlChanged(const QString&); 48 void destUrlChanged(const QString&);
49 void installationSettingChange(int); 49 void installationSettingChange(int);
50 void newInstallationSetting(); 50 void newInstallationSetting();
51 void removeInstallationSetting(); 51 void removeInstallationSetting();
52 void renameInstallationSetting(); 52 void renameInstallationSetting();
53 void activeServerChanged(); 53 void activeServerChanged();
54signals: 54signals:
55// void doCreateLinks( QString dest ); 55// void doCreateLinks( QString dest );
56// void doRemoveLinks( QString dest ); 56// void doRemoveLinks( QString dest );
57 57
58private: 58private:
59 QIntDict<QString> serverurlDic; 59 QIntDict<QString> serverurlDic;
60 QIntDict<QString> destinationurlDic; 60 QIntDict<QString> destinationurlDic;
61 int ipkg_old; 61 int ipkg_old;
62 int editedserver; 62 int editedserver;
63 int editeddestination; 63 int editeddestination;
64 int currentSetting; 64 int currentSetting;
65 int installationSettingsCount; 65 int installationSettingsCount;
66 bool changed; 66 bool changed;
67 bool serverChanged; 67 bool serverChanged;
68 68
69 bool readIpkgConfig(const QString&); 69 bool readIpkgConfig(const QString&);
70 void writeIpkgConfig(const QString&); 70 void writeIpkgConfig(const QString&);
71 void writeSettings(); 71 void writeSettings();
72 void readSettings(); 72 void readSettings();
73}; 73};
74 74
75#endif 75#endif
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index 7b3fa1e..2a534d2 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -1,166 +1,221 @@
1#include "pmipkg.h" 1#include "pmipkg.h"
2#include "pksettings.h" 2#include "pksettings.h"
3#include "package.h" 3#include "package.h"
4#include "packagelistitem.h" 4#include "packagelistitem.h"
5 5
6#include <qpe/process.h> 6//#infdef OPROCESS
7#include <opie/oprocess.h>
8//#endif
7#include <qpe/resource.h> 9#include <qpe/resource.h>
8#include <qpe/config.h> 10#include <qpe/config.h>
9#include <qpe/stringutil.h> 11#include <qpe/stringutil.h>
10#include <qpe/qpeapplication.h> 12#include <qpe/qpeapplication.h>
11#include <qdir.h> 13#include <qdir.h>
12#include <qfile.h> 14#include <qfile.h>
13#include <qgroupbox.h> 15#include <qgroupbox.h>
14#include <qmultilineedit.h> 16#include <qmultilineedit.h>
15#include <qstring.h> 17#include <qstring.h>
16#include <qcheckbox.h> 18#include <qcheckbox.h>
17#include <qtextstream.h> 19#include <qtextstream.h>
18#include <qtextview.h> 20#include <qtextview.h>
19 21
20#include <qprogressbar.h> 22#include <qprogressbar.h>
21#include <qpushbutton.h> 23#include <qpushbutton.h>
22#include <qlayout.h> 24#include <qlayout.h>
23 25
24#include <stdlib.h> 26#include <stdlib.h>
25#include <unistd.h> 27#include <unistd.h>
26 28
27#include "mainwindow.h" 29#include "mainwindow.h"
28 30
29 31
30PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlags f ) 32PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlags f )
31 : QObject ( p ) 33 : QObject ( p )
32{ 34{
33 settings = s; 35 settings = s;
34 runwindow = new RunWindow( p, name, true, f ); 36 runwindow = new RunWindow( p, name, true, f );
37#ifdef OPROCESS
38 ipkgProcess = new OProcess();
39 connect ( ipkgProcess, SIGNAL(receivedStdout(OProcess*,char*,int)),
40 this, SLOT(getIpkgOutput(OProcess*,char*,int)));
41
42 connect ( ipkgProcess, SIGNAL(receivedStderr(OProcess*,char*,int)),
43 this, SLOT(getIpkgOutput(OProcess*,char*,int)));
44 installDialog = 0;
45#endif
35} 46}
36 47
37PmIpkg::~PmIpkg() 48PmIpkg::~PmIpkg()
38{ 49{
50#ifdef OPROCESS
51 delete ipkgProcess;
52#endif
39} 53}
40 54
41bool PmIpkg::runIpkg(const QString& args, const QString& dest ) 55bool PmIpkg::runIpkg(const QString& args, const QString& dest )
42{ 56{
43 bool ret=false; 57 bool ret=false;
44 QDir::setCurrent("/tmp"); 58 QDir::setCurrent("/tmp");
45 QString cmd = "/usr/bin/ipkg "; 59 QString cmd = "/usr/bin/ipkg ";
60#ifdef OPROCESS
61 ipkgProcess->clearArguments();
62 *ipkgProcess << "/usr/bin/ipkg ";
63 QString cmd = "";
64#endif
46 pvDebug( 3,"PmIpkg::runIpkg got dest="+dest); 65 pvDebug( 3,"PmIpkg::runIpkg got dest="+dest);
47 if ( dest == "" ) 66 if ( dest == "" )
48 cmd += " -dest "+settings->getDestinationName(); 67 cmd += " -dest "+settings->getDestinationName();
49 else 68 else
50 cmd += " -dest "+ dest; 69 cmd += " -dest "+ dest;
51 70
52 cmd += " -force-defaults "; 71 cmd += " -force-defaults ";
53 72
54 if (installDialog && installDialog->_force_depends) 73 if (installDialog && installDialog->_force_depends)
55 { 74 {
56 if (installDialog->_force_depends->isChecked()) 75 if (installDialog->_force_depends->isChecked())
57 cmd += " -force-depends "; 76 cmd += " -force-depends ";
58 if (installDialog->_force_reinstall->isChecked()) 77 if (installDialog->_force_reinstall->isChecked())
59 cmd += " -force-reinstall "; 78 cmd += " -force-reinstall ";
60 if (installDialog->_force_remove->isChecked()) 79 if (installDialog->_force_remove->isChecked())
61 cmd += " -force-removal-of-essential-packages "; 80 cmd += " -force-removal-of-essential-packages ";
62 } 81 }
63 82
64 out( "Starting to "+ args+"\n"); 83 out( "Starting to "+ args+"\n");
65 cmd += args; 84 cmd += args;
66 out( "running:\n"+cmd+"\n" ); 85 out( "running:\n"+cmd+"\n" );
67 pvDebug(2,"running:"+cmd); 86 pvDebug(2,"running:"+cmd);
87#ifdef OPROCESS
88 *ipkgProcess << args;
89 out( "running:\n" + cmd);
90 *ipkgProcess << cmd;
91
92//debug
93 ipkgProcess->clearArguments();
94 *ipkgProcess << "/bin/ls ";
95//debug
96 QValueList<QCString> a = ipkgProcess->args();
97 QValueList<QCString>::Iterator it;
98 for( it = a.begin(); it != a.end(); ++it )
99 {
100 out( *it );
101 cmd += *it;
102 }
103
104 pvDebug(2,"running:"+cmd);
105 qApp->processEvents();
106// sleep(1);
107 ret = ipkgProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput);
108 if ( !ret ) {
109 pvDebug(2,"Could not execute '" + cmd);
110 out("\nError while executing "+ cmd+"\n\n");
111 out("\nError while executing\n\n");
112 // return false;
113 }
114
115 while ( ipkgProcess->isRunning() )
116 {
117 out(".");
118 pvDebug(7,"wait for oprocess to terminate");
119 qApp->processEvents();
120 };
121#else
68 qApp->processEvents(); 122 qApp->processEvents();
69 FILE *fp; 123 FILE *fp;
70 char line[130]; 124 char line[130];
71 QString lineStr, lineStrOld; 125 QString lineStr, lineStrOld;
72 sleep(1); 126 sleep(1);
73 cmd +=" 2>&1"; 127 cmd +=" 2>&1";
74 fp = popen( (const char *) cmd, "r"); 128 fp = popen( (const char *) cmd, "r");
75 if ( !fp ) { 129 if ( !fp ) {
76 qDebug("Could not execute '" + cmd + "'! err=%d", fp); 130 qDebug("Could not execute '" + cmd + "'! err=%d", fp);
77 pclose(fp); 131 pclose(fp);
78 out("\nError while executing "+ cmd+"\n\n"); 132 out("\nError while executing "+ cmd+"\n\n");
79 return false; 133 return false;
80 } else { 134 } else {
81 while ( fgets( line, sizeof line, fp)) { 135 while ( fgets( line, sizeof line, fp)) {
82 lineStr = line; 136 lineStr = line;
83 lineStr=lineStr.left(lineStr.length()-1); 137 lineStr=lineStr.left(lineStr.length()-1);
84 //Configuring opie-oipkg...Done 138 //Configuring opie-oipkg...Done
85 if (lineStr.contains("Done")) 139 if (lineStr.contains("Done"))
86 ret = true; 140 ret = true;
87 if (lineStr!=lineStrOld) 141 if (lineStr!=lineStrOld)
88 out(lineStr); 142 out(lineStr);
89 lineStrOld = lineStr; 143 lineStrOld = lineStr;
90 qApp->processEvents(); 144 qApp->processEvents();
91 } 145 }
92 pclose(fp); 146 pclose(fp);
93 } 147 }
148#endif
94 //out( "Finished!"); 149 //out( "Finished!");
95 pvDebug(2,QString(ret?"success\n":"failure\n")); 150 pvDebug(2,QString(ret?"success\n":"failure\n"));
96 return ret; 151 return ret;
97} 152}
98 153
99void PmIpkg::makeLinks(Package *pack) 154void PmIpkg::makeLinks(Package *pack)
100{ 155{
101 pvDebug( 2, "PmIpkg::makeLinks "+ pack->name()); 156 pvDebug( 2, "PmIpkg::makeLinks "+ pack->name());
102 linkPackage( pack->installName(), pack->dest() ); 157 linkPackage( pack->name(), pack->dest() );
103} 158}
104 159
105QStringList* PmIpkg::getList( QString packFileName, QString d ) 160QStringList* PmIpkg::getList( QString packFileName, QString d )
106{ 161{
107 QString dest = settings->getDestinationUrlByName( d ); 162 QString dest = settings->getDestinationUrlByName( d );
108 dest = dest==""?d:dest; 163 dest = dest==""?d:dest;
109 if (dest == "/" ) return 0; 164 if (dest == "/" ) return 0;
110 { 165 {
111 Config cfg( "oipkg", Config::User ); 166 Config cfg( "oipkg", Config::User );
112 cfg.setGroup( "Common" ); 167 cfg.setGroup( "Common" );
113 QString statusDir = cfg.readEntry( "statusDir", "" ); 168 QString statusDir = cfg.readEntry( "statusDir", "" );
114 } 169 }
115 packFileName = dest+"/"+statusDir+"/info/"+packFileName+".list"; 170 packFileName = dest+"/"+statusDir+"/info/"+packFileName+".list";
116 QFile f( packFileName ); 171 QFile f( packFileName );
117 if ( ! f.open(IO_ReadOnly) ) 172 if ( ! f.open(IO_ReadOnly) )
118 { 173 {
119 pvDebug(1," Panik! Could not open"); 174 pvDebug(1," Panik! Could not open");
120 out( "Panik!\n Could not open:\n"+packFileName ); 175 out( "Panik!\n Could not open:\n"+packFileName );
121 return (QStringList*)0; 176 return (QStringList*)0;
122 } 177 }
123 QStringList *fileList = new QStringList(); 178 QStringList *fileList = new QStringList();
124 QTextStream t( &f ); 179 QTextStream t( &f );
125 while ( !t.eof() ) 180 while ( !t.eof() )
126 { 181 {
127 *fileList += t.readLine(); 182 *fileList += t.readLine();
128 } 183 }
129 return fileList; 184 return fileList;
130} 185}
131 186
132void PmIpkg::linkPackage( QString packFileName, QString dest ) 187void PmIpkg::linkPackage( QString packFileName, QString dest )
133{ 188{
134 QStringList *fileList = getList( packFileName, dest ); 189 QStringList *fileList = getList( packFileName, dest );
135 processFileList( fileList, dest ); 190 processFileList( fileList, dest );
136 delete fileList; 191 delete fileList;
137} 192}
138 193
139void PmIpkg::processFileList( QStringList *fileList, QString d ) 194void PmIpkg::processFileList( QStringList *fileList, QString d )
140{ 195{
141 if (!fileList) return; 196 if (!fileList) return;
142 for (uint i=0; i < fileList->count(); i++) 197 for (uint i=0; i < fileList->count(); i++)
143 { 198 {
144 QString dest = settings->getDestinationUrlByName( d ); 199 QString dest = settings->getDestinationUrlByName( d );
145 dest = dest==""?d:dest; 200 dest = dest==""?d:dest;
146 processLinkDir( (*fileList)[i], dest ); 201 processLinkDir( (*fileList)[i], dest );
147 } 202 }
148} 203}
149 204
150 205
151void PmIpkg::processLinkDir( QString file, QString dest ) 206void PmIpkg::processLinkDir( QString file, QString dest )
152{ 207{
153 pvDebug( 4,"PmIpkg::processLinkDir "+file+" to "+ dest); 208 pvDebug( 4,"PmIpkg::processLinkDir "+file+" to "+ dest);
154 if (linkOpp==createLink) pvDebug( 4,"opp: createLink"); 209 if (linkOpp==createLink) pvDebug( 4,"opp: createLink");
155 if (linkOpp==removeLink) pvDebug( 4,"opp: removeLink"); 210 if (linkOpp==removeLink) pvDebug( 4,"opp: removeLink");
156 if ( dest == "???" || dest == "" ) return; 211 if ( dest == "???" || dest == "" ) return;
157 QString destFile = file; 212 QString destFile = file;
158 file = dest+"/"+file; 213 file = dest+"/"+file;
159 if (file == dest) return; 214 if (file == dest) return;
160// if (linkOpp==createLink) out( "\ncreating links\n" ); 215// if (linkOpp==createLink) out( "\ncreating links\n" );
161 // if (linkOpp==removeLink) out( "\nremoving links\n" ); 216 // if (linkOpp==removeLink) out( "\nremoving links\n" );
162 QFileInfo fileInfo( file ); 217 QFileInfo fileInfo( file );
163 if ( fileInfo.isDir() ) 218 if ( fileInfo.isDir() )
164 { 219 {
165 pvDebug(4, "process dir "+file); 220 pvDebug(4, "process dir "+file);
166 QDir destDir( destFile ); 221 QDir destDir( destFile );
@@ -181,128 +236,129 @@ void PmIpkg::processLinkDir( QString file, QString dest )
181 { 236 {
182 const char *instFile = strdup( (file).ascii() ); 237 const char *instFile = strdup( (file).ascii() );
183 const char *linkFile = strdup( (destFile).ascii()); 238 const char *linkFile = strdup( (destFile).ascii());
184 if( linkOpp==createLink ) 239 if( linkOpp==createLink )
185 { 240 {
186 pvDebug(4, "linking: "+file+" -> "+destFile ); 241 pvDebug(4, "linking: "+file+" -> "+destFile );
187 symlink( instFile, linkFile ); 242 symlink( instFile, linkFile );
188 } 243 }
189 } else { 244 } else {
190 const char *linkFile = strdup( (destFile).ascii()); 245 const char *linkFile = strdup( (destFile).ascii());
191 if( linkOpp==removeLink ) 246 if( linkOpp==removeLink )
192 { 247 {
193 QFileInfo toRemoveLink( destFile ); 248 QFileInfo toRemoveLink( destFile );
194 if ( !QFile::exists( file ) && toRemoveLink.isSymLink() ) 249 if ( !QFile::exists( file ) && toRemoveLink.isSymLink() )
195 { 250 {
196 pvDebug(4,"removing "+destFile+" no "+file); 251 pvDebug(4,"removing "+destFile+" no "+file);
197 unlink( linkFile ); 252 unlink( linkFile );
198 } 253 }
199 } 254 }
200 } 255 }
201} 256}
202 257
203void PmIpkg::loadList( PackageList *pl ) 258void PmIpkg::loadList( PackageList *pl )
204 { 259 {
205 for( Package *pack = pl->first();pack ; (pack = pl->next()) ) 260 for( Package *pack = pl->first();pack ; (pack = pl->next()) )
206 { 261 {
207 if ( pack && (pack->name() != "") && pack) 262 if ( pack && (pack->name() != "") && pack)
208 { 263 {
209 if ( pack->toInstall() ) 264 if ( pack->toInstall() )
210 to_install.append( pack ); 265 to_install.append( pack );
211 if ( pack->toRemove() ) 266 if ( pack->toRemove() )
212 to_remove.append( pack ); 267 to_remove.append( pack );
213 } 268 }
214 } 269 }
215} 270}
216 271
217void PmIpkg::commit() 272void PmIpkg::commit()
218 { 273 {
219 int sizecount = 0; 274 int sizecount = 0;
220 installDialog = new InstallDialog(settings,0,0,true); 275 installDialog = new InstallDialog(settings,0,0,true);
221 installDialog->toRemoveItem->setOpen( true ); 276 installDialog->toRemoveItem->setOpen( true );
222 installDialog->toInstallItem->setOpen( true ); 277 installDialog->toInstallItem->setOpen( true );
223 for (uint i=0; i < to_remove.count(); i++) 278 for (uint i=0; i < to_remove.count(); i++)
224 { 279 {
225 sizecount += 1; 280 sizecount += 1;
226 installDialog->toRemoveItem->insertItem( new PackageListItem(installDialog->ListViewPackages, to_remove.at(i),settings) ); 281 installDialog->toRemoveItem->insertItem( new PackageListItem(installDialog->ListViewPackages, to_remove.at(i),settings) );
227 } 282 }
228 for (uint i=0; i < to_install.count(); i++) 283 for (uint i=0; i < to_install.count(); i++)
229 { 284 {
230 sizecount += to_install.at(i)->size().toInt(); 285 sizecount += to_install.at(i)->size().toInt();
231 installDialog->toInstallItem->insertItem( new PackageListItem(installDialog->ListViewPackages, to_install.at(i),settings) ); 286 installDialog->toInstallItem->insertItem( new PackageListItem(installDialog->ListViewPackages, to_install.at(i),settings) );
232 } 287 }
233 runwindow->progress->setTotalSteps(sizecount); 288 runwindow->progress->setTotalSteps(sizecount);
234 qDebug("Install size %i",sizecount); 289 qDebug("Install size %i",sizecount);
235 installDialog->showMaximized(); 290 installDialog->showMaximized();
236 installDialog->show(); 291 installDialog->show();
237 if ( installDialog->exec() ) 292 if ( installDialog->exec() )
238 { 293 {
239 doIt(); 294 doIt();
240 runwindow->showMaximized(); 295 runwindow->showMaximized();
241 runwindow->show(); 296 runwindow->show();
242 } 297 }
243 installDialog->close(); 298 installDialog->close();
244 delete installDialog; 299 delete installDialog;
300 installDialog = 0;
245 out(tr("\nAll done.")); 301 out(tr("\nAll done."));
246} 302}
247 303
248void PmIpkg::doIt() 304void PmIpkg::doIt()
249{ 305{
250 runwindow->progress->setProgress(0); 306 runwindow->progress->setProgress(0);
251 show(); 307 show();
252 remove(); 308 remove();
253 install(); 309 install();
254} 310}
255 311
256 312
257void PmIpkg::remove() 313void PmIpkg::remove()
258{ 314{
259 if ( to_remove.count() == 0 ) return; 315 if ( to_remove.count() == 0 ) return;
260 316
261 out(tr("Removing")+"\n"+tr("please wait")+"\n\n"); 317 out(tr("Removing")+"\n"+tr("please wait")+"\n\n");
262 318
263 QStringList *fileList; 319 QStringList *fileList;
264 for (uint i=0; i < to_remove.count(); i++) 320 for (uint i=0; i < to_remove.count(); i++)
265 { 321 {
266 if ( to_remove.at(i)->link() )fileList = getList( to_remove.at(i)->name(), to_remove.at(i)->dest() ); 322 if ( to_remove.at(i)->link() )fileList = getList( to_remove.at(i)->name(), to_remove.at(i)->dest() );
267 if ( runIpkg("remove " + to_remove.at(i)->installName(), to_remove.at(i)->dest() )) 323 if ( runIpkg("remove " + to_remove.at(i)->installName(), to_remove.at(i)->dest() ))
268 { 324 {
269 runwindow->progress->setProgress( 1 ); 325 runwindow->progress->setProgress( 1 );
270 linkOpp = removeLink; 326 linkOpp = removeLink;
271 to_remove.at(i)->processed(); 327 to_remove.at(i)->processed();
272 pvDebug(3,"link "+QString::number(i)); 328 pvDebug(3,"link "+QString::number(i));
273 if ( to_remove.at(i)->link() ) 329 if ( to_remove.at(i)->link() )
274 processFileList( fileList, to_remove.at(i)->dest() ); 330 processFileList( fileList, to_remove.at(i)->dest() );
275 //pvDebug(3,"take "+QString::number(i)+" of "+QString::number(to_remove.count())); 331 //pvDebug(3,"take "+QString::number(i)+" of "+QString::number(to_remove.count()));
276 //if ( to_remove.at(i) ) to_remove.take( i ); 332 //if ( to_remove.at(i) ) to_remove.take( i );
277 333
278 out("\n"); 334 out("\n");
279 }else{ 335 }else{
280 out(tr("Error while removing ")+to_remove.at(i)->name()+"\n"); 336 out(tr("Error while removing ")+to_remove.at(i)->name()+"\n");
281 if ( to_remove.at(i)->link() ) 337 if ( to_remove.at(i)->link() )
282 processFileList( fileList, to_remove.at(i)->dest() ); 338 processFileList( fileList, to_remove.at(i)->dest() );
283 } 339 }
284 if ( to_remove.at(i)->link() ) 340 if ( to_remove.at(i)->link() )
285 processFileList( fileList, to_remove.at(i)->dest() ); 341 processFileList( fileList, to_remove.at(i)->dest() );
286 if ( to_remove.at(i)->link() )delete fileList; 342 if ( to_remove.at(i)->link() )delete fileList;
287 } 343 }
288 to_remove.clear(); 344 to_remove.clear();
289 out("\n"); 345 out("\n");
290} 346}
291 347
292 348
293void PmIpkg::install() 349void PmIpkg::install()
294{ 350{
295 if ( to_install.count() == 0 ) return; 351 if ( to_install.count() == 0 ) return;
296 out(tr("Installing")+"\n"+tr("please wait")+"\n"); 352 out(tr("Installing")+"\n"+tr("please wait")+"\n");
297 for (uint i=0; i < to_install.count(); i++) 353 for (uint i=0; i < to_install.count(); i++)
298 { 354 {
299 qDebug("install loop %i of %i installing %s",i,to_install.count(),to_install.at(i)->installName().latin1()); //pvDebug 355 qDebug("install loop %i of %i installing %s",i,to_install.count(),to_install.at(i)->installName().latin1()); //pvDebug
300 if ( runIpkg("install " + to_install.at(i)->installName(), to_install.at(i)->dest() )) 356 if ( runIpkg("install " + to_install.at(i)->installName(), to_install.at(i)->dest() ))
301 { 357 {
302 runwindow->progress->setProgress( to_install.at(i)->size().toInt() + runwindow->progress->progress()); 358 runwindow->progress->setProgress( to_install.at(i)->size().toInt() + runwindow->progress->progress());
303 to_install.at(i)->processed(); 359 to_install.at(i)->processed();
304 linkOpp = createLink; 360 linkOpp = createLink;
305 if ( to_install.at(i)->link() ) 361 if ( to_install.at(i)->link() )
306 makeLinks( to_install.at(i) ); 362 makeLinks( to_install.at(i) );
307 // to_install.take( i ); 363 // to_install.take( i );
308 out("\n"); 364 out("\n");
@@ -335,64 +391,76 @@ void PmIpkg::removeLinks( const QString &dest )
335 url = url==""?dest:url; 391 url = url==""?dest:url;
336 processLinkDir( "/opt", url ); 392 processLinkDir( "/opt", url );
337 processLinkDir( "/usr", url ); 393 processLinkDir( "/usr", url );
338} 394}
339 395
340void PmIpkg::update() 396void PmIpkg::update()
341{ 397{
342 show(); 398 show();
343 if ( runIpkg( "update" ) ) 399 if ( runIpkg( "update" ) )
344 runwindow->close(); 400 runwindow->close();
345 else out("An error occurred!\nPlease check the log."); 401 else out("An error occurred!\nPlease check the log.");
346} 402}
347 403
348void PmIpkg::out( QString o ) 404void PmIpkg::out( QString o )
349{ 405{
350 runwindow->outPut->append(o); 406 runwindow->outPut->append(o);
351 runwindow->outPut->setCursorPosition(runwindow->outPut->numLines() + 1,0,FALSE); 407 runwindow->outPut->setCursorPosition(runwindow->outPut->numLines() + 1,0,FALSE);
352} 408}
353 409
354 410
355 411
356 412
357void PmIpkg::show() 413void PmIpkg::show()
358{ 414{
359 if (!runwindow->isVisible()) 415 if (!runwindow->isVisible())
360 { 416 {
361 runwindow->showMaximized(); 417 runwindow->showMaximized();
362 runwindow->show(); 418 runwindow->show();
363 } 419 }
364 runwindow->outPut->setText(""); 420 runwindow->outPut->setText("");
365} 421}
366 422
367void PmIpkg::installFile(const QString &fileName, const QString &dest) 423void PmIpkg::installFile(const QString &fileName, const QString &dest)
368{ 424{
369 425
370 to_install.clear(); 426 to_install.clear();
371 to_remove.clear(); 427 to_remove.clear();
372 pvDebug( 2,"PmIpkg::installFile "+ fileName); 428 pvDebug( 2,"PmIpkg::installFile "+ fileName);
373 Package *p = new Package(fileName,settings); 429 Package *p = new Package(fileName,settings);
374 if ( dest!="") p->setDest( dest ); 430 if ( dest!="") p->setDest( dest );
375 to_install.append( p ); 431 to_install.append( p );
376 commit(); 432 commit();
377 delete p; 433 delete p;
378} 434}
379 435
380void PmIpkg::removeFile(const QString &fileName, const QString &dest) 436void PmIpkg::removeFile(const QString &fileName, const QString &dest)
381{ 437{
382 438
383 to_install.clear(); 439 to_install.clear();
384 to_remove.clear(); 440 to_remove.clear();
385 pvDebug( 2,"PmIpkg::removeFile "+ fileName); 441 pvDebug( 2,"PmIpkg::removeFile "+ fileName);
386 Package *p = new Package(fileName,settings); 442 Package *p = new Package(fileName,settings);
387 if ( dest!="") p->setDest( dest ); 443 if ( dest!="") p->setDest( dest );
388 to_remove.append( p ); 444 to_remove.append( p );
389 commit(); 445 commit();
390 delete p; 446 delete p;
391} 447}
392 448
393 449
394void PmIpkg::clearLists() 450void PmIpkg::clearLists()
395{ 451{
396 to_remove.clear(); 452 to_remove.clear();
397 to_install.clear(); 453 to_install.clear();
398} 454}
455
456
457void PmIpkg::getIpkgOutput(OProcess *proc, char *buffer, int buflen)
458{
459 QString lineStr, lineStrOld;
460 lineStr = buffer;
461 lineStr=lineStr.left(buflen);
462 //Configuring opie-oipkg...Done
463 if (lineStr!=lineStrOld)
464 out(lineStr);
465 lineStrOld = lineStr;
466} \ No newline at end of file
diff --git a/noncore/unsupported/oipkg/pmipkg.h b/noncore/unsupported/oipkg/pmipkg.h
index d53a74d..2c92348 100644
--- a/noncore/unsupported/oipkg/pmipkg.h
+++ b/noncore/unsupported/oipkg/pmipkg.h
@@ -1,65 +1,65 @@
1#ifndef PMIPKG_H 1#ifndef PMIPKG_H
2#define PMIPKG_H 2#define PMIPKG_H
3 3
4 4
5#include <opie/oprocess.h>
5#include <qobject.h> 6#include <qobject.h>
6#include <qlist.h> 7#include <qlist.h>
7#include <qstring.h> 8#include <qstring.h>
8#include <qwidget.h> 9#include <qwidget.h>
9#include "pksettings.h" 10#include "pksettings.h"
10#include "runwindow.h" 11#include "runwindow.h"
11#include "packagelist.h" 12#include "packagelist.h"
12#include "installdialog.h" 13#include "installdialog.h"
13#include "debug.h" 14#include "debug.h"
14 15
15#define createLink 0 16#define createLink 0
16#define removeLink 1 17#define removeLink 1
17 18
18class Package; 19class Package;
19class PmIpkg : public QObject 20class PmIpkg : public QObject
20{ 21{
21 Q_OBJECT 22 Q_OBJECT
22public: 23public:
23 PmIpkg( PackageManagerSettings* , QWidget* p=0, const char * name=0, WFlags f=0 ); 24 PmIpkg( PackageManagerSettings* , QWidget* p=0, const char * name=0, WFlags f=0 );
24 ~PmIpkg(); 25 ~PmIpkg();
25 26
26 int linkOpp; 27 int linkOpp;
27 void loadList( PackageList* ); 28 void loadList( PackageList* );
28 void commit(); 29 void commit();
29 void update(); 30 void update();
30 void show(); 31 void show();
31 /** No descriptions */ 32 /** No descriptions */
32 void clearLists(); 33 void clearLists();
33 34
34public slots: 35public slots:
35 void doIt(); 36 void doIt();
36 void install(); 37 void install();
37 void remove(); 38 void remove();
38 void installFile(const QString &fileName, const QString &dest=""); 39 void installFile(const QString &fileName, const QString &dest="");
39 void removeFile(const QString &fileName, const QString &dest=""); 40 void removeFile(const QString &fileName, const QString &dest="");
40 void createLinks( const QString &dest ); 41 void createLinks( const QString &dest );
41 void removeLinks( const QString &dest ); 42 void removeLinks( const QString &dest );
42 43
44//private slots:
45 void getIpkgOutput(OProcess *proc, char *buffer, int buflen);
46
43private: 47private:
48 OProcess *ipkgProcess;
44 PackageManagerSettings* settings; 49 PackageManagerSettings* settings;
45 RunWindow *runwindow; 50 RunWindow *runwindow;
46 InstallDialog *installDialog; 51 InstallDialog *installDialog;
47 QList<Package> to_remove; 52 QList<Package> to_remove;
48 QList<Package> to_install; 53 QList<Package> to_install;
49 QString fileNameToInstall;
50 QCheckBox *_force_reinstall;
51 QCheckBox *_force_remove;
52 QCheckBox *_force_depends;
53// void startDialog();
54 void makeLinks(Package*); 54 void makeLinks(Package*);
55 void linkPackage( QString, QString ); 55 void linkPackage( QString, QString );
56 void processLinkDir( QString , QString ); 56 void processLinkDir( QString , QString );
57 bool runIpkg(const QString& args, const QString& dest="" ); 57 bool runIpkg(const QString& args, const QString& dest="" );
58 void out( QString ); 58 void out( QString );
59 QStringList* getList( QString, QString ); 59 QStringList* getList( QString, QString );
60 void processFileList( QStringList*, QString ); 60 void processFileList( QStringList*, QString );
61 61
62 62
63}; 63};
64 64
65#endif 65#endif
diff --git a/noncore/unsupported/oipkg/settings.h b/noncore/unsupported/oipkg/settings.h
index f01cb69..9cb7a9b 100644
--- a/noncore/unsupported/oipkg/settings.h
+++ b/noncore/unsupported/oipkg/settings.h
@@ -1,67 +1,67 @@
1#ifndef PACKAGEMANAGERSETTINGS_H 1#ifndef PACKAGEMANAGERSETTINGS_H
2#define PACKAGEMANAGERSETTINGS_H 2#define PACKAGEMANAGERSETTINGS_H
3 3
4#include "pksettingsbase.h" 4#include "pksettingsbase.h"
5#include <qintdict.h> 5#include <qintdict.h>
6 6
7 7
8class PackageManagerSettings : public PackageManagerSettingsBase 8class PackageManagerSettings : public PackageManagerSettingsBase
9//class PackageManagerSettings : private PackageManagerSettingsBase 9//class PackageManagerSettings : private PackageManagerSettingsBase
10{ 10{
11 // Q_OBJECT 11 Q_OBJECT
12public: 12public:
13 PackageManagerSettings( QWidget* , const char* , WFlags ); 13 PackageManagerSettings( QWidget* , const char* , WFlags );
14 ~PackageManagerSettings(); 14 ~PackageManagerSettings();
15 15
16 bool showDialog( int ) ; 16 bool showDialog( int ) ;
17 QString getDestinationUrl(); 17 QString getDestinationUrl();
18 QString getDestinationName(); 18 QString getDestinationName();
19 QString getLinkDestinationName(); 19 QString getLinkDestinationName();
20 bool createLinks(); 20 bool createLinks();
21 QStringList getActiveServers(); 21 QStringList getActiveServers();
22 QStringList getDestinationUrls(); 22 QStringList getDestinationUrls();
23 23
24public slots: /** No descriptions */ 24public slots: /** No descriptions */
25 void createLinks(); 25 void createLinks();
26 void removeLinks(); 26 void removeLinks();
27 void writeInstallationSettings(); 27 void writeInstallationSettings();
28 void readInstallationSettings(); 28 void readInstallationSettings();
29 void writeCurrentInstallationSetting(); 29 void writeCurrentInstallationSetting();
30 void readInstallationSetting(int); 30 void readInstallationSetting(int);
31 void installationSettingSetName(const QString &); 31 void installationSettingSetName(const QString &);
32 void activeDestinationChange(int) 32 void activeDestinationChange(int)
33 void newServer(); 33 void newServer();
34 void editServer(int); 34 void editServer(int);
35 void removeDestination(); 35 void removeDestination();
36 void newDestination(); 36 void newDestination();
37 void editDestination(int); 37 void editDestination(int);
38 void linkEnabled(bool); 38 void linkEnabled(bool);
39 void removeServer(); 39 void removeServer();
40 void serverNameChanged(const QString&); 40 void serverNameChanged(const QString&);
41 void serverUrlChanged(const QString&); 41 void serverUrlChanged(const QString&);
42 void destNameChanged(const QString&); 42 void destNameChanged(const QString&);
43 void destUrlChanged(const QString&); 43 void destUrlChanged(const QString&);
44 void installationSettingChange(int); 44 void installationSettingChange(int);
45 void newInstallationSetting(); 45 void newInstallationSetting();
46 void removeInstallationSetting(); 46 void removeInstallationSetting();
47 void renameInstallationSetting(); 47 void renameInstallationSetting();
48 48
49private: 49private:
50 QIntDict<QString> serverurlDic; 50 QIntDict<QString> serverurlDic;
51 QIntDict<QString> destinationurlDic; 51 QIntDict<QString> destinationurlDic;
52 int ipkg_old; 52 int ipkg_old;
53 int editedserver; 53 int editedserver;
54 int editeddestination; 54 int editeddestination;
55 int currentSetting; 55 int currentSetting;
56 int installationSettingsCount; 56 int installationSettingsCount;
57 bool changed; 57 bool changed;
58 bool serverChanged; 58 bool serverChanged;
59 59
60 bool readIpkgConfig(const QString&); 60 bool readIpkgConfig(const QString&);
61 void writeIpkgConfig(const QString&); 61 void writeIpkgConfig(const QString&);
62 void writeSettings(); 62 void writeSettings();
63 void readSettings(); 63 void readSettings();
64}; 64};
65 65
66#endif 66#endif
67 67