lack of a proxy configuration by Peter Hater. German translation updated by me.
CORE-4852 #resolve #comment Committed, thx for help.

svn path=/trunk/; revision=66690
This commit is contained in:
Daniel Reimer 2015-03-14 12:20:45 +00:00
parent f759acbfe3
commit 401b8cd1d1
27 changed files with 307 additions and 91 deletions

View file

@ -20,7 +20,7 @@ list(APPEND SOURCE
add_executable(rapps ${SOURCE} rapps.rc) add_executable(rapps ${SOURCE} rapps.rc)
set_module_type(rapps win32gui UNICODE) set_module_type(rapps win32gui UNICODE)
target_link_libraries(rapps uuid) 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_pch(rapps rapps.h SOURCE)
add_dependencies(rapps rappsmsg) add_dependencies(rapps rappsmsg)
add_message_headers(ANSI rappsmsg.mc) add_message_headers(ANSI rappsmsg.mc)

View file

@ -56,7 +56,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Настройки" CAPTION "Настройки"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -70,9 +70,16 @@ BEGIN
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL
PUSHBUTTON "Из&бор", IDC_CHOOSE, 187, 85, 50, 14 PUSHBUTTON "Из&бор", IDC_CHOOSE, 187, 85, 50, 14
AUTOCHECKBOX "След слагане, използваните файлове да се изтриват", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 AUTOCHECKBOX "След слагане, използваните файлове да се изтриват", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
PUSHBUTTON "Подразбирано", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 GROUPBOX "Proxy", -1, 4, 116, 240, 61
PUSHBUTTON "Добре", IDOK, 116, 124, 60, 14 CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10
PUSHBUTTON "Отказ", IDCANCEL, 181, 124, 60, 14 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 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -57,7 +57,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Nastavení" CAPTION "Nastavení"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -71,9 +71,16 @@ BEGIN
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL 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 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 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 GROUPBOX "Proxy", -1, 4, 116, 240, 61
PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10
PUSHBUTTON "Storno", IDCANCEL, 181, 124, 60, 14 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 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -52,7 +52,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Einstellungen" CAPTION "Einstellungen"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -66,9 +66,16 @@ BEGIN
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL 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 PUSHBUTTON "&Wählen", IDC_CHOOSE, 187, 85, 50, 14
AUTOCHECKBOX "&Installer nach Programminstallation löschen", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 AUTOCHECKBOX "&Installer nach Programminstallation löschen", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
PUSHBUTTON "Vorgabe", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 GROUPBOX "Proxy", -1, 4, 116, 240, 61
PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 CONTROL "Proxy Einstellungen des Systems verwenden", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 160, 10
PUSHBUTTON "Abbrechen", IDCANCEL, 181, 124, 60, 14 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 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -52,7 +52,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Settings" CAPTION "Settings"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -66,9 +66,16 @@ BEGIN
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL 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 PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14
AUTOCHECKBOX "&Delete program installer after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 AUTOCHECKBOX "&Delete program installer after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 GROUPBOX "Proxy", -1, 4, 116, 240, 61
PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10
PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14 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 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -55,7 +55,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Ajustes" CAPTION "Ajustes"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -69,9 +69,16 @@ BEGIN
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL 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 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 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 GROUPBOX "Proxy", -1, 4, 116, 240, 61
PUSHBUTTON "Aceptar", IDOK, 116, 124, 60, 14 CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10
PUSHBUTTON "Cancelar", IDCANCEL, 181, 124, 60, 14 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 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -52,7 +52,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Configuration" CAPTION "Configuration"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -66,9 +66,16 @@ BEGIN
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL 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 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 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 GROUPBOX "Proxy", -1, 4, 116, 240, 61
PUSHBUTTON "Accepter", IDOK, 116, 124, 60, 14 CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10
PUSHBUTTON "Annuler", IDCANCEL, 181, 124, 60, 14 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 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -54,7 +54,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "הגדרות" CAPTION "הגדרות"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -68,9 +68,16 @@ BEGIN
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL
PUSHBUTTON "בחר", IDC_CHOOSE, 187, 85, 50, 14 PUSHBUTTON "בחר", IDC_CHOOSE, 187, 85, 50, 14
AUTOCHECKBOX "מחק את קובץ ההתקנה לאחר סיום ההתקנה", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 AUTOCHECKBOX "מחק את קובץ ההתקנה לאחר סיום ההתקנה", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
PUSHBUTTON "ברירת מחדל", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 GROUPBOX "Proxy", -1, 4, 116, 240, 61
PUSHBUTTON "אישור", IDOK, 116, 124, 60, 14 CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10
PUSHBUTTON "ביטול", IDCANCEL, 181, 124, 60, 14 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 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -52,7 +52,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Impostazioni" CAPTION "Impostazioni"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -66,9 +66,16 @@ BEGIN
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL 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 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 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 GROUPBOX "Proxy", -1, 4, 116, 240, 61
PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10
PUSHBUTTON "Annulla", IDCANCEL, 181, 124, 60, 14 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 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -52,7 +52,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "設定" CAPTION "設定"
FONT 9, "MS UI Gothic" FONT 9, "MS UI Gothic"
@ -66,9 +66,16 @@ BEGIN
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL 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 PUSHBUTTON "選択(&C)", IDC_CHOOSE, 187, 85, 50, 14
AUTOCHECKBOX "インストール後にプログラムのインストーラを削除する(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 AUTOCHECKBOX "インストール後にプログラムのインストーラを削除する(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
PUSHBUTTON "デフォルト", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 GROUPBOX "Proxy", -1, 4, 116, 240, 61
PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10
PUSHBUTTON "キャンセル", IDCANCEL, 181, 124, 60, 14 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 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -52,7 +52,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Settings" CAPTION "Settings"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -66,9 +66,16 @@ BEGIN
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL 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 PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14
AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 GROUPBOX "Proxy", -1, 4, 116, 240, 61
PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10
PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14 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 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -60,7 +60,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Ustawienia" CAPTION "Ustawienia"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -73,10 +73,17 @@ BEGIN
LTEXT "Katalog dla pobranych plików:", -1, 16, 75, 100, 9 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 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP
PUSHBUTTON "&Wybierz", IDC_CHOOSE, 187, 85, 50, 14 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 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 "Domyślne", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14
PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 PUSHBUTTON "OK", IDOK, 116, 180, 60, 14
PUSHBUTTON "Anuluj", IDCANCEL, 181, 124, 60, 14 PUSHBUTTON "Anuluj", IDCANCEL, 181, 180, 60, 14
END END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -54,7 +54,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Configurações" CAPTION "Configurações"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -67,10 +67,17 @@ BEGIN
LTEXT "Pasta de download:", -1, 16, 75, 100, 9 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 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 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 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 "Padrão", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14
PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 PUSHBUTTON "OK", IDOK, 116, 180, 60, 14
PUSHBUTTON "Cancelar", IDCANCEL, 181, 124, 60, 14 PUSHBUTTON "Cancelar", IDCANCEL, 181, 180, 60, 14
END END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -58,7 +58,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Preferințe" CAPTION "Preferințe"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -72,9 +72,16 @@ BEGIN
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL 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 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 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 GROUPBOX "Proxy", -1, 4, 116, 240, 61
PUSHBUTTON "Con&firmă", IDOK, 116, 124, 60, 14 CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10
PUSHBUTTON "A&nulează", IDCANCEL, 181, 124, 60, 14 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 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -52,7 +52,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Параметры" CAPTION "Параметры"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -66,9 +66,16 @@ BEGIN
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL
PUSHBUTTON "В&ыбрать", IDC_CHOOSE, 187, 85, 50, 14 PUSHBUTTON "В&ыбрать", IDC_CHOOSE, 187, 85, 50, 14
AUTOCHECKBOX "&Удалять инсталляторы программ после установки", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 AUTOCHECKBOX "&Удалять инсталляторы программ после установки", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
PUSHBUTTON "По умолчанию", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 GROUPBOX "Proxy", -1, 4, 116, 240, 61
PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10
PUSHBUTTON "Отмена", IDCANCEL, 181, 124, 60, 14 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 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -57,7 +57,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Nastavenia" CAPTION "Nastavenia"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -71,9 +71,16 @@ BEGIN
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL 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 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 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 GROUPBOX "Proxy", -1, 4, 116, 240, 61
PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10
PUSHBUTTON "Zrušiť", IDCANCEL, 181, 124, 60, 14 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 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -56,7 +56,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Konfigurime" CAPTION "Konfigurime"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -70,9 +70,16 @@ BEGIN
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL 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 PUSHBUTTON "Zgjedh", IDC_CHOOSE, 187, 85, 50, 14
AUTOCHECKBOX "Fshi instaluesit e programeve pas instalimit", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 AUTOCHECKBOX "Fshi instaluesit e programeve pas instalimit", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
PUSHBUTTON "Parazgjedhur", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 GROUPBOX "Proxy", -1, 4, 116, 240, 61
PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10
PUSHBUTTON "Anulo", IDCANCEL, 181, 124, 60, 14 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 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -59,7 +59,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Inställningar" CAPTION "Inställningar"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -73,9 +73,16 @@ BEGIN
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL 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 PUSHBUTTON "&Välj", IDC_CHOOSE, 187, 85, 50, 14
AUTOCHECKBOX "&Ta bort programinstallerare efter installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 AUTOCHECKBOX "&Ta bort programinstallerare efter installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
PUSHBUTTON "Standard", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 GROUPBOX "Proxy", -1, 4, 116, 240, 61
PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10
PUSHBUTTON "Avbryt", IDCANCEL, 181, 124, 60, 14 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 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -54,7 +54,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Ayarlar" CAPTION "Ayarlar"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -68,9 +68,16 @@ BEGIN
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL 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 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 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 GROUPBOX "Proxy", -1, 4, 116, 240, 61
PUSHBUTTON "Tamam", IDOK, 116, 124, 60, 14 CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10
PUSHBUTTON "İptal", IDCANCEL, 181, 124, 60, 14 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 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -60,7 +60,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Налаштування" CAPTION "Налаштування"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -74,9 +74,16 @@ BEGIN
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL
PUSHBUTTON "&Обрати", IDC_CHOOSE, 187, 85, 50, 14 PUSHBUTTON "&Обрати", IDC_CHOOSE, 187, 85, 50, 14
AUTOCHECKBOX "&Видаляти інсталятори програм після встановлення", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 AUTOCHECKBOX "&Видаляти інсталятори програм після встановлення", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
PUSHBUTTON "Стандартно", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 GROUPBOX "Proxy", -1, 4, 116, 240, 61
PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10
PUSHBUTTON "Скасувати", IDCANCEL, 181, 124, 60, 14 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 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -54,7 +54,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "设置" CAPTION "设置"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -68,9 +68,16 @@ BEGIN
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL 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 PUSHBUTTON "选择(&C)", IDC_CHOOSE, 187, 85, 50, 14
AUTOCHECKBOX "在安装完程序后删除安装程序(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 AUTOCHECKBOX "在安装完程序后删除安装程序(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
PUSHBUTTON "缺省", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 GROUPBOX "Proxy", -1, 4, 116, 240, 61
PUSHBUTTON "确定", IDOK, 116, 124, 60, 14 CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10
PUSHBUTTON "取消", IDCANCEL, 181, 124, 60, 14 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 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -54,7 +54,7 @@ BEGIN
END END
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 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "設定" CAPTION "設定"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
@ -68,9 +68,16 @@ BEGIN
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL 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 PUSHBUTTON "選擇(&C)", IDC_CHOOSE, 187, 85, 50, 14
AUTOCHECKBOX "在安裝完程式後刪除安裝程式(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 AUTOCHECKBOX "在安裝完程式後刪除安裝程式(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
PUSHBUTTON "預設", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 GROUPBOX "Proxy", -1, 4, 116, 240, 61
PUSHBUTTON "確定", IDOK, 116, 124, 60, 14 CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10
PUSHBUTTON "取消", IDCANCEL, 181, 124, 60, 14 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 END
IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97

View file

@ -220,6 +220,8 @@ ThreadFunc(LPVOID Context)
HANDLE hOut = INVALID_HANDLE_VALUE; HANDLE hOut = INVALID_HANDLE_VALUE;
unsigned char lpBuffer[4096]; unsigned char lpBuffer[4096];
const LPWSTR lpszAgent = L"RApps/1.0"; const LPWSTR lpszAgent = L"RApps/1.0";
URL_COMPONENTS urlComponents;
size_t urlLength;
/* built the path for the download */ /* built the path for the download */
p = wcsrchr(AppInfo->szUrlDownload, L'/'); p = wcsrchr(AppInfo->szUrlDownload, L'/');
@ -264,16 +266,41 @@ ThreadFunc(LPVOID Context)
dl = CreateDl(Context, &bCancelled); dl = CreateDl(Context, &bCancelled);
if (dl == NULL) goto end; if (dl == NULL) goto end;
switch(SettingsInfo.Proxy)
{
case 0: /* preconfig */
hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); 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; if (!hOpen) goto end;
hFile = InternetOpenUrlW(hOpen, AppInfo->szUrlDownload, NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE|INTERNET_FLAG_KEEP_CONNECTION, 0); 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); hOut = CreateFileW(path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL);
if (hOut == INVALID_HANDLE_VALUE) goto end; if (hOut == INVALID_HANDLE_VALUE) goto end;
HttpQueryInfo(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwBufLen, 0);
do do
{ {

View file

@ -104,6 +104,10 @@ typedef struct
INT Top; INT Top;
INT Width; INT Width;
INT Height; INT Height;
/* Proxy settings */
INT Proxy;
WCHAR szProxyServer[MAX_PATH];
WCHAR szNoProxyFor[MAX_PATH];
} SETTINGS_INFO, *PSETTINGS_INFO; } SETTINGS_INFO, *PSETTINGS_INFO;

View file

@ -45,6 +45,11 @@
#define IDC_INSTALL_TEXT 1010 #define IDC_INSTALL_TEXT 1010
#define IDC_CD_INSTALL 1011 #define IDC_CD_INSTALL 1011
#define IDC_DOWNLOAD_INSTALL 1012 #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 */ /* Dialogs */
#define IDD_SETTINGS_DIALOG 300 #define IDD_SETTINGS_DIALOG 300

View file

@ -57,6 +57,11 @@ InitSettingsControls(HWND hDlg, PSETTINGS_INFO Info)
SetWindowTextW(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT), SetWindowTextW(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT),
Info->szDownloadDir); 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 static
@ -96,6 +101,18 @@ SettingsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
IS_CHECKED(NewSettingsInfo.bDelInstaller, IDC_DEL_AFTER_INSTALL); IS_CHECKED(NewSettingsInfo.bDelInstaller, IDC_DEL_AFTER_INSTALL);
break; 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: case IDC_DEFAULT_SETTINGS:
FillDefaultSettings(&NewSettingsInfo); FillDefaultSettings(&NewSettingsInfo);
InitSettingsControls(hDlg, &NewSettingsInfo); InitSettingsControls(hDlg, &NewSettingsInfo);
@ -104,11 +121,21 @@ SettingsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
case IDOK: case IDOK:
{ {
WCHAR szDir[MAX_PATH]; WCHAR szDir[MAX_PATH];
WCHAR szProxy[MAX_PATH];
WCHAR szNoProxy[MAX_PATH];
DWORD dwAttr; DWORD dwAttr;
GetWindowTextW(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT), GetWindowTextW(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT),
szDir, MAX_PATH); 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); dwAttr = GetFileAttributesW(szDir);
if (dwAttr != INVALID_FILE_ATTRIBUTES && if (dwAttr != INVALID_FILE_ATTRIBUTES &&
(dwAttr & FILE_ATTRIBUTE_DIRECTORY)) (dwAttr & FILE_ATTRIBUTE_DIRECTORY))
@ -132,10 +159,12 @@ SettingsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
EndDialog(hDlg, LOWORD(wParam)); EndDialog(hDlg, LOWORD(wParam));
} }
} }
else
{
SetFocus(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT)); SetFocus(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT));
break; break;
} }
}
SettingsInfo = NewSettingsInfo; SettingsInfo = NewSettingsInfo;
SaveSettings(GetParent(hDlg)); SaveSettings(GetParent(hDlg));

View file

@ -46,6 +46,10 @@ FillDefaultSettings(PSETTINGS_INFO pSettingsInfo)
pSettingsInfo->Top = CW_USEDEFAULT; pSettingsInfo->Top = CW_USEDEFAULT;
pSettingsInfo->Width = 680; pSettingsInfo->Width = 680;
pSettingsInfo->Height = 450; pSettingsInfo->Height = 450;
pSettingsInfo->Proxy = 0;
StringCbCopyW(pSettingsInfo->szProxyServer, sizeof(pSettingsInfo->szProxyServer), L"");
StringCbCopyW(pSettingsInfo->szNoProxyFor, sizeof(pSettingsInfo->szNoProxyFor), L"");
} }
static BOOL static BOOL