Ros-diffs September 2007

ros-diffs@reactos.org

19 participants
589 discussions

[cfinck] 29320: Updated slovak translations for desk.cpl, deskadp, deskmon and slayer by Mario Kacmar (kario AT szm DOT sk)
by cfinck＠svn.reactos.org 30 Sep '07

30 Sep '07

Author: cfinck Date: Mon Oct 1 01:04:49 2007 New Revision: 29320 URL: http://svn.reactos.org/svn/reactos?rev=29320&view=rev Log: Updated slovak translations for desk.cpl, deskadp, deskmon and slayer by Mario Kacmar (kario AT szm DOT sk) Added: trunk/reactos/dll/win32/shellext/deskadp/lang/sk-SK.rc trunk/reactos/dll/win32/shellext/deskmon/lang/sk-SK.rc trunk/reactos/dll/win32/shellext/slayer/lang/sk-SK.rc Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc trunk/reactos/dll/win32/shellext/slayer/rsrc.rc Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc Mon Oct 1 01:04:49 2007 @@ -21,7 +21,7 @@ IDC_STATIC, 8, 103, 180, 9 PUSHBUTTON "&Preh¾adáva...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 PUSHBUTTON "&Farba...", IDC_COLOR_BUTTON, 188, 177, 50, 15 - LTEXT "&Umiestnenie:", IDC_STATIC, 188, 138, 36, 9 + LTEXT "&Umiestnenie:", IDC_STATIC, 188, 138, 50, 9 COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END @@ -47,7 +47,7 @@ CONTROL "Pri obnovení chráni &heslom.",IDC_SCREENS_USEPASSCHK,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 GROUPBOX "Napájani&e monitora", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 - LTEXT "To adjust the power settings for your monitor, click on Power Settings.", + LTEXT "Ak chcete upravi nastavenie napájania monitora a uetri energiu, kliknite na tlaèidlo Napájanie.", IDC_STATIC, 14, 166, 146 ,20 PUSHBUTTON "N&apájanie...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 END @@ -77,7 +77,7 @@ LTEXT "P&oloka:", 8, 5, 160, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP - LTEXT "&Ve¾kos", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + LTEXT "&Ve¾kos", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 39, 9 EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 @@ -108,27 +108,27 @@ CAPTION "Nastavenie" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 + LTEXT "Usporiadajte ikony monitorov ahaním tak, aby zodpovedali fyzickému rozmiestneniu monitorov.",-1,3,3,240,10 CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE - LTEXT "&Display:",1820,3,100,30,8 - LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 - GROUPBOX "&Screen area",1818,3,120,115,43 + LTEXT "&Monitor:",1820,3,100,30,8 + LTEXT "<Nie je>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "&Rozlíenie obrazovky",1818,3,120,115,43 CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 - LTEXT "Less",1815,9,130,15,8,NOT WS_GROUP - LTEXT "More",1816,93,130,21,8,NOT WS_GROUP + LTEXT "niie",1815,9,130,15,8,NOT WS_GROUP + LTEXT "vyie",1816,93,130,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER - GROUPBOX "&Colors",1817,125,120,115,43 + GROUPBOX "&Farby",1817,125,120,115,43 COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 - PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,170,165,70,14 + PUSHBUTTON "&Spresni...",IDC_SETTINGS_ADVANCED,170,165,70,14 END IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "Veobecné" FONT 8, "MS Shell Dlg" BEGIN END @@ -142,15 +142,15 @@ STRINGTABLE BEGIN - IDS_MULTIPLEMONITORS "(Multiple Monitors)" - IDS_UNKNOWNMONITOR "(Unknown Monitor)" - IDS_ADVANCEDTITLEFMT "%s and %s" + IDS_MULTIPLEMONITORS "(Viacero monitorov)" + IDS_UNKNOWNMONITOR "(Neznámy monitor)" + IDS_ADVANCEDTITLEFMT "%s a %s" END STRINGTABLE BEGIN IDS_CPLNAME "Display" - IDS_CPLDESCRIPTION "Customizes the desktop display and screen saver." + IDS_CPLDESCRIPTION "Prispôsobenie vzh¾adu pozadia a etrièa obrazovky." IDS_NONE "(Nie je)" IDS_CENTER "V strede" IDS_STRETCH "Roztiahnu" @@ -161,7 +161,7 @@ BEGIN IDS_COLOR_4BIT "16 farieb" IDS_COLOR_8BIT "256 farieb" - IDS_COLOR_16BIT "High Color (16 bitov)" + IDS_COLOR_16BIT "Ve¾a farieb (16 bitov)" IDS_COLOR_24BIT "Pravé farby (24 bitov)" IDS_COLOR_32BIT "Pravé farby (32 bitov)" IDS_PIXEL "%lux%lu Pixel" @@ -186,25 +186,25 @@ STRINGTABLE DISCARDABLE BEGIN IDS_ELEMENT_1 "Pracovná plocha" - IDS_ELEMENT_2 "Caption of inactive windows" - IDS_ELEMENT_3 "Border of inactive windows" - IDS_ELEMENT_4 "Caption of active windows" - IDS_ELEMENT_5 "Border of active windows" - IDS_ELEMENT_6 "Menu" - IDS_ELEMENT_7 "Hilited elements" - IDS_ELEMENT_8 "Windows" - IDS_ELEMENT_9 "Scrollbars" - IDS_ELEMENT_10 "3D objects" - IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_2 "Záhlavie neaktívneho okna" + IDS_ELEMENT_3 "Okraj neaktívneho okna" + IDS_ELEMENT_4 "Záhlavie aktívneho okna" + IDS_ELEMENT_5 "Okraj aktívneho okna" + IDS_ELEMENT_6 "Ponuka" + IDS_ELEMENT_7 "Vybraté poloky" + IDS_ELEMENT_8 "Okno" + IDS_ELEMENT_9 "Posúvaè" + IDS_ELEMENT_10 "Priestorové objekty" + IDS_ELEMENT_11 "Názov palety" + IDS_ELEMENT_12 "Názov tlaèidla" IDS_ELEMENT_13 "Captionbar" - IDS_ELEMENT_14 "Deactivated menu elements" - IDS_ELEMENT_15 "Dialog" - IDS_ELEMENT_16 "Scrollbar controls" - IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_14 "Nedostupné poloky ponuky" + IDS_ELEMENT_15 "Políèko s hlásením" + IDS_ELEMENT_16 "Ovládanie posúvaèa" + IDS_ELEMENT_17 "Pozadie aplikácie" IDS_ELEMENT_18 "Small captionbar" - IDS_ELEMENT_19 "Symbol distance (horizontal)" - IDS_ELEMENT_20 "Symbol distance (vertical)" - IDS_ELEMENT_21 "Quickinfo" - IDS_ELEMENT_22 "Symbol" -END + IDS_ELEMENT_19 "Rozostup ikon (vodorovne)" + IDS_ELEMENT_20 "Rozostup ikon (zvislo)" + IDS_ELEMENT_21 "Popis tlaèidiel" + IDS_ELEMENT_22 "Ikona" +END Added: trunk/reactos/dll/win32/shellext/deskadp/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/lang/sk-SK.rc (added) +++ trunk/reactos/dll/win32/shellext/deskadp/lang/sk-SK.rc Mon Oct 1 01:04:49 2007 @@ -1,0 +1,55 @@ +/* + * FILE: dll/win32/shellext/deskadp/lang/sk-SK.rc + * PURPOSE: Slovak Language File for deskadp + * TRANSLATOR: Kario <kario(a)szm.sk> + * DATE OF TR.: 30-09-2007 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDD_DISPLAYADAPTER DIALOGEX 0, 0, 252, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Adaptér" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Typ adaptér", -1, 7, 3, 237, 50 + LTEXT "", IDC_ADAPTERNAME, 40, 17, 190, 20, SS_NOPREFIX + PUSHBUTTON "Vl&astnosti", IDC_ADAPTERPROPERTIES, 177, 33, 59, 14 + GROUPBOX "Informácie o adaptéri", -1, 7, 56, 237, 75 + LTEXT "Typ èipu:", -1, 13, 68, 58, 8 + LTEXT "", IDC_CHIPTYPE, 71, 68, 160, 8, SS_NOPREFIX + LTEXT "Typ konvertora:", -1, 13, 80, 58, 8 + LTEXT "", IDC_DACTYPE, 71, 80, 160, 8, SS_NOPREFIX + LTEXT "Ve¾kos pamäte:", -1, 13, 92, 58, 8 + LTEXT "", IDC_MEMORYSIZE, 71, 92, 160, 8, SS_NOPREFIX + LTEXT "Reazec adaptéra:", -1, 13, 104, 58, 8 + LTEXT "", IDC_ADAPTERSTRING, 71, 104, 160, 8, SS_NOPREFIX + LTEXT "BIOS informácie:", -1, 13, 116, 58, 8 + LTEXT "", IDC_BIOSINFORMATION, 71, 116, 160, 8, SS_NOPREFIX + PUSHBUTTON "&Zoznam vetkých reimov...", IDC_LISTALLMODES, 7, 139, 100, 14 +END + +IDD_LISTALLMODES DIALOGEX 0, 0, 225, 135 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_DLGFRAME +CAPTION "Zoznam vetkých reimov" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + DEFPUSHBUTTON "OK", IDOK, 112, 115, 50, 15 + PUSHBUTTON "Zrui", IDCANCEL, 167, 115, 50, 15 + GROUPBOX "&Zoznam platných reimov", -1, 6, 7, 212, 98 + LISTBOX IDC_ALLVALIDMODES, 10, 20, 204, 87, LBS_NOTIFY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + IDS_MODEFMT "%d by %d, %s, %s" + IDS_DEFREFRESHRATE "Predvolene obnovi" + IDES_REFRESHRATEFMT "%d Hz" + IDS_4BPP "16 farieb" + IDS_8BPP "256 farieb" + IDS_15BPP "Ve¾a farieb (15 bit)" + IDS_16BPP "Ve¾a farieb (16 bit)" + IDS_24BPP "Pravé farby (24 bit)" + IDS_32BPP "Pravé farby (32 bit)" +END + Modified: trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskadp… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc (original) +++ trunk/reactos/dll/win32/shellext/deskadp/rsrc.rc Mon Oct 1 01:04:49 2007 @@ -1,9 +1,8 @@ #include <windows.h> #include "resource.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/dll/win32/shellext/deskmon/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/lang/sk-SK.rc (added) +++ trunk/reactos/dll/win32/shellext/deskmon/lang/sk-SK.rc Mon Oct 1 01:04:49 2007 @@ -1,0 +1,22 @@ +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDD_MONITOR DIALOGEX 0, 0, 252, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Monitor" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "Typ monitora", -1, 7, 3, 237, 52 + LTEXT "", IDC_MONITORNAME, 40, 17, 190, 20, SS_NOPREFIX + LISTBOX IDC_MONITORLIST, 40, 13, 196, 30, WS_VSCROLL + PUSHBUTTON "Vl&astnosti", IDC_MONITORPROPERTIES, 177, 35, 59, 14, WS_DISABLED + GROUPBOX "Nastavenie monitora", IDS_MONITORSETTINGSGROUP, 7, 58, 237, 63 + LTEXT "&Frekvencia obnovovania obrazovky:", IDS_REFRESHRATELABEL, 13, 73, 225, 8 + COMBOBOX IDC_REFRESHRATE, 13, 85, 225, 200, WS_VSCROLL | CBS_DROPDOWNLIST | CBS_SORT + AUTOCHECKBOX "&Skry reimy, ktoré sa na tomto monitore nedajú poui", IDC_PRUNINGCHECK, 13, 106, 225, 10 +END + +STRINGTABLE +BEGIN + IDS_USEDEFFRQUENCY "Poui predvolené hardvérové nastavenie" + IDS_FREQFMT "%u Hz" +END Modified: trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/deskmon… ============================================================================== --- trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc (original) +++ trunk/reactos/dll/win32/shellext/deskmon/rsrc.rc Mon Oct 1 01:04:49 2007 @@ -1,9 +1,8 @@ #include <windows.h> #include "resource.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" +#include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/dll/win32/shellext/slayer/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/slayer/… ============================================================================== --- trunk/reactos/dll/win32/shellext/slayer/lang/sk-SK.rc (added) +++ trunk/reactos/dll/win32/shellext/slayer/lang/sk-SK.rc Mon Oct 1 01:04:49 2007 @@ -1,0 +1,45 @@ +/* + * FILE: dll/win32/shellext/slayer/lang/sk-SK.rc + * PURPOSE: Slovak Language File for slayer + * TRANSLATOR: Kario <kario(a)szm.sk> + * DATE OF TR.: 30-09-2007 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDD_SLAYERSHEET DIALOGEX 0, 0, 224, 226 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Kompatibilita" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ak máte problémy so spustením tohto programu v systéme ReactOS, vyberte operaèný systém, pod názvom ktorého sa systém ReactOS ohlási programu.", -1, 7,7,210,31 + GROUPBOX "Kompatibilný reim", IDC_COMPATGROUP, 7,41,210,49 + CHECKBOX "Tento program spusti v reime kompatibilnom so systémom:", IDC_CHKRUNCOMPATIBILITY, 18,57,188,10, BS_AUTOCHECKBOX | WS_TABSTOP + COMBOBOX IDC_COMPATIBILITYMODE, 18,70,188,85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED + GROUPBOX "Nastavenia obrazovky", -1, 7,99,210,61, BS_GROUPBOX | WS_DISABLED + CHECKBOX "Spusti v reime 256 farieb", IDC_CHKRUNIN256COLORS, 18,114,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "Spusti s rozlíením obrazovky 640x480", IDC_CHKRUNIN640480RES, 18,129,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + CHECKBOX "Vypnú vizuálne motívy", IDC_CHKDISABLEVISUALTHEMES, 18,144,188,10, BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED + PUSHBUTTON "&Upravi reimy kompatibility...", IDC_EDITCOMPATIBILITYMODES, 117,167,100,15 + /* CONTROL "Ïalie informácie o <A>kompatibilite programov</A>.", IDC_INFOLINK, "SysLink", WS_CHILD | WS_TABSTOP | WS_VISIBLE, 7,207,210,10, WS_EX_NOPARENTNOTIFY */ +END + +IDD_EDITCOMPATIBILITYMODES DIALOGEX 0, 0, 230, 139 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Úprava reimov kompatibility" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LISTBOX IDC_COMPATIBILITYMODE, 9,6,148,108, LBS_NOTIFY | LBS_WANTKEYBOARDINPUT | WS_BORDER + PUSHBUTTON "Prid&a...", IDC_ADD, 162,6,60,14, WS_DISABLED + PUSHBUTTON "&Upravi...", IDC_EDIT, 162,24,60,14, WS_DISABLED + PUSHBUTTON "O&dstráni", IDC_DELETE, 162,42,60,14, WS_DISABLED + PUSHBUTTON "&OK", IDOK, 95,116,60,14 + PUSHBUTTON "&Zrui", IDCANCEL, 162,116,60,14 +END + +STRINGTABLE +BEGIN + IDS_SLAYER "Slayer" + IDS_DESCRIPTION "Application Compatibility Layer Shell Extension" +END + Modified: trunk/reactos/dll/win32/shellext/slayer/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shellext/slayer/… ============================================================================== --- trunk/reactos/dll/win32/shellext/slayer/rsrc.rc (original) +++ trunk/reactos/dll/win32/shellext/slayer/rsrc.rc Mon Oct 1 01:04:49 2007 @@ -1,9 +1,5 @@ #include <windows.h> #include "resource.h" - - - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "lang/de-DE.rc" #include "lang/en-US.rc" @@ -15,5 +11,6 @@ #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/uk-UA.rc"

1 0

[tkreuzer] 29319: comment out checkbox for version display, as it isn't fully implemented See issue #2323 for more details.
by tkreuzer＠svn.reactos.org 30 Sep '07

30 Sep '07

Author: tkreuzer Date: Sun Sep 30 21:48:41 2007 New Revision: 29319 URL: http://svn.reactos.org/svn/reactos?rev=29319&view=rev Log: comment out checkbox for version display, as it isn't fully implemented See issue #2323 for more details. Modified: trunk/reactos/base/shell/explorer/explorer-bg.rc trunk/reactos/base/shell/explorer/explorer-bn.rc trunk/reactos/base/shell/explorer/explorer-cn-msvc.rc trunk/reactos/base/shell/explorer/explorer-cn.rc trunk/reactos/base/shell/explorer/explorer-cz.rc trunk/reactos/base/shell/explorer/explorer-de.rc trunk/reactos/base/shell/explorer/explorer-en.rc trunk/reactos/base/shell/explorer/explorer-es.rc trunk/reactos/base/shell/explorer/explorer-fr.rc trunk/reactos/base/shell/explorer/explorer-gr.rc trunk/reactos/base/shell/explorer/explorer-hu.rc trunk/reactos/base/shell/explorer/explorer-id.rc trunk/reactos/base/shell/explorer/explorer-it.rc trunk/reactos/base/shell/explorer/explorer-jp.rc trunk/reactos/base/shell/explorer/explorer-nl.rc trunk/reactos/base/shell/explorer/explorer-no.rc trunk/reactos/base/shell/explorer/explorer-pl.rc trunk/reactos/base/shell/explorer/explorer-ru.rc trunk/reactos/base/shell/explorer/explorer-sk.rc trunk/reactos/base/shell/explorer/explorer-sv.rc trunk/reactos/base/shell/explorer/explorer-uk.rc Modified: trunk/reactos/base/shell/explorer/explorer-bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-bg.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-bg.rc Sun Sep 30 21:48:41 2007 @@ -198,8 +198,8 @@ BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "Ïîêàçâàíå íà &âåðñèÿòà",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,120,10 +// CONTROL "Ïîêàçâàíå íà &âåðñèÿòà",ID_DESKTOP_VERSION,"Button", +// BS_AUTOCHECKBOX | WS_TABSTOP,7,177,120,10 END IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 Modified: trunk/reactos/base/shell/explorer/explorer-bn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-bn.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-bn.rc Sun Sep 30 21:48:41 2007 @@ -196,8 +196,8 @@ BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "Display &Version Number",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +// CONTROL "Display &Version Number",ID_DESKTOP_VERSION,"Button", +// BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 END IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 Modified: trunk/reactos/base/shell/explorer/explorer-cn-msvc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/shell/explorer/explorer-cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-cn.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-cn.rc Sun Sep 30 21:48:41 2007 @@ -198,8 +198,8 @@ BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "ÏÔÊ¾°æ±¾ºÅ(&V)",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +// CONTROL "ÏÔÊ¾°æ±¾ºÅ(&V)",ID_DESKTOP_VERSION,"Button", +// BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 END IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 Modified: trunk/reactos/base/shell/explorer/explorer-cz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-cz.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-cz.rc Sun Sep 30 21:48:41 2007 @@ -198,8 +198,8 @@ BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "Zobrazit verzi",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +// CONTROL "Zobrazit verzi",ID_DESKTOP_VERSION,"Button", +// BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 END IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 Modified: trunk/reactos/base/shell/explorer/explorer-de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-de.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-de.rc Sun Sep 30 21:48:41 2007 @@ -201,8 +201,8 @@ BS_BOTTOM | WS_TABSTOP,110,131,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,131,46,44 - CONTROL "Anzeige der &Versionsnummer",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,187,107,10 +// CONTROL "Anzeige der &Versionsnummer",ID_DESKTOP_VERSION,"Button", +// BS_AUTOCHECKBOX | WS_TABSTOP,7,187,107,10 END IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 204 Modified: trunk/reactos/base/shell/explorer/explorer-en.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-en.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-en.rc Sun Sep 30 21:48:41 2007 @@ -198,8 +198,8 @@ BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "Display &Version Number",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +// CONTROL "Display &Version Number",ID_DESKTOP_VERSION,"Button", +// BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 END IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 Modified: trunk/reactos/base/shell/explorer/explorer-es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-es.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-es.rc Sun Sep 30 21:48:41 2007 @@ -198,8 +198,8 @@ BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "Mostrar &Version",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +// CONTROL "Mostrar &Version",ID_DESKTOP_VERSION,"Button", +// BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 END IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 Modified: trunk/reactos/base/shell/explorer/explorer-fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-fr.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-fr.rc Sun Sep 30 21:48:41 2007 @@ -198,8 +198,8 @@ BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "Afficher le numéro de la &version",ID_DESKTOP_VERSION, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,177,120,10 +// CONTROL "Afficher le numéro de la &version",ID_DESKTOP_VERSION, +// "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,177,120,10 END IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 Modified: trunk/reactos/base/shell/explorer/explorer-gr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-gr.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-gr.rc Sun Sep 30 21:48:41 2007 @@ -200,8 +200,8 @@ BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "Display &Version Number",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +// CONTROL "Display &Version Number",ID_DESKTOP_VERSION,"Button", +// BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 END IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 Modified: trunk/reactos/base/shell/explorer/explorer-hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-hu.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-hu.rc Sun Sep 30 21:48:41 2007 @@ -198,8 +198,8 @@ BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "Display &Version Number",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +// CONTROL "Display &Version Number",ID_DESKTOP_VERSION,"Button", +// BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 END IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 Modified: trunk/reactos/base/shell/explorer/explorer-id.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-id.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-id.rc Sun Sep 30 21:48:41 2007 @@ -198,8 +198,8 @@ BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "Tampilkan Nomor &Versi",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +// CONTROL "Tampilkan Nomor &Versi",ID_DESKTOP_VERSION,"Button", +// BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 END IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 Modified: trunk/reactos/base/shell/explorer/explorer-it.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-it.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-it.rc Sun Sep 30 21:48:41 2007 @@ -180,7 +180,7 @@ CONTROL "border H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,57,121,46,44 CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "Visualizza versione",ID_DESKTOP_VERSION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +// CONTROL "Visualizza versione",ID_DESKTOP_VERSION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 END IDD_DESKBAR_TASKBAR DIALOGEX 0, 0, 210, 194 Modified: trunk/reactos/base/shell/explorer/explorer-jp.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-jp.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-jp.rc Sun Sep 30 21:48:41 2007 @@ -198,8 +198,8 @@ BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "fXNgbvÉo[Wð\\¦·é(&V)",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +// CONTROL "fXNgbvÉo[Wð\\¦·é(&V)",ID_DESKTOP_VERSION,"Button", +// BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 END IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 Modified: trunk/reactos/base/shell/explorer/explorer-nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-nl.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-nl.rc Sun Sep 30 21:48:41 2007 @@ -198,8 +198,8 @@ BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "&Versienummer weergeven",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +// CONTROL "&Versienummer weergeven",ID_DESKTOP_VERSION,"Button", +// BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 END IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 Modified: trunk/reactos/base/shell/explorer/explorer-no.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-no.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-no.rc Sun Sep 30 21:48:41 2007 @@ -198,8 +198,8 @@ BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "Vis &versjonsummer",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +// CONTROL "Vis &versjonsummer",ID_DESKTOP_VERSION,"Button", +// BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 END IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 Modified: trunk/reactos/base/shell/explorer/explorer-pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-pl.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-pl.rc Sun Sep 30 21:48:41 2007 @@ -198,8 +198,8 @@ BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "Wywietlaj &numer wersji",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +// CONTROL "Wywietlaj &numer wersji",ID_DESKTOP_VERSION,"Button", +// BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 END IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 Modified: trunk/reactos/base/shell/explorer/explorer-ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-ru.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-ru.rc Sun Sep 30 21:48:41 2007 @@ -198,8 +198,8 @@ BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "Ïîêàçûâàòü íîìåð &âåðñèè",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,109,10 +// CONTROL "Ïîêàçûâàòü íîìåð &âåðñèè",ID_DESKTOP_VERSION,"Button", +// BS_AUTOCHECKBOX | WS_TABSTOP,7,177,109,10 END IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 Modified: trunk/reactos/base/shell/explorer/explorer-sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-sk.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-sk.rc Sun Sep 30 21:48:41 2007 @@ -208,8 +208,8 @@ BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "Zobrazi èíslo &verzie",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +// CONTROL "Zobrazi èíslo &verzie",ID_DESKTOP_VERSION,"Button", +// BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 END IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 Modified: trunk/reactos/base/shell/explorer/explorer-sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-sv.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-sv.rc Sun Sep 30 21:48:41 2007 @@ -236,8 +236,8 @@ BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "Visa &versionsnummer",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +// CONTROL "Visa &versionsnummer",ID_DESKTOP_VERSION,"Button", +// BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 END IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 Modified: trunk/reactos/base/shell/explorer/explorer-uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-uk.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-uk.rc Sun Sep 30 21:48:41 2007 @@ -198,8 +198,8 @@ BS_BOTTOM | WS_TABSTOP,110,121,46,44 CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | WS_TABSTOP,159,121,46,44 - CONTROL "Â³äîáðàæàòè Íîìåð &Âåðñ³¿",ID_DESKTOP_VERSION,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +// CONTROL "Â³äîáðàæàòè Íîìåð &Âåðñ³¿",ID_DESKTOP_VERSION,"Button", +// BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 END IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194

1 0

[cfinck] 29318: Ensure that the "Name" column in Task-Manager will always be shown, so a Registry setting can't influence it. This is necessary as the "Name" column is currently greyed out in the Column Settings dialog, so the user should have no possibility to change that. Patch by Carlo Bramini (carlo DOT bramix AT libero DOT it) See issue #2217 for more details.
by cfinck＠svn.reactos.org 30 Sep '07

30 Sep '07

Author: cfinck Date: Sun Sep 30 20:27:55 2007 New Revision: 29318 URL: http://svn.reactos.org/svn/reactos?rev=29318&view=rev Log: Ensure that the "Name" column in Task-Manager will always be shown, so a Registry setting can't influence it. This is necessary as the "Name" column is currently greyed out in the Column Settings dialog, so the user should have no possibility to change that. Patch by Carlo Bramini (carlo DOT bramix AT libero DOT it) See issue #2217 for more details. Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c Modified: trunk/reactos/base/applications/taskmgr/taskmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.c (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.c Sun Sep 30 20:27:55 2007 @@ -719,6 +719,13 @@ dwSize = sizeof(TASKMANAGER_SETTINGS); RegQueryValueEx(hKey, _T("Preferences"), NULL, NULL, (LPBYTE)&TaskManagerSettings, &dwSize); + /* + * ATM, the 'ImageName' column is always visible + * (and grayed in configuration dialog) + * This will avoid troubles if the registry gets corrupted. + */ + TaskManagerSettings.Column_ImageName = TRUE; + /* Close the key */ RegCloseKey(hKey); }

1 0

[cfinck] 29317: Oops, smartpdf was already in the rbuild file, deleted the other occurence now
by cfinck＠svn.reactos.org 30 Sep '07

30 Sep '07

Author: cfinck Date: Sun Sep 30 20:14:59 2007 New Revision: 29317 URL: http://svn.reactos.org/svn/reactos?rev=29317&view=rev Log: Oops, smartpdf was already in the rbuild file, deleted the other occurence now Modified: trunk/rosapps/directory.rbuild Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=29317… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Sun Sep 30 20:14:59 2007 @@ -112,13 +112,4 @@ <directory name="winver"> <xi:include href="winver/winver.rbuild" /> </directory> - - - -</group> +</group>

1 0

[cfinck] 29316: - Use unicode="yes", so a Unicode entry point can be used. This fixes the last linking issue and this way we also don't need the other UNICODE defines - Add smartpdf to the "directory.rbuild" of rosapps (but commented out, as I'm not sure if it builds well for everyone now)
by cfinck＠svn.reactos.org 30 Sep '07

30 Sep '07

Author: cfinck Date: Sun Sep 30 20:01:17 2007 New Revision: 29316 URL: http://svn.reactos.org/svn/reactos?rev=29316&view=rev Log: - Use unicode="yes", so a Unicode entry point can be used. This fixes the last linking issue and this way we also don't need the other UNICODE defines - Add smartpdf to the "directory.rbuild" of rosapps (but commented out, as I'm not sure if it builds well for everyone now) Modified: trunk/rosapps/directory.rbuild trunk/rosapps/smartpdf/smartpdf.rbuild Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=29316… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Sun Sep 30 20:01:17 2007 @@ -88,7 +88,15 @@ <directory name="screenshot"> <xi:include href="screenshot/screenshot.rbuild" /> </directory> - + +  + <directory name="sysutils"> <xi:include href="sysutils/sysutils.rbuild" /> </directory> Modified: trunk/rosapps/smartpdf/smartpdf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/smartpdf/smartpdf.rbuild?r… ============================================================================== --- trunk/rosapps/smartpdf/smartpdf.rbuild (original) +++ trunk/rosapps/smartpdf/smartpdf.rbuild Sun Sep 30 20:01:17 2007 @@ -1,4 +1,4 @@ -<module name="smartpdf" type="win32gui" installbase="system32" installname="smartpdf.exe" allowwarnings="true" stdlib="host"> +<module name="smartpdf" type="win32gui" installbase="system32" installname="smartpdf.exe" allowwarnings="true" stdlib="host" unicode="yes"> <library>ntdll</library> <library>kernel32</library> <library>advapi32</library> @@ -18,8 +18,6 @@ <define name="WIN32" /> <define name="_WIN32" /> <define name="_WINDOWS" /> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="_DEBUG" /> <define name="DEBUG" /> <define name="USE_OWN_GET_AUTH_DATA" />

1 0

[frik85] 29315: two linking issues fixed * _wstr_dup * _FT_Get_X11_Font_Format (with a work-around) one weird mingw linking issue remains: * _WinMain@16 trunk/reactos/lib/3rdparty/mingw/main.c:73: undefined reference to `_WinMain@16'
by frik85＠svn.reactos.org 30 Sep '07

30 Sep '07

Author: frik85 Date: Sun Sep 30 19:43:34 2007 New Revision: 29315 URL: http://svn.reactos.org/svn/reactos?rev=29315&view=rev Log: two linking issues fixed * _wstr_dup * _FT_Get_X11_Font_Format (with a work-around) one weird mingw linking issue remains: * _WinMain@16 trunk/reactos/lib/3rdparty/mingw/main.c:73: undefined reference to `_WinMain@16' Modified: trunk/rosapps/smartpdf/baseutils/win_util.c trunk/rosapps/smartpdf/fitz/mupdf/pdf_font.c Modified: trunk/rosapps/smartpdf/baseutils/win_util.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/smartpdf/baseutils/win_uti… ============================================================================== --- trunk/rosapps/smartpdf/baseutils/win_util.c (original) +++ trunk/rosapps/smartpdf/baseutils/win_util.c Sun Sep 30 19:43:34 2007 @@ -315,7 +315,7 @@ return tstr_dup(_T("")); #else /* if all else fails, just use root ("\") directory */ - return tstr_dup(_T("")); + return (TCHAR*)str_dup(_T("")); /* @note: mingw doesn't support tstr_dup */ #endif } @@ -363,7 +363,7 @@ assert(0); return NULL; } - return tstr_dup(buf); + return (TCHAR*)str_dup(buf); /* @note: mingw doesn't support tstr_dup */ } const TCHAR *load_string(int str_id) Modified: trunk/rosapps/smartpdf/fitz/mupdf/pdf_font.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/smartpdf/fitz/mupdf/pdf_fo… ============================================================================== --- trunk/rosapps/smartpdf/fitz/mupdf/pdf_font.c (original) +++ trunk/rosapps/smartpdf/fitz/mupdf/pdf_font.c Sun Sep 30 19:43:34 2007 @@ -45,7 +45,7 @@ static int ftkind(FT_Face face) { - const char *kind = FT_Get_X11_Font_Format(face); + /*const char *kind = FT_Get_X11_Font_Format(face); pdf_logfont("ft font format %s\n", kind); if (!strcmp(kind, "TrueType")) return TRUETYPE; @@ -55,7 +55,9 @@ return TYPE1; if (!strcmp(kind, "CID Type 1")) return TYPE1; - return UNKNOWN; + return UNKNOWN;*/ + /* @note: work-around */ + return TYPE1; } static inline int ftcidtogid(pdf_font *font, int cid)

1 0

[cfinck] 29314: Apply the recent changes in the english desk.cpl resource file to all translations. I only translated them to german, the new strings of the other translations still need to be translated.
by cfinck＠svn.reactos.org 30 Sep '07

30 Sep '07

Author: cfinck Date: Sun Sep 30 19:24:04 2007 New Revision: 29314 URL: http://svn.reactos.org/svn/reactos?rev=29314&view=rev Log: Apply the recent changes in the english desk.cpl resource file to all translations. I only translated them to german, the new strings of the other translations still need to be translated. Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/el-GR.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/hu-HU.rc trunk/reactos/dll/cpl/desk/lang/id-ID.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/desk/lang/sv-SE.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/bg-BG.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/bg-BG.rc Sun Sep 30 19:24:04 2007 @@ -103,6 +103,8 @@ CAPTION "Íàñòðîéêè" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&Åêðàí:",1820,3,100,30,8 LTEXT "<íÿìà>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Ðàçäåëèòåëíà ñïîñîáíîñò",1818,3,120,115,43 @@ -116,7 +118,14 @@ WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 - PUSHBUTTON "Ðàç&øèðåíè...",IDC_SETTINGS_ADVANCED,306,165,56,14 + PUSHBUTTON "Ðàç&øèðåíè...",IDC_SETTINGS_ADVANCED,170,165,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN END IDR_PREVIEW_MENU MENU @@ -124,6 +133,13 @@ MENUITEM "Îáèêíîâåíî", ID_MENU_NORMAL MENUITEM "Èçêëþ÷åíî", ID_MENU_DISABLED MENUITEM "Èçáðàíî", ID_MENU_SELECTED +END + +STRINGTABLE +BEGIN + IDS_MULTIPLEMONITORS "(Multiple Monitors)" + IDS_UNKNOWNMONITOR "(Unknown Monitor)" + IDS_ADVANCEDTITLEFMT "%s and %s" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc Sun Sep 30 19:24:04 2007 @@ -100,6 +100,8 @@ CAPTION "Nastavení" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&Obrazovka:",1820,3,100,38,8 LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Velikost obrazovky",1818,3,120,115,43 @@ -113,7 +115,14 @@ WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 - PUSHBUTTON "R&ozíøené nastavení...",IDC_SETTINGS_ADVANCED,306,165,56,14 + PUSHBUTTON "R&ozíøené nastavení...",IDC_SETTINGS_ADVANCED,170,165,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc Sun Sep 30 19:24:04 2007 @@ -99,6 +99,8 @@ CAPTION "Einstellungen" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Verschieben Sie die Monitor-Symbole, sodass sie der physikalischen Anordnung Ihrer Monitore entsprechen.",-1,3,3,240,10 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&Anzeige:",1820,3,100,30,8 LTEXT "<kein>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "Bi&ldschirmauflösung",1818,3,120,115,43 Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/el-GR.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/el-GR.rc Sun Sep 30 19:24:04 2007 @@ -99,6 +99,8 @@ CAPTION "Ñõèìßóåéò" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&ÅìöÜíéóç:",1820,3,100,30,8 LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Ðåñéï÷Þ ïèüíçò",1818,3,120,115,43 @@ -112,7 +114,14 @@ WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 - PUSHBUTTON "Ãéá &ðñï÷ùñçìÝíïõò...",IDC_SETTINGS_ADVANCED,306,165,56,14 + PUSHBUTTON "Ãéá &ðñï÷ùñçìÝíïõò...",IDC_SETTINGS_ADVANCED,170,165,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN END IDR_PREVIEW_MENU MENU @@ -120,6 +129,13 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Disabled", ID_MENU_DISABLED MENUITEM "Selected", ID_MENU_SELECTED +END + +STRINGTABLE +BEGIN + IDS_MULTIPLEMONITORS "(Multiple Monitors)" + IDS_UNKNOWNMONITOR "(Unknown Monitor)" + IDS_ADVANCEDTITLEFMT "%s and %s" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/es-ES.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/es-ES.rc Sun Sep 30 19:24:04 2007 @@ -106,6 +106,8 @@ CAPTION "Configuración" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "Monitor",1820,3,100,30,8 LTEXT "<ninguno>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "Resolución de &pantalla",1818,3,120,115,43 @@ -119,7 +121,14 @@ WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 - PUSHBUTTON "A&vanzado...",IDC_SETTINGS_ADVANCED,306,165,56,14 + PUSHBUTTON "A&vanzado...",IDC_SETTINGS_ADVANCED,170,165,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN END IDR_PREVIEW_MENU MENU @@ -127,6 +136,13 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Disabled", ID_MENU_DISABLED MENUITEM "Selected", ID_MENU_SELECTED +END + +STRINGTABLE +BEGIN + IDS_MULTIPLEMONITORS "(Multiple Monitors)" + IDS_UNKNOWNMONITOR "(Unknown Monitor)" + IDS_ADVANCEDTITLEFMT "%s and %s" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc Sun Sep 30 19:24:04 2007 @@ -117,7 +117,7 @@ WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 - PUSHBUTTON "A&vancé...",IDC_SETTINGS_ADVANCED,306,165,56,14 + PUSHBUTTON "A&vancé...",IDC_SETTINGS_ADVANCED,170,165,70,14 END IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 @@ -141,7 +141,7 @@ IDS_ADVANCEDTITLEFMT "%s et %s" END -STRINGTABLE +STRINGTABLE BEGIN IDS_CPLNAME "Affichage" IDS_CPLDESCRIPTION "Personalise l'affichage du bureau et de l'écran de veille." Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/hu-HU.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/hu-HU.rc Sun Sep 30 19:24:04 2007 @@ -100,6 +100,8 @@ CAPTION "Beállítások" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&Képernyõ:",1820,3,100,30,8 LTEXT "<nincs>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "Ké&pméret",1818,3,120,115,43 @@ -113,7 +115,14 @@ WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 - PUSHBUTTON "&Haladóknak...",IDC_SETTINGS_ADVANCED,306,165,56,14 + PUSHBUTTON "&Haladóknak...",IDC_SETTINGS_ADVANCED,170,165,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN END IDR_PREVIEW_MENU MENU @@ -121,6 +130,13 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Disabled", ID_MENU_DISABLED MENUITEM "Selected", ID_MENU_SELECTED +END + +STRINGTABLE +BEGIN + IDS_MULTIPLEMONITORS "(Multiple Monitors)" + IDS_UNKNOWNMONITOR "(Unknown Monitor)" + IDS_ADVANCEDTITLEFMT "%s and %s" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/id-ID.rc Sun Sep 30 19:24:04 2007 @@ -99,6 +99,8 @@ CAPTION "Setelan" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&Tampilan:",1820,3,100,30,8 LTEXT "<tidak ada>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "Area &Layar",1818,3,120,115,43 @@ -112,7 +114,14 @@ WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 - PUSHBUTTON "&Lanjutan...",IDC_SETTINGS_ADVANCED,306,165,56,14 + PUSHBUTTON "&Lanjutan...",IDC_SETTINGS_ADVANCED,170,165,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN END IDR_PREVIEW_MENU MENU @@ -120,6 +129,13 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Dimatikan", ID_MENU_DISABLED MENUITEM "Dipilih", ID_MENU_SELECTED +END + +STRINGTABLE +BEGIN + IDS_MULTIPLEMONITORS "(Multiple Monitors)" + IDS_UNKNOWNMONITOR "(Unknown Monitor)" + IDS_ADVANCEDTITLEFMT "%s and %s" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc Sun Sep 30 19:24:04 2007 @@ -99,6 +99,8 @@ CAPTION "Impostazioni" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&Schermo:",1820,3,100,30,8 LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Risoluzione dello schermo",1818,3,120,115,43 @@ -112,7 +114,14 @@ WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 - PUSHBUTTON "A&vanzate...",IDC_SETTINGS_ADVANCED,306,165,56,14 + PUSHBUTTON "A&vanzate...",IDC_SETTINGS_ADVANCED,170,165,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN END IDR_PREVIEW_MENU MENU @@ -120,6 +129,13 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Disabled", ID_MENU_DISABLED MENUITEM "Selected", ID_MENU_SELECTED +END + +STRINGTABLE +BEGIN + IDS_MULTIPLEMONITORS "(Multiple Monitors)" + IDS_UNKNOWNMONITOR "(Unknown Monitor)" + IDS_ADVANCEDTITLEFMT "%s and %s" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ja-JP.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/ja-JP.rc Sun Sep 30 19:24:04 2007 @@ -99,6 +99,8 @@ CAPTION "Ýè" FONT 9, "MS UI Gothic" BEGIN + LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "fBXvC(&D):",1820,3,140,30,8 LTEXT "<none>",IDC_SETTINGS_DEVICE,9,149,224,8 GROUPBOX "æÊÌðx(&S)",1818,3,160,115,43 @@ -112,7 +114,14 @@ WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,188,103,9 - PUSHBUTTON "Ú×Ýè(&V)...",IDC_SETTINGS_ADVANCED,306,205,56,14 + PUSHBUTTON "Ú×Ýè(&V)...",IDC_SETTINGS_ADVANCED,170,205,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN END IDR_PREVIEW_MENU MENU @@ -120,6 +129,13 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Disabled", ID_MENU_DISABLED MENUITEM "Selected", ID_MENU_SELECTED +END + +STRINGTABLE +BEGIN + IDS_MULTIPLEMONITORS "(Multiple Monitors)" + IDS_UNKNOWNMONITOR "(Unknown Monitor)" + IDS_ADVANCEDTITLEFMT "%s and %s" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/nl-NL.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/nl-NL.rc Sun Sep 30 19:24:04 2007 @@ -101,6 +101,8 @@ CAPTION "Instellingen" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&Scherm:",1820,3,100,30,8 LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Schermresolutie",1818,3,120,115,43 @@ -114,7 +116,14 @@ WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 - PUSHBUTTON "&Geavanceerd...",IDC_SETTINGS_ADVANCED,306,165,56,14 + PUSHBUTTON "&Geavanceerd...",IDC_SETTINGS_ADVANCED,170,165,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN END IDR_PREVIEW_MENU MENU @@ -122,6 +131,13 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Disabled", ID_MENU_DISABLED MENUITEM "Selected", ID_MENU_SELECTED +END + +STRINGTABLE +BEGIN + IDS_MULTIPLEMONITORS "(Multiple Monitors)" + IDS_UNKNOWNMONITOR "(Unknown Monitor)" + IDS_ADVANCEDTITLEFMT "%s and %s" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc Sun Sep 30 19:24:04 2007 @@ -105,6 +105,8 @@ CAPTION "Ustawienia" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&Ekran:",1820,3,100,30,8 LTEXT "<brak>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Rozdzielczoæ ekranu",1818,3,120,115,43 @@ -118,7 +120,14 @@ WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 - PUSHBUTTON "Zaawa&nsowane...",IDC_SETTINGS_ADVANCED,306,165,56,14 + PUSHBUTTON "Zaawa&nsowane...",IDC_SETTINGS_ADVANCED,170,165,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN END IDR_PREVIEW_MENU MENU @@ -126,6 +135,13 @@ MENUITEM "Normalny", ID_MENU_NORMAL MENUITEM "Wy³¹czony", ID_MENU_DISABLED MENUITEM "Wybrany", ID_MENU_SELECTED +END + +STRINGTABLE +BEGIN + IDS_MULTIPLEMONITORS "(Multiple Monitors)" + IDS_UNKNOWNMONITOR "(Unknown Monitor)" + IDS_ADVANCEDTITLEFMT "%s and %s" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc Sun Sep 30 19:24:04 2007 @@ -99,6 +99,8 @@ CAPTION "Ïàðàìåòðû" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&Äèñïëåé:",1820,3,100,30,8 LTEXT "<íåò>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Ðàçðåøåíèå ýêðàíà",1818,3,120,119,43 @@ -112,7 +114,14 @@ WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 - PUSHBUTTON "Äî&ïîëíèòåëüíî",IDC_SETTINGS_ADVANCED,306,165,56,14 + PUSHBUTTON "Äî&ïîëíèòåëüíî",IDC_SETTINGS_ADVANCED,170,165,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN END IDR_PREVIEW_MENU MENU @@ -120,6 +129,13 @@ MENUITEM "Îáû÷íàÿ", ID_MENU_NORMAL MENUITEM "Îòêëþ÷åííàÿ", ID_MENU_DISABLED MENUITEM "Âûáðàííàÿ", ID_MENU_SELECTED +END + +STRINGTABLE +BEGIN + IDS_MULTIPLEMONITORS "(Multiple Monitors)" + IDS_UNKNOWNMONITOR "(Unknown Monitor)" + IDS_ADVANCEDTITLEFMT "%s and %s" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc Sun Sep 30 19:24:04 2007 @@ -108,6 +108,8 @@ CAPTION "Nastavenie" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&Display:",1820,3,100,30,8 LTEXT "<none>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Screen area",1818,3,120,115,43 @@ -121,7 +123,14 @@ WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,148,103,9 - PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,306,165,56,14 + PUSHBUTTON "Ad&vanced...",IDC_SETTINGS_ADVANCED,170,165,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN END IDR_PREVIEW_MENU MENU @@ -129,6 +138,13 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Disabled", ID_MENU_DISABLED MENUITEM "Selected", ID_MENU_SELECTED +END + +STRINGTABLE +BEGIN + IDS_MULTIPLEMONITORS "(Multiple Monitors)" + IDS_UNKNOWNMONITOR "(Unknown Monitor)" + IDS_ADVANCEDTITLEFMT "%s and %s" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sv-SE.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/sv-SE.rc Sun Sep 30 19:24:04 2007 @@ -102,6 +102,8 @@ CAPTION "Inställningar" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&Bild:",1820,3,100,30,8 LTEXT "<ingen>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Bildyta",1818,3,120,115,43 @@ -115,7 +117,14 @@ WS_VSCROLL | WS_TABSTOP CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, 131,138,103,9 - PUSHBUTTON "&Avancerat...",IDC_SETTINGS_ADVANCED,306,165,56,14 + PUSHBUTTON "&Avancerat...",IDC_SETTINGS_ADVANCED,170,165,70,14 +END + +IDD_ADVANCED_GENERAL DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN END IDR_PREVIEW_MENU MENU @@ -123,6 +132,13 @@ MENUITEM "Normal", ID_MENU_NORMAL MENUITEM "Disabled", ID_MENU_DISABLED MENUITEM "Selected", ID_MENU_SELECTED +END + +STRINGTABLE +BEGIN + IDS_MULTIPLEMONITORS "(Multiple Monitors)" + IDS_UNKNOWNMONITOR "(Unknown Monitor)" + IDS_ADVANCEDTITLEFMT "%s and %s" END STRINGTABLE Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/desk/lang/uk-UA.rc Sun Sep 30 19:24:04 2007 @@ -107,6 +107,8 @@ CAPTION "Ïàðàìåòðè" FONT 8, "MS Shell Dlg" BEGIN + LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.",-1,3,3,240,10 + CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "&Äèñïëåé:",1820,3,100,30,8 LTEXT "<íåìàº>",IDC_SETTINGS_DEVICE,9,109,224,8 GROUPBOX "&Îáëàñòü åêðàíó",1818,3,120,115,43

1 0

[frik85] 29313: removed extern-link function, for the meanwhile 3 linking issues left: * _wstr_dup * _WinMain@16 * _FT_Get_X11_Font_Format
by frik85＠svn.reactos.org 30 Sep '07

30 Sep '07

Author: frik85 Date: Sun Sep 30 19:10:10 2007 New Revision: 29313 URL: http://svn.reactos.org/svn/reactos?rev=29313&view=rev Log: removed extern-link function, for the meanwhile 3 linking issues left: * _wstr_dup * _WinMain@16 * _FT_Get_X11_Font_Format Modified: trunk/rosapps/smartpdf/src/DisplayModel.h trunk/rosapps/smartpdf/src/DisplayModelSplash.cc trunk/rosapps/smartpdf/src/SumatraPDF.cpp Modified: trunk/rosapps/smartpdf/src/DisplayModel.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/smartpdf/src/DisplayModel.… ============================================================================== --- trunk/rosapps/smartpdf/src/DisplayModel.h (original) +++ trunk/rosapps/smartpdf/src/DisplayModel.h Sun Sep 30 19:10:10 2007 @@ -329,7 +329,7 @@ extern DisplaySettings gDisplaySettings; /* must be implemented somewhere else */ -extern void LaunchBrowser(const char *uri); +//extern void LaunchBrowser(const char *uri); /* We keep a cache of rendered bitmaps. BitmapCacheEntry keeps data that uniquely identifies rendered page (dm, pageNo, rotation, zoomReal) Modified: trunk/rosapps/smartpdf/src/DisplayModelSplash.cc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/smartpdf/src/DisplayModelS… ============================================================================== --- trunk/rosapps/smartpdf/src/DisplayModelSplash.cc (original) +++ trunk/rosapps/smartpdf/src/DisplayModelSplash.cc Sun Sep 30 19:10:10 2007 @@ -563,7 +563,9 @@ uri = linkURI->getURI()->getCString(); if (str_empty(uri)) return; - LaunchBrowser(uri); + //LaunchBrowser(uri); + MessageBox(NULL,(TCHAR*)uri, TEXT("Extern link blocked"), 0); /* @note: work-around to solve linking issue */ + } void DisplayModelSplash::handleLinkLaunch(LinkLaunch* linkLaunch) Modified: trunk/rosapps/smartpdf/src/SumatraPDF.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/smartpdf/src/SumatraPDF.cp… ============================================================================== --- trunk/rosapps/smartpdf/src/SumatraPDF.cpp (original) +++ trunk/rosapps/smartpdf/src/SumatraPDF.cpp Sun Sep 30 19:10:10 2007 @@ -282,10 +282,10 @@ g_currLangName = NULL; } -void LaunchBrowser(const TCHAR *url) +/*void LaunchBrowser(const TCHAR *url) { launch_url(url); -} +}*/ static BOOL pageRenderAbortCb(void *data) { @@ -2703,7 +2703,9 @@ if (WS_ABOUT == win->state) { url = AboutGetLink(win, x, y); if (url == win->url) - LaunchBrowser(url); + //LaunchBrowser(url); + MessageBox(NULL,(TCHAR*)url, TEXT("Extern link blocked"), 0); /* @note: work-around to solve linking issue */ + win->url = NULL; return; } @@ -4166,7 +4168,8 @@ break; case IDM_VISIT_WEBSITE: - LaunchBrowser(_T("http://blog.kowalczyk.info/software/sumatrapdf/")); + //LaunchBrowser(_T("http://blog.kowalczyk.info/software/sumatrapdf/")); + MessageBox(NULL, TEXT("http://www.reactos.org/"), TEXT("Extern link blocked"), 0); /* @note: work-around to solve linking issue */ break; case IDM_LANG_EN:

1 0

[frik85] 29312: delete unnecessary files
by frik85＠svn.reactos.org 30 Sep '07

30 Sep '07

Author: frik85 Date: Sun Sep 30 18:36:14 2007 New Revision: 29312 URL: http://svn.reactos.org/svn/reactos?rev=29312&view=rev Log: delete unnecessary files Removed: trunk/rosapps/smartpdf/baseutils/test_win.bat trunk/rosapps/smartpdf/baseutils/win-build.bat trunk/rosapps/smartpdf/baseutils/win-rebuild.bat trunk/rosapps/smartpdf/fitz/build-debug.bat trunk/rosapps/smartpdf/fitz/build.bat trunk/rosapps/smartpdf/fitz/clean.bat trunk/rosapps/smartpdf/src/Kopie von SumatraPDF.cpp trunk/rosapps/smartpdf/src/build-release.bat trunk/rosapps/smartpdf/src/icons-silk/Thumbs.db [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/rosapps/smartpdf/baseutils/test_win.bat URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/smartpdf/baseutils/test_wi… Removed: trunk/rosapps/smartpdf/baseutils/win-build.bat URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/smartpdf/baseutils/win-bui… Removed: trunk/rosapps/smartpdf/baseutils/win-rebuild.bat URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/smartpdf/baseutils/win-reb… Removed: trunk/rosapps/smartpdf/fitz/build-debug.bat URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/smartpdf/fitz/build-debug.… Removed: trunk/rosapps/smartpdf/fitz/build.bat URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/smartpdf/fitz/build.bat?re… Removed: trunk/rosapps/smartpdf/fitz/clean.bat URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/smartpdf/fitz/clean.bat?re… Removed: trunk/rosapps/smartpdf/src/Kopie von SumatraPDF.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/smartpdf/src/Kopie%20von%2… Removed: trunk/rosapps/smartpdf/src/build-release.bat URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/smartpdf/src/build-release… Removed: trunk/rosapps/smartpdf/src/icons-silk/Thumbs.db URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/smartpdf/src/icons-silk/Th…

1 0

[dreimer] 29311: Patch III from Pierre Schweitzer. Correct Button States and Whitespace changes.
by dreimer＠svn.reactos.org 30 Sep '07

30 Sep '07

Author: dreimer Date: Sun Sep 30 17:56:28 2007 New Revision: 29311 URL: http://svn.reactos.org/svn/reactos?rev=29311&view=rev Log: Patch III from Pierre Schweitzer. Correct Button States and Whitespace changes. Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc trunk/tools/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE-Windows/Tools/config/resources.h trunk/tools/RosBE-Windows/Tools/config/todo.txt Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc Sun Sep 30 17:56:28 2007 @@ -13,8 +13,8 @@ COMBOBOX IDC_BACK, 100, 60, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST CONTROL "Kompilierdauer anzeigen", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 90, 21 CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 85, 60, 21 - EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP + EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP | WS_DISABLED EDITTEXT ID_MGWDIR, 10, 127, 200, 13, WS_TABSTOP PUSHBUTTON "...", ID_BROWSEMGW, 215, 127, 30, 13, WS_TABSTOP PUSHBUTTON "Speichern", ID_OK, 63, 155, 59, 26, WS_TABSTOP Modified: trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc Sun Sep 30 17:56:28 2007 @@ -13,8 +13,8 @@ COMBOBOX IDC_BACK, 100, 60, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST CONTROL "Show Build Time", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 90, 21 CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 85, 60, 21 - EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP + EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP | WS_DISABLED EDITTEXT ID_MGWDIR, 10, 127, 200, 13, WS_TABSTOP PUSHBUTTON "...", ID_BROWSEMGW, 215, 127, 30, 13, WS_TABSTOP PUSHBUTTON "Save", ID_OK, 63, 155, 59, 26, WS_TABSTOP Modified: trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc Sun Sep 30 17:56:28 2007 @@ -13,8 +13,8 @@ COMBOBOX IDC_BACK, 100, 60, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST CONTROL "Montrer le temps de compilation", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 90, 21 CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 85, 60, 21 - EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP + EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP | WS_DISABLED EDITTEXT ID_MGWDIR, 10, 127, 200, 13, WS_TABSTOP PUSHBUTTON "...", ID_BROWSEMGW, 215, 127, 30, 13, WS_TABSTOP PUSHBUTTON "Sauvegarder", ID_OK, 63, 155, 59, 26, WS_TABSTOP Modified: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Sun Sep 30 17:56:28 2007 @@ -13,8 +13,8 @@ COMBOBOX IDC_BACK, 100, 60, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST CONTROL "Ïîêàçûâàòü Âðåìÿ", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 90, 21 CONTROL "Âåñòè Ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 85, 60, 21 - EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP + EDITTEXT ID_LOGDIR, 10, 110, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 110, 30, 13, WS_TABSTOP | WS_DISABLED EDITTEXT ID_MGWDIR, 10, 127, 200, 13, WS_TABSTOP PUSHBUTTON "...", ID_BROWSEMGW, 215, 127, 30, 13, WS_TABSTOP PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 155, 59, 26, WS_TABSTOP Modified: trunk/tools/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.c (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.c Sun Sep 30 17:56:28 2007 @@ -65,7 +65,7 @@ DlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) { WCHAR defaultmingwpath[MAX_PATH]; - static HICON hIcon; + static HICON hIcon; switch (Msg) { @@ -90,8 +90,7 @@ GetCurrentDirectory(MAX_PATH, defaultmingwpath); wcscat(defaultmingwpath, MINGWVERSION); SetDlgItemText(Dlg, ID_MGWDIR, defaultmingwpath); - EnableWindow(GetDlgItem(Dlg, ID_BROWSE), FALSE); - EnableWindow(GetDlgItem(Dlg, ID_LOGDIR), FALSE); + return TRUE; } @@ -122,7 +121,7 @@ WCHAR MGWPath[MAX_PATH]; BROWSEINFO PathInfo; ZeroMemory(&PathInfo, sizeof(BROWSEINFO)); -/* Fails with IShellFolder interface */ +/* FIXME : Fails with IShellFolder interface */ #if 0 LPSHELLFOLDER psf = NULL; HRESULT hr; @@ -148,10 +147,10 @@ return FALSE; } - case WM_DESTROY: - { - DestroyIcon(hIcon); - } + case WM_DESTROY: + { + DestroyIcon(hIcon); + } case WM_CLOSE: { Modified: trunk/tools/RosBE-Windows/Tools/config/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/r… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/resources.h (original) +++ trunk/tools/RosBE-Windows/Tools/config/resources.h Sun Sep 30 17:56:28 2007 @@ -1,12 +1,13 @@ -#define ID_OPTICON 0x3 -#define ID_DIALOG 0x10 #define ID_OK 0x1 #define ID_CANCEL 0x2 -#define IDC_FONT 0x1 -#define IDC_BACK 0x2 -#define ID_SAVELOGS 0x5 -#define ID_SHOWBUILDTIME 0x6 -#define ID_LOGDIR 0x7 +#define ID_OPTICON 0x3 +#define ID_SAVELOGS 0x4 +#define ID_SHOWBUILDTIME 0x5 +#define ID_LOGDIR 0x6 #define ID_BROWSE 0x7 #define ID_MGWDIR 0x8 #define ID_BROWSEMGW 0x9 +#define ID_DIALOG 0x10 +#define IDC_FONT 0x1 +#define IDC_BACK 0x2 + Modified: trunk/tools/RosBE-Windows/Tools/config/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/t… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/todo.txt (original) +++ trunk/tools/RosBE-Windows/Tools/config/todo.txt Sun Sep 30 17:56:28 2007 @@ -2,5 +2,4 @@ - Load old settings - Disable Save button if there are no changes - Check validity of log path before saving -- Find out how to disable ... button - Font preview

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 September 2007