[ros-diffs] [gedmurphy] 21550: revert comctl32 Wine sync. There are
some issues with it and I don't have time to fix it at the moment.
gedmurphy at svn.reactos.org
gedmurphy at svn.reactos.org
Tue Apr 11 21:03:12 CEST 2006
Author: gedmurphy
Date: Tue Apr 11 23:03:09 2006
New Revision: 21550
URL: http://svn.reactos.ru/svn/reactos?rev=21550&view=rev
Log:
revert comctl32 Wine sync. There are some issues with it and I don't have time to fix it at the moment.
Modified:
trunk/reactos/dll/win32/comctl32/comctl32.spec
trunk/reactos/dll/win32/comctl32/comctl32undoc.c
trunk/reactos/dll/win32/comctl32/comctl_Cn.rc
trunk/reactos/dll/win32/comctl32/comctl_Cs.rc
trunk/reactos/dll/win32/comctl32/comctl_De.rc
trunk/reactos/dll/win32/comctl32/comctl_En.rc
trunk/reactos/dll/win32/comctl32/comctl_Es.rc
trunk/reactos/dll/win32/comctl32/comctl_Fr.rc
trunk/reactos/dll/win32/comctl32/comctl_Hu.rc
trunk/reactos/dll/win32/comctl32/comctl_It.rc
trunk/reactos/dll/win32/comctl32/comctl_Ja.rc
trunk/reactos/dll/win32/comctl32/comctl_Ko.rc
trunk/reactos/dll/win32/comctl32/comctl_Nl.rc
trunk/reactos/dll/win32/comctl32/comctl_Pl.rc
trunk/reactos/dll/win32/comctl32/comctl_Pt.rc
trunk/reactos/dll/win32/comctl32/comctl_Ru.rc
trunk/reactos/dll/win32/comctl32/comctl_Si.rc
trunk/reactos/dll/win32/comctl32/comctl_Th.rc
trunk/reactos/dll/win32/comctl32/comctl_Uk.rc
trunk/reactos/dll/win32/comctl32/header.c
trunk/reactos/dll/win32/comctl32/listview.c
trunk/reactos/dll/win32/comctl32/monthcal.c
trunk/reactos/dll/win32/comctl32/pager.c
trunk/reactos/dll/win32/comctl32/progress.c
trunk/reactos/dll/win32/comctl32/rebar.c
trunk/reactos/dll/win32/comctl32/status.c
trunk/reactos/dll/win32/comctl32/syslink.c
trunk/reactos/dll/win32/comctl32/tab.c
trunk/reactos/dll/win32/comctl32/tooltips.c
trunk/reactos/dll/win32/comctl32/treeview.c
Modified: trunk/reactos/dll/win32/comctl32/comctl32.spec
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32.spec?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl32.spec (original)
+++ trunk/reactos/dll/win32/comctl32/comctl32.spec Tue Apr 11 23:03:09 2006
@@ -106,13 +106,13 @@
412 stdcall -noname RemoveWindowSubclass(long ptr long)
413 stdcall -noname DefSubclassProc(long long long long)
414 stdcall -noname MirrorIcon(ptr ptr)
-415 stdcall -noname DrawTextWrap(long wstr long ptr long) user32.DrawTextW
-416 stdcall -noname DrawTextExPrivWrap(long wstr long ptr long ptr) user32.DrawTextExW
-417 stdcall -noname ExtTextOutWrap(long long long long ptr wstr long ptr) gdi32.ExtTextOutW
-418 stdcall -noname GetCharWidthWrap(long long long long) gdi32.GetCharWidthW
-419 stdcall -noname GetTextExtentPointWrap(long wstr long ptr) gdi32.GetTextExtentPointW
-420 stdcall -noname GetTextExtentPoint32Wrap(long wstr long ptr) gdi32.GetTextExtentPoint32W
-421 stdcall -noname TextOutWrap(long long long wstr long) gdi32.TextOutW
+415 stdcall DrawTextWrap(long wstr long ptr long) user32.DrawTextW
+416 stdcall DrawTextExPrivWrap(long wstr long ptr long ptr) user32.DrawTextExW
+417 stdcall ExtTextOutWrap(long long long long ptr wstr long ptr) gdi32.ExtTextOutW
+418 stdcall GetCharWidthWrap(long long long long) gdi32.GetCharWidthW
+419 stdcall GetTextExtentPointWrap(long wstr long ptr) gdi32.GetTextExtentPointW
+420 stdcall GetTextExtentPoint32Wrap(long wstr long ptr) gdi32.GetTextExtentPoint32W
+421 stdcall TextOutWrap(long long long wstr long) gdi32.TextOutW
# Functions imported by name
Modified: trunk/reactos/dll/win32/comctl32/comctl32undoc.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl32undoc.c?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl32undoc.c (original)
+++ trunk/reactos/dll/win32/comctl32/comctl32undoc.c Tue Apr 11 23:03:09 2006
@@ -386,8 +386,10 @@
UINT i;
LPSTR dataA = NULL;
- if (!mp->extview.lpfnCompare)
+ if (!mp->extview.lpfnCompare) {
+ ERR("MRU list not properly created. No compare procedure.\n");
return -1;
+ }
if(!(mp->extview.dwFlags & MRUF_BINARY_LIST) && !mp->isUnicode) {
DWORD len = WideCharToMultiByte(CP_ACP, 0, lpData, -1,
Modified: trunk/reactos/dll/win32/comctl32/comctl_Cn.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_Cn.rc?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl_Cn.rc (original)
+++ trunk/reactos/dll/win32/comctl32/comctl_Cn.rc Tue Apr 11 23:03:09 2006
@@ -1,90 +1,90 @@
-/*
- * Copyright 2002 Tisheng Chen
- *
- * 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
- */
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-#pragma code_page(936)
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "ÊôÐÔ "
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "È·¶¨", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "È¡Ïû", IDCANCEL,58,122,50,14
- PUSHBUTTON "Ó¦ÓÃ(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "°ïÖú", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Wizard"
-FONT 8, "MS Shell Dlg"
-BEGIN
- PUSHBUTTON "< ÉÏÒ»²½(&B)", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "ÏÂÒ»²½(&N) >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "½áÊø", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "È¡Ïû", IDCANCEL,178,138,50,14
- PUSHBUTTON "°ïÖú", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "×Ô¶¨Ò幤¾ßÀ¸"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "¹Ø±Õ(&C)", IDCANCEL,308,6,44,14
- PUSHBUTTON "ÖØÖÃ(&e)", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "°ïÖú(&H)", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "ÉÏÒÆ(&U)", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "ÏÂÒÆ(&D)", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "¿ÉÓù¤¾ßÀ¸°´Å¥(&V):", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "Ìí¼Ó(&A) ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- ɾ³ý(&R)", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "µ±Ç°¹¤¾ßÀ¸°´Å¥(&T):", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "¹Ø±Õ"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "Today:"
- IDM_GOTODAY "Go to today"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "·Ö¸ô·û"
-}
-
-STRINGTABLE DISCARDABLE
-{
- HKY_NONE "None"
-}
-
-#pragma code_page(default)
+/*
+ * Copyright 2002 Tisheng Chen
+ *
+ * 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
+ */
+
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
+#pragma code_page(936)
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "ÊôÐÔ "
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "È·¶¨", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "È¡Ïû", IDCANCEL,58,122,50,14
+ PUSHBUTTON "Ó¦ÓÃ(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "°ïÖú", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Wizard"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ PUSHBUTTON "< ÉÏÒ»²½(&B)", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "ÏÂÒ»²½(&N) >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "½áÊø", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "È¡Ïû", IDCANCEL,178,138,50,14
+ PUSHBUTTON "°ïÖú", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "×Ô¶¨Ò幤¾ßÀ¸"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "¹Ø±Õ(&C)", IDCANCEL,308,6,44,14
+ PUSHBUTTON "ÖØÖÃ(&e)", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "°ïÖú(&H)", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "ÉÏÒÆ(&U)", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "ÏÂÒÆ(&D)", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "¿ÉÓù¤¾ßÀ¸°´Å¥(&V):", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "Ìí¼Ó(&A) ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- ɾ³ý(&R)", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "µ±Ç°¹¤¾ßÀ¸°´Å¥(&T):", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "¹Ø±Õ"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "Today:"
+ IDM_GOTODAY "Go to today"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "·Ö¸ô·û"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ HKY_NONE "None"
+}
+
+#pragma code_page(default)
Modified: trunk/reactos/dll/win32/comctl32/comctl_Cs.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_Cs.rc?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl_Cs.rc (original)
+++ trunk/reactos/dll/win32/comctl32/comctl_Cs.rc Tue Apr 11 23:03:09 2006
@@ -1,93 +1,90 @@
-/* Hey, Emacs, open this file with -*- coding: cp1250 -*-
- *
- * Copyright 1999 Eric Kohl
- *
- * Czech resources for comctl32
- * Copyright 2004 David Kredba
- *
- * 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
- */
-
-LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
-
-/* Czech strings in CP1250 */
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Vlastnosti "
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "Storno", IDCANCEL,58,122,50,14
- PUSHBUTTON "&Použít", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "Nápovìda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Prùvodce"
-FONT 8, "MS Shell Dlg"
-BEGIN
- PUSHBUTTON "< &Zpìt", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "&Další >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "Dokonèit", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "Storno", IDCANCEL,178,138,50,14
- PUSHBUTTON "Nápovìda", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Nastavení panelu"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "&Zavøít", IDCANCEL,308,6,44,14
- PUSHBUTTON "&Výchozí", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "&Nápovìda", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "Nahor&u", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "&Dolù", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "D&ostupná tlaèítka:", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "Pøid&at ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- Odeb&rat", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "&Tlaèítka panelu:", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "Zavøít"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "Dnes:"
- IDM_GOTODAY "Jdi na dnešek"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "Oddìlovaè"
-}
-
-STRINGTABLE DISCARDABLE
-{
- HKY_NONE "Žádný"
-}
+/*
+ * Copyright 1999 Eric Kohl
+ *
+ * Czech resources for comctl32
+ * Copyright 2004 David Kredba
+ *
+ * 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
+ */
+
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Vlastnosti "
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "Storno", IDCANCEL,58,122,50,14
+ PUSHBUTTON "&Pou¾ít", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "Nápovìda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Prùvodce"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ PUSHBUTTON "< &Zpìt", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Dal¹í >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Dokonèit", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "Storno", IDCANCEL,178,138,50,14
+ PUSHBUTTON "Nápovìda", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Nastavení panelu"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "&Zavøít", IDCANCEL,308,6,44,14
+ PUSHBUTTON "&Výchozí", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "&Nápovìda", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "Nahor&u", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "&Dolù", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "D&ostupná tlaèítka:", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "Pøid&at ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- Odeb&rat", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "&Tlaèítka panelu:", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "Zavøít"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "Dnes:"
+ IDM_GOTODAY "Jdi na dne¹ek"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "Oddìlovaè"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ HKY_NONE "®ádný"
+}
Modified: trunk/reactos/dll/win32/comctl32/comctl_De.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_De.rc?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl_De.rc (original)
+++ trunk/reactos/dll/win32/comctl32/comctl_De.rc Tue Apr 11 23:03:09 2006
@@ -1,87 +1,87 @@
-/*
- * Copyright 2000 Uwe Bonnes
- *
- * 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
- */
-
-LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "Schließen"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "Heute:"
- IDM_GOTODAY "Gehe zu Heute"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "Trennzeichen"
-}
-
-STRINGTABLE DISCARDABLE
-{
- HKY_NONE "Keiner"
-}
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Eigenschaften für "
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "&OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "A&bbrechen", IDCANCEL,58,122,50,14
- PUSHBUTTON "&Anwenden", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "&Hilfe", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Wizard"
-FONT 8, "MS Shell Dlg"
-BEGIN
- PUSHBUTTON "< &Zurück", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "&Weiter >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "&Beenden", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "Abbrechen", IDCANCEL,178,138,50,14
- PUSHBUTTON "&Hilfe", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Toolbar einrichten"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "&Schließen", IDCANCEL,308,6,44,14
- PUSHBUTTON "&Zurücksetzen", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "&Hilfe", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "Nach &Oben verschieben", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "Nach &Unten verschieben", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "&Vorhandene Knöpfe:", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "H&inzufügen ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- &Löschen", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "&Toolbarknöpfe:", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
+/*
+ * Copyright 2000 Uwe Bonnes
+ *
+ * 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
+ */
+
+LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "Schließen"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "Heute:"
+ IDM_GOTODAY "Gehe zu Heute"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "Trennzeichen"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ HKY_NONE "Keiner"
+}
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Eigenschaften für "
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "&OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "A&bbrechen", IDCANCEL,58,122,50,14
+ PUSHBUTTON "&Anwenden", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "&Hilfe", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Wizard"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ PUSHBUTTON "< &Zurück", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Weiter >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "&Beenden", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "Abbrechen", IDCANCEL,178,138,50,14
+ PUSHBUTTON "&Hilfe", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Toolbar einrichten"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "&Schließen", IDCANCEL,308,6,44,14
+ PUSHBUTTON "&Zurücksetzen", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "&Hilfe", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "Nach &Oben verschieben", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "Nach &Unten verschieben", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "&Vorhandene Knöpfe:", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "H&inzufügen ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- &Löschen", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "&Toolbarknöpfe:", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
Modified: trunk/reactos/dll/win32/comctl32/comctl_En.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_En.rc?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl_En.rc (original)
+++ trunk/reactos/dll/win32/comctl32/comctl_En.rc Tue Apr 11 23:03:09 2006
@@ -1,87 +1,87 @@
-/*
- * Copyright 1999 Eric Kohl
- *
- * 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
- */
-
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Properties for "
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "Cancel", IDCANCEL,58,122,50,14
- PUSHBUTTON "&Apply", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "Help", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Wizard"
-FONT 8, "MS Shell Dlg"
-BEGIN
- PUSHBUTTON "< &Back", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "&Next >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "Finish", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "Cancel", IDCANCEL,178,138,50,14
- PUSHBUTTON "Help", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Customize Toolbar"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "&Close", IDCANCEL,308,6,44,14
- PUSHBUTTON "R&eset", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "&Help", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "Move &Up", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "Move &Down", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "A&vailable buttons:", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "&Add ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- &Remove", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "&Toolbar buttons:", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "Close"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "Today:"
- IDM_GOTODAY "Go to today"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "Separator"
-}
-
-STRINGTABLE DISCARDABLE
-{
- HKY_NONE "None"
-}
+/*
+ * Copyright 1999 Eric Kohl
+ *
+ * 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
+ */
+
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Properties for "
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "Cancel", IDCANCEL,58,122,50,14
+ PUSHBUTTON "&Apply", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "Help", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Wizard"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ PUSHBUTTON "< &Back", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Next >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Finish", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "Cancel", IDCANCEL,178,138,50,14
+ PUSHBUTTON "Help", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Customize Toolbar"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "&Close", IDCANCEL,308,6,44,14
+ PUSHBUTTON "R&eset", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "&Help", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "Move &Up", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "Move &Down", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "A&vailable buttons:", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "&Add ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- &Remove", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "&Toolbar buttons:", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "Close"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "Today:"
+ IDM_GOTODAY "Go to today"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "Separator"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ HKY_NONE "None"
+}
Modified: trunk/reactos/dll/win32/comctl32/comctl_Es.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_Es.rc?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl_Es.rc (original)
+++ trunk/reactos/dll/win32/comctl32/comctl_Es.rc Tue Apr 11 23:03:09 2006
@@ -1,87 +1,87 @@
-/*
- * Copyright 2003 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
- * 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
- */
-
-LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Propiedades de "
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "Aceptar", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "Cancelar", IDCANCEL,58,122,50,14
- PUSHBUTTON "&Aplicar", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "Ayuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Ayudante"
-FONT 8, "MS Shell Dlg"
-BEGIN
- PUSHBUTTON "< &Anterior", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "&Siguiente >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "Terminar", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "Cancelar", IDCANCEL,178,138,50,14
- PUSHBUTTON "Ayuda", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Personalizar barra de herramientas"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "&Cerrar", IDCANCEL,308,6,44,14
- PUSHBUTTON "R&estaurar", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "&Ayuda", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "Mover A&rriba", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "Mover A&bajo", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "Botones &disponibles:", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "A&ñadir ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- &Eliminar", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "B&otones de la barra:", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "Cerrar"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "Hoy:"
- IDM_GOTODAY "Ir a hoy"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "Separador"
-}
-
-STRINGTABLE DISCARDABLE
-{
- HKY_NONE "Ninguno"
-}
+/*
+ * Copyright 2003 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
+ * 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
+ */
+
+LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Propiedades de "
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "Aceptar", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "Cancelar", IDCANCEL,58,122,50,14
+ PUSHBUTTON "&Aplicar", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "Ayuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Ayudante"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ PUSHBUTTON "< &Anterior", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Siguiente >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Terminar", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "Cancelar", IDCANCEL,178,138,50,14
+ PUSHBUTTON "Ayuda", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Personalizar barra de herramientas"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "&Cerrar", IDCANCEL,308,6,44,14
+ PUSHBUTTON "R&estaurar", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "&Ayuda", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "Mover A&rriba", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "Mover A&bajo", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "Botones &disponibles:", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "A&ñadir ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- &Eliminar", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "B&otones de la barra:", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "Cerrar"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "Hoy:"
+ IDM_GOTODAY "Ir a hoy"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "Separador"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ HKY_NONE "Ninguno"
+}
Modified: trunk/reactos/dll/win32/comctl32/comctl_Fr.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_Fr.rc?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl_Fr.rc (original)
+++ trunk/reactos/dll/win32/comctl32/comctl_Fr.rc Tue Apr 11 23:03:09 2006
@@ -1,91 +1,91 @@
-/*
- * Comctl32
- * French language support
- *
- * Copyright 1999 Eric Kohl
- * Copyright 2003 Vincent Béron
- *
- * 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
- */
-
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Propriétés pour "
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "Annuler", IDCANCEL,58,122,50,14
- PUSHBUTTON "&Appliquer", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "Aide", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "onglet", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Assistant"
-FONT 8, "MS Shell Dlg"
-BEGIN
- PUSHBUTTON "< &Précédent", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "&Suivant >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "Terminer", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "Annuler", IDCANCEL,178,138,50,14
- PUSHBUTTON "Aide", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Onglet", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Personnaliser la barre d'outils"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "&Fermer", IDCANCEL,308,6,44,14
- PUSHBUTTON "&Réinitialiser", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "&Aide", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "&Monter", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "&Descendre", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "Boutons disponibles :", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "A&jouter ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- &Enlever", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "&Boutons de la barre d'outils :", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "Fermer"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "Aujourd'hui:"
- IDM_GOTODAY "Aller à aujourd'hui"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "Séparateur"
-}
-
-STRINGTABLE DISCARDABLE
-{
- HKY_NONE "Aucun"
-}
+/*
+ * Comctl32
+ * French language support
+ *
+ * Copyright 1999 Eric Kohl
+ * Copyright 2003 Vincent Béron
+ *
+ * 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
+ */
+
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Propriétés pour "
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "Annuler", IDCANCEL,58,122,50,14
+ PUSHBUTTON "&Appliquer", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "Aide", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "onglet", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Assistant"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ PUSHBUTTON "< &Précédent", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Suivant >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Terminer", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "Annuler", IDCANCEL,178,138,50,14
+ PUSHBUTTON "Aide", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "Onglet", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Personnaliser la barre d'outils"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "&Fermer", IDCANCEL,308,6,44,14
+ PUSHBUTTON "&Réinitialiser", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "&Aide", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "&Monter", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "&Descendre", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "Boutons disponibles :", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "A&jouter ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- &Enlever", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "&Boutons de la barre d'outils :", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "Fermer"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "Aujourd'hui:"
+ IDM_GOTODAY "Aller à aujourd'hui"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "Séparateur"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ HKY_NONE "Aucun"
+}
Modified: trunk/reactos/dll/win32/comctl32/comctl_Hu.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_Hu.rc?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl_Hu.rc (original)
+++ trunk/reactos/dll/win32/comctl32/comctl_Hu.rc Tue Apr 11 23:03:09 2006
@@ -1,5 +1,8 @@
/*
- * Copyright 2006 Andras Kovacs
+ * Hungarian resources for comctl32
+ *
+ * Copyright 1999 Eric Kohl
+ * Copyright 2005 Robert Horvath - Hungarian translation - talley at cubeclub.hu
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -16,33 +19,33 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
+LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Tulajdonságok: "
+CAPTION "Beállítások "
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
PUSHBUTTON "Mégse", IDCANCEL,58,122,50,14
- PUSHBUTTON "&Alkalmazás", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "Súgó", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "Fül", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
+ PUSHBUTTON "&Alkalmaz", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "&Súgó", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
END
IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Varázsló"
+CAPTION "Telepítõ"
FONT 8, "MS Shell Dlg"
BEGIN
- PUSHBUTTON "< &Elõzõ", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "&Következõ >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "Kész", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "< &Vissza", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Tovább >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Befejezés", IDC_FINISH_BUTTON,121,138,50,14
PUSHBUTTON "Mégse", IDCANCEL,178,138,50,14
PUSHBUTTON "Súgó", IDHELP,235,138,50,14,WS_GROUP
LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Fül", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
END
@@ -52,36 +55,36 @@
CAPTION "Eszköztár testreszabása"
FONT 8, "MS Shell Dlg"
BEGIN
- DEFPUSHBUTTON "&Bezárás", IDCANCEL,308,6,44,14
- PUSHBUTTON "Alaph&elyzet", IDC_RESET_BTN,308,23,44,14
+ DEFPUSHBUTTON "&Bezár", IDCANCEL,308,6,44,14
+ PUSHBUTTON "V&isszaállít", IDC_RESET_BTN,308,23,44,14
PUSHBUTTON "&Súgó", IDC_HELP_BTN,308,40,44,14
PUSHBUTTON "&Fel", IDC_MOVEUP_BTN,308,74,44,14
PUSHBUTTON "&Le", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "El&érhetõ gombok:", -1,4,5,84,10
+ LTEXT "&Elérhetõ gombok:", -1,4,5,84,10
LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
PUSHBUTTON "&Hozzáad ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- El&vesz", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "E&szköztár gombok:", -1,182,5,78,10
+ PUSHBUTTON "<- &Töröl", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "Eszköz&tár gombjai:", -1,182,5,78,10
LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
END
STRINGTABLE DISCARDABLE
{
- IDS_CLOSE "Bezárás"
+ IDS_CLOSE "Bezár"
}
STRINGTABLE DISCARDABLE
{
IDM_TODAY "Ma:"
- IDM_GOTODAY "Ugrás mára"
+ IDM_GOTODAY "Mai nap"
}
STRINGTABLE DISCARDABLE
{
- IDS_SEPARATOR "Elválasztó"
+ IDS_SEPARATOR "Separator"
}
STRINGTABLE DISCARDABLE
{
- HKY_NONE "Nincs"
+ HKY_NONE "Ismeretlen"
}
Modified: trunk/reactos/dll/win32/comctl32/comctl_It.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_It.rc?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl_It.rc (original)
+++ trunk/reactos/dll/win32/comctl32/comctl_It.rc Tue Apr 11 23:03:09 2006
@@ -1,88 +1,88 @@
-/*
- * Copyright 1999 Eric Kohl
- * Copyright 2003 Ivan Leo Puoti
- *
- * 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
- */
-
-LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Proprietà per "
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "Annulla", IDCANCEL,58,122,50,14
- PUSHBUTTON "&Applica", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "Aiuto", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "Linguetta", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Wizard"
-FONT 8, "MS Shell Dlg"
-BEGIN
- PUSHBUTTON "< &Indietro", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "&Avanti >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "Fine", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "Anulla", IDCANCEL,178,138,50,14
- PUSHBUTTON "Aiuto", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Linguetta", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Personalitta la barra degli strumenti"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "&Chiudi", IDCANCEL,308,6,44,14
- PUSHBUTTON "R&eimpostare", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "&Aiuto", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "Muovi &Su", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "Muovi &giù", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "&Tasti disponibili:", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "&Aggiungi ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- &Rimuovi", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "&Tast della barra degli strumenti:", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "Chiudi"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "Oggi:"
- IDM_GOTODAY "Vai a oggi"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "Separatore"
-}
-
-STRINGTABLE DISCARDABLE
-{
- HKY_NONE "Nessuno"
-}
+/*
+ * Copyright 1999 Eric Kohl
+ * Copyright 2003 Ivan Leo Puoti
+ *
+ * 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
+ */
+
+LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Proprietà per "
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "Annulla", IDCANCEL,58,122,50,14
+ PUSHBUTTON "&Applica", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "Aiuto", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "Linguetta", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Wizard"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ PUSHBUTTON "< &Indietro", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Avanti >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Fine", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "Anulla", IDCANCEL,178,138,50,14
+ PUSHBUTTON "Aiuto", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "Linguetta", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Personalitta la barra degli strumenti"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "&Chiudi", IDCANCEL,308,6,44,14
+ PUSHBUTTON "R&eimpostare", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "&Aiuto", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "Muovi &Su", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "Muovi &giù", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "&Tasti disponibili:", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "&Aggiungi ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- &Rimuovi", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "&Tast della barra degli strumenti:", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "Chiudi"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "Oggi:"
+ IDM_GOTODAY "Vai a oggi"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "Separatore"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ HKY_NONE "Nessuno"
+}
Modified: trunk/reactos/dll/win32/comctl32/comctl_Ja.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_Ja.rc?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl_Ja.rc (original)
+++ trunk/reactos/dll/win32/comctl32/comctl_Ja.rc Tue Apr 11 23:03:09 2006
@@ -1,87 +1,87 @@
-/*
- * Copyright 2003 Hajime Segawa
- *
- * 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
- */
-
-LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Properties for "
-FONT 9, "MS UI Gothic"
-BEGIN
- DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", IDCANCEL,58,122,50,14
- PUSHBUTTON "“K—p(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "ƒwƒ‹ƒv", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Wizard"
-FONT 9, "MS UI Gothic"
-BEGIN
- PUSHBUTTON "< –ß‚é(&B)", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "i‚Þ(&N) >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "Š®—¹", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", IDCANCEL,178,138,50,14
- PUSHBUTTON "ƒwƒ‹ƒv", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Customize Toolbar"
-FONT 9, "MS UI Gothic"
-BEGIN
- DEFPUSHBUTTON "•Â‚¶‚é(&C)", IDCANCEL,308,6,44,14
- PUSHBUTTON "ƒŠƒZƒbƒg(R&)", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "ƒwƒ‹ƒv(&H)", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "ã‚Ö (&U)", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "‰º‚Ö (&D)", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "A&vailable buttons:", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "’ljÁ(&A) ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- íœ(&R)", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "&Toolbar buttons:", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "Close"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "Today:"
- IDM_GOTODAY "Go to today"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "Separator"
-}
-
-STRINGTABLE DISCARDABLE
-{
- HKY_NONE "None"
-}
+/*
+ * Copyright 2003 Hajime Segawa
+ *
+ * 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
+ */
+
+LANGUAGE LANG_JAPANESE, SUBLANG_NEUTRAL
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Properties for "
+FONT 9, "MS UI Gothic"
+BEGIN
+ DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", IDCANCEL,58,122,50,14
+ PUSHBUTTON "“K—p(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "ƒwƒ‹ƒv", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "ƒ^ƒu", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "ƒEƒBƒU[ƒh"
+FONT 9, "MS UI Gothic"
+BEGIN
+ PUSHBUTTON "< –ß‚é(&B)", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "i‚Þ(&N) >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Š®—¹", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "ƒLƒƒƒ“ƒZƒ‹", IDCANCEL,178,138,50,14
+ PUSHBUTTON "ƒwƒ‹ƒv", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "ƒ^ƒu", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "ƒc[ƒ‹ ƒo[‚̃JƒXƒ^ƒ}ƒCƒY"
+FONT 9, "MS UI Gothic"
+BEGIN
+ DEFPUSHBUTTON "•Â‚¶‚é(&C)", IDCANCEL,308,6,44,14
+ PUSHBUTTON "ƒŠƒZƒbƒg(&E)", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "ƒwƒ‹ƒv(&H)", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "ã‚Ö (&U)", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "‰º‚Ö (&D)", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "Žg—p‚Å‚«‚éƒ{ƒ^ƒ“(&V):", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "’ljÁ(&A) ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- íœ(&R)", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "ƒc[ƒ‹ ƒo[‚̃{ƒ^ƒ“(&T):", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "•Â‚¶‚é"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "¡“ú:"
+ IDM_GOTODAY "¡“ú‚ÖˆÚ“®"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "‹æØ‚èü"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ HKY_NONE "‚È‚µ"
+}
Modified: trunk/reactos/dll/win32/comctl32/comctl_Ko.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_Ko.rc?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl_Ko.rc (original)
+++ trunk/reactos/dll/win32/comctl32/comctl_Ko.rc Tue Apr 11 23:03:09 2006
@@ -1,83 +1,83 @@
-/*
- * Copyright 2002 Won-kyu Park <wkpark at kldp.org>
- * Copyright 2005 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "¼Ó¼º"
-FONT 9, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "È®ÀÎ", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "Ãë¼Ò", IDCANCEL,58,122,50,14
- PUSHBUTTON "Àû¿ë(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "µµ¿ò¸»", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "ÅÇ", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "¸¶¹ý»ç"
-FONT 9, "MS Shell Dlg"
-BEGIN
- PUSHBUTTON "< ÀÌÀü(&B)", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "´ÙÀ½(&N) >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "Á¾·á", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "Ãë¼Ò", IDCANCEL,178,138,50,14
- PUSHBUTTON "µµ¿ò¸»", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "ÅÇ", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "µµ±¸¹Ù »ç¿ëÀÚ Á¤ÀÇ"
-FONT 9, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "´Ý±â(&C)", IDCANCEL,308,6,44,14
- PUSHBUTTON "´Ù½Ã(&e)", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "µµ¿ò¸»(&H)", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "À§·Î À̵¿(&U)", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "¾Æ·¡·Î À̵¿(&D)", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "°¡´ÉÇÑ ¹öÆ°(&v)", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "´õÇϱâ(&A) ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- Á¦°ÅÇϱâ(&R)", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "µµ±¸¹Ù ¹öÆ°(&T):", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "´Ý±â"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "¿À´Ã:"
- IDM_GOTODAY "¿À´Ã·Î °¡±â"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "ºÐ¸®ÀÚ"
-}
+/*
+ * Copyright 2002 Won-kyu Park <wkpark at kldp.org>
+ * Copyright 2005 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "¼Ó¼º"
+FONT 9, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "È®ÀÎ", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "Ãë¼Ò", IDCANCEL,58,122,50,14
+ PUSHBUTTON "Àû¿ë(&A)", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "µµ¿ò¸»", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "ÅÇ", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "¸¶¹ý»ç"
+FONT 9, "MS Shell Dlg"
+BEGIN
+ PUSHBUTTON "< ÀÌÀü(&B)", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "´ÙÀ½(&N) >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Á¾·á", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "Ãë¼Ò", IDCANCEL,178,138,50,14
+ PUSHBUTTON "µµ¿ò¸»", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "ÅÇ", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "µµ±¸¹Ù »ç¿ëÀÚ Á¤ÀÇ"
+FONT 9, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "´Ý±â(&C)", IDCANCEL,308,6,44,14
+ PUSHBUTTON "´Ù½Ã(&e)", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "µµ¿ò¸»(&H)", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "À§·Î À̵¿(&U)", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "¾Æ·¡·Î À̵¿(&D)", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "°¡´ÉÇÑ ¹öÆ°(&v)", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "´õÇϱâ(&A) ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- Á¦°ÅÇϱâ(&R)", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "µµ±¸¹Ù ¹öÆ°(&T):", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "´Ý±â"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "¿À´Ã:"
+ IDM_GOTODAY "¿À´Ã·Î °¡±â"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "ºÐ¸®ÀÚ"
+}
Modified: trunk/reactos/dll/win32/comctl32/comctl_Nl.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_Nl.rc?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl_Nl.rc (original)
+++ trunk/reactos/dll/win32/comctl32/comctl_Nl.rc Tue Apr 11 23:03:09 2006
@@ -1,89 +1,89 @@
-/*
- * comctl (Dutch resources)
- *
- * Copyright 2003 Hans Leidekker
- *
- * 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
- */
-
-LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Eigenschappen van "
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "Annuleren", IDCANCEL,58,122,50,14
- PUSHBUTTON "&Toepassen", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "Help", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "Tabblad", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Assistent"
-FONT 8, "MS Shell Dlg"
-BEGIN
- PUSHBUTTON "< V&orige", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "&Volgende >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "Beëindigen", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "Annuleren", IDCANCEL,178,138,50,14
- PUSHBUTTON "Help", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Tabblad", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Gereedschappenbalk aanpassen"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "&Afsluiten", IDCANCEL,308,6,44,14
- PUSHBUTTON "&Reset", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "&Help", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "Verplaats Om&hoog", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "Verplaats Om&laag", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "&Beschikbare knoppen:", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "&Toevoegen ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- &Verwijderen", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "&Knoppen:", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "Sluiten"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "Vandaag:"
- IDM_GOTODAY "Ga vandaag naar"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "Scheidingsteken"
-}
-
-STRINGTABLE DISCARDABLE
-{
- HKY_NONE "Geen"
-}
+/*
+ * comctl (Dutch resources)
+ *
+ * Copyright 2003 Hans Leidekker
+ *
+ * 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
+ */
+
+LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Eigenschappen van "
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "Annuleren", IDCANCEL,58,122,50,14
+ PUSHBUTTON "&Toepassen", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "Help", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "Tabblad", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Assistent"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ PUSHBUTTON "< V&orige", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Volgende >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Beëindigen", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "Annuleren", IDCANCEL,178,138,50,14
+ PUSHBUTTON "Help", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "Tabblad", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Gereedschappenbalk aanpassen"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "&Afsluiten", IDCANCEL,308,6,44,14
+ PUSHBUTTON "&Reset", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "&Help", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "Verplaats Om&hoog", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "Verplaats Om&laag", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "&Beschikbare knoppen:", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "&Toevoegen ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- &Verwijderen", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "&Knoppen:", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "Sluiten"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "Vandaag:"
+ IDM_GOTODAY "Ga vandaag naar"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "Scheidingsteken"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ HKY_NONE "Geen"
+}
Modified: trunk/reactos/dll/win32/comctl32/comctl_Pl.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_Pl.rc?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl_Pl.rc (original)
+++ trunk/reactos/dll/win32/comctl32/comctl_Pl.rc Tue Apr 11 23:03:09 2006
@@ -1,83 +1,83 @@
-/*
- * Copyright 1999 Eric Kohl
- * Copyright 2002 Jacek Bator
- *
- * 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
- */
-
-LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "W³aœciwoœci "
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "Anuluj", IDCANCEL,58,122,50,14
- PUSHBUTTON "&Zastosuj", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "Pomoc", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Kreator"
-FONT 8, "MS Shell Dlg"
-BEGIN
- PUSHBUTTON "< &Wstecz", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "&Dalej >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "Zakoñcz", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "Anuluj", IDCANCEL,178,138,50,14
- PUSHBUTTON "Pomoc", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Dostosowywanie paska narzêdzi"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "&Zamknij", IDCANCEL,308,6,44,14
- PUSHBUTTON "Z&resetuj", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "&Pomoc", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "Przenieœ &w górê", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "Przenieœ w &dó³", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "Do&stêpne przyciski:", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "D&odaj ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- &Usuñ", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "&Przyciski paska narzêdzi:", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "Zamknij"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "Dziœ:"
- IDM_GOTODAY "IdŸ do dziœ"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "Odstêp"
-}
+/*
+ * Copyright 1999 Eric Kohl
+ * Copyright 2002 Jacek Bator
+ *
+ * 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
+ */
+
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "W³aœciwoœci "
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "Anuluj", IDCANCEL,58,122,50,14
+ PUSHBUTTON "&Zastosuj", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "Pomoc", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Kreator"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ PUSHBUTTON "< &Wstecz", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Dalej >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Zakoñcz", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "Anuluj", IDCANCEL,178,138,50,14
+ PUSHBUTTON "Pomoc", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Dostosowywanie paska narzêdzi"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "&Zamknij", IDCANCEL,308,6,44,14
+ PUSHBUTTON "Z&resetuj", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "&Pomoc", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "Przenieœ &w górê", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "Przenieœ w &dó³", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "Do&stêpne przyciski:", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "D&odaj ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- &Usuñ", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "&Przyciski paska narzêdzi:", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "Zamknij"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "Dziœ:"
+ IDM_GOTODAY "IdŸ do dziœ"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "Odstêp"
+}
Modified: trunk/reactos/dll/win32/comctl32/comctl_Pt.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_Pt.rc?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl_Pt.rc (original)
+++ trunk/reactos/dll/win32/comctl32/comctl_Pt.rc Tue Apr 11 23:03:09 2006
@@ -1,87 +1,87 @@
-/*
- * Copyright 2003 Marcelo Duarte
- *
- * 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
- */
-
-LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Propriedades para "
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "Cancelar", IDCANCEL,58,122,50,14
- PUSHBUTTON "&Aplicar", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "Ajuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Assistente"
-FONT 8, "MS Shell Dlg"
-BEGIN
- PUSHBUTTON "< &Voltar", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "&Avançar >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "Finalizar", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "Cancelar", IDCANCEL,178,138,50,14
- PUSHBUTTON "Ajuda", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Personalizar barra de ferramentas"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "&Fechar", IDCANCEL,308,6,44,14
- PUSHBUTTON "R&estaurar", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "&Ajuda", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "A&cima", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "A&baixo", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "Botões &disponíveis:", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "&Adicionar ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- &Remover", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "&Botões da barra de ferramentas:", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "Fechar"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "Hoje:"
- IDM_GOTODAY "Ir para hoje"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "Separador"
-}
-
-STRINGTABLE DISCARDABLE
-{
- HKY_NONE "Nenhum"
-}
+/*
+ * Copyright 2003 Marcelo Duarte
+ *
+ * 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
+ */
+
+LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Propriedades para "
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "Cancelar", IDCANCEL,58,122,50,14
+ PUSHBUTTON "&Aplicar", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "Ajuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Assistente"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ PUSHBUTTON "< &Voltar", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Avançar >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Finalizar", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "Cancelar", IDCANCEL,178,138,50,14
+ PUSHBUTTON "Ajuda", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Personalizar barra de ferramentas"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "&Fechar", IDCANCEL,308,6,44,14
+ PUSHBUTTON "R&estaurar", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "&Ajuda", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "A&cima", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "A&baixo", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "Botões &disponíveis:", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "&Adicionar ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- &Remover", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "&Botões da barra de ferramentas:", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "Fechar"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "Hoje:"
+ IDM_GOTODAY "Ir para hoje"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "Separador"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ HKY_NONE "Nenhum"
+}
Modified: trunk/reactos/dll/win32/comctl32/comctl_Ru.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_Ru.rc?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl_Ru.rc (original)
+++ trunk/reactos/dll/win32/comctl32/comctl_Ru.rc Tue Apr 11 23:03:09 2006
@@ -1,89 +1,89 @@
-/*
- * comctl (Russian resources)
- *
- * Copyright 2003 Igor Stepin
- *
- * 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
- */
-
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Ñâîéñòâà äëÿ "
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "Îòìåíà", IDCANCEL,58,122,50,14
- PUSHBUTTON "Ïðè&ìåíèòü", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "&Ñïðàâêà", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Ìàñòåð"
-FONT 8, "MS Shell Dlg"
-BEGIN
- PUSHBUTTON "< &Íàçàä", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "&Äàëåå >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "Çàâåðøèòü", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "Îòìåíà", IDCANCEL,178,138,50,14
- PUSHBUTTON "&Ñïðàâêà", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Íàñòðîéêà ïàíåëè èíñòðóìåíòîâ"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "&Çàêðûòü", IDCANCEL,308,6,44,14
- PUSHBUTTON "Ñ&áðîñèòü", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "&Ñïðàâêà", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "Ïåðåìåñòèòü &ââåðõ", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "Ïåðåìåñòèòü &âíèç", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "&Äîñòóïíûå êíîïêè:", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "&Äîáàâèòü ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- &Óäàëèòü", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "&Êíîïêè ïàíåëè èíñòðóìåíòîâ:", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "Çàêðûòü"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "Ñåãîäíÿ:"
- IDM_GOTODAY "Òåêóùàÿ äàòà"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "Ðàçäåëèòåëü"
-}
-
-STRINGTABLE DISCARDABLE
-{
- HKY_NONE "Íåò"
-}
+/*
+ * comctl (Russian resources)
+ *
+ * Copyright 2003 Igor Stepin
+ *
+ * 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
+ */
+
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Ñâîéñòâà äëÿ "
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "Îòìåíà", IDCANCEL,58,122,50,14
+ PUSHBUTTON "Ïðè&ìåíèòü", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "&Ñïðàâêà", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Ìàñòåð"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ PUSHBUTTON "< &Íàçàä", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Äàëåå >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Çàâåðøèòü", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "Îòìåíà", IDCANCEL,178,138,50,14
+ PUSHBUTTON "&Ñïðàâêà", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Íàñòðîéêà ïàíåëè èíñòðóìåíòîâ"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "&Çàêðûòü", IDCANCEL,308,6,44,14
+ PUSHBUTTON "Ñ&áðîñèòü", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "&Ñïðàâêà", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "Ïåðåìåñòèòü &ââåðõ", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "Ïåðåìåñòèòü &âíèç", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "&Äîñòóïíûå êíîïêè:", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "&Äîáàâèòü ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- &Óäàëèòü", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "&Êíîïêè ïàíåëè èíñòðóìåíòîâ:", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "Çàêðûòü"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "Ñåãîäíÿ:"
+ IDM_GOTODAY "Òåêóùàÿ äàòà"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "Ðàçäåëèòåëü"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ HKY_NONE "Íåò"
+}
Modified: trunk/reactos/dll/win32/comctl32/comctl_Si.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_Si.rc?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl_Si.rc (original)
+++ trunk/reactos/dll/win32/comctl32/comctl_Si.rc Tue Apr 11 23:03:09 2006
@@ -1,82 +1,82 @@
-/*
- * Copyright 2002-2003 Rok Mandeljc <rok.mandeljc at gimb.org>
- *
- * 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
- */
-
-LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Lastnosti"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "V redu", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "Preklièi", IDCANCEL,58,122,50,14
- PUSHBUTTON "&Uporabi", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "Pomoè", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Èarovnik"
-FONT 8, "MS Shell Dlg"
-BEGIN
- PUSHBUTTON "< Na&zaj", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "Naprej >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "Dokonèaj", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "Preklièi", IDCANCEL,178,138,50,14
- PUSHBUTTON "Pomoè", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Prilagoditev orodne vrstice"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "&Zapri", IDCANCEL,308,6,44,14
- PUSHBUTTON "Po&nastavi", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "&Pomoè", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "N&avzgor", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "Na&vzdol", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "&Gumbi na voljo:", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "&Dodaj ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- &Odstrani", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "G&umbi orodne vrstice:", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "Zapri"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "Danes:"
- IDM_GOTODAY "&Poglejte danes"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "Loèilo"
-}
+/*
+ * Copyright 2002-2003 Rok Mandeljc <rok.mandeljc at gimb.org>
+ *
+ * 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
+ */
+
+LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Lastnosti"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "V redu", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "Preklièi", IDCANCEL,58,122,50,14
+ PUSHBUTTON "&Uporabi", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "Pomoè", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Èarovnik"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ PUSHBUTTON "< Na&zaj", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "Naprej >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "Dokonèaj", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "Preklièi", IDCANCEL,178,138,50,14
+ PUSHBUTTON "Pomoè", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Prilagoditev orodne vrstice"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "&Zapri", IDCANCEL,308,6,44,14
+ PUSHBUTTON "Po&nastavi", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "&Pomoè", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "N&avzgor", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "Na&vzdol", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "&Gumbi na voljo:", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "&Dodaj ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- &Odstrani", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "G&umbi orodne vrstice:", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "Zapri"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "Danes:"
+ IDM_GOTODAY "&Poglejte danes"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "Loèilo"
+}
Modified: trunk/reactos/dll/win32/comctl32/comctl_Th.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_Th.rc?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl_Th.rc (original)
+++ trunk/reactos/dll/win32/comctl32/comctl_Th.rc Tue Apr 11 23:03:09 2006
@@ -1,87 +1,87 @@
-/*
- * Copyright 2003 Jon Griffiths
- *
- * 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
- */
-
-LANGUAGE LANG_THAI, SUBLANG_DEFAULT
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "¤Ø³ÊÁºÑµÔ¢Í§ "
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "µ¡Å§", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "¡àÅÔ¡", IDCANCEL,58,122,50,14
- PUSHBUTTON "Áռŷѹ·Õ", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "ªèÇÂàËÅÕÍ", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Wizard"
-FONT 8, "MS Shell Dlg"
-BEGIN
- PUSHBUTTON "< Âé͹¡ÅѺ", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "µèÍä» >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "·íÒãËéàÊÃç¨", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "¡àÅÔ¡", IDCANCEL,178,138,50,14
- PUSHBUTTON "ªèÇÂàËÅÕÍ", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "»ÃѺáµè§á¶ºà¤Ã×èͧÁ×Í"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "»Ô´", IDCANCEL,308,6,44,14
- PUSHBUTTON "á¡éÍÍ¡", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "ªèÇÂàËÅÕÍ", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "ÂéÒ¢Öé¹", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "ÂéÒÂŧ", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "·ÕàÅ×Í¡ä´é:", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "ºÇ¡ ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- ¶Í´ÍÍ¡", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "¡ÒáÃзíÒᶺà¤Ã×èͧÁ×Í:", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "»Õ´"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "Çѹ¹Õé:"
- IDM_GOTODAY "件֧Çѹ¹Õé"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "Separator"
-}
-
-STRINGTABLE DISCARDABLE
-{
- HKY_NONE "äÁèÁÕàÅÂ"
-}
+/*
+ * Copyright 2003 Jon Griffiths
+ *
+ * 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
+ */
+
+LANGUAGE LANG_THAI, SUBLANG_DEFAULT
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "¤Ø³ÊÁºÑµÔ¢Í§ "
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "µ¡Å§", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "¡àÅÔ¡", IDCANCEL,58,122,50,14
+ PUSHBUTTON "Áռŷѹ·Õ", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "ªèÇÂàËÅÕÍ", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Wizard"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ PUSHBUTTON "< Âé͹¡ÅѺ", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "µèÍä» >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "·íÒãËéàÊÃç¨", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "¡àÅÔ¡", IDCANCEL,178,138,50,14
+ PUSHBUTTON "ªèÇÂàËÅÕÍ", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "»ÃѺáµè§á¶ºà¤Ã×èͧÁ×Í"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "»Ô´", IDCANCEL,308,6,44,14
+ PUSHBUTTON "á¡éÍÍ¡", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "ªèÇÂàËÅÕÍ", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "ÂéÒ¢Öé¹", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "ÂéÒÂŧ", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "·ÕàÅ×Í¡ä´é:", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "ºÇ¡ ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- ¶Í´ÍÍ¡", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "¡ÒáÃзíÒᶺà¤Ã×èͧÁ×Í:", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "»Õ´"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "Çѹ¹Õé:"
+ IDM_GOTODAY "件֧Çѹ¹Õé"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "Separator"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ HKY_NONE "äÁèÁÕàÅÂ"
+}
Modified: trunk/reactos/dll/win32/comctl32/comctl_Uk.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl_Uk.rc?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl_Uk.rc (original)
+++ trunk/reactos/dll/win32/comctl32/comctl_Uk.rc Tue Apr 11 23:03:09 2006
@@ -1,89 +1,89 @@
-/*
- * comctl (Ukrainian resources)
- *
- * Copyright 2004 Ilya Korniyko
- *
- * 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
- */
-
-LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-
-IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
-STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Âëàñòèâîñò³ äëÿ "
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
- PUSHBUTTON "&³äì³íà", IDCANCEL,58,122,50,14
- PUSHBUTTON "&Çàñòîñóâàòè", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
- PUSHBUTTON "&Äîâ³äêà", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
-END
-
-
-IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
-CAPTION "Ìàñòåð"
-FONT 8, "MS Shell Dlg"
-BEGIN
- PUSHBUTTON "< &Íàçàä", IDC_BACK_BUTTON,71,138,50,14
- DEFPUSHBUTTON "&Äàë³ >", IDC_NEXT_BUTTON,121,138,50,14
- DEFPUSHBUTTON "&Çàâåðøèòè", IDC_FINISH_BUTTON,121,138,50,14
- PUSHBUTTON "&³äì³íà", IDCANCEL,178,138,50,14
- PUSHBUTTON "&Äîâ³äêà", IDHELP,235,138,50,14,WS_GROUP
- LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
- CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
- LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
-END
-
-
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Íàñòðîéêà ïàíåë³ ³íñòðóìåíò³â"
-FONT 8, "MS Shell Dlg"
-BEGIN
- DEFPUSHBUTTON "&Çàêðèòè", IDCANCEL,308,6,44,14
- PUSHBUTTON "&Ñêèíóòè", IDC_RESET_BTN,308,23,44,14
- PUSHBUTTON "&Äîâ³äêà", IDC_HELP_BTN,308,40,44,14
- PUSHBUTTON "Ïåðåñóíóòè â&ãîðó", IDC_MOVEUP_BTN,308,74,44,14
- PUSHBUTTON "Ïåðåñóíóòè äî&íèçó", IDC_MOVEDN_BTN,308,91,44,14
- LTEXT "Íà&ÿâí³ êíîïêè:", -1,4,5,84,10
- LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
- PUSHBUTTON "&Äîäàòè ->", IDOK, 131, 42, 44, 14
- PUSHBUTTON "<- &Ïðèáðàòè", IDC_REMOVE_BTN,131,62,44,14
- LTEXT "&Êíîïêè ïàíåë³ ³íñòðóìåíò³â:", -1,182,5,78,10
- LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
-END
-
-STRINGTABLE DISCARDABLE
-{
- IDS_CLOSE "Çàêðèòè"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDM_TODAY "Ñüîãîäí³:"
- IDM_GOTODAY "Ïîòî÷íà äàòà"
-}
-
-STRINGTABLE DISCARDABLE
-{
- IDS_SEPARATOR "Ðîçä³ëüíèê"
-}
-
-STRINGTABLE DISCARDABLE
-{
- HKY_NONE "Íåìà"
-}
+/*
+ * comctl (Ukrainian resources)
+ *
+ * Copyright 2004 Ilya Korniyko
+ *
+ * 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
+ */
+
+LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Âëàñòèâîñò³ äëÿ "
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+ PUSHBUTTON "&³äì³íà", IDCANCEL,58,122,50,14
+ PUSHBUTTON "&Çàñòîñóâàòè", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+ PUSHBUTTON "&Äîâ³äêà", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114
+END
+
+
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Ìàñòåð"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ PUSHBUTTON "< &Íàçàä", IDC_BACK_BUTTON,71,138,50,14
+ DEFPUSHBUTTON "&Äàë³ >", IDC_NEXT_BUTTON,121,138,50,14
+ DEFPUSHBUTTON "&Çàâåðøèòè", IDC_FINISH_BUTTON,121,138,50,14
+ PUSHBUTTON "&³äì³íà", IDCANCEL,178,138,50,14
+ PUSHBUTTON "&Äîâ³äêà", IDHELP,235,138,50,14,WS_GROUP
+ LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+ CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
+ LTEXT "", IDC_SUNKEN_LINEHEADER,0,35,290,1,SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE
+END
+
+
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Íàñòðîéêà ïàíåë³ ³íñòðóìåíò³â"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "&Çàêðèòè", IDCANCEL,308,6,44,14
+ PUSHBUTTON "&Ñêèíóòè", IDC_RESET_BTN,308,23,44,14
+ PUSHBUTTON "&Äîâ³äêà", IDC_HELP_BTN,308,40,44,14
+ PUSHBUTTON "Ïåðåñóíóòè â&ãîðó", IDC_MOVEUP_BTN,308,74,44,14
+ PUSHBUTTON "Ïåðåñóíóòè äî&íèçó", IDC_MOVEDN_BTN,308,91,44,14
+ LTEXT "Íà&ÿâí³ êíîïêè:", -1,4,5,84,10
+ LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+ PUSHBUTTON "&Äîäàòè ->", IDOK, 131, 42, 44, 14
+ PUSHBUTTON "<- &Ïðèáðàòè", IDC_REMOVE_BTN,131,62,44,14
+ LTEXT "&Êíîïêè ïàíåë³ ³íñòðóìåíò³â:", -1,182,5,78,10
+ LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+END
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_CLOSE "Çàêðèòè"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDM_TODAY "Ñüîãîäí³:"
+ IDM_GOTODAY "Ïîòî÷íà äàòà"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SEPARATOR "Ðîçä³ëüíèê"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ HKY_NONE "Íåìà"
+}
Modified: trunk/reactos/dll/win32/comctl32/header.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/header.c?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/header.c (original)
+++ trunk/reactos/dll/win32/comctl32/header.c Tue Apr 11 23:03:09 2006
@@ -166,7 +166,6 @@
RECT r;
INT oldBkMode, cxEdge = GetSystemMetrics(SM_CXEDGE);
HTHEME theme = GetWindowTheme (hwnd);
- NMCUSTOMDRAW nmcd;
TRACE("DrawItem(iItem %d bHotTrack %d unicode flag %d)\n", iItem, bHotTrack, infoPtr->bUnicode);
@@ -206,24 +205,22 @@
r.left -= cxEdge;
r.right += cxEdge;
- /* Set the colors before sending NM_CUSTOMDRAW so that it can change them */
- SetTextColor (hdc, (bHotTrack && !theme) ? COLOR_HIGHLIGHT : COLOR_BTNTEXT);
- SetBkColor(hdc, GetSysColor(COLOR_3DFACE));
-
- nmcd.hdr.hwndFrom = hwnd;
- nmcd.hdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID);
- nmcd.hdr.code = NM_CUSTOMDRAW;
- nmcd.dwDrawStage = CDDS_PREPAINT | CDDS_ITEM | CDDS_ITEMPOSTERASE;
- nmcd.hdc = hdc;
- nmcd.dwItemSpec = iItem;
- nmcd.rc = r;
- nmcd.uItemState = phdi->bDown ? CDIS_SELECTED : 0;
- nmcd.lItemlParam = phdi->lParam;
-
- SendMessageW (infoPtr->hwndNotify, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd);
-
if (phdi->fmt & HDF_OWNERDRAW) {
DRAWITEMSTRUCT dis;
+ NMCUSTOMDRAW nmcd;
+
+ nmcd.hdr.hwndFrom = hwnd;
+ nmcd.hdr.idFrom = GetWindowLongPtrW (hwnd, GWLP_ID);
+ nmcd.hdr.code = NM_CUSTOMDRAW;
+ nmcd.dwDrawStage = CDDS_PREPAINT | CDDS_ITEM | CDDS_ITEMPOSTERASE;
+ nmcd.hdc = hdc;
+ nmcd.dwItemSpec = iItem;
+ nmcd.rc = r;
+ nmcd.uItemState = phdi->bDown ? CDIS_SELECTED : 0;
+ nmcd.lItemlParam = phdi->lParam;
+
+ SendMessageW (infoPtr->hwndNotify, WM_NOTIFY,
+ (WPARAM)nmcd.hdr.idFrom, (LPARAM)&nmcd);
dis.CtlType = ODT_HEADER;
dis.CtlID = GetWindowLongPtrW (hwnd, GWLP_ID);
@@ -252,14 +249,6 @@
rw = r.right - r.left;
rh = r.bottom - r.top;
- if (theme == NULL) {
- HBRUSH hbr = CreateSolidBrush(GetBkColor(hdc));
- RECT rcBackground = r;
-
- rcBackground.right -= cxEdge;
- FillRect(hdc, &rcBackground, hbr);
- DeleteObject(hbr);
- }
if (phdi->fmt & HDF_STRING) {
RECT textRect;
@@ -330,8 +319,8 @@
if (iw || bw) {
HDC hClipDC = GetDC(hwnd);
HRGN hClipRgn = CreateRectRgn(r.left, r.top, r.right, r.bottom);
+
SelectClipRgn(hClipDC, hClipRgn);
-
if (bw) {
HDC hdcBitmap = CreateCompatibleDC (hClipDC);
SelectObject (hdcBitmap, phdi->hbm);
@@ -355,6 +344,7 @@
HDF_BITMAP_ON_RIGHT|HDF_IMAGE)))) /* no explicit format specified? */
&& (phdi->pszText)) {
oldBkMode = SetBkMode(hdc, TRANSPARENT);
+ SetTextColor (hdc, (bHotTrack && !theme) ? COLOR_HIGHLIGHT : COLOR_BTNTEXT);
r.left = tx;
r.right = tx + tw;
DrawTextW (hdc, phdi->pszText, -1,
Modified: trunk/reactos/dll/win32/comctl32/listview.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/listview.c?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/listview.c (original)
+++ trunk/reactos/dll/win32/comctl32/listview.c Tue Apr 11 23:03:09 2006
@@ -172,6 +172,7 @@
#include <assert.h>
#include <ctype.h>
#include <string.h>
+#include <stddef.h>
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
@@ -396,7 +397,7 @@
TRACE("hwndSelf=%p, ntmH=%d, icSz.cx=%ld, icSz.cy=%ld, icSp.cx=%ld, icSp.cy=%ld, notifyFmt=%d\n", \
iP->hwndSelf, iP->ntmHeight, iP->iconSize.cx, iP->iconSize.cy, \
iP->iconSpacing.cx, iP->iconSpacing.cy, iP->notifyFormat); \
- TRACE("hwndSelf=%p, rcList=%s\n", iP->hwndSelf, wine_dbgstr_rect(&iP->rcList)); \
+ TRACE("hwndSelf=%p, rcList=%s\n", iP->hwndSelf, debugrect(&iP->rcList)); \
} while(0)
static const WCHAR themeClass[] = {'L','i','s','t','V','i','e','w',0};
@@ -564,15 +565,40 @@
static inline const char* debugrange(const RANGE *lprng)
{
- if (!lprng) return "(null)";
- return wine_dbg_sprintf("[%d, %d)", lprng->lower, lprng->upper);
+ if (lprng)
+ {
+ char* buf = debug_getbuf();
+ snprintf(buf, DEBUG_BUFFER_SIZE, "[%d, %d)", lprng->lower, lprng->upper);
+ return buf;
+ } else return "(null)";
+}
+
+static inline const char* debugpoint(const POINT *lppt)
+{
+ if (lppt)
+ {
+ char* buf = debug_getbuf();
+ snprintf(buf, DEBUG_BUFFER_SIZE, "(%ld, %ld)", lppt->x, lppt->y);
+ return buf;
+ } else return "(null)";
+}
+
+static inline const char* debugrect(const RECT *rect)
+{
+ if (rect)
+ {
+ char* buf = debug_getbuf();
+ snprintf(buf, DEBUG_BUFFER_SIZE, "[(%ld, %ld);(%ld, %ld)]",
+ rect->left, rect->top, rect->right, rect->bottom);
+ return buf;
+ } else return "(null)";
}
static const char* debugscrollinfo(const SCROLLINFO *pScrollInfo)
{
char* buf = debug_getbuf(), *text = buf;
int len, size = DEBUG_BUFFER_SIZE;
-
+
if (pScrollInfo == NULL) return "(null)";
len = snprintf(buf, size, "{cbSize=%d, ", pScrollInfo->cbSize);
if (len == -1) goto end; buf += len; size -= len;
@@ -602,11 +628,15 @@
static const char* debugnmlistview(const NMLISTVIEW *plvnm)
{
- if (!plvnm) return "(null)";
- return wine_dbg_sprintf("iItem=%d, iSubItem=%d, uNewState=0x%x,"
+ if (plvnm)
+ {
+ char* buf = debug_getbuf();
+ snprintf(buf, DEBUG_BUFFER_SIZE, "iItem=%d, iSubItem=%d, uNewState=0x%x,"
" uOldState=0x%x, uChanged=0x%x, ptAction=%s, lParam=%ld\n",
plvnm->iItem, plvnm->iSubItem, plvnm->uNewState, plvnm->uOldState,
- plvnm->uChanged, wine_dbgstr_point(&plvnm->ptAction), plvnm->lParam);
+ plvnm->uChanged, debugpoint(&plvnm->ptAction), plvnm->lParam);
+ return buf;
+ } else return "(null)";
}
static const char* debuglvitem_t(const LVITEMW *lpLVItem, BOOL isW)
@@ -687,10 +717,13 @@
static const char* debuglvhittestinfo(const LVHITTESTINFO *lpht)
{
- if (!lpht) return "(null)";
-
- return wine_dbg_sprintf("{pt=%s, flags=0x%x, iItem=%d, iSubItem=%d}",
- wine_dbgstr_point(&lpht->pt), lpht->flags, lpht->iItem, lpht->iSubItem);
+ if (lpht)
+ {
+ char* buf = debug_getbuf();
+ snprintf(buf, DEBUG_BUFFER_SIZE, "{pt=%s, flags=0x%x, iItem=%d, iSubItem=%d}",
+ debugpoint(&lpht->pt), lpht->flags, lpht->iItem, lpht->iSubItem);
+ return buf;
+ } else return "(null)";
}
/* Return the corresponding text for a given scroll value */
@@ -1202,7 +1235,7 @@
LISTVIEW_GetOrigin(infoPtr, &Origin);
- TRACE("(lprc=%s)\n", wine_dbgstr_rect(lprc));
+ TRACE("(lprc=%s)\n", debugrect(lprc));
OffsetRect(&frame, -Origin.x, -Origin.y);
if (uView == LVS_ICON || uView == LVS_SMALLICON)
@@ -1373,7 +1406,7 @@
static inline void LISTVIEW_InvalidateRect(LISTVIEW_INFO *infoPtr, const RECT* rect)
{
if(!is_redrawing(infoPtr)) return;
- TRACE(" invalidating rect=%s\n", wine_dbgstr_rect(rect));
+ TRACE(" invalidating rect=%s\n", debugrect(rect));
InvalidateRect(infoPtr->hwndSelf, rect, TRUE);
}
@@ -1950,7 +1983,7 @@
State.bottom += infoPtr->iconStateSize.cy;
}
if (lprcState) *lprcState = State;
- TRACE(" - state=%s\n", wine_dbgstr_rect(&State));
+ TRACE(" - state=%s\n", debugrect(&State));
}
else State.right = 0;
@@ -1985,7 +2018,7 @@
Icon.bottom = Icon.top + infoPtr->nItemHeight;
}
if(lprcIcon) *lprcIcon = Icon;
- TRACE(" - icon=%s\n", wine_dbgstr_rect(&Icon));
+ TRACE(" - icon=%s\n", debugrect(&Icon));
}
else Icon.right = 0;
@@ -2050,7 +2083,8 @@
infoPtr->iconSize.cy + ICON_BOTTOM_PADDING;
Label.right = Label.left + labelSize.cx;
Label.bottom = Label.top + infoPtr->nItemHeight;
- if (!oversizedBox && labelSize.cy > infoPtr->ntmHeight)
+ if (!oversizedBox && labelSize.cy > infoPtr->ntmHeight &&
+ infoPtr->ntmHeight)
{
labelSize.cy = min(Box.bottom - Label.top, labelSize.cy);
labelSize.cy /= infoPtr->ntmHeight;
@@ -2068,7 +2102,7 @@
}
if (lprcLabel) *lprcLabel = Label;
- TRACE(" - label=%s\n", wine_dbgstr_rect(&Label));
+ TRACE(" - label=%s\n", debugrect(&Label));
}
/* Fix the Box if necessary */
@@ -2077,7 +2111,7 @@
if (oversizedBox) UnionRect(lprcBox, &Box, &Label);
else *lprcBox = Box;
}
- TRACE(" - box=%s\n", wine_dbgstr_rect(&Box));
+ TRACE(" - box=%s\n", debugrect(&Box));
}
/***
@@ -2335,7 +2369,7 @@
LISTVIEW_GetAreaRect(infoPtr, lprcView);
OffsetRect(lprcView, ptOrigin.x, ptOrigin.y);
- TRACE("lprcView=%s\n", wine_dbgstr_rect(lprcView));
+ TRACE("lprcView=%s\n", debugrect(lprcView));
return TRUE;
}
@@ -3646,7 +3680,7 @@
{
if (!infoPtr->hBkBrush) return FALSE;
- TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, wine_dbgstr_rect(lprcBox), infoPtr->hBkBrush);
+ TRACE("(hdc=%p, lprcBox=%s, hBkBrush=%p)\n", hdc, debugrect(lprcBox), infoPtr->hBkBrush);
return FillRect(hdc, lprcBox, infoPtr->hBkBrush);
}
@@ -3677,9 +3711,8 @@
NMLVCUSTOMDRAW nmlvcd;
HIMAGELIST himl;
LVITEMW lvItem;
- HFONT hOldFont;
-
- TRACE("(hdc=%p, nItem=%d, nSubItem=%d, pos=%s)\n", hdc, nItem, nSubItem, wine_dbgstr_point(&pos));
+
+ TRACE("(hdc=%p, nItem=%d, nSubItem=%d, pos=%s)\n", hdc, nItem, nSubItem, debugpoint(&pos));
/* get information needed for drawing the item */
lvItem.mask = LVIF_TEXT | LVIF_IMAGE;
@@ -3700,7 +3733,7 @@
/* now check if we need to update the focus rectangle */
lprcFocus = infoPtr->bFocus && (lvItem.state & LVIS_FOCUSED) ? &infoPtr->rcFocus : 0;
-
+
if (!lprcFocus) lvItem.state &= ~LVIS_FOCUSED;
LISTVIEW_GetItemMetrics(infoPtr, &lvItem, &rcBox, &rcState, &rcIcon, &rcLabel);
OffsetRect(&rcBox, pos.x, pos.y);
@@ -3708,13 +3741,11 @@
OffsetRect(&rcIcon, pos.x, pos.y);
OffsetRect(&rcLabel, pos.x, pos.y);
TRACE(" rcBox=%s, rcState=%s, rcIcon=%s. rcLabel=%s\n",
- wine_dbgstr_rect(&rcBox), wine_dbgstr_rect(&rcState),
- wine_dbgstr_rect(&rcIcon), wine_dbgstr_rect(&rcLabel));
+ debugrect(&rcBox), debugrect(&rcState), debugrect(&rcIcon), debugrect(&rcLabel));
/* fill in the custom draw structure */
customdraw_fill(&nmlvcd, infoPtr, hdc, &rcBox, &lvItem);
- hOldFont = GetCurrentObject(hdc, OBJ_FONT);
if (nSubItem > 0) cdmode = infoPtr->cditemmode;
if (cdmode & CDRF_NOTIFYITEMDRAW)
cdsubitemmode = notify_customdraw(infoPtr, CDDS_PREPAINT, &nmlvcd);
@@ -3792,8 +3823,6 @@
postpaint:
if (cdsubitemmode & CDRF_NOTIFYPOSTPAINT)
notify_postpaint(infoPtr, &nmlvcd);
- if (cdsubitemmode & CDRF_NEWFONT)
- SelectObject(hdc, hOldFont);
return TRUE;
}
@@ -3849,7 +3878,7 @@
dis.rcItem.bottom = dis.rcItem.top + infoPtr->nItemHeight;
dis.itemData = item.lParam;
- TRACE("item=%s, rcItem=%s\n", debuglvitem_t(&item, TRUE), wine_dbgstr_rect(&dis.rcItem));
+ TRACE("item=%s, rcItem=%s\n", debuglvitem_t(&item, TRUE), debugrect(&dis.rcItem));
/*
* Even if we do not send the CDRF_NOTIFYITEMDRAW we need to fill the nmlvcd
@@ -4471,10 +4500,10 @@
rcScroll.right = rcScroll.left + infoPtr->nItemWidth;
rcScroll.bottom = nPerCol * infoPtr->nItemHeight;
OffsetRect(&rcScroll, Origin.x, Origin.y);
- TRACE("rcScroll=%s, dx=%d\n", wine_dbgstr_rect(&rcScroll), dir * infoPtr->nItemHeight);
+ TRACE("rcScroll=%s, dx=%d\n", debugrect(&rcScroll), dir * infoPtr->nItemHeight);
if (IntersectRect(&rcScroll, &rcScroll, &infoPtr->rcList))
{
- TRACE("Scrolling rcScroll=%s, rcList=%s\n", wine_dbgstr_rect(&rcScroll), wine_dbgstr_rect(&infoPtr->rcList));
+ TRACE("Scrolling rcScroll=%s, rcList=%s\n", debugrect(&rcScroll), debugrect(&infoPtr->rcList));
ScrollWindowEx(infoPtr->hwndSelf, 0, dir * infoPtr->nItemHeight,
&rcScroll, &rcScroll, 0, 0, SW_ERASE | SW_INVALIDATE);
}
@@ -5432,7 +5461,7 @@
lpptPosition->x += Origin.x;
lpptPosition->y += Origin.y;
- TRACE (" lpptPosition=%s\n", wine_dbgstr_point(lpptPosition));
+ TRACE (" lpptPosition=%s\n", debugpoint(lpptPosition));
return TRUE;
}
@@ -5568,7 +5597,7 @@
OffsetRect(lprc, Position.x + Origin.x, Position.y + Origin.y);
- TRACE(" rect=%s\n", wine_dbgstr_rect(lprc));
+ TRACE(" rect=%s\n", debugrect(lprc));
return TRUE;
}
@@ -5819,7 +5848,7 @@
}
lvFindInfo.flags = LVFI_NEARESTXY;
lvFindInfo.vkDirection = VK_UP;
- SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt );
+ ListView_GetItemPosition(infoPtr->hwndSelf, nItem, &lvFindInfo.pt);
while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1)
{
if ((ListView_GetItemState(infoPtr->hwndSelf, nItem, uMask) & uMask) == uMask)
@@ -5854,7 +5883,7 @@
}
lvFindInfo.flags = LVFI_NEARESTXY;
lvFindInfo.vkDirection = VK_DOWN;
- SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt );
+ ListView_GetItemPosition(infoPtr->hwndSelf, nItem, &lvFindInfo.pt);
while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1)
{
if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask)
@@ -5890,7 +5919,7 @@
}
lvFindInfo.flags = LVFI_NEARESTXY;
lvFindInfo.vkDirection = VK_LEFT;
- SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt );
+ ListView_GetItemPosition(infoPtr->hwndSelf, nItem, &lvFindInfo.pt);
while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1)
{
if ((ListView_GetItemState(infoPtr->hwndSelf, nItem, uMask) & uMask) == uMask)
@@ -5926,7 +5955,7 @@
}
lvFindInfo.flags = LVFI_NEARESTXY;
lvFindInfo.vkDirection = VK_RIGHT;
- SendMessageW( infoPtr->hwndSelf, LVM_GETITEMPOSITION, nItem, (LPARAM)&lvFindInfo.pt );
+ ListView_GetItemPosition(infoPtr->hwndSelf, nItem, &lvFindInfo.pt);
while ((nItem = ListView_FindItemW(infoPtr->hwndSelf, nItem, &lvFindInfo)) != -1)
{
if ((LISTVIEW_GetItemState(infoPtr, nItem, uMask) & uMask) == uMask)
@@ -5988,7 +6017,7 @@
lpptOrigin->x -= nHorzPos;
lpptOrigin->y -= nVertPos;
- TRACE(" origin=%s\n", wine_dbgstr_point(lpptOrigin));
+ TRACE(" origin=%s\n", debugpoint(lpptOrigin));
}
/***
@@ -6054,7 +6083,7 @@
ITERATOR i;
INT iItem;
- TRACE("(pt=%s, subitem=%d, select=%d)\n", wine_dbgstr_point(&lpht->pt), subitem, select);
+ TRACE("(pt=%s, subitem=%d, select=%d)\n", debugpoint(&lpht->pt), subitem, select);
lpht->flags = 0;
lpht->iItem = -1;
@@ -6111,7 +6140,7 @@
rcBounds = rcBox;
else
UnionRect(&rcBounds, &rcIcon, &rcLabel);
- TRACE("rcBounds=%s\n", wine_dbgstr_rect(&rcBounds));
+ TRACE("rcBounds=%s\n", debugrect(&rcBounds));
if (!PtInRect(&rcBounds, opt)) return -1;
if (PtInRect(&rcIcon, opt))
@@ -6211,7 +6240,7 @@
if (infoPtr->dwStyle & LVS_OWNERDATA) return infoPtr->nItemCount++;
/* make sure it's an item, and not a subitem; cannot insert a subitem */
- if (!lpLVItem || lpLVItem->iSubItem) return -1;
+ if (!lpLVItem || lpLVItem->iItem < 0 || lpLVItem->iSubItem) return -1;
if (!is_assignable_item(lpLVItem, infoPtr->dwStyle)) return -1;
@@ -6223,8 +6252,6 @@
is_sorted = (infoPtr->dwStyle & (LVS_SORTASCENDING | LVS_SORTDESCENDING)) &&
!(infoPtr->dwStyle & LVS_OWNERDRAWFIXED) && (LPSTR_TEXTCALLBACKW != lpLVItem->pszText);
-
- if (lpLVItem->iItem < 0 && !is_sorted) return -1;
nItem = is_sorted ? infoPtr->nItemCount : min(lpLVItem->iItem, infoPtr->nItemCount);
TRACE(" inserting at %d, sorted=%d, count=%d, iItem=%d\n", nItem, is_sorted, infoPtr->nItemCount, lpLVItem->iItem);
@@ -6466,7 +6493,7 @@
/* retrieve the layout of the header */
GetClientRect(infoPtr->hwndSelf, &rcHeader);
- TRACE("start cxy=%d rcHeader=%s\n", lphdi->cxy, wine_dbgstr_rect(&rcHeader));
+ TRACE("start cxy=%d rcHeader=%s\n", lphdi->cxy, debugrect(&rcHeader));
lphdi->cxy = (rcHeader.right - rcHeader.left) - lphdi->cxy;
}
@@ -6740,7 +6767,7 @@
hdi.mask = HDI_TEXT;
hdi.cchTextMax = DISP_TEXT_SIZE;
hdi.pszText = szDispText;
- if (Header_GetItemW(infoPtr->hwndHeader, nColumn, &hdi))
+ if (Header_GetItemW(infoPtr->hwndHeader, nColumn, (LPARAM)&hdi))
{
HDC hdc = GetDC(infoPtr->hwndSelf);
HFONT old_font = SelectObject(hdc, (HFONT)SendMessageW(infoPtr->hwndHeader, WM_GETFONT, 0, 0));
@@ -6762,7 +6789,7 @@
hdi.mask = HDI_WIDTH;
hdi.cxy = cx;
TRACE("hdi.cxy=%d\n", hdi.cxy);
- return Header_SetItemW(infoPtr->hwndHeader, nColumn, &hdi);
+ return Header_SetItemW(infoPtr->hwndHeader, nColumn, (LPARAM)&hdi);
}
/***
@@ -6961,7 +6988,7 @@
return oldspacing;
}
-static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL small)
+static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL _small)
{
INT cx, cy;
@@ -6972,8 +6999,8 @@
}
else
{
- size->cx = GetSystemMetrics(small ? SM_CXSMICON : SM_CXICON);
- size->cy = GetSystemMetrics(small ? SM_CYSMICON : SM_CYICON);
+ size->cx = GetSystemMetrics(_small ? SM_CXSMICON : SM_CXICON);
+ size->cy = GetSystemMetrics(_small ? SM_CYSMICON : SM_CYICON);
}
}
@@ -7150,7 +7177,7 @@
UINT uView = infoPtr->dwStyle & LVS_TYPEMASK;
POINT Origin;
- TRACE("(nItem=%d, &pt=%s\n", nItem, wine_dbgstr_point(&pt));
+ TRACE("(nItem=%d, &pt=%s\n", nItem, debugpoint(&pt));
if (nItem < 0 || nItem >= infoPtr->nItemCount ||
!(uView == LVS_ICON || uView == LVS_SMALLICON)) return FALSE;
@@ -7390,9 +7417,11 @@
LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)lParam;
ITEM_INFO* lv_first = (ITEM_INFO*) DPA_GetPtr( (HDPA)first, 0 );
ITEM_INFO* lv_second = (ITEM_INFO*) DPA_GetPtr( (HDPA)second, 0 );
+ PFNLVCOMPARE CompareFunction = infoPtr->pfnCompare;
/* Forward the call to the client defined callback */
- return (infoPtr->pfnCompare)( lv_first->lParam , lv_second->lParam, infoPtr->lParamSort );
+
+ return (CompareFunction)( lv_first->lParam , lv_second->lParam, infoPtr->lParamSort );
}
/***
@@ -8176,7 +8205,7 @@
lvHitTestInfo.pt.y = y;
nItem = LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE);
- TRACE("at %s, nItem=%d\n", wine_dbgstr_point(&pt), nItem);
+ TRACE("at %s, nItem=%d\n", debugpoint(&pt), nItem);
infoPtr->nEditLabelItem = -1;
if ((nItem >= 0) && (nItem < infoPtr->nItemCount))
{
@@ -8385,7 +8414,7 @@
HDITEMW hdi;
hdi.mask = HDI_WIDTH;
- if (!Header_GetItemW(infoPtr->hwndHeader, lpnmh->iItem, &hdi)) return 0;
+ if (!Header_GetItemW(infoPtr->hwndHeader, lpnmh->iItem, (LPARAM)&hdi)) return 0;
cxy = hdi.cxy;
}
else
@@ -8885,7 +8914,7 @@
{
UINT uView = infoPtr->dwStyle & LVS_TYPEMASK;
- TRACE("uView=%d, rcList(old)=%s\n", uView, wine_dbgstr_rect(&infoPtr->rcList));
+ TRACE("uView=%d, rcList(old)=%s\n", uView, debugrect(&infoPtr->rcList));
GetClientRect(infoPtr->hwndSelf, &infoPtr->rcList);
@@ -8909,14 +8938,14 @@
hl.prc = &infoPtr->rcList;
hl.pwpos = ℘
- SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl );
+ Header_Layout(infoPtr->hwndHeader, &hl);
SetWindowPos(wp.hwnd, wp.hwndInsertAfter, wp.x, wp.y, wp.cx, wp.cy, wp.flags);
infoPtr->rcList.top = max(wp.cy, 0);
}
- TRACE(" rcList=%s\n", wine_dbgstr_rect(&infoPtr->rcList));
+ TRACE(" rcList=%s\n", debugrect(&infoPtr->rcList));
}
/***
@@ -8987,7 +9016,7 @@
hl.prc = &infoPtr->rcList;
hl.pwpos = ℘
- SendMessageW( infoPtr->hwndHeader, HDM_LAYOUT, 0, (LPARAM)&hl );
+ Header_Layout(infoPtr->hwndHeader, &hl);
SetWindowPos(infoPtr->hwndHeader, infoPtr->hwndSelf, wp.x, wp.y, wp.cx, wp.cy, wp.flags);
}
@@ -9791,7 +9820,8 @@
hOldFont = SelectObject(hdc, infoPtr->hFont);
/*Get String Length in pixels */
- GetTextExtentPoint32W(hdc, text, lstrlenW(text), &sz);
+ if(!GetTextExtentPoint32W(hdc, text, lstrlenW(text), &sz))
+ sz.cx = 0;
/*Add Extra spacing for the next character */
GetTextMetricsW(hdc, &textMetric);
Modified: trunk/reactos/dll/win32/comctl32/monthcal.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/monthcal.c?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/monthcal.c (original)
+++ trunk/reactos/dll/win32/comctl32/monthcal.c Tue Apr 11 23:03:09 2006
@@ -160,10 +160,14 @@
/* make sure that time is valid */
static int MONTHCAL_ValidateTime(SYSTEMTIME time)
{
- if(time.wMonth < 1 || time.wMonth > 12 ) return FALSE;
+ if(time.wMonth > 12) return FALSE;
if(time.wDayOfWeek > 6) return FALSE;
if(time.wDay > MONTHCAL_MonthLength(time.wMonth, time.wYear))
return FALSE;
+ if(time.wHour > 23) return FALSE;
+ if(time.wMinute > 59) return FALSE;
+ if(time.wSecond > 59) return FALSE;
+ if(time.wMilliseconds > 999) return FALSE;
return TRUE;
}
@@ -930,54 +934,48 @@
}
+/* FIXME: are validated times taken from current date/time or simply
+ * copied?
+ * FIXME: check whether MCM_GETMONTHRANGE shows correct result after
+ * adjusting range with MCM_SETRANGE
+ */
+
static LRESULT
MONTHCAL_SetRange(MONTHCAL_INFO *infoPtr, WPARAM wParam, LPARAM lParam)
{
- SYSTEMTIME *lprgSysTimeArray=(SYSTEMTIME *)lParam;
- FILETIME ft_min, ft_max;
-
- TRACE("%x %lx\n", wParam, lParam);
-
- if ((wParam & GDTR_MIN && !MONTHCAL_ValidateTime(lprgSysTimeArray[0])) ||
- (wParam & GDTR_MAX && !MONTHCAL_ValidateTime(lprgSysTimeArray[1])))
- return FALSE;
-
- if (wParam & GDTR_MIN)
- {
- MONTHCAL_CopyTime(&lprgSysTimeArray[0], &infoPtr->minDate);
- infoPtr->rangeValid |= GDTR_MIN;
- }
- if (wParam & GDTR_MAX)
- {
- MONTHCAL_CopyTime(&lprgSysTimeArray[1], &infoPtr->maxDate);
- infoPtr->rangeValid |= GDTR_MAX;
- }
-
- /* Only one limit set - we are done */
- if ((infoPtr->rangeValid & (GDTR_MIN | GDTR_MAX)) != (GDTR_MIN | GDTR_MAX))
- return TRUE;
-
- SystemTimeToFileTime(&infoPtr->maxDate, &ft_max);
- SystemTimeToFileTime(&infoPtr->minDate, &ft_min);
-
- if (CompareFileTime(&ft_min, &ft_max) > 0)
- {
- if ((wParam & (GDTR_MIN | GDTR_MAX)) == (GDTR_MIN | GDTR_MAX))
- {
- /* Native swaps limits only when both limits are being set. */
- SYSTEMTIME st_tmp = infoPtr->minDate;
- infoPtr->minDate = infoPtr->maxDate;
- infoPtr->maxDate = st_tmp;
- }
- else
- {
- /* Reset the other limit. */
- /* FIXME: native sets date&time to 0. Should we do this too? */
- infoPtr->rangeValid &= wParam & GDTR_MIN ? ~GDTR_MAX : ~GDTR_MIN ;
- }
- }
-
- return TRUE;
+ SYSTEMTIME *lprgSysTimeArray=(SYSTEMTIME *)lParam;
+ int prev;
+
+ TRACE("%x %lx\n", wParam, lParam);
+
+ if(wParam & GDTR_MAX) {
+ if(MONTHCAL_ValidateTime(lprgSysTimeArray[1])){
+ MONTHCAL_CopyTime(&lprgSysTimeArray[1], &infoPtr->maxDate);
+ infoPtr->rangeValid|=GDTR_MAX;
+ } else {
+ GetSystemTime(&infoPtr->todaysDate);
+ MONTHCAL_CopyTime(&infoPtr->todaysDate, &infoPtr->maxDate);
+ }
+ }
+ if(wParam & GDTR_MIN) {
+ if(MONTHCAL_ValidateTime(lprgSysTimeArray[0])) {
+ MONTHCAL_CopyTime(&lprgSysTimeArray[0], &infoPtr->minDate);
+ infoPtr->rangeValid|=GDTR_MIN;
+ } else {
+ GetSystemTime(&infoPtr->todaysDate);
+ MONTHCAL_CopyTime(&infoPtr->todaysDate, &infoPtr->minDate);
+ }
+ }
+
+ prev = infoPtr->monthRange;
+ infoPtr->monthRange = infoPtr->maxDate.wMonth - infoPtr->minDate.wMonth;
+
+ if(infoPtr->monthRange!=prev) {
+ infoPtr->monthdayState = ReAlloc(infoPtr->monthdayState,
+ infoPtr->monthRange * sizeof(MONTHDAYSTATE));
+ }
+
+ return 1;
}
Modified: trunk/reactos/dll/win32/comctl32/pager.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/pager.c?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/pager.c (original)
+++ trunk/reactos/dll/win32/comctl32/pager.c Tue Apr 11 23:03:09 2006
@@ -59,6 +59,7 @@
#include "wingdi.h"
#include "winuser.h"
#include "winnls.h"
+#include "windowsx.h"
#include "commctrl.h"
#include "comctl32.h"
#include "wine/debug.h"
@@ -1314,7 +1315,7 @@
return PAGER_Destroy (infoPtr);
case WM_SIZE:
- return PAGER_Size (infoPtr, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam));
+ return PAGER_Size (infoPtr, (INT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
case WM_NCPAINT:
return PAGER_NCPaint (infoPtr, (HRGN)wParam);
@@ -1329,18 +1330,18 @@
return PAGER_NCCalcSize (infoPtr, wParam, (LPRECT)lParam);
case WM_NCHITTEST:
- return PAGER_NCHitTest (infoPtr, (short)LOWORD(lParam), (short)HIWORD(lParam));
+ return PAGER_NCHitTest (infoPtr, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
case WM_MOUSEMOVE:
if (infoPtr->bForward && infoPtr->hwndChild)
PostMessageW(infoPtr->hwndChild, WM_MOUSEMOVE, wParam, lParam);
- return PAGER_MouseMove (infoPtr, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam));
+ return PAGER_MouseMove (infoPtr, (INT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
case WM_LBUTTONDOWN:
- return PAGER_LButtonDown (infoPtr, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam));
+ return PAGER_LButtonDown (infoPtr, (INT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
case WM_LBUTTONUP:
- return PAGER_LButtonUp (infoPtr, (INT)wParam, (short)LOWORD(lParam), (short)HIWORD(lParam));
+ return PAGER_LButtonUp (infoPtr, (INT)wParam, GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
case WM_ERASEBKGND:
return PAGER_EraseBackground (infoPtr, (HDC)wParam);
Modified: trunk/reactos/dll/win32/comctl32/progress.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/progress.c?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/progress.c (original)
+++ trunk/reactos/dll/win32/comctl32/progress.c Tue Apr 11 23:03:09 2006
@@ -131,12 +131,35 @@
/***********************************************************************
* PROGRESS_Invalidate
*
- * Don't be too clever about invalidating the progress bar.
- * InstallShield depends on this simple behaviour.
+ * Invalide the range between old and new pos.
*/
static void PROGRESS_Invalidate( PROGRESS_INFO *infoPtr, INT old, INT new )
{
- InvalidateRect( infoPtr->Self, NULL, old > new );
+ LONG style = GetWindowLongW (infoPtr->Self, GWL_STYLE);
+ RECT rect;
+ int oldPos, newPos;
+ BOOL barSmooth = (style & PBS_SMOOTH) && !GetWindowTheme (infoPtr->Self);
+
+ get_client_rect( infoPtr->Self, &rect );
+
+ oldPos = get_bar_position( infoPtr, style, &rect, old );
+ newPos = get_bar_position( infoPtr, style, &rect, new );
+
+ if (style & PBS_VERTICAL)
+ {
+ rect.top = rect.bottom - max( oldPos, newPos );
+ rect.bottom = rect.bottom - min( oldPos, newPos );
+ if (!barSmooth) rect.top -=
+ get_led_size (infoPtr, style, &rect) + get_led_gap (infoPtr);
+ }
+ else
+ {
+ rect.left = min( oldPos, newPos );
+ rect.right = max( oldPos, newPos );
+ if (!barSmooth) rect.right +=
+ get_led_size (infoPtr, style, &rect) + get_led_gap (infoPtr);
+ }
+ InvalidateRect( infoPtr->Self, &rect, oldPos > newPos );
}
/* Information for a progress bar drawing helper */
Modified: trunk/reactos/dll/win32/comctl32/rebar.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/rebar.c (original)
+++ trunk/reactos/dll/win32/comctl32/rebar.c Tue Apr 11 23:03:09 2006
@@ -1492,11 +1492,10 @@
cxsep = (cntonrow == 0) ? 0 : SEP_WIDTH;
cx = lpBand->lcx;
- /* In native, 0 as one of the coordinates means no limit */
if (infoPtr->dwStyle & CCS_VERT)
- dobreak = (adjcy && (y + cx + cxsep > adjcy));
+ dobreak = (y + cx + cxsep > adjcy);
else
- dobreak = (adjcx && (x + cx + cxsep > adjcx));
+ dobreak = (x + cx + cxsep > adjcx);
/* This is the check for whether we need to start a new row */
if ( ( (lpBand->fStyle & RBBS_BREAK) && (i != 0) ) ||
@@ -1538,14 +1537,14 @@
/* if boundary rect specified then limit mcy */
if (lpRect) {
if (infoPtr->dwStyle & CCS_VERT) {
- if (adjcx && (x+mcy > adjcx)) {
+ if (x+mcy > adjcx) {
mcy = adjcx - x;
TRACE("P1 row %u limiting mcy=%d, adjcx=%d, x=%d\n",
i, mcy, adjcx, x);
}
}
else {
- if (adjcy && (y+mcy > adjcy)) {
+ if (y+mcy > adjcy) {
mcy = adjcy - y;
TRACE("P1 row %u limiting mcy=%d, adjcy=%d, y=%d\n",
i, mcy, adjcy, y);
@@ -1657,9 +1656,8 @@
/* ******* Start Phase 2 - split rows till adjustment height full ******* */
/* assumes that the following variables contain: */
- /* y/x current height/width of all rows */
- /* adjcy/adjcx adjustment height/width or 0 (as small as possible) */
- if (lpRect && ((infoPtr->dwStyle & CCS_VERT) ? adjcx : adjcy)) {
+ /* y/x current height/width of all rows */
+ if (lpRect) {
INT i, prev_rh, new_rh, adj_rh, prev_idx, current_idx;
REBAR_BAND *prev, *current, *walk;
UINT j;
@@ -1920,7 +1918,7 @@
y = clientcy;
}
if (infoPtr->dwStyle & CCS_VERT) {
- if( infoPtr->uNumBands != 0 && x < REBAR_MINSIZE )
+ if( x < REBAR_MINSIZE )
x = REBAR_MINSIZE;
infoPtr->calcSize.cx = x;
infoPtr->calcSize.cy = clientcy;
@@ -1929,7 +1927,7 @@
if (notify && (x != origheight)) infoPtr->fStatus |= NTF_HGHTCHG;
}
else {
- if( infoPtr->uNumBands != 0 && y < REBAR_MINSIZE )
+ if( y < REBAR_MINSIZE )
y = REBAR_MINSIZE;
infoPtr->calcSize.cx = clientcx;
infoPtr->calcSize.cy = y;
@@ -4503,14 +4501,9 @@
if ((lParam == 0) && (rcClient.right + rcClient.bottom != 0) &&
(infoPtr->dwStyle & RBS_AUTOSIZE)) {
/* on a WM_SIZE to zero and current client not zero and AUTOSIZE */
- /* native seems to use the current parent width for the size */
+ /* native seems to use the current client rect for the size */
infoPtr->fStatus |= BAND_NEEDS_LAYOUT;
- GetClientRect (GetParent(infoPtr->hwndSelf), &rcClient);
- if (infoPtr->dwStyle & CCS_VERT)
- rcClient.right = 0;
- else
- rcClient.bottom = 0;
- TRACE("sizing rebar to parent (%ld,%ld) size is zero but AUTOSIZE set\n",
+ TRACE("sizing rebar to client (%ld,%ld) size is zero but AUTOSIZE set\n",
rcClient.right, rcClient.bottom);
}
else {
Modified: trunk/reactos/dll/win32/comctl32/status.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/status.c?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/status.c (original)
+++ trunk/reactos/dll/win32/comctl32/status.c Tue Apr 11 23:03:09 2006
@@ -786,7 +786,6 @@
part->text = ntext;
}
InvalidateRect(infoPtr->Self, &part->bound, FALSE);
- UpdateWindow(infoPtr->Self);
return TRUE;
}
Modified: trunk/reactos/dll/win32/comctl32/syslink.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/syslink.c?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/syslink.c (original)
+++ trunk/reactos/dll/win32/comctl32/syslink.c Tue Apr 11 23:03:09 2006
@@ -1,7 +1,7 @@
/*
* SysLink control
*
- * Copyright 2004 - 2006 Thomas Weidenmueller <w3seek at reactos.com>
+ * Copyright 2004, 2005 Thomas Weidenmueller <w3seek at reactos.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -62,6 +62,7 @@
typedef struct _DOC_ITEM
{
struct _DOC_ITEM *Next; /* Address to the next item */
+ LPWSTR Text; /* Text of the document item */
UINT nText; /* Number of characters of the text */
SL_ITEM_TYPE Type; /* type of the item */
PDOC_TEXTBLOCK Blocks; /* Array of text blocks */
@@ -78,7 +79,6 @@
UINT Dummy;
} Text;
} u;
- WCHAR Text[1]; /* Text of the document item */
} DOC_ITEM, *PDOC_ITEM;
typedef struct
@@ -117,14 +117,8 @@
{
if(DocItem->Type == slLink)
{
- if (DocItem->u.Link.szID != NULL)
- {
- Free(DocItem->u.Link.szID);
- }
- if (DocItem->u.Link.szUrl != NULL)
- {
- Free(DocItem->u.Link.szUrl);
- }
+ Free(DocItem->u.Link.szID);
+ Free(DocItem->u.Link.szUrl);
}
/* we don't free Text because it's just a pointer to a character in the
@@ -141,16 +135,16 @@
SL_ITEM_TYPE type, PDOC_ITEM LastItem)
{
PDOC_ITEM Item;
-
- textlen = min(textlen, lstrlenW(Text));
- Item = Alloc(FIELD_OFFSET(DOC_ITEM, Text[textlen + 1]));
+ Item = Alloc(sizeof(DOC_ITEM) + ((textlen + 1) * sizeof(WCHAR)));
if(Item == NULL)
{
ERR("Failed to alloc DOC_ITEM structure!\n");
return NULL;
}
+ textlen = min(textlen, lstrlenW(Text));
Item->Next = NULL;
+ Item->Text = (LPWSTR)(Item + 1);
Item->nText = textlen;
Item->Type = type;
Item->Blocks = NULL;
@@ -165,6 +159,7 @@
}
lstrcpynW(Item->Text, Text, textlen + 1);
+ Item->Text[textlen] = 0;
return Item;
}
@@ -356,11 +351,12 @@
if(lpID != NULL)
{
nc = min(lenId, strlenW(lpID));
- nc = min(nc, MAX_LINKID_TEXT - 1);
- Last->u.Link.szID = Alloc((nc + 1) * sizeof(WCHAR));
+ nc = min(nc, MAX_LINKID_TEXT);
+ Last->u.Link.szID = Alloc((MAX_LINKID_TEXT + 1) * sizeof(WCHAR));
if(Last->u.Link.szID != NULL)
{
lstrcpynW(Last->u.Link.szID, lpID, nc + 1);
+ Last->u.Link.szID[nc] = 0;
}
}
else
@@ -368,11 +364,12 @@
if(lpUrl != NULL)
{
nc = min(lenUrl, strlenW(lpUrl));
- nc = min(nc, L_MAX_URL_LENGTH - 1);
- Last->u.Link.szUrl = Alloc((nc + 1) * sizeof(WCHAR));
+ nc = min(nc, L_MAX_URL_LENGTH);
+ Last->u.Link.szUrl = Alloc((L_MAX_URL_LENGTH + 1) * sizeof(WCHAR));
if(Last->u.Link.szUrl != NULL)
{
lstrcpynW(Last->u.Link.szUrl, lpUrl, nc + 1);
+ Last->u.Link.szUrl[nc] = 0;
}
}
else
@@ -434,11 +431,12 @@
if(lpID != NULL)
{
nc = min(lenId, strlenW(lpID));
- nc = min(nc, MAX_LINKID_TEXT - 1);
- Last->u.Link.szID = Alloc((nc + 1) * sizeof(WCHAR));
+ nc = min(nc, MAX_LINKID_TEXT);
+ Last->u.Link.szID = Alloc((MAX_LINKID_TEXT + 1) * sizeof(WCHAR));
if(Last->u.Link.szID != NULL)
{
lstrcpynW(Last->u.Link.szID, lpID, nc + 1);
+ Last->u.Link.szID[nc] = 0;
}
}
else
@@ -446,11 +444,12 @@
if(lpUrl != NULL)
{
nc = min(lenUrl, strlenW(lpUrl));
- nc = min(nc, L_MAX_URL_LENGTH - 1);
- Last->u.Link.szUrl = Alloc((nc + 1) * sizeof(WCHAR));
+ nc = min(nc, L_MAX_URL_LENGTH);
+ Last->u.Link.szUrl = Alloc((L_MAX_URL_LENGTH + 1) * sizeof(WCHAR));
if(Last->u.Link.szUrl != NULL)
{
lstrcpynW(Last->u.Link.szUrl, lpUrl, nc + 1);
+ Last->u.Link.szUrl[nc] = 0;
}
}
else
@@ -752,7 +751,6 @@
{
Free(bl);
bl = NULL;
- nBlocks = 0;
}
break;
}
@@ -771,12 +769,11 @@
{
Free(bl);
bl = NULL;
- nBlocks = 0;
}
}
else
{
- bl = Alloc(sizeof(DOC_TEXTBLOCK));
+ bl = Alloc((nBlocks + 1) * sizeof(DOC_TEXTBLOCK));
if (bl != NULL)
nBlocks++;
}
@@ -823,6 +820,8 @@
{
Current->Blocks = bl;
}
+ else
+ Current->Blocks = NULL;
}
SelectObject(hdc, hOldFont);
@@ -878,10 +877,10 @@
ExtTextOutW(hdc, bl->rc.left, bl->rc.top, ETO_OPAQUE | ETO_CLIPPED, &bl->rc, tx, bl->nChars, NULL);
if((Current->Type == slLink) && (Current->u.Link.state & LIS_FOCUSED) && infoPtr->HasFocus)
{
- COLORREF PrevTextColor;
- PrevTextColor = SetTextColor(hdc, infoPtr->TextColor);
+ COLORREF PrevColor;
+ PrevColor = SetBkColor(hdc, OldBkColor);
DrawFocusRect(hdc, &bl->rc);
- SetTextColor(hdc, PrevTextColor);
+ SetBkColor(hdc, PrevColor);
}
tx += bl->nChars;
n -= bl->nChars + bl->nSkip;
@@ -908,11 +907,8 @@
PAINTSTRUCT ps;
hdc = hdcParam ? hdcParam : BeginPaint (infoPtr->Self, &ps);
- if (hdc)
- {
- SYSLINK_Draw (infoPtr, hdc);
- if (!hdcParam) EndPaint (infoPtr->Self, &ps);
- }
+ SYSLINK_Draw (infoPtr, hdc);
+ if (!hdcParam) EndPaint (infoPtr->Self, &ps);
return 0;
}
@@ -976,7 +972,8 @@
/* clear the document */
SYSLINK_ClearDoc(infoPtr);
- if(Text == NULL || (textlen = lstrlenW(Text)) == 0)
+ textlen = lstrlenW(Text);
+ if(Text == NULL || textlen == 0)
{
return TRUE;
}
@@ -986,13 +983,9 @@
{
/* Render text position and word wrapping in memory */
HDC hdc = GetDC(infoPtr->Self);
- if (hdc != NULL)
- {
- SYSLINK_Render(infoPtr, hdc);
- ReleaseDC(infoPtr->Self, hdc);
-
- InvalidateRect(infoPtr->Self, NULL, TRUE);
- }
+ SYSLINK_Render(infoPtr, hdc);
+ SYSLINK_Draw(infoPtr, hdc);
+ ReleaseDC(infoPtr->Self, hdc);
}
return TRUE;
@@ -1038,10 +1031,8 @@
static LRESULT SYSLINK_SetItem (SYSLINK_INFO *infoPtr, PLITEM Item)
{
PDOC_ITEM di;
- int nc;
- PWSTR szId = NULL;
- PWSTR szUrl = NULL;
BOOL Repaint = FALSE;
+ BOOL Ret = TRUE;
if(!(Item->mask & LIF_ITEMINDEX) || !(Item->mask & (LIF_FLAGSMASK)))
{
@@ -1055,60 +1046,7 @@
ERR("Link %d couldn't be found\n", Item->iLink);
return FALSE;
}
-
- if(Item->mask & LIF_ITEMID)
- {
- nc = min(lstrlenW(Item->szID), MAX_LINKID_TEXT - 1);
- szId = Alloc((nc + 1) * sizeof(WCHAR));
- if(szId)
- {
- lstrcpynW(szId, Item->szID, nc + 1);
- }
- else
- {
- ERR("Unable to allocate memory for link id\n");
- return FALSE;
- }
- }
-
- if(Item->mask & LIF_URL)
- {
- nc = min(lstrlenW(Item->szUrl), L_MAX_URL_LENGTH - 1);
- szUrl = Alloc((nc + 1) * sizeof(WCHAR));
- if(szUrl)
- {
- lstrcpynW(szUrl, Item->szUrl, nc + 1);
- }
- else
- {
- if (szId)
- {
- Free(szId);
- }
-
- ERR("Unable to allocate memory for link url\n");
- return FALSE;
- }
- }
-
- if(Item->mask & LIF_ITEMID)
- {
- if(di->u.Link.szID)
- {
- Free(di->u.Link.szID);
- }
- di->u.Link.szID = szId;
- }
-
- if(Item->mask & LIF_URL)
- {
- if(di->u.Link.szUrl)
- {
- Free(di->u.Link.szUrl);
- }
- di->u.Link.szUrl = szUrl;
- }
-
+
if(Item->mask & LIF_STATE)
{
UINT oldstate = di->u.Link.state;
@@ -1121,13 +1059,47 @@
/* update the focus */
SYSLINK_SetFocusLink(infoPtr, ((di->u.Link.state & LIS_FOCUSED) ? di : NULL));
}
+
+ if(Item->mask & LIF_ITEMID)
+ {
+ if(!di->u.Link.szID)
+ {
+ di->u.Link.szID = Alloc((MAX_LINKID_TEXT + 1) * sizeof(WCHAR));
+ if(!Item->szID)
+ {
+ ERR("Unable to allocate memory for link id\n");
+ Ret = FALSE;
+ }
+ }
+ if(di->u.Link.szID)
+ {
+ lstrcpynW(di->u.Link.szID, Item->szID, MAX_LINKID_TEXT + 1);
+ }
+ }
+
+ if(Item->mask & LIF_URL)
+ {
+ if(!di->u.Link.szUrl)
+ {
+ di->u.Link.szUrl = Alloc((MAX_LINKID_TEXT + 1) * sizeof(WCHAR));
+ if(!Item->szUrl)
+ {
+ ERR("Unable to allocate memory for link url\n");
+ Ret = FALSE;
+ }
+ }
+ if(di->u.Link.szUrl)
+ {
+ lstrcpynW(di->u.Link.szUrl, Item->szUrl, MAX_LINKID_TEXT + 1);
+ }
+ }
if(Repaint)
{
SYSLINK_RepaintLink(infoPtr, di);
}
- return TRUE;
+ return Ret;
}
/***********************************************************************
@@ -1165,7 +1137,7 @@
{
if(di->u.Link.szID)
{
- lstrcpyW(Item->szID, di->u.Link.szID);
+ lstrcpynW(Item->szID, di->u.Link.szID, MAX_LINKID_TEXT + 1);
}
else
{
@@ -1177,7 +1149,7 @@
{
if(di->u.Link.szUrl)
{
- lstrcpyW(Item->szUrl, di->u.Link.szUrl);
+ lstrcpynW(Item->szUrl, di->u.Link.szUrl, L_MAX_URL_LENGTH + 1);
}
else
{
@@ -1237,7 +1209,7 @@
HitTest->item.stateMask = 0;
if(Current->u.Link.szID)
{
- lstrcpyW(HitTest->item.szID, Current->u.Link.szID);
+ lstrcpynW(HitTest->item.szID, Current->u.Link.szID, MAX_LINKID_TEXT + 1);
}
else
{
@@ -1245,7 +1217,7 @@
}
if(Current->u.Link.szUrl)
{
- lstrcpyW(HitTest->item.szUrl, Current->u.Link.szUrl);
+ lstrcpynW(HitTest->item.szUrl, Current->u.Link.szUrl, L_MAX_URL_LENGTH + 1);
}
else
{
@@ -1307,7 +1279,7 @@
nml.item.stateMask = 0;
if(Link->u.Link.szID)
{
- lstrcpyW(nml.item.szID, Link->u.Link.szID);
+ lstrcpynW(nml.item.szID, Link->u.Link.szID, MAX_LINKID_TEXT + 1);
}
else
{
@@ -1315,7 +1287,7 @@
}
if(Link->u.Link.szUrl)
{
- lstrcpyW(nml.item.szUrl, Link->u.Link.szUrl);
+ lstrcpynW(nml.item.szUrl, Link->u.Link.szUrl, L_MAX_URL_LENGTH + 1);
}
else
{
Modified: trunk/reactos/dll/win32/comctl32/tab.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/tab.c?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/tab.c (original)
+++ trunk/reactos/dll/win32/comctl32/tab.c Tue Apr 11 23:03:09 2006
@@ -261,11 +261,9 @@
if (iItem >= 0 && iItem < infoPtr->uNumItem) {
prevItem=infoPtr->iSelected;
- if (infoPtr->iSelected != iItem) {
- infoPtr->iSelected=iItem;
- TAB_EnsureSelectionVisible(infoPtr);
- TAB_InvalidateTabArea(infoPtr);
- }
+ infoPtr->iSelected=iItem;
+ TAB_EnsureSelectionVisible(infoPtr);
+ TAB_InvalidateTabArea(infoPtr);
}
return prevItem;
}
@@ -1747,19 +1745,13 @@
if(lStyle & TCS_VERTICAL)
{
center_offset_h = ((drawRect->bottom - drawRect->top) - (cy + infoPtr->uHItemPadding + (rcText.right - rcText.left))) / 2;
- center_offset_v = (drawRect->left + (drawRect->right - drawRect->left) - cx) / 2;
+ center_offset_v = ((drawRect->right - drawRect->left) - (cx + infoPtr->uVItemPadding)) / 2;
}
else
{
center_offset_h = ((drawRect->right - drawRect->left) - (cx + infoPtr->uHItemPadding + (rcText.right - rcText.left))) / 2;
- center_offset_v = (drawRect->top + (drawRect->bottom - drawRect->top) - cy) / 2;
+ center_offset_v = ((drawRect->bottom - drawRect->top) - (cy + infoPtr->uVItemPadding)) / 2;
}
-
- /* if an item is selected, the icon is shifted up instead of down */
- if (iItem == infoPtr->iSelected)
- center_offset_v -= infoPtr->uVItemPadding / 2;
- else
- center_offset_v += infoPtr->uVItemPadding / 2;
if (lStyle & TCS_FIXEDWIDTH && lStyle & (TCS_FORCELABELLEFT | TCS_FORCEICONLEFT))
center_offset_h = infoPtr->uHItemPadding;
Modified: trunk/reactos/dll/win32/comctl32/tooltips.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/tooltips.c?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/tooltips.c (original)
+++ trunk/reactos/dll/win32/comctl32/tooltips.c Tue Apr 11 23:03:09 2006
@@ -2025,8 +2025,7 @@
else {
if ( (toolPtr->lpszText) &&
!IS_INTRESOURCE(toolPtr->lpszText) ) {
- if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
- Free (toolPtr->lpszText);
+ Free (toolPtr->lpszText);
toolPtr->lpszText = NULL;
}
if (lpToolInfo->lpszText) {
@@ -2083,8 +2082,7 @@
else {
if ( (toolPtr->lpszText) &&
!IS_INTRESOURCE(toolPtr->lpszText) ) {
- if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
- Free (toolPtr->lpszText);
+ Free (toolPtr->lpszText);
toolPtr->lpszText = NULL;
}
if (lpToolInfo->lpszText) {
@@ -2210,8 +2208,7 @@
else {
if ( (toolPtr->lpszText) &&
!IS_INTRESOURCE(toolPtr->lpszText) ) {
- if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
- Free (toolPtr->lpszText);
+ Free (toolPtr->lpszText);
toolPtr->lpszText = NULL;
}
if (lpToolInfo->lpszText) {
@@ -2268,8 +2265,7 @@
else {
if ( (toolPtr->lpszText) &&
!IS_INTRESOURCE(toolPtr->lpszText) ) {
- if( toolPtr->lpszText != LPSTR_TEXTCALLBACKW)
- Free (toolPtr->lpszText);
+ Free (toolPtr->lpszText);
toolPtr->lpszText = NULL;
}
if (lpToolInfo->lpszText) {
Modified: trunk/reactos/dll/win32/comctl32/treeview.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/comctl32/treeview.c?rev=21550&r1=21549&r2=21550&view=diff
==============================================================================
--- trunk/reactos/dll/win32/comctl32/treeview.c (original)
+++ trunk/reactos/dll/win32/comctl32/treeview.c Tue Apr 11 23:03:09 2006
@@ -2316,14 +2316,11 @@
{
HPEN hOldPen, hNewPen;
HTREEITEM parent;
- LOGBRUSH lb;
/*
* Get a dotted grey pen
*/
- lb.lbStyle = BS_SOLID;
- lb.lbColor = infoPtr->clrLine;
- hNewPen = ExtCreatePen(PS_COSMETIC|PS_ALTERNATE, 1, &lb, 0, NULL);
+ hNewPen = CreatePen(PS_ALTERNATE, 0, infoPtr->clrLine);
hOldPen = SelectObject(hdc, hNewPen);
MoveToEx(hdc, item->stateOffset, centery, NULL);
@@ -2824,8 +2821,6 @@
}
}
- TREEVIEW_UpdateScrollBars(infoPtr);
-
if (infoPtr->cdmode & CDRF_NOTIFYPOSTPAINT)
infoPtr->cdmode =
TREEVIEW_SendCustomDrawNotify(infoPtr, CDDS_POSTPAINT, hdc, rect);
@@ -3330,6 +3325,7 @@
}
}
}
+ TREEVIEW_UpdateScrollBars(infoPtr);
return TRUE;
}
More information about the Ros-diffs
mailing list