[dreimer] 32984: Sync WordPad to recent Wine Tree. Fixes the hang in the GUI and updates Korean and Slovenian Resources
15 Apr
2008
15 Apr
'08
9:07 p.m.
Author: dreimer
Date: Tue Apr 15 16:07:09 2008
New Revision: 32984
URL: http://svn.reactos.org/svn/reactos?rev=32984&view=rev
Log:
Sync WordPad to recent Wine Tree. Fixes the hang in the GUI and updates Korean and
Slovenian Resources
Modified:
trunk/reactos/base/applications/wordpad/Ko.rc
trunk/reactos/base/applications/wordpad/Si.rc
trunk/reactos/base/applications/wordpad/print.c
trunk/reactos/base/applications/wordpad/registry.c
Modified: trunk/reactos/base/applications/wordpad/Ko.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Ko.rc [iso-8859-1] Tue Apr 15 16:07:09 2008
@@ -193,6 +193,13 @@
STRINGTABLE DISCARDABLE
BEGIN
+ STRING_NEWFILE_RICHTEXT, "¸®Ä¡ ÅؽºÆ® ¹®¼"
+ STRING_NEWFILE_TXT, "ÅؽºÆ® ¹®¼"
+ STRING_NEWFILE_TXT_UNICODE, "À¯´ÏÄÚµå ÅؽºÆ® ¹®¼"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
STRING_PRINTER_FILES_PRN, "ÇÁ¸°ÅÍ ÆÄÀÏ (*.PRN)"
END
@@ -208,8 +215,8 @@
STRING_PREVIEW_PRINT, "Àμâ"
STRING_PREVIEW_NEXTPAGE, "´ÙÀ½ ÆäÀÌÁö"
STRING_PREVIEW_PREVPAGE, "ÀÌÀü ÆäÀÌÁö"
- STRING_PREVIEW_TWOPAGES, "Two pages"
- STRING_PREVIEW_ONEPAGE, "One page"
+ STRING_PREVIEW_TWOPAGES, "µÎ ÆäÀÌÁö"
+ STRING_PREVIEW_ONEPAGE, "ÇÑ ÆäÀÌÁö"
STRING_PREVIEW_CLOSE, "´Ý±â"
END
Modified: trunk/reactos/base/applications/wordpad/Si.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/Si.rc [iso-8859-1] Tue Apr 15 16:07:09 2008
@@ -1,7 +1,5 @@
-/*
- * Help Viewer (Slovenian Resources)
- *
- * Copyright 2002, 2003, 2008 Rok Mandeljc
+/*
+ * Copyright 2008 Rok Mandeljc
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,66 +16,227 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-//#pragma code_page(65001)
-
-/* Menu */
-
-MAIN_MENU MENU LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
-{
- POPUP "&Datoteka" {
- MENUITEM "&Odpri", MNID_FILE_OPEN
- MENUITEM SEPARATOR
- MENUITEM "&Natisni", MNID_FILE_PRINT
- MENUITEM "Priprava &tiskalnika ...", MNID_FILE_SETUP
- MENUITEM SEPARATOR
- MENUITEM "Iz&hod", MNID_FILE_EXIT
- }
- POPUP "&Urejanje" {
- MENUITEM "&Kopiraj ...", MNID_EDIT_COPYDLG
- MENUITEM SEPARATOR
- MENUITEM "P&ripombe ...", MNID_EDIT_ANNOTATE
- }
- POPUP "&Zaznamki" {
- MENUITEM "Do&loÄi ...", MNID_BKMK_DEFINE
- }
- POPUP "&PomoÄ" {
- MENUITEM "&O pomoÄi", MNID_HELP_HELPON
- MENUITEM "Vedno na &vrhu", MNID_HELP_HELPTOP
- MENUITEM SEPARATOR
- MENUITEM "&Informacije ...", MNID_HELP_ABOUT
-#ifdef WINELIB
- MENUITEM "&O WINE", MNID_HELP_WINE
-#endif
- }
-}
-
-IDD_INDEX DIALOG DISCARDABLE 0, 0, 200, 190 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
-STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+#pragma code_page(65001)
+
+LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
+
+IDM_MAINMENU MENU DISCARDABLE
+BEGIN
+ POPUP "&Datotka"
+ BEGIN
+ MENUITEM "&Nova ...\tCtrl+N", ID_FILE_NEW
+ MENUITEM "&Odpri ...\tCtrl+O", ID_FILE_OPEN
+ MENUITEM "&Shrani\tCtrl+S", ID_FILE_SAVE
+ MENUITEM "Shrani &kot ...", ID_FILE_SAVEAS
+ MENUITEM SEPARATOR
+ MENUITEM "Na&tisni ...\tCtrl+P", ID_PRINT
+ MENUITEM "Pre&dogled tiskanja ...", ID_PREVIEW
+ MENUITEM "Pri&prava strani ...", ID_PRINTSETUP
+ MENUITEM SEPARATOR
+ MENUITEM "Iz&hod", ID_FILE_EXIT
+ END
+ POPUP "&Urejanje"
+ BEGIN
+ MENUITEM "Ra&zveljavi\tCtrl+Z", ID_EDIT_UNDO
+ MENUITEM "Po&novi\tCtrl+Y", ID_EDIT_REDO
+ MENUITEM SEPARATOR
+ MENUITEM "&Izreži\tCtrl+X", ID_EDIT_CUT
+ MENUITEM "&Kopiraj\tCtrl+C", ID_EDIT_COPY
+ MENUITEM "&Prilepi\tCtrl+V", ID_EDIT_PASTE
+ MENUITEM "Po&briši\tDEL", ID_EDIT_CLEAR
+ MENUITEM "Izberi &vse\tCtrl+A", ID_EDIT_SELECTALL
+ MENUITEM SEPARATOR
+ MENUITEM "Na&jdi ...\tCrtl+F", ID_FIND
+ MENUITEM "Najdi n&aslednje\tF3", ID_FIND_NEXT
+ MENUITEM "Za&menjaj ...\tCtrl+H", ID_REPLACE
+ MENUITEM SEPARATOR
+ MENUITEM "Samo za b&ranje", ID_EDIT_READONLY
+ MENUITEM "Spr&emenjeno", ID_EDIT_MODIFIED
+ MENUITEM SEPARATOR
+ POPUP "Do&datno"
+ BEGIN
+ MENUITEM "Poda&tki o izbiri",
ID_EDIT_SELECTIONINFO
+ MENUITEM "Oblika zna&kov", ID_EDIT_CHARFORMAT
+ MENUITEM "Pr&ivzeta oblika znakov",
ID_EDIT_DEFCHARFORMAT
+ MENUITEM "Ob&lika odstavka", ID_EDIT_PARAFORMAT
+ MENUITEM "Pridobi &besedilo",
ID_EDIT_GETTEXT
+ END
+ END
+ POPUP "Po&gled"
+ BEGIN
+ MENUITEM "O&rodna vrstica", ID_TOGGLE_TOOLBAR
+ MENUITEM "O&blikovna vrstica", ID_TOGGLE_FORMATBAR
+ MENUITEM "&Ravnilo", ID_TOGGLE_RULER
+ MENUITEM "&Vrstica stanja", ID_TOGGLE_STATUSBAR
+ MENUITEM SEPARATOR
+ MENUITEM "&Možnosti ...", ID_VIEWPROPERTIES
+ END
+ POPUP "&Vstavi"
+ BEGIN
+ MENUITEM "&Datum in Äas ...", ID_DATETIME
+ END
+ POPUP "O&blika"
+ BEGIN
+ MENUITEM "&Pisava ...", ID_FONTSETTINGS
+ MENUITEM "&VrstiÄne oznake" ID_BULLET
+ MENUITEM "O&dstavek ..." ID_PARAFORMAT
+ MENUITEM "&Tabulator ..." ID_TABSTOPS
+ POPUP "Ozad&je"
+ BEGIN
+ MENUITEM "&Sistemsko\tCtrl+1", ID_BACK_1
+ MENUITEM "&PostThat rumenkasto\tCtrl+2", ID_BACK_2
+ END
+ END
+ POPUP "&PomoÄ"
+ BEGIN
+ MENUITEM "&O Wine Wordpadu" ID_ABOUT
+ END
+END
+
+IDM_POPUP MENU DISCARDABLE
+BEGIN
+ POPUP ""
+ BEGIN
+ MENUITEM "&Izreži", ID_EDIT_CUT
+ MENUITEM "&Kopiraj", ID_EDIT_COPY
+ MENUITEM "&Prilepi", ID_EDIT_PASTE
+ MENUITEM SEPARATOR
+ MENUITEM "&VrstiÄne oznake" ID_BULLET
+ MENUITEM "O&dstavek ..." ID_PARAFORMAT
+ END
+END
+
+IDD_DATETIME DIALOG DISCARDABLE 30, 20, 130, 80
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+CAPTION "Datum in Äas"
+FONT 10, "MS Sans Serif"
+BEGIN
+ LTEXT "Razpoložljive oblike",0,3,2,100,15
+ LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT
+ PUSHBUTTON "&V redu",IDOK,87,12,40,12
+ PUSHBUTTON "&PrekliÄi",IDCANCEL,87,26,40,12
+END
+
+IDD_NEWFILE DIALOG DISCARDABLE 30, 20, 140, 80
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+CAPTION "Nov dokument"
+FONT 10, "MS Sans Serif"
+BEGIN
+ LTEXT "Vrsta dokumenta",0,3,2,100,15
+ LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT
+ PUSHBUTTON "&V redu",IDOK,97,12,40,12
+ PUSHBUTTON "&PrekliÄi",IDCANCEL,97,26,40,12
+END
+
+IDD_PARAFORMAT DIALOG DISCARDABLE 30, 20, 200, 110
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+Caption "Oblika odstavka"
FONT 8, "MS Shell Dlg"
-CAPTION "Indeks"
-{
- LISTBOX IDC_INDEXLIST, 10, 10, 180, 150, LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
WS_BORDER
- PUSHBUTTON "&V redu", IDOK, 40, 170, 50, 12
- PUSHBUTTON "&PrekliÄi", IDCANCEL, 120, 170, 50, 12
-}
-
-/* Strings */
-STRINGTABLE DISCARDABLE LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
-{
-STID_WINE_HELP, "WINE PomoÄ"
-STID_WHERROR, "NAPAKA"
-STID_WARNING, "OPOZORILO"
-STID_INFO, "Informacija"
-STID_NOT_IMPLEMENTED, "Ni (Å¡e) na voljo"
-STID_HLPFILE_ERROR_s, "Napaka pri branju datoteke s pomoÄjo `%s'"
-STID_CONTENTS, "&Teme pomoÄi"
-STID_SEARCH, "&Iskanje"
-STID_BACK, "&Nazaj"
-STID_HISTORY, "&Zgodovina"
-STID_TOPICS, "&Vsebina"
-STID_ALL_FILES, "Vse datoteke (*.*)"
-STID_HELP_FILES_HLP, "Datoteke s pomoÄjo (*.hlp)"
-STID_FILE_NOT_FOUND_s "Ne najdem datoteke '%s'. Ali jo želite poiskati
sami?"
-}
+BEGIN
+ GROUPBOX "Zamiki", 0, 10, 10, 120, 68
+ LTEXT "Levo", 0, 15, 22, 40, 13
+ EDITTEXT IDC_PARA_LEFT, 55, 20, 60, 13
+ LTEXT "Desno", 0, 15, 40, 40, 13
+ EDITTEXT IDC_PARA_RIGHT, 55, 38, 60, 13
+ LTEXT "Prva vrstica", 0, 15, 58, 40, 13
+ EDITTEXT IDC_PARA_FIRST, 55, 56, 60, 13
+ LTEXT "Poravnava", 0, 15, 87, 40, 13
+ COMBOBOX IDC_PARA_ALIGN, 55, 85, 60, 13, CBS_DROPDOWNLIST
+ PUSHBUTTON "&V redu", IDOK, 137, 15, 50, 15
+ PUSHBUTTON "&PrekliÄi", IDCANCEL, 137, 33, 50, 15
+END
+
+IDD_TABSTOPS DIALOG DISCARDABLE 30, 20, 200, 110
+STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+Caption "Tabulatorji"
+FONT 8, "MS SHell DLg"
+BEGIN
+ GROUPBOX "Položaji tabulatorja", 0, 10, 10, 120, 90
+ COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE | CBS_SORT
+ 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
+ PUSHBUTTON "&PrekliÄi", IDCANCEL, 137, 33, 50, 15
+ PUSHBUTTON "Odstrani v&se", ID_TAB_EMPTY, 137, 51, 50, 15
+END
+
+IDD_FORMATOPTS DIALOG DISCARDABLE 0, 0, 280, 110
+STYLE DS_SYSMODAL
+Caption ""
+FONT 8, "MS Shell Dlg"
+BEGIN
+ GROUPBOX "Prelom vrstic", 0, 10, 10, 130, 85
+ RADIOBUTTON "Prelomi besedilo na robu o&kna", IDC_PAGEFMT_WW, 18, 25,
117, 15
+ RADIOBUTTON "Prelomi besedilo na robu &papirja", IDC_PAGEFMT_WM, 18,
45, 117, 15
+ GROUPBOX "Orodne vrstice", 0, 150, 10, 120, 85
+ CHECKBOX "O&rodna vrstica", IDC_PAGEFMT_TB, 160, 20, 80, 15
+ CHECKBOX "O&blikovna vrstica", IDC_PAGEFMT_FB, 160, 38, 80, 15
+ CHECKBOX "&Ravnilo", IDC_PAGEFMT_RU, 160, 56, 80, 15
+ CHECKBOX "&Vrstica stanja", IDC_PAGEFMT_SB, 160, 74, 80, 15
+ LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ STRING_RICHTEXT_FILES_RTF, "Dokument z obogatenim besedilom (*.rtf)"
+ STRING_TEXT_FILES_TXT, "Dokument z besedilom (*.txt)"
+ STRING_TEXT_FILES_UNICODE_TXT, "Dokument z Unicode besedilom (*.txt)"
+ STRING_ALL_FILES, "Vsi dokumenti (*.*)"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ STRING_ALIGN_LEFT, "Levo"
+ STRING_ALIGN_RIGHT, "Desno"
+ STRING_ALIGN_CENTER, "Sredina"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ STRING_NEWFILE_RICHTEXT, "Dokument z obogatenim besedilom"
+ STRING_NEWFILE_TXT, "Dokument z besedilom"
+ STRING_NEWFILE_TXT_UNICODE, "Dokument z Unicode besedilom"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ STRING_PRINTER_FILES_PRN, "Tiskalnikova datoteka (*.PRN)"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ STRING_VIEWPROPS_TITLE, "Možnosti"
+ STRING_VIEWPROPS_TEXT, "Besedilo"
+ STRING_VIEWPROPS_RICHTEXT, "Obogateno besedilo"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ STRING_PREVIEW_PRINT, "Natisni"
+ STRING_PREVIEW_NEXTPAGE, "Naslednja"
+ STRING_PREVIEW_PREVPAGE, "Prejšnja"
+ STRING_PREVIEW_TWOPAGES, "Dve strani"
+ STRING_PREVIEW_ONEPAGE, "Ena stran"
+ STRING_PREVIEW_CLOSE, "Zapri"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ STRING_UNITS_CM, "cm"
+END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+ STRING_DEFAULT_FILENAME, "Dokument"
+ STRING_PROMPT_SAVE_CHANGES, "Ali naj shranim spremembe v '%s'?"
+ STRING_SEARCH_FINISHED, "Konec iskanja po dokumentu."
+ STRING_LOAD_RICHED_FAILED, "Napaka pri nalaganju RichEdit knjižnice."
+ STRING_SAVE_LOSEFORMATTING, "Izbrali ste shranjevanje v Äisti besedilni "
\
+ "obliki, kar bo povzroÄilo izgubo oblikovanja.
" \
+ "Ali ste prepriÄani, da želite shraniti " \
+ "dokument v tej obliki?"
+ STRING_INVALID_NUMBER, "Neveljavna oblika Å¡tevila"
+ STRING_OLE_STORAGE_NOT_SUPPORTED, "Dokumenti z OLE predmeti niso podprti"
+END
#pragma code_page(default)
Modified: trunk/reactos/base/applications/wordpad/print.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/print.c [iso-8859-1] Tue Apr 15 16:07:09 2008
@@ -85,7 +85,7 @@
}
}
-static void AddTextButton(HWND hRebarWnd, int string, int command, int id)
+static void AddTextButton(HWND hRebarWnd, UINT string, UINT command, UINT id)
{
REBARBANDINFOW rb;
HINSTANCE hInstance = (HINSTANCE)GetWindowLongPtr(hRebarWnd, GWLP_HINSTANCE);
@@ -95,7 +95,7 @@
LoadStringW(hInstance, string, text, MAX_STRING_LEN);
hButton = CreateWindowW(WC_BUTTONW, text,
WS_VISIBLE | WS_CHILD, 5, 5, 100, 15,
- hRebarWnd, (HMENU)command, hInstance, NULL);
+ hRebarWnd, (HMENU)ULongToHandle(command), hInstance, NULL);
rb.cbSize = sizeof(rb);
rb.fMask = RBBIM_SIZE | RBBIM_CHILDSIZE | RBBIM_STYLE | RBBIM_CHILD | RBBIM_IDEALSIZE
| RBBIM_ID;
@@ -500,7 +500,7 @@
DeleteObject(hBitmap);
}
- hdc = CreateCompatibleDC(hdc);
+ hdc = CreateCompatibleDC(0);
CmPixels = twips_to_pixels(TWIPS_PER_CM, GetDeviceCaps(hdc, LOGPIXELSX));
QuarterCmPixels = (int)((float)CmPixels / 4.0);
@@ -702,7 +702,7 @@
if(preview.hdc2)
{
- if((int)preview.hdc2 != -1)
+ if(preview.hdc2 != (HDC)-1)
DeleteDC(preview.hdc2);
preview.hdc2 = CreateCompatibleDC(hdc);
}
Modified: trunk/reactos/base/applications/wordpad/registry.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…
==============================================================================
--- trunk/reactos/base/applications/wordpad/registry.c [iso-8859-1] (original)
+++ trunk/reactos/base/applications/wordpad/registry.c [iso-8859-1] Tue Apr 15 16:07:09
2008
@@ -223,7 +223,7 @@
!= ERROR_SUCCESS)
break;
- mi.dwItemData = (DWORD)pFile[i];
+ mi.dwItemData = (ULONG_PTR)pFile[i];
wsprintfW(itemText, numFormat, i+1);
lstrcpyW(buffer, pFile[i]);
6002
days inactive
6002
days old
0 comments
1 participants
participants (1)
-
dreimer＠svn.reactos.org