summaryrefslogtreecommitdiff
Unidiff
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
@@ -96,7 +96,7 @@ void MainWindow::makeMenu()
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 );
@@ -224,8 +224,7 @@ void MainWindow::makeMenu()
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() );
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
@@ -112,7 +112,6 @@ QPixmap 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 )
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
@@ -45,11 +45,11 @@ PackageManagerSettings::PackageManagerSettings( QWidget* parent, const char* na
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);
@@ -62,10 +62,10 @@ PackageManagerSettings::PackageManagerSettings( QWidget* parent, const char* na
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()
@@ -252,49 +252,49 @@ void PackageManagerSettings::readInstallationSettings()
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{
@@ -342,17 +342,17 @@ void PackageManagerSettings::writeCurrentInstallationSetting()
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)
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
@@ -30,7 +30,7 @@ public slots:
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();
@@ -44,10 +44,10 @@ public slots:
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:
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
@@ -69,55 +69,6 @@
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">
@@ -256,95 +207,6 @@
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>