Ros-diffs January 2008

ros-diffs@reactos.org

24 participants
539 discussions

[sgasiorek] 32072: Polish resource changes: - change Wine to ReactOS in "Run" dialog - insert and translate IDS_RESTART
by sgasiorek＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: sgasiorek Date: Fri Feb 1 02:17:24 2008 New Revision: 32072 URL: http://svn.reactos.org/svn/reactos?rev=32072&view=rev Log: Polish resource changes: - change Wine to ReactOS in "Run" dialog - insert and translate IDS_RESTART Modified: trunk/reactos/base/shell/explorer/explorer-pl.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Modified: trunk/reactos/base/shell/explorer/explorer-pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-pl.rc (original) +++ trunk/reactos/base/shell/explorer/explorer-pl.rc Fri Feb 1 02:17:24 2008 @@ -330,6 +330,7 @@ IDS_START "Start" IDS_LOGOFF "Wyloguj..." IDS_SHUTDOWN "Zamknij system..." + IDS_RESTART "Uruchom ponownie..." IDS_LAUNCH "Uruchom..." IDS_START_HELP "Pomoc" IDS_SEARCH_FILES "Szukaj..." Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc Fri Feb 1 02:17:24 2008 @@ -159,7 +159,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON "", 12297, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Wpisz nazwê programu, katalogu, dokumentu, a Wine otworzy go dla ciebie.", 12289, 36, 11, 182, 18 + LTEXT "Wpisz nazwê programu, katalogu, dokumentu, a ReactOS otworzy go dla ciebie.", 12289, 36, 11, 182, 18 LTEXT "&Otwórz:", 12305, 7, 39, 24, 10 CONTROL "", 12298, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "OK", IDOK, 62, 63, 50, 14, WS_TABSTOP

1 0

[tkreuzer] 32071: fix definitions of WM_MOUSEWHEEL and WM_MOUSELAST
by tkreuzer＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: tkreuzer Date: Fri Feb 1 00:29:03 2008 New Revision: 32071 URL: http://svn.reactos.org/svn/reactos?rev=32071&view=rev Log: fix definitions of WM_MOUSEWHEEL and WM_MOUSELAST Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h (original) +++ trunk/reactos/include/psdk/winuser.h Fri Feb 1 00:29:03 2008 @@ -1685,6 +1685,7 @@ #define WM_KEYLAST 264 #define WM_SYNCPAINT 136 #define WM_MOUSEACTIVATE 33 +#define WM_MOUSEFIRST 512 #define WM_MOUSEMOVE 512 #define WM_LBUTTONDOWN 513 #define WM_LBUTTONUP 514 @@ -1695,13 +1696,20 @@ #define WM_MBUTTONDOWN 519 #define WM_MBUTTONUP 520 #define WM_MBUTTONDBLCLK 521 +#if (_WIN32_WINNT >= 0x0400) || (_WIN32_WINDOWS > 0x0400) #define WM_MOUSEWHEEL 522 -#define WM_MOUSEFIRST 512 +#endif #if (_WIN32_WINNT >= 0x0500) #define WM_XBUTTONDOWN 523 #define WM_XBUTTONUP 524 #define WM_XBUTTONDBLCLK 525 +#endif +#if (_WIN32_WINNT >= 0x0500) #define WM_MOUSELAST 525 +#elif (_WIN32_WINNT >= 0x0400) || (_WIN32_WINDOWS > 0x0400) +#define WM_MOUSELAST 522 +#else +#define WM_MOUSELAST 521 #endif #define WM_MOUSEHOVER 0x2A1 #define WM_MOUSELEAVE 0x2A3

1 0

[cwittich] 32070: handle call :Label fix goto :Label
by cwittich＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: cwittich Date: Thu Jan 31 23:55:05 2008 New Revision: 32070 URL: http://svn.reactos.org/svn/reactos?rev=32070&view=rev Log: handle call :Label fix goto :Label Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/call.c trunk/reactos/base/shell/cmd/goto.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c (original) +++ trunk/reactos/base/shell/cmd/batch.c Thu Jan 31 23:55:05 2008 @@ -273,6 +273,8 @@ bc->bEcho = bEcho; /* Preserve echo across batch calls */ bc->shiftlevel = 0; bc->bCmdBlock = -1; + bc->lCallPosition = 0; + bc->lCallPositionHigh = 0; bc->ffind = NULL; bc->forvar = _T('\0'); Modified: trunk/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.h?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.h (original) +++ trunk/reactos/base/shell/cmd/batch.h Thu Jan 31 23:55:05 2008 @@ -24,6 +24,8 @@ TCHAR forvar; INT bCmdBlock; BOOL bExecuteBlock[MAX_PATH]; + LONG lCallPosition; /* store position where to return to after Call :Label */ + LONG lCallPositionHigh; } BATCH_CONTEXT, *LPBATCH_CONTEXT; Modified: trunk/reactos/base/shell/cmd/call.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/call.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/call.c (original) +++ trunk/reactos/base/shell/cmd/call.c Thu Jan 31 23:55:05 2008 @@ -53,6 +53,13 @@ return 0; } + if (*param == _T(':') && (bc)) + { + bc->lCallPosition = SetFilePointer(bc->hBatchFile, 0, &bc->lCallPositionHigh, FILE_CURRENT); + cmd_goto(_T("goto"), param); + return 0; + } + nErrorLevel = 0; n = (LPBATCH_CONTEXT)cmd_alloc (sizeof (BATCH_CONTEXT)); Modified: trunk/reactos/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/goto.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/goto.c (original) +++ trunk/reactos/base/shell/cmd/goto.c Thu Jan 31 23:55:05 2008 @@ -40,7 +40,7 @@ { TCHAR szMsg[RC_STRING_MAX_SIZE]; LPTSTR tmp; - LONG lNewPosHigh; + LONG lNewPosHigh = 0; #ifdef _DEBUG DebugPrintf (_T("cmd_goto (\'%s\', \'%s\'\n"), cmd, param); @@ -67,33 +67,40 @@ /* terminate label at first space char */ tmp = param+1; - while (!_istcntrl (*tmp) && !_istspace (*tmp) && (*tmp != _T(':'))) - tmp++; + while (!_istcntrl (*tmp) && !_istspace (*tmp) && (*tmp != _T(':'))) + tmp++; *(tmp) = _T('\0'); /* set file pointer to the beginning of the batch file */ lNewPosHigh = 0; - /* jump to end of the file */ - if ( _tcsicmp( param, _T(":eof"))==0) - { - SetFilePointer (bc->hBatchFile, 0, &lNewPosHigh, FILE_END); - return 0; - } + /* jump to end of the file */ + if ( _tcsicmp( param, _T(":eof"))==0) + { + /* when lCallPosition != 0 we have to return to the caller */ + if (bc->lCallPosition == 0) + SetFilePointer (bc->hBatchFile, 0, &lNewPosHigh, FILE_END); + else + { + SetFilePointer (bc->hBatchFile, (LONG)bc->lCallPosition, &bc->lCallPositionHigh, FILE_BEGIN); + bc->lCallPosition = 0; + bc->lCallPositionHigh = 0; + } + return 0; + } - /* jump to begin of the file */ - SetFilePointer (bc->hBatchFile, 0, &lNewPosHigh, FILE_BEGIN); + /* jump to begin of the file */ + SetFilePointer (bc->hBatchFile, 0, &lNewPosHigh, FILE_BEGIN); while (FileGetString (bc->hBatchFile, textline, sizeof(textline) / sizeof(textline[0]))) { - int pos; - int size; + int pos; + int size; /* Strip out any trailing spaces or control chars */ tmp = textline + _tcslen (textline) - 1; - - while (_istcntrl (*tmp) || _istspace (*tmp) || (*tmp == _T(':'))) + while (_istcntrl (*tmp) || _istspace (*tmp) || (*tmp == _T(':'))) tmp--; *(tmp + 1) = _T('\0'); @@ -101,20 +108,21 @@ tmp = textline; while (_istspace (*tmp)) tmp++; - - /* All space after leading space terminate the string */ - size = _tcslen(tmp) -1; - pos=0; - while (tmp+pos < tmp+size) - { - if (_istspace(tmp[pos])) - tmp[pos]=_T('\0'); - pos++; - } + + /* All space after leading space terminate the string */ + size = _tcslen(tmp) -1; + pos=0; + while (tmp+pos < tmp+size) + { + if (_istspace(tmp[pos])) + tmp[pos]=_T('\0'); + pos++; + } /* use whole label name */ - if ((*tmp == _T(':')) && (_tcsicmp (++tmp, param) == 0)) + if ((*tmp == _T(':')) && ((_tcsicmp (++tmp, param) == 0) || (_tcsicmp (tmp, ++param) == 0))) return 0; + } LoadString(CMD_ModuleHandle, STRING_GOTO_ERROR2, szMsg, RC_STRING_MAX_SIZE);

1 0

[cwittich] 32069: handle %dp0
by cwittich＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: cwittich Date: Thu Jan 31 22:01:23 2008 New Revision: 32069 URL: http://svn.reactos.org/svn/reactos?rev=32069&view=rev Log: handle %dp0 Modified: trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c (original) +++ trunk/reactos/base/shell/cmd/cmd.c Thu Jan 31 22:01:23 2008 @@ -1293,6 +1293,18 @@ return NULL; switch ( *varName ) { + case _T('~'): + varName++; + if (_tcsncicmp(varName, _T("dp0"), 3) == 0) + { + if ( varNameLen ) + *varNameLen = 4; + varName += 2; + if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) + return NULL; + GetCurrentDirectory(MAX_PATH, ret); + } + return ret; case _T('0'): case _T('1'): case _T('2'): @@ -1411,7 +1423,7 @@ LPCTSTR tmp; BOOL bEchoThisLine; BOOL bModeSetA; - BOOL bIsBatch; + BOOL bIsBatch; do {

1 0

[cwittich] 32068: support else handle negative values in special envvars stdin, out, err can't be redirected for windows gui apps
by cwittich＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: cwittich Date: Thu Jan 31 20:59:02 2008 New Revision: 32068 URL: http://svn.reactos.org/svn/reactos?rev=32068&view=rev Log: support else handle negative values in special envvars stdin,out,err can't be redirected for windows gui apps Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/cmd.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c (original) +++ trunk/reactos/base/shell/cmd/batch.c Thu Jan 31 20:59:02 2008 @@ -458,10 +458,21 @@ { if (*first == _T(')')) { - bc->bCmdBlock--; + first++; + /* Strip leading spaces and trailing space/control chars */ + while(_istspace (*first)) + first++; + if ((_tcsncicmp (first, _T("else"), 4) == 0) && (_tcschr(first, _T('(')))) + { + bc->bExecuteBlock[bc->bCmdBlock] = !bc->bExecuteBlock[bc->bCmdBlock]; + } + else + { + bc->bCmdBlock--; + } continue; } - if ((bc->bCmdBlock >= 0) && (bc->bCmdBlock < MAX_PATH)) + if (bc->bCmdBlock < MAX_PATH) if (!bc->bExecuteBlock[bc->bCmdBlock]) { /* increase the bCmdBlock count when there is another conditon which opens a new bracket */ Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c (original) +++ trunk/reactos/base/shell/cmd/cmd.c Thu Jan 31 20:59:02 2008 @@ -811,9 +811,18 @@ FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) { - LoadString(CMD_ModuleHandle, STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, in); - return; + if (bc) + { + /* will fail for windows gui apps */ + num = 0; + bc->hBatchFile = INVALID_HANDLE_VALUE; + } + else + { + LoadString(CMD_ModuleHandle, STRING_CMD_ERROR1, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg, in); + return; + } } if (!SetStdHandle (STD_INPUT_HANDLE, hFile)) @@ -892,7 +901,7 @@ /* Now set up the end conditions... */ /* redirect STDOUT */ - if (out[0]) + if ((bc) && (bc->hBatchFile != INVALID_HANDLE_VALUE) && (out[0])) { /* Final output to here */ HANDLE hFile; @@ -959,7 +968,7 @@ } /* redirect STDERR */ - if (err[0]) + if ((bc) && (bc->hBatchFile != INVALID_HANDLE_VALUE) && (err[0])) { /* Final output to here */ HANDLE hFile; @@ -1165,15 +1174,23 @@ if (position) { position += 2; - Token = _tcstok(position, _T(",")); - while ((Token != NULL) && (i < 2)) + if (_tcschr(position, _T(',')) != NULL) { - StringPart[i] = _ttoi(Token); - i++; - Token = _tcstok (NULL, _T(",")); + Token = _tcstok(position, _T(",")); + while ((Token != NULL) && (i < 2)) + { + StringPart[i] = _ttoi(Token); + i++; + Token = _tcstok (NULL, _T(",")); + } + if (i > 0) + { + if (StringPart[1] < 0) + StringPart[1] = _tcslen(ret + StringPart[0]) + StringPart[1]; + _tcsncpy(ReturnValue, ret + StringPart[0], StringPart[1]); + _tcscpy(ret, ReturnValue); + } } - _tcsncpy(ReturnValue, ret + StringPart[0], StringPart[1]); - _tcscpy(ret, ReturnValue); return ret; } else

1 0

[cwittich] 32067: don't print the new color value when echo is off
by cwittich＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: cwittich Date: Thu Jan 31 20:26:57 2008 New Revision: 32067 URL: http://svn.reactos.org/svn/reactos?rev=32067&view=rev Log: don't print the new color value when echo is off Modified: trunk/reactos/base/shell/cmd/color.c Modified: trunk/reactos/base/shell/cmd/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/color.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/color.c (original) +++ trunk/reactos/base/shell/cmd/color.c Thu Jan 31 20:26:57 2008 @@ -113,8 +113,11 @@ return 1; } - LoadString(CMD_ModuleHandle, STRING_COLOR_ERROR3, szMsg, RC_STRING_MAX_SIZE); - ConErrPrintf(szMsg, wColor); + if (((bc) && (bc->bEcho)) || !bc) + { + LoadString(CMD_ModuleHandle, STRING_COLOR_ERROR3, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf(szMsg, wColor); + } if ((wColor & 0xF) == (wColor &0xF0) >> 4) {

1 0

[dreimer] 32066: Bug 3021: slovak translations of rosapps (kario@szm.sk)
by dreimer＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: dreimer Date: Thu Jan 31 19:41:33 2008 New Revision: 32066 URL: http://svn.reactos.org/svn/reactos?rev=32066&view=rev Log: Bug 3021: slovak translations of rosapps (kario(a)szm.sk) Added: trunk/rosapps/applications/screensavers/butterflies/lang/sk-SK.rc (with props) trunk/rosapps/applications/screensavers/mazescr/lang/sk-SK.rc (with props) trunk/rosapps/roscalc/lang/sk-SK.rc (with props) trunk/rosapps/write/Sk.rc (with props) Modified: trunk/rosapps/applications/screensavers/butterflies/rsrc.rc trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc trunk/rosapps/roscalc/resource.rc trunk/rosapps/write/rsrc.rc Added: trunk/rosapps/applications/screensavers/butterflies/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/lang/sk-SK.rc (added) +++ trunk/rosapps/applications/screensavers/butterflies/lang/sk-SK.rc Thu Jan 31 19:41:33 2008 @@ -1,0 +1,38 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 30-01-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +IDD_DLG_SCREEN DIALOGEX DISCARDABLE 0, 0, 172, 57 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Nastavenie etrièa obrazovky Motýle" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,7,35,50,14 + PUSHBUTTON "Zrui",IDCANCEL,61,35,50,14 + CONTROL "Otáèa motýle",ROTATE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,56,15,70,8 + PUSHBUTTON "Èo je ...",IDABOUT,115,35,50,14 +END + +IDD_DLG_ABOUT DIALOGEX DISCARDABLE 0, 0, 149, 79 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Èo je ..." +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,48,58,56,14 + CTEXT "Motýle - etriè obrazovky",IDC_STATIC,7,7,135,9 + CTEXT "Demo od: NeHe ",IDC_STATIC,7,20,135,8 + CTEXT "http://nehe.gamedev.net",WEBPAGE1,7,29,135,8,SS_NOTIFY | + NOT WS_GROUP + CTEXT "etriè obrazovky od: tHaPuTeR",IDC_STATIC,7,38,135,8,NOT + WS_GROUP + CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY | + NOT WS_GROUP +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Motýle - etriè obrazovky" +END Propchange: trunk/rosapps/applications/screensavers/butterflies/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/butterflies/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/rsrc.rc (original) +++ trunk/rosapps/applications/screensavers/butterflies/rsrc.rc Thu Jan 31 19:41:33 2008 @@ -4,4 +4,5 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/lt-LT.rc" +#include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Added: trunk/rosapps/applications/screensavers/mazescr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/lang/sk-SK.rc (added) +++ trunk/rosapps/applications/screensavers/mazescr/lang/sk-SK.rc Thu Jan 31 19:41:33 2008 @@ -1,0 +1,12 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 30-01-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Bludisko - etriè obrazovky" + IDS_TITLE "Èo je ..." + IDS_TEXT "Nie sú potrebné iadne nastavenia." +END Propchange: trunk/rosapps/applications/screensavers/mazescr/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc (original) +++ trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc Thu Jan 31 19:41:33 2008 @@ -15,3 +15,4 @@ #include "lang/lt-LT.rc" #include "lang/uk-UA.rc" #include "lang/es-ES.rc" +#include "lang/sk-SK.rc" Added: trunk/rosapps/roscalc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/lang/sk-SK.rc?rev=… ============================================================================== --- trunk/rosapps/roscalc/lang/sk-SK.rc (added) +++ trunk/rosapps/roscalc/lang/sk-SK.rc Thu Jan 31 19:41:33 2008 @@ -1,0 +1,369 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 30-01-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +// Dialog + +IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Kalkulaèka systému ReactOS" +MENU IDR_MENU_SCIENTIFIC_1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "",IDC_STATIC,4,16,132,21 + CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, + 10 + CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, + 10 + CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, + 10 + CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, + 26,10 + GROUPBOX "",IDC_STATIC,4,36,76,21 + CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,8,44,26,10 + CONTROL "Hyp",IDC_CHECK_HYP,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,40,44,29,10 + CTEXT "",IDC_TEXT_PARENT,84,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CTEXT "",IDC_TEXT_MEMORY,112,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "Sta",IDC_BUTTON_STA,4,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Ave",IDC_BUTTON_AVE,4,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sum",IDC_BUTTON_SUM,4,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "s",IDC_BUTTON_S,4,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Dat",IDC_BUTTON_DAT,4,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F-E",IDC_BUTTON_FE,38,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "dms",IDC_BUTTON_DMS,38,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "sin",IDC_BUTTON_SIN,38,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "cos",IDC_BUTTON_COS,38,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "tan",IDC_BUTTON_TAN,38,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "(",IDC_BUTTON_LEFTPAR,64,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Exp",IDC_BUTTON_EXP,64,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^y",IDC_BUTTON_XeY,64,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^2",IDC_BUTTON_Xe2,64,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^3",IDC_BUTTON_Xe3,64,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ")",IDC_BUTTON_RIGHTPAR,90,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "ln",IDC_BUTTON_LN,90,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "log",IDC_BUTTON_LOG,90,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "n!",IDC_BUTTON_NF,90,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,90,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MC",IDC_BUTTON_MC,124,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,124,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,124,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,124,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "pi",IDC_BUTTON_PI,124,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "7",IDC_BUTTON_7,158,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,158,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,158,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,158,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "A",IDC_BUTTON_A,158,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,184,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,184,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,184,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,184,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "B",IDC_BUTTON_B,184,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,210,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,210,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,210,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,210,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "C",IDC_BUTTON_C,210,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,236,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,236,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,236,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,236,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "D",IDC_BUTTON_D,236,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Mod",IDC_BUTTON_MOD,262,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Or",IDC_BUTTON_OR,262,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Lsh",IDC_BUTTON_LSH,262,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,262,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "E",IDC_BUTTON_E,262,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "And",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Xor",IDC_BUTTON_XOR,288,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Not",IDC_BUTTON_NOT,288,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Int",IDC_BUTTON_INT,288,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F",IDC_BUTTON_F,288,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + GROUPBOX "",IDC_STATIC,140,16,172,21 + CONTROL "Qword",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,148,24,37,10 + CONTROL "Dword",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,188,24,37,10 + CONTROL "Word",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,232,24,33,10 + CONTROL "Bajt",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,272,24,30,10 + CONTROL "Stupne",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24, + 42,10 + CONTROL "Radiány",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192, + 24,42,10 + CONTROL "Grady",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, + 236,24,44,10 + PUSHBUTTON "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Spä",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Kalkulaèka systému ReactOS" +MENU IDR_MENU_STANDARD +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Spä",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "7",IDC_BUTTON_7,40,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,40,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,40,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,40,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,66,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,66,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,66,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,66,105,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,92,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,92,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,92,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,92,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,118,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,118,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,118,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,118,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sqrt",IDC_BUTTON_SQRT,144,48,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "%",IDC_BUTTON_PERCENT,144,67,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,144,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,144,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + CTEXT "",IDC_TEXT_MEMORY,4,24,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "MC",IDC_BUTTON_MC,4,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,4,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,4,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,4,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Èo je kalkulaèka systému ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,105,148,52,16 + CONTROL 106,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | + SS_REALSIZEIMAGE | WS_BORDER,4,4,104,48 + LTEXT "Kalkulaèka systému ReactOS",IDC_STATIC,120,12,132,8, + SS_CENTERIMAGE + LTEXT "Verzia ",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE + LTEXT "Napísal Carlo Bramini",IDC_STATIC,120,32,132,8, + SS_CENTERIMAGE + GROUPBOX "",IDC_STATIC,112,0,148,52 + GROUPBOX "",IDC_STATIC,4,56,256,88 + EDITTEXT IDC_EDIT_LICENSE,12,68,240,68,ES_MULTILINE | ES_READONLY | + WS_VSCROLL +END + +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 +STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "tatistika" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "RET",IDC_BUTTON_RET,4,48,36,16 + PUSHBUTTON "LOAD",IDC_BUTTON_LOAD,44,48,36,16 + PUSHBUTTON "CD",IDC_BUTTON_CD,84,48,36,16 + PUSHBUTTON "CAD",IDC_BUTTON_CAD,124,48,36,16 + CTEXT "n=0",IDC_TEXT_NITEMS,4,68,156,12,SS_CENTERIMAGE | + SS_SUNKEN +END + + +// Menus + +IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE +BEGIN + POPUP "Úpravy" + BEGIN + MENUITEM "Kopírova\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Prilepi\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "Zobrazi" + BEGIN + MENUITEM "tandardná", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Vedecká", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Prevody", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "estnástková\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Desiatková\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "Osmièková\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Dvojková\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Stupne\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "Radiány\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "Grady\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "Zoskupova èíslice", IDM_VIEW_GROUP, CHECKED + END + POPUP "Pomocník" + BEGIN + MENUITEM "Témy pomocníka", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Èo je kalkulaèka systému ReactOS", IDM_HELP_ABOUT + END +END + +IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE +BEGIN + POPUP "Úpravy" + BEGIN + MENUITEM "Kopírova\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Prilepi\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "Zobrazi" + BEGIN + MENUITEM "tandardná", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Vedecká", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Prevody", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "estnástková\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Desiatková\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "Osmièková\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Dvojková\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED + MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED + MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED + MENUITEM "Bajt\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM SEPARATOR + MENUITEM "Zoskupova èíslice", IDM_VIEW_GROUP, CHECKED + END + POPUP "Pomocník" + BEGIN + MENUITEM "Témy pomocníka", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Èo je kalkulaèka systému ReactOS", IDM_HELP_ABOUT + END +END + +IDR_MENU_STANDARD MENU DISCARDABLE +BEGIN + POPUP "Úpravy" + BEGIN + MENUITEM "Kopírova\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Prilepi\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "Zobrazi" + BEGIN + MENUITEM "tandardná", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Vedecká", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Prevody", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Zoskupova èíslice", IDM_VIEW_GROUP, CHECKED + END + POPUP "Pomocník" + BEGIN + MENUITEM "Témy pomocníka", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Èo je kalkulaèka systému ReactOS", IDM_HELP_ABOUT + END +END + +// String Tables + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STRING_LICENSE "Kalkulaèka systému ReactOS je vo¾ný softvér vydaný pod licenciou GNU GPL.\r\n\r\nKópiu licenie GNU GPL môete získa tu:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nRovnako môete získa preklad licencie GNU GPL tu:\r\nhttp://www.gnu.org/licenses/translations.html" + IDS_MATH_ERROR "Chyba" + IDS_QUICKHELP "Rýchla pomoc" +END + Propchange: trunk/rosapps/roscalc/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/roscalc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/resource.rc?rev=32… ============================================================================== --- trunk/rosapps/roscalc/resource.rc (original) +++ trunk/rosapps/roscalc/resource.rc Thu Jan 31 19:41:33 2008 @@ -46,3 +46,4 @@ #include "lang/it-IT.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" +#include "lang/sk-SK.rc" Added: trunk/rosapps/write/Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/Sk.rc?rev=32066&view… ============================================================================== --- trunk/rosapps/write/Sk.rc (added) +++ trunk/rosapps/write/Sk.rc Thu Jan 31 19:41:33 2008 @@ -1,0 +1,10 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 30-01-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_FAILED, "Nepodarilo sa spusti Wordpad" +END Propchange: trunk/rosapps/write/Sk.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/write/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/write/rsrc.rc?rev=32066&r1… ============================================================================== --- trunk/rosapps/write/rsrc.rc (original) +++ trunk/rosapps/write/rsrc.rc Thu Jan 31 19:41:33 2008 @@ -28,3 +28,4 @@ #include "Fr.rc" #include "Ko.rc" #include "Uk.rc" +#include "Sk.rc"

1 0

[cwittich] 32065: allow nested (...) blocks (but still no support for else)
by cwittich＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: cwittich Date: Thu Jan 31 18:11:25 2008 New Revision: 32065 URL: http://svn.reactos.org/svn/reactos?rev=32065&view=rev Log: allow nested (...) blocks (but still no support for else) Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/if.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c (original) +++ trunk/reactos/base/shell/cmd/batch.c Thu Jan 31 18:11:25 2008 @@ -272,8 +272,8 @@ SetFilePointer (bc->hBatchFile, 0, NULL, FILE_BEGIN); bc->bEcho = bEcho; /* Preserve echo across batch calls */ bc->shiftlevel = 0; - bc->bCmdBlock = FALSE; - + bc->bCmdBlock = -1; + bc->ffind = NULL; bc->forvar = _T('\0'); bc->forproto = NULL; @@ -454,15 +454,25 @@ *++ip = _T('\0'); /* cmd block over multiple lines (..) */ - if (bc->bCmdBlock) + if (bc->bCmdBlock >= 0) { if (*first == _T(')')) { - bc->bCmdBlock = FALSE; + bc->bCmdBlock--; continue; } - if (!bc->bExecuteBlock) - continue; + if ((bc->bCmdBlock >= 0) && (bc->bCmdBlock < MAX_PATH)) + if (!bc->bExecuteBlock[bc->bCmdBlock]) + { + /* increase the bCmdBlock count when there is another conditon which opens a new bracket */ + if ((_tcsncicmp (first, _T("if"), 2) == 0) && _tcschr(first, _T('('))) + { + bc->bCmdBlock++; + if ((bc->bCmdBlock > 0) && (bc->bCmdBlock < MAX_PATH)) + bc->bExecuteBlock[bc->bCmdBlock] = bc->bExecuteBlock[bc->bCmdBlock - 1]; + } + continue; + } } /* ignore labels and empty lines */ Modified: trunk/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.h?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.h (original) +++ trunk/reactos/base/shell/cmd/batch.h Thu Jan 31 18:11:25 2008 @@ -6,7 +6,6 @@ #ifndef _BATCH_H_INCLUDED_ #define _BATCH_H_INCLUDED_ - typedef struct tagBATCHCONTEXT { @@ -23,8 +22,8 @@ TCHAR Out[MAX_PATH]; TCHAR Err[MAX_PATH]; TCHAR forvar; - BOOL bCmdBlock; - BOOL bExecuteBlock; + INT bCmdBlock; + BOOL bExecuteBlock[MAX_PATH]; } BATCH_CONTEXT, *LPBATCH_CONTEXT; Modified: trunk/reactos/base/shell/cmd/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/if.c?rev=32… ============================================================================== --- trunk/reactos/base/shell/cmd/if.c (original) +++ trunk/reactos/base/shell/cmd/if.c Thu Jan 31 18:11:25 2008 @@ -188,8 +188,13 @@ { if (bc) { - bc->bCmdBlock = TRUE; - bc->bExecuteBlock = x_flag & X_EXEC; + pp++; + bc->bCmdBlock++; + if ((bc->bCmdBlock >= 0) && (bc->bCmdBlock < MAX_PATH)) + bc->bExecuteBlock[bc->bCmdBlock] = x_flag & X_EXEC; + /* commands are in the next lines */ + if (*pp == _T('\0')) + return 0; } }

1 0

[cwittich] 32064: rename it back to matrix.src to get it included on bootcd again
by cwittich＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: cwittich Date: Thu Jan 31 13:35:34 2008 New Revision: 32064 URL: http://svn.reactos.org/svn/reactos?rev=32064&view=rev Log: rename it back to matrix.src to get it included on bootcd again Modified: trunk/rosapps/applications/screensavers/matrix/matrix.rbuild Modified: trunk/rosapps/applications/screensavers/matrix/matrix.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/matrix.rbuild (original) +++ trunk/rosapps/applications/screensavers/matrix/matrix.rbuild Thu Jan 31 13:35:34 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="matrix" type="win32scr" installbase="system32" installname="matrix2.scr" allowwarnings="true" unicode="true"> +<module name="matrix" type="win32scr" installbase="system32" installname="matrix.scr" allowwarnings="true" unicode="true"> <include base="matrix">.</include> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define>

1 0

[cwittich] 32063: fix storing and loading registry settings
by cwittich＠svn.reactos.org 31 Jan '08

31 Jan '08

Author: cwittich Date: Thu Jan 31 13:05:02 2008 New Revision: 32063 URL: http://svn.reactos.org/svn/reactos?rev=32063&view=rev Log: fix storing and loading registry settings Modified: trunk/rosapps/applications/screensavers/matrix/settings.c Modified: trunk/rosapps/applications/screensavers/matrix/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/matrix/settings.c (original) +++ trunk/rosapps/applications/screensavers/matrix/settings.c Thu Jan 31 13:05:02 2008 @@ -35,7 +35,7 @@ if(hugechar == 0) return; - hugechar[0] = _T('\0'); + ZeroMemory(hugechar, 4096); RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Catch22\\Matrix Screen Saver"), 0, _T(""), 0, KEY_READ, NULL, &hkey, NULL); @@ -71,21 +71,15 @@ if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("Randomize"), 0, 0, (BYTE *)&value, &len)) g_fRandomizeMessages = (value == 0 ? FALSE : TRUE); - len = 4096; - if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("FontName"), 0, 0, (BYTE *)hugechar, &len)) - { - if(len > 0) - lstrcpy(g_szFontName, hugechar); - else - lstrcpy(g_szFontName, _T("Arial")); - - } + len = 512; + if(RegQueryValueEx(hkey, _T("FontName"), 0, 0, (BYTE *)g_szFontName, &len) != ERROR_SUCCESS) + lstrcpy(g_szFontName, _T("Arial")); len = 4096; if(ERROR_SUCCESS == RegQueryValueEx(hkey, _T("Messages"), 0, 0 , (BYTE *)hugechar, &len)) { - while(len > 0 && *hptr && isascii(*hptr)) + while(len > 0 && *hptr && _istascii(*hptr)) { if(lstrlen(hptr) > 0) { @@ -109,7 +103,7 @@ void SaveSettings() { HKEY hkey; - TCHAR *hugechar = malloc(4096); + TCHAR *hugechar = malloc(4096 * sizeof(TCHAR)); TCHAR *msgptr = hugechar; int totallen = 0; int i,len; @@ -118,7 +112,7 @@ if(hugechar == 0) return; - hugechar[0] = _T('\0'); + ZeroMemory(hugechar, 4096 * sizeof(TCHAR)); msgptr = hugechar; RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Catch22\\Matrix Screen Saver"), 0, @@ -142,7 +136,7 @@ value = g_fFontBold; RegSetValueEx(hkey, _T("FontBold"), 0, REG_DWORD, (BYTE *)&value, sizeof value); - RegSetValueEx(hkey, _T("FontName"), 0, REG_SZ, (BYTE *)g_szFontName, lstrlen(g_szFontName)); + RegSetValueEx(hkey, _T("FontName"), 0, REG_SZ, (BYTE *)g_szFontName, lstrlen(g_szFontName) * sizeof(TCHAR)); for(i = 0; i < g_nNumMessages; i++) { @@ -156,10 +150,10 @@ } } - *msgptr = _T('\0'); + //*msgptr = _T('\0'); totallen++; - RegSetValueEx(hkey, _T("Messages"), 0, REG_MULTI_SZ, (BYTE *)hugechar, totallen); + RegSetValueEx(hkey, _T("Messages"), 0, REG_MULTI_SZ, (BYTE *)hugechar, totallen * sizeof(TCHAR)); RegCloseKey(hkey); free(hugechar);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2008