diff --git a/rosapps/winefile/Makefile.in b/rosapps/winefile/Makefile.in new file mode 100644 index 00000000000..799ae8efe2c --- /dev/null +++ b/rosapps/winefile/Makefile.in @@ -0,0 +1,19 @@ +EXTRADEFS = -D__WINE__ -DUNICODE +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = winefile.exe +APPMODE = -mwindows +IMPORTS = shell32 comdlg32 comctl32 ole32 mpr version user32 gdi32 advapi32 kernel32 +EXTRALIBS = -luuid + +C_SRCS = \ + splitpath.c \ + winefile.c + +RC_SRCS = rsrc.rc + +@MAKE_PROG_RULES@ + +@DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/rosapps/winefile/lang/cs-CZ.rc b/rosapps/winefile/lang/cs-CZ.rc index 0996ad2b924..11aee5776d0 100644 --- a/rosapps/winefile/lang/cs-CZ.rc +++ b/rosapps/winefile/lang/cs-CZ.rc @@ -1,4 +1,5 @@ -/* +/* Hey, Emacs, open this file with -*- coding: cp1250 -*- + * * WineFile * Czech Language Support * @@ -19,12 +20,12 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT -#pragma code_page(1250) +/* Czech strings in CP1250 */ /* Menu */ diff --git a/rosapps/winefile/lang/de-DE.rc b/rosapps/winefile/lang/de-DE.rc index 21ac426ed13..550f2386b2e 100644 --- a/rosapps/winefile/lang/de-DE.rc +++ b/rosapps/winefile/lang/de-DE.rc @@ -18,12 +18,10 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -#pragma code_page(1252) - /* Menu */ @@ -133,7 +131,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Aktualisieren\tF5", ID_REFRESH } - POPUP "&?" { + POPUP "&Hilfe" { MENUITEM "&Hilfethemen\tF1", ID_HELP MENUITEM "&Suchen...\tF1", ID_HELP MENUITEM "Hilfe &verwenden\tF1", ID_HELP_USING @@ -176,7 +174,7 @@ FONT 8, "MS Shell Dlg" IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Angaben auswählen" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Sans Serif" BEGIN LTEXT "&Name:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL @@ -198,7 +196,7 @@ END IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Eigenschaften für %s" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,191,7,50,14 PUSHBUTTON "Abbrechen",IDCANCEL,191,29,50,14 @@ -260,3 +258,30 @@ STRINGTABLE IDS_FREE_SPACE_FMT "%s von %s frei" } + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "LIZENZ" +IDS_LICENSE, +"Diese Bibliothek ist freie Software; Sie dürfen sie unter den \ +Bedingungen der GNU Lesser General Public License, wie von der \ +Free Software Foundation veröffentlicht, weiterverteilen und/oder \ +modifizieren; entweder gemäß Version 2.1 der Lizenz oder (nach \ +Ihrer Option) jeder späteren Version.\n\ +Diese Bibliothek wird in der Hoffnung weiterverbreitet, daß sie \ +nützlich sein wird, jedoch OHNE IRGENDEINE GARANTIE, auch ohne \ +die implizierte Garantie der MARKTREIFE oder der VERWENDBARKEIT \ +FÜR EINEN BESTIMMTEN ZWECK. Mehr Details finden Sie in der \ +GNU Lesser General Public License.\n\ +Sie sollten eine Kopie der GNU Lesser General Public License zusammen \ +mit dieser Bibliothek erhalten haben; falls nicht, schreiben Sie an \ +die Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, \ +Boston, MA 02110, USA." + +IDS_WARRANTY_CAPTION, "KEINE GARANTIE" +IDS_WARRANTY, +"Diese Bibliothek wird in der Hoffnung weiterverbreitet, daß sie nützlich \ +sein wird, jedoch OHNE IRGENDEINE GARANTIE, auch ohne die implizierte Garantie \ +der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Mehr Details \ +finden Sie in der GNU Lesser General Public License." +} diff --git a/rosapps/winefile/lang/en-US.rc b/rosapps/winefile/lang/en-US.rc index fc93b8dd7a3..37a2e07c0e1 100644 --- a/rosapps/winefile/lang/en-US.rc +++ b/rosapps/winefile/lang/en-US.rc @@ -18,12 +18,10 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(850) - /* Menu */ @@ -115,7 +113,7 @@ IDM_WINEFILE MENU FIXED IMPURE #endif MENUITEM SEPARATOR MENUITEM "&Minimize on run", 504 - MENUITEM "&Save settings on exit", 511 + MENUITEM "&Save settings on exit", ID_VIEW_SAVESETTINGS } @@ -137,7 +135,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Refresh\tF5", ID_REFRESH } - POPUP "&?" { + POPUP "&Help" { MENUITEM "&Help Topics\tF1", ID_HELP MENUITEM "Help &Search...\tF1", ID_HELP MENUITEM "&Using Help\tF1", ID_HELP_USING @@ -180,7 +178,7 @@ FONT 8, "MS Shell Dlg" IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "By File Type" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Sans Serif" BEGIN LTEXT "&Name:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL @@ -202,7 +200,7 @@ END IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Properties for %s" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,191,7,50,14 PUSHBUTTON "Cancel",IDCANCEL,191,29,50,14 @@ -279,7 +277,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ Lesser General Public License for more details.\n\ You should have received a copy of the GNU Lesser General Public \ License along with this library; if not, write to the Free Software \ -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA" +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" IDS_WARRANTY_CAPTION, "NO WARRANTY" IDS_WARRANTY, diff --git a/rosapps/winefile/lang/es-ES.rc b/rosapps/winefile/lang/es-ES.rc index 1f59f49db4b..4ad3e953948 100644 --- a/rosapps/winefile/lang/es-ES.rc +++ b/rosapps/winefile/lang/es-ES.rc @@ -2,7 +2,7 @@ * WineFile * Spanish Language Support * - * Copyright 2004 José Manuel Ferrer Ortiz + * Copyright 2004, 2007 José Manuel Ferrer Ortiz * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL @@ -111,7 +111,7 @@ IDM_WINEFILE MENU FIXED IMPURE #endif MENUITEM SEPARATOR MENUITEM "&Minimizar al ejecutarse", 504 - MENUITEM "&Guardar opciones al salir", 511 + MENUITEM "&Guardar opciones al salir", ID_VIEW_SAVESETTINGS } @@ -172,58 +172,60 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Cancelar", 2, 158, 23, 47, 14 PUSHBUTTON "&Examinar", 254, 158, 43, 47, 14 } + IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "By File Type" -FONT 8, "MS Shell Dlg" +CAPTION "Por tipo de archivo" +FONT 8, "MS Sans Serif" BEGIN LTEXT "&Nombre:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL - GROUPBOX "Typo de Fichero",-1,7,23,87,56 + GROUPBOX "Tipo de archivo",-1,7,23,87,56 CONTROL "&Directorios",IDC_VIEW_TYPE_DIRECTORIES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 CONTROL "&Programas",IDC_VIEW_TYPE_PROGRAMS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 CONTROL "Docu&mentos",IDC_VIEW_TYPE_DOCUMENTS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 - CONTROL "&Otros Ficheros",IDC_VIEW_TYPE_OTHERS,"Button", + CONTROL "&Otros archivos",IDC_VIEW_TYPE_OTHERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 - CONTROL "Mostrar ficheros Escondidos/Systema (Hidden/&System) ",IDC_VIEW_TYPE_HIDDEN, - "Buton",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + CONTROL "Mostrar archivos de &sistema/ocultos",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,130,9 DEFPUSHBUTTON "Aceptar",IDOK,104,7,50,14 PUSHBUTTON "Cancelar",IDCANCEL,104,24,50,14 END IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Properties for %s" -FONT 8, "MS Shell Dlg" +CAPTION "Propiedades de %s" +FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "Aceptar",IDOK,191,7,50,14 PUSHBUTTON "Cancelar",IDCANCEL,191,29,50,14 - LTEXT "&File Name:",-1,7,7,59,9 + LTEXT "Nombre:",-1,7,7,59,9 EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Full &Path:",-1,7,18,59,9 + LTEXT "&Ruta completa:",-1,7,18,59,9 EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "último Cambio:",-1,7,29,59,9 + LTEXT "Último cambio:",-1,7,29,59,9 EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Verción:",-1,7,40,59,9 + LTEXT "Versión:",-1,7,40,59,9 EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "Cop&yright:",-1,7,51,59,9 EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "tamaño:",-1,7,62,59,9 + LTEXT "Tamaño:",-1,7,62,59,9 EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP GROUPBOX "Atributos",-1,7,79,158,46 - CONTROL "&Lectura Solamente",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 - CONTROL "&Escondido",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 - CONTROL "&Archivado",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "Sólo &lectura",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "&Oculto",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "A&rchivar",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 CONTROL "&Sistema",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 CONTROL "&Comprimido",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 - GROUPBOX "Información de &Verción",-1,7,129,234,79 + GROUPBOX "Información de &versión",-1,7,129,234,79 LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL END + STRINGTABLE { IDS_FONT_SEL_DLG_NAME "Aplicando configuración de fuente" @@ -234,7 +236,7 @@ STRINGTABLE { IDS_WINEFILE "Winefile" IDS_ERROR "Error" - IDS_ROOT_FS "sf raíz" + IDS_ROOT_FS "SF raíz" IDS_UNIXFS "unixfs" IDS_DESKTOP "Escritorio" IDS_SHELL "Shell" @@ -255,4 +257,30 @@ STRINGTABLE IDS_COL_LINKS "Enlaces" IDS_COL_ATTR "Atributos" IDS_COL_SEC "Seguridad" + + IDS_FREE_SPACE_FMT "%s de %s libre" +} + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "LICENCIA" +IDS_LICENSE, +"This library is free software; you can redistribute it and/or \ +modify it under the terms of the GNU Lesser General Public \ +License as published by the Free Software Foundation; either \ +version 2.1 of the License, or (at your option) any later version.\n\ +This library is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details.\n\ +You should have received a copy of the GNU Lesser General Public \ +License along with this library; if not, write to the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" + +IDS_WARRANTY_CAPTION, "SIN GARANTÍA" +IDS_WARRANTY, +"This library is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details." } diff --git a/rosapps/winefile/lang/fr-FR.rc b/rosapps/winefile/lang/fr-FR.rc index f4b65dd0b9a..b990781c8c8 100644 --- a/rosapps/winefile/lang/fr-FR.rc +++ b/rosapps/winefile/lang/fr-FR.rc @@ -6,7 +6,7 @@ * Copyright 2002 Steven Edwards * Copyright 2002 Alexandre Julliard * Copyright 2003 Sylvain Petreolle - * Copyright 2005 Jonathan Ernst + * Copyright 2005-2006 Jonathan Ernst * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,7 +20,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -137,14 +137,14 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Actualiser\tF5", ID_REFRESH } - POPUP "&Aide" { + POPUP "Aid&e" { MENUITEM "&Sommaire de l'aide\tF1", ID_HELP MENUITEM "&Rechercher dans l'aide\tF1", ID_HELP MENUITEM "&Utiliser l'aide\tF1", ID_HELP_USING MENUITEM SEPARATOR - MENUITEM "&A propos de Winefile...", ID_ABOUT + MENUITEM "À &propos de Winefile", ID_ABOUT #ifdef __WINE__ - MENUITEM "A propos de &Wine...", ID_ABOUT_WINE + MENUITEM "À propos de &Wine", ID_ABOUT_WINE #endif } } @@ -161,7 +161,7 @@ FONT 8, "MS Shell Dlg" CONTROL "Sous forme d'icône", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 PUSHBUTTON "Annuler", 2, 158, 23, 47, 14 - PUSHBUTTON "&Aide", 254, 158, 43, 47, 14 + PUSHBUTTON "Aid&e", 254, 158, 43, 47, 14 } IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 @@ -170,17 +170,17 @@ CAPTION "S FONT 8, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Dossier:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + CONTROL "&Dossier :", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 PUSHBUTTON "Annuler", 2, 158, 23, 47, 14 - PUSHBUTTON "Pa&rcourir...", 254, 158, 43, 47, 14 + PUSHBUTTON "&Parcourir...", 254, 158, 43, 47, 14 } IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Par type de fichier" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Sans Serif" BEGIN LTEXT "&Name:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL @@ -202,21 +202,21 @@ END IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Propriétés de %s" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,191,7,50,14 PUSHBUTTON "Annuler",IDCANCEL,191,29,50,14 - LTEXT "Nom du &fichier:",-1,7,7,59,9 + LTEXT "Nom du &fichier :",-1,7,7,59,9 EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Chemin com&plet:",-1,7,18,59,9 + LTEXT "Chemin com&plet :",-1,7,18,59,9 EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Modification:",-1,7,29,59,9 + LTEXT "Modification :",-1,7,29,59,9 EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Version:",-1,7,40,59,9 + LTEXT "Version :",-1,7,40,59,9 EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "Cop&yright:",-1,7,51,59,9 EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Taille:",-1,7,62,59,9 + LTEXT "Taille :",-1,7,62,59,9 EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP GROUPBOX "Attributs",-1,7,79,158,46 CONTROL "Lectu&re seule",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 @@ -242,7 +242,7 @@ STRINGTABLE IDS_ERROR "Erreur" IDS_ROOT_FS "root fs" IDS_UNIXFS "unixfs" - IDS_DESKTOP "Desktop" + IDS_DESKTOP "Bureau" IDS_SHELL "Shell" IDS_TITLEFMT "%s - %s" IDS_NO_IMPL "Pas encore implémenté" @@ -264,3 +264,30 @@ STRINGTABLE IDS_FREE_SPACE_FMT "%s sur %s libre" } + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "LICENCE" +IDS_LICENSE, +"Cette bibliothèque est libre, vous pouvez la redistribuer et/ou \ +la modifier selon les termes de la Licence Publique Générale GNU \ +Limitée publiée par la Free Software Foundation (version 2.1 ou \ +bien toute autre version ultérieure choisie par vous).\n\ +Cette bibliothèque est distribuée car potentiellement utile, \ +mais SANS AUCUNE GARANTIE, ni explicite ni implicite, y compris \ +les garanties de commercialisation ou d'adaptation dans un but \ +spécifique. Reportez-vous à la Licence Publique Générale GNU \ +Limitée pour plus de détails.\n\ +Vous devez avoir reçu une copie de la Licence Publique Générale \ +GNU Limitée en même temps que cette bibliothèque ; si ce n'est pas \ +le cas, écrivez à la Free Software Foundation, Inc., 51 Franklin St, \ +Fifth Floor, Boston, MA 02111-1301, États-Unis." + +IDS_WARRANTY_CAPTION, "AUCUNE GARANTIE" +IDS_WARRANTY, +"Cette bibliothèque est distribuée car potentiellement utile, \ +mais SANS AUCUNE GARANTIE, ni explicite ni implicite, y compris \ +les garanties de commercialisation ou d'adaptation dans un but \ +spécifique. Reportez-vous à la Licence Publique Générale GNU \ +Limitée pour plus de détails." +} diff --git a/rosapps/winefile/lang/hu-HU.rc b/rosapps/winefile/lang/hu-HU.rc index 5221f947197..6cd8cdf8d2a 100644 --- a/rosapps/winefile/lang/hu-HU.rc +++ b/rosapps/winefile/lang/hu-HU.rc @@ -19,10 +19,11 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT + /* Menu */ IDM_WINEFILE MENU FIXED IMPURE diff --git a/rosapps/winefile/lang/it-IT.rc b/rosapps/winefile/lang/it-IT.rc index c7ecc1997b5..9d98051ce6e 100644 --- a/rosapps/winefile/lang/it-IT.rc +++ b/rosapps/winefile/lang/it-IT.rc @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL diff --git a/rosapps/winefile/lang/ko-KO.rc b/rosapps/winefile/lang/ko-KO.rc new file mode 100644 index 00000000000..6c431173d3c --- /dev/null +++ b/rosapps/winefile/lang/ko-KO.rc @@ -0,0 +1,290 @@ +/* + * WineFile + * Korean Language Support + * + * Copyright 2000 Martin Fuchs + * Copyright 2002 Steven Edwards + * Copyright 2002 Alexandre Julliard + * Copyright 2005,2007 YunSong Hwang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL + +/* Menu */ + +IDM_WINEFILE MENU FIXED IMPURE +{ + POPUP "ÆÄÀÏ(&F)" { + MENUITEM "¿­±â(&O)\tEnter", ID_ACTIVATE + MENUITEM "À̵¿(&M)...\tF7", ID_FILE_MOVE + MENUITEM "º¹»ç(&C)...\tF8", ID_FILE_COPY + MENUITEM "Ŭ¸³º¸µå·Î(&I)...\tF9", 118 + MENUITEM "Áö¿ì±â(&D)\tDel", ID_FILE_DELETE + MENUITEM "À̸§¹Ù²Ù±â(&N)...", 109 + MENUITEM "¼Ó¼º(&I)...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "¾ÐÃà(&O)...", 119 + MENUITEM "¾ÐÃà Ç®±â(&O)...", 120 + MENUITEM SEPARATOR + MENUITEM "½ÇÇà(&R)...", ID_EXECUTE + MENUITEM "Àμâ(&P)...", 102 + MENUITEM "¿¬°á...", 103 + MENUITEM SEPARATOR + MENUITEM "µð·ºÅ丮 ¸¸µé±â(&E)...", 111 + MENUITEM "ã±â(&H)...", 104 + MENUITEM "ÆÄÀÏ ¼±ÅÃ(&S)...", 116 + MENUITEM SEPARATOR +#ifndef _NO_EXTENSIONS + MENUITEM "³ª°¡±â(Ex)\tAlt+X", ID_FILE_EXIT +#else + MENUITEM "³ª°¡±â(&x)", ID_FILE_EXIT +#endif + } + + POPUP "µð½ºÅ©(&D)" { + MENUITEM "µð½ºÅ© º¹»ç(&C)...", 201 + MENUITEM "µð½ºÅ© ¶óº§(&L)...", 202 + MENUITEM SEPARATOR + MENUITEM "µð½ºÅ© Æ÷¸Ë(&F)...", ID_FORMAT_DISK +#ifdef _WIN95 + MENUITEM "½Ã½ºÅÛ µð½ºÅ© ¸¸µé±â(&M)...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "³×Æ®¿öÅ© µå¶óÀÌºê ¿¬°á(&N)", ID_CONNECT_NETWORK_DRIVE + MENUITEM "³×Æ®¿öÅ© µå¶óÀÌºê ¿¬°á ²÷±â(&D)", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "°øÀ¯...", 254 + MENUITEM "°øÀ¯ Á¦°Å(&R)...", 255 + MENUITEM SEPARATOR + MENUITEM "µå¶óÀÌºê ¼±ÅÃ(&S)...", 251 + } + + POPUP "µð·ºÅ丮(&R)" { + MENUITEM "´ÙÀ½ ´Ü°è(&N)\t+", 301 + MENUITEM "Æ®¸® È®Àå(&T)\t*", 302 + MENUITEM "¸ðµÎ È®Àå(&A)\tStrg+*", 303 + MENUITEM "Æ®¸® Á¤¸®(&T)\t-", 304 + MENUITEM SEPARATOR + MENUITEM "ÇÏÀ§ üũ(&M)", 505 + } + + POPUP "º¸±â(&V)" { + MENUITEM "Æ®¸® ÇÏ°í ±â·ºÅ丮(&r)", 413 + MENUITEM "¿ÀÁ÷ Æ®¸®¸¸(&e)", 411 + MENUITEM "¿ÀÁ÷ µð·ºÅ丮¸¸(&O)", 412 + MENUITEM SEPARATOR + MENUITEM "³ª´©±â(&l)", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "À̸§(&N)", ID_VIEW_NAME + MENUITEM "¸ðµç ÆÄÀÏ ¼³¸í(&A)", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "ºÎºÐ ¼³¸í(&P)...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "À̸§À¸·Î Á¤·Ä(&S)", ID_VIEW_SORT_NAME + MENUITEM "ŸÀÔÀ¸·Î Á¤·Ä(&b)", ID_VIEW_SORT_TYPE + MENUITEM "Å©±â·Î Á¤·Ä(&z)", ID_VIEW_SORT_SIZE + MENUITEM "³¯Â¥·Î Á¤·Ä(&D)", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "&...·Î ¿©°ú", ID_VIEW_FILTER + } + + POPUP "¿É¼Ç(&O)" { + MENUITEM "È®ÀÎ(&C)...", 501 + MENUITEM "±Û²Ã(&F)...", ID_SELECT_FONT + MENUITEM "µµ±¸¹Ù »ç¿ëÀÚ Á¤ÀÇ(&b)...", 512 + MENUITEM SEPARATOR + MENUITEM "µµ±¸¹Ù(&T)", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "µå¶óÀÌºê ¹Ù(&D)", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "»óŹÙ(&S)", ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "Àüü È­¸é(&u)\tCtrl+Shift+S", ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "½ÇÇà½Ã ÃÖ¼ÒÈ­(&M)", 504 + MENUITEM "³ª°¥¶§ ¼³Á¤ ÀúÀå(&S)", 511 + } + + + POPUP "º¸¾È(&S)" { + MENUITEM "Á¢±Ù(&A)...", 605 + MENUITEM "·Î±ë(&L)...", 606 + MENUITEM "¼ÒÀ¯ÀÚ(&O)...", 607 + } + + POPUP "â(&W)" { + MENUITEM "»õ â(&W)", ID_WINDOW_NEW + MENUITEM "Á¤·Ä\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "°¡·Î ¹ÙµÏÆÇ½Ä Á¤·Ä(&H)", ID_WINDOW_TILE_HORZ + MENUITEM "¼¼·Î ¹ÙµÏÆÇ½Ä Á¤·Ä(&V)\tCtrl+F4", ID_WINDOW_TILE_VERT +#ifndef _NO_EXTENSIONS + MENUITEM "ÀÚµ¿ Á¤·Ä", ID_WINDOW_AUTOSORT +#endif + MENUITEM "½É¹ú·Î Á¤·Ä(&S)", ID_WINDOW_ARRANGE + MENUITEM "»õ·Î Àбâ(&R)\tF5", ID_REFRESH + } + + POPUP "µµ¿ò¸»(&H)" { + MENUITEM "µµ¿ò¸» ¸ñÂ÷(&H)\tF1", ID_HELP + MENUITEM "µµ¿ò¸» ã±â(&S)...\tF1", ID_HELP + MENUITEM "µµ¿ò¸» »ç¿ë¹ý(&U)\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "Winefile °ü·Ã Á¤º¸(&I)...", ID_ABOUT +#ifdef __WINE__ + MENUITEM "&Wine °ü·Ã Á¤º¸...", ID_ABOUT_WINE +#endif + } +} + + +IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "½ÇÇà" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "¸í·É(&C):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + CONTROL "½É¹ú·Î(&S)", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "È®ÀÎ", 1, 158, 6, 47, 14 + PUSHBUTTON "Ãë¼Ò", 2, 158, 23, 47, 14 + PUSHBUTTON "µµ¿ò¸»(&H)", 254, 158, 43, 47, 14 +} + +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "¸ñÀûÁö ¼±ÅÃ" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "°æ·Î(&P):", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "È®ÀÎ", 1, 158, 6, 47, 14 + PUSHBUTTON "Ãë¼Ò", 2, 158, 23, 47, 14 + PUSHBUTTON "ã±â(&B)", 254, 158, 43, 47, 14 +} + +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ÆÄÀÏ Å¸ÀÔÀ¸·Î" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "À̸§(&N):",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "ÆÄÀÏ Å¸ÀÔ",-1,7,23,87,56 + CONTROL "µð·ºÅ丮(&D)",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "Ç®±×¸²(&P)",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "¹®¼­ÆÄÀÏ(&M)",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "´Ù¸¥ ÆÄÀÏ(&O)",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "¼û±è/½Ã½ºÅÛ ÆÄÀÏ º¸¿©ÁÖ±â(&S)",IDC_VIEW_TYPE_HIDDEN, + "¹öÆ°",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 + DEFPUSHBUTTON "È®ÀÎ",IDOK,104,7,50,14 + PUSHBUTTON "Ãë¼Ò",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "%s ¼Ó¼º" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "È®ÀÎ",IDOK,191,7,50,14 + PUSHBUTTON "Ãë¼Ò",IDCANCEL,191,29,50,14 + LTEXT "ÆÄÀÏ À̸§(&F):",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "¿ÏÀüÇÑ °æ·Î(&P):",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "¸¶Áö¸· º¯È­:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "¹öÁ¯:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "ÀúÀÛ±Ç(&Y):",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Å©±â:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "¼Ó¼º",-1,7,79,158,46 + CONTROL "Àбâ Àü¿ë(&R)",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "¼û±è(&I)",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "¾ÆÄ«À̺ê(&A)",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "½Ã½ºÅÛ(&S)",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "¾ÐÃà(&C)",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "¹öÁ¯ Á¤º¸(&V)",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "±Û²Ã ¼³Á¤ Àû¿ë" + IDS_FONT_SEL_ERROR "»õ ±Û²Ã ¼±Åà ¿¡·¯." +} + +STRINGTABLE +{ + IDS_WINEFILE "Winefile" + IDS_ERROR "¿¡·¯" + IDS_ROOT_FS "·çÆ® ÆÄÀϽýºÅÛ" + IDS_UNIXFS "À¯´Ð½º ÆÄÀϽýºÅÛ" + IDS_DESKTOP "µ¥½ºÅ©Å¾" + IDS_SHELL "¼¿" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "¹Ì±¸Çö" + IDS_WINE "WINE" + IDS_WINE_FILE "Wine ÆÄÀÏ" +} + +STRINGTABLE +{ + IDS_COL_NAME "À̸§" + IDS_COL_SIZE "Å©±â" + IDS_COL_CDATE "½Ã(CDate)" + IDS_COL_ADATE "ÃÊ(ADate)" + IDS_COL_MDATE "ºÐ(MDate)" + IDS_COL_IDX "À妽º/¾ÆÀ̳ëµå" + IDS_COL_LINKS "¸µÅ©" + IDS_COL_ATTR "¼Ó¼º" + IDS_COL_SEC "º¸¾È" + + IDS_FREE_SPACE_FMT "%s of %s »ç¿ë°¡´É" +} + + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "¶óÀ̼¾" +IDS_LICENSE, +"This library is free software; you can redistribute it and/or \ +modify it under the terms of the GNU Lesser General Public \ +License as published by the Free Software Foundation; either \ +version 2.1 of the License, or (at your option) any later version.\n\ +This library is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details.\n\ +You should have received a copy of the GNU Lesser General Public \ +License along with this library; if not, write to the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" + +IDS_WARRANTY_CAPTION, "º¸Áõ ¾øÀ½" +IDS_WARRANTY, +"This library is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details." +} diff --git a/rosapps/winefile/lang/nb-NO.rc b/rosapps/winefile/lang/nb-NO.rc index 682909e6013..16043c8429e 100644 --- a/rosapps/winefile/lang/nb-NO.rc +++ b/rosapps/winefile/lang/nb-NO.rc @@ -1,10 +1,8 @@ /* * WineFile - * English Language Support + * Norwegian Bokmål Language Support * - * Copyright 2000 Martin Fuchs - * Copyright 2002 Steven Edwards - * Copyright 2002 Alexandre Julliard + * Copyright 2005-2006 Alexander N. Sørnes * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,12 +16,10 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL -#pragma code_page(850) - +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL /* Menu */ @@ -31,120 +27,120 @@ IDM_WINEFILE MENU FIXED IMPURE { POPUP "&Fil" { MENUITEM "&Åpne\tEnter", ID_ACTIVATE - MENUITEM "&Flytt...\tF7", ID_FILE_MOVE - MENUITEM "&Kopiere...\tF8", ID_FILE_COPY - MENUITEM "&I utklippstavle...\tF9", 118 + MENUITEM "&Flytt . . .\tF7", ID_FILE_MOVE + MENUITEM "&Kopier . . .\tF8", ID_FILE_COPY + MENUITEM "&I utklippstavlen . . .\tF9", 118 MENUITEM "&Slett\tDel", ID_FILE_DELETE - MENUITEM "Endre &navn...", 109 - MENUITEM "E&genskaper...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM "Gi &nytt navn . . .", 109 + MENUITEM "&Egenskaper . . .\tAlt+Enter", ID_EDIT_PROPERTIES MENUITEM SEPARATOR - MENUITEM "k&omprimere...", 119 - MENUITEM "&dekomprimere ...", 120 + MENUITEM "K&omprimer . . .", 119 + MENUITEM "De&komprimer . . .", 120 MENUITEM SEPARATOR - MENUITEM "&Kjør...", ID_EXECUTE - MENUITEM "&Skriv ut...", 102 - MENUITEM "Tilknyttet...", 103 + MENUITEM "Kjø&r . . .", ID_EXECUTE + MENUITEM "Skriv &ut . . .", 102 + MENUITEM "Tilknytt . . .", 103 MENUITEM SEPARATOR - MENUITEM "Opp&rett mappe...", 111 - MENUITEM "S&øk...", 104 - MENUITEM "&Velg Filer...", 116 + MENUITEM "Oppr&et katalog . . .", 111 + MENUITEM "S&øk . . .", 104 + MENUITEM "&Velg filer . . .", 116 MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS - MENUITEM "A&vslutt\tAlt+X", ID_FILE_EXIT + MENUITEM "&Avslutt\tAlt+X", ID_FILE_EXIT #else - MENUITEM "A&vslutt", ID_FILE_EXIT + MENUITEM "&Avslutt", ID_FILE_EXIT #endif } - POPUP "&Disk" { - MENUITEM "&Kopiere disk...", 201 - MENUITEM "&Merke disk...", 202 + POPUP "&Stasjon" { + MENUITEM "&Kopier stasjon . . .", 201 + MENUITEM "Gi vol&umnavn . . .", 202 MENUITEM SEPARATOR - MENUITEM "&Formatere Disk...", ID_FORMAT_DISK + MENUITEM "&Formater stasjon . . .", ID_FORMAT_DISK #ifdef _WIN95 - MENUITEM "&Lag system Disk...", -1 /*TODO*/ + MENUITEM "Opprett syste&mdisk . . .", -1 /*TODO*/ #endif MENUITEM SEPARATOR - MENUITEM "Koble &til nettverk stasjon", ID_CONNECT_NETWORK_DRIVE - MENUITEM "Koble &fra nettverks stasjon", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM "Koble til &nettverksstasjon", ID_CONNECT_NETWORK_DRIVE + MENUITEM "Koble &fra nettverksstasjon", ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR - MENUITEM "Del som...", 254 - MENUITEM "&Fjern deling...", 255 + MENUITEM "Del som . . .", 254 + MENUITEM "Fje&rn delt ressurs . . .", 255 MENUITEM SEPARATOR - MENUITEM "&Velg stasjon...", 251 + MENUITEM "Velg &stasjon . . .", 251 } - POPUP "&Mappe" { + POPUP "Kataloge&r" { MENUITEM "&Neste nivå\t+", 301 - MENUITEM "Utvide &Tre\t*", 302 - MENUITEM "Utvide &alt\tStrg+*", 303 - MENUITEM "Kollaps &Tre\t-", 304 + MENUITEM "Utvid t&re\t*", 302 + MENUITEM "Utvid &alle\tStrg+*", 303 + MENUITEM "Slå sammen &tre\t-", 304 MENUITEM SEPARATOR - MENUITEM "&Merker barn", 505 + MENUITEM "&Marker underelementer", 505 } POPUP "&Vis" { - MENUITEM "T&re og kataloger", 413 - MENUITEM "Bare Tr&e ", 411 - MENUITEM "&Bare kataloger", 412 + MENUITEM "T&re og katalog", 413 + MENUITEM "Kun tr&e", 411 + MENUITEM "Kun katal&og", 412 MENUITEM SEPARATOR - MENUITEM "Sp&litt", ID_VIEW_SPLIT + MENUITEM "De&l opp visning", ID_VIEW_SPLIT MENUITEM SEPARATOR MENUITEM "&Navn", ID_VIEW_NAME - MENUITEM "&Alle fil detaljer", ID_VIEW_ALL_ATTRIBUTES, CHECKED - MENUITEM "&begrenset detaljer...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM "&Alle fildetaljer", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "Del&vise detaljer . . .", ID_VIEW_SELECTED_ATTRIBUTES MENUITEM SEPARATOR - MENUITEM "Sorter etter &navn", ID_VIEW_SORT_NAME + MENUITEM "&Sorter etter navn", ID_VIEW_SORT_NAME MENUITEM "Sorter etter &type", ID_VIEW_SORT_TYPE - MENUITEM "Sorter etter &størrelse", ID_VIEW_SORT_SIZE + MENUITEM "Sorter etter st&ørrelse", ID_VIEW_SORT_SIZE MENUITEM "Sorter etter &dato", ID_VIEW_SORT_DATE MENUITEM SEPARATOR - MENUITEM "Filter etter &...", ID_VIEW_FILTER + MENUITEM "Filtrer med '&' . . .", ID_VIEW_FILTER } POPUP "&Innstillinger" { - MENUITEM "&bekreftelse...", 501 - MENUITEM "&Skrifttype ...", ID_SELECT_FONT - MENUITEM "Spesial verktøy&linje...", 512 + MENUITEM "&Bekreftelse . . .", 501 + MENUITEM "Skri&ft . . .", ID_SELECT_FONT + MENUITEM "Tilpass &verktøylinjen . . .", 512 MENUITEM SEPARATOR - MENUITEM "&Verktøylinje", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "&Stasjonlinje", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "Status &linje", ID_VIEW_STATUSBAR, CHECKED + MENUITEM "Verk&tøylinje", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "Stas&jonslinje", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Statuslinje", ID_VIEW_STATUSBAR, CHECKED #ifndef _NO_EXTENSIONS - MENUITEM "F&ull Skjerm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "F&ullskjerm\tCtrl+Shift+S", ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR - MENUITEM "&Minimalisere ved kjør", 504 - MENUITEM "&Lagre innstillinger ved avslutt", 511 + MENUITEM "&Minimer ved oppstart", 504 + MENUITEM "Lagre inn&stillinger ved avslutting", 511 } POPUP "&Sikkerhet" { - MENUITEM "&Adgang...", 605 - MENUITEM "&Logging...", 606 - MENUITEM "&Eier...", 607 + MENUITEM "Tilg&ang . . .", 605 + MENUITEM "&Loggføring . . .", 606 + MENUITEM "&Eier . . .", 607 } - POPUP "&Vindu" { - MENUITEM "Ny &vindu", ID_WINDOW_NEW - MENUITEM "Som liste\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Sorter &Horisontalt", ID_WINDOW_TILE_HORZ - MENUITEM "Sorter &Vertikalt\tCtrl+F4", ID_WINDOW_TILE_VERT + POPUP "Vind&u" { + MENUITEM "Nytt &vindu", ID_WINDOW_NEW + MENUITEM "Kortstokk\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "Still &vannrett", ID_WINDOW_TILE_HORZ + MENUITEM "Still &loddrett\tCtrl+F4", ID_WINDOW_TILE_VERT #ifndef _NO_EXTENSIONS MENUITEM "Ordne automatisk", ID_WINDOW_AUTOSORT #endif - MENUITEM "Ordne &Symboler", ID_WINDOW_ARRANGE - MENUITEM "&Oppdater\tF5", ID_REFRESH + MENUITEM "Ordne &symboler", ID_WINDOW_ARRANGE + MENUITEM "Oppdate&r\tF5", ID_REFRESH } - POPUP "&?" { - MENUITEM "&Emner i hjelp\tF1", ID_HELP - MENUITEM "Hjelp &Søk...\tF1", ID_HELP - MENUITEM "&Bruke Hjelp\tF1", ID_HELP_USING + POPUP "&Hjelp" { + MENUITEM "Emner i &hjelp\tF1", ID_HELP + MENUITEM "&Søk i hjelp . . .\tF1", ID_HELP + MENUITEM "Br&uk av hjelp\tF1", ID_HELP_USING MENUITEM SEPARATOR - MENUITEM "&Info om Winefile...", ID_ABOUT + MENUITEM "&Informasjon om Filbehandling . . .", ID_ABOUT #ifdef __WINE__ - MENUITEM "Info om &Wine...", ID_ABOUT_WINE + MENUITEM "Informasjon om &Wine . . .", ID_ABOUT_WINE #endif } } @@ -152,13 +148,13 @@ IDM_WINEFILE MENU FIXED IMPURE IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Utføre" +CAPTION "Kjør" FONT 8, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 CONTROL "&Kommando:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL - CONTROL "Som &symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + CONTROL "&Som symbol", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 PUSHBUTTON "Avbryt", 2, 158, 23, 47, 14 PUSHBUTTON "&Hjelp", 254, 158, 43, 47, 14 @@ -166,26 +162,26 @@ FONT 8, "MS Shell Dlg" IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Velg destinasjon" +CAPTION "Velg plasserings" FONT 8, "MS Shell Dlg" { - CONTROL "", 101, "statisk", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Mappe:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Sti:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 PUSHBUTTON "Avbryt", 2, 158, 23, 47, 14 - PUSHBUTTON "&Utforsk", 254, 158, 43, 47, 14 + PUSHBUTTON "&Bla", 254, 158, 43, 47, 14 } IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Etter fil type" -FONT 8, "MS Shell Dlg" +CAPTION "Etter filtype" +FONT 8, "MS Sans Serif" BEGIN LTEXT "&Navn:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL - GROUPBOX "Fil type",-1,7,23,87,56 - CONTROL "&Mapper",IDC_VIEW_TYPE_DIRECTORIES,"Button", + GROUPBOX "Filtype",-1,7,23,87,56 + CONTROL "&Kataloger",IDC_VIEW_TYPE_DIRECTORIES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 CONTROL "&Programmer",IDC_VIEW_TYPE_PROGRAMS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 @@ -193,7 +189,7 @@ BEGIN BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 CONTROL "&Andre filer",IDC_VIEW_TYPE_OTHERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 - CONTROL "Vise skjulte/&System Filer",IDC_VIEW_TYPE_HIDDEN, + CONTROL "Vi&s skjulte/systemfiler",IDC_VIEW_TYPE_HIDDEN, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 DEFPUSHBUTTON "OK",IDOK,104,7,50,14 PUSHBUTTON "Avbryt",IDCANCEL,104,24,50,14 @@ -202,29 +198,29 @@ END IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Egenskaper for %s" -FONT 8, "MS Shell Dlg" +FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,191,7,50,14 PUSHBUTTON "Avbryt",IDCANCEL,191,29,50,14 - LTEXT "&Fil navn:",-1,7,7,59,9 + LTEXT "&Filnavn:",-1,7,7,59,9 EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Full &mappe:",-1,7,18,59,9 + LTEXT "&Full sti:",-1,7,18,59,9 EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "Sist endret:",-1,7,29,59,9 EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "Versjon:",-1,7,40,59,9 EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Ene&rett:",-1,7,51,59,9 + LTEXT "&Kopirett:",-1,7,51,59,9 EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "Størrelse:",-1,7,62,59,9 EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP GROUPBOX "Attributter",-1,7,79,158,46 - CONTROL "&Bare lese",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 - CONTROL "S&kjult",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "Sk&rivebeskyttet",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "Sk&jult",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 CONTROL "&Arkiv",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 CONTROL "&System",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 - CONTROL "&komprimert",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 - GROUPBOX "&Versjon Informasjon",-1,7,129,234,79 + CONTROL "Kompr&imert",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "&Versjoninformasjon",-1,7,129,234,79 LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL END @@ -232,59 +228,59 @@ END STRINGTABLE { - IDS_FONT_SEL_DLG_NAME "kjøre skrift innstillinger" - IDS_FONT_SEL_ERROR "Feil mens valgt ny skrift." + IDS_FONT_SEL_DLG_NAME "Aktiverer skriftinnstillinger" + IDS_FONT_SEL_ERROR "Feil ved valg av ny skrift." } STRINGTABLE { - IDS_WINEFILE "Winefile" + IDS_WINEFILE "Filbehandling" IDS_ERROR "Feil" - IDS_ROOT_FS "root fs" - IDS_UNIXFS "unixfs" + IDS_ROOT_FS "Rotfilsystem" + IDS_UNIXFS "Unix-filsystem" IDS_DESKTOP "Skrivebord" - IDS_SHELL "Shell" + IDS_SHELL "Skall" IDS_TITLEFMT "%s - %s" - IDS_NO_IMPL "ikke enda implementert" + IDS_NO_IMPL "Ikke implementert ennå" IDS_WINE "WINE" - IDS_WINE_FILE "Wine Fil" + IDS_WINE_FILE "Filbehandling" } STRINGTABLE { IDS_COL_NAME "Navn" IDS_COL_SIZE "Størrelse" - IDS_COL_CDATE "CDate" - IDS_COL_ADATE "ADate" - IDS_COL_MDATE "MDate" - IDS_COL_IDX "Index/Inode" - IDS_COL_LINKS "Lenker" + IDS_COL_CDATE "C-dato" + IDS_COL_ADATE "A-dato" + IDS_COL_MDATE "M-dato" + IDS_COL_IDX "Indeks/Inode" + IDS_COL_LINKS "Koblinger" IDS_COL_ATTR "Attributter" IDS_COL_SEC "Sikkerhet" - IDS_FREE_SPACE_FMT "%s av %s fri" + IDS_FREE_SPACE_FMT "%s av %s ledig" } STRINGTABLE { IDS_LICENSE_CAPTION, "LISENS" IDS_LICENSE, -"This library is free software; you can redistribute it and/or \ -modify it under the terms of the GNU Lesser General Public \ -License as published by the Free Software Foundation; either \ -version 2.1 of the License, or (at your option) any later version.\n\ -This library is distributed in the hope that it will be useful, \ -but WITHOUT ANY WARRANTY; without even the implied warranty of \ -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ -Lesser General Public License for more details.\n\ -You should have received a copy of the GNU Lesser General Public \ -License along with this library; if not, write to the Free Software \ -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA" +"Dette biblioteket er fri programvare; du kan redistribuere det \ +og/eller endre det under vilkårene i «GNU Lesser General Public \ +License», utgitt av the Free Software Foundation; enten \ +versjon 2.1 av Lisensen, eller (hvis du ønsker det) en nyere versjon.\n\ +Dette biblioteket distribueres i håp om at det er nyttig, \ +men UTEN ENHVER GARANTI; ikke engang den uttrykte garantien for \ +HANDELSDYKTIGHET eller EGNETHET FOR ET SPESIELT FORMÅL. Se «GNU \ +Lesser General Public License» for flere detaljer.\n\ +Du skal ha mottatt et eksemplar av «GNU Lesser General Public \ +License» sammen med dette biblioteket; hvis ikke, skriv til: the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" IDS_WARRANTY_CAPTION, "INGEN GARANTI" IDS_WARRANTY, -"This library is distributed in the hope that it will be useful, \ -but WITHOUT ANY WARRANTY; without even the implied warranty of \ -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ -Lesser General Public License for more details." +"Dette biblioteket distribueres i håp om at det er nyttig, \ +men UTEN ENHVER GARANTI; ikke engang en uttrykte garantien for \ +HANDELSDYKTIGHET eller EGNETHET FOR ET SPESIELT FORMÅL. Se «GNU \ +Lesser General Public License» for flere detaljer." } diff --git a/rosapps/winefile/lang/nl-NL.rc b/rosapps/winefile/lang/nl-NL.rc index d5933286b32..8b85139113b 100644 --- a/rosapps/winefile/lang/nl-NL.rc +++ b/rosapps/winefile/lang/nl-NL.rc @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL diff --git a/rosapps/winefile/lang/pl-PL.rc b/rosapps/winefile/lang/pl-PL.rc index 34fe0165b3e..42e5051682e 100644 --- a/rosapps/winefile/lang/pl-PL.rc +++ b/rosapps/winefile/lang/pl-PL.rc @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -35,18 +35,18 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "W s&chowku...\tF9", 118 MENUITEM "&Usuñ\tDel", ID_FILE_DELETE MENUITEM "&Zmieñ nazwê...", 109 - MENUITEM "Ustawie&nia...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM "W³aœc&iwoœci...\tAlt+Enter", ID_EDIT_PROPERTIES MENUITEM SEPARATOR - MENUITEM "&Kompresja...", 119 - MENUITEM "&Dekompresja...", 120 + MENUITEM "Ko&mpresja...", 119 + MENUITEM "D&ekompresja...", 120 MENUITEM SEPARATOR - MENUITEM "&Uruchom...", ID_EXECUTE + MENUITEM "U&ruchom...", ID_EXECUTE MENUITEM "&Drukuj...", 102 MENUITEM "Skojarz...", 103 MENUITEM SEPARATOR MENUITEM "U&twórz folder...", 111 MENUITEM "&Szukaj...", 104 - MENUITEM "&Zaznacz pliki...", 116 + MENUITEM "Z&aznacz pliki...", 116 MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS MENUITEM "&Wyjœcie\tAlt+X", ID_FILE_EXIT @@ -95,10 +95,10 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM SEPARATOR MENUITEM "P&osortuj alfabetycznie", 404 MENUITEM "Posortuj po &typie", 405 - MENUITEM "Rozmieœæ &po wielkoœci", 406 - MENUITEM "&Sortuj po dacie", 407 + MENUITEM "Posortuj po wie&lkoœci", 406 + MENUITEM "Po&sortuj po dacie", 407 MENUITEM SEPARATOR - MENUITEM "Sortuj po &...", ID_VIEW_FILTER + MENUITEM "Filtruj widok &...", ID_VIEW_FILTER } POPUP "&Opcje" { @@ -176,8 +176,113 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Przegl¹daj", 254, 158, 43, 47, 14 } +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Wed³ug typu pliku" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Nazwa:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "Wyœwietl pliki typu",-1,7,23,87,56 + CONTROL "&Katalogi",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Programy",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "Doku&menty",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Inne pliki",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "Poka¿ pliki ukryte i &systemowe",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,126,9 + DEFPUSHBUTTON "OK",IDOK,104,7,50,14 + PUSHBUTTON "Anuluj",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "W³aœciwoœci: %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,191,7,50,14 + PUSHBUTTON "Anulujl",IDCANCEL,191,29,50,14 + LTEXT "&Nazwa pliku:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&Pe³na œcie¿ka:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&Ostatnio modyfikowany:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&Wersja:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Prawa a&utorskie:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Wie&lkoœæ:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Atrybuty",-1,7,79,158,46 + CONTROL "Tylko do &odczytu",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "&Ukryty",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&Archiwalny",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&Systemowy",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "S&kompresowany",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "We&rsja",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + STRINGTABLE { IDS_FONT_SEL_DLG_NAME "Wprowadzanie ustawieñ czcionki" IDS_FONT_SEL_ERROR "B³¹d przy wybieraniu czcionki" } + +STRINGTABLE +{ + IDS_WINEFILE "Winefile" + IDS_ERROR "B³¹d" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Pulpit" + IDS_SHELL "Pulpit" /* t³umaczenie nie dos³owne, ale chyba lepiej pasuje */ + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "Jeszcze nie zaimplementowane" + IDS_WINE "WINE" + IDS_WINE_FILE "Wine File" +} + +STRINGTABLE +{ + IDS_COL_NAME "Nazwa" + IDS_COL_SIZE "Wielkoœæ" + IDS_COL_CDATE "CDate" + IDS_COL_ADATE "ADate" + IDS_COL_MDATE "MDate" + IDS_COL_IDX "Indeks/inode" + IDS_COL_LINKS "Dowi¹zania" + IDS_COL_ATTR "Atrybuty" + IDS_COL_SEC "Prawa dostêpu" + + IDS_FREE_SPACE_FMT "%s z %s wolne" +} + +STRINGTABLE +{ +IDS_LICENSE_CAPTION, "LICENCJA" +IDS_LICENSE, +"This library is free software; you can redistribute it and/or \ +modify it under the terms of the GNU Lesser General Public \ +License as published by the Free Software Foundation; either \ +version 2.1 of the License, or (at your option) any later version.\n\ +This library is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details.\n\ +You should have received a copy of the GNU Lesser General Public \ +License along with this library; if not, write to the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" + +IDS_WARRANTY_CAPTION, "BEZ GWARANCJI" +IDS_WARRANTY, +"This library is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details." +} diff --git a/rosapps/winefile/lang/pt-PT.rc b/rosapps/winefile/lang/pt-PT.rc index dd6ba03247d..c247caa7cbe 100644 --- a/rosapps/winefile/lang/pt-PT.rc +++ b/rosapps/winefile/lang/pt-PT.rc @@ -3,7 +3,7 @@ * Portuguese Language Support * * Copyright 2003 Marcelo Duarte - * Copyright 2004 Américo José Melo + * Copyright 2004,2007 Américo José Melo * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,13 +17,13 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ /* Menu */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDM_WINEFILE MENU FIXED IMPURE { @@ -147,7 +147,6 @@ IDM_WINEFILE MENU FIXED IMPURE } } - LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDM_WINEFILE MENU FIXED IMPURE @@ -156,7 +155,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "A&brir\tEnter", ID_ACTIVATE MENUITEM "&Mover...\tF7", ID_FILE_MOVE MENUITEM "&Copiar...\tF8", ID_FILE_COPY - MENUITEM "&Na Area de Transferencia...\tF9", 118 + MENUITEM "&Na Area de Transferência...\tF9", 118 MENUITEM "E&xcluir\tDel", ID_FILE_DELETE MENUITEM "Re&nomear...", 109 MENUITEM "&Propriedades...\tAlt+Enter", ID_EDIT_PROPERTIES @@ -170,7 +169,7 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM SEPARATOR MENUITEM "Cri&ar pasta...", 111 MENUITEM "P&esquisar...", 104 - MENUITEM "Selecionar fichei&ros...", 116 + MENUITEM "Seleccionar fichei&ros...", 116 MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS MENUITEM "Sai&r\tAlt+X", ID_FILE_EXIT @@ -188,8 +187,8 @@ IDM_WINEFILE MENU FIXED IMPURE MENUITEM "&Gerar disco de sistema...", -1 /*TODO*/ #endif MENUITEM SEPARATOR - MENUITEM "Conecta&r unidade de rede", ID_CONNECT_NETWORK_DRIVE - MENUITEM "&Desconectar unidade de rede",ID_DISCONNECT_NETWORK_DRIVE + MENUITEM "Liga&r unidade de rede", ID_CONNECT_NETWORK_DRIVE + MENUITEM "&Desligar unidade de rede",ID_DISCONNECT_NETWORK_DRIVE MENUITEM SEPARATOR MENUITEM "&Partilhar como...", 254 MENUITEM "&Remover partilha...", 255 @@ -208,8 +207,8 @@ IDM_WINEFILE MENU FIXED IMPURE POPUP "&Exibir" { MENUITEM "Á&rvore e pasta", 413 - MENUITEM "S&omente árvore", 411 - MENUITEM "So&mente pasta", 412 + MENUITEM "A&penas árvore", 411 + MENUITEM "Ap&enas pasta", 412 MENUITEM SEPARATOR MENUITEM "&Dividir", ID_VIEW_SPLIT MENUITEM SEPARATOR @@ -227,14 +226,14 @@ IDM_WINEFILE MENU FIXED IMPURE POPUP "&Opções" { MENUITEM "&Confirmação...", 501 - MENUITEM "&Fonte...", ID_SELECT_FONT + MENUITEM "&Tipo de Letra...", ID_SELECT_FONT MENUITEM "&Personalizar barra de ferramentas...", 512 MENUITEM SEPARATOR MENUITEM "Barra d&e ferramentas", ID_VIEW_TOOL_BAR, CHECKED MENUITEM "&Barra de unidades", ID_VIEW_DRIVE_BAR, CHECKED MENUITEM "B&arra de e&stado", ID_VIEW_STATUSBAR, CHECKED #ifndef _NO_EXTENSIONS - MENUITEM "Ecrã Complecto\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "Ecrã Completo\tCtrl+Shift+S", ID_VIEW_FULLSCREEN #endif MENUITEM SEPARATOR MENUITEM "&Minimizar durante o uso", 504 @@ -244,7 +243,7 @@ IDM_WINEFILE MENU FIXED IMPURE POPUP "&Segurança" { MENUITEM "&Acesso...", 605 - MENUITEM "&Logging...", 606 + MENUITEM "&Autenticação...", 606 MENUITEM "&Dono...", 607 } @@ -263,7 +262,7 @@ IDM_WINEFILE MENU FIXED IMPURE POPUP "Aj&uda" { MENUITEM "&Tópicos da ajuda\tF1", ID_HELP MENUITEM "Pesquisar...", ID_HELP - MENUITEM "&Usando a ajuda", ID_HELP_USING + MENUITEM "&Usar a ajuda", ID_HELP_USING MENUITEM SEPARATOR #ifdef __WINE__ MENUITEM "Acerca do &Wine...", ID_ABOUT_WINE @@ -272,7 +271,7 @@ IDM_WINEFILE MENU FIXED IMPURE } -LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -288,6 +287,9 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Ajuda", 254, 158, 43, 47, 14 } + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Selecionar destino" @@ -301,12 +303,41 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Procurar", 254, 158, 43, 47, 14 } +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Selecionar destino" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Localização:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "Cancelar", 2, 158, 23, 47, 14 + PUSHBUTTON "&Procurar", 254, 158, 43, 47, 14 +} + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + STRINGTABLE { IDS_FONT_SEL_DLG_NAME "Aplicando configurações de fonte" IDS_FONT_SEL_ERROR "Erro enquanto seleciona nova fonte." } +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "A aplicar configurações do tipo de letra" + IDS_FONT_SEL_ERROR "Erro ao seleccionar novo tipo de letra." +} + + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN + STRINGTABLE { IDS_WINEFILE "Winefile" @@ -321,6 +352,24 @@ STRINGTABLE IDS_WINE_FILE "Wine File" } +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE + +STRINGTABLE +{ + IDS_WINEFILE "Winefile" + IDS_ERROR "Erro" + IDS_ROOT_FS "root fs" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Ecrã" + IDS_SHELL "Linha de Comandos" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "Ainda não implementado" + IDS_WINE "WINE" + IDS_WINE_FILE "Ficheiro Wine" +} + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + STRINGTABLE { IDS_COL_NAME "Nome" @@ -328,7 +377,7 @@ STRINGTABLE IDS_COL_CDATE "CData" IDS_COL_ADATE "AData" IDS_COL_MDATE "MData" - IDS_COL_IDX "Index/Inode" + IDS_COL_IDX "Índice/Inode" IDS_COL_LINKS "Ligações" IDS_COL_ATTR "Atributos" IDS_COL_SEC "Segurança" diff --git a/rosapps/winefile/lang/ru-RU.rc b/rosapps/winefile/lang/ru-RU.rc index ee458b12439..6294beb088a 100644 --- a/rosapps/winefile/lang/ru-RU.rc +++ b/rosapps/winefile/lang/ru-RU.rc @@ -2,6 +2,7 @@ * WineFile (Russian resources) * * Copyright 2003 Igor Stepin + * Copyright 2007 Konstantin Kondratyuk (Etersoft) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -15,14 +16,11 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -#pragma code_page(1251) - - /* Menu */ IDM_WINEFILE MENU FIXED IMPURE @@ -161,68 +159,67 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "Îòìåíà", 2, 158, 23, 47, 14 PUSHBUTTON "&Ñïðàâêà", 254, 158, 43, 47, 14 } - IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Select destination" +CAPTION "Âûáåðèòå ïóòü íàçíà÷åíèÿ" FONT 8, "MS Shell Dlg" { CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 - CONTROL "&Path:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + CONTROL "&Ïóòü:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 - PUSHBUTTON "Cancel", 2, 158, 23, 47, 14 - PUSHBUTTON "&Browse", 254, 158, 43, 47, 14 + PUSHBUTTON "Îòìåíà", 2, 158, 23, 47, 14 + PUSHBUTTON "&Îáçîð", 254, 158, 43, 47, 14 } IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "By File Type" -FONT 8, "MS Shell Dlg" +CAPTION "Ïî òèïó ôàéëîâ" +FONT 8, "MS Sans Serif" BEGIN - LTEXT "&Name:",-1,7,8,22,10 + LTEXT "&Èìÿ:",-1,7,8,22,10 EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL - GROUPBOX "File Type",-1,7,23,87,56 - CONTROL "&Directories",IDC_VIEW_TYPE_DIRECTORIES,"Button", + GROUPBOX "Òèï ôàéëà",-1,7,23,87,56 + CONTROL "&Êàòàëîãè",IDC_VIEW_TYPE_DIRECTORIES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 - CONTROL "&Programs",IDC_VIEW_TYPE_PROGRAMS,"Button", + CONTROL "&Ïðîãðàììû",IDC_VIEW_TYPE_PROGRAMS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 - CONTROL "Docu&ments",IDC_VIEW_TYPE_DOCUMENTS,"Button", + CONTROL "&Äîêóìåíòû",IDC_VIEW_TYPE_DOCUMENTS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 - CONTROL "&Other files",IDC_VIEW_TYPE_OTHERS,"Button", + CONTROL "Äðóãèå &ôàéëû",IDC_VIEW_TYPE_OTHERS,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 - CONTROL "Show Hidden/&System Files",IDC_VIEW_TYPE_HIDDEN, + CONTROL "Ïîêàçàòü ñêðûòûå/&ñèñòåìíûå ôàéëû",IDC_VIEW_TYPE_HIDDEN, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,106,9 DEFPUSHBUTTON "OK",IDOK,104,7,50,14 - PUSHBUTTON "Cancel",IDCANCEL,104,24,50,14 + PUSHBUTTON "Îòìåíà",IDCANCEL,104,24,50,14 END IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Properties for %s" -FONT 8, "MS Shell Dlg" +CAPTION "Ñâîéñòâà %s" +FONT 8, "MS Sans Serif" BEGIN DEFPUSHBUTTON "OK",IDOK,191,7,50,14 - PUSHBUTTON "Cancel",IDCANCEL,191,29,50,14 - LTEXT "&File Name:",-1,7,7,59,9 + PUSHBUTTON "Îòìåíà",IDCANCEL,191,29,50,14 + LTEXT "Èìÿ &ôàéëà:",-1,7,7,59,9 EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Full &Path:",-1,7,18,59,9 + LTEXT "&Ïîëíûé ïóòü:",-1,7,18,59,9 EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Last Change:",-1,7,29,59,9 + LTEXT "Ïîñëåäíåå èçìåíåíèå:",-1,7,29,59,9 EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Version:",-1,7,40,59,9 + LTEXT "Âåðñèÿ:",-1,7,40,59,9 EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP LTEXT "Cop&yright:",-1,7,51,59,9 EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - LTEXT "Size:",-1,7,62,59,9 + LTEXT "Ðàçìåð:",-1,7,62,59,9 EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP - GROUPBOX "Attributes",-1,7,79,158,46 - CONTROL "&Read Only",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 - CONTROL "H&idden",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + GROUPBOX "Àòðèáóòû",-1,7,79,158,46 + CONTROL "&Òîëüêî äëÿ ÷òåíèÿ",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "Ñ&êðûòûé",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 CONTROL "&Archive",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 - CONTROL "&System",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 - CONTROL "&Compressed",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 - GROUPBOX "&Version Information",-1,7,129,234,79 + CONTROL "&Ñèñòåìíûé",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "Ñ&æàòûé",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "&Èíôîðìàöèÿ î âåðñèè",-1,7,129,234,79 LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL END @@ -230,59 +227,59 @@ END STRINGTABLE { - IDS_FONT_SEL_DLG_NAME "Applying font settings" - IDS_FONT_SEL_ERROR "Error while selecting new font." + IDS_FONT_SEL_DLG_NAME "Ïðèìåíåíèå ïàðàìåòðîâ íàñòðîéêè øðèôòà" + IDS_FONT_SEL_ERROR "Îøèáêà ïðè âûáîðå íîâîãî øðèôòà." } STRINGTABLE { IDS_WINEFILE "Winefile" - IDS_ERROR "Error" - IDS_ROOT_FS "root fs" - IDS_UNIXFS "unixfs" - IDS_DESKTOP "Desktop" + IDS_ERROR "Îøèáêà" + IDS_ROOT_FS "Êîðíåâàÿ ôàéëîâàÿ ñèñòåìà" + IDS_UNIXFS "Îñíîâíàÿ ôàéëîâàÿ ñèñòåìà" + IDS_DESKTOP "Ðàáî÷èé ñòîë" IDS_SHELL "Shell" IDS_TITLEFMT "%s - %s" - IDS_NO_IMPL "Not yet implemented" + IDS_NO_IMPL "Åù¸ íå ðåàëèçîâàíî" IDS_WINE "WINE" IDS_WINE_FILE "Wine File" } STRINGTABLE { - IDS_COL_NAME "Name" - IDS_COL_SIZE "Size" - IDS_COL_CDATE "CDate" - IDS_COL_ADATE "ADate" - IDS_COL_MDATE "MDate" + IDS_COL_NAME "Èìÿ" + IDS_COL_SIZE "Ðàçìåð" + IDS_COL_CDATE "Äàòà ñîçäàíèÿ" + IDS_COL_ADATE "Äàòà ïîñëåäíåãî äîñòóïà" + IDS_COL_MDATE "Äàòà ïîñëåäíåãî èçìåíåíèÿ" IDS_COL_IDX "Index/Inode" - IDS_COL_LINKS "Links" - IDS_COL_ATTR "Attributes" - IDS_COL_SEC "Security" + IDS_COL_LINKS "Ññûëêè" + IDS_COL_ATTR "Àòðèáóòû" + IDS_COL_SEC "Áåçîïàñíîñòü" - IDS_FREE_SPACE_FMT "%s of %s free" + IDS_FREE_SPACE_FMT "%s èç %s ñâîáîäíî" } STRINGTABLE { -IDS_LICENSE_CAPTION, "LICENSE" +IDS_LICENSE_CAPTION, "Ëèöåíçèÿ" IDS_LICENSE, -"This library is free software; you can redistribute it and/or \ -modify it under the terms of the GNU Lesser General Public \ -License as published by the Free Software Foundation; either \ -version 2.1 of the License, or (at your option) any later version.\n\ -This library is distributed in the hope that it will be useful, \ -but WITHOUT ANY WARRANTY; without even the implied warranty of \ -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ -Lesser General Public License for more details.\n\ -You should have received a copy of the GNU Lesser General Public \ -License along with this library; if not, write to the Free Software \ -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA" +"Ýòà ðàáîòà ÿâëÿåòñÿ ñâîáîäíûì ïðîãðàììíûì îáåñïå÷åíèåì; âû ìîæåòå ñâîáîäíî ðàñïðîñòðàíÿòü è/èëè \ +èçìåíÿòü å¸ ïðè ñîáëþäåíèè óñëîâèé ëèöåíçèè GNU Lesser General Public \ +êîòîðàÿ áûëà îïóáëèêîâàíà Free Software Foundation; \ +ëèáî âåðñèè 2.1, ëèáî ëþáîé áîëåå ïîçäíåé âåðñèè.\n\ +Äàííàÿ ðàáîòà ðàñïðîñòðàíÿåòñÿ â íàäåæäå, ÷òî îíà áóäåò ïîëåçíîé, \ +íî ÁÅÇ ÂÑßÊÎÉ ÃÀÐÀÍÒÈÈ; â òîì ÷èñëå áåç âûòåêàþùåé ãàðàíòèè \ +ÒÎÂÀÐÍÎÉ ÏÐÈÃÎÄÍÎÑÒÈ èëè ÏÐÈÃÎÄÍÎÑÒÈ ÄËß ×ÀÑÒÍÎÃÎ ÈÑÏÎËÜÇÎÂÀÍÈß. \ +Ñì. GNU Lesser General Public License äëÿ áîëåå ïîäðîáíîé èíôîðìàöèè.\n\ +Âû äîëæíû áûëè ïîëó÷èòü êîïèþ the GNU Lesser General Public \ +License âìåñòå ñ ýòîé ðàáîòîé; åñëè íåò, ïèøèòå: the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA" -IDS_WARRANTY_CAPTION, "NO WARRANTY" +IDS_WARRANTY_CAPTION, "Îòñóòñòâèå ãàðàíòèè" IDS_WARRANTY, -"This library is distributed in the hope that it will be useful, \ -but WITHOUT ANY WARRANTY; without even the implied warranty of \ -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ -Lesser General Public License for more details." +"Äàííàÿ ðàáîòà ðàñïðîñòðàíÿåòñÿ â íàäåæäå, ÷òî îíà áóäåò ïîëåçíîé, \ +íî ÁÅÇ ÂÑßÊÎÉ ÃÀÐÀÍÒÈÈ; â òîì ÷èñëå áåç âûòåêàþùåé ãàðàíòèè \ +ÒÎÂÀÐÍÎÉ ÏÐÈÃÎÄÍÎÑÒÈ èëè ÏÐÈÃÎÄÍÎÑÒÈ ÄËß ×ÀÑÒÍÎÃÎ ÈÑÏÎËÜÇÎÂÀÍÈß. \ +Ñì. GNU Lesser General Public License äëÿ áîëåå ïîäðîáíîé èíôîðìàöèè." } diff --git a/rosapps/winefile/lang/sl-SI.rc b/rosapps/winefile/lang/sl-SI.rc index 3f68186ad7c..5441d50aa21 100644 --- a/rosapps/winefile/lang/sl-SI.rc +++ b/rosapps/winefile/lang/sl-SI.rc @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT diff --git a/rosapps/winefile/lang/sv-SE.rc b/rosapps/winefile/lang/sv-SE.rc index 5b2f366d604..0b52641c3df 100644 --- a/rosapps/winefile/lang/sv-SE.rc +++ b/rosapps/winefile/lang/sv-SE.rc @@ -16,12 +16,10 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL -#pragma code_page(1252) - +LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT /* Menu */ diff --git a/rosapps/winefile/lang/tr-TR.rc b/rosapps/winefile/lang/tr-TR.rc new file mode 100644 index 00000000000..27ca3a290ef --- /dev/null +++ b/rosapps/winefile/lang/tr-TR.rc @@ -0,0 +1,262 @@ +/* + * WineFile + * Turkish Language Support + * + * Copyright 2006 Fatih Aþýcý + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +/* Menu */ + +IDM_WINEFILE MENU FIXED IMPURE +{ + POPUP "&Dosya" { + MENUITEM "&Aç\tEnter", ID_ACTIVATE + MENUITEM "&Taþý...\tF7", ID_FILE_MOVE + MENUITEM "K&opyala...\tF8", ID_FILE_COPY + MENUITEM "&Panodan...\tF9", 118 + MENUITEM "&Sil\tDel", ID_FILE_DELETE + MENUITEM "Ye&niden Adlandýr...", 109 + MENUITEM "&Özellikler...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "S&ýkýþtýr...", 119 + MENUITEM "Geni&þlet...", 120 + MENUITEM SEPARATOR + MENUITEM "&Çalýþtýr...", ID_EXECUTE + MENUITEM "Ya&zdýr...", 102 + MENUITEM "Ýliþkilendir...", 103 + MENUITEM SEPARATOR + MENUITEM "&Dizin Oluþtur...", 111 + MENUITEM "A&ra...", 104 + MENUITEM "D&osyalarý Seç...", 116 + MENUITEM SEPARATOR +#ifndef _NO_EXTENSIONS + MENUITEM "&Çýkýþ\tAlt+X", ID_FILE_EXIT +#else + MENUITEM "&Çýkýþ", ID_FILE_EXIT +#endif + } + + POPUP "&Disk" { + MENUITEM "Disk K&opyala...", 201 + MENUITEM "Disk &Etiketi...", 202 + MENUITEM SEPARATOR + MENUITEM "Disk Bi&çimlendir...", ID_FORMAT_DISK +#ifdef _WIN95 + MENUITEM "&Sistem Diski Oluþtur...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "&Að Sürücüsüne Baðlan", ID_CONNECT_NETWORK_DRIVE + MENUITEM "Að Sürücüsüne Baðlantýyý &Kes", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "Paylaþ...", 254 + MENUITEM "Paylaþýmý S&il...", 255 + MENUITEM SEPARATOR + MENUITEM "S&ürücü Seç...", 251 + } + + POPUP "Di&zinler" { + MENUITEM "&Sonraki Seviye\t+", 301 + MENUITEM "Aðacý &Geniþlet\t*", 302 + MENUITEM "&Tümünü Geniþlet\tStrg+*", 303 + MENUITEM "Aðacý T&opla\t-", 304 + MENUITEM SEPARATOR + MENUITEM "A< Dallarý Ýþaretle", 505 + } + + POPUP "&Görünüm" { + MENUITEM "A&ðaç ve Dizin", 413 + MENUITEM "Yalnýzca &Aðaç", 411 + MENUITEM "Yalnýzca &Dizin", 412 + MENUITEM SEPARATOR + MENUITEM "Ay&raç", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "&Ad", ID_VIEW_NAME + MENUITEM "&Tüm Dosya Ayrýntýlarý", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "&Seçilmiþ Ayrýntýlar...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&Ada Göre Sýrala", ID_VIEW_SORT_NAME + MENUITEM "&Türe Göre Sýrala", ID_VIEW_SORT_TYPE + MENUITEM "&Boyuta Göre Sýrala", ID_VIEW_SORT_SIZE + MENUITEM "&Tarihe Göre Sýrala", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "Süzgeç &...", ID_VIEW_FILTER + } + + POPUP "&Seçenekler" { + MENUITEM "&Onaylama...", 501 + MENUITEM "&Yazý Tipi...", ID_SELECT_FONT + MENUITEM "Araç Çubuðunu &Özelleþtir...", 512 + MENUITEM SEPARATOR + MENUITEM "&Araç Çubuðu", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "&Sürücü Çubuðu", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Durum Çubuðu", ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "&Tam Ekran\tCtrl+Shift+S", ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "Açýlýþta &küçült", 504 + MENUITEM "&Çýkýþta ayarlarý kaydet", 511 + } + + + POPUP "&Güvenlik" { + MENUITEM "&Eriþim...", 605 + MENUITEM "&Oturum Açma...", 606 + MENUITEM "&Sahip...", 607 + } + + POPUP "&Pencere" { + MENUITEM "&Yeni Pencere", ID_WINDOW_NEW + MENUITEM "Diz\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "&Yatay Döþe", ID_WINDOW_TILE_HORZ + MENUITEM "Di&key Döþe\tCtrl+F4", ID_WINDOW_TILE_VERT +#ifndef _NO_EXTENSIONS + MENUITEM "Otomatik Düzenle", ID_WINDOW_AUTOSORT +#endif + MENUITEM "Simgeleri D&üzenle", ID_WINDOW_ARRANGE + MENUITEM "Ye&nile\tF5", ID_REFRESH + } + + POPUP "&Yardým" { + MENUITEM "&Yardým Konularý\tF1", ID_HELP + MENUITEM "Yardýmda &Ara...\tF1", ID_HELP + MENUITEM "Yardým &Kullanýmý\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "Winefile hakkýnda &bilgi...", ID_ABOUT +#ifdef __WINE__ + MENUITEM "&Wine hakkýnda bilgi...", ID_ABOUT_WINE +#endif + } +} + + +IDD_EXECUTE DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Çalýþtýr" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Komut:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + CONTROL "&Simge Olarak", 214, "Button", BS_AUTOCHECKBOX|WS_TABSTOP,3, 45, 71, 12 + DEFPUSHBUTTON "Tamam", 1, 158, 6, 47, 14 + PUSHBUTTON "Ýptal", 2, 158, 23, 47, 14 + PUSHBUTTON "&Yardým", 254, 158, 43, 47, 14 +} + +IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Hedefi seç" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "&Yol:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "Tamam", 1, 158, 6, 47, 14 + PUSHBUTTON "Ýptal", 2, 158, 23, 47, 14 + PUSHBUTTON "&Gözat", 254, 158, 43, 47, 14 +} + +IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Dosya Türüne Göre" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Ad:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "Dosya Türü",-1,7,23,87,56 + CONTROL "&Dizinler",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Programlar",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "&Belgeler",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Diðer dosyalar",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "Gizli/Sistem Özellikli Dosyalarý &Göster",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,140,9 + DEFPUSHBUTTON "Tamam",IDOK,104,7,50,14 + PUSHBUTTON "Ýptal",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "%s Özellikleri" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "Tamam",IDOK,191,7,50,14 + PUSHBUTTON "Ýptal",IDCANCEL,191,29,50,14 + LTEXT "&Dosya Adý:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Tam &Yol:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Son Deðiþme:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Sürüm:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "&Telif Hakký:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Boyut:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Özellikler",-1,7,79,158,46 + CONTROL "&Salt Okunur",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "&Gizli",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&Arþiv",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&Sistem",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "S&ýkýþýk",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "S&ürüm Bilgisi",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "Yazý tipi ayarlarý uygulanýyor" + IDS_FONT_SEL_ERROR "Yeni yazý tipi seçerken hata." +} + +STRINGTABLE +{ + IDS_WINEFILE "Winefile" + IDS_ERROR "Hata" + IDS_ROOT_FS "kök ds" + IDS_UNIXFS "unixfs" + IDS_DESKTOP "Masaüstü" + IDS_SHELL "Kabuk" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "Henüz tamamlanmadý" + IDS_WINE "WINE" + IDS_WINE_FILE "Wine Dosya Yöneticisi" +} + +STRINGTABLE +{ + IDS_COL_NAME "Ad" + IDS_COL_SIZE "Boyut" + IDS_COL_CDATE "OTarihi" + IDS_COL_ADATE "ETarihi" + IDS_COL_MDATE "DTarihi" + IDS_COL_IDX "Ýndeks/Düðüm" + IDS_COL_LINKS "Baðlantýlar" + IDS_COL_ATTR "Özellikler" + IDS_COL_SEC "Güvenlik" + + IDS_FREE_SPACE_FMT "%s / %s boþ" +} diff --git a/rosapps/winefile/lang/zh-CN.rc b/rosapps/winefile/lang/zh-CN.rc index d68cd5e101b..d9b43311d82 100644 --- a/rosapps/winefile/lang/zh-CN.rc +++ b/rosapps/winefile/lang/zh-CN.rc @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED diff --git a/rosapps/winefile/resource.h b/rosapps/winefile/resource.h index 9b3659387ac..358dc8656c9 100644 --- a/rosapps/winefile/resource.h +++ b/rosapps/winefile/resource.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ @@ -25,7 +25,7 @@ #define IDI_WINEFILE 100 -/* accellerators and menus */ +/* accelerators and menus */ #define IDA_WINEFILE 101 #define IDM_WINEFILE 102 @@ -63,6 +63,7 @@ #define ID_VIEW_TOOL_BAR 508 #define ID_VIEW_DRIVE_BAR 507 #define ID_VIEW_STATUSBAR 503 +#define ID_VIEW_SAVESETTINGS 511 #define ID_ABOUT 1803 #define ID_REFRESH 1704 @@ -140,7 +141,6 @@ #define IDS_WARRANTY_CAPTION 1302 #define IDS_WARRANTY 1303 - /* range for drive bar command ids: 0x9000..0x90FF */ #ifdef __WINE__ diff --git a/rosapps/winefile/resource.rc b/rosapps/winefile/resource.rc deleted file mode 100644 index b53aa7e3cb3..00000000000 --- a/rosapps/winefile/resource.rc +++ /dev/null @@ -1,293 +0,0 @@ -/* - * Copyright 2000 Martin Fuchs - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -IDA_WINEFILE ACCELERATORS DISCARDABLE -BEGIN - VK_F1, ID_HELP, VIRTKEY, NOINVERT - VK_F5, ID_REFRESH, VIRTKEY, NOINVERT - VK_F7, ID_FILE_MOVE, VIRTKEY, NOINVERT - VK_F8, ID_FILE_COPY, VIRTKEY, NOINVERT - VK_DELETE, ID_FILE_DELETE, VIRTKEY, NOINVERT - VK_RETURN, ID_ACTIVATE, VIRTKEY, NOINVERT - VK_RETURN, ID_EDIT_PROPERTIES, VIRTKEY, ALT, NOINVERT -#ifndef _NO_EXTENSIONS - "X", ID_FILE_EXIT, VIRTKEY, ALT, NOINVERT - "S", ID_VIEW_FULLSCREEN, VIRTKEY, SHIFT, CONTROL, NOINVERT - VK_ADD, ID_PREFERRED_SIZES, VIRTKEY, CONTROL, NOINVERT -#endif -END - -IDI_WINEFILE ICON DISCARDABLE -#ifdef _WIN32 - "winefile.ico" -#else -BEGIN - '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' - '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' - '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00' - '00 00 80 00 80 00 80 80 00 00 C0 C0 C0 00 80 80' - '80 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00' - '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 B7' - 'B7 B7 B7 B7 B7 B7 B7 70 00 00 00 00 00 00 00 70' - '00 00 00 00 00 00 0B 73 00 00 00 00 00 00 00 B3' - 'F7 B7 B7 B7 B7 B7 07 73 30 00 00 00 00 00 00 73' - 'FB 7B 7B 7B 7B 7B 0B 73 33 00 00 00 00 00 00 B3' - 'F7 BF FF FF F7 B7 07 73 33 00 00 00 00 00 00 73' - 'FB 70 33 33 0B 7B 0B 73 33 00 0F FF FF 00 00 B3' - 'F7 B0 33 33 07 B7 07 73 33 00 F0 00 00 F0 00 73' - 'FB 70 00 00 0B 7B 0B 73 33 00 00 00 00 00 00 B3' - 'F7 B7 B7 B7 B7 B7 07 73 33 00 00 00 00 00 00 73' - 'FF FF FF FF FF FF 0B 73 33 00 00 02 00 00 00 B3' - '33 33 33 33 33 33 07 73 33 00 00 09 00 00 00 7B' - '7B 7B 7B 7B 7B 7B 7B 73 33 00 00 99 90 00 00 B0' - '00 00 00 00 00 00 07 73 33 00 0B BB BB 00 00 73' - 'FB 7B 7B 7B 7B 7B 0B 73 33 00 BB BB BB B0 00 B3' - 'F7 B7 B7 B7 B7 B7 07 73 33 00 00 00 E0 00 00 73' - 'FB 7F FF FF FB 7B 0B 73 33 00 00 00 0E 00 00 B3' - 'F7 B0 33 33 07 B7 07 73 33 00 00 00 00 00 00 73' - 'FB 70 33 33 0B 7B 0B 73 33 00 00 00 00 00 00 B3' - 'F7 B0 00 00 07 B7 07 73 33 00 00 00 00 00 00 73' - 'FB 7B 7B 7B 7B 7B 0B 73 33 00 00 00 00 00 00 B3' - 'FF FF FF FF FF FF 07 73 33 00 00 00 00 00 00 73' - '33 33 33 33 33 33 0B 73 33 00 00 00 00 00 00 B7' - 'B7 B7 B7 B7 B7 B7 B7 73 33 00 00 00 00 00 00 FF' - 'FF FF FF FF FF FF FF F3 33 00 00 00 00 00 00 07' - 'B7 B7 B7 B7 B7 B7 B7 BF 33 00 00 00 00 00 00 00' - '7B 7B 7B 7B 7B 7B 7B 7B F3 00 00 00 00 00 00 00' - '07 B7 B7 B7 B7 B7 B7 B7 BF 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF' - 'FF FF 80 00 1F FF 80 00 0F FF 80 00 07 FF 80 00' - '03 FF 80 00 01 FF 80 00 01 FF 80 00 01 83 80 00' - '01 39 80 00 01 C7 80 00 01 EF 80 00 01 EF 80 00' - '01 EF 80 00 01 C7 80 00 01 83 80 00 01 01 80 00' - '01 F7 80 00 01 FB 80 00 01 FF 80 00 01 FF 80 00' - '01 FF 80 00 01 FF 80 00 01 FF 80 00 01 FF 80 00' - '01 FF 80 00 01 FF C0 00 01 FF E0 00 01 FF F0 00' - '01 FF F8 00 01 FF FF FF FF FF FF FF FF FF' -END -#endif - -IDB_TOOLBAR BITMAP DISCARDABLE -#ifdef _WIN32 - "toolbar.bmp" -#else -BEGIN - '42 4D BE 03 00 00 00 00 00 00 76 00 00 00 28 00' - '00 00 70 00 00 00 0F 00 00 00 01 00 04 00 00 00' - '00 00 48 03 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80' - '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80' - '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF' - '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF' - '00 00 FF FF FF 00 77 77 77 88 88 88 88 88 77 77' - '77 77 77 77 77 77 77 88 88 88 88 88 88 87 77 88' - '88 88 88 88 88 87 77 88 88 88 88 88 88 88 78 88' - '88 88 88 88 88 87 77 77 77 07 07 07 07 07 77 77' - '74 44 44 44 44 48 77 77 77 88 88 88 88 88 74 44' - '44 44 44 44 44 87 74 44 44 44 44 44 44 87 74 44' - '44 44 44 44 44 48 44 44 44 44 44 44 44 87 77 77' - '77 77 77 77 77 70 77 77 74 FF FF FF FF 48 77 77' - '74 44 44 44 44 48 74 FF FF FF FF FF F4 87 74 FF' - 'FF F4 FF FF F4 87 74 FF FF F4 FF FF FF 48 4F FF' - 'FF 4F FF FF F4 87 07 07 07 07 77 77 77 77 77 77' - '74 FF FF FF FF 48 77 77 74 FF FF FF FF 48 74 FF' - 'FF FF FF FF F4 87 74 FF FF F4 FF FF F4 87 74 FF' - 'FF F4 FF FF FF 48 4F FF FF 44 44 44 44 87 77 77' - '77 77 77 77 77 70 77 88 88 88 88 88 FF 48 77 77' - '84 FF FF FF FF 48 74 FF FF FF FF FF F4 87 74 FF' - 'FF F4 FF FF F4 87 74 FF FF F4 44 44 44 48 4F FF' - 'FF 44 44 44 44 87 07 77 77 07 77 77 77 77 74 44' - '8B 44 44 48 44 48 77 74 44 FF FF FF FF 48 74 44' - '44 44 44 44 44 87 74 FF FF F4 FF FF F4 87 74 FF' - 'FF F4 44 44 44 48 4F FF FF 4F FF 4F F4 87 77 77' - '77 70 70 70 70 70 7B FF 8B FF FF 48 44 47 77 74' - 'F4 44 44 44 44 48 74 44 44 44 44 44 44 87 74 FF' - 'FF F4 FF FF F4 87 74 FF FF F4 FF F4 FF 48 44 44' - '44 44 44 44 44 87 07 77 77 07 07 07 07 07 78 B8' - '8B F8 BF 48 77 77 77 84 F4 44 44 44 44 47 74 44' - '44 44 44 44 44 87 74 FF FF F4 FF FF F4 87 74 44' - '44 44 FF F4 FF 48 44 44 44 44 44 44 44 77 70 70' - '70 70 70 77 77 77 74 8B 8B 8B FF 48 88 87 74 44' - 'FF FF FF FF 48 77 74 FF FF FF FF FF F4 87 74 FF' - 'FF F4 FF FF F4 87 74 44 44 44 FF F4 FF 48 77 77' - '77 77 77 77 77 77 00 F7 07 07 07 70 70 77 7B B8' - 'BB B4 44 48 44 87 74 F4 44 44 44 44 48 77 74 FF' - 'FF FF FF FF F4 87 74 FF FF F4 FF FF F4 87 74 FF' - 'FF F4 FF F4 FF 48 7C CC 77 CC 77 C7 7C 77 00 F7' - '78 87 77 77 77 07 74 88 BB B4 44 44 F4 87 74 F4' - '44 44 44 44 47 77 74 FF FF FF FF FF F4 87 74 FF' - 'FF F4 FF FF F4 87 74 FF FF F4 FF F4 FF 48 C7 7C' - '7C 7C 7C 77 C7 C7 70 0F 00 F7 77 77 77 77 77 8B' - '8B 8B FF FF F4 87 74 FF FF FF FF 48 77 77 74 44' - '44 44 44 44 44 87 74 44 44 44 44 44 44 87 74 FF' - 'FF F4 FF F4 FF 48 7C CC 7C 7C 7C 77 C7 C7 77 08' - '07 77 77 77 77 07 78 B7 8B FF FF FF F4 87 74 44' - '44 44 44 48 77 77 74 44 44 44 44 44 44 87 74 44' - '44 44 44 44 44 87 74 44 44 44 44 44 44 48 77 7C' - '7C 7C 7C 77 C7 C7 77 80 0F 77 77 77 77 77 7B 77' - '8B 44 8B 44 44 87 74 44 44 44 44 47 77 77 74 44' - '44 44 44 44 44 77 74 44 44 44 44 44 44 77 74 44' - '44 44 44 44 44 47 7C C7 7C 7C 7C C7 7C 77 80 07' - '70 F7 07 07 07 07 77 77 8B 44 54 44 44 77 77 77' - '77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77' - '77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77' - '77 77 7C 77 77 77 08 77 70 00 70 70 70 77' -END -#endif - -IDB_DRIVEBAR BITMAP DISCARDABLE -#ifdef _WIN32 - "drivebar.bmp" -#else -BEGIN - '42 4D E6 02 00 00 00 00 00 00 76 00 00 00 28 00' - '00 00 60 00 00 00 0D 00 00 00 01 00 04 00 00 00' - '00 00 70 02 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80' - '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80' - '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF' - '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF' - '00 00 FF FF FF 00 77 77 77 77 77 77 77 77 77 77' - '77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77' - '77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77' - '77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77' - '77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77' - '77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77' - '77 77 77 77 77 77 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 08 88 88 88 88 88 88 80 08 88' - '88 88 88 88 88 80 08 88 88 88 88 88 88 80 08 88' - '88 88 88 88 88 80 08 88 88 88 88 88 88 80 08 88' - '88 88 88 88 88 80 07 70 07 77 77 70 00 80 0F 77' - '77 77 77 77 77 80 0F 00 77 77 77 77 77 80 0F 77' - '77 77 77 79 97 80 0F 77 70 00 77 77 77 80 0F 77' - '07 07 07 07 77 80 07 77 70 07 00 00 77 80 0F 77' - '70 00 00 07 77 80 0F 00 00 00 00 00 00 80 0F 77' - '70 00 07 77 77 80 0F 77 77 07 77 77 77 80 0F 70' - '00 00 00 00 77 80 07 77 77 00 00 77 77 80 0F 00' - '00 00 00 00 00 80 0F 77 77 77 77 77 77 80 0F 77' - '07 7F 70 77 77 80 0F 77 70 00 77 77 77 80 0F 70' - '70 70 70 70 77 80 07 70 00 77 70 00 77 80 0F 77' - '70 00 00 07 77 80 0F 00 00 00 00 00 00 80 0F 00' - '87 F8 78 00 77 80 0F 00 00 70 00 00 07 80 0F 70' - '00 00 00 00 77 80 07 07 77 77 77 70 00 80 0F 77' - '77 77 77 77 70 80 0F 77 77 77 77 77 77 80 0F 00' - '00 00 00 00 77 80 0F 77 77 77 77 77 77 80 0F 77' - '07 07 07 07 77 80 07 77 77 77 77 77 77 80 0F FF' - 'FF FF FF FF FF 80 0F FF FF FF FF FF FF 80 0F FF' - 'FF FF FF FF FF 80 0F FF FF FF FF FF FF 80 0F FF' - 'FF FF FF FF FF 80 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 77 77 77 77 77 77 77 77 77 77' - '77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77' - '77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77' - '77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77' - '77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77' - '77 77 77 77 77 77 77 77 77 77 77 77 77 77 77 77' - '77 77 77 77 77 77' -END -#endif - -IDB_IMAGES BITMAP DISCARDABLE -#ifdef _WIN32 - "images.bmp" -#else -BEGIN - '42 4D 86 04 00 00 00 00 00 00 76 00 00 00 28 00' - '00 00 A0 00 00 00 0D 00 00 00 01 00 04 00 00 00' - '00 00 10 04 00 00 00 00 00 00 00 00 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80' - '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80' - '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF' - '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF' - '00 00 FF FF FF 00 AA AA 00 00 00 00 00 AA AA AA' - '00 00 00 00 00 AA AA 00 00 00 00 00 00 00 AA 00' - '00 00 00 00 00 00 AA A0 00 00 00 00 00 0A AA 00' - '00 00 00 00 00 00 AA A0 00 00 00 00 00 0A AA A0' - '00 00 00 00 00 0A AA AA AA AA AA AA AA AA AA AA' - 'AA AA AA AA AA AA AA A7 77 77 77 77 70 AA AA A7' - '77 77 77 77 70 AA A7 77 77 77 77 77 77 70 A7 77' - '77 77 77 77 77 80 AA 77 77 77 77 77 77 0A A7 77' - '77 77 77 77 77 80 AA 77 77 77 77 77 77 0A AA 77' - '77 77 77 77 77 0A AA AA AA AA AA AA AA AA AA AA' - 'AA AA AA AA AA AA AA A7 FF FF FF FF 70 AA AA A7' - 'FF FF FF FF 70 AA A7 7F 7F 7F 7F 7F 7F 70 A7 FB' - 'FB FB FB FB FB 80 AA 7F BF BF BF BF B7 0A A7 FB' - 'FB FB FB FB FB 80 AA 7F BF BF BF BF B7 0A AA 7F' - 'BF BF BF BF B7 0A AA AA AA 00 00 00 0A AA AA AA' - 'AA 00 AA AA AA AA AA A7 FF FF FF FF 70 AA AA A7' - 'FF 44 44 FF 70 AA A7 F7 F7 F7 F7 F7 F7 70 A7 FF' - 'BF BF BF BF BF 80 A7 FB FB FB FB FB F0 8A A7 FF' - 'BF B0 BF BF BF 80 A7 FB FB F0 FB FB F0 8A A7 FB' - 'FB FB FB FB F0 8A AA AA A0 E6 68 86 0A AA AA AA' - 'A0 E8 0A AA AA AA AA A7 FF FF FF FF 70 AA AA A7' - 'FF FF FF FF 70 AA A7 7F 7F 7F 7F 7F 7F 70 A7 FB' - 'FB FB FB FB FB 80 A7 BF BF BF BF BF 70 8A A7 FB' - 'FB F0 FB FB FB 80 A7 BF B0 00 0F BF 70 8A A7 BF' - 'B0 00 0F BF 70 8A AA AA A0 E0 00 00 AA AA AA AA' - 'A0 E8 0A AA AA AA AA A7 FF FF FF FF 70 AA AA A7' - 'FF 44 44 FF 70 AA A7 F7 F7 F7 F7 F7 F7 70 A7 FF' - 'BF BF BF BF BF 80 7B FB FB FB FB FB 88 8A A7 FF' - 'B0 00 00 BF BF 80 7B FB FB 0B FB FB 88 8A 7B FB' - 'FB FB FB FB 88 8A AA AA A0 E0 AA AA AA AA AA AA' - 'AA 00 AA AA AA AA AA A7 FF FF FF FF 70 AA AA A7' - 'FF FF FF FF 70 AA A7 7F 7F 7F 7F 7F 7F 70 A7 FB' - 'FB FB FB FB FB 80 7F FF FF FF FF F7 0F 8A A7 FB' - 'FB F0 FB FB FB 80 7F FF FF FF FF F7 0F 8A 7F FF' - 'FF FF FF F7 0F 8A AA AA A0 E0 AA AA AA AA AA AA' - 'AA AA AA AA AA AA AA A7 FF FF FF FF 70 AA AA A7' - 'FF 44 44 FF 70 AA A7 F7 F7 F7 F7 F7 F7 70 A7 FF' - 'BF BF BF BF BF 80 77 77 77 77 77 78 FB 8A A7 FF' - 'BF B0 BF BF BF 80 77 77 77 77 77 78 FB 8A 77 77' - '77 77 77 78 FB 8A AA A0 00 E0 00 AA AA AA AA AA' - 'AA AA AA AA AA AA AA A7 FF FF FF FF 70 AA AA A7' - 'FF FF FF FF 70 AA A7 7F 7F 7F 7F 7F 7F 70 A7 FB' - 'FB FB FB FB FB 80 A7 BF BF BF BF BF BF 8A A7 FB' - 'FB FB FB FB FB 80 A7 BF BF BF BF BF BF 8A A7 BF' - 'BF BF BF BF BF 8A AA A0 E6 66 60 AA AA AA AA AA' - 'AA AA AA AA AA AA AA A7 FF FF F7 77 7A AA AA A7' - 'FF 44 F7 77 7A AA A7 F7 F7 F7 F7 F7 F7 70 A7 FF' - 'FF FF FF FF FF 80 A7 FB FB FB FF FF FF 8A A7 FF' - 'FF FF FF FF FF 80 A7 FB FB FB FF FF FF 8A A7 FB' - 'FB FB FF FF FF 8A AA AA 0E 66 0A AA AA AA AA AA' - 'AA AA AA AA AA AA AA A7 FF FF F7 F7 AA AA AA A7' - 'FF FF F7 F7 AA AA A7 77 77 77 77 77 77 70 A7 FB' - 'FB FB F7 77 77 8A A7 BF BF BF F7 77 77 8A A7 FB' - 'FB FB F7 77 77 8A A7 BF BF BF F7 77 77 8A A7 BF' - 'BF BF F7 77 77 8A AA AA A0 E0 AA AA AA AA AA AA' - 'AA AA AA AA AA AA AA A7 FF FF F7 7A AA AA AA A7' - 'FF FF F7 7A AA AA A7 EE EE EE EE EE EE 70 AA 7F' - 'BF BF 7A AA AA AA AA 7F FF FF 7A AA AA AA AA 7F' - 'BF BF 7A AA AA AA AA 7F FF FF 7A AA AA AA AA 7F' - 'FF FF 7A AA AA AA AA AA AA 0A AA AA AA AA AA AA' - 'AA AA AA AA AA AA AA A7 77 77 77 AA AA AA AA A7' - '77 77 77 AA AA AA A7 77 77 77 77 77 77 7A AA A7' - '77 77 AA AA AA AA AA A7 77 77 AA AA AA AA AA A7' - '77 77 AA AA AA AA AA A7 77 77 AA AA AA AA AA A7' - '77 77 AA AA AA AA AA AA AA AA AA AA AA AA AA AA' - 'AA AA AA AA AA AA' -END -#endif diff --git a/rosapps/winefile/splitpath.c b/rosapps/winefile/splitpath.c index 7081f75d3d1..42286eccac8 100644 --- a/rosapps/winefile/splitpath.c +++ b/rosapps/winefile/splitpath.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #include "winefile.h" @@ -33,18 +33,18 @@ void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* if (drv) { *drv++ = *path++; *drv++ = *path++; - *drv = L'\0'; + *drv = '\0'; } } else if (drv) - *drv = L'\0'; + *drv = '\0'; /* search for end of string or stream separator */ - for(end=path; *end && *end!=L':'; ) + for(end=path; *end && *end!=':'; ) end++; /* search for begin of file extension */ - for(p=end; p>path && *--p!=L'\\' && *p!=L'/'; ) - if (*p == L'.') { + for(p=end; p>path && *--p!='\\' && *p!='/'; ) + if (*p == '.') { end = p; break; } @@ -64,14 +64,14 @@ void _wsplitpath(const WCHAR* path, WCHAR* drv, WCHAR* dir, WCHAR* name, WCHAR* for(s=p; sleft.hwnd, WM_SETFONT, (WPARAM)Globals.hfont, TRUE); + SendMessageW(child->right.hwnd, WM_SETFONT, (WPARAM)Globals.hfont, TRUE); + SendMessageW(child->left.hwnd, LB_SETITEMHEIGHT, 1, max(Globals.spaceSize.cy,IMAGE_HEIGHT+3)); + SendMessageW(child->right.hwnd, LB_SETITEMHEIGHT, 1, max(Globals.spaceSize.cy,IMAGE_HEIGHT+3)); + InvalidateRect(child->left.hwnd, NULL, TRUE); + InvalidateRect(child->right.hwnd, NULL, TRUE); + } + + SelectObject(hdc, hFontOld); + } + else if (CommDlgExtendedError()) { + LoadStringW(Globals.hInstance, IDS_FONT_SEL_DLG_NAME, dlg_name, BUFFER_LEN); + LoadStringW(Globals.hInstance, IDS_FONT_SEL_ERROR, dlg_info, BUFFER_LEN); + MessageBoxW(hwnd, dlg_info, dlg_name, MB_OK); + } + + ReleaseDC(hwnd, hdc); +} + +#ifdef __WINE__ + #ifdef UNICODE /* call vswprintf() in msvcrt.dll */ @@ -305,7 +373,7 @@ static LPCWSTR my_wcsrchr(LPCWSTR str, WCHAR c) /* allocate and initialise a directory entry */ static Entry* alloc_entry(void) { - Entry* entry = (Entry*) malloc(sizeof(Entry)); + Entry* entry = HeapAlloc(GetProcessHeap(), 0, sizeof(Entry)); #ifdef _SHELL_FOLDERS entry->pidl = NULL; @@ -330,7 +398,7 @@ static void free_entry(Entry* entry) IMalloc_Free(Globals.iMalloc, entry->pidl); #endif - free(entry); + HeapFree(GetProcessHeap(), 0, entry); } /* recursively free all child entries */ @@ -441,7 +509,7 @@ static Entry* find_entry_win(Entry* dir, LPCTSTR name) LPCTSTR q = entry->data.cFileName; do { - if (!*p || *p==TEXT('\\') || *p==TEXT('/')) + if (!*p || *p == '\\' || *p == '/') return entry; } while(tolower(*p++) == tolower(*q++)); @@ -449,7 +517,7 @@ static Entry* find_entry_win(Entry* dir, LPCTSTR name) q = entry->data.cAlternateFileName; do { - if (!*p || *p==TEXT('\\') || *p==TEXT('/')) + if (!*p || *p == '\\' || *p == '/') return entry; } while(tolower(*p++) == tolower(*q++)); } @@ -472,14 +540,14 @@ static Entry* read_tree_win(Root* root, LPCTSTR path, SORT_ORDER sortOrder, HWND #endif while(entry) { - while(*s && *s!=TEXT('\\') && *s!=TEXT('/')) + while(*s && *s != '\\' && *s != '/') *d++ = *s++; - while(*s==TEXT('\\') || *s==TEXT('/')) + while(*s == '\\' || *s == '/') s++; - *d++ = TEXT('\\'); - *d = TEXT('\0'); + *d++ = '\\'; + *d = '\0'; read_directory(entry, buffer, sortOrder, hwnd); @@ -510,7 +578,7 @@ static BOOL time_to_filetime(const time_t* t, FILETIME* ftime) stime.wYear = tm->tm_year+1900; stime.wMonth = tm->tm_mon+1; - /* stime.wDayOfWeek */ + /* stime.wDayOfWeek */ stime.wDay = tm->tm_mday; stime.wHour = tm->tm_hour; stime.wMinute = tm->tm_min; @@ -620,7 +688,7 @@ static Entry* find_entry_unix(Entry* dir, LPCTSTR name) LPCTSTR q = entry->data.cFileName; do { - if (!*p || *p==TEXT('/')) + if (!*p || *p == '/') return entry; } while(*p++ == *q++); } @@ -640,14 +708,14 @@ static Entry* read_tree_unix(Root* root, LPCTSTR path, SORT_ORDER sortOrder, HWN entry->etype = ET_UNIX; while(entry) { - while(*s && *s!=TEXT('/')) + while(*s && *s != '/') *d++ = *s++; - while(*s == TEXT('/')) + while(*s == '/') s++; - *d++ = TEXT('/'); - *d = TEXT('\0'); + *d++ = '/'; + *d = '\0'; read_directory(entry, buffer, sortOrder, hwnd); @@ -859,7 +927,7 @@ static HICON extract_icon(IShellFolder* folder, LPCITEMIDLIST pidl) HICON hicon; int idx; - if (SUCCEEDED((*pExtract->lpVtbl->GetIconLocation)(pExtract, GIL_FORSHELL, path, _MAX_PATH, &idx, &flags))) { + if (SUCCEEDED(IExtractIconW_GetIconLocation(pExtract, GIL_FORSHELL, path, _MAX_PATH, &idx, &flags))) { if (!(flags & GIL_NOTFILENAME)) { if (idx == -1) idx = 0; /* special case for some control panel applications */ @@ -869,7 +937,7 @@ static HICON extract_icon(IShellFolder* folder, LPCITEMIDLIST pidl) } else { HICON hIconLarge = 0; - HRESULT hr = (*pExtract->lpVtbl->Extract)(pExtract, path, idx, &hIconLarge, &hicon, MAKELONG(0/*GetSystemMetrics(SM_CXICON)*/,GetSystemMetrics(SM_CXSMICON))); + HRESULT hr = IExtractIconW_Extract(pExtract, path, idx, &hIconLarge, &hicon, MAKELONG(0/*GetSystemMetrics(SM_CXICON)*/,GetSystemMetrics(SM_CXSMICON))); if (SUCCEEDED(hr)) DestroyIcon(hIconLarge); @@ -1181,8 +1249,8 @@ static int compareExt(const void* arg1, const void* arg2) name1 = fd1->cFileName; name2 = fd2->cFileName; - ext1 = _tcsrchr(name1, TEXT('.')); - ext2 = _tcsrchr(name2, TEXT('.')); + ext1 = _tcsrchr(name1, '.'); + ext2 = _tcsrchr(name2, '.'); if (ext1) ext1++; @@ -1270,7 +1338,7 @@ static void SortDirectory(Entry* dir, SORT_ORDER sortOrder) (*p)->next = 0; - HeapFree(GetProcessHeap(), 0, array); + HeapFree(GetProcessHeap(), 0, array); } } @@ -1294,7 +1362,7 @@ static void read_directory(Entry* dir, LPCTSTR path, SORT_ORDER sortOrder, HWND while(*s) *d++ = *s++; - *d++ = TEXT('\\'); + *d++ = '\\'; for(entry=dir->down; entry; entry=entry->next) if (entry->data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { @@ -1317,7 +1385,7 @@ static void read_directory(Entry* dir, LPCTSTR path, SORT_ORDER sortOrder, HWND while(*s) *d++ = *s++; - *d++ = TEXT('/'); + *d++ = '/'; for(entry=dir->down; entry; entry=entry->next) if (entry->data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { @@ -1339,7 +1407,7 @@ static void read_directory(Entry* dir, LPCTSTR path, SORT_ORDER sortOrder, HWND while(*s) *d++ = *s++; - *d++ = TEXT('\\'); + *d++ = '\\'; for(entry=dir->down; entry; entry=entry->next) if (entry->data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { @@ -1357,9 +1425,9 @@ static void read_directory(Entry* dir, LPCTSTR path, SORT_ORDER sortOrder, HWND static Entry* read_tree(Root* root, LPCTSTR path, LPITEMIDLIST pidl, LPTSTR drv, SORT_ORDER sortOrder, HWND hwnd) { #if !defined(_NO_EXTENSIONS) && defined(__WINE__) - const static TCHAR sSlash[] = {'/', '\0'}; + static const TCHAR sSlash[] = {'/', '\0'}; #endif - const static TCHAR sBackslash[] = {'\\', '\0'}; + static const TCHAR sBackslash[] = {'\\', '\0'}; #ifdef _SHELL_FOLDERS if (pidl) @@ -1421,9 +1489,9 @@ static ChildWnd* alloc_child_window(LPCTSTR path, LPITEMIDLIST pidl, HWND hwnd) TCHAR drv[_MAX_DRIVE+1], dir[_MAX_DIR], name[_MAX_FNAME], ext[_MAX_EXT]; TCHAR dir_path[MAX_PATH]; TCHAR b1[BUFFER_LEN]; - const static TCHAR sAsterics[] = {'*', '\0'}; + static const TCHAR sAsterics[] = {'*', '\0'}; - ChildWnd* child = (ChildWnd*) malloc(sizeof(ChildWnd)); + ChildWnd* child = HeapAlloc(GetProcessHeap(), 0, sizeof(ChildWnd)); Root* root = &child->root; Entry* entry; @@ -1490,7 +1558,7 @@ static ChildWnd* alloc_child_window(LPCTSTR path, LPITEMIDLIST pidl, HWND hwnd) static void free_child_window(ChildWnd* child) { free_entries(&child->root.entry); - free(child); + HeapFree(GetProcessHeap(), 0, child); } @@ -1507,7 +1575,7 @@ static void get_path(Entry* dir, PTSTR path) SFGAOF attribs; HRESULT hr = S_OK; - path[0] = TEXT('\0'); + path[0] = '\0'; attribs = 0; @@ -1532,7 +1600,7 @@ static void get_path(Entry* dir, PTSTR path) name = entry->data.cFileName; s = name; - for(l=0; *s && *s!=TEXT('/') && *s!=TEXT('\\'); s++) + for(l=0; *s && *s != '/' && *s != '\\'; s++) l++; } @@ -1544,10 +1612,10 @@ static void get_path(Entry* dir, PTSTR path) #ifndef _NO_EXTENSIONS if (entry->etype == ET_UNIX) - path[0] = TEXT('/'); + path[0] = '/'; else #endif - path[0] = TEXT('\\'); + path[0] = '\\'; } entry = entry->up; @@ -1562,16 +1630,95 @@ static void get_path(Entry* dir, PTSTR path) if (!level) { #ifndef _NO_EXTENSIONS if (entry->etype == ET_UNIX) - path[len++] = TEXT('/'); + path[len++] = '/'; else #endif - path[len++] = TEXT('\\'); + path[len++] = '\\'; } - path[len] = TEXT('\0'); + path[len] = '\0'; } } +static windowOptions load_registry_settings(void) +{ + DWORD size; + DWORD type; + HKEY hKey; + windowOptions opts; + LOGFONT logfont; + + RegOpenKeyExW( HKEY_CURRENT_USER, registry_key, + 0, KEY_QUERY_VALUE, &hKey ); + + size = sizeof(DWORD); + + if( RegQueryValueExW( hKey, reg_start_x, NULL, &type, + (LPBYTE) &opts.start_x, &size ) != ERROR_SUCCESS ) + opts.start_x = CW_USEDEFAULT; + + if( RegQueryValueExW( hKey, reg_start_y, NULL, &type, + (LPBYTE) &opts.start_y, &size ) != ERROR_SUCCESS ) + opts.start_y = CW_USEDEFAULT; + + if( RegQueryValueExW( hKey, reg_width, NULL, &type, + (LPBYTE) &opts.width, &size ) != ERROR_SUCCESS ) + opts.width = CW_USEDEFAULT; + + if( RegQueryValueExW( hKey, reg_height, NULL, &type, + (LPBYTE) &opts.height, &size ) != ERROR_SUCCESS ) + opts.height = CW_USEDEFAULT; + size=sizeof(logfont); + if( RegQueryValueExW( hKey, reg_logfont, NULL, &type, + (LPBYTE) &logfont, &size ) != ERROR_SUCCESS ) + GetObject(GetStockObject(DEFAULT_GUI_FONT),sizeof(logfont),&logfont); + + RegCloseKey( hKey ); + + Globals.hfont = CreateFontIndirect(&logfont); + return opts; +} + +static void save_registry_settings(void) +{ + WINDOWINFO wi; + HKEY hKey; + INT width, height; + LOGFONT logfont; + + wi.cbSize = sizeof( WINDOWINFO ); + GetWindowInfo(Globals.hMainWnd, &wi); + width = wi.rcWindow.right - wi.rcWindow.left; + height = wi.rcWindow.bottom - wi.rcWindow.top; + + if ( RegOpenKeyExW( HKEY_CURRENT_USER, registry_key, + 0, KEY_SET_VALUE, &hKey ) != ERROR_SUCCESS ) + { + /* Unable to save registry settings - try to create key */ + if ( RegCreateKeyExW( HKEY_CURRENT_USER, registry_key, + 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_SET_VALUE, NULL, &hKey, NULL ) != ERROR_SUCCESS ) + { + /* FIXME: Cannot create key */ + return; + } + } + /* Save all of the settings */ + RegSetValueExW( hKey, reg_start_x, 0, REG_DWORD, + (LPBYTE) &wi.rcWindow.left, sizeof(DWORD) ); + RegSetValueExW( hKey, reg_start_y, 0, REG_DWORD, + (LPBYTE) &wi.rcWindow.top, sizeof(DWORD) ); + RegSetValueExW( hKey, reg_width, 0, REG_DWORD, + (LPBYTE) &width, sizeof(DWORD) ); + RegSetValueExW( hKey, reg_height, 0, REG_DWORD, + (LPBYTE) &height, sizeof(DWORD) ); + GetObject(Globals.hfont, sizeof(logfont), &logfont); + RegSetValueExW( hKey, reg_logfont, 0, REG_BINARY, + (LPBYTE) &logfont, sizeof(LOGFONT) ); + + /* TODO: Save more settings here (List vs. Detailed View, etc.) */ + RegCloseKey( hKey ); +} static void resize_frame_rect(HWND hwnd, PRECT prect) { @@ -1670,11 +1817,11 @@ static HWND create_child_window(ChildWnd* child) UnhookWindowsHookEx(hcbthook); - (void)ListBox_SetItemHeight(child->left.hwnd, 1, max(Globals.spaceSize.cy,IMAGE_HEIGHT+3)); - (void)ListBox_SetItemHeight(child->right.hwnd, 1, max(Globals.spaceSize.cy,IMAGE_HEIGHT+3)); + SendMessage(child->left.hwnd, LB_SETITEMHEIGHT, 1, max(Globals.spaceSize.cy,IMAGE_HEIGHT+3)); + SendMessage(child->right.hwnd, LB_SETITEMHEIGHT, 1, max(Globals.spaceSize.cy,IMAGE_HEIGHT+3)); - idx = ListBox_FindItemData(child->left.hwnd, 0, child->left.cur); - (void)ListBox_SetCurSel(child->left.hwnd, idx); + idx = SendMessage(child->left.hwnd, LB_FINDSTRING, 0, (LPARAM)child->left.cur); + SendMessage(child->left.hwnd, LB_SETCURSEL, idx, 0); return child->hwnd; } @@ -1699,8 +1846,7 @@ static INT_PTR CALLBACK ExecuteDialogDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam if (id == IDOK) { GetWindowText(GetDlgItem(hwnd, 201), dlg->cmd, MAX_PATH); - dlg->cmdshow = Button_GetState(GetDlgItem(hwnd,214))&BST_CHECKED? - SW_SHOWMINIMIZED: SW_SHOWNORMAL; + dlg->cmdshow = get_check(hwnd,214) ? SW_SHOWMINIMIZED : SW_SHOWNORMAL; EndDialog(hwnd, id); } else if (id == IDCANCEL) EndDialog(hwnd, id); @@ -1762,11 +1908,11 @@ static INT_PTR CALLBACK FilterDialogDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, case WM_INITDIALOG: dlg = (struct FilterDialog*) lparam; SetWindowText(GetDlgItem(hwnd, IDC_VIEW_PATTERN), dlg->pattern); - Button_SetCheck(GetDlgItem(hwnd,IDC_VIEW_TYPE_DIRECTORIES), (dlg->flags&TF_DIRECTORIES? BST_CHECKED: BST_UNCHECKED)); - Button_SetCheck(GetDlgItem(hwnd,IDC_VIEW_TYPE_PROGRAMS), dlg->flags&TF_PROGRAMS? BST_CHECKED: BST_UNCHECKED); - Button_SetCheck(GetDlgItem(hwnd,IDC_VIEW_TYPE_DOCUMENTS), dlg->flags&TF_DOCUMENTS? BST_CHECKED: BST_UNCHECKED); - Button_SetCheck(GetDlgItem(hwnd,IDC_VIEW_TYPE_OTHERS), dlg->flags&TF_OTHERS? BST_CHECKED: BST_UNCHECKED); - Button_SetCheck(GetDlgItem(hwnd,IDC_VIEW_TYPE_HIDDEN), dlg->flags&TF_HIDDEN? BST_CHECKED: BST_UNCHECKED); + set_check(hwnd, IDC_VIEW_TYPE_DIRECTORIES, dlg->flags&TF_DIRECTORIES); + set_check(hwnd, IDC_VIEW_TYPE_PROGRAMS, dlg->flags&TF_PROGRAMS); + set_check(hwnd, IDC_VIEW_TYPE_DOCUMENTS, dlg->flags&TF_DOCUMENTS); + set_check(hwnd, IDC_VIEW_TYPE_OTHERS, dlg->flags&TF_OTHERS); + set_check(hwnd, IDC_VIEW_TYPE_HIDDEN, dlg->flags&TF_HIDDEN); return 1; case WM_COMMAND: { @@ -1777,11 +1923,11 @@ static INT_PTR CALLBACK FilterDialogDlgProc(HWND hwnd, UINT nmsg, WPARAM wparam, GetWindowText(GetDlgItem(hwnd, IDC_VIEW_PATTERN), dlg->pattern, MAX_PATH); - flags |= Button_GetCheck(GetDlgItem(hwnd,IDC_VIEW_TYPE_DIRECTORIES))&BST_CHECKED? TF_DIRECTORIES: 0; - flags |= Button_GetCheck(GetDlgItem(hwnd,IDC_VIEW_TYPE_PROGRAMS))&BST_CHECKED? TF_PROGRAMS: 0; - flags |= Button_GetCheck(GetDlgItem(hwnd,IDC_VIEW_TYPE_DOCUMENTS))&BST_CHECKED? TF_DOCUMENTS: 0; - flags |= Button_GetCheck(GetDlgItem(hwnd,IDC_VIEW_TYPE_OTHERS))&BST_CHECKED? TF_OTHERS: 0; - flags |= Button_GetCheck(GetDlgItem(hwnd,IDC_VIEW_TYPE_HIDDEN))&BST_CHECKED? TF_HIDDEN: 0; + flags |= get_check(hwnd, IDC_VIEW_TYPE_DIRECTORIES) ? TF_DIRECTORIES : 0; + flags |= get_check(hwnd, IDC_VIEW_TYPE_PROGRAMS) ? TF_PROGRAMS : 0; + flags |= get_check(hwnd, IDC_VIEW_TYPE_DOCUMENTS) ? TF_DOCUMENTS : 0; + flags |= get_check(hwnd, IDC_VIEW_TYPE_OTHERS) ? TF_OTHERS : 0; + flags |= get_check(hwnd, IDC_VIEW_TYPE_HIDDEN) ? TF_HIDDEN : 0; dlg->flags = flags; @@ -1826,10 +1972,10 @@ static LPCSTR InfoStrings[] = { static void PropDlg_DisplayValue(HWND hlbox, HWND hedit) { - int idx = ListBox_GetCurSel(hlbox); + int idx = SendMessage(hlbox, LB_GETCURSEL, 0, 0); if (idx != LB_ERR) { - LPCTSTR pValue = (LPCTSTR) ListBox_GetItemData(hlbox, idx); + LPCTSTR pValue = (LPCTSTR) SendMessage(hlbox, LB_GETITEMDATA, idx, 0); if (pValue) SetWindowText(hedit, pValue); @@ -1842,12 +1988,12 @@ static void CheckForFileInfo(struct PropertiesDialog* dlg, HWND hwnd, LPCTSTR st static TCHAR sTranslation[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n','s','l','a','t','i','o','n','\0'}; static TCHAR sStringFileInfo[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\', '%','0','4','x','%','0','4','x','\\','%','s','\0'}; - DWORD dwVersionDataLen = GetFileVersionInfoSize((LPTSTR)strFilename, NULL); /* VC6 and MinGW headers use LPTSTR instead of LPCTSTR */ + DWORD dwVersionDataLen = GetFileVersionInfoSize(strFilename, NULL); if (dwVersionDataLen) { - dlg->pVersionData = malloc(dwVersionDataLen); + dlg->pVersionData = HeapAlloc(GetProcessHeap(), 0, dwVersionDataLen); - if (GetFileVersionInfo((LPTSTR)strFilename, 0, dwVersionDataLen, dlg->pVersionData)) { /* VC6 and MinGW headers use LPTSTR instead of LPCTSTR */ + if (GetFileVersionInfo(strFilename, 0, dwVersionDataLen, dlg->pVersionData)) { LPVOID pVal; UINT nValLen; @@ -1893,13 +2039,13 @@ static void CheckForFileInfo(struct PropertiesDialog* dlg, HWND hwnd, LPCTSTR st /* Retrieve file description for language and code page */ if (VerQueryValue(dlg->pVersionData, subblock, (PVOID)&pTxt, &nValLen)) { - int idx = ListBox_AddString(hlbox, infoStr); - (void)ListBox_SetItemData(hlbox, idx, pTxt); + int idx = SendMessage(hlbox, LB_ADDSTRING, 0L, (LPARAM)infoStr); + SendMessage(hlbox, LB_SETITEMDATA, idx, (LPARAM) pTxt); } } } - (void)ListBox_SetCurSel(hlbox, 0); + SendMessage(hlbox, LB_SETCURSEL, 0, 0); PropDlg_DisplayValue(hlbox, GetDlgItem(hwnd,IDC_LIST_PROP_VERSION_VALUES)); } @@ -1913,7 +2059,7 @@ static INT_PTR CALLBACK PropertiesDialogDlgProc(HWND hwnd, UINT nmsg, WPARAM wpa switch(nmsg) { case WM_INITDIALOG: { - const static TCHAR sByteFmt[] = {'%','s',' ','B','y','t','e','s','\0'}; + static const TCHAR sByteFmt[] = {'%','s',' ','B','y','t','e','s','\0'}; TCHAR b1[BUFFER_LEN], b2[BUFFER_LEN]; LPWIN32_FIND_DATA pWFD; ULONGLONG size; @@ -1936,11 +2082,11 @@ static INT_PTR CALLBACK PropertiesDialogDlgProc(HWND hwnd, UINT nmsg, WPARAM wpa SetWindowText(GetDlgItem(hwnd, IDC_STATIC_PROP_FILENAME), pWFD->cFileName); SetWindowText(GetDlgItem(hwnd, IDC_STATIC_PROP_PATH), dlg->path); - Button_SetCheck(GetDlgItem(hwnd,IDC_CHECK_READONLY), (pWFD->dwFileAttributes&FILE_ATTRIBUTE_READONLY? BST_CHECKED: BST_UNCHECKED)); - Button_SetCheck(GetDlgItem(hwnd,IDC_CHECK_ARCHIVE), (pWFD->dwFileAttributes&FILE_ATTRIBUTE_ARCHIVE? BST_CHECKED: BST_UNCHECKED)); - Button_SetCheck(GetDlgItem(hwnd,IDC_CHECK_COMPRESSED), (pWFD->dwFileAttributes&FILE_ATTRIBUTE_COMPRESSED? BST_CHECKED: BST_UNCHECKED)); - Button_SetCheck(GetDlgItem(hwnd,IDC_CHECK_HIDDEN), (pWFD->dwFileAttributes&FILE_ATTRIBUTE_HIDDEN? BST_CHECKED: BST_UNCHECKED)); - Button_SetCheck(GetDlgItem(hwnd,IDC_CHECK_SYSTEM), (pWFD->dwFileAttributes&FILE_ATTRIBUTE_SYSTEM? BST_CHECKED: BST_UNCHECKED)); + set_check(hwnd, IDC_CHECK_READONLY, pWFD->dwFileAttributes&FILE_ATTRIBUTE_READONLY); + set_check(hwnd, IDC_CHECK_ARCHIVE, pWFD->dwFileAttributes&FILE_ATTRIBUTE_ARCHIVE); + set_check(hwnd, IDC_CHECK_COMPRESSED, pWFD->dwFileAttributes&FILE_ATTRIBUTE_COMPRESSED); + set_check(hwnd, IDC_CHECK_HIDDEN, pWFD->dwFileAttributes&FILE_ATTRIBUTE_HIDDEN); + set_check(hwnd, IDC_CHECK_SYSTEM, pWFD->dwFileAttributes&FILE_ATTRIBUTE_SYSTEM); CheckForFileInfo(dlg, hwnd, dlg->path); return 1;} @@ -1963,7 +2109,7 @@ static INT_PTR CALLBACK PropertiesDialogDlgProc(HWND hwnd, UINT nmsg, WPARAM wpa return 1;} case WM_NCDESTROY: - free(dlg->pVersionData); + HeapFree(GetProcessHeap(), 0, dlg->pVersionData); dlg->pVersionData = NULL; break; } @@ -2038,7 +2184,7 @@ static BOOL toggle_fullscreen(HWND hwnd) GetWindowRect(hwnd, &g_fullscreen.orgPos); g_fullscreen.wasZoomed = IsZoomed(hwnd); - (void)Frame_CalcFrameClient(hwnd, &rt); + Frame_CalcFrameClient(hwnd, &rt); ClientToScreen(hwnd, (LPPOINT)&rt.left); ClientToScreen(hwnd, (LPPOINT)&rt.right); @@ -2065,7 +2211,7 @@ static void fullscreen_move(HWND hwnd) RECT rt, pos; GetWindowRect(hwnd, &pos); - (void)Frame_CalcFrameClient(hwnd, &rt); + Frame_CalcFrameClient(hwnd, &rt); ClientToScreen(hwnd, (LPPOINT)&rt.left); ClientToScreen(hwnd, (LPPOINT)&rt.right); @@ -2113,7 +2259,7 @@ static BOOL activate_drive_window(LPCTSTR path) if (!lstrcmpi(drv2, drv1)) { SendMessage(Globals.hmdiclient, WM_MDIACTIVATE, (WPARAM)child_wnd, 0); - if (IsMinimized(child_wnd)) + if (IsIconic(child_wnd)) ShowWindow(child_wnd, SW_SHOWNORMAL); return TRUE; @@ -2136,7 +2282,7 @@ static BOOL activate_fs_window(LPCTSTR filesys) if (!lstrcmpi(child->root.fs, filesys)) { SendMessage(Globals.hmdiclient, WM_MDIACTIVATE, (WPARAM)child_wnd, 0); - if (IsMinimized(child_wnd)) + if (IsIconic(child_wnd)) ShowWindow(child_wnd, SW_SHOWNORMAL); return TRUE; @@ -2153,6 +2299,9 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM switch(nmsg) { case WM_CLOSE: + if (Globals.saveSettings) + save_registry_settings(); + DestroyWindow(hwnd); /* clear handle variables */ @@ -2206,7 +2355,7 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM child = alloc_child_window(path, NULL, hwnd); if (!create_child_window(child)) - free(child); + HeapFree(GetProcessHeap(), 0, child); } else switch(cmd) { case ID_FILE_EXIT: SendMessage(hwnd, WM_CLOSE, 0, 0); @@ -2220,7 +2369,7 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM child = alloc_child_window(path, NULL, hwnd); if (!create_child_window(child)) - free(child); + HeapFree(GetProcessHeap(), 0, child); break;} case ID_REFRESH: @@ -2243,58 +2392,9 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM SendMessage(Globals.hmdiclient, WM_MDIICONARRANGE, 0, 0); break; - case ID_SELECT_FONT: { - TCHAR dlg_name[BUFFER_LEN], dlg_info[BUFFER_LEN]; - CHOOSEFONT chFont; - LOGFONT lFont; - - HDC hdc = GetDC(hwnd); - chFont.lStructSize = sizeof(CHOOSEFONT); - chFont.hwndOwner = hwnd; - chFont.hDC = NULL; - chFont.lpLogFont = &lFont; - chFont.Flags = CF_SCREENFONTS | CF_FORCEFONTEXIST | CF_LIMITSIZE | CF_NOSCRIPTSEL; - chFont.rgbColors = RGB(0,0,0); - chFont.lCustData = 0; - chFont.lpfnHook = NULL; - chFont.lpTemplateName = NULL; - chFont.hInstance = Globals.hInstance; - chFont.lpszStyle = NULL; - chFont.nFontType = SIMULATED_FONTTYPE; - chFont.nSizeMin = 0; - chFont.nSizeMax = 24; - - if (ChooseFont(&chFont)) { - HWND childWnd; - HFONT hFontOld; - - DeleteObject(Globals.hfont); - Globals.hfont = CreateFontIndirect(&lFont); - hFontOld = SelectFont(hdc, Globals.hfont); - GetTextExtentPoint32(hdc, sSpace, 1, &Globals.spaceSize); - - /* change font in all open child windows */ - for(childWnd=GetWindow(Globals.hmdiclient,GW_CHILD); childWnd; childWnd=GetNextWindow(childWnd,GW_HWNDNEXT)) { - ChildWnd* child = (ChildWnd*) GetWindowLongPtr(childWnd, GWLP_USERDATA); - SetWindowFont(child->left.hwnd, Globals.hfont, TRUE); - SetWindowFont(child->right.hwnd, Globals.hfont, TRUE); - (void)ListBox_SetItemHeight(child->left.hwnd, 1, max(Globals.spaceSize.cy,IMAGE_HEIGHT+3)); - (void)ListBox_SetItemHeight(child->right.hwnd, 1, max(Globals.spaceSize.cy,IMAGE_HEIGHT+3)); - InvalidateRect(child->left.hwnd, NULL, TRUE); - InvalidateRect(child->right.hwnd, NULL, TRUE); - } - - (void)SelectFont(hdc, hFontOld); - } - else if (CommDlgExtendedError()) { - LoadString(Globals.hInstance, IDS_FONT_SEL_DLG_NAME, dlg_name, BUFFER_LEN); - LoadString(Globals.hInstance, IDS_FONT_SEL_ERROR, dlg_info, BUFFER_LEN); - MessageBox(hwnd, dlg_info, dlg_name, MB_OK); - } - - ReleaseDC(hwnd, hdc); - break; - } + case ID_SELECT_FONT: + choose_font(hwnd); + break; case ID_VIEW_TOOL_BAR: toggle_child(hwnd, cmd, Globals.htoolbar); @@ -2308,6 +2408,12 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM toggle_child(hwnd, cmd, Globals.hstatusbar); break; + case ID_VIEW_SAVESETTINGS: + Globals.saveSettings = !Globals.saveSettings; + CheckMenuItem(Globals.hMenuOptions, ID_VIEW_SAVESETTINGS, + Globals.saveSettings ? MF_CHECKED : MF_UNCHECKED ); + break; + case ID_EXECUTE: { struct ExecuteDialog dlg; @@ -2345,14 +2451,12 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM } break;} -#ifndef __MINGW32__ /* SHFormatDrive missing in MinGW (as of 13.5.2005) */ case ID_FORMAT_DISK: { UINT sem_org = SetErrorMode(0); /* Get the current Error Mode settings. */ SetErrorMode(sem_org & ~SEM_FAILCRITICALERRORS); /* Force O/S to handle */ SHFormatDrive(hwnd, 0 /* A: */, SHFMT_ID_DEFAULT, 0); SetErrorMode(sem_org); /* Put it back the way it was. */ break;} -#endif case ID_HELP: WinHelp(hwnd, RS(b1,IDS_WINEFILE), HELP_INDEX, 0); @@ -2374,7 +2478,6 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM if (activate_fs_window(RS(b1,IDS_UNIXFS))) break; - #ifdef UNICODE getcwd(cpath, MAX_PATH); MultiByteToWideChar(CP_UNIXCP, 0, cpath, -1, path, MAX_PATH); @@ -2384,10 +2487,9 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM child = alloc_child_window(path, NULL, hwnd); if (!create_child_window(child)) - free(child); + HeapFree(GetProcessHeap(), 0, child); break;} #endif - #ifdef _SHELL_FOLDERS case ID_DRIVE_SHELL_NS: { TCHAR path[MAX_PATH]; @@ -2400,7 +2502,7 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM child = alloc_child_window(path, get_path_pidl(path,hwnd), hwnd); if (!create_child_window(child)) - free(child); + HeapFree(GetProcessHeap(), 0, child); break;} #endif #endif @@ -2442,6 +2544,10 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM resize_frame(hwnd, LOWORD(lparam), HIWORD(lparam)); break; /* do not pass message to DefFrameProc */ + case WM_DEVICECHANGE: + SendMessage(hwnd, WM_COMMAND, MAKELONG(ID_REFRESH,0), 0); + break; + #ifndef _NO_EXTENSIONS case WM_GETMINMAXINFO: { LPMINMAXINFO lpmmi = (LPMINMAXINFO)lparam; @@ -2504,7 +2610,7 @@ static void resize_tree(ChildWnd* child, int cx, int cy) hdl.prc = &rt; hdl.pwpos = ℘ - (void)Header_Layout(child->left.hwndHeader, &hdl); + SendMessage(child->left.hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hdl); DeferWindowPos(hdwp, child->left.hwndHeader, wp.hwndInsertAfter, wp.x-1, wp.y, child->split_pos-SPLIT_WIDTH/2+1, wp.cy, wp.flags); @@ -2527,12 +2633,12 @@ static HWND create_header(HWND parent, Pane* pane, int id) HD_ITEM hdi; int idx; - HWND hwnd = CreateWindow(WC_HEADER, 0, WS_CHILD|WS_VISIBLE|HDS_HORZ/*TODO: |HDS_BUTTONS + sort orders*/, + HWND hwnd = CreateWindow(WC_HEADER, 0, WS_CHILD|WS_VISIBLE|HDS_HORZ|HDS_FULLDRAG/*TODO: |HDS_BUTTONS + sort orders*/, 0, 0, 0, 0, parent, (HMENU)id, Globals.hInstance, 0); if (!hwnd) return 0; - SetWindowFont(hwnd, GetStockObject(DEFAULT_GUI_FONT), FALSE); + SendMessage(hwnd, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), FALSE); hdi.mask = HDI_TEXT|HDI_WIDTH|HDI_FORMAT; @@ -2540,7 +2646,7 @@ static HWND create_header(HWND parent, Pane* pane, int id) hdi.pszText = g_pos_names[idx]; hdi.fmt = HDF_STRING | g_pos_align[idx]; hdi.cxy = pane->widths[idx]; - (void)Header_InsertItem(hwnd, idx, &hdi); + SendMessage(hwnd, HDM_INSERTITEM, idx, (LPARAM) &hdi); } return hwnd; @@ -2551,20 +2657,19 @@ static HWND create_header(HWND parent, Pane* pane, int id) static void init_output(HWND hwnd) { - const static TCHAR s1000[] = {'1','0','0','0','\0'}; - - TCHAR b[16]; + static const WCHAR s1000[] = {'1','0','0','0','\0'}; + WCHAR b[16]; HFONT old_font; HDC hdc = GetDC(hwnd); - if (GetNumberFormat(LOCALE_USER_DEFAULT, 0, s1000, 0, b, 16) > 4) + if (GetNumberFormatW(LOCALE_USER_DEFAULT, 0, s1000, 0, b, 16) > 4) Globals.num_sep = b[1]; else - Globals.num_sep = TEXT('.'); + Globals.num_sep = '.'; - old_font = SelectFont(hdc, Globals.hfont); - GetTextExtentPoint32(hdc, sSpace, 1, &Globals.spaceSize); - (void)SelectFont(hdc, old_font); + old_font = SelectObject(hdc, Globals.hfont); + GetTextExtentPoint32W(hdc, sSpace, 1, &Globals.spaceSize); + SelectObject(hdc, old_font); ReleaseDC(hwnd, hdc); } @@ -2576,7 +2681,7 @@ static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWi static BOOL calc_widths(Pane* pane, BOOL anyway) { int col, x, cx, spc=3*Globals.spaceSize.cx; - int entries = ListBox_GetCount(pane->hwnd); + int entries = SendMessage(pane->hwnd, LB_GETCOUNT, 0, 0); int orgWidths[COLUMNS]; int orgPositions[COLUMNS+1]; HFONT hfontOld; @@ -2592,10 +2697,10 @@ static BOOL calc_widths(Pane* pane, BOOL anyway) pane->widths[col] = 0; hdc = GetDC(pane->hwnd); - hfontOld = SelectFont(hdc, Globals.hfont); + hfontOld = SelectObject(hdc, Globals.hfont); for(cnt=0; cnthwnd, cnt); + Entry* entry = (Entry*) SendMessage(pane->hwnd, LB_GETITEMDATA, cnt, 0); DRAWITEMSTRUCT dis; @@ -2637,7 +2742,7 @@ static BOOL calc_widths(Pane* pane, BOOL anyway) pane->positions[COLUMNS] = x; - ListBox_SetHorizontalExtent(pane->hwnd, x); + SendMessage(pane->hwnd, LB_SETHORIZONTALEXTENT, x, 0); /* no change? */ if (!memcmp(orgWidths, pane->widths, sizeof(orgWidths))) @@ -2664,17 +2769,17 @@ static void calc_single_width(Pane* pane, int col) { HFONT hfontOld; int x, cx; - int entries = ListBox_GetCount(pane->hwnd); + int entries = SendMessage(pane->hwnd, LB_GETCOUNT, 0, 0); int cnt; HDC hdc; pane->widths[col] = 0; hdc = GetDC(pane->hwnd); - hfontOld = SelectFont(hdc, Globals.hfont); + hfontOld = SelectObject(hdc, Globals.hfont); for(cnt=0; cnthwnd, cnt); + Entry* entry = (Entry*) SendMessage(pane->hwnd, LB_GETITEMDATA, cnt, 0); DRAWITEMSTRUCT dis; dis.CtlType = 0; @@ -2714,7 +2819,7 @@ static void calc_single_width(Pane* pane, int col) x += pane->widths[col]; } - ListBox_SetHorizontalExtent(pane->hwnd, x); + SendMessage(pane->hwnd, LB_SETHORIZONTALEXTENT, x, 0); } @@ -2786,12 +2891,12 @@ static int insert_entries(Pane* pane, Entry* dir, LPCTSTR pattern, int filter_fl if (entry->data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { /* don't display entries "." and ".." in the left pane */ - if (pane->treePane && entry->data.cFileName[0]==TEXT('.')) + if (pane->treePane && entry->data.cFileName[0] == '.') if ( - #ifndef _NO_EXTENSIONS - entry->data.cFileName[1]==TEXT('\0') || - #endif - (entry->data.cFileName[1]==TEXT('.') && entry->data.cFileName[2]==TEXT('\0'))) +#ifndef _NO_EXTENSIONS + entry->data.cFileName[1] == '\0' || +#endif + (entry->data.cFileName[1] == '.' && entry->data.cFileName[2] == '\0')) continue; /* filter directories in right pane */ @@ -2829,7 +2934,7 @@ static int insert_entries(Pane* pane, Entry* dir, LPCTSTR pattern, int filter_fl if (idx != -1) idx++; - (void)ListBox_InsertItemData(pane->hwnd, idx, entry); + SendMessage(pane->hwnd, LB_INSERTSTRING, idx, (LPARAM) entry); if (pane->treePane && entry->expanded) idx = insert_entries(pane, entry->down, pattern, filter_flags, idx); @@ -2843,27 +2948,18 @@ static int insert_entries(Pane* pane, Entry* dir, LPCTSTR pattern, int filter_fl static void format_bytes(LPTSTR buffer, LONGLONG bytes) { - const static TCHAR sFmtGB[] = {'%', '.', '1', 'f', ' ', 'G', 'B', '\0'}; - const static TCHAR sFmtMB[] = {'%', '.', '1', 'f', ' ', 'M', 'B', '\0'}; - const static TCHAR sFmtkB[] = {'%', '.', '1', 'f', ' ', 'k', 'B', '\0'}; + static const TCHAR sFmtGB[] = {'%', '.', '1', 'f', ' ', 'G', 'B', '\0'}; + static const TCHAR sFmtMB[] = {'%', '.', '1', 'f', ' ', 'M', 'B', '\0'}; + static const TCHAR sFmtkB[] = {'%', '.', '1', 'f', ' ', 'k', 'B', '\0'}; float fBytes = (float)bytes; -#ifdef __WINE__ /* work around for incorrect implementation of wsprintf()/_stprintf() in WINE */ - if (bytes >= 1073741824) /* 1 GB */ - wsprintf(buffer, sFmtGB, fBytes/1073741824.f+.5f); - else if (bytes >= 1048576) /* 1 MB */ - wsprintf(buffer, sFmtMB, fBytes/1048576.f+.5f); - else if (bytes >= 1024) /* 1 kB */ - wsprintf(buffer, sFmtkB, fBytes/1024.f+.5f); -#else if (bytes >= 1073741824) /* 1 GB */ _stprintf(buffer, sFmtGB, fBytes/1073741824.f+.5f); else if (bytes >= 1048576) /* 1 MB */ _stprintf(buffer, sFmtMB, fBytes/1048576.f+.5f); else if (bytes >= 1024) /* 1 kB */ _stprintf(buffer, sFmtkB, fBytes/1024.f+.5f); -#endif else _stprintf(buffer, sLongNumFmt, bytes); } @@ -2888,7 +2984,7 @@ static WNDPROC g_orgTreeWndProc; static void create_tree_window(HWND parent, Pane* pane, int id, int id_header, LPCTSTR pattern, int filter_flags) { - const static TCHAR sListBox[] = {'L','i','s','t','B','o','x','\0'}; + static const TCHAR sListBox[] = {'L','i','s','t','B','o','x','\0'}; static int s_init = 0; Entry* entry = pane->root; @@ -2898,9 +2994,9 @@ static void create_tree_window(HWND parent, Pane* pane, int id, int id_header, L 0, 0, 0, 0, parent, (HMENU)id, Globals.hInstance, 0); SetWindowLongPtr(pane->hwnd, GWLP_USERDATA, (LPARAM)pane); - g_orgTreeWndProc = SubclassWindow(pane->hwnd, TreeWndProc); + g_orgTreeWndProc = (WNDPROC) SetWindowLongPtr(pane->hwnd, GWLP_WNDPROC, (LPARAM)TreeWndProc); - SetWindowFont(pane->hwnd, Globals.hfont, FALSE); + SendMessage(pane->hwnd, WM_SETFONT, (WPARAM)Globals.hfont, FALSE); /* insert entries into listbox */ if (entry) @@ -2933,7 +3029,7 @@ static void format_date(const FILETIME* ft, TCHAR* buffer, int visible_cols) FILETIME lft; int len = 0; - *buffer = TEXT('\0'); + *buffer = '\0'; if (!ft->dwLowDateTime && !ft->dwHighDateTime) return; @@ -2957,7 +3053,7 @@ static void format_date(const FILETIME* ft, TCHAR* buffer, int visible_cols) buffer[len++] = ' '; if (!GetTimeFormat(LOCALE_USER_DEFAULT, 0, &systime, 0, buffer+len, BUFFER_LEN-len)) - buffer[len] = TEXT('\0'); + buffer[len] = '\0'; } } @@ -2966,7 +3062,7 @@ static void calc_width(Pane* pane, LPDRAWITEMSTRUCT dis, int col, LPCTSTR str) { RECT rt = {0, 0, 0, 0}; - DrawText(dis->hDC, (LPTSTR)str, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_NOPREFIX); + DrawText(dis->hDC, str, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_NOPREFIX); if (rt.right > pane->widths[col]) pane->widths[col] = rt.right; @@ -2979,7 +3075,7 @@ static void calc_tabbed_width(Pane* pane, LPDRAWITEMSTRUCT dis, int col, LPCTSTR /* DRAWTEXTPARAMS dtp = {sizeof(DRAWTEXTPARAMS), 2}; DrawTextEx(dis->hDC, (LPTSTR)str, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_NOPREFIX|DT_EXPANDTABS|DT_TABSTOP, &dtp);*/ - DrawText(dis->hDC, (LPTSTR)str, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_EXPANDTABS|DT_TABSTOP|(2<<8)); + DrawText(dis->hDC, str, -1, &rt, DT_CALCRECT|DT_SINGLELINE|DT_EXPANDTABS|DT_TABSTOP|(2<<8)); /*FIXME rt (0,0) ??? */ if (rt.right > pane->widths[col]) @@ -2997,7 +3093,7 @@ static void output_text(Pane* pane, LPDRAWITEMSTRUCT dis, int col, LPCTSTR str, rt.right = x+pane->positions[col+1]-Globals.spaceSize.cx; rt.bottom = dis->rcItem.bottom; - DrawText(dis->hDC, (LPTSTR)str, -1, &rt, DT_SINGLELINE|DT_NOPREFIX|flags); + DrawText(dis->hDC, str, -1, &rt, DT_SINGLELINE|DT_NOPREFIX|flags); } static void output_tabbed_text(Pane* pane, LPDRAWITEMSTRUCT dis, int col, LPCTSTR str) @@ -3013,7 +3109,7 @@ static void output_tabbed_text(Pane* pane, LPDRAWITEMSTRUCT dis, int col, LPCTST /* DRAWTEXTPARAMS dtp = {sizeof(DRAWTEXTPARAMS), 2}; DrawTextEx(dis->hDC, (LPTSTR)str, -1, &rt, DT_SINGLELINE|DT_NOPREFIX|DT_EXPANDTABS|DT_TABSTOP, &dtp);*/ - DrawText(dis->hDC, (LPTSTR)str, -1, &rt, DT_SINGLELINE|DT_EXPANDTABS|DT_TABSTOP|(2<<8)); + DrawText(dis->hDC, str, -1, &rt, DT_SINGLELINE|DT_EXPANDTABS|DT_TABSTOP|(2<<8)); } static void output_number(Pane* pane, LPDRAWITEMSTRUCT dis, int col, LPCTSTR str) @@ -3118,11 +3214,11 @@ static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWi attrs = entry->data.dwFileAttributes; if (attrs & FILE_ATTRIBUTE_DIRECTORY) { - if (entry->data.cFileName[0]==TEXT('.') && entry->data.cFileName[1]==TEXT('.') - && entry->data.cFileName[2]==TEXT('\0')) + if (entry->data.cFileName[0] == '.' && entry->data.cFileName[1] == '.' + && entry->data.cFileName[2] == '\0') img = IMG_FOLDER_UP; #ifndef _NO_EXTENSIONS - else if (entry->data.cFileName[0]==TEXT('.') && entry->data.cFileName[1]==TEXT('\0')) + else if (entry->data.cFileName[0] == '.' && entry->data.cFileName[1] == '\0') img = IMG_FOLDER_CUR; #endif else if ( @@ -3225,7 +3321,7 @@ static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWi } if (calcWidthCol == -1) { - focusRect.left = img_pos - 2; + focusRect.left = img_pos -2; #ifdef _NO_EXTENSIONS if (pane->treePane && entry) { @@ -3244,10 +3340,10 @@ static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWi textcolor = RGB(0,0,0); if (dis->itemState & ODS_FOCUS) { - textcolor = COLOR_SELECTION_TXT; + textcolor = RGB(255,255,255); bkcolor = COLOR_SELECTION; } else { - bkcolor = GetSysColor(COLOR_WINDOW); + bkcolor = RGB(255,255,255); } hbrush = CreateSolidBrush(bkcolor); @@ -3304,14 +3400,14 @@ static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWi { ULONGLONG size; - size = ((ULONGLONG)entry->data.nFileSizeHigh << 32) | entry->data.nFileSizeLow; + size = ((ULONGLONG)entry->data.nFileSizeHigh << 32) | entry->data.nFileSizeLow; _stprintf(buffer, sLongNumFmt, size); if (calcWidthCol == -1) output_number(pane, dis, col, buffer); else if (calcWidthCol==col || calcWidthCol==COLUMNS) - calc_width(pane, dis, col, buffer);/*TODO: not in every case time enough */ + calc_width(pane, dis, col, buffer);/*TODO: not ever time enough */ } col++; @@ -3375,10 +3471,10 @@ static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWi /* show file attributes */ if (visible_cols & COL_ATTRIBUTES) { #ifdef _NO_EXTENSIONS - const static TCHAR s4Tabs[] = {' ','\t',' ','\t',' ','\t',' ','\t',' ','\0'}; + static const TCHAR s4Tabs[] = {' ','\t',' ','\t',' ','\t',' ','\t',' ','\0'}; lstrcpy(buffer, s4Tabs); #else - const static TCHAR s11Tabs[] = {' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\0'}; + static const TCHAR s11Tabs[] = {' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\t',' ','\0'}; lstrcpy(buffer, s11Tabs); #endif @@ -3410,7 +3506,7 @@ static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWi /*TODO if (flags.security) { - const static TCHAR sSecTabs[] = { + static const TCHAR sSecTabs[] = { ' ','\t',' ','\t',' ','\t',' ', ' ','\t',' ', ' ','\t',' ','\t',' ','\t',' ', @@ -3456,7 +3552,7 @@ static void draw_item(Pane* pane, LPDRAWITEMSTRUCT dis, Entry* entry, int calcWi HPEN lastPen; HPEN hpen; - if (!(GetVersion() & 0x80000000)) { /* Windows NT or higher? */ + if (!(GetVersion() & 0x80000000)) { /* Windows NT? */ LOGBRUSH lb = {PS_SOLID, RGB(255,255,255)}; hpen = ExtCreatePen(PS_COSMETIC|PS_ALTERNATE, 1, &lb, 0, 0); } else @@ -3507,18 +3603,18 @@ static void set_header(Pane* pane) for(; x+pane->widths[i]widths[i]; - (void)Header_SetItem(pane->hwndHeader, i, &item); + SendMessage(pane->hwndHeader, HDM_SETITEM, i, (LPARAM) &item); } if (i < COLUMNS) { x += pane->widths[i]; item.cxy = x - scroll_pos; - (void)Header_SetItem(pane->hwndHeader, i++, &item); + SendMessage(pane->hwndHeader, HDM_SETITEM, i++, (LPARAM) &item); for(; iwidths[i]; x += pane->widths[i]; - (void)Header_SetItem(pane->hwndHeader, i, &item); + SendMessage(pane->hwndHeader, HDM_SETITEM, i, (LPARAM) &item); } } } @@ -3526,8 +3622,7 @@ static void set_header(Pane* pane) static LRESULT pane_notify(Pane* pane, NMHDR* pnmh) { switch(pnmh->code) { - case HDN_TRACK: - case HDN_ENDTRACK: { + case HDN_ITEMCHANGED: { HD_NOTIFY* phdn = (HD_NOTIFY*) pnmh; int idx = phdn->iItem; int dx = phdn->pitem->cxy - pane->widths[idx]; @@ -3536,9 +3631,6 @@ static LRESULT pane_notify(Pane* pane, NMHDR* pnmh) RECT clnt; GetClientRect(pane->hwnd, &clnt); - /* move immediate to simulate HDS_FULLDRAG (for now [04/2000] not really needed with WINELIB) */ - (void)Header_SetItem(pane->hwndHeader, idx, phdn->pitem); - pane->widths[idx] += dx; for(i=idx; ++i<=COLUMNS; ) @@ -3568,7 +3660,7 @@ static LRESULT pane_notify(Pane* pane, NMHDR* pnmh) RedrawWindow(pane->hwnd, &rt_clip, 0, RDW_INVALIDATE|RDW_UPDATENOW); if (pnmh->code == HDN_ENDTRACK) { - ListBox_SetHorizontalExtent(pane->hwnd, pane->positions[COLUMNS]); + SendMessage(pane->hwnd, LB_SETHORIZONTALEXTENT, pane->positions[COLUMNS], 0); if (GetScrollPos(pane->hwnd, SB_HORZ) != scroll_pos) set_header(pane); @@ -3586,7 +3678,7 @@ static LRESULT pane_notify(Pane* pane, NMHDR* pnmh) item.mask = HDI_WIDTH; item.cxy = pane->widths[phdn->iItem]; - (void)Header_SetItem(pane->hwndHeader, phdn->iItem, &item); + SendMessage(pane->hwndHeader, HDM_SETITEM, phdn->iItem, (LPARAM) &item); InvalidateRect(pane->hwnd, 0, TRUE); break;} } @@ -3604,17 +3696,17 @@ static void scan_entry(ChildWnd* child, Entry* entry, int idx, HWND hwnd) /* delete sub entries in left pane */ for(;;) { - LRESULT res = ListBox_GetItemData(child->left.hwnd, idx+1); + LRESULT res = SendMessage(child->left.hwnd, LB_GETITEMDATA, idx+1, 0); Entry* sub = (Entry*) res; if (res==LB_ERR || !sub || sub->level<=entry->level) break; - (void)ListBox_DeleteString(child->left.hwnd, idx+1); + SendMessage(child->left.hwnd, LB_DELETESTRING, idx+1, 0); } /* empty right pane */ - (void)ListBox_ResetContent(child->right.hwnd); + SendMessage(child->right.hwnd, LB_RESETCONTENT, 0, 0); /* release memory */ free_entries(entry); @@ -3669,7 +3761,7 @@ static BOOL expand_entry(ChildWnd* child, Entry* dir) if (!(p->data.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)) return FALSE; - idx = ListBox_FindItemData(child->left.hwnd, 0, dir); + idx = SendMessage(child->left.hwnd, LB_FINDSTRING, 0, (LPARAM)dir); dir->expanded = TRUE; @@ -3692,19 +3784,19 @@ static BOOL expand_entry(ChildWnd* child, Entry* dir) static void collapse_entry(Pane* pane, Entry* dir) { - int idx = ListBox_FindItemData(pane->hwnd, 0, dir); + int idx = SendMessage(pane->hwnd, LB_FINDSTRING, 0, (LPARAM)dir); ShowWindow(pane->hwnd, SW_HIDE); /* hide sub entries */ for(;;) { - LRESULT res = ListBox_GetItemData(pane->hwnd, idx+1); + LRESULT res = SendMessage(pane->hwnd, LB_GETITEMDATA, idx+1, 0); Entry* sub = (Entry*) res; if (res==LB_ERR || !sub || sub->level<=dir->level) break; - (void)ListBox_DeleteString(pane->hwnd, idx+1); + SendMessage(pane->hwnd, LB_DELETESTRING, idx+1, 0); } dir->expanded = FALSE; @@ -3715,7 +3807,7 @@ static void collapse_entry(Pane* pane, Entry* dir) static void refresh_right_pane(ChildWnd* child) { - (void)ListBox_ResetContent(child->right.hwnd); + SendMessage(child->right.hwnd, LB_RESETCONTENT, 0, 0); insert_entries(&child->right, child->right.root, child->filter_pattern, child->filter_flags, -1); calc_widths(&child->right, FALSE); @@ -3782,8 +3874,8 @@ static void refresh_child(ChildWnd* child) set_curdir(child, entry, 0, child->hwnd); - idx = ListBox_FindItemData(child->left.hwnd, 0, child->left.cur); - (void)ListBox_SetCurSel(child->left.hwnd, idx); + idx = SendMessage(child->left.hwnd, LB_FINDSTRING, 0, (LPARAM)child->left.cur); + SendMessage(child->left.hwnd, LB_SETCURSEL, idx, 0); } @@ -3933,7 +4025,10 @@ static void activate_entry(ChildWnd* child, Pane* pane, HWND hwnd) int scanned_old = entry->scanned; if (!scanned_old) - scan_entry(child, entry, ListBox_GetCurSel(child->left.hwnd), hwnd); + { + int idx = SendMessage(child->left.hwnd, LB_GETCURSEL, 0, 0); + scan_entry(child, entry, idx, hwnd); + } #ifndef _NO_EXTENSIONS if (entry->data.cFileName[0]=='.' && entry->data.cFileName[1]=='\0') @@ -3950,8 +4045,9 @@ static void activate_entry(ChildWnd* child, Pane* pane, HWND hwnd) expand_entry(child, child->left.cur); if (!pane->treePane) focus_entry: { - int idx = ListBox_FindItemData(child->left.hwnd, ListBox_GetCurSel(child->left.hwnd), entry); - (void)ListBox_SetCurSel(child->left.hwnd, idx); + int idxstart = SendMessage(child->left.hwnd, LB_GETCURSEL, 0, 0); + int idx = SendMessage(child->left.hwnd, LB_FINDSTRING, idxstart, (LPARAM)entry); + SendMessage(child->left.hwnd, LB_SETCURSEL, idx, 0); set_curdir(child, entry, idx, hwnd); } } @@ -4048,7 +4144,7 @@ static BOOL is_directory(LPCTSTR target) return target_attr&FILE_ATTRIBUTE_DIRECTORY? TRUE: FALSE; } - + static BOOL prompt_target(Pane* pane, LPTSTR source, LPTSTR target) { TCHAR path[MAX_PATH]; @@ -4076,7 +4172,7 @@ static BOOL prompt_target(Pane* pane, LPTSTR source, LPTSTR target) /* If the target already exists as directory, create a new target below this. */ if (is_directory(path)) { TCHAR fname[_MAX_FNAME], ext[_MAX_EXT]; - const static TCHAR sAppend[] = {'%','s','/','%','s','%','s','\0'}; + static const TCHAR sAppend[] = {'%','s','/','%','s','%','s','\0'}; _tsplitpath(source, NULL, NULL, fname, ext); @@ -4088,18 +4184,12 @@ static BOOL prompt_target(Pane* pane, LPTSTR source, LPTSTR target) static IContextMenu2* s_pctxmenu2 = NULL; - -#ifndef __MINGW32__ /* IContextMenu3 missing in MinGW (as of 6.2.2005) */ static IContextMenu3* s_pctxmenu3 = NULL; -#endif static void CtxMenu_reset(void) { s_pctxmenu2 = NULL; - -#ifndef __MINGW32__ /* IContextMenu3 missing in MinGW (as of 6.2.2005) */ s_pctxmenu3 = NULL; -#endif } static IContextMenu* CtxMenu_query_interfaces(IContextMenu* pcm1) @@ -4108,16 +4198,13 @@ static IContextMenu* CtxMenu_query_interfaces(IContextMenu* pcm1) CtxMenu_reset(); -#ifndef __MINGW32__ /* IContextMenu3 missing in MinGW (as of 6.2.2005) */ - if (IUnknown_QueryInterface(pcm1, &IID_IContextMenu3, (void**)&pcm) == NOERROR) + if (IContextMenu_QueryInterface(pcm1, &IID_IContextMenu3, (void**)&pcm) == NOERROR) s_pctxmenu3 = (LPCONTEXTMENU3)pcm; - else -#endif - if (IUnknown_QueryInterface(pcm1, &IID_IContextMenu2, (void**)&pcm) == NOERROR) + else if (IContextMenu_QueryInterface(pcm1, &IID_IContextMenu2, (void**)&pcm) == NOERROR) s_pctxmenu2 = (LPCONTEXTMENU2)pcm; if (pcm) { - IUnknown_Release(pcm1); + IContextMenu_Release(pcm1); return pcm; } else return pcm1; @@ -4125,15 +4212,13 @@ static IContextMenu* CtxMenu_query_interfaces(IContextMenu* pcm1) static BOOL CtxMenu_HandleMenuMsg(UINT nmsg, WPARAM wparam, LPARAM lparam) { -#ifndef __MINGW32__ /* IContextMenu3 missing in MinGW (as of 6.2.2005) */ if (s_pctxmenu3) { - if (SUCCEEDED((*s_pctxmenu3->lpVtbl->HandleMenuMsg)(s_pctxmenu3, nmsg, wparam, lparam))) + if (SUCCEEDED(IContextMenu3_HandleMenuMsg(s_pctxmenu3, nmsg, wparam, lparam))) return TRUE; } -#endif if (s_pctxmenu2) - if (SUCCEEDED((*s_pctxmenu2->lpVtbl->HandleMenuMsg)(s_pctxmenu2, nmsg, wparam, lparam))) + if (SUCCEEDED(IContextMenu2_HandleMenuMsg(s_pctxmenu2, nmsg, wparam, lparam))) return TRUE; return FALSE; @@ -4154,7 +4239,7 @@ static HRESULT ShellFolderContextMenu(IShellFolder* shell_folder, HWND hwndParen pcm = CtxMenu_query_interfaces(pcm); if (hmenu) { - hr = (*pcm->lpVtbl->QueryContextMenu)(pcm, hmenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); + hr = IContextMenu_QueryContextMenu(pcm, hmenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, CMF_NORMAL); if (SUCCEEDED(hr)) { UINT idCmd = TrackPopupMenu(hmenu, TPM_LEFTALIGN|TPM_RETURNCMD|TPM_RIGHTBUTTON, x, y, 0, hwndParent, NULL); @@ -4162,26 +4247,26 @@ static HRESULT ShellFolderContextMenu(IShellFolder* shell_folder, HWND hwndParen CtxMenu_reset(); if (idCmd) { - CMINVOKECOMMANDINFO cmi; + CMINVOKECOMMANDINFO cmi; - cmi.cbSize = sizeof(CMINVOKECOMMANDINFO); - cmi.fMask = 0; - cmi.hwnd = hwndParent; - cmi.lpVerb = (LPCSTR)(INT_PTR)(idCmd - FCIDM_SHVIEWFIRST); - cmi.lpParameters = NULL; - cmi.lpDirectory = NULL; - cmi.nShow = SW_SHOWNORMAL; - cmi.dwHotKey = 0; - cmi.hIcon = 0; + cmi.cbSize = sizeof(CMINVOKECOMMANDINFO); + cmi.fMask = 0; + cmi.hwnd = hwndParent; + cmi.lpVerb = (LPCSTR)(INT_PTR)(idCmd - FCIDM_SHVIEWFIRST); + cmi.lpParameters = NULL; + cmi.lpDirectory = NULL; + cmi.nShow = SW_SHOWNORMAL; + cmi.dwHotKey = 0; + cmi.hIcon = 0; - hr = (*pcm->lpVtbl->InvokeCommand)(pcm, &cmi); + hr = IContextMenu_InvokeCommand(pcm, &cmi); executed = TRUE; } } else CtxMenu_reset(); } - IUnknown_Release(pcm); + IContextMenu_Release(pcm); } return FAILED(hr)? hr: executed? S_OK: S_FALSE; @@ -4224,7 +4309,7 @@ static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM BeginPaint(hwnd, &ps); rt.left = child->split_pos-SPLIT_WIDTH/2; rt.right = child->split_pos+SPLIT_WIDTH/2+1; - lastBrush = SelectBrush(ps.hdc, (HBRUSH)GetStockObject(COLOR_SPLITBAR)); + lastBrush = SelectObject(ps.hdc, GetStockObject(COLOR_SPLITBAR)); Rectangle(ps.hdc, rt.left, rt.top-1, rt.right, rt.bottom+1); SelectObject(ps.hdc, lastBrush); #ifdef _NO_EXTENSIONS @@ -4249,7 +4334,7 @@ static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM case WM_LBUTTONDOWN: { RECT rt; - int x = GET_X_LPARAM(lparam); + int x = (short)LOWORD(lparam); GetClientRect(hwnd, &rt); @@ -4267,7 +4352,7 @@ static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM if (GetCapture() == hwnd) { #ifdef _NO_EXTENSIONS RECT rt; - int x = LOWORD(lparam); + int x = (short)LOWORD(lparam); draw_splitbar(hwnd, last_split); last_split = -1; GetClientRect(hwnd, &rt); @@ -4305,7 +4390,7 @@ static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM case WM_MOUSEMOVE: if (GetCapture() == hwnd) { RECT rt; - int x = LOWORD(lparam); + int x = (short)LOWORD(lparam); #ifdef _NO_EXTENSIONS HDC hdc = GetDC(hwnd); @@ -4363,7 +4448,7 @@ static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM ChildWnd* new_child = alloc_child_window(child->path, NULL, hwnd); if (!create_child_window(new_child)) - free(new_child); + HeapFree(GetProcessHeap(), 0, new_child); break;} @@ -4469,8 +4554,8 @@ static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM switch(HIWORD(wparam)) { case LBN_SELCHANGE: { - int idx = ListBox_GetCurSel(pane->hwnd); - Entry* entry = (Entry*) ListBox_GetItemData(pane->hwnd, idx); + int idx = SendMessage(pane->hwnd, LB_GETCURSEL, 0, 0); + Entry* entry = (Entry*) SendMessage(pane->hwnd, LB_GETITEMDATA, idx, 0); if (pane == &child->left) set_curdir(child, entry, idx, hwnd); @@ -4506,10 +4591,10 @@ static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM /* now create the popup menu using shell namespace and IContextMenu */ pane = GetFocus()==child->left.hwnd? &child->left: &child->right; - idx = ListBox_GetCurSel(pane->hwnd); + idx = SendMessage(pane->hwnd, LB_GETCURSEL, 0, 0); if (idx != -1) { - Entry* entry = (Entry*) ListBox_GetItemData(pane->hwnd, idx); + Entry* entry = (Entry*) SendMessage(pane->hwnd, LB_GETITEMDATA, idx, 0); LPITEMIDLIST pidl_abs = get_to_absolute_pidl(entry, hwnd); @@ -4546,18 +4631,16 @@ static LRESULT CALLBACK ChildWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM update_view_menu(child); break; -#ifndef __MINGW32__ /* IContextMenu3 missing in MinGW (as of 6.2.2005) */ case WM_MENUCHAR: /* only supported by IContextMenu3 */ if (s_pctxmenu3) { LRESULT lResult = 0; - (*s_pctxmenu3->lpVtbl->HandleMenuMsg2)(s_pctxmenu3, nmsg, wparam, lparam, &lResult); + IContextMenu3_HandleMenuMsg2(s_pctxmenu3, nmsg, wparam, lparam, &lResult); return lResult; } break; -#endif case WM_SIZE: if (wparam != SIZE_MINIMIZED) @@ -4587,7 +4670,7 @@ static LRESULT CALLBACK TreeWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM case WM_SETFOCUS: child->focus_pane = pane==&child->right? 1: 0; - (void)ListBox_SetSel(hwnd, TRUE, 1); + SendMessage(hwnd, LB_SETSEL, TRUE, 1); /*TODO: check menu items */ break; @@ -4604,7 +4687,7 @@ static LRESULT CALLBACK TreeWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM static void InitInstance(HINSTANCE hinstance) { - const static TCHAR sFont[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; + static const TCHAR sFont[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f','\0'}; WNDCLASSEX wcFrame; WNDCLASS wcChild; @@ -4702,17 +4785,19 @@ static void InitInstance(HINSTANCE hinstance) static void show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) { - const static TCHAR sMDICLIENT[] = {'M','D','I','C','L','I','E','N','T','\0'}; + static const TCHAR sMDICLIENT[] = {'M','D','I','C','L','I','E','N','T','\0'}; TCHAR buffer[MAX_PATH], b1[BUFFER_LEN]; ChildWnd* child; HMENU hMenuFrame, hMenuWindow; + windowOptions opts; CLIENTCREATESTRUCT ccs; if (Globals.hMainWnd) return; + opts = load_registry_settings(); hMenuFrame = LoadMenu(Globals.hInstance, MAKEINTRESOURCE(IDM_WINEFILE)); hMenuWindow = GetSubMenu(hMenuFrame, GetMenuItemCount(hMenuFrame)-2); @@ -4726,7 +4811,7 @@ static void show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) /* create main window */ Globals.hMainWnd = CreateWindowEx(0, (LPCTSTR)(int)Globals.hframeClass, RS(b1,IDS_WINE_FILE), WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, + opts.start_x, opts.start_y, opts.width, opts.height, hwndParent, Globals.hMenuFrame, Globals.hInstance, 0/*lpParam*/); @@ -4734,9 +4819,9 @@ static void show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) WS_CHILD|WS_CLIPCHILDREN|WS_VSCROLL|WS_HSCROLL|WS_VISIBLE|WS_BORDER, 0, 0, 0, 0, Globals.hMainWnd, 0, Globals.hInstance, &ccs); - - + CheckMenuItem(Globals.hMenuOptions, ID_VIEW_DRIVE_BAR, MF_BYCOMMAND|MF_CHECKED); + CheckMenuItem(Globals.hMenuOptions, ID_VIEW_SAVESETTINGS, MF_BYCOMMAND); create_drive_bar(); @@ -4766,7 +4851,7 @@ static void show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_BORDER|CCS_NODIVIDER, 0,0,0,0, Globals.hMainWnd, (HMENU)IDW_STATUSBAR, hinstance, 0);*/ - /*TODO: read paths and window placements from registry */ + /*TODO: read paths from registry */ if (!path || !*path) { GetCurrentDirectory(MAX_PATH, buffer); @@ -4775,12 +4860,12 @@ static void show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) ShowWindow(Globals.hMainWnd, cmdshow); -//#if defined(_SHELL_FOLDERS) && !defined(__WINE__) -// // Shell Namespace as default: -// child = alloc_child_window(path, get_path_pidl(path,Globals.hMainWnd), Globals.hMainWnd); -//#else +#if defined(_SHELL_FOLDERS) && !defined(__WINE__) + /* Shell Namespace as default: */ + child = alloc_child_window(path, get_path_pidl(path,Globals.hMainWnd), Globals.hMainWnd); +#else child = alloc_child_window(path, NULL, Globals.hMainWnd); -//#endif +#endif child->pos.showCmd = SW_SHOWMAXIMIZED; child->pos.rcNormalPosition.left = 0; @@ -4789,7 +4874,7 @@ static void show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) child->pos.rcNormalPosition.bottom = 280; if (!create_child_window(child)) - free(child); + HeapFree(GetProcessHeap(), 0, child); SetWindowPlacement(child->hwnd, &child->pos); @@ -4810,18 +4895,17 @@ static void show_frame(HWND hwndParent, int cmdshow, LPCTSTR path) _tsplitpath(path, drv, dir, name, ext); if (name[0]) { - count = ListBox_GetCount(child->right.hwnd); + count = SendMessage(child->right.hwnd, LB_GETCOUNT, 0, 0); lstrcpy(fullname,name); lstrcat(fullname,ext); for (index = 0; index < count; index ++) { - Entry* entry = (Entry*) ListBox_GetItemData(child->right.hwnd, - index); + Entry* entry = (Entry*) SendMessage(child->right.hwnd, LB_GETITEMDATA, index, 0); if (lstrcmp(entry->data.cFileName,fullname)==0 || lstrcmp(entry->data.cAlternateFileName,fullname)==0) { - (void)ListBox_SetCurSel(child->right.hwnd, index); + SendMessage(child->right.hwnd, LB_SETCURSEL, index, 0); SetFocus(child->right.hwnd); break; } @@ -4878,13 +4962,9 @@ static int find_window_class(LPCTSTR classname) static int winefile_main(HINSTANCE hinstance, int cmdshow, LPCTSTR path) { MSG msg; - + InitInstance(hinstance); - if (cmdshow == SW_SHOWNORMAL) - /*TODO: read window placement from registry */ - cmdshow = SW_MAXIMIZE; - show_frame(0, cmdshow, path); while(GetMessage(&msg, 0, 0, 0)) { diff --git a/rosapps/winefile/winefile.h b/rosapps/winefile/winefile.h index 4cb7e0ca738..55d942107c0 100644 --- a/rosapps/winefile/winefile.h +++ b/rosapps/winefile/winefile.h @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ #define WIN32_LEAN_AND_MEAN @@ -30,7 +30,6 @@ #define NONAMELESSUNION #include -#include #include #include @@ -46,10 +45,6 @@ #ifndef __WINE__ #include /* for alloca() */ - - // ugly hack to use alloca() while keeping Wine's developers happy -#define HeapAlloc(h,f,s) alloca(s) -#define HeapFree(h,f,p) #endif #include /* for ShellExecute() */ @@ -101,7 +96,6 @@ enum IMAGE { #define COLOR_COMPRESSED RGB(0,0,255) #define COLOR_SELECTION RGB(0,0,128) -#define COLOR_SELECTION_TXT RGB(255,255,255) #ifdef _NO_EXTENSIONS #define COLOR_SPLITBAR WHITE_BRUSH @@ -110,8 +104,15 @@ enum IMAGE { #endif #define FRM_CALC_CLIENT 0xBF83 -#define Frame_CalcFrameClient(hwnd, prt) ((BOOL)SNDMSG(hwnd, FRM_CALC_CLIENT, 0, (LPARAM)(PRECT)prt)) +#define Frame_CalcFrameClient(hwnd, prt) (SendMessageW(hwnd, FRM_CALC_CLIENT, 0, (LPARAM)(PRECT)prt)) +typedef struct +{ + int start_x; + int start_y; + int width; + int height; +} windowOptions; typedef struct { @@ -137,7 +138,8 @@ typedef struct TCHAR drives[BUFFER_LEN]; BOOL prescan_node; /*TODO*/ - + BOOL saveSettings; + #ifdef _SHELL_FOLDERS IShellFolder* iDesktop; IMalloc* iMalloc; diff --git a/rosapps/winefile/winefile.ico b/rosapps/winefile/winefile.ico index 3c7fd13dae4..51cb8b248ff 100644 Binary files a/rosapps/winefile/winefile.ico and b/rosapps/winefile/winefile.ico differ diff --git a/rosapps/winefile/winefile.rc b/rosapps/winefile/winefile.rc index bbf6ef7aef6..4717063da2f 100644 --- a/rosapps/winefile/winefile.rc +++ b/rosapps/winefile/winefile.rc @@ -13,17 +13,45 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "windows.h" +#include +#include + #include "resource.h" /* define language neutral resources */ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#include "resource.rc" +IDA_WINEFILE ACCELERATORS DISCARDABLE +{ + VK_F1, ID_HELP, VIRTKEY, NOINVERT + VK_F5, ID_REFRESH, VIRTKEY, NOINVERT + VK_F7, ID_FILE_MOVE, VIRTKEY, NOINVERT + VK_F8, ID_FILE_COPY, VIRTKEY, NOINVERT + VK_DELETE, ID_FILE_DELETE, VIRTKEY, NOINVERT + VK_RETURN, ID_ACTIVATE, VIRTKEY, NOINVERT + VK_RETURN, ID_EDIT_PROPERTIES, VIRTKEY, ALT, NOINVERT +#ifndef _NO_EXTENSIONS + "X", ID_FILE_EXIT, VIRTKEY, ALT, NOINVERT + "S", ID_VIEW_FULLSCREEN, VIRTKEY, SHIFT, CONTROL, NOINVERT + VK_ADD, ID_PREFERRED_SIZES, VIRTKEY, CONTROL, NOINVERT +#endif +} + +/* @makedep: winefile.ico */ +IDI_WINEFILE ICON DISCARDABLE winefile.ico + +/* @makedep: toolbar.bmp */ +IDB_TOOLBAR BITMAP DISCARDABLE toolbar.bmp + +/* @makedep: drivebar.bmp */ +IDB_DRIVEBAR BITMAP DISCARDABLE drivebar.bmp + +/* @makedep: images.bmp */ +IDB_IMAGES BITMAP DISCARDABLE images.bmp /* include localised resources */ @@ -34,11 +62,13 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "lang/fr-FR.rc" #include "lang/hu-HU.rc" #include "lang/it-IT.rc" +#include "lang/ko-KO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/pt-PT.rc" #include "lang/ru-RU.rc" #include "lang/sl-SI.rc" +#include "lang/tr-TR.rc" #include "lang/zh-CN.rc" #include "lang/sv-SE.rc" #include "lang/nb-NO.rc"