Author: dreimer Date: Sat Mar 14 12:20:45 2015 New Revision: 66690
URL: http://svn.reactos.org/svn/reactos?rev=66690&view=rev Log: [RAPPS] lack of a proxy configuration by Peter Hater. German translation updated by me. CORE-4852 #resolve #comment Committed, thx for help.
Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt trunk/reactos/base/applications/rapps/lang/bg-BG.rc trunk/reactos/base/applications/rapps/lang/cs-CZ.rc trunk/reactos/base/applications/rapps/lang/de-DE.rc trunk/reactos/base/applications/rapps/lang/en-US.rc trunk/reactos/base/applications/rapps/lang/es-ES.rc trunk/reactos/base/applications/rapps/lang/fr-FR.rc trunk/reactos/base/applications/rapps/lang/he-IL.rc trunk/reactos/base/applications/rapps/lang/it-IT.rc trunk/reactos/base/applications/rapps/lang/ja-JP.rc trunk/reactos/base/applications/rapps/lang/no-NO.rc trunk/reactos/base/applications/rapps/lang/pl-PL.rc trunk/reactos/base/applications/rapps/lang/pt-BR.rc trunk/reactos/base/applications/rapps/lang/ro-RO.rc trunk/reactos/base/applications/rapps/lang/ru-RU.rc trunk/reactos/base/applications/rapps/lang/sk-SK.rc trunk/reactos/base/applications/rapps/lang/sq-AL.rc trunk/reactos/base/applications/rapps/lang/sv-SE.rc trunk/reactos/base/applications/rapps/lang/tr-TR.rc trunk/reactos/base/applications/rapps/lang/uk-UA.rc trunk/reactos/base/applications/rapps/lang/zh-CN.rc trunk/reactos/base/applications/rapps/lang/zh-TW.rc trunk/reactos/base/applications/rapps/loaddlg.c trunk/reactos/base/applications/rapps/rapps.h trunk/reactos/base/applications/rapps/resource.h trunk/reactos/base/applications/rapps/settingsdlg.c trunk/reactos/base/applications/rapps/winmain.c
Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/CMa... ============================================================================== --- trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -20,7 +20,7 @@ add_executable(rapps ${SOURCE} rapps.rc) set_module_type(rapps win32gui UNICODE) target_link_libraries(rapps uuid) -add_importlibs(rapps advapi32 comctl32 gdi32 urlmon wininet user32 shell32 shlwapi ole32 msvcrt kernel32 ntdll) +add_importlibs(rapps advapi32 comctl32 gdi32 wininet user32 shell32 shlwapi ole32 msvcrt kernel32 ntdll) add_pch(rapps rapps.h SOURCE) add_dependencies(rapps rappsmsg) add_message_headers(ANSI rappsmsg.mc)
Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -56,7 +56,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 254, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 254, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ÐаÑÑÑойки" FONT 8, "MS Shell Dlg" @@ -70,9 +70,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "Ðз&боÑ", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "След Ñлагане, използваниÑе Ñайлове да Ñе изÑÑиваÑ", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "ÐодÑазбиÑано", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "ÐобÑе", IDOK, 116, 124, 60, 14 - PUSHBUTTON "ÐÑказ", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "ÐодÑазбиÑано", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "ÐобÑе", IDOK, 116, 180, 60, 14 + PUSHBUTTON "ÐÑказ", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/cs-CZ.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -57,7 +57,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "NastavenÃ" FONT 8, "MS Shell Dlg" @@ -71,9 +71,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Procházet...", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Smazat instalátor programu po dokonÄenà instalace", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "VýchozÃ", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Storno", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "VýchozÃ", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Storno", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -52,7 +52,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Einstellungen" FONT 8, "MS Shell Dlg" @@ -66,9 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Wählen", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Installer nach Programminstallation löschen", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Vorgabe", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Abbrechen", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "Proxy Einstellungen des Systems verwenden", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 160, 10 + CONTROL "Direkt (Kein Proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "Kein Proxy", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Vorgabe", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -52,7 +52,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Settings" FONT 8, "MS Shell Dlg" @@ -66,9 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Delete program installer after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -55,7 +55,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ajustes" FONT 8, "MS Shell Dlg" @@ -69,9 +69,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Seleccionar", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Borrar el instalador del programa tras su instalación", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Por defecto", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "Aceptar", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Por defecto", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "Aceptar", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -52,7 +52,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Configuration" FONT 8, "MS Shell Dlg" @@ -66,9 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Sélectionner", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Supprimer l'installateur du programme après l'installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Par défaut", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "Accepter", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Annuler", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Par défaut", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "Accepter", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/he-IL.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -54,7 +54,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "×××ר×ת" FONT 8, "MS Shell Dlg" @@ -68,9 +68,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "××ר", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "×××§ ×ת ×§×××¥ ×××ª×§× × ×××ר ס××× ×××ª×§× ×", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "×ר×רת ××××", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "××ש×ר", IDOK, 116, 124, 60, 14 - PUSHBUTTON "×××××", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "×ר×רת ××××", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "××ש×ר", IDOK, 116, 180, 60, 14 + PUSHBUTTON "×××××", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -52,7 +52,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Impostazioni" FONT 8, "MS Shell Dlg" @@ -66,9 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Scegli", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Rimuovere la procedura di installazione dopo l'uso", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Predefiniti", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Annulla", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Predefiniti", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Annulla", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -52,7 +52,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "è¨å®" FONT 9, "MS UI Gothic" @@ -66,9 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "鏿(&C)", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "ã¤ã³ã¹ãã¼ã«å¾ã«ããã°ã©ã ã®ã¤ã³ã¹ãã¼ã©ãåé¤ãã(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "ããã©ã«ã", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "ããã©ã«ã", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -52,7 +52,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Settings" FONT 8, "MS Shell Dlg" @@ -66,9 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -60,7 +60,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ustawienia" FONT 8, "MS Shell Dlg" @@ -73,10 +73,17 @@ LTEXT "Katalog dla pobranych plików:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP PUSHBUTTON "&Wybierz", IDC_CHOOSE, 187, 85, 50, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL AUTOCHECKBOX "&UsuÅ instalatory programów po ich zainstalowaniu", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "DomyÅlne", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Anuluj", IDCANCEL, 181, 124, 60, 14 + PUSHBUTTON "DomyÅlne", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pt-BR.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -54,7 +54,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Configurações" FONT 8, "MS Shell Dlg" @@ -67,10 +67,17 @@ LTEXT "Pasta de download:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Escolher", IDC_CHOOSE, 187, 85, 50, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL AUTOCHECKBOX "&Deletar instalador após a instalação do programa", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Padrão", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 181, 124, 60, 14 + PUSHBUTTON "Padrão", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -58,7 +58,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "PreferinÈe" FONT 8, "MS Shell Dlg" @@ -72,9 +72,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "Spe&cificareâ¦", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "Èt&erge aplicaÈia de instalare dupÄ instalarea programului", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "&Implicite", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "Con&firmÄ", IDOK, 116, 124, 60, 14 - PUSHBUTTON "A&nuleazÄ", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Implicite", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "Con&firmÄ", IDOK, 116, 180, 60, 14 + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -52,7 +52,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ÐаÑамеÑÑÑ" FONT 8, "MS Shell Dlg" @@ -66,9 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "Ð&ÑбÑаÑÑ", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&УдалÑÑÑ Ð¸Ð½ÑÑаллÑÑоÑÑ Ð¿ÑогÑамм поÑле ÑÑÑановки", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Ðо ÑмолÑаниÑ", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "ÐÑмена", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Ðо ÑмолÑаниÑ", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "ÐÑмена", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -57,7 +57,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Nastavenia" FONT 8, "MS Shell Dlg" @@ -71,9 +71,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&VybraÅ¥", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&ZmazaÅ¥ inÅ¡talaÄné programy po nainÅ¡talovanÃ", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Predvolené", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Predvolené", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sq-AL.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -56,7 +56,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Konfigurime" FONT 8, "MS Shell Dlg" @@ -70,9 +70,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "Zgjedh", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "Fshi instaluesit e programeve pas instalimit", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Parazgjedhur", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Anulo", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Parazgjedhur", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Anulo", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -59,7 +59,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Inställningar" FONT 8, "MS Shell Dlg" @@ -73,9 +73,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Välj", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Ta bort programinstallerare efter installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Standard", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Avbryt", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Standard", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -54,7 +54,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ayarlar" FONT 8, "MS Shell Dlg" @@ -68,9 +68,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Seç", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Kurulumdan Sonra İzlencenin Kurulum KütüÄünü Sil", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Ãn Tanımlılar", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "Tamam", IDOK, 116, 124, 60, 14 - PUSHBUTTON "İptal", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Ãn Tanımlılar", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "Tamam", IDOK, 116, 180, 60, 14 + PUSHBUTTON "İptal", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -60,7 +60,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ÐалаÑÑÑваннÑ" FONT 8, "MS Shell Dlg" @@ -74,9 +74,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&ÐбÑаÑи", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&ÐидалÑÑи ÑнÑÑалÑÑоÑи пÑогÑам пÑÑÐ»Ñ Ð²ÑÑановленнÑ", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "СÑандаÑÑно", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "СкаÑÑваÑи", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "СÑандаÑÑно", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "СкаÑÑваÑи", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -54,7 +54,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "设置" FONT 8, "MS Shell Dlg" @@ -68,9 +68,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "éæ©(&C)", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "å¨å®è£ å®ç¨åºåå é¤å®è£ ç¨åº(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "缺ç", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "ç¡®å®", IDOK, 116, 124, 60, 14 - PUSHBUTTON "åæ¶", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "缺ç", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "ç¡®å®", IDOK, 116, 180, 60, 14 + PUSHBUTTON "åæ¶", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lan... ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -54,7 +54,7 @@ END END
-IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "è¨å®" FONT 8, "MS Shell Dlg" @@ -68,9 +68,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "鏿(&C)", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "å¨å®è£å®ç¨å¼å¾åªé¤å®è£ç¨å¼(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "é è¨", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "確å®", IDOK, 116, 124, 60, 14 - PUSHBUTTON "åæ¶", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "é è¨", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "確å®", IDOK, 116, 180, 60, 14 + PUSHBUTTON "åæ¶", IDCANCEL, 181, 180, 60, 14 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97
Modified: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/loa... ============================================================================== --- trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -220,6 +220,8 @@ HANDLE hOut = INVALID_HANDLE_VALUE; unsigned char lpBuffer[4096]; const LPWSTR lpszAgent = L"RApps/1.0"; + URL_COMPONENTS urlComponents; + size_t urlLength;
/* built the path for the download */ p = wcsrchr(AppInfo->szUrlDownload, L'/'); @@ -264,16 +266,41 @@ dl = CreateDl(Context, &bCancelled); if (dl == NULL) goto end;
- hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + switch(SettingsInfo.Proxy) + { + case 0: /* preconfig */ + hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + break; + case 1: /* direct (no proxy) */ + hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + break; + case 2: /* use proxy */ + hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PROXY, SettingsInfo.szProxyServer, SettingsInfo.szNoProxyFor, 0); + break; + default: /* preconfig */ + hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + break; + } if (!hOpen) goto end;
hFile = InternetOpenUrlW(hOpen, AppInfo->szUrlDownload, NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE|INTERNET_FLAG_KEEP_CONNECTION, 0); - if(!hFile) goto end; + if (!hFile) goto end; + + memset(&urlComponents, 0, sizeof(urlComponents)); + urlComponents.dwStructSize = sizeof(urlComponents); + if(FAILED(StringCbLengthW(AppInfo->szUrlDownload, sizeof(AppInfo->szUrlDownload), &urlLength))) goto end; + urlComponents.dwSchemeLength = urlLength*sizeof(WCHAR); + urlComponents.lpszScheme = malloc(urlComponents.dwSchemeLength); + if(!InternetCrackUrlW(AppInfo->szUrlDownload, urlLength+1, ICU_DECODE | ICU_ESCAPE, &urlComponents)) goto end; + if(urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme == INTERNET_SCHEME_HTTPS) + HttpQueryInfo(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwBufLen, 0); + if(urlComponents.nScheme == INTERNET_SCHEME_FTP) + dwContentLen = FtpGetFileSize(hFile, &dwBufLen); + free(urlComponents.lpszScheme);
hOut = CreateFileW(path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); if (hOut == INVALID_HANDLE_VALUE) goto end;
- HttpQueryInfo(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwBufLen, 0);
do {
Modified: trunk/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/rap... ============================================================================== --- trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -104,6 +104,10 @@ INT Top; INT Width; INT Height; + /* Proxy settings */ + INT Proxy; + WCHAR szProxyServer[MAX_PATH]; + WCHAR szNoProxyFor[MAX_PATH];
} SETTINGS_INFO, *PSETTINGS_INFO;
Modified: trunk/reactos/base/applications/rapps/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/res... ============================================================================== --- trunk/reactos/base/applications/rapps/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/resource.h [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -45,6 +45,11 @@ #define IDC_INSTALL_TEXT 1010 #define IDC_CD_INSTALL 1011 #define IDC_DOWNLOAD_INSTALL 1012 +#define IDC_PROXY_DEFAULT 1013 +#define IDC_NO_PROXY 1014 +#define IDC_USE_PROXY 1015 +#define IDC_PROXY_SERVER 1016 +#define IDC_NO_PROXY_FOR 1017
/* Dialogs */ #define IDD_SETTINGS_DIALOG 300
Modified: trunk/reactos/base/applications/rapps/settingsdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/set... ============================================================================== --- trunk/reactos/base/applications/rapps/settingsdlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/settingsdlg.c [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -57,6 +57,11 @@
SetWindowTextW(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT), Info->szDownloadDir); + + CheckRadioButton(hDlg, IDC_PROXY_DEFAULT, IDC_USE_PROXY, IDC_PROXY_DEFAULT+Info->Proxy); + + SetWindowTextW(GetDlgItem(hDlg, IDC_PROXY_SERVER), Info->szProxyServer); + SetWindowTextW(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), Info->szNoProxyFor); }
static @@ -96,6 +101,18 @@ IS_CHECKED(NewSettingsInfo.bDelInstaller, IDC_DEL_AFTER_INSTALL); break;
+ case IDC_PROXY_DEFAULT: + NewSettingsInfo.Proxy = 0; + break; + + case IDC_NO_PROXY: + NewSettingsInfo.Proxy = 1; + break; + + case IDC_USE_PROXY: + NewSettingsInfo.Proxy = 2; + break; + case IDC_DEFAULT_SETTINGS: FillDefaultSettings(&NewSettingsInfo); InitSettingsControls(hDlg, &NewSettingsInfo); @@ -104,10 +121,20 @@ case IDOK: { WCHAR szDir[MAX_PATH]; + WCHAR szProxy[MAX_PATH]; + WCHAR szNoProxy[MAX_PATH]; DWORD dwAttr;
GetWindowTextW(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT), szDir, MAX_PATH); + + GetWindowTextW(GetDlgItem(hDlg, IDC_PROXY_SERVER), + szProxy, MAX_PATH); + StringCbCopyW(NewSettingsInfo.szProxyServer, sizeof(NewSettingsInfo.szProxyServer), szProxy); + + GetWindowTextW(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), + szNoProxy, MAX_PATH); + StringCbCopyW(NewSettingsInfo.szNoProxyFor, sizeof(NewSettingsInfo.szNoProxyFor), szNoProxy);
dwAttr = GetFileAttributesW(szDir); if (dwAttr != INVALID_FILE_ATTRIBUTES && @@ -132,9 +159,11 @@ EndDialog(hDlg, LOWORD(wParam)); } } - - SetFocus(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT)); - break; + else + { + SetFocus(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT)); + break; + } }
SettingsInfo = NewSettingsInfo;
Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/win... ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -46,6 +46,10 @@ pSettingsInfo->Top = CW_USEDEFAULT; pSettingsInfo->Width = 680; pSettingsInfo->Height = 450; + + pSettingsInfo->Proxy = 0; + StringCbCopyW(pSettingsInfo->szProxyServer, sizeof(pSettingsInfo->szProxyServer), L""); + StringCbCopyW(pSettingsInfo->szNoProxyFor, sizeof(pSettingsInfo->szNoProxyFor), L""); }
static BOOL