Ros-diffs May 2016

ros-diffs@reactos.org

18 participants
260 discussions

[rnaumann] 71469: [SHIMGVW]Replacement for SHIMGVW control button bitmaps. Work by "dsp8195". CORE-11145
by rnaumann＠svn.reactos.org 31 May '16

31 May '16

Author: rnaumann Date: Tue May 31 10:59:04 2016 New Revision: 71469 URL: http://svn.reactos.org/svn/reactos?rev=71469&view=rev Log: [SHIMGVW]Replacement for SHIMGVW control button bitmaps. Work by "dsp8195". CORE-11145 Modified: trunk/reactos/dll/win32/shimgvw/res/next.bmp trunk/reactos/dll/win32/shimgvw/res/prev.bmp trunk/reactos/dll/win32/shimgvw/res/print.bmp trunk/reactos/dll/win32/shimgvw/res/rot1.bmp trunk/reactos/dll/win32/shimgvw/res/rot2.bmp trunk/reactos/dll/win32/shimgvw/res/save.bmp trunk/reactos/dll/win32/shimgvw/res/zoomm.bmp trunk/reactos/dll/win32/shimgvw/res/zoomp.bmp Modified: trunk/reactos/dll/win32/shimgvw/res/next.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/next… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shimgvw/res/prev.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/prev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shimgvw/res/print.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/prin… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shimgvw/res/rot1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/rot1… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shimgvw/res/rot2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/rot2… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shimgvw/res/save.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/save… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shimgvw/res/zoomm.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/zoom… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/shimgvw/res/zoomp.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/res/zoom… ============================================================================== Binary files - no diff available.

1 0

[rnaumann] 71468: [COMCTL32][COMDLG32] Fix Esperanto localization. Patch by Mike Swanson. CORE-11264
by rnaumann＠svn.reactos.org 31 May '16

31 May '16

Author: rnaumann Date: Tue May 31 10:48:53 2016 New Revision: 71468 URL: http://svn.reactos.org/svn/reactos?rev=71468&view=rev Log: [COMCTL32][COMDLG32] Fix Esperanto localization. Patch by Mike Swanson. CORE-11264 Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Eo.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/co… ============================================================================== --- trunk/reactos/dll/win32/comctl32/lang/comctl_Eo.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/lang/comctl_Eo.rc [iso-8859-1] Tue May 31 10:48:53 2016 @@ -28,8 +28,8 @@ STRINGTABLE { - IDM_TODAY "HodiaÃ½:" - IDM_GOTODAY "Iru a la hodiaÃ½" + IDM_TODAY "HodiaÅ:" + IDM_GOTODAY "Iru a la hodiaÅ" } STRINGTABLE @@ -44,7 +44,7 @@ IDD_PROPSHEET DIALOGEX 0, 0, 220, 140 STYLE DS_SHELLFONT | DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Ecoj laÃ½ %s" +CAPTION "Ecoj laÅ %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Bone", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP @@ -60,8 +60,8 @@ CAPTION "Estrita Proceduro" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "< &Retro", IDC_BACK_BUTTON,56,138,55,14 - DEFPUSHBUTTON "&AntaÃ½en >", IDC_NEXT_BUTTON,111,138,55,14 + PUSHBUTTON "< &MalantaÅen", IDC_BACK_BUTTON,56,138,55,14 + DEFPUSHBUTTON "&AntaÅen >", IDC_NEXT_BUTTON,111,138,55,14 DEFPUSHBUTTON "Konkludi", IDC_FINISH_BUTTON,111,138,55,14 PUSHBUTTON "Rezigni", IDCANCEL,173,138,55,14 PUSHBUTTON "Helpo", IDHELP,235,138,55,14,WS_GROUP @@ -79,8 +79,8 @@ DEFPUSHBUTTON "&Fermu", IDCANCEL,320,6,70,14 PUSHBUTTON "R&ee agordu", IDC_RESET_BTN,320,23,70,14 PUSHBUTTON "&Helpo", IDC_HELP_BTN,320,40,70,14 - PUSHBUTTON "&Supre forÃ¾ovu", IDC_MOVEUP_BTN,320,74,70,14 - PUSHBUTTON "Su&be forÃ¾ovu", IDC_MOVEDN_BTN,320,91,70,14 + PUSHBUTTON "Movi &supren", IDC_MOVEUP_BTN,320,74,70,14 + PUSHBUTTON "Movi &malsupren", IDC_MOVEDN_BTN,320,91,70,14 LTEXT "&Disponeblaj butonoj:", -1,4,5,120,10 LISTBOX IDC_AVAILBTN_LBOX,5,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "&Aldonu ->", IDOK, 132, 42, 55, 14 Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/lang/cdlg_Eo.rc [iso-8859-1] Tue May 31 10:48:53 2016 @@ -24,11 +24,11 @@ STRINGTABLE { IDS_FILENOTFOUND "Dosiero ne estis trovita" - IDS_VERIFYFILE "Kontrolu la Ã¸ustecon je havigita dosiernomo." + IDS_VERIFYFILE "Kontrolu la Äustecon je havigita dosiernomo." IDS_CREATEFILE "Dosiero estas neekzistanta\n\ -Ãu vi volas krei dosieron?" +Äu vi volas krei dosieron?" IDS_OVERWRITEFILE "Dosiero estas jam ekzistanta.\n\ -Ãu vi volas superskribi Ã¸in?" +Äu vi volas superskribi Äin?" IDS_INVALID_FILENAME_TITLE "Nekorekta(j) tipo(j) en vojo" IDS_INVALID_FILENAME "La dosiernomo ne povas enhavi la jenajn tipojn:\n\ / : < > |" @@ -51,35 +51,35 @@ PD32_PRINT_TITLE "Presu" PD32_VALUE_UREADABLE "Nelegebla Entry" - PD32_INVALID_PAGE_RANGE "Ãi tiu valoro ne estas en la paÃ¸o.\n\ + PD32_INVALID_PAGE_RANGE "Äi tiu valoro ne estas en la paÄo.\n\ Enigu valoron inter %d kaj %d." - PD32_FROM_NOT_ABOVE_TO "La 'de:' valoro ne povas superi la 'Ã¸is:' valoron." - PD32_MARGINS_OVERLAP "MarÃ¸enoj surmetiÃ¸as inter si aÃ½ estas ekster paperfolio.\n\ -Difinu denove la marÃ¸enojn." + PD32_FROM_NOT_ABOVE_TO "La 'de:' valoro ne povas superi la 'Äis:' valoron." + PD32_MARGINS_OVERLAP "MarÄenoj surmetiÄas inter si aÅ estas ekster paperfolio.\n\ +Difinu denove la marÄenojn." PD32_NR_OF_COPIES_EMPTY "La nombrvaloro je 'Nombro da &ekzempleroj' ne povas esti malplena." PD32_TOO_LARGE_COPIES "La via printilo ne povas presi tiel granda nombro da ekzempleroj\n\ Enigu valoron inter 1 kaj %d." PD32_PRINT_ERROR "Okazis printila eroro." - PD32_NO_DEFAULT_PRINTER "Ne estas defaÃ½lta printilo." + PD32_NO_DEFAULT_PRINTER "Ne estas defaÅlta printilo." PD32_CANT_FIND_PRINTER "Mi ne povas trovi la printilon." - PD32_OUT_OF_MEMORY "La memoro estas elÃ¦erpita." + PD32_OUT_OF_MEMORY "La memoro estas elÄerpita." PD32_GENERIC_ERROR "Okazis eroro." PD32_DRIVER_UNKNOWN "Nekonata printilzorgilo." - PD32_NO_DEVICES "AntaÃ½ ol vi povos plenumi printiltaskojn kvazaÃ½ impozi paÃ¸on aÃ½ presi dokumenton, estas necese ke vi instalu printilon. Oni konsilas instali Ã¸in kaj reprovi." - - PD32_DEFAULT_PRINTER "DefaÃ½lta Printilo; " + PD32_NO_DEVICES "AntaÅ ol vi povos plenumi printiltaskojn kvazaÅ impozi paÄon aÅ presi dokumenton, estas necese ke vi instalu printilon. Oni konsilas instali Äin kaj reprovi." + + PD32_DEFAULT_PRINTER "DefaÅlta Printilo; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d dokumento(j) estas en presvico" - PD32_MARGINS_IN_INCHES "MarÃ¸enoj [inches]" - PD32_MARGINS_IN_MILLIMETERS "MarÃ¸enoj [mm]" + PD32_MARGINS_IN_INCHES "MarÄenoj [inches]" + PD32_MARGINS_IN_MILLIMETERS "MarÄenoj [mm]" PD32_MILLIMETERS "mm" PD32_PRINTER_STATUS_READY "Preta" - PD32_PRINTER_STATUS_PAUSED "PaÃ½se; " + PD32_PRINTER_STATUS_PAUSED "PaÅse; " PD32_PRINTER_STATUS_ERROR "Eroro; " PD32_PRINTER_STATUS_PENDING_DELETION "Nuliga atendado; " PD32_PRINTER_STATUS_PAPER_JAM "Blokita papero; " - PD32_PRINTER_STATUS_PAPER_OUT "ElÃ¦erpita papero; " - PD32_PRINTER_STATUS_MANUAL_FEED "Mane enÃ¾ovo de papero; " + PD32_PRINTER_STATUS_PAPER_OUT "ElÄerpita papero; " + PD32_PRINTER_STATUS_MANUAL_FEED "Mane enÅovo de papero; " PD32_PRINTER_STATUS_PAPER_PROBLEM "Papera problemo; " PD32_PRINTER_STATUS_OFFLINE "Nekonektita printilo; " PD32_PRINTER_STATUS_IO_ACTIVE "I/O Aktiva; " @@ -93,12 +93,12 @@ PD32_PRINTER_STATUS_WARMING_UP "Varmigo de la printilo; " PD32_PRINTER_STATUS_TONER_LOW "Kseroprintila nivelo estas basa; " PD32_PRINTER_STATUS_NO_TONER "Neniu kseroprintilo; " - PD32_PRINTER_STATUS_PAGE_PUNT "PaÃ¸a 'punt'; " + PD32_PRINTER_STATUS_PAGE_PUNT "PaÄa 'punt'; " PD32_PRINTER_STATUS_USER_INTERVENTION "Interrompita far uzanto; " - PD32_PRINTER_STATUS_OUT_OF_MEMORY "ElÃ¦erpita memoro; " + PD32_PRINTER_STATUS_OUT_OF_MEMORY "ElÄerpita memoro; " PD32_PRINTER_STATUS_DOOR_OPEN "La printila pordo estas malfermita; " PD32_PRINTER_STATUS_SERVER_UNKNOWN "Nekonata pres-servanto; " - PD32_PRINTER_STATUS_POWER_SAVE "EnergiÃ¾pare; " + PD32_PRINTER_STATUS_POWER_SAVE "EnergiÅpare; " } STRINGTABLE /* Font styles */ @@ -112,15 +112,15 @@ STRINGTABLE /* Color names */ { IDS_COLOR_BLACK "Nigro" - IDS_COLOR_MAROON "DuonruÃ¸bruna koloro" + IDS_COLOR_MAROON "DuonruÄbruna koloro" IDS_COLOR_GREEN "Verdo" IDS_COLOR_OLIVE "Olivverdo" IDS_COLOR_NAVY "Ultramara bluo" - IDS_COLOR_PURPLE "PurpurruÃ¸o" + IDS_COLOR_PURPLE "PurpurruÄo" IDS_COLOR_TEAL "Kreka koloro" IDS_COLOR_GRAY "Grizo" - IDS_COLOR_SILVER "ArÃ¸ento" - IDS_COLOR_RED "RuÃ¸o" + IDS_COLOR_SILVER "ArÄento" + IDS_COLOR_RED "RuÄo" IDS_COLOR_LIME "Limeta koloro" IDS_COLOR_YELLOW "Flavo" IDS_COLOR_BLUE "Bluo" @@ -196,19 +196,19 @@ { LTEXT "Printilo:", stc1, 6, 6, 40, 9 LTEXT "", stc2, 60, 6, 150, 9 - GROUPBOX "EtendiÃ¸on", grp1, 6, 30, 160, 65, BS_GROUPBOX - RADIOBUTTON "Ã¦&iujn", rad1, 16, 45, 60, 12 + GROUPBOX "EtendiÄon", grp1, 6, 30, 160, 65, BS_GROUPBOX + RADIOBUTTON "Ä&iujn", rad1, 16, 45, 60, 12 RADIOBUTTON "&elekton", rad2, 16, 60, 60, 12 - RADIOBUTTON "&paÃ¸ojn", rad3, 16, 75, 60, 12 + RADIOBUTTON "&paÄojn", rad3, 16, 75, 60, 12 DEFPUSHBUTTON "Presu", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Rezigni", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&AranÃ¸u", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&AranÄu", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP LTEXT "de:", stc3, 60, 80, 30, 9 - LTEXT "Ã¸is:", stc4, 120, 80, 30, 9 + LTEXT "Äis:", stc4, 120, 80, 30, 9 LTEXT "&Kvalito:", stc5, 6, 100, 76, 9 COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP CHECKBOX "Presu &dosieren", chx1, 20, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - CHECKBOX "MallarÃ¸tipe", chx2, 160, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "MallarÄtipe", chx2, 160, 120, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP } @@ -224,7 +224,7 @@ COMBOBOX cmb1, 35, 58, 145, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP DEFPUSHBUTTON "Bone", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Rezigni", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&AranÃ¸u", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&AranÄu", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP GROUPBOX "Formato", grp2, 6, 82, 100, 50, BS_GROUPBOX RADIOBUTTON "&Vertikala", rad3, 50, 95, 50, 12 RADIOBUTTON "&Horizontala", rad4, 50, 110, 50, 12 @@ -278,7 +278,7 @@ LTEXT "&Normala koloraro:", stc1, 4, 4, 140, 10 LTEXT "&Persona koloraro:", stc2, 4, 106, 140, 10 LTEXT "Sol&idkoloro", stc3, 150, 151, 48, 10 - LTEXT "&RuÃ¸o", IDC_COLOR_RL /*1094*/,247,126,27,10 + LTEXT "&RuÄo", IDC_COLOR_RL /*1094*/,247,126,27,10 EDITTEXT IDC_COLOR_EDIT_R, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "&Verdo", IDC_COLOR_GL /*1095*/,247,140,27,10 EDITTEXT IDC_COLOR_EDIT_G, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP @@ -299,17 +299,17 @@ PUSHBUTTON "Rezigni", IDCANCEL, 58, 167, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Helpo", pshHelp,100,166, 44, 14 PUSHBUTTON "&Aldonu al Koloraro", IDC_COLOR_ADD /*1024*/, 152, 167, 144, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Forv&iÃ¾u Koloraron >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Forv&iÅu Koloraron >>", IDC_COLOR_DEFINE /*1025*/, 4, 149, 142, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Sol&idkoloro", IDC_COLOR_RES, 300,200,4,14 /* just a dummy */ } FINDDLGORD DIALOG 36, 24, 276, 62 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "SerÃ¦u" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&SerÃ¦u:", -1, 4, 8, 52, 8 +CAPTION "SerÄu" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&SerÄu:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Nur tutan &vorton", chx1, 4, 26, 140, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Atentu &Usklecon", chx2, 4, 42, 140, 12, BS_AUTOCHECKBOX | WS_TABSTOP @@ -317,7 +317,7 @@ CONTROL "&Supre", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 151, 30, 48, 12 CONTROL "&Sube", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 151, 44, 48, 12 - DEFPUSHBUTTON "&PluserÃ¦u", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + DEFPUSHBUTTON "&PluserÄu", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON PUSHBUTTON "Rezigni", IDCANCEL , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Helpo", pshHelp , 212, 42, 60, 14, WS_GROUP | WS_TABSTOP } @@ -325,19 +325,19 @@ REPLACEDLGORD DIALOG 36, 24, 276, 94 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "AnstataÃ½igu" -FONT 8, "MS Shell Dlg" -{ - LTEXT "&SerÃ¦u:", -1, 4, 8, 52, 8 +CAPTION "AnstataÅigu" +FONT 8, "MS Shell Dlg" +{ + LTEXT "&SerÄu:", -1, 4, 8, 52, 8 EDITTEXT edt1, 57, 7, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP LTEXT "&per:", -1, 4, 26, 52, 8 EDITTEXT edt2, 57, 24, 148, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP CHECKBOX "Nur tutan &vorton", chx1, 5, 46, 120, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP CHECKBOX "Atentu &Usklecon", chx2, 5, 62, 120, 12, BS_AUTOCHECKBOX | WS_TABSTOP - DEFPUSHBUTTON "&PluserÃ¦u", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "&AnstataÃ½igu", psh1 , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "AnstataÃ½igu Ã¦&iujn", psh2 , 212, 42, 60, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&PluserÄu", IDOK, 212, 6, 60, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "&AnstataÅigu", psh1 , 212, 24, 60, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "AnstataÅigu Ä&iujn", psh2 , 212, 42, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Rezigni", IDCANCEL , 212, 60, 60, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Helpo", pshHelp , 212, 78, 60, 14, WS_GROUP | WS_TABSTOP } @@ -370,17 +370,17 @@ GROUPBOX "Ekzempleroj", grp2, 160, 92, 120,64, WS_GROUP LTEXT "Nombro da &ekzempleroj:",stc5,168,105,68,8 ICON "", ico3, 170,131, 76,24, WS_GROUP | SS_CENTERIMAGE - CONTROL "LaÃ½&kajere", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 + CONTROL "LaÅ&kajere", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,168,118,100,12 EDITTEXT edt3, 240,103, 32,12, WS_GROUP | ES_NUMBER - GROUPBOX "EtendiÃ¸on", grp1, 8,92, 144,64, WS_GROUP - CONTROL "Ã¦&iujn", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 - CONTROL "&paÃ¸ojn", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 + GROUPBOX "EtendiÄon", grp1, 8,92, 144,64, WS_GROUP + CONTROL "Ä&iujn", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 + CONTROL "&paÄojn", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 CONTROL "&elekton", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "de:", stc2, 52,124, 20,8 - RTEXT "Ã¸is:", stc3, 99,124, 20,8 + RTEXT "Äis:", stc3, 99,124, 20,8 } PRINT32_SETUP DIALOG 32, 32, 288, 178 @@ -419,7 +419,7 @@ PAGESETUPDLGORD DIALOG 32, 32, 240, 240 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Impozu PaÃ¸on" +CAPTION "Impozu PaÄon" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80 @@ -433,7 +433,7 @@ GROUPBOX "Formato", grp1, 8, 156, 64, 56, BS_GROUPBOX AUTORADIOBUTTON "&Vertikala", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "&Horizontala", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON - GROUPBOX "MarÃ¸enoj", grp4, 80, 156, 152, 56, BS_GROUPBOX + GROUPBOX "MarÄenoj", grp4, 80, 156, 152, 56, BS_GROUPBOX LTEXT "&Dekstra:", stc15, 88, 172, 30, 8 EDITTEXT edt4, 119, 170, 36, 12, WS_TABSTOP|WS_GROUP|WS_BORDER LTEXT "&Dekstra:", stc16, 159, 172, 30, 8 @@ -452,7 +452,7 @@ CAPTION "Malfermu" FONT 8, "MS Shell Dlg" { - LTEXT "SerÃ¦u &en:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY + LTEXT "SerÄu &en:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE

1 0

[rnaumann] 71467: [TASKMGR] Change "Mem Usage" status text. Patch by Tim Crawford. Use the more familiar term "Commit Charge" instead. -Addition: Also apply this for greek and hewbrew CORE-10250
by rnaumann＠svn.reactos.org 31 May '16

31 May '16

Author: rnaumann Date: Tue May 31 10:31:16 2016 New Revision: 71467 URL: http://svn.reactos.org/svn/reactos?rev=71467&view=rev Log: [TASKMGR] Change "Mem Usage" status text. Patch by Tim Crawford. Use the more familiar term "Commit Charge" instead. -Addition: Also apply this for greek and hewbrew CORE-10250 Modified: trunk/reactos/base/applications/taskmgr/lang/el-GR.rc trunk/reactos/base/applications/taskmgr/lang/en-US.rc trunk/reactos/base/applications/taskmgr/lang/he-IL.rc Modified: trunk/reactos/base/applications/taskmgr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/el-GR.rc [iso-8859-1] Tue May 31 10:31:16 2016 @@ -438,7 +438,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%" - IDS_STATUS_MEMUSAGE "Mem Usage: %s / %s (%d%%)" + IDS_STATUS_MEMUSAGE "Commit Charge: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%" IDS_STATUS_PROCESSES "Processes: %d" IDS_NOT_RESPONDING "Not Responding" Modified: trunk/reactos/base/applications/taskmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/en-US.rc [iso-8859-1] Tue May 31 10:31:16 2016 @@ -434,7 +434,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%" - IDS_STATUS_MEMUSAGE "Mem Usage: %s / %s (%d%%)" + IDS_STATUS_MEMUSAGE "Commit Charge: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%" IDS_STATUS_PROCESSES "Processes: %d" IDS_NOT_RESPONDING "Not Responding" Modified: trunk/reactos/base/applications/taskmgr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/he-IL.rc [iso-8859-1] Tue May 31 10:31:16 2016 @@ -438,7 +438,7 @@ IDS_MSG_UNABLECHANGEPRIORITY "Unable to Change Priority" IDS_MSG_WARNINGCHANGEPRIORITY "WARNING: Changing the priority class of this process may\ncause undesired results including system instability. Are you\nsure you want to change the priority class?" IDS_MSG_TRAYICONCPUUSAGE "CPU Usage: %d%%" - IDS_STATUS_MEMUSAGE "Mem Usage: %s / %s (%d%%)" + IDS_STATUS_MEMUSAGE "Commit Charge: %s / %s (%d%%)" IDS_STATUS_CPUUSAGE "CPU Usage: %3d%%" IDS_STATUS_PROCESSES "Processes: %d" IDS_NOT_RESPONDING "Not Responding"

1 0

[rnaumann] 71466: [CALC] Use ShellAbout for the about dialog in Calc. Patch by Jason Wendt. Thank You. - Addition by me: delete about.c as well as ROS_logo.bmp CORE-11346
by rnaumann＠svn.reactos.org 31 May '16

31 May '16

Author: rnaumann Date: Tue May 31 08:04:18 2016 New Revision: 71466 URL: http://svn.reactos.org/svn/reactos?rev=71466&view=rev Log: [CALC] Use ShellAbout for the about dialog in Calc. Patch by Jason Wendt. Thank You. - Addition by me: delete about.c as well as ROS_logo.bmp CORE-11346 Removed: trunk/reactos/base/applications/calc/about.c trunk/reactos/base/applications/calc/res/ROS_logo.bmp Modified: trunk/reactos/base/applications/calc/CMakeLists.txt trunk/reactos/base/applications/calc/calc.h trunk/reactos/base/applications/calc/lang/bg-BG.rc trunk/reactos/base/applications/calc/lang/cs-CZ.rc trunk/reactos/base/applications/calc/lang/de-DE.rc trunk/reactos/base/applications/calc/lang/el-GR.rc trunk/reactos/base/applications/calc/lang/en-US.rc trunk/reactos/base/applications/calc/lang/es-ES.rc trunk/reactos/base/applications/calc/lang/fr-FR.rc trunk/reactos/base/applications/calc/lang/he-IL.rc trunk/reactos/base/applications/calc/lang/hu-HU.rc trunk/reactos/base/applications/calc/lang/it-IT.rc trunk/reactos/base/applications/calc/lang/ja-JP.rc trunk/reactos/base/applications/calc/lang/ko-KR.rc trunk/reactos/base/applications/calc/lang/nl-NL.rc trunk/reactos/base/applications/calc/lang/no-NO.rc trunk/reactos/base/applications/calc/lang/pl-PL.rc trunk/reactos/base/applications/calc/lang/pt-BR.rc trunk/reactos/base/applications/calc/lang/ro-RO.rc trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/calc/lang/sk-SK.rc trunk/reactos/base/applications/calc/lang/sq-AL.rc trunk/reactos/base/applications/calc/lang/sv-SE.rc trunk/reactos/base/applications/calc/lang/th-TH.rc trunk/reactos/base/applications/calc/lang/tr-TR.rc trunk/reactos/base/applications/calc/lang/uk-UA.rc trunk/reactos/base/applications/calc/lang/zh-CN.rc trunk/reactos/base/applications/calc/resource.h trunk/reactos/base/applications/calc/resource.rc trunk/reactos/base/applications/calc/winmain.c Modified: trunk/reactos/base/applications/calc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/CMa… ============================================================================== --- trunk/reactos/base/applications/calc/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/CMakeLists.txt [iso-8859-1] Tue May 31 08:04:18 2016 @@ -2,7 +2,6 @@ add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1) list(APPEND SOURCE - about.c convert.c function.c rpn.c @@ -14,7 +13,7 @@ add_rc_deps(resource.rc ${calc_rc_deps}) add_executable(calc ${SOURCE} resource.rc) set_module_type(calc win32gui UNICODE) -add_importlibs(calc advapi32 user32 gdi32 msvcrt kernel32) +add_importlibs(calc advapi32 user32 shell32 gdi32 msvcrt kernel32) if(CMAKE_C_COMPILER_ID STREQUAL "Clang") target_link_libraries(calc mingwex) Removed: trunk/reactos/base/applications/calc/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/abo… ============================================================================== --- trunk/reactos/base/applications/calc/about.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/about.c (removed) @@ -1,33 +0,0 @@ -#include "calc.h" - -#define MAX_LICENSE_SIZE 1000 // it's enought! - -INT_PTR CALLBACK AboutDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) -{ - TCHAR *license; - - switch (msg) { - case WM_INITDIALOG: - license = (TCHAR *)alloca(MAX_LICENSE_SIZE*sizeof(TCHAR)); - if (LoadString(calc.hInstance, IDS_STRING_LICENSE, license, MAX_LICENSE_SIZE)) - SendDlgItemMessage(hWnd, IDC_EDIT_LICENSE, WM_SETTEXT, 0, (LPARAM)license); - /* Update software version */ - SendDlgItemMessage(hWnd, IDC_TEXT_VERSION, WM_GETTEXT, (WPARAM)MAX_LICENSE_SIZE, (LPARAM)license); - _tcscat(license, CALC_VERSION); - SendDlgItemMessage(hWnd, IDC_TEXT_VERSION, WM_SETTEXT, 0, (LPARAM)license); - return TRUE; - case WM_COMMAND: - switch (LOWORD(wp)) { - case IDOK: - EndDialog(hWnd, 0); - return TRUE; - } - break; - - case WM_CLOSE: - EndDialog(hWnd, 0); - return 0; - } - return FALSE; -} - Modified: trunk/reactos/base/applications/calc/calc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/cal… ============================================================================== --- trunk/reactos/base/applications/calc/calc.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/calc.h [iso-8859-1] Tue May 31 08:04:18 2016 @@ -40,8 +40,6 @@ #ifndef IDC_STATIC #define IDC_STATIC ((DWORD)-1) #endif - -#define CALC_VERSION TEXT("1.11") #define MAX_CALC_SIZE 256 Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/bg-BG.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -296,22 +296,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ÐÐ° ReactOS Calc" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "ÐÐ¾Ð±ÑÐµ", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "ÐÐ·ÑÐ¸ÑÐ»Ð¸ÑÐµÐ»ÑÑ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "ÐÐµÑÑÐ¸Ñ:", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "ÐÐ°Ð¿Ð¸ÑÐ°Ð½Ð¾ Ð¾Ñ Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ð¡ÑÐ°ÑÐ¸ÑÑÐ¸ÑÐµÑÐºÐ° ÐºÑÑÐ¸Ñ" @@ -419,9 +403,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL license.\r\n\r\nYou can get a copy of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "ÐÑÐµÑÐºÐ°" IDS_QUICKHELP "ÐÑÑÐ·Ð° Ð¿Ð¾Ð¼Ð¾Ñ" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "ÐÐ·ÑÐ¸ÑÐ»Ð¸ÑÐµÐ»ÑÑ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡" + IDS_AUTHOR "ÐÐ°Ð¿Ð¸ÑÐ°Ð½Ð¾ Ð¾Ñ Carlo Bramini" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -295,22 +295,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "O ReactOS KalkulaÄce" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "ReactOS KalkulaÄka", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "Verze ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "Autor: Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "StatistickÃ© vÃ½poÄty" @@ -418,9 +402,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "ReactOS kalkulaÄka je svobodnÃ½ software vydanÃ½ pod licencÃ GNU GPL.\r\n\r\nZde najdete znÄnÃ GNU GPL licence:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nZde takÃ© najdete pÅeklad GNU GPL licence:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "Chyba" IDS_QUICKHELP "RychlÃ¡ nÃ¡povÄda" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "ReactOS KalkulaÄka" + IDS_AUTHOR "Autor: Carlo Bramini" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -290,22 +290,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ãber ReactOS Rechner" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "ReactOS Rechner", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "Version ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "Geschrieben von Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistikbox" @@ -413,9 +397,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "ReactOS Rechner ist freie Software, herausgegeben unter der GNU GPL Lizenz.\r\n\r\nSie kÃ¶nnen hier eine Kopie der GNU GPL Lizenz erhalten:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nSie kÃ¶nnen hier auch eine Ãbersetzung der GNU GPL Lizenz erhalten:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "Fehler" IDS_QUICKHELP "Schnellhilfe" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "ReactOS Rechner" + IDS_AUTHOR "Geschrieben von Carlo Bramini" END /* Konversionstypen */ Modified: trunk/reactos/base/applications/calc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/el-GR.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -290,22 +290,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Î£ÏÎµÏÎ¹ÎºÎ¬..." -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "ÎÏÎ¹Î¸Î¼Î¿Î¼Î·ÏÎ±Î½Î®", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "ÎÎºÎ´Î¿ÏÎ· ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "ÎÏÏ ÏÎ¿Î½ Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistics box" @@ -413,9 +397,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL license.\r\n\r\nYou can get a copy of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "Î£ÏÎ¬Î»Î¼Î±" IDS_QUICKHELP "Quick help" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "ÎÏÎ¹Î¸Î¼Î¿Î¼Î·ÏÎ±Î½Î®" + IDS_AUTHOR "ÎÏÏ ÏÎ¿Î½ Carlo Bramini" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -290,22 +290,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "About ReactOS Calc" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "ReactOS Calculator", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "Version ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "Written by Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistics box" @@ -413,9 +397,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL license.\r\n\r\nYou can get a copy of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "Error" IDS_QUICKHELP "Quick help" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "ReactOS Calculator" + IDS_AUTHOR "Written by Carlo Bramini" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/es-ES.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -296,22 +296,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Acerca de la Calculadora de ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "Aceptar", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "Calculadora de ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "VersiÃ³n ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "Creada por Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Cuadro de estadÃsticas" @@ -419,16 +403,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "La Calculadora de ReactOS es software libre realizado bajo licencia GNU GPL.\r\n\ - \r\n\ - Puedes obtener una copia de la licencia GNU GPL aquÃ:\r\n\ - http://www.gnu.org/licenses/gpl.html\r\n\ - \r\n\ - TambiÃ©n puedes obtener una traducciÃ³n de la licencia GNU GPL aquÃ:\r\n\ - http://www.gnu.org/licenses/translations.html" - IDS_MATH_ERROR "Error" IDS_QUICKHELP "Ayuda rÃ¡pida" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "Calculadora de ReactOS" + IDS_AUTHOR "Creada por Carlo Bramini" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/fr-FR.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -290,22 +290,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ã propos de la Calculatrice ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "Calculatrice ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "Version ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "par Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistiques" @@ -413,9 +397,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "Calculatrice ReactOS est un logiciel libre distribuÃ© sous licence GNU GPL.\r\n\r\nVous pouvez obtenir une copie de la licence GNU GPL ici:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nVous pouvez aussi obtenir une traduction de la licence GNU GPL ici:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "Erreur" IDS_QUICKHELP "Aide rapide" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "Calculatrice ReactOS" + IDS_AUTHOR "par Carlo Bramini" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/he-IL.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -292,22 +292,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "×××××ª ××××©××× ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "×××©××¨", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "×××©××× ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "×××¨×¡× ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "× ××ª×× ×¢× ××× Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "×ª×××ª ×¡××××¡×××§×" @@ -415,9 +399,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL license.\r\n\r\nYou can get a copy of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "×©××××" IDS_QUICKHELP "×¢××¨× ××××¨×" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "×××©××× ReactOS" + IDS_AUTHOR "× ××ª×× ×¢× ××× Carlo Bramini" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/hu-HU.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -298,22 +298,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "A ReactOS SzÃ¡molÃ³gÃ©prÅl" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "ReactOS SzÃ¡molÃ³gÃ©p", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "VerziÃ³ ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "Ãrta Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statisztika" @@ -421,9 +405,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "A ReactOS SzÃ¡molÃ³gÃ©p a GNU GPL licenc alatt kiadott szabad szoftver.\r\n\r\nA GNU GPL licenc egy mÃ¡solatÃ¡t innen szerezheted be:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nValamint a GNU GPL licenc fordÃtÃ¡sÃ¡t innen szerezheted be:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "Hiba" IDS_QUICKHELP "Gyors sÃºgÃ³" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "ReactOS SzÃ¡molÃ³gÃ©p" + IDS_AUTHOR "Ãrta Carlo Bramini" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -290,22 +290,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Informazioni su ReactOS Calc" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "Calcolatrice ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "Versione ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "Scritto da Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Finestra di statistica" @@ -413,9 +397,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "ReactOS Calc e` software libero rilasciato sotto licenza GNU GPL.\r\n\r\nE` possibile ottenere una copia del testo della licenza GNU GPL all'indirizzo:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nE` possibile ottenere una traduzione del testo della licenza GNU GPL all'indirizzo:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "Errore" IDS_QUICKHELP "Guida rapida" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "Calcolatrice ReactOS" + IDS_AUTHOR "Scritto da Carlo Bramini" END /* Categorie per le conversioni */ Modified: trunk/reactos/base/applications/calc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ja-JP.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -290,22 +290,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS é»åã«ã¤ãã¦" -FONT 9, "MS UI Gothic" -BEGIN - DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "ReactOS é»å", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "Version ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "Written by Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistics box" @@ -413,9 +397,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "ReactOS é»åã¯GNU GPLã©ã¤ã»ã³ã¹ã®åã§æä¾ãããããªã¼ã½ããã¦ã§ã¢ã§ãã\r\n\r\nãã¡ãã§GNU GPLã©ã¤ã»ã³ã¹ã®ã³ãã¼ãå¾ããã¨ãã§ãã¾ã:\r\nhttp://www… GPLã©ã¤ã»ã³ã¹ã®ç¿»è¨³ãå¾ããã¨ãã§ãã¾ã:\r\nhttp://www.gn…" IDS_MATH_ERROR "ã¨ã©ã¼" IDS_QUICKHELP "ã¯ã¤ãã¯ãã«ã" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "ReactOS é»å" + IDS_AUTHOR "Written by Carlo Bramini" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -292,22 +292,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS ê³ì°ê¸° ì ë³´" -FONT 9, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "ReactOS ê³ì°ê¸°", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "ë²ì ¼ ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "Carlo Braminiì ìí´ ì°ì¬ì§", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistics box" @@ -415,9 +399,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL license.\r\n\r\nYou can get a copy of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "ìë¬" IDS_QUICKHELP "ë¹ ë¥¸ ëìë§" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "ReactOS ê³ì°ê¸°" + IDS_AUTHOR "Carlo Braminiì ìí´ ì°ì¬ì§" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -290,22 +290,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Over ReactOS Rekenmachine" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "ReactOS Rekenmachine", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "Versie", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "Geschreven door: Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistiek-venster" @@ -413,9 +397,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "De ReactOS Rekenmachine is free software gepubliceerd onder de GNU GPL licentie.\r\n\r\nU kan een kopie van GNU GPL licentie hier bezichtigen:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nU kan ook een vertaling van de GNU GPL licentie hier bezichtigen:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "Fout" IDS_QUICKHELP "Snelle hulp" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "ReactOS Rekenmachine" + IDS_AUTHOR "Geschreven door: Carlo Bramini" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -290,22 +290,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Om ReactOS Kalkulator" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "ReactOS Kalkulator", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "Versjon ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "Laget av Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "statistikk boks" @@ -413,9 +397,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "ReactOS Kalkulator er gratis programvare utgitt under GNU GPL lisensen.\r\n\r\nDu kan fÃ¥ en kopi av GNU GPL lisensen her:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDu kan ogsÃ¥ fÃ¥ en oversettelse av GNU GPL lisensen her:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "Feil" IDS_QUICKHELP "Rask hjelp" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "ReactOS Kalkulator" + IDS_AUTHOR "Laget av Carlo Bramini" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -299,22 +299,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "O Kalkulatorze ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "Kalkulator ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "Wersja ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "Autorstwa: Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statystyka" @@ -422,9 +406,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "Kalkulator ReactOS jest darmowym programem, publikowanym zgodnie z licencjÄ GNU GPL.\r\n\r\nMoÅ¼esz otrzymaÄ kopiÄ licencji GNU GPL tutaj:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nTÅumaczenie licencji GNU GPL znajdziesz tutaj:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "BÅÄd" IDS_QUICKHELP "Szybka pomoc" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "Kalkulator ReactOS" + IDS_AUTHOR "Autorstwa: Carlo Bramini" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/pt-BR.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -292,22 +292,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Sobre Calc ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "Calcuadora ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "VersÃ£o ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "Escrita por Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Caixa de estatÃsticas" @@ -415,9 +399,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "Calculadora ReactOS Ã© um software livre lanÃ§ado sobre a licenÃ§a GNU GPL.\r\nVocÃª pode adquirir uma cÃ³pia da licenÃ§a GNU GPL no endereÃ§o abaixo:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nVocÃª tambÃ©m pode adquirir uma traduÃ§Ã£o da licenÃ§a GNU GPL no endereÃ§o abaixo:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "Erro" IDS_QUICKHELP "Ajuda rÃ¡pida" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "Calcuadora ReactOS" + IDS_AUTHOR "Escrita por Carlo Bramini" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ro-RO.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -295,22 +295,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Despre Minicalculator" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "Ã&nchide", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "Minicalculator ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "Versiune ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "Scris de Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistici" @@ -418,9 +402,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "AceastÄ aplicaÈie este publicÄ; fiind permisÄ modificarea Èi/sau (re)distribuÈia sa Ã®n termenii LicenÈei Publice Generale GNU publicatÄ de Free Software Foundation; sau versiunea 2 a LicenÈei, sau (la alegere) a oricÄrei versiuni ulterioare.\r\n\r\nAceastÄ aplicaÈie este distribuitÄ doar Ã®n speranÈa de a fi utilÄ, FÄRÄ Ã®nsÄ NICI O GARANÈIE; nici mÄcar cu garanÈia implicitÄ a VANDABILITÄÈII sau a UTILITÄÈII ÃNTR-UN SCOP ANUME. Pentru mai multe detalii consultaÈi LicenÈa PublicÄ GeneralÄ GNU.\r\n\r\nPuteÈi vedea aceastÄ licenÈÄ aici:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDe asemenea puteÈi consulta traduceri neoficiale ale acestei licenÈe aici:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "Eroare" IDS_QUICKHELP "Manual" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "Minicalculator ReactOS" + IDS_AUTHOR "Scris de Carlo Bramini" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -290,22 +290,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "ÐÐ°Ð»ÑÐºÑÐ»ÑÑÐ¾Ñ ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "ÐÐµÑÑÐ¸Ñ ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "ÐÐ²ÑÐ¾Ñ: ÐÐ°ÑÐ»Ð¾ ÐÑÐ°Ð¼Ð¸Ð½Ð¸", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ð¡ÑÐ°ÑÐ¸ÑÑÐ¸ÐºÐ°" @@ -413,9 +397,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "ÐÐ°Ð»ÑÐºÑÐ»ÑÑÐ¾Ñ ReactOS - ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ðµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð½Ð¾Ðµ Ð¾Ð±ÐµÑÐ¿ÐµÑÐµÐ½Ð¸Ðµ, ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÑÑÐµÐµÑÑ Ð¿Ð¾ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ð¸ GNU GPL.\r\n\r\nÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑ ÐºÐ¾Ð¿Ð¸Ñ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ð¸ GNU GPL Ð·Ð´ÐµÑÑ:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nÐÐ·Ð½Ð°ÐºÐ¾Ð¼Ð¸… c Ð¿ÐµÑÐµÐ²Ð¾Ð´Ð¾Ð¼ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ð¸ GNU GPL Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð´ÐµÑÑ:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "ÐÑÐ¸Ð±ÐºÐ°" IDS_QUICKHELP "ÐÑÑÑÑÐ°Ñ ÑÐ¿ÑÐ°Ð²ÐºÐ°" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "ÐÐ°Ð»ÑÐºÑÐ»ÑÑÐ¾Ñ ReactOS" + IDS_AUTHOR "ÐÐ²ÑÐ¾Ñ: ÐÐ°ÑÐ»Ð¾ ÐÑÐ°Ð¼Ð¸Ð½Ð¸" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -297,22 +297,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Äo je kalkulaÄka systÃ©mu ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "KalkulaÄka systÃ©mu ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "Verzia ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "NapÃsal Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Å tatistika" @@ -420,9 +404,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "KalkulaÄka systÃ©mu ReactOS je voÄ¾nÃ½ softvÃ©r vydanÃ½ pod licenciou GNU GPL.\r\n\r\nKÃ³piu licencie GNU GPL mÃ´Å¾ete zÃskaÅ¥ tu:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nRovnako mÃ´Å¾ete zÃskaÅ¥ preklad licencie GNU GPL tu:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "Chyba" IDS_QUICKHELP "RÃ½chla pomoc" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "KalkulaÄka systÃ©mu ReactOS" + IDS_AUTHOR "NapÃsal Carlo Bramini" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sq-AL.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -294,22 +294,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Informacione mbi Makine Llogaritje ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "ReactOS Makine Llogaritje", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "Versioni ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "krijuar nga Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Kutia e Statistikave" @@ -417,9 +401,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "Makina Llogaritese ReactOS eshte program falas i lanquar nen liÃ§ensen GNU GPL.\r\n\r\nJu mund te merrni nje kopje te liÃ§enses se GNU CPL ketu:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nJu gjithashtu mund te merrni e liÃ§enses se GNU GPL ketu:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "Error" IDS_QUICKHELP "NdihmÃ« e shpejtÃ«" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "ReactOS Makine Llogaritje" + IDS_AUTHOR "krijuar nga Carlo Bramini" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sv-SE.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -297,22 +297,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Om ReactOS Kalkylator" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "ReactOS Kalkylator", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "Version ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "Skriven av Carlo Bramini, Ãvers.: Jaix Bly", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Statistik box" @@ -420,9 +404,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "ReactOS Kalkylator Ã¤r gratis programvara utgivet under GNU GPL licensen.\r\n\r\nDu kan fÃ¥ en kopia av GNU GPL licensen hÃ¤r:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDu kan ocksÃ¥ fÃ¥ en Ã¶versÃ¤ttning av GNU GPL lisensen hÃ¤r:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "Fel" IDS_QUICKHELP "Snabb hjÃ¤lp" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "ReactOS Kalkylator" + IDS_AUTHOR "Skriven av Carlo Bramini" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -290,22 +290,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "à¹à¸à¸µà¹à¸¢à¸§à¸à¸±à¸ ReactOS Calc" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "à¸à¸à¸¥à¸", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "à¹à¸à¸£à¸·à¹à¸à¸à¸à¸´à¸à¹à¸¥à¸ ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "à¸£à¸¸à¹à¸ ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "Written by Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "à¸à¸¥à¹à¸à¸à¸ªà¸à¸²à¸à¸°" @@ -413,9 +397,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "ReactOS Calc is free software released under GNU GPL license.\r\n\r\nYou can get a copy of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nYou can also get a translation of GNU GPL license here:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "à¸à¸´à¸à¸à¸¥à¸²à¸" IDS_QUICKHELP "à¸ªà¸´à¹à¸à¸à¸µà¹à¸à¸·à¸à¸à¸°à¹à¸£ ?" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "à¹à¸à¸£à¸·à¹à¸à¸à¸à¸´à¸à¹à¸¥à¸ ReactOS" + IDS_AUTHOR "Written by Carlo Bramini" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/tr-TR.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -292,22 +292,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Hesap Makinesi Ãzerine" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "Tamam", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "Hesap Makinesi", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "SÃ¼rÃ¼m: ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "Carlo Bramini eliyle yapÄ±lmÄ±ÅtÄ±r.", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "SayÄ±mlama Penceresi" @@ -415,9 +399,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "Hesap Makinesi, GNU GPL ruhsatÄ±yla yayÄ±mlanan bir Ã¶zgÃ¼r yazÄ±lÄ±mdÄ±r.\r\n\r\nGNU GPL ruhsatÄ±nÄ±n bir kopyasÄ±nÄ± Åuradan elde edebilirsiniz:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nBir de GNU GPL ruhsatÄ±nÄ±n bir Ã§evirisini Åuradan elde edebilirsiniz:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "YanlÄ±ÅlÄ±k" IDS_QUICKHELP "HÄ±zlÄ± YardÄ±m" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "Hesap Makinesi" + IDS_AUTHOR "Carlo Bramini eliyle yapÄ±lmÄ±ÅtÄ±r." END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -298,22 +298,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ÐÑÐ¾ ÐÐ°Ð»ÑÐºÑÐ»ÑÑÐ¾Ñ ReactOS" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "ÐÐ°Ð»ÑÐºÑÐ»ÑÑÐ¾Ñ ReactOS", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "ÐÐµÑÑÑÑ ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "ÐÐ°Ð¿Ð¸ÑÐ°Ð² ÐÐ°ÑÐ»Ð¾ ÐÑÐ°Ð¼ÑÐ½Ñ", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ð¡ÑÐ°ÑÐ¸ÑÑÐ¸ÐºÐ°" @@ -421,9 +405,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "ÐÐ°Ð»ÑÐºÑÐ»ÑÑÐ¾Ñ ReactOS - Ð²ÑÐ»ÑÐ½Ðµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ðµ Ð·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐ½Ð½Ñ, Ð²Ð¸Ð¿ÑÑÐµÐ½Ðµ Ð·Ð° Ð»ÑÑÐµÐ½Ð·ÑÑÑ GNU GPL.\r\n\r\nÐÐ¸ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¾ÑÑÐ¸Ð¼Ð°ÑÐ¸ ÐºÐ¾Ð¿ÑÑ Ð»ÑÑÐµÐ½Ð·ÑÑ GNU GPL ÑÑÑ:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nÐÐ¸ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐ°ÐºÐ¾Ð¶ Ð¾ÑÑÐ¸Ð¼Ð°ÑÐ¸ Ð¿ÐµÑÐµÐºÐ»Ð°Ð´ Ð»ÑÑÐµÐ½Ð·ÑÑ GNU GPL ÑÑÑ:\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°" IDS_QUICKHELP "Ð¨Ð²Ð¸Ð´ÐºÐ° Ð´Ð¾Ð²ÑÐ´ÐºÐ°" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "ÐÐ°Ð»ÑÐºÑÐ»ÑÑÐ¾Ñ ReactOS" + IDS_AUTHOR "ÐÐ°Ð¿Ð¸ÑÐ°Ð² ÐÐ°ÑÐ»Ð¾ ÐÑÐ°Ð¼ÑÐ½Ñ" END /* Types of conversion */ Modified: trunk/reactos/base/applications/calc/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/zh-CN.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -292,22 +292,6 @@ DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE END -IDD_DIALOG_ABOUT DIALOGEX 0, 0, 264, 169 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "å³äº ReactOS è®¡ç®å¨" -FONT 9, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "ç¡®å®", IDOK, 105, 148, 52, 16 - CONTROL IDB_BITMAP_ROS, IDC_STATIC, "Static", SS_BITMAP | SS_CENTERIMAGE | - SS_REALSIZEIMAGE | WS_BORDER, 4, 4, 104, 48 - LTEXT "ReactOS è®¡ç®å¨", IDC_STATIC, 120, 12, 132, 8, SS_CENTERIMAGE - LTEXT "çæ¬ ", IDC_TEXT_VERSION, 120, 20, 132, 8, SS_CENTERIMAGE - LTEXT "ä½è Carlo Bramini", IDC_STATIC, 120, 32, 132, 8, SS_CENTERIMAGE - GROUPBOX "", IDC_STATIC, 112, 0, 148, 52 - GROUPBOX "", IDC_STATIC, 5, 56, 256, 88 - EDITTEXT IDC_EDIT_LICENSE, 12, 68, 240, 68, ES_MULTILINE | ES_READONLY | WS_VSCROLL -END - IDD_DIALOG_STAT DIALOGEX 0, 0, 163, 85 STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ç»è®¡æ¡" @@ -415,9 +399,15 @@ STRINGTABLE BEGIN - IDS_STRING_LICENSE "ReactOS è®¡ç®å¨æ¯å¨ GNU GPL åè®®ä¸åè¡çèªç±è½¯ä»¶ã\r\n\r\nä½ å¯ä»¥ä»è¿å¿åå¾ä¸ä»½ GNU GPL åè®®çå¯æ¬ï¼\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nä½ ä¹å¯ä»¥ä»è¿å¿åå¾å¶ç¿»è¯ï¼\r\nhttp://www.gnu.org/licenses/translations.html" IDS_MATH_ERROR "éè¯¯" IDS_QUICKHELP "å¿«éå¸®å©" +END + +/* About */ +STRINGTABLE +BEGIN + IDS_CALC_NAME "ReactOS è®¡ç®å¨" + IDS_AUTHOR "ä½è Carlo Bramini" END /* Types of conversion */ Removed: trunk/reactos/base/applications/calc/res/ROS_logo.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== Binary file - no diff available. Modified: trunk/reactos/base/applications/calc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== --- trunk/reactos/base/applications/calc/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.h [iso-8859-1] Tue May 31 08:04:18 2016 @@ -1,17 +1,16 @@ #pragma once -#define IDS_STRING_LICENSE 1 +#define IDS_CALC_NAME 1 #define IDS_MATH_ERROR 2 #define IDS_QUICKHELP 3 +#define IDS_AUTHOR 4 #define IDD_DIALOG_SCIENTIFIC 101 #define IDD_DIALOG_STANDARD 102 -#define IDD_DIALOG_ABOUT 103 #define IDD_DIALOG_STAT 104 #define IDD_DIALOG_CONVERSION 105 #define IDR_MENU_SCIENTIFIC_1 106 #define IDR_MENU_SCIENTIFIC_2 107 #define IDR_MENU_STANDARD 108 -#define IDB_BITMAP_ROS 109 #define IDI_CALC_BIG 110 #define IDI_CALC_SMALL 111 #define IDC_RADIO_HEX 1002 @@ -88,7 +87,6 @@ #define IDC_TEXT_OUTPUT 1074 #define IDC_TEXT_PARENT 1075 #define IDC_TEXT_MEMORY 1076 -#define IDC_EDIT_LICENSE 1078 #define IDC_LIST_STAT 1079 #define IDC_BUTTON_RET 1080 #define IDC_BUTTON_LOAD 1081 @@ -98,7 +96,6 @@ #define IDC_BUTTON_SQRT 1085 #define IDC_BUTTON_PERCENT 1086 #define IDC_BUTTON_CONVERT 1087 -#define IDC_TEXT_VERSION 1088 #define IDC_BUTTON_FOCUS 1089 #define IDC_COMBO_CATEGORY 1090 #define IDC_COMBO_FROM 1091 Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== --- trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] Tue May 31 08:04:18 2016 @@ -21,9 +21,6 @@ /* Icons */ IDI_CALC_BIG ICON "res/calc.ico" IDI_CALC_SMALL ICON "res/calc_sm.ico" - -/* Bitmaps */ -IDB_BITMAP_ROS BITMAP "res/ROS_logo.bmp" #include <reactos/manifest_exe.rc> Modified: trunk/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] Tue May 31 08:04:18 2016 @@ -3,6 +3,7 @@ #include <winbase.h> #include <wingdi.h> #include <winreg.h> +#include <shellapi.h> #define HTMLHELP_PATH(_pt) TEXT("%systemroot%\\Help\\calc.chm::") TEXT(_pt) @@ -1338,8 +1339,14 @@ SetFocus(GetDlgItem(hWnd, IDC_BUTTON_FOCUS)); switch (LOWORD(wp)) { case IDM_HELP_ABOUT: - DialogBox(calc.hInstance,MAKEINTRESOURCE(IDD_DIALOG_ABOUT), hWnd, AboutDlgProc); - return TRUE; + { + TCHAR infotitle[100]; + TCHAR infotext[200]; + LoadString(calc.hInstance, IDS_CALC_NAME, infotitle, SIZEOF(infotitle)); + LoadString(calc.hInstance, IDS_AUTHOR, infotext, SIZEOF(infotext)); + ShellAbout(hWnd, infotitle, infotext, (HICON)LoadIcon(calc.hInstance, MAKEINTRESOURCE(IDI_CALC_BIG))); + return TRUE; + } case IDM_HELP_HELP: #ifndef DISABLE_HTMLHELP_SUPPORT HtmlHelp(hWnd, HTMLHELP_PATH("/general_information.htm"), HH_DISPLAY_TOPIC, (DWORD_PTR)NULL);

1 0

[gadamopoulos] 71465: [BROWSEUI] - Implement most methods of IBandSite for CBaseBarSite. - Part of the work submitted by Sylvain Deverre. CORE-8814 and CORE-10838
by gadamopoulos＠svn.reactos.org 30 May '16

30 May '16

Author: gadamopoulos Date: Mon May 30 22:38:36 2016 New Revision: 71465 URL: http://svn.reactos.org/svn/reactos?rev=71465&view=rev Log: [BROWSEUI] - Implement most methods of IBandSite for CBaseBarSite. - Part of the work submitted by Sylvain Deverre. CORE-8814 and CORE-10838 Modified: trunk/reactos/dll/win32/browseui/basebarsite.cpp Modified: trunk/reactos/dll/win32/browseui/basebarsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/basebar… ============================================================================== --- trunk/reactos/dll/win32/browseui/basebarsite.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/basebarsite.cpp [iso-8859-1] Mon May 30 22:38:36 2016 @@ -128,6 +128,12 @@ // message handlers LRESULT OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + // Helper functions + HRESULT FindBandByGUID(REFIID pGuid, DWORD *pdwBandID); + HRESULT ShowBand(DWORD dwBandID); + HRESULT GetInternalBandInfo(UINT uBand, REBARBANDINFO *pBandInfo); + HRESULT GetInternalBandInfo(UINT uBand, REBARBANDINFO *pBandInfo, DWORD fMask); + BEGIN_MSG_MAP(CBaseBarSite) MESSAGE_HANDLER(WM_NOTIFY, OnNotify) END_MSG_MAP() @@ -165,12 +171,12 @@ CComPtr<IObjectWithSite> site; CComPtr<IOleWindow> oleWindow; CComPtr<IDeskBand> deskBand; - CComPtr<IDockingWindow> dockingWindow; CBarInfo *newInfo; REBARBANDINFOW bandInfo; DESKBANDINFO deskBandInfo; DWORD thisBandID; HRESULT hResult; + CLSID tmp; hResult = newBar->QueryInterface(IID_PPV_ARG(IPersist, &persist)); if (FAILED_UNEXPECTEDLY(hResult)) @@ -184,12 +190,22 @@ hResult = newBar->QueryInterface(IID_PPV_ARG(IDeskBand, &deskBand)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - hResult = newBar->QueryInterface(IID_PPV_ARG(IDockingWindow, &dockingWindow)); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; + + // Check if the GUID already exists + hResult = persist->GetClassID(&tmp); + if (!SUCCEEDED(hResult)) + { + return E_INVALIDARG; + } + if (FindBandByGUID(tmp, &thisBandID) == S_OK) + { + return ShowBand(thisBandID); + } + hResult = site->SetSite(static_cast<IOleWindow *>(this)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; + ATLTRY(newInfo = new CBarInfo); if (newInfo == NULL) return E_OUTOFMEMORY; @@ -198,23 +214,26 @@ thisBandID = fNextBandID++; newInfo->fTheBar = newBar; newInfo->fBandID = thisBandID; - hResult = persist->GetClassID(&newInfo->fBarClass); + newInfo->fBarClass = tmp; // get band info - deskBandInfo.dwMask = DBIM_MINSIZE | DBIM_ACTUAL | DBIM_TITLE; + deskBandInfo.dwMask = DBIM_MINSIZE | DBIM_ACTUAL | DBIM_TITLE | DBIM_BKCOLOR; deskBandInfo.wszTitle[0] = 0; - hResult = deskBand->GetBandInfo(0, 0, &deskBandInfo); + hResult = deskBand->GetBandInfo(0, (fVertical) ? DBIF_VIEWMODE_VERTICAL : DBIF_VIEWMODE_NORMAL, &deskBandInfo); // insert band memset(&bandInfo, 0, sizeof(bandInfo)); bandInfo.cbSize = sizeof(bandInfo); bandInfo.fMask = RBBIM_STYLE | RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_IDEALSIZE | RBBIM_TEXT | RBBIM_LPARAM | RBBIM_ID; - bandInfo.fStyle = RBBS_NOGRIPPER | RBBS_VARIABLEHEIGHT; + bandInfo.fStyle = RBBS_TOPALIGN | RBBS_VARIABLEHEIGHT | RBBS_NOGRIPPER; bandInfo.lpText = deskBandInfo.wszTitle; hResult = oleWindow->GetWindow(&bandInfo.hwndChild); + /* It seems Windows XP doesn't take account of band minsize */ +#if 0 bandInfo.cxMinChild = 200; //deskBandInfo.ptMinSize.x; bandInfo.cyMinChild = 200; //deskBandInfo.ptMinSize.y; +#endif bandInfo.cx = 0; bandInfo.wID = thisBandID; bandInfo.cyChild = -1; //deskBandInfo.ptActual.y; @@ -223,15 +242,10 @@ bandInfo.cxIdeal = 0; //deskBandInfo.ptActual.x; bandInfo.lParam = reinterpret_cast<LPARAM>(newInfo); SendMessage(RB_INSERTBANDW, -1, reinterpret_cast<LPARAM>(&bandInfo)); - - // this call is what makes the tree fill with contents - hResult = dockingWindow->ShowDW(TRUE); - if (FAILED_UNEXPECTEDLY(hResult)) - return hResult; - // for now - fCurrentActiveBar = newInfo; - return S_OK; -} + hResult = ShowBand(newInfo->fBandID); + //fCurrentActiveBar = newInfo; + return hResult; + } HRESULT STDMETHODCALLTYPE CBaseBarSite::GetWindow(HWND *lphwnd) { @@ -299,7 +313,6 @@ CComPtr<IDeskBar> deskBar; CComPtr<IWinEventHandler> winEventHandler; NMHDR *notifyHeader; - RECT newBounds; HRESULT hResult; hResult = S_OK; @@ -308,9 +321,13 @@ notifyHeader = (NMHDR *)lParam; if (notifyHeader->hwndFrom == m_hWnd && notifyHeader->code == RBN_AUTOSIZE) { + // For now, don't notify basebar we tried to resize ourselves, we don't + // get correct values at the moment. +#if 0 hResult = fDeskBarSite->QueryInterface(IID_PPV_ARG(IDeskBar, &deskBar)); GetClientRect(&newBounds); hResult = deskBar->OnPosRectChangeDB(&newBounds); +#endif } } if (fCurrentActiveBar != NULL) @@ -338,10 +355,23 @@ { CComPtr<IOleWindow> oleWindow; HWND ownerWindow; - HRESULT hResult; - + HRESULT hResult; + DWORD dwBandID; + if (punkSite == NULL) - fDeskBarSite.Release(); + { + + TRACE("Destroying site \n"); + /* Cleanup our bands */ + while(SUCCEEDED(EnumBands(-1, &dwBandID)) && dwBandID) + { + hResult = EnumBands(0, &dwBandID); + if(FAILED_UNEXPECTEDLY(hResult)) + continue; + RemoveBand(dwBandID); + } + fDeskBarSite = NULL; + } else { hResult = punkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &oleWindow)); @@ -353,11 +383,20 @@ hResult = oleWindow->GetWindow(&ownerWindow); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - m_hWnd = CreateWindow(REBARCLASSNAMEW, NULL, WS_VISIBLE | WS_CHILDWINDOW | WS_CLIPSIBLINGS | - WS_CLIPCHILDREN | - RBS_VARHEIGHT | RBS_REGISTERDROP | RBS_AUTOSIZE | RBS_VERTICALGRIPPER | RBS_DBLCLKTOGGLE | - CCS_LEFT | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NORESIZE, 0, 0, 0, 0, ownerWindow, NULL, + + DWORD dwStyle = WS_VISIBLE | WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_BORDER | + RBS_VARHEIGHT | RBS_REGISTERDROP | RBS_AUTOSIZE | RBS_VERTICALGRIPPER | RBS_DBLCLKTOGGLE | + CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NORESIZE; + if (fVertical) + dwStyle |= CCS_VERT; + + /* Create site window */ + HWND tmp = CreateWindowW(REBARCLASSNAMEW, NULL, dwStyle, 0, 0, 0, 0, ownerWindow, NULL, _AtlBaseModule.GetModuleInstance(), NULL); + + /* Give window management to ATL */ + SubclassWindow(tmp); + SendMessage(RB_SETTEXTCOLOR, 0, CLR_DEFAULT); SendMessage(RB_SETBKCOLOR, 0, CLR_DEFAULT); } @@ -392,6 +431,8 @@ { switch (nCmdID) { + case 0: + //update band info ? case 1: // insert a new band if (V_VT(pvaIn) != VT_UNKNOWN) return E_INVALIDARG; @@ -401,6 +442,33 @@ return E_FAIL; } +HRESULT CBaseBarSite::GetInternalBandInfo(UINT uBand, REBARBANDINFO *pBandInfo) +{ + if (!pBandInfo) + return E_INVALIDARG; + memset(pBandInfo, 0, sizeof(REBARBANDINFO)); + pBandInfo->cbSize = sizeof(REBARBANDINFO); + pBandInfo->fMask = RBBIM_LPARAM | RBBIM_ID; + + // Grab our bandinfo from rebar control + if (!SendMessage(RB_GETBANDINFO, uBand, reinterpret_cast<LPARAM>(pBandInfo))) + return E_INVALIDARG; + return S_OK; +} + +HRESULT CBaseBarSite::GetInternalBandInfo(UINT uBand, REBARBANDINFO *pBandInfo, DWORD fMask) +{ + if (!pBandInfo) + return E_INVALIDARG; + pBandInfo->cbSize = sizeof(REBARBANDINFO); + pBandInfo->fMask = fMask; + + // Grab our bandinfo from rebar control + if (!SendMessage(RB_GETBANDINFO, uBand, reinterpret_cast<LPARAM>(pBandInfo))) + return E_INVALIDARG; + return S_OK; +} + HRESULT STDMETHODCALLTYPE CBaseBarSite::AddBand(IUnknown *punk) { return InsertBar(punk); @@ -408,12 +476,19 @@ HRESULT STDMETHODCALLTYPE CBaseBarSite::EnumBands(UINT uBand, DWORD *pdwBandID) { + REBARBANDINFO bandInfo; + + if (pdwBandID == NULL) + return E_INVALIDARG; if (uBand == 0xffffffff) { *pdwBandID = (DWORD)SendMessage(RB_GETBANDCOUNT, 0, 0); return S_OK; } - return E_NOTIMPL; + if (!SUCCEEDED(GetInternalBandInfo(uBand, &bandInfo))) + return E_INVALIDARG; + *pdwBandID = bandInfo.wID; + return S_OK; } HRESULT STDMETHODCALLTYPE CBaseBarSite::QueryBand(DWORD dwBandID, IDeskBand **ppstb, @@ -429,14 +504,77 @@ HRESULT STDMETHODCALLTYPE CBaseBarSite::RemoveBand(DWORD dwBandID) { - return E_NOTIMPL; + REBARBANDINFO bandInfo; + HRESULT hr; + CBarInfo *pInfo; + CComPtr<IObjectWithSite> pSite; + CComPtr<IDeskBand> pDockWnd; + DWORD index; + + // Retrieve the right index of the coolbar knowing the id + index = SendMessage(RB_IDTOINDEX, dwBandID, 0); + if (index == 0xffffffff) + return E_INVALIDARG; + + if (FAILED_UNEXPECTEDLY(GetInternalBandInfo(index, &bandInfo))) + return E_INVALIDARG; + + pInfo = reinterpret_cast<CBarInfo*>(bandInfo.lParam); + if (!pInfo) + return E_INVALIDARG; + + hr = pInfo->fTheBar->QueryInterface(IID_PPV_ARG(IDeskBand, &pDockWnd)); + if (FAILED_UNEXPECTEDLY(hr)) + { + return E_NOINTERFACE; + } + hr = pInfo->fTheBar->QueryInterface(IID_PPV_ARG(IObjectWithSite, &pSite)); + if (FAILED_UNEXPECTEDLY(hr)) + { + return E_NOINTERFACE; + } + /* Windows sends a CloseDW before setting site to NULL */ + pDockWnd->CloseDW(0); + pSite->SetSite(NULL); + + // Delete the band from rebar + if (!SendMessage(RB_DELETEBAND, index, 0)) + { + ERR("Can't delete the band\n"); + return E_INVALIDARG; + } + if (pInfo == fCurrentActiveBar) + { + // FIXME: what to do when we are deleting active bar ? Let's assume we remove it for now + fCurrentActiveBar = NULL; + } + delete pInfo; + return S_OK; } HRESULT STDMETHODCALLTYPE CBaseBarSite::GetBandObject(DWORD dwBandID, REFIID riid, void **ppv) { + REBARBANDINFO bandInfo; + HRESULT hr; + CBarInfo *pInfo; + DWORD index; + if (ppv == NULL) return E_POINTER; - return E_NOTIMPL; + + // Retrieve the right index of the coolbar knowing the id + index = SendMessage(RB_IDTOINDEX, dwBandID, 0); + if (index == 0xffffffff) + return E_INVALIDARG; + + if (FAILED_UNEXPECTEDLY(GetInternalBandInfo(index, &bandInfo))) + return E_INVALIDARG; + + pInfo = reinterpret_cast<CBarInfo*>(bandInfo.lParam); + hr = pInfo->fTheBar->QueryInterface(riid, ppv); + if (!SUCCEEDED(hr)) + return E_NOINTERFACE; + return S_OK; } HRESULT STDMETHODCALLTYPE CBaseBarSite::SetBandSiteInfo(const BANDSITEINFO *pbsinfo) @@ -491,9 +629,71 @@ if (notifyHeader->hwndFrom == m_hWnd) { } + bHandled = FALSE; /* forward notification to parent */ return 0; } +HRESULT CBaseBarSite::FindBandByGUID(REFGUID pGuid, DWORD *pdwBandID) +{ + DWORD numBands; + DWORD i; + HRESULT hr; + REBARBANDINFO bandInfo; + CBarInfo *realInfo; + + hr = EnumBands(-1, &numBands); + if (FAILED_UNEXPECTEDLY(hr)) + return E_FAIL; + + for(i = 0; i < numBands; i++) + { + if (FAILED_UNEXPECTEDLY(GetInternalBandInfo(i, &bandInfo))) + return E_FAIL; + realInfo = (CBarInfo*)bandInfo.lParam; + if (IsEqualGUID(pGuid, realInfo->fBarClass)) + { + *pdwBandID = realInfo->fBandID; + return S_OK; + } + } + return S_FALSE; +} + +HRESULT CBaseBarSite::ShowBand(DWORD dwBandID) +{ + UINT index; + CComPtr<IDeskBand> dockingWindow; + HRESULT hResult; + REBARBANDINFO bandInfo; + + // show our band + hResult = GetBandObject(dwBandID, IID_PPV_ARG(IDeskBand, &dockingWindow)); + if (FAILED_UNEXPECTEDLY(hResult)) + return E_FAIL; + + hResult = dockingWindow->ShowDW(TRUE); + + // Hide old band while adding new one + if (fCurrentActiveBar && fCurrentActiveBar->fBandID != dwBandID) + { + DWORD index; + index = SendMessage(RB_IDTOINDEX, fCurrentActiveBar->fBandID, 0); + if (index != 0xffffffff) + SendMessage(RB_SHOWBAND, index, 0); + } + if (FAILED_UNEXPECTEDLY(hResult)) + return hResult; + + // Display the current band + index = SendMessage(RB_IDTOINDEX, dwBandID, 0); + if (index != 0xffffffff) + SendMessage(RB_SHOWBAND, index, 1); + if (FAILED_UNEXPECTEDLY(GetInternalBandInfo(index, &bandInfo))) + return E_FAIL; + fCurrentActiveBar = (CBarInfo*)bandInfo.lParam; + return S_OK; +} + HRESULT CreateBaseBarSite(REFIID riid, void **ppv, BOOL bVertical) { return ShellObjectCreatorInit<CBaseBarSite, BOOL>(bVertical, riid, ppv);

1 0

[hbelusca] 71464: [SHELL32] It is enough to check the "ListviewShadow" registry setting for deciding whether or not the desktop icons should be transparent. Now we also get transparent icons in saf...
by hbelusca＠svn.reactos.org 30 May '16

30 May '16

Author: hbelusca Date: Mon May 30 21:30:25 2016 New Revision: 71464 URL: http://svn.reactos.org/svn/reactos?rev=71464&view=rev Log: [SHELL32] It is enough to check the "ListviewShadow" registry setting for deciding whether or not the desktop icons should be transparent. Now we also get transparent icons in safe mode with no wallpaper. Thanks Jared Smudde for having pointing this out to me. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Mon May 30 21:30:25 2016 @@ -580,7 +580,6 @@ /* Check if drop shadows option is enabled */ BOOL bDropShadow = FALSE; DWORD cbDropShadow = sizeof(bDropShadow); - WCHAR wszBuf[16] = L""; /* * The desktop ListView always take the default desktop colours, by @@ -591,7 +590,7 @@ RegGetValueW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", L"ListviewShadow", RRF_RT_DWORD, NULL, &bDropShadow, &cbDropShadow); - if (bDropShadow && SystemParametersInfoW(SPI_GETDESKWALLPAPER, _countof(wszBuf), wszBuf, 0) && wszBuf[0]) + if (bDropShadow) { /* Set the icon background transparent */ m_ListView.SetTextBkColor(CLR_NONE);

1 0

[gadamopoulos] 71463: [BROWSEUI] - Move the implementation of the search button from CInternetToolbar to CShellBrowser. - Part of the work submitted by Sylvain Deverre. CORE-8814 and CORE-10838
by gadamopoulos＠svn.reactos.org 30 May '16

30 May '16

Author: gadamopoulos Date: Mon May 30 20:52:05 2016 New Revision: 71463 URL: http://svn.reactos.org/svn/reactos?rev=71463&view=rev Log: [BROWSEUI] - Move the implementation of the search button from CInternetToolbar to CShellBrowser. - Part of the work submitted by Sylvain Deverre. CORE-8814 and CORE-10838 Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Mon May 30 20:52:05 2016 @@ -1503,33 +1503,7 @@ LRESULT CInternetToolbar::OnSearch(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) { - CComPtr<IObjectWithSite> objectWithSite; - CComPtr<IContextMenu> contextMenu; - CMINVOKECOMMANDINFO commandInfo; - const char *searchGUID = "{169A0691-8DF9-11d1-A1C4-00C04FD75D13}"; - HRESULT hResult; - - // TODO: Query shell if this command is enabled first - - memset(&commandInfo, 0, sizeof(commandInfo)); - commandInfo.cbSize = sizeof(commandInfo); - commandInfo.hwnd = m_hWnd; - commandInfo.lpParameters = searchGUID; - commandInfo.nShow = SW_SHOWNORMAL; - - hResult = CoCreateInstance(CLSID_ShellSearchExt, NULL, CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IContextMenu, &contextMenu)); - if (FAILED_UNEXPECTEDLY(hResult)) - return 0; - hResult = contextMenu->QueryInterface(IID_PPV_ARG(IObjectWithSite, &objectWithSite)); - if (FAILED_UNEXPECTEDLY(hResult)) - return 0; - hResult = objectWithSite->SetSite(fSite); - if (FAILED_UNEXPECTEDLY(hResult)) - return 0; - hResult = contextMenu->InvokeCommand(&commandInfo); - hResult = objectWithSite->SetSite(NULL); - return 0; + return IUnknown_Exec(fSite, CLSID_CommonButtons, 0x123, 1, NULL, NULL); } LRESULT CInternetToolbar::OnFolders(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL &bHandled) Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Mon May 30 20:52:05 2016 @@ -345,6 +345,7 @@ HRESULT UpdateUpState(); void UpdateGotoMenu(HMENU theMenu); void UpdateViewMenu(HMENU theMenu); + HRESULT OnSearch(); /* // *** IDockingWindowFrame methods *** virtual HRESULT STDMETHODCALLTYPE AddToolbar(IUnknown *punkSrc, LPCWSTR pwszItem, DWORD dwAddFlags); @@ -1638,6 +1639,37 @@ SHEnableMenuItem(theMenu, IDM_VIEW_EXPLORERBAR, FALSE); } +HRESULT CShellBrowser::OnSearch() +{ + CComPtr<IObjectWithSite> objectWithSite; + CComPtr<IContextMenu> contextMenu; + CMINVOKECOMMANDINFO commandInfo; + const char *searchGUID = "{169A0691-8DF9-11d1-A1C4-00C04FD75D13}"; + HRESULT hResult; + + // TODO: Query shell if this command is enabled first + + memset(&commandInfo, 0, sizeof(commandInfo)); + commandInfo.cbSize = sizeof(commandInfo); + commandInfo.hwnd = m_hWnd; + commandInfo.lpParameters = searchGUID; + commandInfo.nShow = SW_SHOWNORMAL; + + hResult = CoCreateInstance(CLSID_ShellSearchExt, NULL, CLSCTX_INPROC_SERVER, + IID_PPV_ARG(IContextMenu, &contextMenu)); + if (FAILED_UNEXPECTEDLY(hResult)) + return 0; + hResult = contextMenu->QueryInterface(IID_PPV_ARG(IObjectWithSite, &objectWithSite)); + if (FAILED_UNEXPECTEDLY(hResult)) + return 0; + hResult = objectWithSite->SetSite(dynamic_cast<IShellBrowser*>(this)); + if (FAILED_UNEXPECTEDLY(hResult)) + return 0; + hResult = contextMenu->InvokeCommand(&commandInfo); + hResult = objectWithSite->SetSite(NULL); + return hResult; +} + bool IUnknownIsEqual(IUnknown *int1, IUnknown *int2) { CComPtr<IUnknown> int1Retry; @@ -1866,6 +1898,20 @@ break; } } + else if (IsEqualIID(*pguidCmdGroup, CLSID_CommonButtons)) + { + // Windows seems to use this as proxy for toolbar buttons. + // We use it for search band for now to remove code duplication, + // let's see if it could be useful in the future. + switch (nCmdID) + { + case 0x123: + // Show search band from toolbar + OnSearch(); + return S_OK; + } + return E_NOTIMPL; + } else { return E_NOTIMPL;

1 0

[gadamopoulos] 71462: [BROWSEUI] - Implement CBaseBar::ShowDW and CBaseBar::CloseDW. - Simplify CBaseBar::SetClient. - Implement resizing support for CBaseBar.
by gadamopoulos＠svn.reactos.org 30 May '16

30 May '16

Author: gadamopoulos Date: Mon May 30 20:37:40 2016 New Revision: 71462 URL: http://svn.reactos.org/svn/reactos?rev=71462&view=rev Log: [BROWSEUI] - Implement CBaseBar::ShowDW and CBaseBar::CloseDW. - Simplify CBaseBar::SetClient. - Implement resizing support for CBaseBar. Modified: trunk/reactos/dll/win32/browseui/basebar.cpp Modified: trunk/reactos/dll/win32/browseui/basebar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/basebar… ============================================================================== --- trunk/reactos/dll/win32/browseui/basebar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/basebar.cpp [iso-8859-1] Mon May 30 20:37:40 2016 @@ -30,11 +30,10 @@ */ /* TODO: - **Make base bar support resizing + **Make base bar support resizing -- almost done (need to support integral ?) Add context menu for base bar Fix base bar to correctly initialize fVertical field - Fix base bar to correctly reposition its base bar site when resized - + Fix base bar to correctly reposition its base bar site when resized -- done ? */ class CBaseBar : @@ -51,7 +50,7 @@ public IPersistPropertyBag, public IObjectWithSite { -public: +private: CComPtr<IUnknown> fSite; CComPtr<IUnknown> fClient; HWND fClientWindow; @@ -255,6 +254,7 @@ { if (IsEqualIID(*pguidCmdGroup, CGID_Explorer)) { + // pass through to the explorer ? } else if (IsEqualIID(*pguidCmdGroup, IID_IDeskBarClient)) { @@ -264,6 +264,7 @@ // hide current band break; case 2: + // switch bands break; case 3: break; @@ -309,9 +310,10 @@ HWND ownerWindow; HRESULT hResult; - if (punkClient == NULL) - fClient.Release(); - else + /* Clean up old client */ + fClient = NULL; + + if (punkClient) { hResult = punkClient->QueryInterface(IID_PPV_ARG(IUnknown, &fClient)); if (FAILED_UNEXPECTEDLY(hResult)) @@ -354,14 +356,18 @@ HRESULT STDMETHODCALLTYPE CBaseBar::ShowDW(BOOL fShow) { fVisible = fShow ? true : false; + ShowWindow(fShow); ReserveBorderSpace(); return S_OK; } HRESULT STDMETHODCALLTYPE CBaseBar::CloseDW(DWORD dwReserved) { - fVisible = false; - ReserveBorderSpace(); + ShowDW(0); + // Detach from our client + SetClient(NULL); + // Destroy our site + SetSite(NULL); return S_OK; } @@ -434,6 +440,31 @@ LRESULT CBaseBar::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { + DWORD dwWidth; + DWORD dwHeight; + CComPtr<IOleWindow> pClient; + HWND clientHwnd; + HRESULT hr; + + if (fVisible) + { + dwWidth = LOWORD(lParam); + dwHeight = HIWORD(lParam); + + // substract resizing grips to child's window size + if (fVertical) + dwWidth -= GetSystemMetrics(SM_CXFRAME); + else + dwHeight -= GetSystemMetrics(SM_CXFRAME); + hr = fClient->QueryInterface(IID_PPV_ARG(IOleWindow, &pClient)); + if (FAILED_UNEXPECTEDLY(hr)) + return 0; + hr = pClient->GetWindow(&clientHwnd); + if (FAILED_UNEXPECTEDLY(hr)) + return 0; + ::SetWindowPos(clientHwnd, NULL, 0, (fVertical) ? 0 : GetSystemMetrics(SM_CXFRAME), dwWidth, dwHeight, NULL); + bHandled = TRUE; + } return 0; } @@ -486,20 +517,21 @@ LRESULT CBaseBar::OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { POINT newLocation; - //int delta; + int delta; if (fTracking) { newLocation.x = (short)LOWORD(lParam); newLocation.y = (short)HIWORD(lParam); -#if 0 if (fVertical) delta = newLocation.x - fLastLocation.x; else - delta = newLocation.y - fLastLocation.y; - -#endif + delta = fLastLocation.y - newLocation.y; + if (fNeededSize + delta < 0) + return 0; + fNeededSize += delta; fLastLocation = newLocation; + ReserveBorderSpace(); } return 0; }

1 0

[gadamopoulos] 71461: [BROWSEUI] - CBaseBar, CBaseBarSite: Implement IInputObject and IInputObjectSite interfaces - Part of the work submitted by Sylvain Deverre. Simplified by me. CORE-8814 and CO...
by gadamopoulos＠svn.reactos.org 30 May '16

30 May '16

Author: gadamopoulos Date: Mon May 30 20:28:30 2016 New Revision: 71461 URL: http://svn.reactos.org/svn/reactos?rev=71461&view=rev Log: [BROWSEUI] - CBaseBar, CBaseBarSite: Implement IInputObject and IInputObjectSite interfaces - Part of the work submitted by Sylvain Deverre. Simplified by me. CORE-8814 and CORE-10838 Modified: trunk/reactos/dll/win32/browseui/basebar.cpp trunk/reactos/dll/win32/browseui/basebarsite.cpp Modified: trunk/reactos/dll/win32/browseui/basebar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/basebar… ============================================================================== --- trunk/reactos/dll/win32/browseui/basebar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/basebar.cpp [iso-8859-1] Mon May 30 20:28:30 2016 @@ -241,8 +241,7 @@ HRESULT STDMETHODCALLTYPE CBaseBar::OnFocusChangeIS (IUnknown *punkObj, BOOL fSetFocus) { - // forward to owner - return E_NOTIMPL; + return IUnknown_OnFocusChangeIS(fSite, punkObj, fSetFocus); } HRESULT STDMETHODCALLTYPE CBaseBar::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, @@ -291,20 +290,17 @@ HRESULT STDMETHODCALLTYPE CBaseBar::UIActivateIO(BOOL fActivate, LPMSG lpMsg) { - // forward to contained bar - return S_OK; + return IUnknown_UIActivateIO(fClient, fActivate, lpMsg); } HRESULT STDMETHODCALLTYPE CBaseBar::HasFocusIO() { - // forward to contained bar - return S_OK; + return IUnknown_HasFocusIO(fClient); } HRESULT STDMETHODCALLTYPE CBaseBar::TranslateAcceleratorIO(LPMSG lpMsg) { - // forward to contained bar - return S_FALSE; + return IUnknown_TranslateAcceleratorIO(fClient, lpMsg); } HRESULT STDMETHODCALLTYPE CBaseBar::SetClient(IUnknown *punkClient) Modified: trunk/reactos/dll/win32/browseui/basebarsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/basebar… ============================================================================== --- trunk/reactos/dll/win32/browseui/basebarsite.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/basebarsite.cpp [iso-8859-1] Mon May 30 20:28:30 2016 @@ -248,17 +248,33 @@ HRESULT STDMETHODCALLTYPE CBaseBarSite::UIActivateIO(BOOL fActivate, LPMSG lpMsg) { - return E_NOTIMPL; + if (!fCurrentActiveBar) + return S_OK; + + return IUnknown_UIActivateIO(fCurrentActiveBar->fTheBar, fActivate, lpMsg); } HRESULT STDMETHODCALLTYPE CBaseBarSite::HasFocusIO() { - return E_NOTIMPL; + if (!fCurrentActiveBar) + return S_FALSE; + + return IUnknown_HasFocusIO(fCurrentActiveBar->fTheBar); } HRESULT STDMETHODCALLTYPE CBaseBarSite::TranslateAcceleratorIO(LPMSG lpMsg) { - return E_NOTIMPL; + if (!fCurrentActiveBar) + { + if (lpMsg) + { + TranslateMessage(lpMsg); + DispatchMessage(lpMsg); + } + return S_OK; + } + + return IUnknown_TranslateAcceleratorIO(fCurrentActiveBar->fTheBar, lpMsg); } HRESULT STDMETHODCALLTYPE CBaseBarSite::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) @@ -314,7 +330,8 @@ HRESULT STDMETHODCALLTYPE CBaseBarSite::OnFocusChangeIS (IUnknown *punkObj, BOOL fSetFocus) { - return E_NOTIMPL; + // FIXME: should we directly pass-through, or advertise ourselves as focus owner ? + return IUnknown_OnFocusChangeIS(fDeskBarSite, punkObj, fSetFocus); } HRESULT STDMETHODCALLTYPE CBaseBarSite::SetDeskBarSite(IUnknown *punkSite)

1 0

[gadamopoulos] 71460: [BROWSEUI] - CBaseBar, CBaseBarSite: Add an initialization method in order to set the basebar and the basebar site as vertical. - CShellBrowser: Create the basebar and the bas...
by gadamopoulos＠svn.reactos.org 30 May '16

30 May '16

Author: gadamopoulos Date: Mon May 30 20:02:45 2016 New Revision: 71460 URL: http://svn.reactos.org/svn/reactos?rev=71460&view=rev Log: [BROWSEUI] - CBaseBar, CBaseBarSite: Add an initialization method in order to set the basebar and the basebar site as vertical. - CShellBrowser: Create the basebar and the basebar site with the right orientation. - Part of the work submitted by Sylvain Deverre. CORE-8814 and CORE-10838 Modified: trunk/reactos/dll/win32/browseui/basebar.cpp trunk/reactos/dll/win32/browseui/basebarsite.cpp trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/basebar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/basebar… ============================================================================== --- trunk/reactos/dll/win32/browseui/basebar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/basebar.cpp [iso-8859-1] Mon May 30 20:02:45 2016 @@ -65,6 +65,8 @@ public: CBaseBar(); ~CBaseBar(); + HRESULT Initialize(BOOL); + public: HRESULT ReserveBorderSpace(); @@ -172,6 +174,12 @@ { } +HRESULT CBaseBar::Initialize(BOOL vert) +{ + fVertical = (vert == TRUE); + return S_OK; +} + HRESULT CBaseBar::ReserveBorderSpace() { CComPtr<IDockingWindowSite> dockingWindowSite; @@ -512,7 +520,7 @@ return 0; } -HRESULT CreateBaseBar(REFIID riid, void **ppv) -{ - return ShellObjectCreator<CBaseBar>(riid, ppv); -} +HRESULT CreateBaseBar(REFIID riid, void **ppv, BOOL vertical) +{ + return ShellObjectCreatorInit<CBaseBar, BOOL>(vertical, riid, ppv); +} Modified: trunk/reactos/dll/win32/browseui/basebarsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/basebar… ============================================================================== --- trunk/reactos/dll/win32/browseui/basebarsite.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/basebarsite.cpp [iso-8859-1] Mon May 30 20:02:45 2016 @@ -65,9 +65,11 @@ // HWND fRebarWindow; // rebar for top of window CComPtr<IUnknown> fDeskBarSite; DWORD fNextBandID; + BOOL fVertical; public: CBaseBarSite(); ~CBaseBarSite(); + HRESULT Initialize(BOOL vert) { fVertical = vert; return S_OK; }; private: HRESULT InsertBar(IUnknown *newBar); @@ -147,7 +149,7 @@ END_COM_MAP() }; -CBaseBarSite::CBaseBarSite() +CBaseBarSite::CBaseBarSite() : fVertical(TRUE) { fCurrentActiveBar = NULL; fNextBandID = 1; @@ -475,7 +477,7 @@ return 0; } -HRESULT CreateBaseBarSite(REFIID riid, void **ppv) -{ - return ShellObjectCreator<CBaseBarSite>(riid, ppv); -} +HRESULT CreateBaseBarSite(REFIID riid, void **ppv, BOOL bVertical) +{ + return ShellObjectCreatorInit<CBaseBarSite, BOOL>(bVertical, riid, ppv); +} Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Mon May 30 20:02:45 2016 @@ -139,8 +139,8 @@ extern HRESULT CreateTravelLog(REFIID riid, void **ppv); -extern HRESULT CreateBaseBar(REFIID riid, void **ppv); -extern HRESULT CreateBaseBarSite(REFIID riid, void **ppv); +extern HRESULT CreateBaseBar(REFIID riid, void **ppv, BOOL vertical); +extern HRESULT CreateBaseBarSite(REFIID riid, void **ppv, BOOL vertical); // temporary extern HRESULT CreateInternetToolbar(REFIID riid, void **ppv); @@ -1105,10 +1105,10 @@ cache = &fClientBars[BIHorizontalBaseBar].clientBar.p; if (*cache == NULL) { - hResult = CreateBaseBar(IID_PPV_ARG(IUnknown, &newBaseBar)); + hResult = CreateBaseBar(IID_PPV_ARG(IUnknown, &newBaseBar), vertical); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; - hResult = CreateBaseBarSite(IID_PPV_ARG(IUnknown, &newBaseBarSite)); + hResult = CreateBaseBarSite(IID_PPV_ARG(IUnknown, &newBaseBarSite), vertical); if (FAILED_UNEXPECTEDLY(hResult)) return hResult;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2016