Menu
▾
▴
[Easycalc-commits] PPCport/system - UI EasyCalc.layout, 1.3, 1.4 EasyCalcppc.aps, 1.2, 1.3 EasyCalcppc.rc, 1.3, 1.4
|
From: Mapi B. <ma...@us...> - 2009-10-21 20:56:33
|
Update of /cvsroot/easycalc/PPCport/system - UI In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27742 Modified Files: EasyCalc.layout EasyCalcppc.aps EasyCalcppc.rc Log Message: Bug fixes, dynamic language change enabled on UI. Index: EasyCalc.layout =================================================================== RCS file: /cvsroot/easycalc/PPCport/system - UI/EasyCalc.layout,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EasyCalc.layout 17 Oct 2009 13:53:14 -0000 1.3 --- EasyCalc.layout 21 Oct 2009 20:56:25 -0000 1.4 *************** *** 3,8 **** # Skin rectangle coordinates x1,y1,x2,y2 Skin: 0,0,240,268 ! # Description of the display area: x1,y1 ? ? fg_color bg_color ! Display: 7,13 0 3 a3b39d 0b2327 # Active elements: num x1,y1,l,h (on screen) x1_off,y1_off x1_on,y1_on (in the gif) --- 3,10 ---- # Skin rectangle coordinates x1,y1,x2,y2 Skin: 0,0,240,268 ! # Description of the display area: x1,y1 xscale yscale fg_color bg_color ! # With xscale = 0, screen width is 217 dots (only value used for now). ! # Do not touch yscale either for now. ! Display: 9,13 0 3 a3b39d 0b2327 # Active elements: num x1,y1,l,h (on screen) x1_off,y1_off x1_on,y1_on (in the gif) *************** *** 15,27 **** Annunciator: 7 134,6,13,7 100,268 100,275 # Binary indicator Annunciator: 8 150,6,16,7 112,268 112,275 # Hexadecimal indicator ! Annunciator: 9 205,6,6,7 0,268 0,275 # Skin 1 indicator ! Annunciator: 10 212,6,6,7 5,268 5,275 # Skin 2 indicator ! Annunciator: 11 219,6,6,7 10,268 10,275 # Skin 3 indicator ! Annunciator: 12 226,6,6,7 15,268 15,275 # Graph indicator ! Annunciator: 13 170,6,7,7 139,268 139,275 # Var list indicator ! Annunciator: 14 178,6,6,7 145,268 145,275 # User fct list indicator ! Annunciator: 15 185,6,6,7 150,268 150,275 # Calc fct list indicator ! Annunciator: 16 226,26,7,7 127,268 127,275 # Result Menu indicator ! Annunciator: 17 226,34,7,7 133,268 133,275 # History Menu indicator # Keys on the calculator gif: --- 17,31 ---- Annunciator: 7 134,6,13,7 100,268 100,275 # Binary indicator Annunciator: 8 150,6,16,7 112,268 112,275 # Hexadecimal indicator ! Annunciator: 9 4,16,5,7 155,268 155,275 # Result scroll left indicator ! Annunciator: 10 227,16,5,7 159,268 159,275 # Result scroll right indicator ! Annunciator: 11 205,6,6,7 0,268 0,275 # Skin 1 indicator ! Annunciator: 12 212,6,6,7 5,268 5,275 # Skin 2 indicator ! Annunciator: 13 219,6,6,7 10,268 10,275 # Skin 3 indicator ! Annunciator: 14 226,6,6,7 15,268 15,275 # Graph indicator ! Annunciator: 15 170,6,7,7 139,268 139,275 # Var list indicator ! Annunciator: 16 178,6,6,7 145,268 145,275 # User fct list indicator ! Annunciator: 17 185,6,6,7 150,268 150,275 # Calc fct list indicator ! Annunciator: 18 226,26,7,7 127,268 127,275 # Result Menu indicator ! Annunciator: 19 226,34,7,7 133,268 133,275 # History Menu indicator # Keys on the calculator gif: *************** *** 189,193 **** Key: -2 162,70,32,22 167,75,22,12 167,74 Key: -1 201,70,32,22 206,75,22,12 206,74 ! Key: 38 6,97,32,22 11,102,22,12 11,101 Key: 31 45,97,32,22 50,102,22,12 50,101 Key: 30 84,97,32,22 89,102,22,12 89,101 --- 193,197 ---- Key: -2 162,70,32,22 167,75,22,12 167,74 Key: -1 201,70,32,22 206,75,22,12 206,74 ! Key: 48 6,97,32,22 11,102,22,12 11,101 Key: 31 45,97,32,22 50,102,22,12 50,101 Key: 30 84,97,32,22 89,102,22,12 89,101 Index: EasyCalcppc.rc =================================================================== RCS file: /cvsroot/easycalc/PPCport/system - UI/EasyCalcppc.rc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EasyCalcppc.rc 17 Oct 2009 13:53:14 -0000 1.3 --- EasyCalcppc.rc 21 Oct 2009 20:56:25 -0000 1.4 *************** *** 45,49 **** PUSHBUTTON "Cancel",IDCANCEL,73,41,41,14 COMBOBOX IDC_VARCOMBO,43,7,71,47,CBS_DROPDOWN | CBS_SORT | CBS_LOWERCASE | WS_VSCROLL | WS_GROUP | WS_TABSTOP ! LTEXT "Name:",IDC_VARNAME,0,7,35,12 CONTROL "SIP1",IDC_SIP1,"SIPPREF",NOT WS_VISIBLE | WS_TABSTOP,47,41,14,14 END --- 45,49 ---- PUSHBUTTON "Cancel",IDCANCEL,73,41,41,14 COMBOBOX IDC_VARCOMBO,43,7,71,47,CBS_DROPDOWN | CBS_SORT | CBS_LOWERCASE | WS_VSCROLL | WS_GROUP | WS_TABSTOP ! LTEXT "Name:",IDC_VARNAME3,0,7,35,12 CONTROL "SIP1",IDC_SIP1,"SIPPREF",NOT WS_VISIBLE | WS_TABSTOP,47,41,14,14 END *************** *** 58,62 **** PUSHBUTTON "F",IDC_USERF,127,70,16,14 PUSHBUTTON "f",IDC_CALCF,143,70,16,14 ! LTEXT "Name:",IDC_VARNAME,0,9,25,8 EDITTEXT IDC_EDIT1,32,7,60,14,ES_LOWERCASE | ES_AUTOHSCROLL | WS_GROUP EDITTEXT IDC_EDIT2,0,24,159,43,ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL --- 58,62 ---- PUSHBUTTON "F",IDC_USERF,127,70,16,14 PUSHBUTTON "f",IDC_CALCF,143,70,16,14 ! LTEXT "Name:",IDC_VARNAME1,0,9,25,8 EDITTEXT IDC_EDIT1,32,7,60,14,ES_LOWERCASE | ES_AUTOHSCROLL | WS_GROUP EDITTEXT IDC_EDIT2,0,24,159,43,ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL *************** *** 87,91 **** PUSHBUTTON "F",IDC_USERF,127,70,16,14 PUSHBUTTON "f",IDC_CALCF,143,70,16,14 ! LTEXT "Name:",IDC_VARNAME,0,9,25,8 EDITTEXT IDC_EDIT1,32,7,60,14,ES_LOWERCASE | ES_AUTOHSCROLL | WS_GROUP EDITTEXT IDC_EDIT2,0,24,159,43,ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL --- 87,91 ---- PUSHBUTTON "F",IDC_USERF,127,70,16,14 PUSHBUTTON "f",IDC_CALCF,143,70,16,14 ! LTEXT "Name:",IDC_VARNAME2,0,9,25,8 EDITTEXT IDC_EDIT1,32,7,60,14,ES_LOWERCASE | ES_AUTOHSCROLL | WS_GROUP EDITTEXT IDC_EDIT2,0,24,159,43,ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL *************** *** 108,121 **** FONT 8, "MS Shell Dlg" BEGIN ! LTEXT "General",IDC_TITLE,4,3,63,8 ! CONTROL "Dynamic mouse",IDC_CHECK_MOUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,42,83,10 END IDD_OPT_SKINS DIALOG 0, 0, 161, 153 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION ! CAPTION "Default skin" FONT 8, "MS Shell Dlg" BEGIN ! LTEXT "Skins",IDC_TITLE,4,3,63,8 COMBOBOX IDC_COMBO_SKIN1,9,32,48,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_COMBO_SKIN2,9,51,48,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP --- 108,123 ---- FONT 8, "MS Shell Dlg" BEGIN ! LTEXT "General",IDC_TITLE1,4,3,63,8 ! CONTROL "Dynamic mouse",IDC_CHECK_MOUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,27,83,10 ! COMBOBOX IDC_LANGUAGE_CB,7,44,78,88,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP ! LTEXT "Language",IDC_LANGUAGE,91,47,54,8 END IDD_OPT_SKINS DIALOG 0, 0, 161, 153 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION ! CAPTION "Skins" FONT 8, "MS Shell Dlg" BEGIN ! LTEXT "Skins",IDC_TITLE2,4,3,63,8 COMBOBOX IDC_COMBO_SKIN1,9,32,48,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP COMBOBOX IDC_COMBO_SKIN2,9,51,48,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP *************** *** 131,138 **** IDD_OPT_PREFS DIALOG 0, 0, 161, 153 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION ! CAPTION "Calc Preferences" FONT 8, "MS Shell Dlg" BEGIN ! LTEXT "Calc Preferences",IDC_TITLE,4,3,149,8 CONTROL "Degree",IDC_DEGREE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,5,15,40,10 CONTROL "Radian",IDC_RADIAN,"Button",BS_AUTORADIOBUTTON,57,15,39,10 --- 133,140 ---- IDD_OPT_PREFS DIALOG 0, 0, 161, 153 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION ! CAPTION "Preferences" FONT 8, "MS Shell Dlg" BEGIN ! LTEXT "Preferences",IDC_TITLE3,4,3,149,8 CONTROL "Degree",IDC_DEGREE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,5,15,40,10 CONTROL "Radian",IDC_RADIAN,"Button",BS_AUTORADIOBUTTON,57,15,39,10 *************** *** 165,168 **** --- 167,192 ---- END + IDD_ABOUTBOX DIALOG 8, 18, 120, 101 + STYLE DS_SETFONT | WS_POPUP | WS_CAPTION + EXSTYLE 0x80000000L + CAPTION "About..." + FONT 8, "MS Sans Serif" + BEGIN + ICON IDI_EASYCALC,IDC_STATIC_1,12,12,20,20,SS_REALSIZEIMAGE + LTEXT "EasyCalc Version 1.25a PPC",IDC_STATIC_2,12,36,100,8,SS_NOPREFIX + LTEXT "Copyright (C) 2009",IDC_STATIC_3,12,48,66,8 + END + + IDD_ABOUTBOX_WIDE DIALOG 18, 8, 138, 84 + STYLE DS_SETFONT | WS_POPUP | WS_CAPTION + EXSTYLE 0x80000000L + CAPTION "About EasyCalc" + FONT 8, "MS Sans Serif" + BEGIN + ICON IDI_EASYCALC,IDC_STATIC_1,9,12,21,20,SS_REALSIZEIMAGE + LTEXT "EasyCalc Version 1.25a PPC",IDC_STATIC_2,49,12,76,8,SS_NOPREFIX + LTEXT "Copyright (C) 2009",IDC_STATIC_3,49,24,66,8 + END + ///////////////////////////////////////////////////////////////////////////// *************** *** 219,274 **** BOTTOMMARGIN, 152 END - END - #endif // APSTUDIO_INVOKED - - #endif // Neutral resources - ///////////////////////////////////////////////////////////////////////////// - - - ///////////////////////////////////////////////////////////////////////////// - // English (U.S.) resources - - #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) - #ifdef _WIN32 - LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - #pragma code_page(1252) - #endif //_WIN32 - - ///////////////////////////////////////////////////////////////////////////// - // - // Dialog - // - - IDD_ABOUTBOX DIALOG 8, 18, 120, 101 - STYLE DS_SETFONT | WS_POPUP | WS_CAPTION - EXSTYLE 0x80000000L - CAPTION "About EasyCalc" - FONT 8, "MS Sans Serif" - BEGIN - ICON IDI_EASYCALC,IDC_STATIC_1,12,12,20,20,SS_REALSIZEIMAGE - LTEXT "EasyCalc Version 1.25a PPC",IDC_STATIC_2,12,36,100,8,SS_NOPREFIX - LTEXT "Copyright (C) 2009",IDC_STATIC_3,12,48,66,8 - END - - IDD_ABOUTBOX_WIDE DIALOG 18, 8, 138, 84 - STYLE DS_SETFONT | WS_POPUP | WS_CAPTION - EXSTYLE 0x80000000L - CAPTION "About EasyCalc" - FONT 8, "MS Sans Serif" - BEGIN - ICON IDI_EASYCALC,IDC_STATIC_1,9,12,21,20,SS_REALSIZEIMAGE - LTEXT "EasyCalc Version 1.25",IDC_STATIC_2,49,12,76,8,SS_NOPREFIX - LTEXT "Copyright (C) 2008",IDC_STATIC_3,49,24,66,8 - END - - - ///////////////////////////////////////////////////////////////////////////// - // - // DESIGNINFO - // - #ifdef APSTUDIO_INVOKED - GUIDELINES DESIGNINFO - BEGIN IDD_ABOUTBOX, DIALOG BEGIN --- 243,247 ---- *************** *** 316,320 **** POPUP "Help" BEGIN ! MENUITEM "About EasyCalc...", IDM_HELP_ABOUT END END --- 289,293 ---- POPUP "Help" BEGIN ! MENUITEM "About...", IDM_HELP_ABOUT END END *************** *** 333,370 **** - #ifdef APSTUDIO_INVOKED - ///////////////////////////////////////////////////////////////////////////// - // - // TEXTINCLUDE - // - - 1 TEXTINCLUDE - BEGIN - "resourceppc.h\0" - END - - 2 TEXTINCLUDE - BEGIN - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#include ""resdefce.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" - END - - 3 TEXTINCLUDE - BEGIN - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" - "LANGUAGE 9, 1\r\n" - "#pragma code_page(1252)\r\n" - "#include ""EasyCalcppc.rc2"" // non-Microsoft Visual C++ edited resources\r\n" - "#endif\r\n" - "\0" - END - - #endif // APSTUDIO_INVOKED - - ///////////////////////////////////////////////////////////////////////////// // --- 306,309 ---- *************** *** 385,420 **** END ! #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// ! // Farsi resources ! #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FAR) #ifdef _WIN32 ! LANGUAGE LANG_FARSI, SUBLANG_DEFAULT ! #pragma code_page(1256) #endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // ! // String Table // ! STRINGTABLE BEGIN ! IDS_APP_TITLE "EasyCalc" ! IDC_EASYCALC "EASYCALC" END ! STRINGTABLE BEGIN ! IDS_FILE "Fichier" ! IDS_HELP "Aide" ! IDS_EDIT "Editer" END ! #endif // Farsi resources ///////////////////////////////////////////////////////////////////////////// --- 324,374 ---- END ! #endif // Neutral resources ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// ! // English (U.S.) resources ! #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 ! LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US ! #pragma code_page(1252) #endif //_WIN32 + #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // ! // TEXTINCLUDE // ! 1 TEXTINCLUDE BEGIN ! "resourceppc.h\0" END ! 2 TEXTINCLUDE BEGIN ! "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" ! "#include ""windows.h""\r\n" ! "#include ""resdefce.h""\r\n" ! "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" ! "\0" END ! 3 TEXTINCLUDE ! BEGIN ! "\r\n" ! "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" ! "LANGUAGE 9, 1\r\n" ! "#pragma code_page(1252)\r\n" ! "#include ""EasyCalcppc.rc2"" // non-Microsoft Visual C++ edited resources\r\n" ! "#endif\r\n" ! "\0" ! END ! ! #endif // APSTUDIO_INVOKED ! ! #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// Index: EasyCalcppc.aps =================================================================== RCS file: /cvsroot/easycalc/PPCport/system - UI/EasyCalcppc.aps,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsmGCOoK and /tmp/cvsg1ZTHI differ |
