author | andyq <andyq> | 2002-10-17 22:50:20 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-10-17 22:50:20 (UTC) |
commit | b61a21e46590228b6c5800d168fc57789ce733f6 (patch) (side-by-side diff) | |
tree | da0732436919ccb19167eb124898615d499e5914 /noncore | |
parent | 51dbf76486cb81a7cb34c07483b344c8ea7a8a24 (diff) | |
download | opie-b61a21e46590228b6c5800d168fc57789ce733f6.zip opie-b61a21e46590228b6c5800d168fc57789ce733f6.tar.gz opie-b61a21e46590228b6c5800d168fc57789ce733f6.tar.bz2 |
Changed dlg to add linkToRoot checkbox to destinations tab
-rw-r--r-- | noncore/settings/aqpkg/settings.ui | 169 | ||||
-rw-r--r-- | noncore/settings/aqpkg/settingsimpl.cpp | 43 |
2 files changed, 143 insertions, 69 deletions
diff --git a/noncore/settings/aqpkg/settings.ui b/noncore/settings/aqpkg/settings.ui index eb99cf7..6b3cfd4 100644 --- a/noncore/settings/aqpkg/settings.ui +++ b/noncore/settings/aqpkg/settings.ui @@ -13,4 +13,4 @@ <y>0</y>
- <width>331</width>
- <height>456</height>
+ <width>247</width> + <height>390</height> </rect>
@@ -71,3 +71,3 @@ </property>
- <widget row="0" column="0" rowspan="1" colspan="2" >
+ <widget row="0" column="0" > <class>QLayoutWidget</class>
@@ -120,3 +120,18 @@ </widget>
- <widget row="1" column="0" rowspan="1" colspan="2" >
+ <widget row="1" column="0" > + <class>QLayoutWidget</class> + <property stdset="1"> + <name>name</name> + <cstring>Layout8</cstring> + </property> + <grid> + <property stdset="1"> + <name>margin</name> + <number>0</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>6</number> + </property> + <widget row="0" column="0" rowspan="1" colspan="2" > <class>QListBox</class>
@@ -131,55 +146,57 @@ </widget>
- <widget row="2" column="1" >
- <class>QPushButton</class>
+ <widget row="2" column="0" rowspan="1" colspan="2" > + <class>QLayoutWidget</class> <property stdset="1">
<name>name</name>
- <cstring>removeserver</cstring>
- </property>
- <property stdset="1">
- <name>enabled</name>
- <bool>true</bool>
+ <cstring>Layout6</cstring> </property>
+ <grid> <property stdset="1">
- <name>text</name>
- <string>Remove</string>
+ <name>margin</name> + <number>0</number> </property>
<property stdset="1">
- <name>autoDefault</name>
- <bool>false</bool>
+ <name>spacing</name> + <number>6</number> </property>
- </widget>
- <widget row="2" column="0" >
- <class>QPushButton</class>
+ <widget row="2" column="1" > + <class>QCheckBox</class> <property stdset="1">
<name>name</name>
- <cstring>newserver</cstring>
+ <cstring>active</cstring> </property>
<property stdset="1">
- <name>enabled</name>
- <bool>true</bool>
+ <name>text</name> + <string>Active Server</string> </property>
+ </widget> + <widget row="0" column="0" > + <class>QLabel</class> <property stdset="1">
- <name>text</name>
- <string>New</string>
+ <name>name</name> + <cstring>TextLabel1_3</cstring> </property>
<property stdset="1">
- <name>autoDefault</name>
- <bool>false</bool>
+ <name>text</name> + <string>Name:</string> </property>
</widget>
- <widget row="3" column="0" rowspan="1" colspan="2" >
- <class>QLayoutWidget</class>
+ <widget row="1" column="0" > + <class>QLabel</class> <property stdset="1">
<name>name</name>
- <cstring>Layout10</cstring>
+ <cstring>TextLabel2_3</cstring> </property>
- <grid>
<property stdset="1">
- <name>margin</name>
- <number>0</number>
+ <name>text</name> + <string>URL:</string> </property>
+ </widget> + <widget row="0" column="1" > + <class>QLineEdit</class> <property stdset="1">
- <name>spacing</name>
- <number>6</number>
+ <name>name</name> + <cstring>servername</cstring> </property>
+ </widget> <widget row="1" column="1" >
@@ -191,7 +208,7 @@ </widget>
- <widget row="1" column="0" >
- <class>QLabel</class>
+ <widget row="3" column="1" > + <class>QPushButton</class> <property stdset="1">
<name>name</name>
- <cstring>TextLabel2_3</cstring>
+ <cstring>btnChangeServer</cstring> </property>
@@ -199,17 +216,16 @@ <name>text</name>
- <string>URL:</string>
+ <string>Change</string> </property>
</widget>
- <widget row="0" column="1" >
- <class>QLineEdit</class>
+ </grid> + </widget> + <widget row="1" column="1" > + <class>QPushButton</class> <property stdset="1">
<name>name</name>
- <cstring>servername</cstring>
+ <cstring>removeserver</cstring> </property>
- </widget>
- <widget row="0" column="0" >
- <class>QLabel</class>
<property stdset="1">
- <name>name</name>
- <cstring>TextLabel1_3</cstring>
+ <name>enabled</name> + <bool>true</bool> </property>
@@ -217,6 +233,10 @@ <name>text</name>
- <string>Name:</string>
+ <string>Remove</string> + </property> + <property stdset="1"> + <name>autoDefault</name> + <bool>false</bool> </property>
</widget>
- <widget row="2" column="1" >
+ <widget row="1" column="0" > <class>QPushButton</class>
@@ -224,3 +244,7 @@ <name>name</name>
- <cstring>btnChangeServer</cstring>
+ <cstring>newserver</cstring> + </property> + <property stdset="1"> + <name>enabled</name> + <bool>true</bool> </property>
@@ -228,3 +252,7 @@ <name>text</name>
- <string>Change</string>
+ <string>New</string> + </property> + <property stdset="1"> + <name>autoDefault</name> + <bool>false</bool> </property>
@@ -394,3 +422,3 @@ <name>name</name>
- <cstring>Layout8</cstring>
+ <cstring>Layout13</cstring> </property>
@@ -405,17 +433,14 @@ </property>
- <widget row="0" column="1" >
- <class>QLineEdit</class>
+ <widget row="1" column="0" > + <class>QLabel</class> <property stdset="1">
<name>name</name>
- <cstring>destinationname</cstring>
+ <cstring>TextLabel1_3_2_2</cstring> </property>
- </widget>
- <widget row="1" column="1" >
- <class>QLineEdit</class>
<property stdset="1">
- <name>name</name>
- <cstring>destinationurl</cstring>
+ <name>text</name> + <string>URL:</string> </property>
</widget>
- <widget row="2" column="1" >
+ <widget row="3" column="1" > <class>QPushButton</class>
@@ -430,2 +455,9 @@ </widget>
+ <widget row="0" column="1" > + <class>QLineEdit</class> + <property stdset="1"> + <name>name</name> + <cstring>destinationname</cstring> + </property> + </widget> <widget row="0" column="0" >
@@ -441,7 +473,7 @@ </widget>
- <widget row="1" column="0" >
- <class>QLabel</class>
+ <widget row="2" column="1" > + <class>QCheckBox</class> <property stdset="1">
<name>name</name>
- <cstring>TextLabel1_3_2_2</cstring>
+ <cstring>linkToRoot</cstring> </property>
@@ -449,3 +481,14 @@ <name>text</name>
- <string>URL:</string>
+ <string>LinkToRoot</string> + </property> + <property stdset="1"> + <name>checked</name> + <bool>true</bool> + </property> + </widget> + <widget row="1" column="1" > + <class>QLineEdit</class> + <property stdset="1"> + <name>name</name> + <cstring>destinationurl</cstring> </property>
diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp index 81e89ed..9ee3a33 100644 --- a/noncore/settings/aqpkg/settingsimpl.cpp +++ b/noncore/settings/aqpkg/settingsimpl.cpp @@ -24,2 +24,7 @@ using namespace std; #include <qtabwidget.h> +#include <qcheckbox.h> + +#ifdef QWS +#include <qpe/config.h> +#endif @@ -85,2 +90,3 @@ void SettingsImpl :: editServer( int sel ) serverurl->setText( s->getServerUrl() ); + active->setChecked( s->isServerActive() ); } @@ -93,2 +99,3 @@ void SettingsImpl :: newServer() servername->setFocus(); + active->setChecked( true ); } @@ -114,2 +121,4 @@ void SettingsImpl :: changeServerDetails() s->setServerUrl( serverurl->text() ); + s->setActive( active->isChecked() ); + @@ -122,4 +131,4 @@ void SettingsImpl :: changeServerDetails() // See if this server is the active server - if ( dataMgr->getActiveServer() == serverName ) - dataMgr->setActiveServer( newName ); +// if ( dataMgr->getActiveServer() == serverName ) +// dataMgr->setActiveServer( newName ); @@ -131,3 +140,5 @@ void SettingsImpl :: changeServerDetails() { + Server s( newName, serverurl->text() ); dataMgr->getServerList().push_back( Server( newName, serverurl->text() ) ); + dataMgr->getServerList().end()->setActive( active->isChecked() ); servers->insertItem( newName ); @@ -143,6 +154,7 @@ void SettingsImpl :: editDestination( int sel ) currentSelectedDestination = sel; - Destination *s = dataMgr->getDestination( destinations->currentText() ); - destinationName = s->getDestinationName(); - destinationname->setText( s->getDestinationName() ); - destinationurl->setText( s->getDestinationPath() ); + Destination *d = dataMgr->getDestination( destinations->currentText() ); + destinationName = d->getDestinationName(); + destinationname->setText( d->getDestinationName() ); + destinationurl->setText( d->getDestinationPath() ); + linkToRoot->setChecked( d->linkToRoot() ); } @@ -155,2 +167,3 @@ void SettingsImpl :: newDestination() destinationname->setFocus(); + linkToRoot->setChecked( true ); } @@ -169,2 +182,7 @@ void SettingsImpl :: changeDestinationDetails() +#ifdef QWS + Config cfg( "aqpkg" ); + cfg.setGroup( "destinations" ); +#endif + QString newName = destinationname->text(); @@ -176,2 +194,3 @@ void SettingsImpl :: changeDestinationDetails() d->setDestinationPath( destinationurl->text() ); + d->linkToRoot( linkToRoot->isChecked() ); @@ -186,2 +205,8 @@ void SettingsImpl :: changeDestinationDetails() } +#ifdef QWS + QString key = newName; + key += "_linkToRoot"; + int val = d->linkToRoot(); + cfg.writeEntry( key, val ); +#endif } @@ -193,2 +218,8 @@ void SettingsImpl :: changeDestinationDetails() newdestination = false; + +#ifdef QWS + QString key = newName; + key += "_linkToRoot"; + cfg.writeEntry( key, true ); +#endif } |