summaryrefslogtreecommitdiff
authortille <tille>2002-07-17 11:15:50 (UTC)
committer tille <tille>2002-07-17 11:15:50 (UTC)
commitb7c02750fd7f0f57843098b694a10e7a7b52eec8 (patch) (unidiff)
treeb463de360cae2f72fb33378da05fcb9053e6d832
parent1a6f157f6a83a73907dcd4c4da1d7b24cb19dc5c (diff)
downloadopie-b7c02750fd7f0f57843098b694a10e7a7b52eec8.zip
opie-b7c02750fd7f0f57843098b694a10e7a7b52eec8.tar.gz
opie-b7c02750fd7f0f57843098b694a10e7a7b52eec8.tar.bz2
removed setups settings
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/oipkg/mainwindow.cpp5
-rw-r--r--noncore/unsupported/oipkg/packagelistitem.cpp1
-rw-r--r--noncore/unsupported/oipkg/pksettings.cpp114
-rw-r--r--noncore/unsupported/oipkg/pksettings.h10
-rw-r--r--noncore/unsupported/oipkg/pksettingsbase.ui138
5 files changed, 64 insertions, 204 deletions
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 11fc91b..04362d3 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -51,97 +51,97 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
51 settings = new PackageManagerSettings(this,0,TRUE); 51 settings = new PackageManagerSettings(this,0,TRUE);
52 listViewPackages = new PackageListView( this,"listViewPackages",settings ); 52 listViewPackages = new PackageListView( this,"listViewPackages",settings );
53 setCentralWidget( listViewPackages ); 53 setCentralWidget( listViewPackages );
54 listViewPackages->addList( tr("feeds"), &packageListServers ); 54 listViewPackages->addList( tr("feeds"), &packageListServers );
55 listViewPackages->addList( tr("ipkgfind&killefiz"), &packageListSearch ); 55 listViewPackages->addList( tr("ipkgfind&killefiz"), &packageListSearch );
56 listViewPackages->addList( tr("documents"), &packageListDocLnk ); 56 listViewPackages->addList( tr("documents"), &packageListDocLnk );
57 ipkg = new PmIpkg( settings, this ); 57 ipkg = new PmIpkg( settings, this );
58 packageListServers.setSettings( settings ); 58 packageListServers.setSettings( settings );
59 packageListSearch.setSettings( settings ); 59 packageListSearch.setSettings( settings );
60 packageListDocLnk.setSettings( settings ); 60 packageListDocLnk.setSettings( settings );
61 pvDebug(9,"packageListServers.update"); 61 pvDebug(9,"packageListServers.update");
62 packageListServers.update(); 62 packageListServers.update();
63 pvDebug(9,"packageListDocLnk.update"); 63 pvDebug(9,"packageListDocLnk.update");
64 packageListDocLnk.update(); 64 packageListDocLnk.update();
65 pvDebug(9,"makeMenu"); 65 pvDebug(9,"makeMenu");
66 makeMenu(); 66 makeMenu();
67 makeChannel(); 67 makeChannel();
68 68
69 69
70 connect( section, SIGNAL(activated(int)), SLOT(sectionChanged()) ); 70 connect( section, SIGNAL(activated(int)), SLOT(sectionChanged()) );
71 connect( subsection, SIGNAL(activated(int)), SLOT(subSectionChanged()) ); 71 connect( subsection, SIGNAL(activated(int)), SLOT(subSectionChanged()) );
72 72
73 connect( settings->removeLinksButton, SIGNAL( clicked()), 73 connect( settings->removeLinksButton, SIGNAL( clicked()),
74 SLOT(removeLinks()) ); 74 SLOT(removeLinks()) );
75 connect( settings->createLinksButton, SIGNAL( clicked()), 75 connect( settings->createLinksButton, SIGNAL( clicked()),
76 SLOT(createLinks()) ); 76 SLOT(createLinks()) );
77 77
78 pvDebug(9,"displayList"); 78 pvDebug(9,"displayList");
79 displayList(); 79 displayList();
80} 80}
81 81
82void MainWindow::makeMenu() 82void MainWindow::makeMenu()
83{ 83{
84 84
85 QPEToolBar *toolBar = new QPEToolBar( this ); 85 QPEToolBar *toolBar = new QPEToolBar( this );
86 QPEMenuBar *menuBar = new QPEMenuBar( toolBar ); 86 QPEMenuBar *menuBar = new QPEMenuBar( toolBar );
87 QPopupMenu *srvMenu = new QPopupMenu( menuBar ); 87 QPopupMenu *srvMenu = new QPopupMenu( menuBar );
88 QPopupMenu *viewMenu = new QPopupMenu( menuBar ); 88 QPopupMenu *viewMenu = new QPopupMenu( menuBar );
89 QPopupMenu *cfgMenu = new QPopupMenu( menuBar ); 89 QPopupMenu *cfgMenu = new QPopupMenu( menuBar );
90 QPopupMenu *helpMenu = new QPopupMenu( menuBar ); 90 QPopupMenu *helpMenu = new QPopupMenu( menuBar );
91 91
92 setToolBarsMovable( false ); 92 setToolBarsMovable( false );
93 toolBar->setHorizontalStretchable( true ); 93 toolBar->setHorizontalStretchable( true );
94 menuBar->insertItem( tr( "Package" ), srvMenu ); 94 menuBar->insertItem( tr( "Package" ), srvMenu );
95 menuBar->insertItem( tr( "View" ), viewMenu ); 95 menuBar->insertItem( tr( "View" ), viewMenu );
96 menuBar->insertItem( tr( "Settings" ), cfgMenu ); 96 menuBar->insertItem( tr( "Settings" ), cfgMenu );
97 menuBar->insertItem( tr( "Help" ), helpMenu ); 97 menuBar->insertItem( tr( "Help" ), helpMenu );
98 98
99 QLabel *spacer; 99// QLabel *spacer;
100// spacer = new QLabel( "", toolBar ); 100// spacer = new QLabel( "", toolBar );
101// spacer->setBackgroundColor( toolBar->backgroundColor() ); 101// spacer->setBackgroundColor( toolBar->backgroundColor() );
102// toolBar->setStretchableWidget( spacer ); 102// toolBar->setStretchableWidget( spacer );
103 103
104 104
105 runAction = new QAction( tr( "Apply" ), 105 runAction = new QAction( tr( "Apply" ),
106 Resource::loadPixmap( "oipkg/install" ), 106 Resource::loadPixmap( "oipkg/install" ),
107 QString::null, 0, this, 0 ); 107 QString::null, 0, this, 0 );
108 connect( runAction, SIGNAL( activated() ), 108 connect( runAction, SIGNAL( activated() ),
109 this, SLOT( runIpkg() ) ); 109 this, SLOT( runIpkg() ) );
110 runAction->addTo( toolBar ); 110 runAction->addTo( toolBar );
111 runAction->addTo( srvMenu ); 111 runAction->addTo( srvMenu );
112 112
113 srvMenu->insertSeparator(); 113 srvMenu->insertSeparator();
114 114
115 updateAction = new QAction( tr( "Update" ), 115 updateAction = new QAction( tr( "Update" ),
116 Resource::loadIconSet( "oipkg/update" ), 116 Resource::loadIconSet( "oipkg/update" ),
117 QString::null, 0, this, 0 ); 117 QString::null, 0, this, 0 );
118 connect( updateAction, SIGNAL( activated() ), 118 connect( updateAction, SIGNAL( activated() ),
119 this , SLOT( updateList() ) ); 119 this , SLOT( updateList() ) );
120 updateAction->addTo( toolBar ); 120 updateAction->addTo( toolBar );
121 updateAction->addTo( srvMenu ); 121 updateAction->addTo( srvMenu );
122 122
123 QAction *cfgact; 123 QAction *cfgact;
124 124
125 cfgact = new QAction( tr( "Setups" ), 125 cfgact = new QAction( tr( "Setups" ),
126 QString::null, 0, this, 0 ); 126 QString::null, 0, this, 0 );
127 connect( cfgact, SIGNAL( activated() ), 127 connect( cfgact, SIGNAL( activated() ),
128 SLOT( showSettingsSetup() ) ); 128 SLOT( showSettingsSetup() ) );
129 cfgact->addTo( cfgMenu ); 129 cfgact->addTo( cfgMenu );
130 130
131 cfgact = new QAction( tr( "Servers" ), 131 cfgact = new QAction( tr( "Servers" ),
132 QString::null, 0, this, 0 ); 132 QString::null, 0, this, 0 );
133 connect( cfgact, SIGNAL( activated() ), 133 connect( cfgact, SIGNAL( activated() ),
134 SLOT( showSettingsSrv() ) ); 134 SLOT( showSettingsSrv() ) );
135 cfgact->addTo( cfgMenu ); 135 cfgact->addTo( cfgMenu );
136 cfgact = new QAction( tr( "Destinations" ), 136 cfgact = new QAction( tr( "Destinations" ),
137 QString::null, 0, this, 0 ); 137 QString::null, 0, this, 0 );
138 connect( cfgact, SIGNAL( activated() ), 138 connect( cfgact, SIGNAL( activated() ),
139 SLOT( showSettingsDst() ) ); 139 SLOT( showSettingsDst() ) );
140 cfgact->addTo( cfgMenu ); 140 cfgact->addTo( cfgMenu );
141 141
142 QAction *a; 142 QAction *a;
143 143
144 // SECTIONS 144 // SECTIONS
145 sectionBar = new QPEToolBar( this ); 145 sectionBar = new QPEToolBar( this );
146 addToolBar( sectionBar, "Section", QMainWindow::Top, TRUE ); 146 addToolBar( sectionBar, "Section", QMainWindow::Top, TRUE );
147 sectionBar->setHorizontalStretchable( true ); 147 sectionBar->setHorizontalStretchable( true );
@@ -179,98 +179,97 @@ void MainWindow::makeMenu()
179 connect( findEdit, SIGNAL( textChanged( const QString & ) ), 179 connect( findEdit, SIGNAL( textChanged( const QString & ) ),
180 this, SLOT( displayList() ) ); 180 this, SLOT( displayList() ) );
181 a = new QAction( tr( "Clear Find" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 ); 181 a = new QAction( tr( "Clear Find" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 );
182 connect( a, SIGNAL( activated() ), findEdit, SLOT( clear() ) ); 182 connect( a, SIGNAL( activated() ), findEdit, SLOT( clear() ) );
183 a->addTo( findBar ); 183 a->addTo( findBar );
184 a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); 184 a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
185 connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) ); 185 connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) );
186 a->addTo( findBar ); 186 a->addTo( findBar );
187 findAction = new QAction( tr( "Filter" ), QString::null, 0, this, 0 ); 187 findAction = new QAction( tr( "Filter" ), QString::null, 0, this, 0 );
188 connect( findAction, SIGNAL( toggled(bool) ), this, SLOT( findShow(bool) ) ); 188 connect( findAction, SIGNAL( toggled(bool) ), this, SLOT( findShow(bool) ) );
189 findAction->setToggleAction( true ); 189 findAction->setToggleAction( true );
190 findAction->addTo( viewMenu ); 190 findAction->addTo( viewMenu );
191 191
192 //SEARCH 192 //SEARCH
193 searchBar = new QPEToolBar(this); 193 searchBar = new QPEToolBar(this);
194 addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); 194 addToolBar( searchBar, "Search", QMainWindow::Top, TRUE );
195 label = new QLabel( tr("Search: "), searchBar ); 195 label = new QLabel( tr("Search: "), searchBar );
196// label->setBackgroundMode( PaletteForeground ); 196// label->setBackgroundMode( PaletteForeground );
197 searchBar->setHorizontalStretchable( TRUE ); 197 searchBar->setHorizontalStretchable( TRUE );
198 searchEdit = new QLineEdit( searchBar, "seachEdit" ); 198 searchEdit = new QLineEdit( searchBar, "seachEdit" );
199 searchBar->setStretchableWidget( searchEdit ); 199 searchBar->setStretchableWidget( searchEdit );
200// connect( searchEdit, SIGNAL( textChanged( const QString & ) ), 200// connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
201// this, SLOT( displayList() ) ); 201// this, SLOT( displayList() ) );
202 a = new QAction( tr( "Clear Search" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 ); 202 a = new QAction( tr( "Clear Search" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 );
203 connect( a, SIGNAL( activated() ), searchEdit, SLOT( clear() ) ); 203 connect( a, SIGNAL( activated() ), searchEdit, SLOT( clear() ) );
204 a->addTo( searchBar ); 204 a->addTo( searchBar );
205 searchCommit = new QAction( tr( "Do Search" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 ); 205 searchCommit = new QAction( tr( "Do Search" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 );
206 connect( searchCommit, SIGNAL( activated() ), SLOT( remotePackageQuery() ) ); 206 connect( searchCommit, SIGNAL( activated() ), SLOT( remotePackageQuery() ) );
207 searchCommit->addTo( searchBar ); 207 searchCommit->addTo( searchBar );
208 a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); 208 a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
209 connect( a, SIGNAL( activated() ), this, SLOT( searchClose() ) ); 209 connect( a, SIGNAL( activated() ), this, SLOT( searchClose() ) );
210 a->addTo( searchBar ); 210 a->addTo( searchBar );
211 searchAction = new QAction( tr( "Search" ), QString::null, 0, this, 0 ); 211 searchAction = new QAction( tr( "Search" ), QString::null, 0, this, 0 );
212 connect( searchAction, SIGNAL( toggled(bool) ), this, SLOT( searchShow(bool) ) ); 212 connect( searchAction, SIGNAL( toggled(bool) ), this, SLOT( searchShow(bool) ) );
213 searchAction->setToggleAction( true ); 213 searchAction->setToggleAction( true );
214 searchAction->addTo( viewMenu ); 214 searchAction->addTo( viewMenu );
215 215
216 //DEST 216 //DEST
217 destBar = new QPEToolBar(this); 217 destBar = new QPEToolBar(this);
218 addToolBar( destBar, "Destination", QMainWindow::Top, TRUE ); 218 addToolBar( destBar, "Destination", QMainWindow::Top, TRUE );
219 label = new QLabel( tr("Destination: "), destBar ); 219 label = new QLabel( tr("Destination: "), destBar );
220// label->setBackgroundMode( PaletteForeground ); 220// label->setBackgroundMode( PaletteForeground );
221 destBar->setHorizontalStretchable( TRUE ); 221 destBar->setHorizontalStretchable( TRUE );
222 destination = new QComboBox( false, destBar ); 222 destination = new QComboBox( false, destBar );
223 destination->insertStringList( settings->getDestinationNames() ); 223 destination->insertStringList( settings->getDestinationNames() );
224 setComboName(destination,settings->getDestinationName()); 224 setComboName(destination,settings->getDestinationName());
225 connect( destination, SIGNAL(activated(int)), 225 connect( destination, SIGNAL(activated(int)),
226 settings, SLOT(activeDestinationChange(int)) ); 226 settings, SLOT(activeDestinationChange(int)) );
227// spacer = new QLabel( " ", destBar ); 227// space->setBackgroundMode( PaletteForeground );
228// spacer->setBackgroundMode( PaletteForeground );
229 CheckBoxLink = new QCheckBox( tr("Link"), destBar); 228 CheckBoxLink = new QCheckBox( tr("Link"), destBar);
230// CheckBoxLink->setBackgroundMode( PaletteForeground ); 229// CheckBoxLink->setBackgroundMode( PaletteForeground );
231 CheckBoxLink->setChecked( settings->createLinks() ); 230 CheckBoxLink->setChecked( settings->createLinks() );
232 connect( CheckBoxLink, SIGNAL(toggled(bool)), 231 connect( CheckBoxLink, SIGNAL(toggled(bool)),
233 settings, SLOT(linkEnabled(bool)) ); 232 settings, SLOT(linkEnabled(bool)) );
234 destAction = new QAction( tr( "Destinations" ), QString::null, 0, this, 0 ); 233 destAction = new QAction( tr( "Destinations" ), QString::null, 0, this, 0 );
235 connect( destAction, SIGNAL( toggled(bool) ), SLOT( destShow(bool) ) ); 234 connect( destAction, SIGNAL( toggled(bool) ), SLOT( destShow(bool) ) );
236 a = new QAction( tr( "Close Destinations" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); 235 a = new QAction( tr( "Close Destinations" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
237 connect( a, SIGNAL( activated() ), SLOT( destClose() ) ); 236 connect( a, SIGNAL( activated() ), SLOT( destClose() ) );
238 a->addTo( destBar ); 237 a->addTo( destBar );
239 destBar->setStretchableWidget( CheckBoxLink ); 238 destBar->setStretchableWidget( CheckBoxLink );
240 destAction->setToggleAction( true ); 239 destAction->setToggleAction( true );
241 destAction->addTo( viewMenu ); 240 destAction->addTo( viewMenu );
242 241
243// helpMenu 242// helpMenu
244 helpMenu->insertSeparator(); 243 helpMenu->insertSeparator();
245 a = new QAction( tr( "Package Actions" ), QString::null, 0, this, 0 ); 244 a = new QAction( tr( "Package Actions" ), QString::null, 0, this, 0 );
246 a->addTo( helpMenu ); 245 a->addTo( helpMenu );
247 helpMenu->insertSeparator(); 246 helpMenu->insertSeparator();
248 a = new QAction( tr( "Install" ), 247 a = new QAction( tr( "Install" ),
249 Resource::loadPixmap( "oipkg/install" ), QString::null, 0, this, 0 ); 248 Resource::loadPixmap( "oipkg/install" ), QString::null, 0, this, 0 );
250 a->addTo( helpMenu ); 249 a->addTo( helpMenu );
251 a = new QAction( tr( "Remove" ), 250 a = new QAction( tr( "Remove" ),
252 Resource::loadPixmap( "oipkg/uninstall" ), QString::null, 0, this, 0 ); 251 Resource::loadPixmap( "oipkg/uninstall" ), QString::null, 0, this, 0 );
253 a->addTo( helpMenu ); 252 a->addTo( helpMenu );
254 helpMenu->insertSeparator(); 253 helpMenu->insertSeparator();
255 a = new QAction( tr( "Package Status" ), QString::null, 0, this, 0 ); 254 a = new QAction( tr( "Package Status" ), QString::null, 0, this, 0 );
256 a->addTo( helpMenu ); 255 a->addTo( helpMenu );
257 helpMenu->insertSeparator(); 256 helpMenu->insertSeparator();
258 a = new QAction( tr( "New version, installed" ), 257 a = new QAction( tr( "New version, installed" ),
259 Resource::loadPixmap( "oipkg/installed" ), QString::null, 0, this, 0 ); 258 Resource::loadPixmap( "oipkg/installed" ), QString::null, 0, this, 0 );
260 a->addTo( helpMenu ); 259 a->addTo( helpMenu );
261 a = new QAction( tr( "New version, not installed" ), 260 a = new QAction( tr( "New version, not installed" ),
262 Resource::loadPixmap( "oipkg/uninstalled" ), QString::null, 0, this, 0 ); 261 Resource::loadPixmap( "oipkg/uninstalled" ), QString::null, 0, this, 0 );
263 a->addTo( helpMenu ); 262 a->addTo( helpMenu );
264 a = new QAction( tr( "Old version, installed" ), 263 a = new QAction( tr( "Old version, installed" ),
265 Resource::loadPixmap( "oipkg/installedOld" ), QString::null, 0, this, 0 ); 264 Resource::loadPixmap( "oipkg/installedOld" ), QString::null, 0, this, 0 );
266 a->addTo( helpMenu ); 265 a->addTo( helpMenu );
267 a = new QAction( tr( "Old version, not installed" ), 266 a = new QAction( tr( "Old version, not installed" ),
268 Resource::loadPixmap( "oipkg/uninstalledOld" ), QString::null, 0, this, 0 ); 267 Resource::loadPixmap( "oipkg/uninstalledOld" ), QString::null, 0, this, 0 );
269 a->addTo( helpMenu ); 268 a->addTo( helpMenu );
270 a = new QAction( tr( "Old version, new version installed" ), 269 a = new QAction( tr( "Old version, new version installed" ),
271 Resource::loadPixmap( "oipkg/uninstalledOldinstalledNew" ), QString::null, 0, this, 0 ); 270 Resource::loadPixmap( "oipkg/uninstalledOldinstalledNew" ), QString::null, 0, this, 0 );
272 a->addTo( helpMenu ); 271 a->addTo( helpMenu );
273 a = new QAction( tr( "New version, old version installed" ), 272 a = new QAction( tr( "New version, old version installed" ),
274 Resource::loadPixmap( "oipkg/uninstalledInstalledOld" ), QString::null, 0, this, 0 ); 273 Resource::loadPixmap( "oipkg/uninstalledInstalledOld" ), QString::null, 0, this, 0 );
275 a->addTo( helpMenu ); 274 a->addTo( helpMenu );
276 //a = new QAction( tr( "" ), 275 //a = new QAction( tr( "" ),
diff --git a/noncore/unsupported/oipkg/packagelistitem.cpp b/noncore/unsupported/oipkg/packagelistitem.cpp
index b5e86f5..03bf477 100644
--- a/noncore/unsupported/oipkg/packagelistitem.cpp
+++ b/noncore/unsupported/oipkg/packagelistitem.cpp
@@ -67,97 +67,96 @@ void PackageListItem::init( Package *pi, PackageManagerSettings *s)
67 pm_installed_old = new QPixmap(Resource::loadPixmap("oipkg/installedOld")); 67 pm_installed_old = new QPixmap(Resource::loadPixmap("oipkg/installedOld"));
68 pm_install = new QPixmap(Resource::loadPixmap("oipkg/install")); 68 pm_install = new QPixmap(Resource::loadPixmap("oipkg/install"));
69 pm_uninstall = new QPixmap(Resource::loadPixmap("oipkg/uninstall")); 69 pm_uninstall = new QPixmap(Resource::loadPixmap("oipkg/uninstall"));
70 } 70 }
71} 71}
72 72
73void PackageListItem::paintCell( QPainter *p, const QColorGroup & cg, 73void PackageListItem::paintCell( QPainter *p, const QColorGroup & cg,
74 int column, int width, int alignment ) 74 int column, int width, int alignment )
75{ 75{
76 if ( !p ) 76 if ( !p )
77 return; 77 return;
78 78
79 p->fillRect( 0, 0, width, height(), 79 p->fillRect( 0, 0, width, height(),
80 isSelected()? cg.highlight() : cg.base() ); 80 isSelected()? cg.highlight() : cg.base() );
81 81
82 if ( column != 0 ) { 82 if ( column != 0 ) {
83 // The rest is text 83 // The rest is text
84 QListViewItem::paintCell( p, cg, column, width, alignment ); 84 QListViewItem::paintCell( p, cg, column, width, alignment );
85 return; 85 return;
86 } 86 }
87 87
88 QListView *lv = listView(); 88 QListView *lv = listView();
89 if ( !lv ) 89 if ( !lv )
90 return; 90 return;
91 int marg = lv->itemMargin(); 91 int marg = lv->itemMargin();
92 int r = marg; 92 int r = marg;
93 93
94 QPixmap pm = statePixmap(); 94 QPixmap pm = statePixmap();
95 p->drawPixmap(marg,(height()-pm.height())/2,pm); 95 p->drawPixmap(marg,(height()-pm.height())/2,pm);
96 r += pm.width()+1; 96 r += pm.width()+1;
97 97
98 p->translate( r, 0 ); 98 p->translate( r, 0 );
99 QListViewItem::paintCell( p, cg, column, width - r, alignment ); 99 QListViewItem::paintCell( p, cg, column, width - r, alignment );
100} 100}
101 101
102 102
103void PackageListItem::paintFocus( QPainter *p, const QColorGroup & cg, 103void PackageListItem::paintFocus( QPainter *p, const QColorGroup & cg,
104 const QRect & r ) 104 const QRect & r )
105{ 105{
106 // Skip QCheckListItem 106 // Skip QCheckListItem
107 // (makes you wonder what we're getting from QCheckListItem) 107 // (makes you wonder what we're getting from QCheckListItem)
108 QListViewItem::paintFocus(p,cg,r); 108 QListViewItem::paintFocus(p,cg,r);
109} 109}
110 110
111QPixmap PackageListItem::statePixmap() const 111QPixmap PackageListItem::statePixmap() const
112{ 112{
113 bool installed = package->installed(); 113 bool installed = package->installed();
114 bool old = package->isOld(); 114 bool old = package->isOld();
115 bool versions = package->hasVersions();
116 bool verinstalled = package->otherInstalled(); 115 bool verinstalled = package->otherInstalled();
117 if ( !package->toProcess() ) { 116 if ( !package->toProcess() ) {
118 if ( !installed ) 117 if ( !installed )
119 if (old) 118 if (old)
120 { 119 {
121 if (verinstalled) return *pm_uninstalled_old_installed_new; 120 if (verinstalled) return *pm_uninstalled_old_installed_new;
122 else return *pm_uninstalled_old; 121 else return *pm_uninstalled_old;
123 } 122 }
124 else 123 else
125 { 124 {
126 if (verinstalled) return *pm_uninstalled_installed_old; 125 if (verinstalled) return *pm_uninstalled_installed_old;
127 else return *pm_uninstalled; 126 else return *pm_uninstalled;
128 } 127 }
129 else 128 else
130 if (old) return *pm_installed_old; 129 if (old) return *pm_installed_old;
131 else return *pm_installed; 130 else return *pm_installed;
132 } else { //toProcess() == true 131 } else { //toProcess() == true
133 if ( !installed ) 132 if ( !installed )
134 return *pm_install; 133 return *pm_install;
135 else 134 else
136 return *pm_uninstall; 135 return *pm_uninstall;
137 } 136 }
138} 137}
139 138
140QString PackageListItem::key( int column, bool ascending ) const 139QString PackageListItem::key( int column, bool ascending ) const
141{ 140{
142 if ( column == 2 ) { 141 if ( column == 2 ) {
143 QString t = text(2); 142 QString t = text(2);
144 double bytes=t.toDouble(); 143 double bytes=t.toDouble();
145 if ( t.contains('M') ) bytes*=1024*1024; 144 if ( t.contains('M') ) bytes*=1024*1024;
146 else if ( t.contains('K') || t.contains('k') ) bytes*=1024; 145 else if ( t.contains('K') || t.contains('k') ) bytes*=1024;
147 if ( !ascending ) bytes=999999999-bytes; 146 if ( !ascending ) bytes=999999999-bytes;
148 return QString().sprintf("%09d",(int)bytes); 147 return QString().sprintf("%09d",(int)bytes);
149 } else { 148 } else {
150 return QListViewItem::key(column,ascending); 149 return QListViewItem::key(column,ascending);
151 } 150 }
152} 151}
153 152
154void PackageListItem::setOn( bool b ) 153void PackageListItem::setOn( bool b )
155{ 154{
156 QCheckListItem::setOn( b ); 155 QCheckListItem::setOn( b );
157 package->toggleProcess(); 156 package->toggleProcess();
158 package->setLink( settings->createLinks() ); 157 package->setLink( settings->createLinks() );
159 displayDetails(); 158 displayDetails();
160} 159}
161 160
162void PackageListItem::displayDetails() 161void PackageListItem::displayDetails()
163{ 162{
diff --git a/noncore/unsupported/oipkg/pksettings.cpp b/noncore/unsupported/oipkg/pksettings.cpp
index 14c1944..acabaed 100644
--- a/noncore/unsupported/oipkg/pksettings.cpp
+++ b/noncore/unsupported/oipkg/pksettings.cpp
@@ -1,116 +1,116 @@
1#include "pksettings.h" 1#include "pksettings.h"
2 2
3#include <qpe/process.h> 3#include <qpe/process.h>
4#include <qpe/resource.h> 4#include <qpe/resource.h>
5#include <qpe/stringutil.h> 5#include <qpe/stringutil.h>
6#include <qpe/qpeapplication.h> 6#include <qpe/qpeapplication.h>
7#include <qpe/qcopenvelope_qws.h> 7#include <qpe/qcopenvelope_qws.h>
8#include <qpe/applnk.h> 8#include <qpe/applnk.h>
9#include <qpe/config.h> 9#include <qpe/config.h>
10 10
11#include <qprogressbar.h> 11#include <qprogressbar.h>
12#include <qcombobox.h> 12#include <qcombobox.h>
13#include <qdict.h> 13#include <qdict.h>
14#include <qfile.h> 14#include <qfile.h>
15#include <qlineedit.h> 15#include <qlineedit.h>
16#include <qpushbutton.h> 16#include <qpushbutton.h>
17#include <qlistview.h> 17#include <qlistview.h>
18#include <qlistbox.h> 18#include <qlistbox.h>
19#include <qcheckbox.h> 19#include <qcheckbox.h>
20#include <qmessagebox.h> 20#include <qmessagebox.h>
21#include <qpainter.h> 21#include <qpainter.h>
22#include <qpixmap.h> 22#include <qpixmap.h>
23#include <qregexp.h> 23#include <qregexp.h>
24#include <qstring.h> 24#include <qstring.h>
25#include <qobject.h> 25#include <qobject.h>
26#include <qtextstream.h> 26#include <qtextstream.h>
27#include <qtextview.h> 27#include <qtextview.h>
28#include <qtoolbutton.h> 28#include <qtoolbutton.h>
29#include <qtabwidget.h> 29#include <qtabwidget.h>
30 30
31#include <stdlib.h> 31#include <stdlib.h>
32#include <unistd.h> 32#include <unistd.h>
33#include "debug.h" 33#include "debug.h"
34//#include "utils.h" 34//#include "utils.h"
35 35
36PackageManagerSettings::PackageManagerSettings( QWidget* parent, const char* name, WFlags fl ) 36PackageManagerSettings::PackageManagerSettings( QWidget* parent, const char* name, WFlags fl )
37 : PackageManagerSettingsBase( parent, name, fl ) 37 : PackageManagerSettingsBase( parent, name, fl )
38{ 38{
39 connect( newserver, SIGNAL(clicked()), this, SLOT(newServer()) ); 39 connect( newserver, SIGNAL(clicked()), this, SLOT(newServer()) );
40 connect( removeserver, SIGNAL(clicked()), this, SLOT(removeServer()) ); 40 connect( removeserver, SIGNAL(clicked()), this, SLOT(removeServer()) );
41 connect( servers, SIGNAL(highlighted(int)), this, SLOT(editServer(int)) ); 41 connect( servers, SIGNAL(highlighted(int)), this, SLOT(editServer(int)) );
42 connect( newdestination, SIGNAL(clicked()), this, SLOT(newDestination()) ); 42 connect( newdestination, SIGNAL(clicked()), this, SLOT(newDestination()) );
43 connect( removedestination, SIGNAL(clicked()), this, SLOT(removeDestination()) ); 43 connect( removedestination, SIGNAL(clicked()), this, SLOT(removeDestination()) );
44 connect( destinations, SIGNAL(highlighted(int)), this, SLOT(editDestination(int)) ); 44 connect( destinations, SIGNAL(highlighted(int)), this, SLOT(editDestination(int)) );
45 // connect( CheckBoxLink, SIGNAL(toggled(bool)), 45 // connect( CheckBoxLink, SIGNAL(toggled(bool)),
46 // activeLinkDestination, SLOT(setEnabled(bool)) ); 46 // activeLinkDestination, SLOT(setEnabled(bool)) );
47 47
48 connect( settingName, SIGNAL(activated(int)), this, SLOT(installationSettingChange(int)) ); 48// connect( settingName, SIGNAL(activated(int)), this, SLOT(installationSettingChange(int)) );
49 connect( settingName, SIGNAL(textChanged(const QString &)), this, SLOT(installationSettingSetName(const QString &)) ); 49// connect( settingName, SIGNAL(textChanged(const QString &)), this, SLOT(installationSettingSetName(const QString &)) );
50 connect( newsetting, SIGNAL(clicked()), this, SLOT(newInstallationSetting()) ); 50// connect( newsetting, SIGNAL(clicked()), this, SLOT(newInstallationSetting()) );
51 connect( renamesetting, SIGNAL(clicked()), this, SLOT(renameInstallationSetting()) ); 51// connect( renamesetting, SIGNAL(clicked()), this, SLOT(renameInstallationSetting()) );
52 connect( removesetting, SIGNAL(clicked()), this, SLOT(removeInstallationSetting()) ); 52 // connect( removesetting, SIGNAL(clicked()), this, SLOT(removeInstallationSetting()) );
53 servername->setEnabled(FALSE); 53 servername->setEnabled(FALSE);
54 serverurl->setEnabled(FALSE); 54 serverurl->setEnabled(FALSE);
55 serverurlDic.setAutoDelete(TRUE); 55 serverurlDic.setAutoDelete(TRUE);
56 destinationname->setEnabled(FALSE); 56 destinationname->setEnabled(FALSE);
57 destinationurl->setEnabled(FALSE); 57 destinationurl->setEnabled(FALSE);
58 destinationurlDic.setAutoDelete(TRUE); 58 destinationurlDic.setAutoDelete(TRUE);
59 readSettings(); 59 readSettings();
60 activeLinkDestination->hide(); 60 activeLinkDestination->hide();
61 serverChanged = false; 61 serverChanged = false;
62 62
63 // get rid of setups 63 // get rid of setups
64// Settings->hide(); 64// Settings->hide();
65 settingName->hide(); 65// settingName->hide();
66 newsetting->hide(); 66// newsetting->hide();
67 renamesetting->hide(); 67// renamesetting->hide();
68 removesetting->hide(); 68// removesetting->hide();
69} 69}
70 70
71PackageManagerSettings::~PackageManagerSettings() 71PackageManagerSettings::~PackageManagerSettings()
72{ 72{
73} 73}
74 74
75 75
76void PackageManagerSettings::newServer() 76void PackageManagerSettings::newServer()
77{ 77{
78 int i = servers->count(); 78 int i = servers->count();
79 if ( servername->isEnabled() || serverurl->text().isEmpty() ) { 79 if ( servername->isEnabled() || serverurl->text().isEmpty() ) {
80 serverurlDic.insert(i,new QString("http://")); 80 serverurlDic.insert(i,new QString("http://"));
81 servers->insertItem(tr("New")); 81 servers->insertItem(tr("New"));
82 activeServers->insertItem(tr("New")); 82 activeServers->insertItem(tr("New"));
83 } else { 83 } else {
84 // allows one-level undo 84 // allows one-level undo
85 serverurlDic.insert(i,new QString(serverurl->text())); 85 serverurlDic.insert(i,new QString(serverurl->text()));
86 servers->insertItem(servername->text()); 86 servers->insertItem(servername->text());
87 activeServers->insertItem(servername->text()); 87 activeServers->insertItem(servername->text());
88 } 88 }
89 changed = true; 89 changed = true;
90 servers->setSelected(i,TRUE); 90 servers->setSelected(i,TRUE);
91 editServer(i); 91 editServer(i);
92 changed = true; 92 changed = true;
93} 93}
94 94
95void PackageManagerSettings::newDestination() 95void PackageManagerSettings::newDestination()
96{ 96{
97 int i = destinations->count(); 97 int i = destinations->count();
98 if ( destinationname->isEnabled() || destinationurl->text().isEmpty() ) { 98 if ( destinationname->isEnabled() || destinationurl->text().isEmpty() ) {
99 destinationurlDic.insert(i,new QString("/")); 99 destinationurlDic.insert(i,new QString("/"));
100 destinations->insertItem(tr("New")); 100 destinations->insertItem(tr("New"));
101 activeDestination->insertItem(tr("New")); 101 activeDestination->insertItem(tr("New"));
102 activeLinkDestination->insertItem(tr("New")); 102 activeLinkDestination->insertItem(tr("New"));
103 } else { 103 } else {
104 // allows one-level undo 104 // allows one-level undo
105 destinationurlDic.insert(i,new QString(destinationurl->text())); 105 destinationurlDic.insert(i,new QString(destinationurl->text()));
106 destinations->insertItem(destinationname->text()); 106 destinations->insertItem(destinationname->text());
107 activeDestination->insertItem(destinationname->text()); 107 activeDestination->insertItem(destinationname->text());
108 activeLinkDestination->insertItem(destinationname->text()); 108 activeLinkDestination->insertItem(destinationname->text());
109 } 109 }
110 destinations->setSelected(i,TRUE); 110 destinations->setSelected(i,TRUE);
111 editDestination(i); 111 editDestination(i);
112 changed = true; 112 changed = true;
113} 113}
114 114
115 115
116void PackageManagerSettings::editServer(int i) 116void PackageManagerSettings::editServer(int i)
@@ -207,197 +207,197 @@ void PackageManagerSettings::destNameChanged(const QString& t)
207 activeLinkDestination->changeItem( t, editeddestination ); 207 activeLinkDestination->changeItem( t, editeddestination );
208 connect( destinations, SIGNAL(highlighted(int)), this, SLOT(editDestination(int)) ); 208 connect( destinations, SIGNAL(highlighted(int)), this, SLOT(editDestination(int)) );
209 changed = true; 209 changed = true;
210} 210}
211 211
212void PackageManagerSettings::serverUrlChanged(const QString& t) 212void PackageManagerSettings::serverUrlChanged(const QString& t)
213{ 213{
214 serverurlDic.replace(editedserver, new QString(t)); 214 serverurlDic.replace(editedserver, new QString(t));
215 changed = true; 215 changed = true;
216 serverChanged = true; 216 serverChanged = true;
217} 217}
218 218
219void PackageManagerSettings::destUrlChanged(const QString& t) 219void PackageManagerSettings::destUrlChanged(const QString& t)
220{ 220{
221 destinationurlDic.replace(editeddestination, new QString(t)); 221 destinationurlDic.replace(editeddestination, new QString(t));
222 changed = true; 222 changed = true;
223} 223}
224 224
225void PackageManagerSettings::writeIpkgConfig(const QString& conffile) 225void PackageManagerSettings::writeIpkgConfig(const QString& conffile)
226{ 226{
227 QFile conf(conffile); 227 QFile conf(conffile);
228 if ( ! conf.open(IO_WriteOnly) ) return; 228 if ( ! conf.open(IO_WriteOnly) ) return;
229 QTextStream s(&conf); 229 QTextStream s(&conf);
230 s << "# Written by qpie Package Manager\n"; 230 s << "# Written by qpie Package Manager\n";
231 for (int i=0; i<(int)activeServers->count(); i++) 231 for (int i=0; i<(int)activeServers->count(); i++)
232 { 232 {
233 QString url = serverurlDic[i] ? *serverurlDic[i] : QString("???"); 233 QString url = serverurlDic[i] ? *serverurlDic[i] : QString("???");
234 if ( !activeServers->isSelected(i) ) 234 if ( !activeServers->isSelected(i) )
235 s << "#"; 235 s << "#";
236 s << "src " << activeServers->text(i) << " " << url << "\n"; 236 s << "src " << activeServers->text(i) << " " << url << "\n";
237 } 237 }
238 for (int i=0; i<(int)destinations->count(); i++) 238 for (int i=0; i<(int)destinations->count(); i++)
239 { 239 {
240 QString url = destinationurlDic[i] ? *destinationurlDic[i] : QString("???"); 240 QString url = destinationurlDic[i] ? *destinationurlDic[i] : QString("???");
241 s << "dest " << destinations->text(i) << " " << url << "\n"; 241 s << "dest " << destinations->text(i) << " " << url << "\n";
242 } 242 }
243 conf.close(); 243 conf.close();
244} 244}
245 245
246 246
247void PackageManagerSettings::readInstallationSettings() 247void PackageManagerSettings::readInstallationSettings()
248{ 248{
249 Config cfg( "oipkg", Config::User ); 249 Config cfg( "oipkg", Config::User );
250 cfg.setGroup( "Settings" ); 250 cfg.setGroup( "Settings" );
251 251
252 installationSettingsCount = cfg.readNumEntry( "count", -1 ); 252 installationSettingsCount = cfg.readNumEntry( "count", -1 );
253 currentSetting = cfg.readNumEntry( "current", 0 );// o should be -1 253 currentSetting = cfg.readNumEntry( "current", 0 );// o should be -1
254 254
255 for (int i = 0; i < installationSettingsCount; i++) 255// for (int i = 0; i < installationSettingsCount; i++)
256 { 256// {
257 cfg.setGroup( "Setting_" + QString::number(i) ); 257// cfg.setGroup( "Setting_" + QString::number(i) );
258 settingName->insertItem( cfg.readEntry( "name", "???" ), i ); 258// settingName->insertItem( cfg.readEntry( "name", "???" ), i );
259 }; 259// };
260 readInstallationSetting( currentSetting ); 260 readInstallationSetting( currentSetting );
261} 261}
262 262
263 263
264 264
265/** 265///**
266 * remove from conf file 266// * remove from conf file
267 */ 267// */
268void PackageManagerSettings::removeInstallationSetting() 268//void PackageManagerSettings::removeInstallationSetting()
269{ 269//{
270 settingName->removeItem( settingName->currentItem() ); 270// settingName->removeItem( settingName->currentItem() );
271 Config cfg( "oipkg", Config::User ); 271// Config cfg( "oipkg", Config::User );
272 cfg.setGroup( "Setting_" + QString::number( installationSettingsCount ) ); 272// cfg.setGroup( "Setting_" + QString::number( installationSettingsCount ) );
273 cfg.clearGroup(); 273// cfg.clearGroup();
274 installationSettingsCount--; 274// installationSettingsCount--;
275 changed = true; 275// changed = true;
276 settingName->setEditable( false ); 276// settingName->setEditable( false );
277} 277//}
278 278
279/** 279///**
280 * write to confgile 280// * write to confgile
281 */ 281// */
282void PackageManagerSettings::newInstallationSetting() 282//void PackageManagerSettings::newInstallationSetting()
283{ 283//{
284 installationSettingsCount++; 284// installationSettingsCount++;
285 settingName->insertItem( "New", installationSettingsCount ); 285// settingName->insertItem( "New", installationSettingsCount );
286 settingName->setCurrentItem( installationSettingsCount ); 286// settingName->setCurrentItem( installationSettingsCount );
287 settingName->setEditable( true ); 287// settingName->setEditable( true );
288 changed = true; 288// changed = true;
289} 289//}
290 290
291void PackageManagerSettings::installationSettingChange(int cs) 291//void PackageManagerSettings::installationSettingChange(int cs)
292{ 292//{
293 writeCurrentInstallationSetting(); 293// writeCurrentInstallationSetting();
294 currentSetting = cs; 294// currentSetting = cs;
295 readInstallationSetting( cs ); 295// readInstallationSetting( cs );
296 changed = true; 296// changed = true;
297} 297//}
298 298
299void PackageManagerSettings::writeInstallationSettings() 299void PackageManagerSettings::writeInstallationSettings()
300{ 300{
301 { 301 {
302 Config cfg( "oipkg", Config::User ); 302 Config cfg( "oipkg", Config::User );
303 cfg.setGroup( "Settings" ); 303 cfg.setGroup( "Settings" );
304 cfg.writeEntry( "count", installationSettingsCount ); 304 cfg.writeEntry( "count", installationSettingsCount );
305 cfg.writeEntry( "current", currentSetting ); 305 cfg.writeEntry( "current", currentSetting );
306 } 306 }
307 writeCurrentInstallationSetting(); 307 writeCurrentInstallationSetting();
308} 308}
309 309
310 310
311void PackageManagerSettings::readInstallationSetting(int setting) 311void PackageManagerSettings::readInstallationSetting(int setting)
312{ 312{
313 if ( setting < 0 ) return; 313 if ( setting < 0 ) return;
314 Config cfg( "oipkg", Config::User ); 314 Config cfg( "oipkg", Config::User );
315 cfg.setGroup( "Setting_" + QString::number( setting ) ); 315 cfg.setGroup( "Setting_" + QString::number( setting ) );
316 CheckBoxLink->setChecked( cfg.readBoolEntry( "link", true ) ); 316 CheckBoxLink->setChecked( cfg.readBoolEntry( "link", true ) );
317 QString dest = cfg.readEntry( "dest" ); 317 QString dest = cfg.readEntry( "dest" );
318 QString linkdest = cfg.readEntry( "linkdest" ); 318 QString linkdest = cfg.readEntry( "linkdest" );
319 pvDebug(3, "dest="+dest); 319 pvDebug(3, "dest="+dest);
320 pvDebug(3, "linkdest="+linkdest); 320 pvDebug(3, "linkdest="+linkdest);
321 for ( int i = 0; i < activeDestination->count(); i++) 321 for ( int i = 0; i < activeDestination->count(); i++)
322 { 322 {
323 if ( activeDestination->text( i ) == dest ) 323 if ( activeDestination->text( i ) == dest )
324 activeDestination->setCurrentItem( i ); 324 activeDestination->setCurrentItem( i );
325 if ( activeLinkDestination->text( i ) == linkdest ) 325 if ( activeLinkDestination->text( i ) == linkdest )
326 activeLinkDestination->setCurrentItem( i ); 326 activeLinkDestination->setCurrentItem( i );
327 } 327 }
328} 328}
329 329
330void PackageManagerSettings::writeCurrentInstallationSetting() 330void PackageManagerSettings::writeCurrentInstallationSetting()
331{ 331{
332 Config cfg( "oipkg", Config::User ); 332 Config cfg( "oipkg", Config::User );
333 cfg.setGroup( "Setting_" + QString::number(currentSetting) ); 333 cfg.setGroup( "Setting_" + QString::number(currentSetting) );
334 cfg.writeEntry( "link", CheckBoxLink->isChecked() ); 334 cfg.writeEntry( "link", CheckBoxLink->isChecked() );
335 cfg.writeEntry( "dest", getDestinationName() ); 335 cfg.writeEntry( "dest", getDestinationName() );
336 cfg.writeEntry( "linkdest" , getLinkDestinationName() ); 336 cfg.writeEntry( "linkdest" , getLinkDestinationName() );
337 QStringList sers = getActiveServers(); 337 QStringList sers = getActiveServers();
338 int srvc = 0; 338 int srvc = 0;
339 for ( QStringList::Iterator it = sers.begin(); it != sers.end(); ++it ) { 339 for ( QStringList::Iterator it = sers.begin(); it != sers.end(); ++it ) {
340 cfg.writeEntry( "server_" + QString::number(srvc++), *it ); 340 cfg.writeEntry( "server_" + QString::number(srvc++), *it );
341 } 341 }
342 cfg.writeEntry( "server_count", srvc ); 342 cfg.writeEntry( "server_count", srvc );
343} 343}
344 344
345void PackageManagerSettings::renameInstallationSetting() 345//void PackageManagerSettings::renameInstallationSetting()
346{ 346//{
347 settingName->setEditable( true ); 347// settingName->setEditable( true );
348 changed = true; 348// changed = true;
349} 349//}
350 350
351void PackageManagerSettings::installationSettingSetName(const QString &name) 351//void PackageManagerSettings::installationSettingSetName(const QString &name)
352{ 352//{
353 settingName->changeItem( name, settingName->currentItem() ); 353// settingName->changeItem( name, settingName->currentItem() );
354 changed = true; 354// changed = true;
355} 355//}
356 356
357 357
358bool PackageManagerSettings::readIpkgConfig(const QString& conffile) 358bool PackageManagerSettings::readIpkgConfig(const QString& conffile)
359{ 359{
360 QFile conf(conffile); 360 QFile conf(conffile);
361 changed = false; 361 changed = false;
362 if ( conf.open(IO_ReadOnly) ) { 362 if ( conf.open(IO_ReadOnly) ) {
363 QTextStream s(&conf); 363 QTextStream s(&conf);
364 servers->clear(); 364 servers->clear();
365 activeServers->clear(); 365 activeServers->clear();
366 destinations->clear(); 366 destinations->clear();
367 activeDestination->clear(); 367 activeDestination->clear();
368 activeLinkDestination->clear(); 368 activeLinkDestination->clear();
369 serverurlDic.clear(); 369 serverurlDic.clear();
370 destinationurlDic.clear(); 370 destinationurlDic.clear();
371 ipkg_old=0; 371 ipkg_old=0;
372 int currentserver=0; 372 int currentserver=0;
373 while ( !s.atEnd() ) { 373 while ( !s.atEnd() ) {
374 QString l = s.readLine(); 374 QString l = s.readLine();
375 QStringList token = QStringList::split(' ', l); 375 QStringList token = QStringList::split(' ', l);
376 if ( token[0] == "src" || token[0] == "#src" ) { 376 if ( token[0] == "src" || token[0] == "#src" ) {
377 currentserver=servers->count(); 377 currentserver=servers->count();
378 serverurlDic.insert(servers->count(),new QString(token[2])); 378 serverurlDic.insert(servers->count(),new QString(token[2]));
379 int a = token[0] == "src" ? 1 : 0; 379 int a = token[0] == "src" ? 1 : 0;
380 int i = servers->count(); 380 int i = servers->count();
381 servers->insertItem(token[1]); 381 servers->insertItem(token[1]);
382 activeServers->insertItem( token[1] ); 382 activeServers->insertItem( token[1] );
383 activeServers->setSelected(i,a); 383 activeServers->setSelected(i,a);
384 } else if ( token[0] == "dest" ) { 384 } else if ( token[0] == "dest" ) {
385 currentserver=destinations->count(); 385 currentserver=destinations->count();
386 destinationurlDic.insert(destinations->count(),new QString(token[2])); 386 destinationurlDic.insert(destinations->count(),new QString(token[2]));
387 destinations->insertItem(token[1]); 387 destinations->insertItem(token[1]);
388 activeDestination->insertItem( token[1] ); 388 activeDestination->insertItem( token[1] );
389 activeLinkDestination->insertItem( token[1] ); 389 activeLinkDestination->insertItem( token[1] );
390 390
391 } else if ( token[0] == "option" ) { 391 } else if ( token[0] == "option" ) {
392 // ### somehow need to use the settings from netsetup 392 // ### somehow need to use the settings from netsetup
393 // if ( token[1] == "http_proxy" ) 393 // if ( token[1] == "http_proxy" )
394 // http->setText(token[2]); 394 // http->setText(token[2]);
395 // else if ( token[1] == "ftp_proxy" ) 395 // else if ( token[1] == "ftp_proxy" )
396 // ftp->setText(token[2]); 396 // ftp->setText(token[2]);
397 // else if ( token[1] == "proxy_username" ) 397 // else if ( token[1] == "proxy_username" )
398 // username->setText(token[2]); 398 // username->setText(token[2]);
399 // else if ( token[1] == "proxy_password" ) 399 // else if ( token[1] == "proxy_password" )
400 // password->setText(token[2]); 400 // password->setText(token[2]);
401 } else { 401 } else {
402 // Old style? 402 // Old style?
403 int eq = l.find('='); 403 int eq = l.find('=');
diff --git a/noncore/unsupported/oipkg/pksettings.h b/noncore/unsupported/oipkg/pksettings.h
index d66c4e8..db991f6 100644
--- a/noncore/unsupported/oipkg/pksettings.h
+++ b/noncore/unsupported/oipkg/pksettings.h
@@ -1,74 +1,74 @@
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 27
28public slots: 28public slots:
29 void writeInstallationSettings(); 29 void writeInstallationSettings();
30 void readInstallationSettings(); 30 void readInstallationSettings();
31 void writeCurrentInstallationSetting(); 31 void writeCurrentInstallationSetting();
32 void readInstallationSetting(int); 32 void readInstallationSetting(int);
33 void installationSettingSetName(const QString &); 33// void installationSettingSetName(const QString &);
34 void removeLinksToDest(); 34 void removeLinksToDest();
35 void createLinksToDest(); 35 void createLinksToDest();
36 void newServer(); 36 void newServer();
37 void editServer(int); 37 void editServer(int);
38 void removeDestination(); 38 void removeDestination();
39 void newDestination(); 39 void newDestination();
40 void editDestination(int); 40 void editDestination(int);
41 void linkEnabled(bool); 41 void linkEnabled(bool);
42 void removeServer(); 42 void removeServer();
43 void serverNameChanged(const QString&); 43 void serverNameChanged(const QString&);
44 void serverUrlChanged(const QString&); 44 void serverUrlChanged(const QString&);
45 void destNameChanged(const QString&); 45 void destNameChanged(const QString&);
46 void destUrlChanged(const QString&); 46 void destUrlChanged(const QString&);
47 void installationSettingChange(int); 47// void installationSettingChange(int);
48 void newInstallationSetting(); 48// void newInstallationSetting();
49 void removeInstallationSetting(); 49// void removeInstallationSetting();
50 void renameInstallationSetting(); 50// void renameInstallationSetting();
51 void activeServerChanged(); 51 void activeServerChanged();
52 void activeDestinationChange(int); 52 void activeDestinationChange(int);
53signals: 53signals:
54// void doCreateLinks( QString dest ); 54// void doCreateLinks( QString dest );
55// void doRemoveLinks( QString dest ); 55// void doRemoveLinks( QString dest );
56 56
57private: 57private:
58 QIntDict<QString> serverurlDic; 58 QIntDict<QString> serverurlDic;
59 QIntDict<QString> destinationurlDic; 59 QIntDict<QString> destinationurlDic;
60 int ipkg_old; 60 int ipkg_old;
61 int editedserver; 61 int editedserver;
62 int editeddestination; 62 int editeddestination;
63 int currentSetting; 63 int currentSetting;
64 int installationSettingsCount; 64 int installationSettingsCount;
65 bool changed; 65 bool changed;
66 bool serverChanged; 66 bool serverChanged;
67 67
68 bool readIpkgConfig(const QString&); 68 bool readIpkgConfig(const QString&);
69 void writeIpkgConfig(const QString&); 69 void writeIpkgConfig(const QString&);
70 void writeSettings(); 70 void writeSettings();
71 void readSettings(); 71 void readSettings();
72}; 72};
73 73
74#endif 74#endif
diff --git a/noncore/unsupported/oipkg/pksettingsbase.ui b/noncore/unsupported/oipkg/pksettingsbase.ui
index e95ed83..5bc5b46 100644
--- a/noncore/unsupported/oipkg/pksettingsbase.ui
+++ b/noncore/unsupported/oipkg/pksettingsbase.ui
@@ -24,145 +24,96 @@
24 </property> 24 </property>
25 <property> 25 <property>
26 <name>layoutSpacing</name> 26 <name>layoutSpacing</name>
27 </property> 27 </property>
28 <grid> 28 <grid>
29 <property stdset="1"> 29 <property stdset="1">
30 <name>margin</name> 30 <name>margin</name>
31 <number>3</number> 31 <number>3</number>
32 </property> 32 </property>
33 <property stdset="1"> 33 <property stdset="1">
34 <name>spacing</name> 34 <name>spacing</name>
35 <number>3</number> 35 <number>3</number>
36 </property> 36 </property>
37 <widget row="0" column="0" > 37 <widget row="0" column="0" >
38 <class>QTabWidget</class> 38 <class>QTabWidget</class>
39 <property stdset="1"> 39 <property stdset="1">
40 <name>name</name> 40 <name>name</name>
41 <cstring>TabWidget</cstring> 41 <cstring>TabWidget</cstring>
42 </property> 42 </property>
43 <property stdset="1"> 43 <property stdset="1">
44 <name>enabled</name> 44 <name>enabled</name>
45 <bool>true</bool> 45 <bool>true</bool>
46 </property> 46 </property>
47 <property> 47 <property>
48 <name>layoutMargin</name> 48 <name>layoutMargin</name>
49 </property> 49 </property>
50 <property> 50 <property>
51 <name>layoutSpacing</name> 51 <name>layoutSpacing</name>
52 </property> 52 </property>
53 <widget> 53 <widget>
54 <class>QWidget</class> 54 <class>QWidget</class>
55 <property stdset="1"> 55 <property stdset="1">
56 <name>name</name> 56 <name>name</name>
57 <cstring>tab</cstring> 57 <cstring>tab</cstring>
58 </property> 58 </property>
59 <attribute> 59 <attribute>
60 <name>title</name> 60 <name>title</name>
61 <string>Settings</string> 61 <string>Settings</string>
62 </attribute> 62 </attribute>
63 <grid> 63 <grid>
64 <property stdset="1"> 64 <property stdset="1">
65 <name>margin</name> 65 <name>margin</name>
66 <number>3</number> 66 <number>3</number>
67 </property> 67 </property>
68 <property stdset="1"> 68 <property stdset="1">
69 <name>spacing</name> 69 <name>spacing</name>
70 <number>3</number> 70 <number>3</number>
71 </property> 71 </property>
72 <widget row="0" column="0" >
73 <class>QLayoutWidget</class>
74 <property stdset="1">
75 <name>name</name>
76 <cstring>Layout3_2</cstring>
77 </property>
78 <hbox>
79 <property stdset="1">
80 <name>margin</name>
81 <number>0</number>
82 </property>
83 <property stdset="1">
84 <name>spacing</name>
85 <number>6</number>
86 </property>
87 <widget>
88 <class>QLabel</class>
89 <property stdset="1">
90 <name>name</name>
91 <cstring>Settings</cstring>
92 </property>
93 <property stdset="1">
94 <name>text</name>
95 <string>Installation Setups</string>
96 </property>
97 </widget>
98 <spacer>
99 <property>
100 <name>name</name>
101 <cstring>Spacer2_2_2</cstring>
102 </property>
103 <property stdset="1">
104 <name>orientation</name>
105 <enum>Horizontal</enum>
106 </property>
107 <property stdset="1">
108 <name>sizeType</name>
109 <enum>Expanding</enum>
110 </property>
111 <property>
112 <name>sizeHint</name>
113 <size>
114 <width>20</width>
115 <height>20</height>
116 </size>
117 </property>
118 </spacer>
119 </hbox>
120 </widget>
121 <widget row="5" column="0" > 72 <widget row="5" column="0" >
122 <class>QLayoutWidget</class> 73 <class>QLayoutWidget</class>
123 <property stdset="1"> 74 <property stdset="1">
124 <name>name</name> 75 <name>name</name>
125 <cstring>Layout8</cstring> 76 <cstring>Layout8</cstring>
126 </property> 77 </property>
127 <hbox> 78 <hbox>
128 <property stdset="1"> 79 <property stdset="1">
129 <name>margin</name> 80 <name>margin</name>
130 <number>0</number> 81 <number>0</number>
131 </property> 82 </property>
132 <property stdset="1"> 83 <property stdset="1">
133 <name>spacing</name> 84 <name>spacing</name>
134 <number>6</number> 85 <number>6</number>
135 </property> 86 </property>
136 <widget> 87 <widget>
137 <class>QLabel</class> 88 <class>QLabel</class>
138 <property stdset="1"> 89 <property stdset="1">
139 <name>name</name> 90 <name>name</name>
140 <cstring>TextLabel1</cstring> 91 <cstring>TextLabel1</cstring>
141 </property> 92 </property>
142 <property stdset="1"> 93 <property stdset="1">
143 <name>text</name> 94 <name>text</name>
144 <string>Install destination:</string> 95 <string>Install destination:</string>
145 </property> 96 </property>
146 </widget> 97 </widget>
147 <widget> 98 <widget>
148 <class>QComboBox</class> 99 <class>QComboBox</class>
149 <property stdset="1"> 100 <property stdset="1">
150 <name>name</name> 101 <name>name</name>
151 <cstring>activeDestination</cstring> 102 <cstring>activeDestination</cstring>
152 </property> 103 </property>
153 </widget> 104 </widget>
154 </hbox> 105 </hbox>
155 </widget> 106 </widget>
156 <widget row="6" column="0" > 107 <widget row="6" column="0" >
157 <class>QLayoutWidget</class> 108 <class>QLayoutWidget</class>
158 <property stdset="1"> 109 <property stdset="1">
159 <name>name</name> 110 <name>name</name>
160 <cstring>Layout9</cstring> 111 <cstring>Layout9</cstring>
161 </property> 112 </property>
162 <hbox> 113 <hbox>
163 <property stdset="1"> 114 <property stdset="1">
164 <name>margin</name> 115 <name>margin</name>
165 <number>0</number> 116 <number>0</number>
166 </property> 117 </property>
167 <property stdset="1"> 118 <property stdset="1">
168 <name>spacing</name> 119 <name>spacing</name>
@@ -211,185 +162,96 @@
211 <class>QLabel</class> 162 <class>QLabel</class>
212 <property stdset="1"> 163 <property stdset="1">
213 <name>name</name> 164 <name>name</name>
214 <cstring>TextLabel1_2</cstring> 165 <cstring>TextLabel1_2</cstring>
215 </property> 166 </property>
216 <property stdset="1"> 167 <property stdset="1">
217 <name>text</name> 168 <name>text</name>
218 <string>Used servers: (Highlighted feeds are active)</string> 169 <string>Used servers: (Highlighted feeds are active)</string>
219 </property> 170 </property>
220 </widget> 171 </widget>
221 <spacer> 172 <spacer>
222 <property> 173 <property>
223 <name>name</name> 174 <name>name</name>
224 <cstring>Spacer4</cstring> 175 <cstring>Spacer4</cstring>
225 </property> 176 </property>
226 <property stdset="1"> 177 <property stdset="1">
227 <name>orientation</name> 178 <name>orientation</name>
228 <enum>Horizontal</enum> 179 <enum>Horizontal</enum>
229 </property> 180 </property>
230 <property stdset="1"> 181 <property stdset="1">
231 <name>sizeType</name> 182 <name>sizeType</name>
232 <enum>Expanding</enum> 183 <enum>Expanding</enum>
233 </property> 184 </property>
234 <property> 185 <property>
235 <name>sizeHint</name> 186 <name>sizeHint</name>
236 <size> 187 <size>
237 <width>20</width> 188 <width>20</width>
238 <height>20</height> 189 <height>20</height>
239 </size> 190 </size>
240 </property> 191 </property>
241 </spacer> 192 </spacer>
242 </hbox> 193 </hbox>
243 </widget> 194 </widget>
244 <widget row="4" column="0" > 195 <widget row="4" column="0" >
245 <class>QListBox</class> 196 <class>QListBox</class>
246 <property stdset="1"> 197 <property stdset="1">
247 <name>name</name> 198 <name>name</name>
248 <cstring>activeServers</cstring> 199 <cstring>activeServers</cstring>
249 </property> 200 </property>
250 <property stdset="1"> 201 <property stdset="1">
251 <name>enabled</name> 202 <name>enabled</name>
252 <bool>true</bool> 203 <bool>true</bool>
253 </property> 204 </property>
254 <property stdset="1"> 205 <property stdset="1">
255 <name>selectionMode</name> 206 <name>selectionMode</name>
256 <enum>Multi</enum> 207 <enum>Multi</enum>
257 </property> 208 </property>
258 </widget> 209 </widget>
259 <widget row="1" column="0" >
260 <class>QComboBox</class>
261 <property stdset="1">
262 <name>name</name>
263 <cstring>settingName</cstring>
264 </property>
265 <property stdset="1">
266 <name>enabled</name>
267 <bool>true</bool>
268 </property>
269 <property stdset="1">
270 <name>focusPolicy</name>
271 <enum>NoFocus</enum>
272 </property>
273 <property stdset="1">
274 <name>editable</name>
275 <bool>false</bool>
276 </property>
277 </widget>
278 <widget row="2" column="0" >
279 <class>QLayoutWidget</class>
280 <property stdset="1">
281 <name>name</name>
282 <cstring>Layout11</cstring>
283 </property>
284 <hbox>
285 <property stdset="1">
286 <name>margin</name>
287 <number>0</number>
288 </property>
289 <property stdset="1">
290 <name>spacing</name>
291 <number>6</number>
292 </property>
293 <widget>
294 <class>QPushButton</class>
295 <property stdset="1">
296 <name>name</name>
297 <cstring>newsetting</cstring>
298 </property>
299 <property stdset="1">
300 <name>enabled</name>
301 <bool>false</bool>
302 </property>
303 <property stdset="1">
304 <name>text</name>
305 <string>New</string>
306 </property>
307 <property stdset="1">
308 <name>autoDefault</name>
309 <bool>false</bool>
310 </property>
311 </widget>
312 <widget>
313 <class>QPushButton</class>
314 <property stdset="1">
315 <name>name</name>
316 <cstring>renamesetting</cstring>
317 </property>
318 <property stdset="1">
319 <name>enabled</name>
320 <bool>false</bool>
321 </property>
322 <property stdset="1">
323 <name>text</name>
324 <string>Rename</string>
325 </property>
326 </widget>
327 <widget>
328 <class>QPushButton</class>
329 <property stdset="1">
330 <name>name</name>
331 <cstring>removesetting</cstring>
332 </property>
333 <property stdset="1">
334 <name>enabled</name>
335 <bool>false</bool>
336 </property>
337 <property stdset="1">
338 <name>text</name>
339 <string>Remove</string>
340 </property>
341 <property stdset="1">
342 <name>autoDefault</name>
343 <bool>false</bool>
344 </property>
345 </widget>
346 </hbox>
347 </widget>
348 </grid> 210 </grid>
349 </widget> 211 </widget>
350 <widget> 212 <widget>
351 <class>QWidget</class> 213 <class>QWidget</class>
352 <property stdset="1"> 214 <property stdset="1">
353 <name>name</name> 215 <name>name</name>
354 <cstring>tab</cstring> 216 <cstring>tab</cstring>
355 </property> 217 </property>
356 <attribute> 218 <attribute>
357 <name>title</name> 219 <name>title</name>
358 <string>Servers</string> 220 <string>Servers</string>
359 </attribute> 221 </attribute>
360 <grid> 222 <grid>
361 <property stdset="1"> 223 <property stdset="1">
362 <name>margin</name> 224 <name>margin</name>
363 <number>3</number> 225 <number>3</number>
364 </property> 226 </property>
365 <property stdset="1"> 227 <property stdset="1">
366 <name>spacing</name> 228 <name>spacing</name>
367 <number>3</number> 229 <number>3</number>
368 </property> 230 </property>
369 <widget row="3" column="0" rowspan="1" colspan="2" > 231 <widget row="3" column="0" rowspan="1" colspan="2" >
370 <class>QLayoutWidget</class> 232 <class>QLayoutWidget</class>
371 <property stdset="1"> 233 <property stdset="1">
372 <name>name</name> 234 <name>name</name>
373 <cstring>Layout4</cstring> 235 <cstring>Layout4</cstring>
374 </property> 236 </property>
375 <grid> 237 <grid>
376 <property stdset="1"> 238 <property stdset="1">
377 <name>margin</name> 239 <name>margin</name>
378 <number>0</number> 240 <number>0</number>
379 </property> 241 </property>
380 <property stdset="1"> 242 <property stdset="1">
381 <name>spacing</name> 243 <name>spacing</name>
382 <number>6</number> 244 <number>6</number>
383 </property> 245 </property>
384 <widget row="0" column="1" > 246 <widget row="0" column="1" >
385 <class>QLineEdit</class> 247 <class>QLineEdit</class>
386 <property stdset="1"> 248 <property stdset="1">
387 <name>name</name> 249 <name>name</name>
388 <cstring>servername</cstring> 250 <cstring>servername</cstring>
389 </property> 251 </property>
390 </widget> 252 </widget>
391 <widget row="0" column="0" > 253 <widget row="0" column="0" >
392 <class>QLabel</class> 254 <class>QLabel</class>
393 <property stdset="1"> 255 <property stdset="1">
394 <name>name</name> 256 <name>name</name>
395 <cstring>TextLabel1_3</cstring> 257 <cstring>TextLabel1_3</cstring>