author | tille <tille> | 2002-07-17 11:15:50 (UTC) |
---|---|---|
committer | tille <tille> | 2002-07-17 11:15:50 (UTC) |
commit | b7c02750fd7f0f57843098b694a10e7a7b52eec8 (patch) (unidiff) | |
tree | b463de360cae2f72fb33378da05fcb9053e6d832 /noncore | |
parent | 1a6f157f6a83a73907dcd4c4da1d7b24cb19dc5c (diff) | |
download | opie-b7c02750fd7f0f57843098b694a10e7a7b52eec8.zip opie-b7c02750fd7f0f57843098b694a10e7a7b52eec8.tar.gz opie-b7c02750fd7f0f57843098b694a10e7a7b52eec8.tar.bz2 |
removed setups settings
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.cpp | 5 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/packagelistitem.cpp | 1 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pksettings.cpp | 114 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pksettings.h | 10 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/pksettingsbase.ui | 138 |
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 | |||
@@ -87,25 +87,25 @@ void MainWindow::makeMenu() | |||
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 ); |
@@ -215,26 +215,25 @@ void MainWindow::makeMenu() | |||
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 ); |
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 | |||
@@ -103,25 +103,24 @@ void PackageListItem::paintCell( QPainter *p, const QColorGroup & cg, | |||
103 | void PackageListItem::paintFocus( QPainter *p, const QColorGroup & cg, | 103 | void 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 | ||
111 | QPixmap PackageListItem::statePixmap() const | 111 | 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 ) |
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; |
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 | |||
@@ -36,45 +36,45 @@ | |||
36 | PackageManagerSettings::PackageManagerSettings( QWidget* parent, const char* name, WFlags fl ) | 36 | PackageManagerSettings::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 | ||
71 | PackageManagerSettings::~PackageManagerSettings() | 71 | PackageManagerSettings::~PackageManagerSettings() |
72 | { | 72 | { |
73 | } | 73 | } |
74 | 74 | ||
75 | 75 | ||
76 | void PackageManagerSettings::newServer() | 76 | void 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://")); |
@@ -243,67 +243,67 @@ void PackageManagerSettings::writeIpkgConfig(const QString& conffile) | |||
243 | conf.close(); | 243 | conf.close(); |
244 | } | 244 | } |
245 | 245 | ||
246 | 246 | ||
247 | void PackageManagerSettings::readInstallationSettings() | 247 | void 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 | // */ |
268 | void 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 | // */ |
282 | void 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 | ||
291 | void 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 | ||
299 | void PackageManagerSettings::writeInstallationSettings() | 299 | void 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 | ||
@@ -333,35 +333,35 @@ void PackageManagerSettings::writeCurrentInstallationSetting() | |||
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 | ||
345 | void 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 | ||
351 | void 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 | ||
358 | bool PackageManagerSettings::readIpkgConfig(const QString& conffile) | 358 | bool 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(); |
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 | |||
@@ -21,42 +21,42 @@ public: | |||
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 | ||
28 | public slots: | 28 | public 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); |
53 | signals: | 53 | signals: |
54 | // void doCreateLinks( QString dest ); | 54 | // void doCreateLinks( QString dest ); |
55 | // void doRemoveLinks( QString dest ); | 55 | // void doRemoveLinks( QString dest ); |
56 | 56 | ||
57 | private: | 57 | private: |
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; |
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 | |||
@@ -60,73 +60,24 @@ | |||
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"> |
@@ -247,113 +198,24 @@ | |||
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> |