Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[greatlrd] 20467: languages file update for Hu.rc by Talley.

by greatlrd＠svn.reactos.org

languages file update for Hu.rc by Talley. Modified: trunk/reactos/lib/cpl/timedate/Hu.rc _____ Modified: trunk/reactos/lib/cpl/timedate/Hu.rc --- trunk/reactos/lib/cpl/timedate/Hu.rc 2005-12-30 20:15:07 UTC (rev 20466) +++ trunk/reactos/lib/cpl/timedate/Hu.rc 2005-12-30 20:28:35 UTC (rev 20467) @@ -32,23 +32,21 @@ IDC_AUTODAYLIGHT, 5, 136, 241, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP END - IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Internet Time" +CAPTION "Internet Id§" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Automatically synchronize with an Internet time server", IDC_AUTODAYLIGHT, + CONTROL "Szinkronizßlja a szßmÝt¾gÚp ¾rßjßt egy internetes kiszolgßl¾val", IDC_AUTODAYLIGHT, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 - LTEXT "Server:", -1, 34, 22, 28, 13 - PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 + LTEXT "Kiszolgßl¾:", -1, 34, 22, 28, 13 + PUSHBUTTON "Szinkronizßljon most", IDC_UPDATEBUTTON, 187, 22, 49, 14 LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 - LTEXT "Synchronazation can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 + LTEXT "A szinkronizßlßs csak akk÷r t÷rtÚnhet meg, ha az internetre fel van csatlakozva a gÚp.", -1, 12, 114, 225, 25 END - STRINGTABLE BEGIN IDS_CPLNAME "Dßtum Ús id§" @@ -56,6 +54,6 @@ IDS_TIMEZONETEXT "Hasznßlt id§z¾na: %s" IDS_TIMEZONEINVALID "?rvÚnytelen" IDS_TIMEZONEUNKNOWN "Ismeretlen" - IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" - IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" + IDS_INETTIMESUCSYNC "A szßmÝt¾gÚp ¾rßja sikeresen szinkronizßlva lett: %s (% %s-kor)" + IDS_INETTIMENEXTSYNC "A k÷vetkez§ szinkronizßlßs: %s %s-kor" END

18 years, 8 months

[greatlrd] 20466: Fix a mouse bug for hide the cursor. It is working now with my test code for ShowCursor and NtShowCursor. The code for it is not finish.

by greatlrd＠svn.reactos.org

Fix a mouse bug for hide the cursor. It is working now with my test code for ShowCursor and NtShowCursor. The code for it is not finish. and it also working now hide the mouse with EngMovePointer(SurfObj,-1,-1,NULL); and that did not work before. Modified: trunk/reactos/subsys/win32k/eng/mouse.c _____ Modified: trunk/reactos/subsys/win32k/eng/mouse.c --- trunk/reactos/subsys/win32k/eng/mouse.c 2005-12-30 19:14:58 UTC (rev 20465) +++ trunk/reactos/subsys/win32k/eng/mouse.c 2005-12-30 20:15:07 UTC (rev 20466) @@ -72,14 +72,14 @@ tmp = HazardY2; HazardY2 = HazardY1; HazardY1 = tmp; } - ppdev->SafetyRemoveCount++; - - if (ppdev->SafetyRemoveLevel) + if (ppdev->SafetyRemoveLevel != 0) { - /* already hidden */ + ppdev->SafetyRemoveCount++; return FALSE; } + ppdev->SafetyRemoveCount++; + if (pgp->Exclude.right >= HazardX1 && pgp->Exclude.left <= HazardX2 && pgp->Exclude.bottom >= HazardY1

18 years, 8 months

[gvg] 20465: temarez <temarez@yandex.ru>:

by gvg＠svn.reactos.org

temarez <temarez(a)yandex.ru>: Ukrainian translation of notepad (from bug 1179) Added: trunk/reactos/subsys/system/notepad/Uk.rc Modified: trunk/reactos/subsys/system/notepad/rsrc.rc _____ Added: trunk/reactos/subsys/system/notepad/Uk.rc --- trunk/reactos/subsys/system/notepad/Uk.rc 2005-12-30 19:12:40 UTC (rev 20464) +++ trunk/reactos/subsys/system/notepad/Uk.rc 2005-12-30 19:14:58 UTC (rev 20465) @@ -0,0 +1,161 @@ +/* + * Notepad (Ukrainian resources) + * + * Copyright 2005 Artem Reznikov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +MAIN_MENU MENU +{ + POPUP "&File" { + MENUITEM "&Ð?Ô¯Þ?Þ", CMD_NEW + MENUITEM "&??õÛÞ?Þ...\tCtrl+O", CMD_OPEN + MENUITEM "&Ã&ßÕÕÒ?Þ\tCtrl+S", CMD_SAVE + MENUITEM "ÃßÕÕÒ?Þ & Û...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "¤ÓÓ&ýÕ?Þ ±?¯?ÝÛÞ...", CMD_PAGE_SETUP + MENUITEM "?&¾Û", CMD_PRINT + MENUITEM "?Ó±?¯ÚÛÓ &´ÞÝ?ÕÓ...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "?&Þ§?õ", CMD_EXIT + } +POPUP "&¤ÓÔÛÓ" { + MENUITEM "&ÐÛÓ±¾ÔÓ?Þ\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "&?Þ?þÓ?Þ\tCtrl+X", CMD_CUT + MENUITEM "&?¯´??ÔÓ?Þ\tCtrl+C", CMD_COPY + MENUITEM "?±?&ÓÔÞ?Þ\tCtrl+V", CMD_PASTE + MENUITEM "?&ÞõÓÙÞ?Þ\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "Ã&ÝÓÚ?Þ...\tCtrl+F", CMD_SEARCH + MENUITEM "ÃÝÓ&Ú?Þ õÓÙ?\tF3", CMD_SEARCH_NEXT + MENUITEM "&ÃÓý?ÝÞ?Þ\tCtrl+H", CMD_REPLACE + MENUITEM "¤ÕÕÚ&?Þ...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "?Þõ?&ÙÞ?Þ Ô±Õ\tCtrl+A", CMD_SELECT_ALL + MENUITEM "&?Ó?Ó Ú ¸Ó±\tF5", CMD_TIME_DATE + } +POPUP "È¯&ýÓ?" { + MENUITEM "&¤ÕÕÝ¯± ´¯ ±Ù¯ÔÓ§", CMD_WRAP + MENUITEM "&ÏÞ¶?...", CMD_FONT +} +POPUP "&?ÞÒÙ õ" { + MENUITEM "&ð õ¯Û ±?ÓÝ¾", CMD_STATUSBAR +} +POPUP "&?¯Ô?õÛÓ" { + MENUITEM "&Ãý?±?", CMD_HELP_CONTENTS + MENUITEM "&¤¯°¾Û...", CMD_HELP_SEARCH + MENUITEM "&Help on help", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "&??÷ÕÝþ? ", CMD_LICENSE + MENUITEM "&NO WARRANTY", CMD_NO_WARRANTY + MENUITEM "&¤¯ ´¯ÒÓý¾", CMD_ABOUT_WINE + } +} + +/* Dialog `Page setup' */ + +DIALOG_PAGESETUP DIALOG 0, 0, 225, 95 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "¤ÓÓýÕ?Þ ±?¯?ÝÛÞ" +{ +LTEXT "?&Õ§Ý?Ú Û¯Ù¯Ý?Þ?¾Ù:", 0x140, 10, 07, 40, 15 +EDITTEXT 0x141, 60, 05,110, 12, WS_BORDER | WS_TABSTOP +LTEXT "?&ÞµÝ?Ú Û¯Ù¯Ý?Þ?¾Ù:", 0x142, 10, 24, 40, 15 +EDITTEXT 0x143, 60, 22,110, 12, WS_BORDER | WS_TABSTOP + +GROUPBOX "¤¯Ù ", 0x144, 10, 43,160, 45 +LTEXT "&??ÔÕ:", 0x145, 20, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&?Õ§Ý?:", 0x148, 20, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&¤ÓÔÕ:", 0x14B, 100, 55, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "&?ÞµÝ?:", 0x14E,100, 73, 30, 10, WS_CHILD +EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + +DEFPUSHBUTTON "OK", 0x151, 180, 3, 40, 15, WS_TABSTOP +PUSHBUTTON "ÐÛÓ±¾ÔÓ?Þ", 0x152, 180, 21, 40, 15, WS_TABSTOP +PUSHBUTTON "&?¯Ô?õÛÓ", 0x153, 180, 39, 40, 15, WS_TABSTOP +} + +/* Dialog `Encoding' */ +DIALOG_ENCODING DIALOG 0, 0, 256, 44 +STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | + WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "?¯õ¾ÔÓÝÝ " +{ +COMBOBOX ID_ENCODING,54,0,156,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP +LTEXT "?¯õ¾ÔÓÝÝ :",0x155,5,2,41,12 +COMBOBOX ID_EOLN,54,18,156,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +LTEXT "ð¯þÞÔÞ õÛ?Ô:",0x156,5,20,41,12 +} + +/* Dialog 'Go To' */ +DIALOG_GOTO DIALOG 0,0,165,50 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "¤ÕÕ§?õ õ¯ õÛÓ" +{ +EDITTEXT ID_LINENUMBER,54,10,106,12,WS_CHILD | WS_BORDER | WS_TABSTOP +LTEXT "?¯ýÕ õÛÓ:",0x155,5,12,41,12,WS_CHILD | WS_TABSTOP | ES_NUMBER +DEFPUSHBUTTON "OK", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP +PUSHBUTTON "ÐÛÓ±¾ÔÓ?Þ", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP +} + +STRINGTABLE DISCARDABLE +{ +STRING_PAGESETUP_HEADERVALUE, "&n" /* FIXME */ +STRING_PAGESETUP_FOOTERVALUE, "Ð?¯?ÝÛÓ &s" /* FIXME */ +STRING_PAGESETUP_LEFTVALUE, "20 ýý" /* FIXME */ +STRING_PAGESETUP_RIGHTVALUE, "20 ýý" /* FIXME */ +STRING_PAGESETUP_TOPVALUE, "25 ýý" /* FIXME */ +STRING_PAGESETUP_BOTTOMVALUE, "25 ýý" /* FIXME */ + +STRING_NOTEPAD, "?Ù¯ÛÝ¯?" +STRING_ERROR, "¤??????" +STRING_WARNING, "Ë????" +STRING_INFO, "?Ý¶¯ýÓ÷? " + +STRING_UNTITLED, "(ßÕþ þÓÒ¯Ù¯ÔÛÓ)" + +STRING_ALL_FILES, "Ë±? ¶ÓÚÙÞ (*.*)" +STRING_TEXT_FILES_TXT, "ÊÕÛ±?¯Ô? ¶ÓÚÙÞ (*.txt)" + +STRING_TOOLARGE, "ÈÓÚÙ '%s' þÓÔÕÙÞÛÞÚ õÙ ßÙ¯ÛÝ¯?Ó.\n \ +?¾õ³ ÙÓ±ÛÓ ÔÞÛ¯Þ±?ÓÚ?Õ ?Ý°ÞÚ ÕõÓÛ?¯." +STRING_NOTEXT, "?Þ ÝÕ ÔÔÕÙÞ Ý? Û¯Ò¯ ?ÕÛ±?¾. \ +\n?¾õ³ ÙÓ±ÛÓ ÔÔÕõ??³ ¨¯-ÝÕß¾õ³ ? ±´¯ß¾Ú?Õ ¨Õ Óþ" +STRING_DOESNOTEXIST, "ÈÓÚÙ '%s'\nÝÕ ?±Ý¾ ?\n\n \ +i¯¸Õ?Õ ±?Ô¯Þ?Þ Ý¯ÔÞÚ ¶ÓÚÙ ?" +STRING_NOTSAVED, "ÈÓÚÙ '%s'\nß¾Ô þý? ÝÕÝÞÚ\n\n \ +i¯¸Õ?Õ þßÕÕÒ?Þ þý?ÝÞ ?" +STRING_NOTFOUND, "'%s' can not be found." +STRING_OUT_OF_MEMORY, "?Õõ¯±?Ó?Ý³¯ ´Óý' ?? õÙ ÔÞÛ¯ÝÓÝÝ ¯´ÕÓ÷??.\ +\nÃÓÛÞÚ?Õ ¯õÞÝ Óß¯ õÕÛ?Ù³ÛÓ õ¯õÓ?Û?Ô ? ´¯Ô?¯??³ ±´¯ß¾." +STRING_CANNOTFIND "?Õ ý¯µ¾ þÝÓÚ?Þ '%s'" +STRING_ANSI, "ANSI" +STRING_UNICODE, "ÌÝ?Û¯õ" +STRING_UNICODE_BE, "ÌÝ?Û¯õ (big endian)" +STRING_UTF8, "UTF-8" +STRING_CRLF, "Windows" +STRING_LF, "Unix" +STRING_CR, "Mac" +} Property changes on: trunk/reactos/subsys/system/notepad/Uk.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/notepad/rsrc.rc --- trunk/reactos/subsys/system/notepad/rsrc.rc 2005-12-30 19:12:40 UTC (rev 20464) +++ trunk/reactos/subsys/system/notepad/rsrc.rc 2005-12-30 19:14:58 UTC (rev 20465) @@ -41,10 +41,10 @@ VK_F5, CMD_TIME_DATE, VIRTKEY } +#include "En.rc" #include "Cs.rc" #include "Da.rc" #include "De.rc" -#include "En.rc" #include "Es.rc" #include "Fi.rc" #include "Fr.rc" @@ -60,5 +60,6 @@ #include "Sk.rc" #include "Sv.rc" #include "Th.rc" +#include "Uk.rc" #include "Wa.rc" #include "Zh.rc"

18 years, 8 months

[frik85] 20464: DJ_Smith <dj_smith_reactos@online.de>

by frik85＠svn.reactos.org

DJ_Smith <dj_smith_reactos(a)online.de> german language file updated Modified: trunk/reactos/lib/cpl/timedate/De.rc _____ Modified: trunk/reactos/lib/cpl/timedate/De.rc --- trunk/reactos/lib/cpl/timedate/De.rc 2005-12-30 19:10:43 UTC (rev 20463) +++ trunk/reactos/lib/cpl/timedate/De.rc 2005-12-30 19:12:40 UTC (rev 20464) @@ -35,17 +35,17 @@ IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Internet Time" +CAPTION "Internet Zeit" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Automatically synchronize with an Internet time server", IDC_AUTODAYLIGHT, + CONTROL "Automatisch mit einem Internet Zeitserver synchronisieren", IDC_AUTODAYLIGHT, "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 LTEXT "Server:", -1, 34, 22, 28, 13 - PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 + PUSHBUTTON "Jetzt updaten", IDC_UPDATEBUTTON, 187, 22, 49, 14 LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 - LTEXT "Synchronazation can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 + LTEXT "Zum Synchronisieren muss der Computer mit dem Internet verbunden sein.", -1, 12, 114, 225, 25 END @@ -56,6 +56,7 @@ IDS_TIMEZONETEXT "Aktuelle Zeitzone: %s" IDS_TIMEZONEINVALID "Ung³ltig" IDS_TIMEZONEUNKNOWN "Unbekannt" - IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" - IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" + IDS_INETTIMESUCSYNC "Die Zeit wurde erfolgreich mit %s am % um %s synchronisiert" + IDS_INETTIMENEXTSYNC "Nõchste Synchronisierung am %s um %s" END +

18 years, 8 months

[gvg] 20463: Another coordinate transformation change. Fixes final problem with bug 1201.

by gvg＠svn.reactos.org

Another coordinate transformation change. Fixes final problem with bug 1201. Modified: trunk/reactos/subsys/win32k/objects/text.c _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2005-12-30 19:01:44 UTC (rev 20462) +++ trunk/reactos/subsys/win32k/objects/text.c 2005-12-30 19:10:43 UTC (rev 20463) @@ -1488,17 +1488,6 @@ // TODO: Write test-cases to exactly match real Windows in different // bad parameters (e.g. does Windows check the DC or the RECT first?). - if (lprc && (fuOptions & (ETO_OPAQUE | ETO_CLIPPED))) - { - // At least one of the two flags were specified. Copy lprc. Once. - Status = MmCopyFromCaller(&SpecifiedDestRect, lprc, sizeof(RECT)); - if (!NT_SUCCESS(Status)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; - } - } - dc = DC_LockDc(hDC); if (!dc) { @@ -1512,6 +1501,18 @@ return TRUE; } + if (lprc && (fuOptions & (ETO_OPAQUE | ETO_CLIPPED))) + { + // At least one of the two flags were specified. Copy lprc. Once. + Status = MmCopyFromCaller(&SpecifiedDestRect, lprc, sizeof(RECT)); + if (!NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + IntLPtoDP(dc, (POINT *) &SpecifiedDestRect, 2); + } + if (NULL != UnsafeDx && Count > 0) { Dx = ExAllocatePoolWithTag(PagedPool, Count * sizeof(INT), TAG_GDITEXT);

18 years, 8 months

[frik85] 20462: RosCMS update:

by frik85＠svn.reactos.org

RosCMS update: All Interfaces: * improve edit/save contents Admin Interface: * improve the Page Generator Overview page * static page generator: it's now possible to generate only the changed pages * simplify the menu bar Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_generator.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_admin.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_overview.php Modified: trunk/web/reactos.org/htdocs/roscms/index.php _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin.php 2005-12-30 18:48:27 UTC (rev 20461) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin.php 2005-12-30 19:01:44 UTC (rev 20462) @@ -62,6 +62,7 @@ } } break; + default: case "generate": // generator menu page include("inc/admin_generator.php"); break; @@ -187,7 +188,6 @@ include("inc/admin_subsys.php"); break; case "overview": - default: include("inc/admin_overview.php"); break; } _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php 2005-12-30 18:48:27 UTC (rev 20461) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_content_edit.php 2005-12-30 19:01:44 UTC (rev 20462) @@ -501,6 +501,7 @@ if ($content_savemode == "update") { + $roscms_TEMP_cont_name = $result_content['content_name']; echo "<p>The content '".$result_content['content_name']."' (id='".$rpm_db_id."') has been saved!</p>"; echo "<p><a href=".$_SERVER['HTTP_REFERER'].">Back to the 'content edit' page</a></p>"; echo "<p> </p><p><fieldset><legend>Preview</legend><br>".$result_content ['content_text']."</fieldset></p>"; @@ -513,13 +514,29 @@ AND `content_version` = ". $content_version ." LIMIT 1;"); $result_content_new_revision_preview = mysql_fetch_array($query_content_new_revision_preview); - + $roscms_TEMP_cont_name = $result_content_new_revision_preview['content_name']; echo "<p>A new version of content '".$result_content_new_revision_preview['content_name']."' (old id='".$rpm_db_id."', new id='". $result_content_new_revision_preview["content_id"] ."') has been saved!</p>"; echo "<p><a href='?page=". $rpm_page ."&sec=content&sec2=edit&sort=". $rpm_sort ."&filt=". $rpm_filt ."&langid=". $rpm_lang_id ."&db_id=". $result_content_new_revision_preview['content_id'] ."'>Go to the 'content edit' page (revision ". $result_content_new_revision_preview["content_id"] .")</a></p>"; echo "<p><a href='".$_SERVER['HTTP_REFERER']."'>Back to the 'content edit' page (revision ". $result_content['content_id'] .")</a></p>"; echo "<p> </p><p><fieldset><legend>Preview</legend><br>".$result_content _new_revision_preview['content_text']."</fieldset></p>"; } - + + + $query_TEMP_content = mysql_query("SELECT COUNT('page_id') + FROM `pages` + WHERE `page_name` = '". $roscms_TEMP_cont_name ."' + AND `page_active` = 1 + AND `page_visible` = 1 ;") ; + $result_TEMP_content = mysql_fetch_row($query_TEMP_content); + + // Update the "page" generator info: + if ($result_TEMP_content[0] == "0" || $result_TEMP_content[0] == "") { + // temp + } + else { + $content_postc="UPDATE `pages` SET `page_generate_force` = '1' WHERE `page_name` = '". $roscms_TEMP_cont_name ."' ;"; + $content_post_listc=mysql_query($content_postc); + } } ?> </div> _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_generator.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_generator.php 2005-12-30 18:48:27 UTC (rev 20461) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_generator.php 2005-12-30 19:01:44 UTC (rev 20462) @@ -27,32 +27,37 @@ </tr> <tr> <td colspan="2" bgcolor="#F9F8F8"> <table width="650" border="0" cellpadding="4"> + <tr> + <td><div align="center"><img src="images/dot.gif" vspace="3"></div></td> + <td><strong><font face="Arial, Helvetica, sans-serif"><a href="?page=admin&sec=generator&sec2=output&newcontent=true" title="Generate all UPDATED static pages! (except content that is visible on several pages, e.g. menu bars -> then use the 'generate all pages' link instead!)">Generate all UPDATED static pages</a> </font></strong></td> + <td> </td> + <td> + <div align="center"><img src="images/dot.gif" vspace="3"></div></td> + <td width="300"> + <div align="left"><strong><font face="Arial, Helvetica, sans-serif"><a href="?page=admin&sec=generator&sec2=view&site=index&lan g=en&forma=html&skin=default&debug=yes" title="Don't use this function if you don't know what this function do!">View page - debug mode</a></font></strong></div></td> + </tr> + <tr> + <td><div align="center"><img src="images/dot.gif" vspace="3"></div></td> + <td><strong><font face="Arial, Helvetica, sans-serif"><a href="?page=admin&sec=generator&sec2=output" title="Generate all static pages (only if you need to update all pages, e.g. one time per day)">Generate all static pages</a> </font></strong></td> + <td> </td> + <td><div align="center"><img src="images/dot.gif" vspace="3"></div></td> + <td><strong><font face="Arial, Helvetica, sans-serif"><a href="?page=admin&sec=generator&sec2=view&site=&lang=en& amp;forma=xhtml&skin=default" title="Don't use this function if you don't know what this function do!">View all pages - test mode</a></font></strong></td> + </tr> <tr> <td width="20"> <div align="center"><img src="images/dot.gif" vspace="3"></div></td> - <td width="300"> <div align="left"><strong><font face="Arial, Helvetica, sans-serif"><a href="?page=admin&sec=generator&sec2=output" title="Generate all static pages (only if you need to update all pages, e.g. one time per day)">Generate - all static pages</a> </font></strong></div></td> + <td width="300"> <div align="left"><strong><font face="Arial, Helvetica, sans-serif"><a href="#gensinglepage" title="Generate one static page (if you want to update one specific page)">Generate/view a specific static page</a></font></strong></div></td> <td width="10"> </td> - <td width="20"> <div align="center"><img src="images/dot.gif" vspace="3"></div></td> - <td width="300"><strong><font face="Arial, Helvetica, sans-serif"><a href="?page=admin&sec=generator&sec2=view&site=index&lan g=en&forma=html&skin=default&debug=yes" title="Don't use this function if you don't know what this function do!">View - page - debug mode</a></font></strong></td> + <td> + <div align="center"><img src="images/dot.gif" vspace="3"></div></td> + <td> + <div align="left"><strong><font face="Arial, Helvetica, sans-serif"><a href="?page=admin&sec=generator&sec2=view&site=&lang=en& amp;forma=xhtml&skin=default&debug=yes" title="Don't use this function if you don't know what this function do!">View all pages - debug mode</a></font></strong></div></td> </tr> <tr> <td width="20"> <div align="center"><img src="images/dot.gif" vspace="3"></div></td> - <td width="300"> <div align="left"><strong><font face="Arial, Helvetica, sans-serif"><a href="#gensinglepage" title="Generate one static page (if you want to update one specific page)">Generate/view - a specific static page</a></font></strong></div></td> + <td width="300"> <div align="left"><strong><font face="Arial, Helvetica, sans-serif"><a href="?page=admin&sec=generator&sec2=view&sec3=menu&site =index&lang=en&forma=html&skin=default" title="View the static homepage in a dynamic way">View page (dynamic from database)</a></font></strong></div></td> <td width="10"> </td> - <td> <div align="center"><img src="images/dot.gif" vspace="3"></div></td> - <td> <div align="left"><strong><font face="Arial, Helvetica, sans-serif"><a href="?page=admin&sec=generator&sec2=view&site=&lang=en& amp;forma=xhtml&skin=default" title="Don't use this function if you don't know what this function do!">View - all pages - test mode</a></font></strong></div></td> - </tr> - <tr> - <td> <div align="center"><img src="images/dot.gif" vspace="3"></div></td> - <td><strong><font face="Arial, Helvetica, sans-serif"><a href="?page=admin&sec=generator&sec2=view&sec3=menu&site =index&lang=en&forma=html&skin=default" title="View the static homepage in a dynamic way">View - page (dynamic from database)</a></font></strong></td> <td> </td> - <td> <div align="center"><img src="images/dot.gif" vspace="3"></div></td> - <td> <div align="left"><strong><font face="Arial, Helvetica, sans-serif"><a href="?page=admin&sec=generator&sec2=view&site=&lang=en& amp;forma=xhtml&skin=default&debug=yes" title="Don't use this function if you don't know what this function do!">View - all pages - debug mode</a></font></strong></div></td> + <td> </td> </tr> </table></tr> <tr bgcolor=#AEADAD> @@ -282,6 +287,9 @@ echo $farbe2; $farbe = $farbe2; } + if ($result_page['page_generate_force'] == "1") { + $farbe = "#00FF00"; + } ?>" title="RosCMS action buttons:

* Generate static page
* View page in dynamc mode
* Delete static pagse"> <div align="center"> <?php _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php --- trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php 2005-12-30 18:48:27 UTC (rev 20461) +++ trunk/web/reactos.org/htdocs/roscms/inc/generate_page.php 2005-12-30 19:01:44 UTC (rev 20462) @@ -48,7 +48,7 @@ ob_start(); $roscms_template_var_pageid=""; $roscms_template_var_pageid=$dyncontid; - eval(' ?'.'> '.$code.' <'.'?php '); + eval(' ?'.'>'.$code.' <'.'?php '); $output = ob_get_contents(); ob_end_clean(); //echo ob_get_status(); @@ -152,11 +152,20 @@ // echo "<br>=".$rpm_site; } else { - echo "<br><br>  <b>".$myrow_lang[1]."</b><br>"; - $query_page = mysql_query("SELECT * - FROM pages - WHERE page_visible != 0 AND page_active = '1' AND (page_language = '$myrow_lang[0]' OR page_language = 'all') - ORDER BY 'page_name' ASC"); + if ($rpm_newcontent == true) { + echo "<br><br>  <b>".$myrow_lang[1]."</b><br>"; + $query_page = mysql_query("SELECT * + FROM pages + WHERE page_visible = '1' AND page_active = '1' AND page_generate_force = '1' AND (page_language = '$myrow_lang[0]' OR page_language = 'all') + ORDER BY 'page_name' ASC"); + } + else { + echo "<br><br>  <b>".$myrow_lang[1]."</b><br>"; + $query_page = mysql_query("SELECT * + FROM pages + WHERE page_visible = '1' AND page_active = '1' AND (page_language = '$myrow_lang[0]' OR page_language = 'all') + ORDER BY 'page_name' ASC"); + } } // $result = mysql_fetch_array($query); AND pages_extra = '' while($result_page = mysql_fetch_array($query_page)) { // Pages @@ -454,6 +463,17 @@ echo("\n\n\n\n<br><center><font size='1'>This dynamic <b>".$w3cformat." page</b> was <b>generated</b> with ".$roscms_intern_version." in <b>" . $showtime . " seconds.</b></font></center>"); } +if ($rpm_site == "" && $rpm_sec2 != "view" && $rpm_sec2 !="genpage") { + $query_pagegen_status = mysql_query("SELECT * + FROM pages + WHERE page_visible = '1' AND page_active = '1' + ORDER BY 'page_name' ASC ;") ; + while($result_pagegen_status = mysql_fetch_array($query_pagegen_status)) { // Pages + $content_postd="UPDATE `pages` SET `page_generate_force` = '0' WHERE `page_id` = '". $result_pagegen_status['page_id'] ."' ;"; + $content_post_listd=mysql_query($content_postd); + } +} + set_time_limit(30); ?> _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_admin.php --- trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_admin.php 2005-12-30 18:48:27 UTC (rev 20461) +++ trunk/web/reactos.org/htdocs/roscms/inc/inc_menu_admin.php 2005-12-30 19:01:44 UTC (rev 20462) @@ -20,10 +20,9 @@ ?> <div class="navTitle">Admin Interface</div> <ol> - <li><a href="?page=admin">Overview</a></li> <li><a href="?page=admin&sec=generate">Page Generator</a></li> <?php - if ($rpm_sec == "pages" || $rpm_sec == "content" || $rpm_sec == "inctext" || $rpm_sec == "dyncontent" || $rpm_sec == "languages" || $rpm_sec == "generate") { + if ($rpm_sec == "" || $rpm_sec == "pages" || $rpm_sec == "content" || $rpm_sec == "inctext" || $rpm_sec == "dyncontent" || $rpm_sec == "languages" || $rpm_sec == "generate") { ?> <li><a href="?page=admin&sec=pages&sec2=view"> - Pages</a></li> <li><a href="?page=admin&sec=content&sec2=view"> - Content</a></li> _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/user_overview.php --- trunk/web/reactos.org/htdocs/roscms/inc/user_overview.php 2005-12-30 18:48:27 UTC (rev 20461) +++ trunk/web/reactos.org/htdocs/roscms/inc/user_overview.php 2005-12-30 19:01:44 UTC (rev 20462) @@ -128,7 +128,7 @@ <td colspan="2" valign="top"> <font size="2" face="Arial, Helvetica, sans-serif"><?php include("../editor/bbcode/cbparser.php"); - echo bb2html(stripslashes($result_usraccount['user_description']),''); + echo bb2html($result_usraccount['user_description'],''); ?></font></td> </tr> _____ Modified: trunk/web/reactos.org/htdocs/roscms/index.php --- trunk/web/reactos.org/htdocs/roscms/index.php 2005-12-30 18:48:27 UTC (rev 20461) +++ trunk/web/reactos.org/htdocs/roscms/index.php 2005-12-30 19:01:44 UTC (rev 20462) @@ -59,7 +59,8 @@ $rpm_debug=""; $rpm_logo=""; $rpm_db_id=""; - + $rpm_newcontent=""; + $varlang=""; $varw3cformat=""; $varformat=""; @@ -97,7 +98,9 @@ if (array_key_exists("debug", $_GET)) $rpm_debug=htmlspecialchars($_GET["debug"]); if (array_key_exists("logo", $_GET)) $rpm_logo=htmlspecialchars($_GET["logo"]); if (array_key_exists("db_id", $_GET)) $rpm_db_id=htmlspecialchars($_GET["db_id"]); + if (array_key_exists("newcontent", $_GET)) $rpm_newcontent=htmlspecialchars($_GET["newcontent"]); + if (array_key_exists('HTTP_REFERER', $_SERVER)) $roscms_referrer=htmlspecialchars($_SERVER['HTTP_REFERER']); if(isset($_COOKIE['roscms_usrset_lang'])) {

18 years, 8 months

[gedmurphy] 20461: update all resource files. All need translating.

by gedmurphy＠svn.reactos.org

update all resource files. All need translating. info for translating purposes: IDS_INETTIMESUCSYNC "The time has been successfully synchronized with <server> on <date> at <time>" IDS_INETTIMENEXTSYNC "Next synchronization: <date> at <time>" Modified: trunk/reactos/lib/cpl/timedate/Cz.rc Modified: trunk/reactos/lib/cpl/timedate/De.rc Modified: trunk/reactos/lib/cpl/timedate/Dk.rc Modified: trunk/reactos/lib/cpl/timedate/Fr.rc Modified: trunk/reactos/lib/cpl/timedate/Gr.rc Modified: trunk/reactos/lib/cpl/timedate/Hu.rc Modified: trunk/reactos/lib/cpl/timedate/Ja.rc Modified: trunk/reactos/lib/cpl/timedate/Nl.rc Modified: trunk/reactos/lib/cpl/timedate/Pl.rc Modified: trunk/reactos/lib/cpl/timedate/Ru.rc Modified: trunk/reactos/lib/cpl/timedate/Sv.rc _____ Modified: trunk/reactos/lib/cpl/timedate/Cz.rc --- trunk/reactos/lib/cpl/timedate/Cz.rc 2005-12-30 18:35:49 UTC (rev 20460) +++ trunk/reactos/lib/cpl/timedate/Cz.rc 2005-12-30 18:48:27 UTC (rev 20461) @@ -32,6 +32,22 @@ END +IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Internet Time" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Automatically synchronize with an Internet time server", IDC_AUTODAYLIGHT, + "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 + LTEXT "Server:", -1, 34, 22, 28, 13 + PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 + LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 + LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 + LTEXT "Synchronazation can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 +END + + STRINGTABLE BEGIN IDS_CPLNAME "Datum/?as" @@ -39,4 +55,6 @@ IDS_TIMEZONETEXT "AktußlnÝ ÞasovÚ pßsmo: %s" IDS_TIMEZONEINVALID "NeplatnÚ" IDS_TIMEZONEUNKNOWN "NeznßmÚ" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" END _____ Modified: trunk/reactos/lib/cpl/timedate/De.rc --- trunk/reactos/lib/cpl/timedate/De.rc 2005-12-30 18:35:49 UTC (rev 20460) +++ trunk/reactos/lib/cpl/timedate/De.rc 2005-12-30 18:48:27 UTC (rev 20461) @@ -33,6 +33,22 @@ END +IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Internet Time" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Automatically synchronize with an Internet time server", IDC_AUTODAYLIGHT, + "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 + LTEXT "Server:", -1, 34, 22, 28, 13 + PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 + LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 + LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 + LTEXT "Synchronazation can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 +END + + STRINGTABLE BEGIN IDS_CPLNAME "Datum/Zeit" @@ -40,4 +56,6 @@ IDS_TIMEZONETEXT "Aktuelle Zeitzone: %s" IDS_TIMEZONEINVALID "Ung³ltig" IDS_TIMEZONEUNKNOWN "Unbekannt" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" END _____ Modified: trunk/reactos/lib/cpl/timedate/Dk.rc --- trunk/reactos/lib/cpl/timedate/Dk.rc 2005-12-30 18:35:49 UTC (rev 20460) +++ trunk/reactos/lib/cpl/timedate/Dk.rc 2005-12-30 18:48:27 UTC (rev 20461) @@ -33,6 +33,22 @@ END +IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Internet Time" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Automatically synchronize with an Internet time server", IDC_AUTODAYLIGHT, + "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 + LTEXT "Server:", -1, 34, 22, 28, 13 + PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 + LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 + LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 + LTEXT "Synchronazation can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 +END + + STRINGTABLE BEGIN IDS_CPLNAME "Dato/Tid" @@ -40,4 +56,6 @@ IDS_TIMEZONETEXT "Nuvµrende tidszone: %s" IDS_TIMEZONEINVALID "Ugyldig" IDS_TIMEZONEUNKNOWN "Ukendt" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" END _____ Modified: trunk/reactos/lib/cpl/timedate/Fr.rc --- trunk/reactos/lib/cpl/timedate/Fr.rc 2005-12-30 18:35:49 UTC (rev 20460) +++ trunk/reactos/lib/cpl/timedate/Fr.rc 2005-12-30 18:48:27 UTC (rev 20461) @@ -32,6 +32,22 @@ END +IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Internet Time" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Automatically synchronize with an Internet time server", IDC_AUTODAYLIGHT, + "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 + LTEXT "Server:", -1, 34, 22, 28, 13 + PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 + LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 + LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 + LTEXT "Synchronazation can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 +END + + STRINGTABLE BEGIN IDS_CPLNAME "Date/Heure" @@ -39,4 +55,6 @@ IDS_TIMEZONETEXT "Fuseau horaire actuel: %s" IDS_TIMEZONEINVALID "Invalide" IDS_TIMEZONEUNKNOWN "Inconnu" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" END _____ Modified: trunk/reactos/lib/cpl/timedate/Gr.rc --- trunk/reactos/lib/cpl/timedate/Gr.rc 2005-12-30 18:35:49 UTC (rev 20460) +++ trunk/reactos/lib/cpl/timedate/Gr.rc 2005-12-30 18:48:27 UTC (rev 20461) @@ -32,6 +32,22 @@ END +IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Internet Time" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Automatically synchronize with an Internet time server", IDC_AUTODAYLIGHT, + "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 + LTEXT "Server:", -1, 34, 22, 28, 13 + PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 + LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 + LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 + LTEXT "Synchronazation can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 +END + + STRINGTABLE BEGIN IDS_CPLNAME "ÃýÕ±´ýþÝ?ß/?±ß" @@ -39,4 +55,6 @@ IDS_TIMEZONETEXT "È¨±ÚÝÌ ¸±´ÝÚÛÌ µ?Ýþ: %s" IDS_TIMEZONEINVALID "?þ ¦ÒÒ§±´" IDS_TIMEZONEUNKNOWN "óÒÝ¨¾¶´" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" END _____ Modified: trunk/reactos/lib/cpl/timedate/Hu.rc --- trunk/reactos/lib/cpl/timedate/Hu.rc 2005-12-30 18:35:49 UTC (rev 20460) +++ trunk/reactos/lib/cpl/timedate/Hu.rc 2005-12-30 18:48:27 UTC (rev 20461) @@ -33,6 +33,22 @@ END +IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Internet Time" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Automatically synchronize with an Internet time server", IDC_AUTODAYLIGHT, + "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 + LTEXT "Server:", -1, 34, 22, 28, 13 + PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 + LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 + LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 + LTEXT "Synchronazation can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 +END + + STRINGTABLE BEGIN IDS_CPLNAME "Dßtum Ús id§" @@ -40,4 +56,6 @@ IDS_TIMEZONETEXT "Hasznßlt id§z¾na: %s" IDS_TIMEZONEINVALID "?rvÚnytelen" IDS_TIMEZONEUNKNOWN "Ismeretlen" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" END _____ Modified: trunk/reactos/lib/cpl/timedate/Ja.rc --- trunk/reactos/lib/cpl/timedate/Ja.rc 2005-12-30 18:35:49 UTC (rev 20460) +++ trunk/reactos/lib/cpl/timedate/Ja.rc 2005-12-30 18:48:27 UTC (rev 20461) @@ -32,6 +32,22 @@ END +IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Internet Time" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Automatically synchronize with an Internet time server", IDC_AUTODAYLIGHT, + "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 + LTEXT "Server:", -1, 34, 22, 28, 13 + PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 + LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 + LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 + LTEXT "Synchronazation can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 +END + + STRINGTABLE BEGIN IDS_CPLNAME "ô·òtéãÄ×ìÅ" @@ -39,4 +55,6 @@ IDS_TIMEZONETEXT "î?ì¦é?â^âCâÇ â]ü[âô: %s" IDS_TIMEZONEINVALID "òsÉ?é?Æl" IDS_TIMEZONEUNKNOWN "òsû¥" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" END _____ Modified: trunk/reactos/lib/cpl/timedate/Nl.rc --- trunk/reactos/lib/cpl/timedate/Nl.rc 2005-12-30 18:35:49 UTC (rev 20460) +++ trunk/reactos/lib/cpl/timedate/Nl.rc 2005-12-30 18:48:27 UTC (rev 20461) @@ -32,6 +32,22 @@ END +IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Internet Time" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Automatically synchronize with an Internet time server", IDC_AUTODAYLIGHT, + "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 + LTEXT "Server:", -1, 34, 22, 28, 13 + PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 + LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 + LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 + LTEXT "Synchronazation can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 +END + + STRINGTABLE BEGIN IDS_CPLNAME "Datum en Tijd" @@ -39,4 +55,6 @@ IDS_TIMEZONETEXT "Huidige tijdzone: %s" IDS_TIMEZONEINVALID "Ongelding" IDS_TIMEZONEUNKNOWN "Niet gekend" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" END _____ Modified: trunk/reactos/lib/cpl/timedate/Pl.rc --- trunk/reactos/lib/cpl/timedate/Pl.rc 2005-12-30 18:35:49 UTC (rev 20460) +++ trunk/reactos/lib/cpl/timedate/Pl.rc 2005-12-30 18:48:27 UTC (rev 20461) @@ -34,6 +34,22 @@ END +IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Internet Time" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Automatically synchronize with an Internet time server", IDC_AUTODAYLIGHT, + "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 + LTEXT "Server:", -1, 34, 22, 28, 13 + PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 + LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 + LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 + LTEXT "Synchronazation can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 +END + + STRINGTABLE BEGIN IDS_CPLNAME "Data/Godzina" @@ -41,4 +57,6 @@ IDS_TIMEZONETEXT "Aktualna strefa czasowa: %s" IDS_TIMEZONEINVALID "Nieprawid?owa" IDS_TIMEZONEUNKNOWN "Nieznana" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" END _____ Modified: trunk/reactos/lib/cpl/timedate/Ru.rc --- trunk/reactos/lib/cpl/timedate/Ru.rc 2005-12-30 18:35:49 UTC (rev 20460) +++ trunk/reactos/lib/cpl/timedate/Ru.rc 2005-12-30 18:48:27 UTC (rev 20461) @@ -32,6 +32,22 @@ END +IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Internet Time" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Automatically synchronize with an Internet time server", IDC_AUTODAYLIGHT, + "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 + LTEXT "Server:", -1, 34, 22, 28, 13 + PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 + LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 + LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 + LTEXT "Synchronazation can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 +END + + STRINGTABLE BEGIN IDS_CPLNAME "?Ó?Ó Þ ÔÕý " @@ -39,4 +55,6 @@ IDS_TIMEZONETEXT "ÊÕÛ¾¨ÞÚ ¸Ó±¯Ô¯Ú ´¯ ±: %s" IDS_TIMEZONEINVALID "?ÕõÕÚ±?ÔÞ?ÕÙ³ÝÓ " IDS_TIMEZONEUNKNOWN "?ÕÞþÔÕ±?ÝÓ " + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" END _____ Modified: trunk/reactos/lib/cpl/timedate/Sv.rc --- trunk/reactos/lib/cpl/timedate/Sv.rc 2005-12-30 18:35:49 UTC (rev 20460) +++ trunk/reactos/lib/cpl/timedate/Sv.rc 2005-12-30 18:48:27 UTC (rev 20461) @@ -37,6 +37,22 @@ END +IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Internet Time" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Automatically synchronize with an Internet time server", IDC_AUTODAYLIGHT, + "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 + LTEXT "Server:", -1, 34, 22, 28, 13 + PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 + LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 + LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 + LTEXT "Synchronazation can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 +END + + STRINGTABLE BEGIN IDS_CPLNAME "Datum/Tid" @@ -44,4 +60,6 @@ IDS_TIMEZONETEXT "Aktuell tidszon: %s" IDS_TIMEZONEINVALID "Felaktig" IDS_TIMEZONEUNKNOWN "Okõnd" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" END

18 years, 8 months

[gvg] 20460: - Detect end of chain

by gvg＠svn.reactos.org

- Detect end of chain - Correct copy/paste error Fixes bug 1212 Modified: trunk/reactos/lib/crt/except/seh.s _____ Modified: trunk/reactos/lib/crt/except/seh.s --- trunk/reactos/lib/crt/except/seh.s 2005-12-30 18:19:24 UTC (rev 20459) +++ trunk/reactos/lib/crt/except/seh.s 2005-12-30 18:35:49 UTC (rev 20460) @@ -99,8 +99,10 @@ // If we have reached the end of the chain or we're asked to stop here // by the caller then exit + test %ebx, %ebx + je .lu2_done + movl ER_TRYLEVEL(%ebx), %eax - cmpl $-1, %eax je .lu2_done @@ -288,7 +290,6 @@ // Perform local unwinding .eh3_unwind: - movl $ExceptionContinueSearch, %eax testl $EXCEPTION_TARGET_UNWIND, EREC_FLAGS(%eax) jnz .eh3_return

18 years, 8 months

[gedmurphy] 20459: Put skeleton in place for 'internet time' tab in the 'date and time' control panel applet

by gedmurphy＠svn.reactos.org

Put skeleton in place for 'internet time' tab in the 'date and time' control panel applet Modified: trunk/reactos/lib/cpl/timedate/En.rc Modified: trunk/reactos/lib/cpl/timedate/resource.h Modified: trunk/reactos/lib/cpl/timedate/timedate.c _____ Modified: trunk/reactos/lib/cpl/timedate/En.rc --- trunk/reactos/lib/cpl/timedate/En.rc 2005-12-30 15:28:43 UTC (rev 20458) +++ trunk/reactos/lib/cpl/timedate/En.rc 2005-12-30 18:19:24 UTC (rev 20459) @@ -32,6 +32,22 @@ END +IDD_INETTIMEPAGE DIALOGEX 0, 0, 252, 146 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Internet Time" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + COMBOBOX IDC_SERVERLIST, 65, 22, 117, 136, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Automatically synchronize with an Internet time server", IDC_AUTODAYLIGHT, + "Button", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,11,7,241,10 + LTEXT "Server:", -1, 34, 22, 28, 13 + PUSHBUTTON "Update Now", IDC_UPDATEBUTTON, 187, 22, 49, 14 + LTEXT "", IDC_SUCSYNC, 16, 54, 214, 23 + LTEXT "", IDC_NEXTSYNC, 12, 96, 137, 12 + LTEXT "Synchronazation can only occur when your computer is connected to the internet.", -1, 12, 114, 225, 25 +END + + STRINGTABLE BEGIN IDS_CPLNAME "Date/Time" @@ -39,4 +55,6 @@ IDS_TIMEZONETEXT "Current time zone: %s" IDS_TIMEZONEINVALID "Invalid" IDS_TIMEZONEUNKNOWN "Unknown" + IDS_INETTIMESUCSYNC "The time has been successfully synchronized with %s on % at %s" + IDS_INETTIMENEXTSYNC "Next synchronization: %s at %s" END _____ Modified: trunk/reactos/lib/cpl/timedate/resource.h --- trunk/reactos/lib/cpl/timedate/resource.h 2005-12-30 15:28:43 UTC (rev 20458) +++ trunk/reactos/lib/cpl/timedate/resource.h 2005-12-30 18:19:24 UTC (rev 20459) @@ -14,11 +14,19 @@ #define IDC_TIMEZONELIST 111 #define IDC_AUTODAYLIGHT 113 +#define IDD_INETTIMEPAGE 120 +#define IDC_SERVERLIST 121 +#define IDC_UPDATEBUTTON 122 +#define IDC_SUCSYNC 126 +#define IDC_NEXTSYNC 127 + #define IDS_CPLNAME 1001 #define IDS_CPLDESCRIPTION 1002 #define IDS_TIMEZONETEXT 1003 #define IDS_TIMEZONEINVALID 1004 #define IDS_TIMEZONEUNKNOWN 1005 +#define IDS_INETTIMESUCSYNC 1006 +#define IDS_INETTIMENEXTSYNC 1007 #endif /* __CPL_RESOURCE_H */ _____ Modified: trunk/reactos/lib/cpl/timedate/timedate.c --- trunk/reactos/lib/cpl/timedate/timedate.c 2005-12-30 15:28:43 UTC (rev 20458) +++ trunk/reactos/lib/cpl/timedate/timedate.c 2005-12-30 18:19:24 UTC (rev 20459) @@ -176,6 +176,8 @@ } + + static PTIMEZONE_ENTRY GetLargerTimeZoneEntry(DWORD Index) { @@ -568,6 +570,41 @@ } +/* Property page dialog callback */ +INT_PTR CALLBACK +InetTimePageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + break; + + case WM_COMMAND: + break; + + case WM_DESTROY: + break; + + case WM_NOTIFY: + { + switch (lParam) + { + + default: + break; + } + + } + break; + } + + return FALSE; +} + + static VOID InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) { @@ -584,7 +621,7 @@ Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) { PROPSHEETHEADER psh; - PROPSHEETPAGE psp[2]; + PROPSHEETPAGE psp[3]; TCHAR Caption[256]; LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); @@ -602,6 +639,7 @@ InitPropSheetPage(&psp[0], IDD_DATETIMEPAGE, DateTimePageProc); InitPropSheetPage(&psp[1], IDD_TIMEZONEPAGE, TimeZonePageProc); + InitPropSheetPage(&psp[2], IDD_INETTIMEPAGE, InetTimePageProc); return (LONG)(PropertySheet(&psh) != -1); }

18 years, 8 months

[gvg] 20458: Use the BSOD color that Cutler intended

by gvg＠svn.reactos.org

Use the BSOD color that Cutler intended Modified: trunk/reactos/hal/halx86/generic/display.c Modified: trunk/reactos/hal/halx86/generic/halinit.c _____ Modified: trunk/reactos/hal/halx86/generic/display.c --- trunk/reactos/hal/halx86/generic/display.c 2005-12-30 13:33:31 UTC (rev 20457) +++ trunk/reactos/hal/halx86/generic/display.c 2005-12-30 15:28:43 UTC (rev 20458) @@ -171,7 +171,7 @@ #define CHAR_ATTRIBUTE_BLACK 0x00 /* black on black */ -#define CHAR_ATTRIBUTE 0x07 /* grey on black */ +#define CHAR_ATTRIBUTE 0x17 /* grey on blue */ #define FONT_AMOUNT (8*8192) _____ Modified: trunk/reactos/hal/halx86/generic/halinit.c --- trunk/reactos/hal/halx86/generic/halinit.c 2005-12-30 13:33:31 UTC (rev 20457) +++ trunk/reactos/hal/halx86/generic/halinit.c 2005-12-30 15:28:43 UTC (rev 20458) @@ -53,7 +53,8 @@ else if (BootPhase == 2) { /* Go to blue screen */ - + HalClearDisplay (0x17); /* grey on blue */ + HalpZeroPageMapping = MmMapIoSpace((LARGE_INTEGER)0LL, PAGE_SIZE, MmNonCached); }

18 years, 8 months

← Newer
1
2
3
4
5
6
7
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2005