Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[tkreuzer] 29310: reorder libs in rbuild file, reducing the number of unresolved references to 4
by tkreuzer＠svn.reactos.org 30 Sep '07

30 Sep '07

Author: tkreuzer Date: Sun Sep 30 17:48:53 2007 New Revision: 29310 URL: http://svn.reactos.org/svn/reactos?rev=29310&view=rev Log: reorder libs in rbuild file, reducing the number of unresolved references to 4 Modified: trunk/rosapps/smartpdf/smartpdf.rbuild 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 17:48:53 2007 @@ -1,4 +1,4 @@ -<module name="smartpdf" type="win32cui" installbase="system32" installname="smartpdf.exe" allowwarnings="true" stdlib="host"> +<module name="smartpdf" type="win32gui" installbase="system32" installname="smartpdf.exe" allowwarnings="true" stdlib="host"> <library>ntdll</library> <library>kernel32</library> <library>advapi32</library> @@ -9,11 +9,11 @@ <library>shell32</library> <library>user32</library> <library>winspool</library> + <library>fitz</library> + <library>poppler</library> + <library>freetype</library> <library>libjpeg</library> <library>zlib</library> - <library>freetype</library> - <library>fitz</library> - <library>poppler</library> <define name="__USE_W32API" /> <define name="WIN32" /> <define name="_WIN32" />

1 0

[gbrunmar] 29309: Changes to regedit: * Fixed updating tree view when renaming a key * Fixed a tree view refresh bug * Proper updating of the tree view when deleting keys
by gbrunmar＠svn.reactos.org 30 Sep '07

30 Sep '07

Author: gbrunmar Date: Sun Sep 30 17:31:44 2007 New Revision: 29309 URL: http://svn.reactos.org/svn/reactos?rev=29309&view=rev Log: Changes to regedit: * Fixed updating tree view when renaming a key * Fixed a tree view refresh bug * Proper updating of the tree view when deleting keys Modified: trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/treeview.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c (original) +++ trunk/reactos/base/applications/regedit/childwnd.c Sun Sep 30 17:31:44 2007 @@ -522,7 +522,7 @@ HKEY hRootKey; HKEY hKey = NULL; LPNMTVDISPINFO ptvdi; - LONG lResult = ERROR_SUCCESS; + LONG lResult = TRUE; TCHAR szBuffer[MAX_PATH]; ptvdi = (LPNMTVDISPINFO) lParam; @@ -533,13 +533,14 @@ keyPath = GetItemPath(pChildWnd->hTreeWnd, ptvdi->item.hItem, &hRootKey); if (RegOpenKeyEx(hRootKey, szBuffer, 0, KEY_READ, &hKey) == ERROR_SUCCESS) { - lResult = REG_OPENED_EXISTING_KEY; + lResult = FALSE; RegCloseKey(hKey); (void)TreeView_EditLabel(pChildWnd->hTreeWnd, ptvdi->item.hItem); } else { - lResult = RegRenameKey(hRootKey, keyPath, ptvdi->item.pszText); + if (RegRenameKey(hRootKey, keyPath, ptvdi->item.pszText) != ERROR_SUCCESS) + lResult = FALSE; } return lResult; } Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c (original) +++ trunk/reactos/base/applications/regedit/framewnd.c Sun Sep 30 17:31:44 2007 @@ -949,7 +949,10 @@ MessageBeep(MB_ICONHAND); } else if (DeleteKey(hWnd, hKeyRoot, keyPath)) + { DeleteNode(g_pChildWnd->hTreeWnd, 0); + RefreshTreeView(g_pChildWnd->hTreeWnd); + } } break; case ID_EDIT_NEW_STRINGVALUE: Modified: trunk/reactos/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/treeview.c (original) +++ trunk/reactos/base/applications/regedit/treeview.c Sun Sep 30 17:31:44 2007 @@ -218,7 +218,17 @@ pszNodes[dwActualSize] = '\0'; } - /* Now go through all the children in the registry, and check if any have to be added. */ + /* Now go through all the children in the tree, and check if any have to be removed. */ + childItem = TreeView_GetChild(hwndTV, hItem); + while (childItem) { + HTREEITEM nextItem = TreeView_GetNextSibling(hwndTV, childItem); + if (RefreshTreeItem(hwndTV, childItem) == FALSE) { + (void)TreeView_DeleteItem(hwndTV, childItem); + } + childItem = nextItem; + } + + /* Now go through all the children in the registry, and check if any have to be added. */ bAddedAny = FALSE; for (dwIndex = 0; dwIndex < dwCount; dwIndex++) { DWORD cName = dwMaxSubKeyLen, dwSubCount; @@ -258,15 +268,6 @@ if (bAddedAny) SendMessage(hwndTV, TVM_SORTCHILDREN, 0, (LPARAM) hItem); - /* Now go through all the children in the tree, and check if any have to be removed. */ - childItem = TreeView_GetChild(hwndTV, hItem); - while (childItem) { - HTREEITEM nextItem = TreeView_GetNextSibling(hwndTV, childItem); - if (RefreshTreeItem(hwndTV, childItem) == FALSE) { - (void)TreeView_DeleteItem(hwndTV, childItem); - } - childItem = nextItem; - } bSuccess = TRUE; done:

1 0

[gbrunmar] 29308: * Unicode fixes to regedit * Fixed bug 2494 Patch by Carlo Bramix [carlo (dot) bramix (at) libero (dot) it]. See issue #2494 for more details.
by gbrunmar＠svn.reactos.org 30 Sep '07

30 Sep '07

Author: gbrunmar Date: Sun Sep 30 17:23:31 2007 New Revision: 29308 URL: http://svn.reactos.org/svn/reactos?rev=29308&view=rev Log: * Unicode fixes to regedit * Fixed bug 2494 Patch by Carlo Bramix [carlo (dot) bramix (at) libero (dot) it]. See issue #2494 for more details. Modified: trunk/reactos/base/applications/regedit/childwnd.c trunk/reactos/base/applications/regedit/framewnd.c trunk/reactos/base/applications/regedit/regproc.c trunk/reactos/base/applications/regedit/treeview.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c (original) +++ trunk/reactos/base/applications/regedit/childwnd.c Sun Sep 30 17:23:31 2007 @@ -202,7 +202,7 @@ iSuggestionsLength--; /* Are we a root key in HKEY_CLASSES_ROOT? */ - if ((hRootKey == HKEY_CLASSES_ROOT) && pszKeyPath[0] && !_tcschr(pszKeyPath, '\\')) + if ((hRootKey == HKEY_CLASSES_ROOT) && pszKeyPath[0] && !_tcschr(pszKeyPath, TEXT('\\'))) { do { Modified: trunk/reactos/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/framewnd.c (original) +++ trunk/reactos/base/applications/regedit/framewnd.c Sun Sep 30 17:23:31 2007 @@ -150,7 +150,7 @@ /* load appropriate string*/ LPTSTR lpsz = str; /* first newline terminates actual string*/ - lpsz = _tcschr(lpsz, '\n'); + lpsz = _tcschr(lpsz, _T('\n')); if (lpsz != NULL) *lpsz = '\0'; } @@ -877,7 +877,7 @@ if (lRet != ERROR_SUCCESS) hKey = 0; } - switch (LOWORD(wParam)) { + switch (LOWORD(wParam)) { case ID_EDIT_MODIFY: if (valueName && ModifyValue(hWnd, hKey, valueName, FALSE)) RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath); @@ -887,13 +887,23 @@ RefreshListView(g_pChildWnd->hListWnd, hKeyRoot, keyPath); break; case ID_EDIT_RENAME: - if(ListView_GetSelectedCount(g_pChildWnd->hListWnd) == 1) - { - item = ListView_GetNextItem(g_pChildWnd->hListWnd, -1, LVNI_SELECTED); - if(item > -1) - { - (void)ListView_EditLabel(g_pChildWnd->hListWnd, item); - } + if (GetFocus() == g_pChildWnd->hListWnd) + { + if(ListView_GetSelectedCount(g_pChildWnd->hListWnd) == 1) + { + item = ListView_GetNextItem(g_pChildWnd->hListWnd, -1, LVNI_SELECTED); + if(item > -1) + { + (void)ListView_EditLabel(g_pChildWnd->hListWnd, item); + } + } + } + if (GetFocus() == g_pChildWnd->hTreeWnd) + { + /* Get focused entry of treeview (if any) */ + HTREEITEM hItem = TreeView_GetSelection(g_pChildWnd->hTreeWnd); + if (hItem != NULL) + (void)TreeView_EditLabel(g_pChildWnd->hTreeWnd, hItem); } break; case ID_EDIT_DELETE: Modified: trunk/reactos/base/applications/regedit/regproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regproc.c (original) +++ trunk/reactos/base/applications/regedit/regproc.c Sun Sep 30 17:23:31 2007 @@ -1735,7 +1735,7 @@ /* Go up and find the next sibling key */ do { - s = _tcsrchr(lpSubKey, '\\'); + s = _tcsrchr(lpSubKey, TEXT('\\')); if (s) { *s = '\0'; @@ -1832,7 +1832,7 @@ if (lResult != ERROR_SUCCESS) return lResult; - s = _tcsrchr(lpSubKey, '\\'); + s = _tcsrchr(lpSubKey, TEXT('\\')); s = s ? s + 1 : lpSubKey; } while(!(dwSearchFlags & RSF_LOOKATKEYS) || !RegSearchCompare(s, pszSearchString, dwSearchFlags)); @@ -1871,3 +1871,4 @@ } + Modified: trunk/reactos/base/applications/regedit/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/treeview.c (original) +++ trunk/reactos/base/applications/regedit/treeview.c Sun Sep 30 17:23:31 2007 @@ -602,7 +602,7 @@ while(keyPath[0]) { - s = _tcschr(keyPath, '\\'); + s = _tcschr(keyPath, TEXT('\\')); lstrcpyn(szPathPart, keyPath, s ? s - keyPath + 1 : _tcslen(keyPath) + 1); /* Special case for root to expand root key abbreviations */ @@ -656,3 +656,4 @@ return TRUE; } +

1 0

[hpoussin] 29307: Reference file handle according to previous mode
by hpoussin＠svn.reactos.org 30 Sep '07

30 Sep '07

Author: hpoussin Date: Sun Sep 30 17:11:36 2007 New Revision: 29307 URL: http://svn.reactos.org/svn/reactos?rev=29307&view=rev Log: Reference file handle according to previous mode Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Sun Sep 30 17:11:36 2007 @@ -2421,7 +2421,7 @@ Status = ObReferenceObjectByHandle(FileHandle, FileAccess, IoFileObjectType, - UserMode, + ExGetPreviousMode(), (PVOID*)(PVOID)&FileObject, NULL); if (!NT_SUCCESS(Status))

1 0

[greatlrd] 29306: Adding a text file call notes.txt it is some werid thing I have have not yet figout how it works. Add testcase for AddFontResourceA
by greatlrd＠svn.reactos.org 30 Sep '07

30 Sep '07

Author: greatlrd Date: Sun Sep 30 15:57:37 2007 New Revision: 29306 URL: http://svn.reactos.org/svn/reactos?rev=29306&view=rev Log: Adding a text file call notes.txt it is some werid thing I have have not yet figout how it works. Add testcase for AddFontResourceA Added: trunk/rostests/apitests/gdi32api/Notes.txt (with props) trunk/rostests/apitests/gdi32api/tests/AddFontResource.c (with props) trunk/rostests/apitests/testdata/ trunk/rostests/apitests/testdata/ReadMe.txt (with props) trunk/rostests/apitests/testdata/test.otf (with props) trunk/rostests/apitests/testdata/test.sfd (with props) trunk/rostests/apitests/testdata/test.ttf (with props) Modified: trunk/rostests/apitests/gdi32api/testlist.c trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/rostests/apitests/gdi32api/Notes.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/Notes.t… Modified: trunk/rostests/apitests/gdi32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis… Added: trunk/rostests/apitests/gdi32api/tests/AddFontResource.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/A… Added: trunk/rostests/apitests/testdata/ReadMe.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/testdata/ReadMe.… Added: trunk/rostests/apitests/testdata/test.otf URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/testdata/test.ot… Added: trunk/rostests/apitests/testdata/test.sfd URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/testdata/test.sf… Added: trunk/rostests/apitests/testdata/test.ttf URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/testdata/test.tt… Modified: trunk/rostests/apitests/w32knapi/ntdd/NtGdiDdQueryDirectDrawObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntdd/Nt…

1 0

[dreimer] 29305: Part II of Piere Schweitzer's Patch: - Added French translation. - Added the possibility to choose MingW directory. - Added support for WinXP style. - Added the support of C99. - Fixed warnings. Small Modification by me: added -s and went from -O3 to -O2 in Makefile.
by dreimer＠svn.reactos.org 30 Sep '07

30 Sep '07

Author: dreimer Date: Sun Sep 30 13:29:25 2007 New Revision: 29305 URL: http://svn.reactos.org/svn/reactos?rev=29305&view=rev Log: Part II of Piere Schweitzer's Patch: - Added French translation. - Added the possibility to choose MingW directory. - Added support for WinXP style. - Added the support of C99. - Fixed warnings. Small Modification by me: added -s and went from -O3 to -O2 in Makefile. Added: trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc trunk/tools/RosBE-Windows/Tools/config/options.exe.Manifest 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/ru-RU.rc trunk/tools/RosBE-Windows/Tools/config/makefile trunk/tools/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE-Windows/Tools/config/options.rc 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 13:29:25 2007 @@ -1,6 +1,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 175 +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 192 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "RosBE Einstellungen" FONT 8, "MS Shell Dlg" @@ -15,6 +15,8 @@ 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 - PUSHBUTTON "Speichern", ID_OK, 63, 138, 59, 26, WS_TABSTOP - PUSHBUTTON "Abbrechen", ID_CANCEL, 133, 138, 59, 26, WS_TABSTOP + 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 + PUSHBUTTON "Abbrechen", ID_CANCEL, 133, 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 13:29:25 2007 @@ -1,6 +1,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 175 +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 192 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "RosBE Settings" FONT 8, "MS Shell Dlg" @@ -15,6 +15,8 @@ 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 - PUSHBUTTON "Save", ID_OK, 63, 138, 59, 26, WS_TABSTOP - PUSHBUTTON "Cancel", ID_CANCEL, 133, 138, 59, 26, WS_TABSTOP + 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 + PUSHBUTTON "Cancel", ID_CANCEL, 133, 155, 59, 26, WS_TABSTOP } Added: 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 (added) +++ trunk/tools/RosBE-Windows/Tools/config/lang/fr-FR.rc Sun Sep 30 13:29:25 2007 @@ -1,0 +1,22 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 192 +STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Paramètre du RosBE" +FONT 8, "MS Shell Dlg" +{ + // x, pos_hight, width, hight + LTEXT "Paramètres de l'Environnement de Compilation de ReactOS", 0x0, 10, 10, 140, 13 + LTEXT "Couleur d'arrière plan", 0x0, 10, 35, 60, 12 + COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Couleur de la police", 0x0, 10, 60, 60, 12 + 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_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 + PUSHBUTTON "Annuler", ID_CANCEL, 133, 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 13:29:25 2007 @@ -1,6 +1,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 175 +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 192 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêè RosBE" FONT 8, "MS Shell Dlg" @@ -15,6 +15,8 @@ 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 - PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 138, 59, 26, WS_TABSTOP - PUSHBUTTON "Îòìåíèòü", ID_CANCEL, 133, 138, 59, 26, WS_TABSTOP + 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 + PUSHBUTTON "Îòìåíèòü", ID_CANCEL, 133, 155, 59, 26, WS_TABSTOP } Modified: trunk/tools/RosBE-Windows/Tools/config/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/m… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/makefile (original) +++ trunk/tools/RosBE-Windows/Tools/config/makefile Sun Sep 30 13:29:25 2007 @@ -5,8 +5,8 @@ all: $(TARGET) CPP=mingw32-gcc -CFLAGS := -DWIN32 -DUNICODE -O3 -LFLAGS := -mwindows +CFLAGS := -DWIN32 -DUNICODE -O2 -std=c99 +LFLAGS := -mwindows -s LIBS := SRCS := options.c 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 13:29:25 2007 @@ -2,6 +2,7 @@ * RosBE Options Dialog (options.c) * * Copyright 2007 by Maarten Bosma + * Pierre Schweitzer * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -21,7 +22,10 @@ #include <windows.h> #include <stdio.h> #include <shlobj.h> +#include <wchar.h> #include "resources.h" + +#define MINGWVERSION L"\\4.1.3" // note: do not change the order - theses are the color under winxp they might differ in another OSes WCHAR *Colors[] = { L"black", L"dark blue", L"green", L"turquoise", L"dark red", L"purple", @@ -31,18 +35,19 @@ HINSTANCE hInstance; -int +VOID WriteSettings(HWND hwnd) { int foreground, background; BOOL showtime, writelog; - WCHAR logpath[MAX_PATH]; + WCHAR logpath[MAX_PATH], mingwpath[MAX_PATH]; showtime = SendMessage(GetDlgItem(hwnd, ID_SHOWBUILDTIME), BM_GETCHECK, 0, 0) == BST_CHECKED; writelog = SendMessage(GetDlgItem(hwnd, ID_SAVELOGS), BM_GETCHECK, 0, 0) == BST_CHECKED; foreground = SendMessage(GetDlgItem(hwnd, IDC_BACK), CB_GETCURSEL, 0, 0); background = SendMessage(GetDlgItem(hwnd, IDC_FONT), CB_GETCURSEL, 0, 0); GetDlgItemText(hwnd, ID_LOGDIR, logpath, MAX_PATH); + GetDlgItemText(hwnd, ID_MGWDIR, mingwpath, MAX_PATH); FILE *pFile = fopen("options.cmd", "w"); @@ -51,6 +56,7 @@ fprintf(pFile, "set ROSBE_SHOWTIME=%d\n", showtime); fprintf(pFile, "set ROSBE_WRITELOG=%d\n", writelog); fprintf(pFile, "set ROSBE_LOGPATH=%S\n", logpath); + fprintf(pFile, "set ROSBE_MINGWPATH=%S\n", mingwpath); fclose(pFile); } @@ -58,7 +64,7 @@ INT_PTR CALLBACK DlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) { - int i = 0; + WCHAR defaultmingwpath[MAX_PATH]; static HICON hIcon; switch (Msg) @@ -74,13 +80,16 @@ if(hIcon) SendMessage(Dlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon); - for(i = 0; i < sizeof(Colors) / sizeof(char *); i++) + for(unsigned int i = 0; i < sizeof(Colors) / sizeof(char *); i++) { SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_ADDSTRING, 0, (LPARAM) (Colors[i])); SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_ADDSTRING, 0, (LPARAM) (Colors[i])); } SendMessage(GetDlgItem(Dlg, IDC_BACK), CB_SETCURSEL, 0xA, 0); SendMessage(GetDlgItem(Dlg, IDC_FONT), CB_SETCURSEL, 0, 0); + 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; @@ -100,12 +109,34 @@ else if (wParam == ID_BROWSE) { WCHAR Path[MAX_PATH]; - BROWSEINFO PathInfo = { 0 }; + BROWSEINFO PathInfo; + ZeroMemory(&PathInfo, sizeof(BROWSEINFO)); PathInfo.hwndOwner = Dlg; PathInfo.lpszTitle = L"Please choose a directory where the the logs should be stored:"; LPITEMIDLIST pidl = SHBrowseForFolder(&PathInfo); if (pidl && SHGetPathFromIDList(pidl, Path)) SetDlgItemText(Dlg, ID_LOGDIR, Path); + } + else if (wParam == ID_BROWSEMGW) + { + WCHAR MGWPath[MAX_PATH]; + BROWSEINFO PathInfo; + ZeroMemory(&PathInfo, sizeof(BROWSEINFO)); +/* Fails with IShellFolder interface */ +#if 0 + LPSHELLFOLDER psf = NULL; + HRESULT hr; + hr = SHGetDesktopFolder(&psf); + LPITEMIDLIST pidlRoot; + hr = psf->ParseDisplayName(NULL, NULL, defaultmingwpath, NULL, &pidlRoot, NULL); + psf->Release(); + PathInfo.pidlRoot = pidlRoot; +#endif + PathInfo.hwndOwner = Dlg; + PathInfo.lpszTitle = L"Please choose the directory where MingW is located:"; + LPITEMIDLIST pidl = SHBrowseForFolder(&PathInfo); + if (pidl && SHGetPathFromIDList(pidl, MGWPath)) + SetDlgItemText(Dlg, ID_MGWDIR, MGWPath); } else if (wParam == ID_SAVELOGS) { Added: trunk/tools/RosBE-Windows/Tools/config/options.exe.Manifest URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.exe.Manifest (added) +++ trunk/tools/RosBE-Windows/Tools/config/options.exe.Manifest Sun Sep 30 13:29:25 2007 @@ -1,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity + name="ReactOS.options" + processorArchitecture="x86" + version="1.1.0.0" + type="win32"/> +<description>Config Tool</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="x86" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Modified: trunk/tools/RosBE-Windows/Tools/config/options.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/o… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/options.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/options.rc Sun Sep 30 13:29:25 2007 @@ -3,9 +3,11 @@ ID_OPTICON ICON "reactos.ico" +1 24 "options.exe.Manifest" + VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,0 - PRODUCTVERSION 1,0,0,0 + FILEVERSION 1,1,0,0 + PRODUCTVERSION 1,1,0,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -20,14 +22,14 @@ BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "Marteen Bosma / Daniel Reimer\0" + VALUE "CompanyName", "Marteen Bosma / Daniel Reimer / Pierre Schweitzer\0" VALUE "FileDescription", "Config Tool for RosBE\0" - VALUE "FileVersion", "1.0.0.0\0" + VALUE "FileVersion", "1.1.0.0\0" VALUE "InternalName", "options\0" VALUE "LegalCopyright", "Copyright © Daniel Reimer 2007\0" VALUE "OriginalFilename", "options.exe\0" VALUE "ProductName", "Config Tool for RosBE\0" - VALUE "ProductVersion", "1.0.0.0\0" + VALUE "ProductVersion", "1.1.0.0\0" END END BLOCK "VarFileInfo" @@ -36,6 +38,7 @@ END END +#include "lang/de-DE.rc" #include "lang/en-US.rc" -#include "lang/de-DE.rc" +#include "lang/fr-FR.rc" #include "lang/ru-RU.rc" 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 13:29:25 2007 @@ -8,3 +8,5 @@ #define ID_SHOWBUILDTIME 0x6 #define ID_LOGDIR 0x7 #define ID_BROWSE 0x7 +#define ID_MGWDIR 0x8 +#define ID_BROWSEMGW 0x9 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 13:29:25 2007 @@ -2,6 +2,5 @@ - Load old settings - Disable Save button if there are no changes - Check validity of log path before saving -- Use styled controls (uxtheme) for dialog - 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