Changed dlg to add linkToRoot checkbox to destinations tab

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
@@ -11,8 +11,8 @@
         <rect>

             <x>0</x>

             <y>0</y>

-            <width>331</width>

-            <height>456</height>

+            <width>247</width>
+            <height>390</height>
         </rect>

     </property>

     <property stdset="1">

@@ -69,7 +69,7 @@
                         <name>spacing</name>

                         <number>6</number>

                     </property>

-                    <widget row="0"  column="0"  rowspan="1"  colspan="2" >

+                    <widget row="0"  column="0" >
                         <class>QLayoutWidget</class>

                         <property stdset="1">

                             <name>name</name>

@@ -118,7 +118,22 @@
                             </spacer>

                         </hbox>

                     </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>

                         <property stdset="1">

                             <name>name</name>

@@ -129,59 +144,61 @@
                             <enum>Extended</enum>

                         </property>

                     </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" >

                                 <class>QLineEdit</class>

                                 <property stdset="1">

@@ -189,44 +206,55 @@
                                     <cstring>serverurl</cstring>

                                 </property>

                             </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>

                                 <property stdset="1">

                                     <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>

                                 <property stdset="1">

                                     <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>

                                 <property stdset="1">

                                     <name>name</name>

-                                    <cstring>btnChangeServer</cstring>

+                                    <cstring>newserver</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>enabled</name>
+                                    <bool>true</bool>
                                 </property>

                                 <property stdset="1">

                                     <name>text</name>

-                                    <string>Change</string>

+                                    <string>New</string>
+                                </property>
+                                <property stdset="1">
+                                    <name>autoDefault</name>
+                                    <bool>false</bool>
                                 </property>

                             </widget>

                         </grid>

@@ -392,7 +420,7 @@
                         <class>QLayoutWidget</class>

                         <property stdset="1">

                             <name>name</name>

-                            <cstring>Layout8</cstring>

+                            <cstring>Layout13</cstring>
                         </property>

                         <grid>

                             <property stdset="1">

@@ -403,21 +431,18 @@
                                 <name>spacing</name>

                                 <number>6</number>

                             </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>

                                 <property stdset="1">

                                     <name>name</name>

@@ -428,6 +453,13 @@
                                     <string>Change</string>

                                 </property>

                             </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" >

                                 <class>QLabel</class>

                                 <property stdset="1">

@@ -439,15 +471,26 @@
                                     <string>Name:</string>

                                 </property>

                             </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>

                                 <property stdset="1">

                                     <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>

                             </widget>

                         </grid>

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
@@ -22,6 +22,11 @@ using namespace std;
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qtabwidget.h>
+#include <qcheckbox.h>
+
+#ifdef QWS
+#include <qpe/config.h>
+#endif
 
 #include "settingsimpl.h"
 
@@ -83,6 +88,7 @@ void SettingsImpl :: editServer( int sel )
     serverName = s->getServerName();
     servername->setText( s->getServerName() );
     serverurl->setText( s->getServerUrl() );
+    active->setChecked( s->isServerActive() );
 }
 
 void SettingsImpl :: newServer()
@@ -91,6 +97,7 @@ void SettingsImpl :: newServer()
 	servername->setText( "" );
 	serverurl->setText( "" );
 	servername->setFocus();
+    active->setChecked( true );
 }
 
 void SettingsImpl :: removeServer()
@@ -112,6 +119,8 @@ void SettingsImpl :: changeServerDetails()
 
 		// Update url
 		s->setServerUrl( serverurl->text() );
+        s->setActive( active->isChecked() );
+
 
 		// Check if server name has changed, if it has then we need to replace the key in the map
 		if ( serverName != newName )
@@ -120,8 +129,8 @@ void SettingsImpl :: changeServerDetails()
 			s->setServerName( newName );
 
 			// See if this server is the active server
-			if ( dataMgr->getActiveServer() == serverName )
-				dataMgr->setActiveServer( newName );
+//			if ( dataMgr->getActiveServer() == serverName )
+//				dataMgr->setActiveServer( newName );
 
 			// Update list box
 			servers->changeItem( newName, currentSelectedServer );
@@ -129,7 +138,9 @@ void SettingsImpl :: changeServerDetails()
 	}
 	else
 	{
+        Server s( newName, serverurl->text() );
 		dataMgr->getServerList().push_back( Server( newName, serverurl->text() ) );
+        dataMgr->getServerList().end()->setActive( active->isChecked() );
 		servers->insertItem( newName );
 		servers->setCurrentItem( servers->count() );
 		newserver = false;
@@ -141,10 +152,11 @@ void SettingsImpl :: changeServerDetails()
 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() );
 }
 
 void SettingsImpl :: newDestination()
@@ -153,6 +165,7 @@ void SettingsImpl :: newDestination()
 	destinationname->setText( "" );
 	destinationurl->setText( "" );
 	destinationname->setFocus();
+    linkToRoot->setChecked( true );
 }
 
 void SettingsImpl :: removeDestination()
@@ -167,6 +180,11 @@ void SettingsImpl :: changeDestinationDetails()
 {
 	changed = true;
 
+#ifdef QWS
+    Config cfg( "aqpkg" );
+    cfg.setGroup( "destinations" );
+#endif
+
 	QString newName = destinationname->text();
 	if ( !newdestination )
 	{
@@ -174,6 +192,7 @@ void SettingsImpl :: changeDestinationDetails()
 
 		// Update url
 		d->setDestinationPath( destinationurl->text() );
+        d->linkToRoot( linkToRoot->isChecked() );
 
 		// Check if server name has changed, if it has then we need to replace the key in the map
 		if ( destinationName != newName )
@@ -184,6 +203,12 @@ void SettingsImpl :: changeDestinationDetails()
 			// Update list box
 			destinations->changeItem( newName, currentSelectedDestination );
 		}
+#ifdef QWS
+        QString key = newName;
+        key += "_linkToRoot";
+        int val = d->linkToRoot();
+        cfg.writeEntry( key, val );
+#endif        
 	}
 	else
 	{
@@ -191,5 +216,11 @@ void SettingsImpl :: changeDestinationDetails()
 		destinations->insertItem( newName );
 		destinations->setCurrentItem( destinations->count() );
 		newdestination = false;
+
+#ifdef QWS
+        QString key = newName;
+        key += "_linkToRoot";
+        cfg.writeEntry( key, true );
+#endif
 	}
 }