From 51a3198748d6b8c6fae182c688e91c980f7ac7b5 Mon Sep 17 00:00:00 2001 From: Michael Jung Date: Tue, 14 Feb 2006 13:09:30 +0100 Subject: [PATCH] winecfg: Support for setting symlinks for 'Desktop' and 'My Stuff' shell folders. --- programs/winecfg/Bg.rc | 27 ++-- programs/winecfg/De.rc | 29 ++-- programs/winecfg/En.rc | 52 +++--- programs/winecfg/Es.rc | 29 ++-- programs/winecfg/Fi.rc | 29 ++-- programs/winecfg/Fr.rc | 29 ++-- programs/winecfg/Ja.rc | 29 ++-- programs/winecfg/Ko.rc | 29 ++-- programs/winecfg/Makefile.in | 1 + programs/winecfg/Nl.rc | 29 ++-- programs/winecfg/No.rc | 31 ++-- programs/winecfg/Ru.rc | 29 ++-- programs/winecfg/Tr.rc | 27 ++-- programs/winecfg/driveui.c | 22 ++- programs/winecfg/main.c | 4 +- programs/winecfg/resource.h | 12 +- programs/winecfg/theme.c | 301 +++++++++++++++++++++++++++++++++-- programs/winecfg/winecfg.h | 1 + 18 files changed, 558 insertions(+), 152 deletions(-) diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc index f78f18233f0..88b63a9c037 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc @@ -175,17 +175,24 @@ BEGIN CONTROL " ",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END -IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250 +IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - LTEXT ":",IDC_STATIC,8,10,244,8 - COMBOBOX IDC_THEME_THEMECOMBO,8,18,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON " ...",IDC_THEME_INSTALL,152,32,100,14 - LTEXT ":",IDC_THEME_COLORTEXT,8,48,244,8 - COMBOBOX IDC_THEME_COLORCOMBO,8,56,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT ":",IDC_THEME_SIZETEXT,8,74,244,8 - COMBOBOX IDC_THEME_SIZECOMBO,8,82,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + LTEXT ":",IDC_STATIC,15,16,230,8 + COMBOBOX IDC_THEME_THEMECOMBO,15,24,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON " ...",IDC_THEME_INSTALL,152,38,93,14 + LTEXT ":",IDC_THEME_COLORTEXT,15,54,230,8 + COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT ":",IDC_THEME_SIZETEXT,15,80,230,8 + COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | + LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 + CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -199,13 +206,15 @@ BEGIN IDS_SHOW_ADVANCED " " IDS_NOTHEME "( )" IDS_TAB_GRAPHICS "" - IDS_TAB_APPEARANCE " " + IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" IDS_TAB_AUDIO "" IDS_TAB_ABOUT "" IDS_WINECFG_TITLE " Wine" IDS_THEMEFILE " " IDS_THEMEFILE_SELECT " " IDS_AUDIO_MISSING " .\n\n .\n .\n\n , ." + IDS_SHELL_FOLDER "Shell Folder" + IDS_LINKS_TO "Links to" END STRINGTABLE DISCARDABLE diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index 75eacf64343..d8b5e540211 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -169,17 +169,24 @@ BEGIN CONTROL "Treiber Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END -IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250 +IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Motiv:",IDC_STATIC,8,10,244,8 - COMBOBOX IDC_THEME_THEMECOMBO,8,18,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Motiv installieren...",IDC_THEME_INSTALL,152,32,100,14 - LTEXT "Farbe:",IDC_THEME_COLORTEXT,8,48,244,8 - COMBOBOX IDC_THEME_COLORCOMBO,8,56,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Gre:",IDC_THEME_SIZETEXT,8,74,244,8 - COMBOBOX IDC_THEME_SIZECOMBO,8,82,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Darstellung ",IDC_STATIC,8,4,244,106 + LTEXT "Motiv:",IDC_STATIC,15,16,230,8 + COMBOBOX IDC_THEME_THEMECOMBO,15,24,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Motiv installieren...",IDC_THEME_INSTALL,152,38,93,14 + LTEXT "Farbe:",IDC_THEME_COLORTEXT,15,54,230,8 + COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Gre:",IDC_THEME_SIZETEXT,15,80,230,8 + COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Shell Ordner ",IDC_STATIC,8,114,244,100 + CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | + LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 + CONTROL "Verknpfe:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "Whlen",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -188,18 +195,20 @@ BEGIN IDS_TAB_APPLICATIONS "Anwendungen" IDS_TAB_DLLS "Bibliotheken" IDS_TAB_DRIVES "Laufwerke" - IDS_CHOOSE_PATH "Bitte whlen Sie ein Unix-Verzeichnis fr das Laufwerk." + IDS_CHOOSE_PATH "Bitte whlen Sie das Ziel-Unix-Verzeichnis." IDS_HIDE_ADVANCED "Verstecke Erweitert" IDS_SHOW_ADVANCED "Zeige Erweitert" IDS_NOTHEME "(Kein Motiv)" IDS_TAB_GRAPHICS "Grafik" - IDS_TAB_APPEARANCE "Darstellung" + IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" IDS_TAB_AUDIO "Audio" IDS_TAB_ABOUT "ber" IDS_WINECFG_TITLE "Wine-Konfiguration" IDS_THEMEFILE "Motiv-Dateien" IDS_THEMEFILE_SELECT "Motiv-Datei auswhlen" IDS_AUDIO_MISSING "Zur Zeit ist kein Audio Treiber in der Registry eingetragen.\n\nEin bevorzugter Treiber wurde fr Sie ausgewhlt.\nSie knnen diesen Treiber nutzen oder einen anderen auswhlen, sofern dieser vorhanden ist.\n\nSie mssen auf Anwenden klicken, damit die nderung bernommen wird." + IDS_SHELL_FOLDER "Shell Ordner" + IDS_LINKS_TO "Verknpft mit" END STRINGTABLE DISCARDABLE diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 22bdeb0792a..482a58976cc 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -171,17 +171,24 @@ BEGIN CONTROL "Driver Emulation",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END -IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250 +IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Theme:",IDC_STATIC,8,10,244,8 - COMBOBOX IDC_THEME_THEMECOMBO,8,18,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Install theme...",IDC_THEME_INSTALL,152,32,100,14 - LTEXT "Color:",IDC_THEME_COLORTEXT,8,48,244,8 - COMBOBOX IDC_THEME_COLORCOMBO,8,56,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Size:",IDC_THEME_SIZETEXT,8,74,244,8 - COMBOBOX IDC_THEME_SIZECOMBO,8,82,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + LTEXT "Theme:",IDC_STATIC,15,16,230,8 + COMBOBOX IDC_THEME_THEMECOMBO,15,24,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Install theme...",IDC_THEME_INSTALL,152,38,93,14 + LTEXT "Color:",IDC_THEME_COLORTEXT,15,54,230,8 + COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Size:",IDC_THEME_SIZETEXT,15,80,230,8 + COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | + LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 + CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -190,18 +197,20 @@ BEGIN IDS_TAB_APPLICATIONS "Applications" IDS_TAB_DLLS "Libraries" IDS_TAB_DRIVES "Drives" - IDS_CHOOSE_PATH "Select the unix directory to be mapped, please." + IDS_CHOOSE_PATH "Select the unix target directory, please." IDS_HIDE_ADVANCED "Hide Advanced" IDS_SHOW_ADVANCED "Show Advanced" IDS_NOTHEME "(No Theme)" IDS_TAB_GRAPHICS "Graphics" - IDS_TAB_APPEARANCE "Appearance" + IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" IDS_TAB_AUDIO "Audio" IDS_TAB_ABOUT "About" IDS_WINECFG_TITLE "Wine configuration" IDS_THEMEFILE "Theme files" IDS_THEMEFILE_SELECT "Select a theme file" IDS_AUDIO_MISSING "There is no audio driver currently specified in the registry.\n\nA recommended driver has been selected for you.\nYou can use this driver or select another driver if available.\n\nYou must click Apply for the selection to take effect." + IDS_SHELL_FOLDER "Shell Folder" + IDS_LINKS_TO "Links to" END STRINGTABLE DISCARDABLE @@ -249,15 +258,22 @@ BEGIN CONTROL "Allow Pixel Shader (if supported by hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,144,230,10 END -IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250 +IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN -LTEXT "Theme:",IDC_STATIC,8,10,244,8 -COMBOBOX IDC_THEME_THEMECOMBO,8,18,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP -PUSHBUTTON "Install theme...",IDC_THEME_INSTALL,152,32,100,14 -LTEXT "Colour:",IDC_THEME_COLORTEXT,8,48,244,8 -COMBOBOX IDC_THEME_COLORCOMBO,8,56,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP -LTEXT "Size:",IDC_THEME_SIZETEXT,8,74,244,8 -COMBOBOX IDC_THEME_SIZECOMBO,8,82,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + LTEXT "Theme:",IDC_STATIC,15,16,230,8 + COMBOBOX IDC_THEME_THEMECOMBO,15,24,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Install theme...",IDC_THEME_INSTALL,152,38,93,14 + LTEXT "Colour:",IDC_THEME_COLORTEXT,15,54,230,8 + COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Size:",IDC_THEME_SIZETEXT,15,80,230,8 + COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | + LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 + CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index 28d2324625e..e86159bd8ec 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -169,17 +169,24 @@ BEGIN CONTROL "Emulacin del manejador",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END -IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250 +IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Tema:",IDC_STATIC,8,10,244,8 - COMBOBOX IDC_THEME_THEMECOMBO,8,18,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Instalar tema...",IDC_THEME_INSTALL,152,32,100,14 - LTEXT "Color:",IDC_THEME_COLORTEXT,8,48,244,8 - COMBOBOX IDC_THEME_COLORCOMBO,8,56,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Tamao:",IDC_THEME_SIZETEXT,8,74,244,8 - COMBOBOX IDC_THEME_SIZECOMBO,8,82,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + LTEXT "Tema:",IDC_STATIC,15,16,230,8 + COMBOBOX IDC_THEME_THEMECOMBO,15,24,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Instalar tema...",IDC_THEME_INSTALL,152,38,93,14 + LTEXT "Color:",IDC_THEME_COLORTEXT,15,54,230,8 + COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Tamao:",IDC_THEME_SIZETEXT,15,80,230,8 + COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | + LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 + CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -188,16 +195,18 @@ BEGIN IDS_TAB_APPLICATIONS "Aplicaciones" IDS_TAB_DLLS "Libreras" IDS_TAB_DRIVES "Unidades" - IDS_CHOOSE_PATH "Seleccione el directorio de unix para mapear." + IDS_CHOOSE_PATH "Select the unix target directory, please." IDS_HIDE_ADVANCED "Ocultar avanzado" IDS_SHOW_ADVANCED "Mostrar avanzado" IDS_NOTHEME "(Ningn tema)" IDS_TAB_GRAPHICS "Grficos" - IDS_TAB_APPEARANCE "Apariencia" + IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" IDS_TAB_AUDIO "Audio" IDS_TAB_ABOUT "Acerca de" IDS_WINECFG_TITLE "Configuracin de Wine" IDS_THEMEFILE "Ficheros de tema" IDS_THEMEFILE_SELECT "Seleccione un fichero de tema" IDS_AUDIO_MISSING "Actualmente no hay ningn manejador de audio especificado en el registro.\n\nSe ha seleccionado un manejador recomendado para usted. Puede usar este manejador o seleccionar otro manejador disponible.\n\nDebe pulsar Aplicar para que la seleccin surja efecto." + IDS_SHELL_FOLDER "Shell Folder" + IDS_LINKS_TO "Links to" END diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc index 2f16e770f88..436d47451a3 100644 --- a/programs/winecfg/Fi.rc +++ b/programs/winecfg/Fi.rc @@ -165,17 +165,24 @@ BEGIN CONTROL "Ajurin &emulointi",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END -IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250 +IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Teema:",IDC_STATIC,8,10,244,8 - COMBOBOX IDC_THEME_THEMECOMBO,8,18,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Asenna &teema...",IDC_THEME_INSTALL,152,32,100,14 - LTEXT "Vri:",IDC_THEME_COLORTEXT,8,48,244,8 - COMBOBOX IDC_THEME_COLORCOMBO,8,56,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Koko:",IDC_THEME_SIZETEXT,8,74,244,8 - COMBOBOX IDC_THEME_SIZECOMBO,8,82,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + LTEXT "Teema:",IDC_STATIC,15,16,230,8 + COMBOBOX IDC_THEME_THEMECOMBO,15,24,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Asenna &teema...",IDC_THEME_INSTALL,152,38,93,14 + LTEXT "Vri:",IDC_THEME_COLORTEXT,15,54,230,8 + COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Koko:",IDC_THEME_SIZETEXT,15,80,230,8 + COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | + LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 + CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -184,15 +191,17 @@ BEGIN IDS_TAB_APPLICATIONS "Sovellukset" IDS_TAB_DLLS "Kirjastot" IDS_TAB_DRIVES "Asemat" - IDS_CHOOSE_PATH "Valitse mapattava unix -kansio." + IDS_CHOOSE_PATH "Select the unix target directory, please." IDS_HIDE_ADVANCED "Piilota lisasetukset" IDS_SHOW_ADVANCED "Nyt lisasetukset" IDS_NOTHEME "(Ei Teemaa)" IDS_TAB_GRAPHICS "Grafiikka" - IDS_TAB_APPEARANCE "Ulkoasu" + IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" IDS_TAB_AUDIO "ni" IDS_TAB_ABOUT "Tietoja" IDS_WINECFG_TITLE "Winen asetukset" IDS_THEMEFILE "Teema -tiedostot" IDS_THEMEFILE_SELECT "Valitse teeman tiedosto" + IDS_SHELL_FOLDER "Shell Folder" + IDS_LINKS_TO "Links to" END diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 9367176ab2b..e73bd92d875 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -167,17 +167,24 @@ BEGIN CONTROL "Emulation pilote",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END -IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250 +IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Thme:",IDC_STATIC,8,10,244,8 - COMBOBOX IDC_THEME_THEMECOMBO,8,18,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Installer un thme...",IDC_THEME_INSTALL,152,32,100,14 - LTEXT "Couleur:",IDC_THEME_COLORTEXT,8,48,244,8 - COMBOBOX IDC_THEME_COLORCOMBO,8,56,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Taille:",IDC_THEME_SIZETEXT,8,74,244,8 - COMBOBOX IDC_THEME_SIZECOMBO,8,82,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + LTEXT "Thme:",IDC_STATIC,15,16,230,8 + COMBOBOX IDC_THEME_THEMECOMBO,15,24,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Installer un thme...",IDC_THEME_INSTALL,152,38,93,14 + LTEXT "Couleur:",IDC_THEME_COLORTEXT,15,54,230,8 + COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Taille:",IDC_THEME_SIZETEXT,15,80,230,8 + COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | + LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 + CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -186,15 +193,17 @@ BEGIN IDS_TAB_APPLICATIONS "Applications" IDS_TAB_DLLS "Bibliothques" IDS_TAB_DRIVES "Lecteurs" - IDS_CHOOSE_PATH "Veuillez slectionner le rpertoire unix assigner." + IDS_CHOOSE_PATH "Select the unix target directory, please." IDS_HIDE_ADVANCED "Cacher avancs" IDS_SHOW_ADVANCED "Montrer avancs" IDS_NOTHEME "(Pas de thme)" IDS_TAB_GRAPHICS "Affichage" - IDS_TAB_APPEARANCE "Apparence" + IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" IDS_TAB_AUDIO "Audio" IDS_TAB_ABOUT "A propos" IDS_WINECFG_TITLE "Configuration de Wine" IDS_THEMEFILE "Fichiers de thmes" IDS_THEMEFILE_SELECT "Slectionnez un fichier de thme" + IDS_SHELL_FOLDER "Shell Folder" + IDS_LINKS_TO "Links to" END diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index fe656d5d735..11854cb6892 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -168,17 +168,24 @@ BEGIN CONTROL "hCoEG~[V",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END -IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250 +IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 9, "MS UI Gothic" BEGIN - LTEXT "e[}:",IDC_STATIC,8,10,244,8 - COMBOBOX IDC_THEME_THEMECOMBO,8,18,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "e[}̃CXg[...",IDC_THEME_INSTALL,152,32,100,14 - LTEXT "zF:",IDC_THEME_COLORTEXT,8,48,244,8 - COMBOBOX IDC_THEME_COLORCOMBO,8,56,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "TCY:",IDC_THEME_SIZETEXT,8,74,244,8 - COMBOBOX IDC_THEME_SIZECOMBO,8,82,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + LTEXT "e[}:",IDC_STATIC,15,16,230,8 + COMBOBOX IDC_THEME_THEMECOMBO,15,24,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "e[}̃CXg[...",IDC_THEME_INSTALL,152,38,93,14 + LTEXT "zF:",IDC_THEME_COLORTEXT,15,54,230,8 + COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "TCY:",IDC_THEME_SIZETEXT,15,80,230,8 + COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | + LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 + CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -187,15 +194,17 @@ BEGIN IDS_TAB_APPLICATIONS "AvP[V" IDS_TAB_DLLS "Cu" IDS_TAB_DRIVES "hCu" - IDS_CHOOSE_PATH "}bsOUnixfBNg[Ił" + IDS_CHOOSE_PATH "Select the unix target directory, please." IDS_HIDE_ADVANCED "ڍׂB" IDS_SHOW_ADVANCED "ڍׂ\" IDS_NOTHEME "(e[})" IDS_TAB_GRAPHICS "" - IDS_TAB_APPEARANCE "O" + IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" IDS_TAB_AUDIO "I[fBI" IDS_TAB_ABOUT "Wineɂ‚" IDS_WINECFG_TITLE "Wineݒ" IDS_THEMEFILE "e[}t@C" IDS_THEMEFILE_SELECT "e[}t@CIł" + IDS_SHELL_FOLDER "Shell Folder" + IDS_LINKS_TO "Links to" END diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 92ef7340d63..e132825059d 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -173,17 +173,24 @@ BEGIN CONTROL "̹ ֹ",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END -IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250 +IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - LTEXT "׸:",IDC_STATIC,8,10,244,8 - COMBOBOX IDC_THEME_THEMECOMBO,8,18,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "׸ ġ...",IDC_THEME_INSTALL,152,32,100,14 - LTEXT ":",IDC_THEME_COLORTEXT,8,48,244,8 - COMBOBOX IDC_THEME_COLORCOMBO,8,56,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "ũ:",IDC_THEME_SIZETEXT,8,74,244,8 - COMBOBOX IDC_THEME_SIZECOMBO,8,82,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + LTEXT "׸:",IDC_STATIC,15,16,230,8 + COMBOBOX IDC_THEME_THEMECOMBO,15,24,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "׸ ġ...",IDC_THEME_INSTALL,152,38,93,14 + LTEXT ":",IDC_THEME_COLORTEXT,15,54,230,8 + COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "ũ:",IDC_THEME_SIZETEXT,15,80,230,8 + COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | + LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 + CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -192,12 +199,12 @@ BEGIN IDS_TAB_APPLICATIONS "Ǯ׸" IDS_TAB_DLLS "̺귯" IDS_TAB_DRIVES "̺" - IDS_CHOOSE_PATH " н 丮 Ͻÿ." + IDS_CHOOSE_PATH "Select the unix target folder, please." IDS_HIDE_ADVANCED "߰ ɼ " IDS_SHOW_ADVANCED "߰ ɼ ֱ" IDS_NOTHEME "(׸ )" IDS_TAB_GRAPHICS "׷" - IDS_TAB_APPEARANCE "ܾ" + IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" IDS_TAB_AUDIO "" IDS_TAB_ABOUT "" IDS_WINECFG_TITLE "Wine " @@ -215,4 +222,6 @@ BEGIN IDS_DLL_NATIVE_BUILTIN "Ƽ, " IDS_DLL_BUILTIN_NATIVE ", Ƽ" IDS_DLL_DISABLED "Ұ" + IDS_SHELL_FOLDER "Shell Folder" + IDS_LINKS_TO "Links to" END diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in index 7aa11363817..5d03871dd91 100644 --- a/programs/winecfg/Makefile.in +++ b/programs/winecfg/Makefile.in @@ -5,6 +5,7 @@ VPATH = @srcdir@ MODULE = winecfg.exe APPMODE = -mwindows IMPORTS = comdlg32 comctl32 shell32 ole32 winmm shlwapi uxtheme user32 gdi32 advapi32 kernel32 +EXTRALIBS = -luuid C_SRCS = \ appdefaults.c \ diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index 564e175975b..e9356959a75 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -171,17 +171,24 @@ BEGIN CONTROL "Stuurprogramma emulatie",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END -IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250 +IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Thema:",IDC_STATIC,8,10,244,8 - COMBOBOX IDC_THEME_THEMECOMBO,8,18,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Thema installeren...",IDC_THEME_INSTALL,152,32,100,14 - LTEXT "Kleuren:",IDC_THEME_COLORTEXT,8,48,244,8 - COMBOBOX IDC_THEME_COLORCOMBO,8,56,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Tekstgrootte:",IDC_THEME_SIZETEXT,8,74,244,8 - COMBOBOX IDC_THEME_SIZECOMBO,8,82,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + LTEXT "Thema:",IDC_STATIC,15,16,230,8 + COMBOBOX IDC_THEME_THEMECOMBO,15,24,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Thema installeren...",IDC_THEME_INSTALL,152,38,93,14 + LTEXT "Kleuren:",IDC_THEME_COLORTEXT,15,54,230,8 + COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Tekstgrootte:",IDC_THEME_SIZETEXT,15,80,230,8 + COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | + LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 + CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -190,18 +197,20 @@ BEGIN IDS_TAB_APPLICATIONS "Toepassingen" IDS_TAB_DLLS "Bibliotheken" IDS_TAB_DRIVES "Stations" - IDS_CHOOSE_PATH "Selecteer een unix folder voor dit station." + IDS_CHOOSE_PATH "Select the unix target folder, please." IDS_HIDE_ADVANCED "Verberg uitgebreid" IDS_SHOW_ADVANCED "Toon uitgebreid" IDS_NOTHEME "(Geen Thema)" IDS_TAB_GRAPHICS "Graphics" /* FIXME */ - IDS_TAB_APPEARANCE "Vormgeving" + IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" IDS_TAB_AUDIO "Audio" IDS_TAB_ABOUT "Info" IDS_WINECFG_TITLE "Wine configuratie" IDS_THEMEFILE "Thema-bestanden" IDS_THEMEFILE_SELECT "Thema-bestanden kiezen" IDS_AUDIO_MISSING "Op dit moment is er geen audio stuurbestand gespecificeerd in de registry.\n\nEen aanbevolen stuurbestand is voor u geselecteerd.\nU kunt dit stuurbestand gebruiken of (indien beschikbaar) een ander selecteren.\n\nKlik op 'Toepassen' om deze selectie te activeren." + IDS_SHELL_FOLDER "Shell Folder" + IDS_LINKS_TO "Links to" END STRINGTABLE DISCARDABLE diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index 1313c57eb80..feb4b614537 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -168,17 +168,24 @@ BEGIN CONTROL "Driveremulering",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END -IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250 +IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN -LTEXT "Tema:",IDC_STATIC,8,10,244,8 -COMBOBOX IDC_THEME_THEMECOMBO,8,18,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Installer tema . . .",IDC_THEME_INSTALL,152,32,100,14 - LTEXT "Farge:",IDC_THEME_COLORTEXT,8,48,244,8 - COMBOBOX IDC_THEME_COLORCOMBO,8,56,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Strrelse:",IDC_THEME_SIZETEXT,8,74,244,8 - COMBOBOX IDC_THEME_SIZECOMBO,8,82,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + LTEXT "Tema:",IDC_STATIC,15,16,230,8 + COMBOBOX IDC_THEME_THEMECOMBO,15,24,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Installer tema . . .",IDC_THEME_INSTALL,152,38,93,14 + LTEXT "Farge:",IDC_THEME_COLORTEXT,15,54,230,8 + COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Strrelse:",IDC_THEME_SIZETEXT,15,80,230,8 + COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | + LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 + CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -187,19 +194,21 @@ BEGIN IDS_TAB_APPLICATIONS "Programmer" IDS_TAB_DLLS "Biblioteker" IDS_TAB_DRIVES "Stasjoner" - IDS_CHOOSE_PATH "Velg Unix-katalogens som skal kartlegges." + IDS_CHOOSE_PATH "Select the unix target folder, please." IDS_HIDE_ADVANCED "Enkel visning" IDS_SHOW_ADVANCED "Avansert visning" IDS_NOTHEME "(Intet tema)" IDS_TAB_GRAPHICS "Grafikk" - IDS_TAB_APPEARANCE "Utseende" + IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" IDS_TAB_AUDIO "Lyd" IDS_TAB_ABOUT "Om" IDS_WINECFG_TITLE "Oppsett av Wine" IDS_THEMEFILE "Temafiler" IDS_THEMEFILE_SELECT "Velg en temafil" IDS_AUDIO_MISSING "Ingen lyddriver er oppgitt i registeret.\n\nEn anbefalt driver er valgt for deg;\nbruk den eller velg en annen,\n\nog trykk Bruk for at endringene skal tre i kraft." - END + IDS_SHELL_FOLDER "Shell Folder" + IDS_LINKS_TO "Links to" +END STRINGTABLE DISCARDABLE BEGIN diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 6144ab0fafc..125a0111ad4 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -170,17 +170,24 @@ BEGIN CONTROL " ",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END -IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250 +IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - LTEXT ":",IDC_STATIC,15,5,228,8 - COMBOBOX IDC_THEME_THEMECOMBO,15,13,228,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON " ...",IDC_THEME_INSTALL,152,32,90,14 - LTEXT ":",IDC_THEME_COLORTEXT,15,48,228,8 - COMBOBOX IDC_THEME_COLORCOMBO,15,56,228,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT ":",IDC_THEME_SIZETEXT,15,74,228,8 - COMBOBOX IDC_THEME_SIZECOMBO,15,82,228,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + LTEXT ":",IDC_STATIC,15,16,230,8 + COMBOBOX IDC_THEME_THEMECOMBO,15,24,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON " ...",IDC_THEME_INSTALL,152,38,93,14 + LTEXT ":",IDC_THEME_COLORTEXT,15,54,230,8 + COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT ":",IDC_THEME_SIZETEXT,15,80,230,8 + COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | + LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 + CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -189,15 +196,17 @@ BEGIN IDS_TAB_APPLICATIONS "" IDS_TAB_DLLS "" IDS_TAB_DRIVES "" - IDS_CHOOSE_PATH " unix ." + IDS_CHOOSE_PATH "Select the target unix folder, please." IDS_HIDE_ADVANCED " " IDS_SHOW_ADVANCED " " IDS_NOTHEME "( )" IDS_TAB_GRAPHICS "" - IDS_TAB_APPEARANCE " " + IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" IDS_TAB_AUDIO "" IDS_TAB_ABOUT " " IDS_WINECFG_TITLE " Wine" IDS_THEMEFILE " " IDS_THEMEFILE_SELECT " " + IDS_SHELL_FOLDER "Shell Folder" + IDS_LINKS_TO "Links to" END diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc index 56ede393aa5..d83ec943773 100644 --- a/programs/winecfg/Tr.rc +++ b/programs/winecfg/Tr.rc @@ -168,17 +168,24 @@ BEGIN CONTROL "Src Emlasyonu",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END -IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250 +IDD_DESKTOP_INTEGRATION DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Tema:",IDC_STATIC,8,10,244,8 - COMBOBOX IDC_THEME_THEMECOMBO,8,18,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Tema kur...",IDC_THEME_INSTALL,152,32,100,14 - LTEXT "Renk:",IDC_THEME_COLORTEXT,8,48,244,8 - COMBOBOX IDC_THEME_COLORCOMBO,8,56,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Boyut:",IDC_THEME_SIZETEXT,8,74,244,8 - COMBOBOX IDC_THEME_SIZECOMBO,8,82,244,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Appearance ",IDC_STATIC,8,4,244,106 + LTEXT "Tema:",IDC_STATIC,15,16,230,8 + COMBOBOX IDC_THEME_THEMECOMBO,15,24,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Tema kur...",IDC_THEME_INSTALL,152,38,93,14 + LTEXT "Renk:",IDC_THEME_COLORTEXT,15,54,230,8 + COMBOBOX IDC_THEME_COLORCOMBO,15,62,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Boyut:",IDC_THEME_SIZETEXT,15,80,230,8 + COMBOBOX IDC_THEME_SIZECOMBO,15,88,230,14,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + GROUPBOX " Shell Folder ",IDC_STATIC,8,114,244,100 + CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | + LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 + CONTROL "Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 + EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "Browse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED END STRINGTABLE DISCARDABLE @@ -192,11 +199,13 @@ BEGIN IDS_SHOW_ADVANCED "Gelimi Ayarlar" IDS_NOTHEME "(Tema Yok)" IDS_TAB_GRAPHICS "Grafik" - IDS_TAB_APPEARANCE "Grnm" + IDS_TAB_DESKTOP_INTEGRATION "Desktop Integration" IDS_TAB_AUDIO "Ses" IDS_TAB_ABOUT "Hakknda" IDS_WINECFG_TITLE "Wine yaplandrmas" IDS_THEMEFILE "Tema dosyalar" IDS_THEMEFILE_SELECT "Tema dosyas sein" IDS_AUDIO_MISSING "Sistem kaydnda belirlenmi bir ses srcs yok.\n\nnerilen bir src sizin iin seildi.\nBu srcy kullanabilir veya varsa baka bir srcy seebilirsiniz.\n\nSeimin etkili olabilmesi iin Uygula'y tklamalsnz." + IDS_SHELL_FOLDER "Shell Folder" + IDS_LINKS_TO "Links to" END diff --git a/programs/winecfg/driveui.c b/programs/winecfg/driveui.c index 5f407b5512e..ea80889e849 100644 --- a/programs/winecfg/driveui.c +++ b/programs/winecfg/driveui.c @@ -21,6 +21,8 @@ * */ +#include + #define WIN32_LEAN_AND_MEAN #define COBJMACROS @@ -590,7 +592,7 @@ static void paint(HWND dialog) EndPaint(dialog, &ps); } -static void browse_for_folder(HWND dialog) +BOOL browse_for_unix_folder(HWND dialog, char *pszPath) { static WCHAR wszUnixRootDisplayName[] = { ':',':','{','C','C','7','0','2','E','B','2','-','7','D','C','5','-','1','1','D','9','-', @@ -613,13 +615,13 @@ static void browse_for_folder(HWND dialog) LoadString(GetModuleHandle(NULL), IDS_CHOOSE_PATH, pszChoosePath, 256); hr = SHGetDesktopFolder(&pDesktop); - if (!SUCCEEDED(hr)) return; + if (!SUCCEEDED(hr)) return FALSE; hr = IShellFolder_ParseDisplayName(pDesktop, NULL, NULL, wszUnixRootDisplayName, NULL, &pidlUnixRoot, NULL); if (!SUCCEEDED(hr)) { IShellFolder_Release(pDesktop); - return; + return FALSE; } bi.pidlRoot = pidlUnixRoot; @@ -636,17 +638,19 @@ static void browse_for_folder(HWND dialog) IShellFolder_Release(pDesktop); if (!SUCCEEDED(hr)) { SHFree(pidlSelectedPath); - return; + return FALSE; } hr = StrRetToStr(&strSelectedPath, pidlSelectedPath, &pszSelectedPath); SHFree(pidlSelectedPath); - if (!SUCCEEDED(hr)) return; + if (!SUCCEEDED(hr)) return FALSE; - set_text(dialog, IDC_EDIT_PATH, pszSelectedPath); + lstrcpy(pszPath, pszSelectedPath); CoTaskMemFree(pszSelectedPath); + return TRUE; } + return FALSE; } static void init_listview_columns(HWND dialog) @@ -760,8 +764,12 @@ DriveDlgProc (HWND dialog, UINT msg, WPARAM wParam, LPARAM lParam) break; case IDC_BUTTON_BROWSE_PATH: - browse_for_folder(dialog); + { + char szTargetPath[FILENAME_MAX]; + if (browse_for_unix_folder(dialog, szTargetPath)) + set_text(dialog, IDC_EDIT_PATH, szTargetPath); break; + } case IDC_RADIO_ASSIGN: { diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index b77d02b1c9f..14168e6c905 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -146,10 +146,10 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner) psp[pg].dwSize = sizeof (PROPSHEETPAGEW); psp[pg].dwFlags = PSP_USETITLE; psp[pg].hInstance = hInstance; - psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_APPEARANCE); + psp[pg].u.pszTemplate = MAKEINTRESOURCEW (IDD_DESKTOP_INTEGRATION); psp[pg].u2.pszIcon = NULL; psp[pg].pfnDlgProc = ThemeDlgProc; - psp[pg].pszTitle = load_string (IDS_TAB_APPEARANCE); + psp[pg].pszTitle = load_string (IDS_TAB_DESKTOP_INTEGRATION); psp[pg].lParam = 0; pg++; diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h index 4fac41f5884..effe459b339 100644 --- a/programs/winecfg/resource.h +++ b/programs/winecfg/resource.h @@ -33,12 +33,14 @@ #define IDS_HIDE_ADVANCED 7 #define IDS_NOTHEME 8 #define IDS_TAB_GRAPHICS 9 -#define IDS_TAB_APPEARANCE 10 +#define IDS_TAB_DESKTOP_INTEGRATION 10 #define IDS_TAB_AUDIO 11 #define IDS_TAB_ABOUT 12 #define IDS_WINECFG_TITLE 13 #define IDS_THEMEFILE 14 #define IDS_THEMEFILE_SELECT 15 +#define IDS_SHELL_FOLDER 16 +#define IDS_LINKS_TO 17 #define IDD_MAINDLG 101 #define IDB_WINE 104 #define IDD_ABOUTCFG 107 @@ -48,7 +50,7 @@ #define IDD_DLLCFG 111 #define IDD_DRIVECFG 112 #define IDD_DRIVE_EDIT 114 -#define IDD_APPEARANCE 115 +#define IDD_DESKTOP_INTEGRATION 115 #define IDB_WINE_LOGO 200 #define IDC_TABABOUT 1001 #define IDC_APPLYBTN 1002 @@ -149,10 +151,14 @@ #define IDB_DEVICE 1307 #define IDS_AUDIO_MISSING 1308 -/* appearance tab */ +/* desktop integration tab */ #define IDC_THEME_COLORCOMBO 1401 #define IDC_THEME_COLORTEXT 1402 #define IDC_THEME_SIZECOMBO 1403 #define IDC_THEME_SIZETEXT 1404 #define IDC_THEME_THEMECOMBO 1405 #define IDC_THEME_INSTALL 1406 +#define IDC_LIST_SFPATHS 1407 +#define IDC_LINK_SFPATH 1408 +#define IDC_EDIT_SFPATH 1409 +#define IDC_BROWSE_SFPATH 1410 diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 3cb0e399eb5..e3d53b2e709 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1,7 +1,10 @@ /* - * Theme configuration code + * Desktop Integration + * - Theme configuration code + * - User Shell Folder mapping * * Copyright (c) 2005 by Frank Richter + * Copyright (c) 2006 by Michael Jung * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +25,10 @@ #include #include #include +#include +#include + +#define COBJMACROS #include #include @@ -572,11 +579,250 @@ static void on_theme_install(HWND dialog) else WINE_TRACE("user cancelled\n"); } +/* Information about symbolic link targets of certain User Shell Folders. */ +struct ShellFolderInfo { + int nFolder; + char szLinkTarget[FILENAME_MAX]; +}; + +static struct ShellFolderInfo asfiInfo[] = { + { CSIDL_DESKTOP, "" }, + { CSIDL_PERSONAL, "" }, + { CSIDL_MYPICTURES, "" }, + { CSIDL_MYMUSIC, "" }, + { CSIDL_MYVIDEO, "" } +}; + +static struct ShellFolderInfo *psfiSelected = NULL; + +#define NUM_ELEMS(x) (sizeof(x)/sizeof(*(x))) + +static void init_shell_folder_listview_headers(HWND dialog) { + LVCOLUMN listColumn; + RECT viewRect; + char szShellFolder[64] = "Shell Folder"; + char szLinksTo[64] = "Links to"; + int width; + + LoadString(GetModuleHandle(NULL), IDS_SHELL_FOLDER, szShellFolder, sizeof(szShellFolder)); + LoadString(GetModuleHandle(NULL), IDS_LINKS_TO, szLinksTo, sizeof(szLinksTo)); + + GetClientRect(GetDlgItem(dialog, IDC_LIST_SFPATHS), &viewRect); + width = (viewRect.right - viewRect.left) / 4; + + listColumn.mask = LVCF_TEXT | LVCF_WIDTH | LVCF_SUBITEM; + listColumn.pszText = szShellFolder; + listColumn.cchTextMax = lstrlen(listColumn.pszText); + listColumn.cx = width; + + SendDlgItemMessage(dialog, IDC_LIST_SFPATHS, LVM_INSERTCOLUMN, 0, (LPARAM) &listColumn); + + listColumn.pszText = szLinksTo; + listColumn.cchTextMax = lstrlen(listColumn.pszText); + listColumn.cx = viewRect.right - viewRect.left - width - 1; + + SendDlgItemMessage(dialog, IDC_LIST_SFPATHS, LVM_INSERTCOLUMN, 1, (LPARAM) &listColumn); +} + +/* Reads the currently set shell folder symbol link targets into asfiInfo. */ +static void read_shell_folder_link_targets() { + WCHAR wszPath[MAX_PATH]; + HRESULT hr; + int i; + + for (i=0; i= 0) asfiInfo[i].szLinkTarget[cLen] = '\0'; + } + HeapFree(GetProcessHeap(), 0, pszUnixPath); + } + } + } +} + +static void update_shell_folder_listview(HWND dialog) { + int i; + LVITEM item; + LONG lSelected = SendDlgItemMessage(dialog, IDC_LIST_SFPATHS, LVM_GETNEXTITEM, (WPARAM)-1, + MAKELPARAM(LVNI_SELECTED,0)); + + SendDlgItemMessage(dialog, IDC_LIST_SFPATHS, LVM_DELETEALLITEMS, 0, 0); + + for (i=0; i= 0) { + item.mask = LVIF_STATE; + item.state = LVIS_SELECTED; + item.stateMask = LVIS_SELECTED; + SendDlgItemMessage(dialog, IDC_LIST_SFPATHS, LVM_SETITEMSTATE, (WPARAM)lSelected, + (LPARAM)&item); + } +} + +static void on_shell_folder_selection_changed(HWND hDlg, LPNMLISTVIEW lpnm) { + if (lpnm->uNewState & LVIS_SELECTED) { + psfiSelected = (struct ShellFolderInfo *)lpnm->lParam; + EnableWindow(GetDlgItem(hDlg, IDC_LINK_SFPATH), 1); + if (strlen(psfiSelected->szLinkTarget)) { + CheckDlgButton(hDlg, IDC_LINK_SFPATH, BST_CHECKED); + EnableWindow(GetDlgItem(hDlg, IDC_EDIT_SFPATH), 1); + EnableWindow(GetDlgItem(hDlg, IDC_BROWSE_SFPATH), 1); + SetWindowText(GetDlgItem(hDlg, IDC_EDIT_SFPATH), psfiSelected->szLinkTarget); + } else { + CheckDlgButton(hDlg, IDC_LINK_SFPATH, BST_UNCHECKED); + EnableWindow(GetDlgItem(hDlg, IDC_EDIT_SFPATH), 0); + EnableWindow(GetDlgItem(hDlg, IDC_BROWSE_SFPATH), 0); + SetWindowText(GetDlgItem(hDlg, IDC_EDIT_SFPATH), ""); + } + } else { + psfiSelected = NULL; + CheckDlgButton(hDlg, IDC_LINK_SFPATH, BST_UNCHECKED); + SetWindowText(GetDlgItem(hDlg, IDC_EDIT_SFPATH), ""); + EnableWindow(GetDlgItem(hDlg, IDC_LINK_SFPATH), 0); + EnableWindow(GetDlgItem(hDlg, IDC_EDIT_SFPATH), 0); + EnableWindow(GetDlgItem(hDlg, IDC_BROWSE_SFPATH), 0); + } +} + +/* Keep the contents of the edit control, the listview control and the symlink + * information in sync. */ +static void on_shell_folder_edit_changed(HWND hDlg) { + LVITEM item; + char *text = get_text(hDlg, IDC_EDIT_SFPATH); + LONG iSel = SendDlgItemMessage(hDlg, IDC_LIST_SFPATHS, LVM_GETNEXTITEM, -1, + MAKELPARAM(LVNI_SELECTED,0)); + + if (!text || !psfiSelected || iSel < 0) { + HeapFree(GetProcessHeap(), 0, text); + return; + } + + strncpy(psfiSelected->szLinkTarget, text, FILENAME_MAX); + HeapFree(GetProcessHeap(), 0, text); + + item.mask = LVIF_TEXT; + item.iItem = iSel; + item.iSubItem = 1; + item.pszText = psfiSelected->szLinkTarget; + SendDlgItemMessage(hDlg, IDC_LIST_SFPATHS, LVM_SETITEM, 0, (LPARAM)&item); + + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); +} + +static void apply_shell_folder_changes() { + WCHAR wszPath[MAX_PATH]; + char szBackupPath[FILENAME_MAX], szUnixPath[FILENAME_MAX], *pszUnixPath = NULL; + int i, cUnixPathLen; + struct stat statPath; + HRESULT hr; + + for (i=0; iszLinkTarget)) { + update_shell_folder_listview(hDlg); + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + } + break; + + case IDC_LINK_SFPATH: + if (IsDlgButtonChecked(hDlg, IDC_LINK_SFPATH)) { + if (browse_for_unix_folder(hDlg, psfiSelected->szLinkTarget)) { + update_shell_folder_listview(hDlg); + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + } else { + CheckDlgButton(hDlg, IDC_LINK_SFPATH, BST_UNCHECKED); + } + } else { + psfiSelected->szLinkTarget[0] = '\0'; + update_shell_folder_listview(hDlg); + SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); + } + break; + } break; } break; - case WM_NOTIFY: switch (((LPNMHDR)lParam)->code) { case PSN_KILLACTIVE: { @@ -626,9 +893,17 @@ ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) case PSN_APPLY: { apply(); apply_theme(hDlg); + apply_shell_folder_changes(); + read_shell_folder_link_targets(); + update_shell_folder_listview(hDlg); SetWindowLongPtr(hDlg, DWLP_MSGRESULT, PSNRET_NOERROR); break; } + case LVN_ITEMCHANGED: { + if (wParam == IDC_LIST_SFPATHS) + on_shell_folder_selection_changed(hDlg, (LPNMLISTVIEW)lParam); + break; + } case PSN_SETACTIVE: { init_dialog (hDlg); break; diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h index 0e78d2fa242..4966dcb08bb 100644 --- a/programs/winecfg/winecfg.h +++ b/programs/winecfg/winecfg.h @@ -101,6 +101,7 @@ long drive_available_mask(char letter); BOOL add_drive(const char letter, const char *targetpath, const char *label, const char *serial, unsigned int type); void delete_drive(struct drive *pDrive); void apply_drive_changes(void); +BOOL browse_for_unix_folder(HWND dialog, char *pszPath); extern struct drive drives[26]; /* one for each drive letter */ BOOL gui_mode;