setup: fix network proxy configuration dialog (fixes #773)

jef-n · Jan 9, 2023 · 2f3af00 · 2f3af00
1 parent b2ccab3
commit 2f3af00
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/src/setup/UserSettings.cc b/src/setup/UserSettings.cc
@@ -182,10 +182,10 @@ UserSettings::save ()
     return;
   for (Element **e = table; *e; e++)
     {
-	  msg( "SAVE '%s' => '%s'\n", (*e)->key, (*e)->value );
+      msg( "SAVE '%s' => '%s'\n", (*e)->key, (*e)->value );
       f->write ((*e)->key, strlen ((*e)->key));
       f->write ("\n", 1);
-      std::string s = (*e)->value;
+      std::string s = (*e)->value ? (*e)->value : "";
       s.append ("\n");
       size_t n;
       for (size_t i = 0; (n = s.find_first_of ('\n', i)) != std::string::npos; i = n + 1)

diff --git a/src/setup/res_de.rc b/src/setup/res_de.rc
@@ -138,9 +138,9 @@ CAPTION "OSGeo4W Setup - Verbindungsart w
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "&Systemproxy-Einstellungen verwenden",
-		    IDC_NET_PRECONFIG,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,55,185,10
+		    IDC_NET_PRECONFIG,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,185,10
     CONTROL         "&Direkte Verbindung",
-		    IDC_NET_DIRECT,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,70,73,10
+		    IDC_NET_DIRECT,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,73,10
     CONTROL         "HTTP/FTP-&Proxy nutzen:",
 		    IDC_NET_PROXY,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,85,88,10
     EDITTEXT        IDC_PROXY_HOST,120,105,120,12,ES_AUTOHSCROLL | WS_DISABLED | WS_GROUP

diff --git a/src/setup/res_en.rc b/src/setup/res_en.rc
@@ -138,9 +138,9 @@ CAPTION "OSGeo4W Setup - Select Connection Type"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "Use &System Proxy Settings",
-		    IDC_NET_PRECONFIG,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,55,185,10
+		    IDC_NET_PRECONFIG,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,185,10
     CONTROL         "&Direct Connection",
-		    IDC_NET_DIRECT,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,70,73,10
+		    IDC_NET_DIRECT,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,73,10
     CONTROL         "Use HTTP/FTP &Proxy:",
 		    IDC_NET_PROXY,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,85,88,10
     EDITTEXT        IDC_PROXY_HOST,120,105,120,12,ES_AUTOHSCROLL | WS_DISABLED | WS_GROUP

diff --git a/src/setup/res_es.rc b/src/setup/res_es.rc
@@ -139,9 +139,9 @@ CAPTION "Instalador OSGeo4W - Escoja el Tipo de Conexi
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "Usar la Configuraci�n de &IE5",
-		    IDC_NET_PRECONFIG,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,55,185,10
+		    IDC_NET_PRECONFIG,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,185,10
     CONTROL         "&Conexi�n Directa",
-		    IDC_NET_DIRECT,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,70,73,10
+		    IDC_NET_DIRECT,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,73,10
     CONTROL         "Usar el &Proxy HTTP/FTP :",
 		    IDC_NET_PROXY,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,85,88,10
     EDITTEXT        IDC_PROXY_HOST,120,105,120,12,ES_AUTOHSCROLL | WS_DISABLED | WS_GROUP

diff --git a/src/setup/res_ja.rc b/src/setup/res_ja.rc
@@ -139,9 +139,9 @@ CAPTION "OSGeo4Wセットアップ－接続タイプの選択"
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "IE設定を利用する(&I)",
-		    IDC_NET_PRECONFIG,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,55,185,10
+		    IDC_NET_PRECONFIG,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,185,10
     CONTROL         "直接接続する(&D)",
-		    IDC_NET_DIRECT,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,70,173,10
+		    IDC_NET_DIRECT,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,173,10
     CONTROL         "HTTP/FTPプロキシを利用する(&P):",
 		    IDC_NET_PROXY,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,85,188,10
     EDITTEXT        IDC_PROXY_HOST,120,105,120,12,ES_AUTOHSCROLL | WS_DISABLED | WS_GROUP

diff --git a/src/setup/res_ru.rc b/src/setup/res_ru.rc
@@ -139,9 +139,9 @@ CAPTION "Установка OSGeo4W - Выберите тип интернет-
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "Используются настройки &IE 5.0:",
-		    IDC_NET_PRECONFIG,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,55,132,10
+		    IDC_NET_PRECONFIG,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,132,10
     CONTROL         "&Прямое соединение",
-		    IDC_NET_DIRECT,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,70,88,10
+		    IDC_NET_DIRECT,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,88,10
     CONTROL         "Используются настройки прокси &HTTP/FTP:",
 		    IDC_NET_PROXY,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,85,168,10
     EDITTEXT        IDC_PROXY_HOST,120,105,120,12,ES_AUTOHSCROLL | WS_DISABLED | WS_GROUP

diff --git a/src/setup/res_ua.rc b/src/setup/res_ua.rc
@@ -139,9 +139,9 @@ CAPTION "Інсталятор OSGeo4W - Виберіть тип інтернет
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "Використовувати налаштовування &IE 5.0:",
-		    IDC_NET_PRECONFIG,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,55,168,10
+		    IDC_NET_PRECONFIG,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,168,10
     CONTROL         "&Пряме з'єднання",
-		    IDC_NET_DIRECT,"Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,70,88,10
+		    IDC_NET_DIRECT,"Button", BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,88,10
     CONTROL         "Вказати налаштовування проксі &HTTP/FTP:",
 		    IDC_NET_PROXY,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,60,85,168,10
     EDITTEXT        IDC_PROXY_HOST,120,105,120,12,ES_AUTOHSCROLL | WS_DISABLED | WS_GROUP