ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 12:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ReactOS Calc to version 1.11. Carlo Bramini, bug #4346.

Browse Source 
svn path=/trunk/; revision=40566
This commit is contained in:
Dmitry Gorbachev
2009-04-17 21:35:07 +00:00
parent 79cdd76423
commit 06d7de1000
24 changed files with 120 additions and 1111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/base/applications/calc/calc.h
+5 -26
View File
@@ -42,7 +42,7 @@
#define IDC_STATIC ((DWORD)-1)
#endif
#define CALC_VERSION TEXT("1.10")
#define CALC_VERSION TEXT("1.11")
#define MAX_CALC_SIZE 256
@@ -51,30 +51,6 @@
#define SIZEOF(_ar) (sizeof(_ar)/sizeof(_ar[1]))
// RPN.C
/*
typedef struct _postfix_item_t {
unsigned int type;
union {
#ifdef ENABLE_MULTI_PRECISION
mpfr_t mf;
#else
double f;
INT64 i;
#endif
struct {
unsigned short int code;
unsigned short int elem;
} action;
} number;
struct _postfix_item_t *next;
} postfix_item_t;
void flush_postfix(void);
void infix2postfix(char *in_str);
postfix_item_t *exec_postfix(void);
*/
//
enum {
RPN_OPERATOR_PARENT,
@@ -93,6 +69,8 @@ enum {
RPN_OPERATOR_MOD,
RPN_OPERATOR_POW,
RPN_OPERATOR_SQR,
RPN_OPERATOR_NONE
};
typedef union {
@@ -124,7 +102,7 @@ void stop_rpn_engine(void);
typedef struct {
char *data;
char *ptr;
int wm_msg;
UINT wm_msg;
} sequence_t;
typedef struct {
@@ -190,6 +168,7 @@ extern calc_t calc;
#define MODIFIER_INV 0x01
#define MODIFIER_HYP 0x02
#define NO_CHAIN 0x04
void apply_int_mask(calc_number_t *a);
#ifdef ENABLE_MULTI_PRECISION
reactos/base/applications/calc/calc.rbuild
+3 -2
View File
@@ -3,9 +3,10 @@
<module name="calc" type="win32gui" installbase="system32" installname="calc.exe" unicode="yes">
<include base="calc">.</include>
<define name="DISABLE_HTMLHELP_SUPPORT">1</define>
<library>user32</library>
<library>gdi32</library>
<library>advapi32</library>
<library>kernel32</library>
<library>gdi32</library>
<library>user32</library>
<file>about.c</file>
<file>convert.c</file>
<file>function.c</file>
reactos/base/applications/calc/lang/bg-BG.rc
+1 -1
View File
@@ -226,7 +226,7 @@ BEGIN
END
IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Èç÷èñëèòåëÿò íà ÐåàêòÎÑ"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg"
reactos/base/applications/calc/lang/cs-CZ.rc
+5 -5
View File
@@ -8,7 +8,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
// Dialog
IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS kalkulaèka"
MENU IDR_MENU_SCIENTIFIC_1
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -164,7 +164,7 @@ BEGIN
END
IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS Kalkulaèka"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -231,7 +231,7 @@ BEGIN
END
IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS Kalkulaèka"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg"
@@ -309,7 +309,7 @@ BEGIN
END
IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "O ReactOS Kalkulaèce"
FONT 8, "MS Shell Dlg"
BEGIN
@@ -328,7 +328,7 @@ BEGIN
END
IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Statistické výpoèty"
FONT 8, "MS Shell Dlg"
BEGIN
reactos/base/applications/calc/lang/de-DE.rc
+1 -1
View File
@@ -226,7 +226,7 @@ BEGIN
END
IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS Rechner"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg"
reactos/base/applications/calc/lang/el-GR.rc
+5 -5
View File
@@ -3,7 +3,7 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
// Dialog
IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Áñéèìïìç÷áíÞ"
MENU IDR_MENU_SCIENTIFIC_1
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -159,7 +159,7 @@ BEGIN
END
IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Áñéèìïìç÷áíÞ"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -226,7 +226,7 @@ BEGIN
END
IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Áñéèìïìç÷áíÞ"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg"
@@ -304,7 +304,7 @@ BEGIN
END
IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Ó÷åôéêÜ..."
FONT 8, "MS Shell Dlg"
BEGIN
@@ -323,7 +323,7 @@ BEGIN
END
IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Statistics box"
FONT 8, "MS Shell Dlg"
BEGIN
reactos/base/applications/calc/lang/en-US.rc
+6 -6
View File
@@ -3,7 +3,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// Dialog
IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS Calculator"
MENU IDR_MENU_SCIENTIFIC_1
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -159,7 +159,7 @@ BEGIN
END
IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS Calculator"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -226,7 +226,7 @@ BEGIN
END
IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS Calculator"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg"
@@ -304,7 +304,7 @@ BEGIN
END
IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "About ReactOS Calc"
FONT 8, "MS Shell Dlg"
BEGIN
@@ -323,7 +323,7 @@ BEGIN
END
IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Statistics box"
FONT 8, "MS Shell Dlg"
BEGIN
@@ -444,7 +444,7 @@ BEGIN
IDS_CONV_CONSUMPTION "Consumption (engines)"
IDS_CONV_CURRENCY "Currencies"
IDS_CONV_ENERGY "Energy"
IDS_CONV_LENGTH "Lenghts"
IDS_CONV_LENGTH "Lengths"
IDS_CONV_POWER "Power"
IDS_CONV_PRESSURE "Pressure"
IDS_CONV_TEMPERATURE "Temperature"
reactos/base/applications/calc/lang/es-ES.rc
+1 -1
View File
@@ -231,7 +231,7 @@ BEGIN
END
IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS Calculator"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg"
reactos/base/applications/calc/lang/fr-FR.rc
+5 -5
View File
@@ -3,7 +3,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
// Dialog
IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Calculatrice ReactOS"
MENU IDR_MENU_SCIENTIFIC_1
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -159,7 +159,7 @@ BEGIN
END
IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Calculatrice ReactOS"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -226,7 +226,7 @@ BEGIN
END
IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Calculatrice ReactOS"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg"
@@ -304,7 +304,7 @@ BEGIN
END
IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "À propos de la Calculatrice ReactOS"
FONT 8, "MS Shell Dlg"
BEGIN
@@ -323,7 +323,7 @@ BEGIN
END
IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Statistiques"
FONT 8, "MS Shell Dlg"
BEGIN
reactos/base/applications/calc/lang/it-IT.rc
+5 -5
View File
@@ -3,7 +3,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
// Dialog
IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Calcolatrice ReactOS"
MENU IDR_MENU_SCIENTIFIC_1
FONT 8, "MS Shell Dlg"
@@ -159,7 +159,7 @@ BEGIN
END
IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Calcolatrice ReactOS"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg"
@@ -226,7 +226,7 @@ BEGIN
END
IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Calcolatrice ReactOS"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg"
@@ -304,7 +304,7 @@ BEGIN
END
IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Informazioni su ReactOS Calc"
FONT 8, "MS Shell Dlg"
BEGIN
@@ -323,7 +323,7 @@ BEGIN
END
IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Finestra di statistica"
FONT 8, "MS Shell Dlg"
BEGIN
reactos/base/applications/calc/lang/ko-KR.rc
+5 -5
View File
@@ -7,7 +7,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
// Dialog
IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS 계산기"
MENU IDR_MENU_SCIENTIFIC_1
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -163,7 +163,7 @@ BEGIN
END
IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS 계산기"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -230,7 +230,7 @@ BEGIN
END
IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS 계산기 정보"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg"
@@ -308,7 +308,7 @@ BEGIN
END
IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS 계산기 정보"
FONT 8, "MS Shell Dlg"
BEGIN
@@ -327,7 +327,7 @@ BEGIN
END
IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Statistics box"
FONT 8, "MS Shell Dlg"
BEGIN
reactos/base/applications/calc/lang/nl-NL.rc
+1 -1
View File
@@ -226,7 +226,7 @@ BEGIN
END
IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS Rekenmachine"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg"
reactos/base/applications/calc/lang/no-NO.rc
+1 -1
View File
@@ -226,7 +226,7 @@ BEGIN
END
IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS Kalkulator"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg"
reactos/base/applications/calc/lang/pl-PL.rc
+1 -1
View File
@@ -233,7 +233,7 @@ BEGIN
END
IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ReactOS Calculator"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg"
reactos/base/applications/calc/lang/ru-RU.rc
+1 -1
View File
@@ -226,7 +226,7 @@ BEGIN
END
IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Êàëüêóëÿòîð ReactOS"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg"
reactos/base/applications/calc/lang/sk-SK.rc
+1 -1
View File
@@ -235,7 +235,7 @@ BEGIN
END
IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
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"
reactos/base/applications/calc/lang/th-TH.rc
+5 -5
View File
@@ -8,7 +8,7 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT
// Dialog
IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "à¤Ã×èͧ¤Ô´àÅ¢ ReactOS"
MENU IDR_MENU_SCIENTIFIC_1
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -164,7 +164,7 @@ BEGIN
END
IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "ʶҹÀÒ¾·ÑèÇä»"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -231,7 +231,7 @@ BEGIN
END
IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "à¤Ã×èͧ¤Ô´àÅ¢ ReactOS"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg"
@@ -309,7 +309,7 @@ BEGIN
END
IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "à¡ÕèÂǡѺ ReactOS Calc"
FONT 8, "MS Shell Dlg"
BEGIN
@@ -328,7 +328,7 @@ BEGIN
END
IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "¡ÅèͧʶҹÐ"
FONT 8, "MS Shell Dlg"
BEGIN
reactos/base/applications/calc/lang/uk-UA.rc
+1 -1
View File
@@ -234,7 +234,7 @@ BEGIN
END
IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130
STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Êàëüêóëÿòîð ReactOS"
MENU IDR_MENU_STANDARD
FONT 8, "MS Shell Dlg"
reactos/base/applications/calc/resource.rc
+4
View File
@@ -26,6 +26,10 @@
#define IDC_STATIC -1
#endif
#ifndef DS_SHELLFONT
#define DS_SHELLFONT DS_SETFONT|DS_FIXEDSYS
#endif
// Common resources
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
reactos/base/applications/calc/rpn.c
+3
View File
@@ -383,6 +383,9 @@ int exec_infix2postfix(calc_number_t *number, unsigned int func)
push(&tmp);
if (func == RPN_OPERATOR_NONE)
return 0;
if (func != RPN_OPERATOR_PARENT) {
calc.last_operator = func;
evalStack(number);
reactos/base/applications/calc/rpn_mpfr.c
+3
View File
@@ -364,6 +364,9 @@ int exec_infix2postfix(calc_number_t *number, unsigned int func)
push(&tmp);
mpfr_clear(tmp.node.number.mf);
if (func == RPN_OPERATOR_NONE)
return 0;
if (func != RPN_OPERATOR_PARENT) {
calc.last_operator = func;
evalStack(number);
reactos/base/applications/calc/whatsnew.txt
+10
View File
@@ -1,3 +1,13 @@
1.11 (20080813)
=======================
* Updated translations (thanks to the friends at ReactOS' community).
* Added DS_SHELLFONT to some dialogs into various translations (sometimes it was specified, sometimes it was not).
* Added support for newer conversion units.
* Fixed mistake into english translation (lenghts -> lengths).
* Now decimal and thousand separators can be also read directly from registry (NT only, not 9x/ME).
* Fixed bug when pressing an operator twice (like '1++2=' caused error).
* Now unary operators and constant generators won't break RPN queue.
1.10 (20080813)
=======================
* Added Norvegian and Korean translations.
reactos/base/applications/calc/winmain.c
+47 -8
View File
@@ -38,10 +38,10 @@ typedef struct {
} key2code_t;
typedef struct {
WORD idc; // IDC for posting message
CHAR key; // Virtual key identifier
BYTE mask; // enable/disable into the various modes.
INT col; // color used for drawing the text
WORD idc; // IDC for posting message
CHAR key; // Virtual key identifier
BYTE mask; // enable/disable into the various modes.
COLORREF col; // color used for drawing the text
} key3code_t;
#define CTRL_FLAG 0x100
@@ -209,9 +209,9 @@ static const function_table_t function_table[] = {
{ IDC_BUTTON_DAT, 0, 1, run_dat_sta, NULL, NULL, NULL, },
{ IDC_BUTTON_MP, MODIFIER_INV, 1, run_mp, run_mm, NULL, NULL, },
{ IDC_BUTTON_MS, MODIFIER_INV, 1, run_ms, run_mw, NULL, NULL, },
{ IDC_BUTTON_CANC, 0, 0, run_canc, NULL, NULL, NULL, },
{ IDC_BUTTON_RIGHTPAR, 0, 1, run_rpar, NULL, NULL, NULL, },
{ IDC_BUTTON_LEFTPAR, 0, 0, run_lpar, NULL, NULL, NULL, },
{ IDC_BUTTON_CANC, NO_CHAIN, 0, run_canc, NULL, NULL, NULL, },
{ IDC_BUTTON_RIGHTPAR, NO_CHAIN, 1, run_rpar, NULL, NULL, NULL, },
{ IDC_BUTTON_LEFTPAR, NO_CHAIN, 0, run_lpar, NULL, NULL, NULL, },
};
/*
@@ -223,6 +223,9 @@ static void load_config(void)
{
TCHAR buf[32];
DWORD tmp;
#if _WIN32_WINNT >= 0x0500
HKEY hKey;
#endif
/* Try to load last selected layout */
GetProfileString(TEXT("SciCalc"), TEXT("layout"), TEXT("0"), buf, SIZEOF(buf));
@@ -239,9 +242,42 @@ static void load_config(void)
/* memory is empty at startup */
calc.is_memory = FALSE;
#if _WIN32_WINNT >= 0x0500
/* empty these values */
calc.sDecimal[0] = TEXT('\0');
calc.sThousand[0] = TEXT('\0');
/* try to open the registry */
if (RegOpenKeyEx(HKEY_CURRENT_USER,
TEXT("Control Panel\\International"),
0,
KEY_QUERY_VALUE,
&hKey) == ERROR_SUCCESS) {
/* get these values (ignore errors) */
tmp = sizeof(calc.sDecimal);
RegQueryValueEx(hKey, TEXT("sDecimal"), NULL, NULL, (LPBYTE)calc.sDecimal, &tmp);
tmp = sizeof(calc.sThousand);
RegQueryValueEx(hKey, TEXT("sThousand"), NULL, NULL, (LPBYTE)calc.sThousand, &tmp);
/* close the key */
RegCloseKey(hKey);
}
/* if something goes wrong, let's apply the defaults */
if (calc.sDecimal[0] == TEXT('\0'))
_tcscpy(calc.sDecimal, TEXT("."));
if (calc.sThousand[0] == TEXT('\0'))
_tcscpy(calc.sThousand, TEXT(","));
/* get the string lengths */
calc.sDecimal_len = _tcslen(calc.sDecimal);
calc.sThousand_len = _tcslen(calc.sThousand);
#else
/* acquire regional settings */
calc.sDecimal_len = GetProfileString(TEXT("intl"), TEXT("sDecimal"), TEXT("."), calc.sDecimal, SIZEOF(calc.sDecimal));
calc.sThousand_len = GetProfileString(TEXT("intl"), TEXT("sThousand"), TEXT(","), calc.sThousand, SIZEOF(calc.sThousand));
#endif
}
static void save_config(void)
@@ -1427,7 +1463,8 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
if (x == RPN_OPERATOR_EQUAL) {
exec_infix2postfix(&calc.code, calc.prev_operator);
rpn_copy(&calc.code, &calc.prev);
}
} else
break;
}
/* if no change then quit silently, */
@@ -1569,6 +1606,8 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
convert_text2number(&calc.code);
cb(&calc.code);
display_rpn_result(hWnd, &calc.code);
if (!(function_table[x].range & NO_CHAIN))
exec_infix2postfix(&calc.code, RPN_OPERATOR_NONE);
if (function_table[x].range & MODIFIER_INV)
SendDlgItemMessage(hWnd, IDC_CHECK_INV, BM_SETCHECK, 0, 0);
if (function_table[x].range & MODIFIER_HYP)
reactos/base/applications/calc/wmmsg.h
-1030
View File
File diff suppressed because it is too large Load Diff