author | andyq <andyq> | 2002-12-12 00:18:40 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-12-12 00:18:40 (UTC) |
commit | 1d044ba4d276240b60bc98d18365a80183960751 (patch) (side-by-side diff) | |
tree | 98f69f03bb7ff4a904c02322be6480c54b6a7e08 | |
parent | fe063bdf069cd33def6347777624798e4f3a7059 (diff) | |
download | opie-1d044ba4d276240b60bc98d18365a80183960751.zip opie-1d044ba4d276240b60bc98d18365a80183960751.tar.gz opie-1d044ba4d276240b60bc98d18365a80183960751.tar.bz2 |
Added proxy support
-rw-r--r-- | noncore/settings/aqpkg/datamgr.cpp | 28 | ||||
-rw-r--r-- | noncore/settings/aqpkg/datamgr.h | 18 | ||||
-rw-r--r-- | noncore/settings/aqpkg/settings.ui | 245 | ||||
-rw-r--r-- | noncore/settings/aqpkg/settingsimpl.cpp | 21 | ||||
-rw-r--r-- | noncore/settings/aqpkg/settingsimpl.h | 2 |
5 files changed, 298 insertions, 16 deletions
diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp index 96c28c0..3933a22 100644 --- a/noncore/settings/aqpkg/datamgr.cpp +++ b/noncore/settings/aqpkg/datamgr.cpp @@ -131,5 +131,5 @@ void DataManager :: loadServers() destList.push_back( d ); } - else if ( lineStr.startsWith( "option" ) ) + else if ( lineStr.startsWith( "option" ) || lineStr.startsWith( "#option" ) ) { char type[20]; @@ -137,7 +137,19 @@ void DataManager :: loadServers() sscanf( lineStr, "%*[^ ] %s %s", type, val ); if ( stricmp( type, "http_proxy" ) == 0 ) + { httpProxy = val; + if ( lineStr.startsWith( "#" ) ) + httpProxyEnabled = false; + else + httpProxyEnabled = true; + } if ( stricmp( type, "ftp_proxy" ) == 0 ) + { ftpProxy = val; + if ( lineStr.startsWith( "#" ) ) + ftpProxyEnabled = false; + else + ftpProxyEnabled = true; + } if ( stricmp( type, "proxy_username" ) == 0 ) proxyUsername = val; @@ -219,16 +231,24 @@ void DataManager :: writeOutIpkgConf() } + out << endl; out << "# Proxy Support" << endl; - out << "#" << endl; - if ( httpProxy == "" ) + if ( !httpProxyEnabled && httpProxy == "" ) out << "#option http_proxy http://proxy.tld:3128" << endl; else + { + if ( !httpProxyEnabled ) + out << "#"; out << "option http_proxy " << httpProxy << endl; + } - if ( ftpProxy == "" ) + if ( !ftpProxyEnabled && ftpProxy == "" ) out << "#option ftp_proxy http://proxy.tld:3128" << endl; else + { + if ( !ftpProxyEnabled ) + out << "#"; out << "option ftp_proxy " << ftpProxy << endl; + } if ( proxyUsername == "" ) out << "#option proxy_username <username>" << endl; diff --git a/noncore/settings/aqpkg/datamgr.h b/noncore/settings/aqpkg/datamgr.h index 41833df..0a7467f 100644 --- a/noncore/settings/aqpkg/datamgr.h +++ b/noncore/settings/aqpkg/datamgr.h @@ -59,4 +59,19 @@ public: static void setAvailableCategories( QString section ); + QString getHttpProxy() { return httpProxy; } + QString getFtpProxy() { return ftpProxy; } + QString getProxyUsername() { return proxyUsername; } + QString getProxyPassword() { return proxyPassword; } + + bool getHttpProxyEnabled() { return httpProxyEnabled; } + bool getFtpProxyEnabled() { return ftpProxyEnabled; } + + void setHttpProxy( QString proxy ) { httpProxy = proxy; } + void setFtpProxy( QString proxy ) { ftpProxy = proxy; } + void setProxyUsername( QString name ) { proxyUsername = name; } + void setProxyPassword( QString pword ) { proxyPassword = pword; } + + void setHttpProxyEnabled( bool val ) { httpProxyEnabled = val; } + void setFtpProxyEnabled( bool val ) { ftpProxyEnabled = val; } private: static QString availableCategories; @@ -67,4 +82,7 @@ private: QString proxyPassword; + bool httpProxyEnabled; + bool ftpProxyEnabled; + vector<Server> serverList; vector<Destination> destList; diff --git a/noncore/settings/aqpkg/settings.ui b/noncore/settings/aqpkg/settings.ui index 44e8fd9..b39d358 100644 --- a/noncore/settings/aqpkg/settings.ui +++ b/noncore/settings/aqpkg/settings.ui @@ -12,5 +12,5 @@ <x>0</x> <y>0</y> - <width>235</width> + <width>211</width> <height>390</height> </rect> @@ -26,14 +26,5 @@ <name>layoutSpacing</name> </property> - <grid> - <property stdset="1"> - <name>margin</name> - <number>11</number> - </property> - <property stdset="1"> - <name>spacing</name> - <number>6</number> - </property> - <widget row="0" column="0" > + <widget> <class>QTabWidget</class> <property stdset="1"> @@ -45,4 +36,13 @@ <bool>true</bool> </property> + <property stdset="1"> + <name>geometry</name> + <rect> + <x>11</x> + <y>11</y> + <width>209</width> + <height>368</height> + </rect> + </property> <property> <name>layoutMargin</name> @@ -506,4 +506,219 @@ <attribute> <name>title</name> + <string>Proxys</string> + </attribute> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabel1_2</cstring> + </property> + <property stdset="1"> + <name>geometry</name> + <rect> + <x>1</x> + <y>19</y> + <width>67</width> + <height>22</height> + </rect> + </property> + <property stdset="1"> + <name>text</name> + <string>HTTP Proxy</string> + </property> + </widget> + <widget> + <class>QLineEdit</class> + <property stdset="1"> + <name>name</name> + <cstring>txtFtpProxy</cstring> + </property> + <property stdset="1"> + <name>geometry</name> + <rect> + <x>74</x> + <y>72</y> + <width>110</width> + <height>22</height> + </rect> + </property> + </widget> + <widget> + <class>QLineEdit</class> + <property stdset="1"> + <name>name</name> + <cstring>txtHttpProxy</cstring> + </property> + <property stdset="1"> + <name>geometry</name> + <rect> + <x>74</x> + <y>19</y> + <width>110</width> + <height>22</height> + </rect> + </property> + </widget> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabel4</cstring> + </property> + <property stdset="1"> + <name>geometry</name> + <rect> + <x>1</x> + <y>153</y> + <width>67</width> + <height>22</height> + </rect> + </property> + <property stdset="1"> + <name>text</name> + <string>Password</string> + </property> + </widget> + <widget> + <class>QLineEdit</class> + <property stdset="1"> + <name>name</name> + <cstring>txtUsername</cstring> + </property> + <property stdset="1"> + <name>geometry</name> + <rect> + <x>74</x> + <y>125</y> + <width>110</width> + <height>22</height> + </rect> + </property> + </widget> + <widget> + <class>QLineEdit</class> + <property stdset="1"> + <name>name</name> + <cstring>txtPassword</cstring> + </property> + <property stdset="1"> + <name>geometry</name> + <rect> + <x>74</x> + <y>153</y> + <width>110</width> + <height>22</height> + </rect> + </property> + </widget> + <widget> + <class>QCheckBox</class> + <property stdset="1"> + <name>name</name> + <cstring>chkFtpProxyEnabled</cstring> + </property> + <property stdset="1"> + <name>geometry</name> + <rect> + <x>74</x> + <y>100</y> + <width>110</width> + <height>19</height> + </rect> + </property> + <property stdset="1"> + <name>text</name> + <string>Enabled</string> + </property> + </widget> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabel2</cstring> + </property> + <property stdset="1"> + <name>geometry</name> + <rect> + <x>1</x> + <y>72</y> + <width>67</width> + <height>22</height> + </rect> + </property> + <property stdset="1"> + <name>text</name> + <string>FTP Proxy</string> + </property> + </widget> + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabel3</cstring> + </property> + <property stdset="1"> + <name>geometry</name> + <rect> + <x>1</x> + <y>125</y> + <width>67</width> + <height>22</height> + </rect> + </property> + <property stdset="1"> + <name>text</name> + <string>Username</string> + </property> + </widget> + <widget> + <class>QCheckBox</class> + <property stdset="1"> + <name>name</name> + <cstring>chkHttpProxyEnabled</cstring> + </property> + <property stdset="1"> + <name>geometry</name> + <rect> + <x>74</x> + <y>47</y> + <width>110</width> + <height>19</height> + </rect> + </property> + <property stdset="1"> + <name>text</name> + <string>Enabled</string> + </property> + </widget> + <widget> + <class>QPushButton</class> + <property stdset="1"> + <name>name</name> + <cstring>btnProxyApply</cstring> + </property> + <property stdset="1"> + <name>geometry</name> + <rect> + <x>74</x> + <y>181</y> + <width>110</width> + <height>28</height> + </rect> + </property> + <property stdset="1"> + <name>text</name> + <string>&Apply</string> + </property> + </widget> + </widget> + <widget> + <class>QWidget</class> + <property stdset="1"> + <name>name</name> + <cstring>tab</cstring> + </property> + <attribute> + <name>title</name> <string>General</string> </attribute> @@ -550,5 +765,4 @@ </widget> </widget> - </grid> </widget> <connections> @@ -607,4 +821,10 @@ <slot>toggleJumpTo(bool)</slot> </connection> + <connection> + <sender>btnProxyApply</sender> + <signal>clicked()</signal> + <receiver>Settings</receiver> + <slot>proxyApplyChanges()</slot> + </connection> <slot access="public">activeServerChanged()</slot> <slot access="public">changeDestinationDetails()</slot> @@ -621,4 +841,5 @@ <slot access="public">newInstallationSetting()</slot> <slot access="public">newServer()</slot> + <slot access="public">proxyApplyChanges()</slot> <slot access="public">removeDestination()</slot> <slot access="public">removeInstallationSetting()</slot> diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp index 9dd2206..4bb928a 100644 --- a/noncore/settings/aqpkg/settingsimpl.cpp +++ b/noncore/settings/aqpkg/settingsimpl.cpp @@ -79,4 +79,5 @@ void SettingsImpl :: setupData() destinations->insertItem( it2->getDestinationName() ); + // setup general tab #ifdef QWS Config cfg( "aqpkg" ); @@ -86,4 +87,12 @@ void SettingsImpl :: setupData() jumpTo->setChecked( true ); #endif + + // setup proxy tab + txtHttpProxy->setText( dataMgr->getHttpProxy() ); + txtFtpProxy->setText( dataMgr->getFtpProxy() ); + txtUsername->setText( dataMgr->getProxyUsername() ); + txtPassword->setText( dataMgr->getProxyPassword() ); + chkHttpProxyEnabled->setChecked( dataMgr->getHttpProxyEnabled() ); + chkFtpProxyEnabled->setChecked( dataMgr->getFtpProxyEnabled() ); } @@ -245,2 +254,14 @@ void SettingsImpl :: toggleJumpTo( bool val ) } +//------------------ Proxy tab ---------------------- +void SettingsImpl :: proxyApplyChanges() +{ + changed = true; + dataMgr->setHttpProxy( txtHttpProxy->text() ); + dataMgr->setFtpProxy( txtFtpProxy->text() ); + dataMgr->setProxyUsername( txtUsername->text() ); + dataMgr->setProxyPassword( txtPassword->text() ); + + dataMgr->setHttpProxyEnabled( chkHttpProxyEnabled->isChecked() ); + dataMgr->setFtpProxyEnabled( chkFtpProxyEnabled->isChecked() ); +} diff --git a/noncore/settings/aqpkg/settingsimpl.h b/noncore/settings/aqpkg/settingsimpl.h index 971516b..bb027dc 100644 --- a/noncore/settings/aqpkg/settingsimpl.h +++ b/noncore/settings/aqpkg/settingsimpl.h @@ -52,3 +52,5 @@ private: void toggleJumpTo( bool val ); + + void proxyApplyChanges(); }; |