[ros-diffs] [dreimer] 39950: Translate the ReactOS MediaPlayer into German and Polish (Maciej Bialas). Sync WinHLP32 and WordPad with Wine HEAD.
dreimer at svn.reactos.org
dreimer at svn.reactos.org
Wed Mar 11 13:11:29 CET 2009
Author: dreimer
Date: Wed Mar 11 15:11:28 2009
New Revision: 39950
URL: http://svn.reactos.org/svn/reactos?rev=39950&view=rev
Log:
Translate the ReactOS MediaPlayer into German and Polish (Maciej Bialas).
Sync WinHLP32 and WordPad with Wine HEAD.
Added:
trunk/reactos/base/applications/mplay32/lang/de-DE.rc (with props)
trunk/reactos/base/applications/mplay32/lang/pl-PL.rc (with props)
Modified:
trunk/reactos/base/applications/mplay32/rsrc.rc
trunk/reactos/base/applications/winhlp32/winhelp.c
trunk/reactos/base/applications/wordpad/Da.rc
trunk/reactos/base/applications/wordpad/De.rc
trunk/reactos/base/applications/wordpad/En.rc
trunk/reactos/base/applications/wordpad/Fr.rc
trunk/reactos/base/applications/wordpad/Hu.rc
trunk/reactos/base/applications/wordpad/Ja.rc
trunk/reactos/base/applications/wordpad/Ko.rc
trunk/reactos/base/applications/wordpad/Nl.rc
trunk/reactos/base/applications/wordpad/No.rc
trunk/reactos/base/applications/wordpad/Pl.rc
trunk/reactos/base/applications/wordpad/Pt.rc
trunk/reactos/base/applications/wordpad/Ru.rc
trunk/reactos/base/applications/wordpad/Si.rc
trunk/reactos/base/applications/wordpad/Sv.rc
trunk/reactos/base/applications/wordpad/Tr.rc
trunk/reactos/base/applications/wordpad/Zh.rc
trunk/reactos/base/applications/wordpad/wordpad.c
trunk/reactos/base/applications/wordpad/wordpad.h
Added: trunk/reactos/base/applications/mplay32/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/lang/de-DE.rc?rev=39950&view=auto
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/de-DE.rc (added)
+++ trunk/reactos/base/applications/mplay32/lang/de-DE.rc [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -1,0 +1,29 @@
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
+IDR_MAINMENU MENU
+BEGIN
+ POPUP "&Datei"
+ BEGIN
+ MENUITEM "Ö&ffnen...", IDM_OPEN_FILE
+ MENUITEM "Sch&ließen", IDM_CLOSE_FILE
+ MENUITEM SEPARATOR
+ MENUITEM "&Beenden", IDM_EXIT
+ END
+ POPUP "&Hilfe"
+ BEGIN
+ MENUITEM "&Über...", IDM_ABOUT
+ END
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_ALL_TYPES_FILTER "Alle Unterstützten (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
+ IDS_TOOLTIP_PLAY "wiedergabe"
+ IDS_TOOLTIP_STOP "Stopp"
+ IDS_TOOLTIP_EJECT "Auswerfen"
+ IDS_TOOLTIP_BACKWARD "Zurück"
+ IDS_TOOLTIP_SEEKBACK "Schneller Rücklauf"
+ IDS_TOOLTIP_SEEKFORW "Schneller Vorlauf"
+ IDS_TOOLTIP_FORWARD "Weiter"
+ IDS_APPTITLE "ReactOS Multimedia Player"
+END
Propchange: trunk/reactos/base/applications/mplay32/lang/de-DE.rc
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/base/applications/mplay32/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/lang/pl-PL.rc?rev=39950&view=auto
==============================================================================
--- trunk/reactos/base/applications/mplay32/lang/pl-PL.rc (added)
+++ trunk/reactos/base/applications/mplay32/lang/pl-PL.rc [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -1,0 +1,31 @@
+LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
+
+//By Maciej Bialas
+
+IDR_MAINMENU MENU
+BEGIN
+ POPUP "&Plik"
+ BEGIN
+ MENUITEM "&Otwórz...", IDM_OPEN_FILE
+ MENUITEM "&Zamknij", IDM_CLOSE_FILE
+ MENUITEM SEPARATOR
+ MENUITEM "&WyjdŸ", IDM_EXIT
+ END
+ POPUP "&Pomoc"
+ BEGIN
+ MENUITEM "&O programie...", IDM_ABOUT
+ END
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ IDS_ALL_TYPES_FILTER "Wszystkie formaty (*.wav, *.cda, *.midi, *.mid, *.avi)\0*.wav;*.cda;*.midi;*.mid;*.avi\0"
+ IDS_TOOLTIP_PLAY "Odtwarzaj"
+ IDS_TOOLTIP_STOP "Zatrzymaj"
+ IDS_TOOLTIP_EJECT "Wysuñ"
+ IDS_TOOLTIP_BACKWARD "Przeskocz do ty³u"
+ IDS_TOOLTIP_SEEKBACK "Przewiñ do ty³u"
+ IDS_TOOLTIP_SEEKFORW "Przewiñ do przodu"
+ IDS_TOOLTIP_FORWARD "Przeskocz do przodu"
+ IDS_APPTITLE "ReactOS Multimedia Player"
+END
Propchange: trunk/reactos/base/applications/mplay32/lang/pl-PL.rc
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/base/applications/mplay32/rsrc.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/rsrc.rc?rev=39950&r1=39949&r2=39950&view=diff
==============================================================================
--- trunk/reactos/base/applications/mplay32/rsrc.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/mplay32/rsrc.rc [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -1,5 +1,7 @@
#include <windows.h>
#include "resource.h"
+#include "lang/de-DE.rc"
#include "lang/en-US.rc"
+#include "lang/pl-PL.rc"
#include "lang/ru-RU.rc"
Modified: trunk/reactos/base/applications/winhlp32/winhelp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32/winhelp.c?rev=39950&r1=39949&r2=39950&view=diff
==============================================================================
--- trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/winhlp32/winhelp.c [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -274,9 +274,7 @@
{
strcpy(mwi.type, "primary");
strcpy(mwi.name, "main");
- if (hlpfile && !LoadString(Globals.hInstance, STID_WINE_HELP,
- mwi.caption, sizeof(mwi.caption)))
- strcpy(mwi.caption, hlpfile->lpszTitle);
+ LoadString(Globals.hInstance, STID_WINE_HELP, mwi.caption, sizeof(mwi.caption));
mwi.origin.x = mwi.origin.y = mwi.size.cx = mwi.size.cy = CW_USEDEFAULT;
mwi.style = SW_SHOW;
mwi.win_style = WS_OVERLAPPEDWINDOW;
@@ -1265,8 +1263,7 @@
{
WINHELP_WINDOW *win;
WINHELP_BUTTON *button;
- RECT rect;
- INT curPos, min, max, dy, keyDelta;
+ INT keyDelta;
HWND hTextWnd;
LRESULT ret;
@@ -1381,42 +1378,23 @@
case WM_KEYDOWN:
keyDelta = 0;
+ win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0);
+ hTextWnd = GetDlgItem(win->hMainWnd, CTL_ID_TEXT);
switch (wParam)
{
case VK_UP:
+ SendMessage(hTextWnd, EM_SCROLL, SB_LINEUP, 0);
+ return 0;
case VK_DOWN:
- keyDelta = GetSystemMetrics(SM_CXVSCROLL);
- if (wParam == VK_UP)
- keyDelta = -keyDelta;
-
+ SendMessage(hTextWnd, EM_SCROLL, SB_LINEDOWN, 0);
+ return 0;
case VK_PRIOR:
+ SendMessage(hTextWnd, EM_SCROLL, SB_PAGEUP, 0);
+ return 0;
case VK_NEXT:
- win = (WINHELP_WINDOW*) GetWindowLongPtr(hWnd, 0);
- hTextWnd = GetDlgItem(win->hMainWnd, CTL_ID_TEXT);
- curPos = GetScrollPos(hTextWnd, SB_VERT);
- GetScrollRange(hTextWnd, SB_VERT, &min, &max);
-
- if (keyDelta == 0)
- {
- GetClientRect(hTextWnd, &rect);
- keyDelta = (rect.bottom - rect.top) / 2;
- if (wParam == VK_PRIOR)
- keyDelta = -keyDelta;
- }
-
- curPos += keyDelta;
- if (curPos > max)
- curPos = max;
- else if (curPos < min)
- curPos = min;
-
- dy = GetScrollPos(hTextWnd, SB_VERT) - curPos;
- SetScrollPos(hTextWnd, SB_VERT, curPos, TRUE);
- ScrollWindow(hTextWnd, 0, dy, NULL, NULL);
- UpdateWindow(hTextWnd);
+ SendMessage(hTextWnd, EM_SCROLL, SB_PAGEDOWN, 0);
return 0;
-
case VK_ESCAPE:
MACRO_Exit();
return 0;
Modified: trunk/reactos/base/applications/wordpad/Da.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/Da.rc?rev=39950&r1=39949&r2=39950&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/Da.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Da.rc [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -150,7 +150,7 @@
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Tabulatorstop", -1, 10, 10, 120, 90
- COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
+ COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Tilføj", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Fjern", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
Modified: trunk/reactos/base/applications/wordpad/De.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/De.rc?rev=39950&r1=39949&r2=39950&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/De.rc [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -152,7 +152,7 @@
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Tabstoppposition", -1, 10, 10, 120, 90
- COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
+ COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Festlegen", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Löschen", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
Modified: trunk/reactos/base/applications/wordpad/En.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/En.rc?rev=39950&r1=39949&r2=39950&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/En.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/En.rc [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -150,7 +150,7 @@
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Tab stops", -1, 10, 10, 120, 90
- COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
+ COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
@@ -239,5 +239,6 @@
STRING_WRITE_ACCESS_DENIED, "You do not have access to save the file."
STRING_OPEN_FAILED, "Could not open the file."
STRING_OPEN_ACCESS_DENIED, "You do not have access to open the file."
- STRING_PRINTING_NOT_IMPLEMENTED, "Printing not implemented"
-END
+ STRING_PRINTING_NOT_IMPLEMENTED, "Printing not implemented"
+ STRING_MAX_TAB_STOPS, "Cannot add more than 32 tab stops."
+END
Modified: trunk/reactos/base/applications/wordpad/Fr.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/Fr.rc?rev=39950&r1=39949&r2=39950&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Fr.rc [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -150,7 +150,7 @@
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Arrêts de tabulation", -1, 10, 10, 120, 90
- COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
+ COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Ajouter", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Supprimer", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
Modified: trunk/reactos/base/applications/wordpad/Hu.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/Hu.rc?rev=39950&r1=39949&r2=39950&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Hu.rc [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -150,7 +150,7 @@
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Tab stops", -1, 10, 10, 120, 90
- COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
+ COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
Modified: trunk/reactos/base/applications/wordpad/Ja.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/Ja.rc?rev=39950&r1=39949&r2=39950&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Ja.rc [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -153,7 +153,7 @@
FONT 9, "MS Shell Dlg"
BEGIN
GROUPBOX "タブã®åœæ¢ä½ç½®(&T)", -1, 10, 10, 120, 90
- COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
+ COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "è¿½åŠ (&A)", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "削除(&R)", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
Modified: trunk/reactos/base/applications/wordpad/Ko.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/Ko.rc?rev=39950&r1=39949&r2=39950&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -152,7 +152,7 @@
FONT 9, "MS Shell Dlg"
BEGIN
GROUPBOX "ÅÇ Á¤Áö", -1, 10, 10, 120, 90
- COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
+ COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "´õÇϱâ(&A)", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "Áö¿ì±â(&R)", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "È®ÀÎ(&O)", IDOK, 137, 15, 50, 15
@@ -242,4 +242,5 @@
STRING_OPEN_FAILED, "ÆÄÀÏÀ» ¿ ¼ö ¾ø½À´Ï´Ù."
STRING_OPEN_ACCESS_DENIED, "ÆÄÀÏÀ» ¿ ±ÇÇÑÀÌ ¾ø½À´Ï´Ù."
STRING_PRINTING_NOT_IMPLEMENTED, "Àμâ´Â Áö¿øµÇÁö ¾Ê½À´Ï´Ù"
-END
+ STRING_MAX_TAB_STOPS, " ÅÇÁßÁö´Â 32°³ ÀÌ»ó Ãß°¡ ÇÒ ¼ö ¾ø½À´Ï´Ù."
+END
Modified: trunk/reactos/base/applications/wordpad/Nl.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/Nl.rc?rev=39950&r1=39949&r2=39950&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Nl.rc [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -151,7 +151,7 @@
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Tab stops", -1, 10, 10, 120, 90
- COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
+ COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Toevoegen", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Verwijderen", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
Modified: trunk/reactos/base/applications/wordpad/No.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/No.rc?rev=39950&r1=39949&r2=39950&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/No.rc [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -150,7 +150,7 @@
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Tabulatorstopp", -1, 10, 10, 120, 90
- COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
+ COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Legg til", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Fjern", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
Modified: trunk/reactos/base/applications/wordpad/Pl.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/Pl.rc?rev=39950&r1=39949&r2=39950&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/Pl.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Pl.rc [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -151,7 +151,7 @@
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Pozycje tabulatorów", -1, 10, 10, 120, 90
- COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
+ COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Dodaj", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Usuñ", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 57, 15
Modified: trunk/reactos/base/applications/wordpad/Pt.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/Pt.rc?rev=39950&r1=39949&r2=39950&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/Pt.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Pt.rc [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -152,7 +152,7 @@
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Marca de tabulação", -1, 10, 10, 120, 90
- COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
+ COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Adicionar", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Remover", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 135, 15, 55, 15
Modified: trunk/reactos/base/applications/wordpad/Ru.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/Ru.rc?rev=39950&r1=39949&r2=39950&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Ru.rc [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -150,7 +150,7 @@
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Ïîçèöèè òàáóëÿöèè", -1, 10, 10, 120, 90
- COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
+ COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Óñòàíîâèòü", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "Î&÷èñòèòü", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&ÎÊ", IDOK, 137, 15, 50, 15
Modified: trunk/reactos/base/applications/wordpad/Si.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/Si.rc?rev=39950&r1=39949&r2=39950&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -152,7 +152,7 @@
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Položaji tabulatorja", -1, 10, 10, 120, 90
- COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
+ COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Dodaj", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Odstrani", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&V redu", IDOK, 137, 15, 50, 15
Modified: trunk/reactos/base/applications/wordpad/Sv.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/Sv.rc?rev=39950&r1=39949&r2=39950&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/Sv.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Sv.rc [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -152,7 +152,7 @@
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Tabulatorstopp", -1, 10, 10, 120, 90
- COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
+ COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "Lägg &till", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "Ta &bort", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
Modified: trunk/reactos/base/applications/wordpad/Tr.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/Tr.rc?rev=39950&r1=39949&r2=39950&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Tr.rc [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -152,7 +152,7 @@
FONT 8, "MS SHell DLg"
BEGIN
GROUPBOX "Tab stops", -1, 10, 10, 120, 90
- COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
+ COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "&Add", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "&Remove", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "&OK", IDOK, 137, 15, 50, 15
Modified: trunk/reactos/base/applications/wordpad/Zh.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/Zh.rc?rev=39950&r1=39949&r2=39950&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Zh.rc [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -155,7 +155,7 @@
FONT 9, "MS Shell Dlg"
BEGIN
GROUPBOX "æ ‡ç¾åœç‚¹", -1, 10, 10, 120, 90
- COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
+ COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "æ·»åŠ (&A)", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "åˆ é™¤(&R)", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "确定(&O)", IDOK, 137, 15, 50, 15
@@ -380,7 +380,7 @@
FONT 9, "MS Shell Dlg"
BEGIN
GROUPBOX "標籤åœé»ž", -1, 10, 10, 120, 90
- COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
+ COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE
DEFPUSHBUTTON "æ·»åŠ (&A)", ID_TAB_ADD, 20, 80, 45, 15
PUSHBUTTON "刪除(&R)", ID_TAB_DEL, 72, 80, 45, 15
PUSHBUTTON "確定(&O)", IDOK, 137, 15, 50, 15
Modified: trunk/reactos/base/applications/wordpad/wordpad.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/wordpad.c?rev=39950&r1=39949&r2=39950&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/wordpad.c [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -1636,15 +1636,36 @@
if(SendMessageW(hTabWnd, CB_FINDSTRINGEXACT, -1, (LPARAM)&buffer) == CB_ERR)
{
float number = 0;
+ int item_count = SendMessage(hTabWnd, CB_GETCOUNT, 0, 0);
if(!number_from_string(buffer, &number, TRUE))
{
MessageBoxWithResStringW(hWnd, MAKEINTRESOURCEW(STRING_INVALID_NUMBER),
wszAppTitle, MB_OK | MB_ICONINFORMATION);
- } else
- {
- SendMessageW(hTabWnd, CB_ADDSTRING, 0, (LPARAM)&buffer);
- SetWindowTextW(hTabWnd, 0);
+ } else if (item_count >= MAX_TAB_STOPS) {
+ MessageBoxWithResStringW(hWnd, MAKEINTRESOURCEW(STRING_MAX_TAB_STOPS),
+ wszAppTitle, MB_OK | MB_ICONINFORMATION);
+ } else {
+ int i;
+ float next_number = -1;
+ int next_number_in_twips = -1;
+ int insert_number = current_units_to_twips(number);
+
+ /* linear search for position to insert the string */
+ for(i = 0; i < item_count; i++)
+ {
+ SendMessageW(hTabWnd, CB_GETLBTEXT, i, (LPARAM)&buffer);
+ number_from_string(buffer, &next_number, TRUE);
+ next_number_in_twips = current_units_to_twips(next_number);
+ if (insert_number <= next_number_in_twips)
+ break;
+ }
+ if (insert_number != next_number_in_twips)
+ {
+ number_with_units(buffer, insert_number);
+ SendMessageW(hTabWnd, CB_INSERTSTRING, i, (LPARAM)&buffer);
+ SetWindowTextW(hTabWnd, 0);
+ }
}
}
SetFocus(hTabWnd);
Modified: trunk/reactos/base/applications/wordpad/wordpad.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/wordpad.h?rev=39950&r1=39949&r2=39950&view=diff
==============================================================================
--- trunk/reactos/base/applications/wordpad/wordpad.h [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/wordpad.h [iso-8859-1] Wed Mar 11 15:11:28 2009
@@ -200,6 +200,7 @@
#define STRING_OPEN_FAILED 1709
#define STRING_OPEN_ACCESS_DENIED 1710
#define STRING_PRINTING_NOT_IMPLEMENTED 1711
+#define STRING_MAX_TAB_STOPS 1712
LPWSTR file_basename(LPWSTR);
More information about the Ros-diffs
mailing list