Menu
▾
▴
[Easycalc-commits] PPCport/system - UI EasyCalc.cpp, 1.5, 1.6 EasyCalc.h, 1.5, 1.6 EasyCalc.layout, 1.6, 1.7 EasyCalcppc.aps, 1.5, 1.6 EasyCalcppc.rc, 1.5, 1.6 resourceppc.h, 1.5, 1.6 Skin.cpp, 1.7, 1.8 Skin.h, 1.7, 1.8 StateManager.cpp, 1.3, 1.4 StateManager.h, 1.4, 1.5
|
From: Mapi B. <ma...@us...> - 2009-11-02 17:37:08
|
Update of /cvsroot/easycalc/PPCport/system - UI In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv28045 Modified Files: EasyCalc.cpp EasyCalc.h EasyCalc.layout EasyCalcppc.aps EasyCalcppc.rc resourceppc.h Skin.cpp Skin.h StateManager.cpp StateManager.h Log Message: 1.25b Index: EasyCalc.layout =================================================================== RCS file: /cvsroot/easycalc/PPCport/system - UI/EasyCalc.layout,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** EasyCalc.layout 25 Oct 2009 23:58:07 -0000 1.6 --- EasyCalc.layout 2 Nov 2009 17:36:50 -0000 1.7 *************** *** 206,210 **** Key: 30,38 84,97,32,22 89,102,22,12 89,101 Key: 29,60 123,97,32,22 128,102,22,12 128,101 ! Key: 27,106 162,97,32,22 167,102,22,12 167,101 Key: 48,107 201,97,32,22 206,102,22,12 206,101 # 3rd row --- 206,210 ---- Key: 30,38 84,97,32,22 89,102,22,12 89,101 Key: 29,60 123,97,32,22 128,102,22,12 128,101 ! Key: 27,98 162,97,32,22 167,102,22,12 167,101 Key: 48,107 201,97,32,22 206,102,22,12 206,101 # 3rd row Index: EasyCalc.h =================================================================== RCS file: /cvsroot/easycalc/PPCport/system - UI/EasyCalc.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EasyCalc.h 25 Oct 2009 23:58:07 -0000 1.5 --- EasyCalc.h 2 Nov 2009 17:36:50 -0000 1.6 *************** *** 53,63 **** #define BCD_SECT - #define int2 short - #define uint2 unsigned short - #define int4 int - #define uint4 unsigned int - #define uint unsigned int - - #if defined(WINDOWS) && !defined(__GNUC__) #define int8 __int64 --- 53,56 ---- *************** *** 111,116 **** #endif - // Filename, including path, max size. - #define FILENAMELEN 256 // Version of the shell file #define SHELL_VERSION 1 --- 104,107 ---- *************** *** 138,151 **** #define altWriteStateFile 13 #define FrmAlert FrmPopupForm int FrmPopupForm(int formNb, void *hWnd_p); int FrmCustomAlert(int formNb, const TCHAR *s1, const TCHAR *s2, const TCHAR *s3, void *hWnd_p); #ifndef _EASYCALC_C_ #include "compat/Lang.h" ! extern LibLang *libLang; ! extern int g_systUserLangId; // Detected language of the system user #endif - #include "compat/PalmOS.h" #include "core/mlib/konvert.h" void read_state (void); --- 129,154 ---- #define altWriteStateFile 13 #define FrmAlert FrmPopupForm + #define FrmAlertMain(a) FrmPopupForm(a, NULL) int FrmPopupForm(int formNb, void *hWnd_p); int FrmCustomAlert(int formNb, const TCHAR *s1, const TCHAR *s2, const TCHAR *s3, void *hWnd_p); + #include "compat/PalmOS.h" + // Structure for talking with the ask()panel. + typedef struct { + TCHAR *asktxt; + TCHAR *defaultvalue; + TCHAR *answertxt; + } t_asktxt_param; + + Boolean popupAskTxt(t_asktxt_param *param); + #ifndef _EASYCALC_C_ + #include "StateManager.h" #include "compat/Lang.h" ! extern LibLang *libLang; ! extern int g_systUserLangId; // Detected language of the system user ! extern StateManager *stateMgr; #endif #include "core/mlib/konvert.h" void read_state (void); *************** *** 158,160 **** --- 161,168 ---- void ErrFatalDisplayIf(int cond, TCHAR *msg); + void LstEditSetLabel(int listNb, TCHAR *label); + void LstEditSetRow(int rowNb, int value, TCHAR *cell1, TCHAR *cell2, TCHAR *cell3); + void LstEditSetListChoices(int listNb, TCHAR **values, int size); + void LstEditDeselect(void); + #endif Index: EasyCalcppc.aps =================================================================== RCS file: /cvsroot/easycalc/PPCport/system - UI/EasyCalcppc.aps,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvsKNZ2es and /tmp/cvs3aWxD2 differ Index: EasyCalc.cpp =================================================================== RCS file: /cvsroot/easycalc/PPCport/system - UI/EasyCalc.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EasyCalc.cpp 25 Oct 2009 17:53:49 -0000 1.5 --- EasyCalc.cpp 2 Nov 2009 17:36:50 -0000 1.6 *************** *** 47,50 **** --- 47,53 ---- #include "core/mlib/calcDB.h" #include "core/mlib/history.h" + #include "core/lstedit.h" + #include "core/mlib/funcs.h" + #include "core/mlib/stack.h" *************** *** 55,58 **** [...1851 lines suppressed...] ! } ! return (TRUE); ! ! case WM_APP_ENDFMENU: ! case WM_APP_ENDFCMENU: ! { ! HWND hWnd = GetDlgItem(hDlg, IDC_EDIT2); ! main_insert(cur_skin, hWnd, (TCHAR *) lParam, false, true, false, NULL); ! free((void *) lParam); ! } ! return (TRUE); ! ! case WM_CLOSE: ! EndDialog(hDlg, 0); ! return (TRUE); ! ! default: ! return (DefWindowProc(hDlg, message, wParam, lParam)); } Index: Skin.h =================================================================== RCS file: /cvsroot/easycalc/PPCport/system - UI/Skin.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Skin.h 25 Oct 2009 17:53:50 -0000 1.7 --- Skin.h 2 Nov 2009 17:36:50 -0000 1.8 *************** *** 23,27 **** #include <windows.h> #include "core/core_globals.h" - //#include "core_display.h" #include "compat/PalmOS.h" #include "defuns.h" --- 23,26 ---- *************** *** 82,87 **** TODEGREE, TORADIAN, - TOGONIO, TOCIS, ENGDISPLAY, TODEGREE2 --- 81,86 ---- TODEGREE, TORADIAN, TOCIS, + TOGONIO, ENGDISPLAY, TODEGREE2 *************** *** 102,105 **** --- 101,107 ---- SkinPoint display_scale; COLORREF display_bg, display_fg; + HFONT hFontBig_display; + HFONT hFontSmall_display; + HFONT hFont_input; SkinKey *keylist; // Array of keys in the skin int nkeys; // Number of keys in the skin *************** *** 129,139 **** bool display_enabled; // Enable or disable screen repaints. TCHAR dispResult[RESULTAREA_SIZE]; // Contains the result area string int result_len; // Length of the result area string (-1 to ask for recalculation of result_size) SIZE result_size; // Result "would-be" size on display without clipping int scroll_result; // DT_LEFT if scrolled left (left align), DT_RIGHT if scrolled right (right align) TCHAR inputText[INPUTAREA_SIZE]; // Used to get the input area string ! int pow_pos; // Current posistion right when writing ! // power text. ! HDC pow_hdc; // Current HDC used for power text. HWND hwndE; // The handle to the edit control input area bool landscape; --- 131,141 ---- bool display_enabled; // Enable or disable screen repaints. TCHAR dispResult[RESULTAREA_SIZE]; // Contains the result area string + TCHAR work_dispResult[RESULTAREA_SIZE]; // Working area for pow results int result_len; // Length of the result area string (-1 to ask for recalculation of result_size) + bool result_pow; // Signals that we are mixing small and big fonts (exponential display) SIZE result_size; // Result "would-be" size on display without clipping int scroll_result; // DT_LEFT if scrolled left (left align), DT_RIGHT if scrolled right (right align) TCHAR inputText[INPUTAREA_SIZE]; // Used to get the input area string ! int pow_pos; // Current position when writing power text. HWND hwndE; // The handle to the edit control input area bool landscape; *************** *** 152,161 **** int load(TCHAR *skinname, const TCHAR *basedir, int width, int height); ! int getchar(); ! void rewind(); int init_image(int type, int ncolors, const SkinColor *colors, int width, int height); void put_pixels(unsigned const char *data); ! void finish_image(); void repaint(HDC hdc, HDC memdc); --- 154,163 ---- int load(TCHAR *skinname, const TCHAR *basedir, int width, int height); ! int getchar(void); ! void rewind(void); int init_image(int type, int ncolors, const SkinColor *colors, int width, int height); void put_pixels(unsigned const char *data); ! void finish_image(void); void repaint(HDC hdc, HDC memdc); *************** *** 168,174 **** void display_blitter(HDC hdc, const char *bits, int bytesperline, int x, int y, int width, int height); ! void repaint_display(HDC hdc, HDC memdc); ! COLORREF getDisplayFgColor(); ! COLORREF getDisplayBgColor(); void create_input_area(HWND hwnd, HINSTANCE hinst); void clipboardAction (void *hwnd, int action); --- 170,176 ---- void display_blitter(HDC hdc, const char *bits, int bytesperline, int x, int y, int width, int height); ! void repaint_result(HDC hdc, HDC memdc); ! COLORREF getDisplayFgColor(void); ! COLORREF getDisplayBgColor(void); void create_input_area(HWND hwnd, HINSTANCE hinst); void clipboardAction (void *hwnd, int action); *************** *** 181,194 **** void insert_input_text(void *hwnd, const TCHAR *text); void set_input_text(void *hwnd, const TCHAR *text); ! TCHAR *get_input_text(); void print_result(void *hWnd_p, TCHAR *res_text); void print_result(HDC hdc); void paint_result(HDC hdc); void scroll_result_left(HWND hWnd); void scroll_result_right(HWND hWnd); ! void print_resultpowInit(void *hdc, TCHAR *res_text); ! void print_resultpowNext(bool smallf, TCHAR *res_piece, int len); ! TCHAR *get_result(); ! void clipCopy_result(); void resultActionsPopup(resSelection choices[], int length, void *hWnd_p); void historyAddActionPopup(TCHAR *description, void *hWnd); --- 183,199 ---- void insert_input_text(void *hwnd, const TCHAR *text); void set_input_text(void *hwnd, const TCHAR *text); ! TCHAR *get_input_text(void); void print_result(void *hWnd_p, TCHAR *res_text); void print_result(HDC hdc); void paint_result(HDC hdc); + void print_resultpow(void *hWnd_p, TCHAR *res_text); + void print_resultpow(HDC hdc); + void paint_resultpow(HDC hdc); + void paint_resultpow_rec(HDC hdc, bool smallf, TCHAR *text); + void paint_result_piece(HDC hdc, bool smallf, TCHAR *res_piece, int len); void scroll_result_left(HWND hWnd); void scroll_result_right(HWND hWnd); ! TCHAR *get_result(void); ! void clipCopy_result(void); void resultActionsPopup(resSelection choices[], int length, void *hWnd_p); void historyAddActionPopup(TCHAR *description, void *hWnd); Index: StateManager.cpp =================================================================== RCS file: /cvsroot/easycalc/PPCport/system - UI/StateManager.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** StateManager.cpp 21 Oct 2009 20:56:50 -0000 1.3 --- StateManager.cpp 2 Nov 2009 17:36:50 -0000 1.4 *************** *** 5,9 **** #include "core/mlib/fp.h" #include "core/mlib/history.h" ! StateManager::StateManager(void) { --- 5,9 ---- #include "core/mlib/fp.h" #include "core/mlib/history.h" ! #include "EasyCalc.h" StateManager::StateManager(void) { *************** *** 16,19 **** --- 16,22 ---- _tcscpy(state.langName, _T("en")); // Language = english by default state.mouse_cont = true; + state.listPrefs.list[0][0] = _T('\0'); + state.listPrefs.list[1][0] = _T('\0'); + state.listPrefs.list[2][0] = _T('\0'); historyDB.in_state = false; Index: EasyCalcppc.rc =================================================================== RCS file: /cvsroot/easycalc/PPCport/system - UI/EasyCalcppc.rc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** EasyCalcppc.rc 25 Oct 2009 17:53:50 -0000 1.5 --- EasyCalcppc.rc 2 Nov 2009 17:36:50 -0000 1.6 *************** *** 37,66 **** END ! IDD_VARENTRY DIALOG 0, 0, 115, 55 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU ! CAPTION "Save variable as" FONT 8, "MS Shell Dlg" BEGIN ! DEFPUSHBUTTON "OK",IDOK,0,41,32,14 ! 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 ! IDD_EDITVAR DIALOG 0, 0, 160, 85 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Edit variable" FONT 8, "MS Shell Dlg" BEGIN ! DEFPUSHBUTTON "OK",IDOK,0,70,30,14 ! PUSHBUTTON "V",IDC_VAR,111,70,16,14 ! 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 ! PUSHBUTTON "Cancel",IDCANCEL,33,70,50,14 ! CONTROL "SIP1",IDC_SIP1,"SIPPREF",NOT WS_VISIBLE,91,70,14,14 END --- 37,66 ---- END ! IDD_VARENTRY DIALOG 0, 0, 115, 45 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU ! CAPTION "Save var as" FONT 8, "MS Shell Dlg" BEGIN ! DEFPUSHBUTTON "OK",IDOK,1,31,32,14 ! PUSHBUTTON "Cancel",IDCANCEL,73,31,41,14 ! LTEXT "Name:",IDC_VARNAME,3,3,35,12 ! COMBOBOX IDC_VARCOMBO,44,1,70,40,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP ! CONTROL "SIP1",IDC_SIP,"SIPPREF",NOT WS_VISIBLE | WS_TABSTOP,47,31,14,14 END ! IDD_EDITVAR DIALOG 0, 0, 160, 81 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Edit variable" FONT 8, "MS Shell Dlg" BEGIN ! DEFPUSHBUTTON "OK",IDOK,0,66,30,14 ! PUSHBUTTON "V",IDC_VAR,111,66,16,14 ! PUSHBUTTON "F",IDC_USERF,127,66,16,14 ! PUSHBUTTON "f",IDC_CALCF,143,66,16,14 ! LTEXT "Name:",IDC_VARNAME,0,4,25,8,NOT WS_GROUP ! EDITTEXT IDC_EDIT1,32,2,60,14,ES_LOWERCASE | ES_AUTOHSCROLL ! EDITTEXT IDC_EDIT2,0,19,159,43,ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL ! PUSHBUTTON "Cancel",IDCANCEL,33,66,50,14 ! CONTROL "SIP1",IDC_SIP,"SIPPREF",NOT WS_VISIBLE,91,66,14,14 END *************** *** 78,97 **** END ! IDD_EDITFCT DIALOG 0, 0, 160, 85 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Edit function" FONT 8, "MS Shell Dlg" BEGIN ! DEFPUSHBUTTON "OK",IDOK,0,70,30,14 ! PUSHBUTTON "V",IDC_VAR,111,70,16,14 ! 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 ! PUSHBUTTON "Cancel",IDCANCEL,33,70,50,14 ! LTEXT "Param:",IDC_PARAM,97,9,30,8 ! EDITTEXT IDC_EDIT3,129,7,30,14,ES_AUTOHSCROLL ! CONTROL "SIP1",IDC_SIP1,"SIPPREF",NOT WS_VISIBLE,91,70,14,14 END --- 78,97 ---- END ! IDD_EDITFCT DIALOG 0, 0, 160, 81 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Edit function" FONT 8, "MS Shell Dlg" BEGIN ! DEFPUSHBUTTON "OK",IDOK,0,66,30,14 ! PUSHBUTTON "V",IDC_VAR,111,66,16,14 ! PUSHBUTTON "F",IDC_USERF,127,66,16,14 ! PUSHBUTTON "f",IDC_CALCF,143,66,16,14 ! LTEXT "Name:",IDC_VARNAME,0,4,25,8 ! EDITTEXT IDC_EDIT1,32,2,60,14,ES_LOWERCASE | ES_AUTOHSCROLL | WS_GROUP ! EDITTEXT IDC_EDIT2,0,19,159,43,ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL ! PUSHBUTTON "Cancel",IDCANCEL,33,66,50,14 ! LTEXT "Param:",IDC_PARAM,97,4,30,8 ! EDITTEXT IDC_EDIT3,129,2,30,14,ES_AUTOHSCROLL ! CONTROL "SIP1",IDC_SIP,"SIPPREF",NOT WS_VISIBLE,91,66,14,14 END *************** *** 108,112 **** 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 --- 108,112 ---- 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,9,27,83,10 COMBOBOX IDC_LANGUAGE_CB,7,44,78,88,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP *************** *** 119,123 **** 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 --- 119,123 ---- 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 *************** *** 128,132 **** COMBOBOX IDC_SKINVAL,72,87,21,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Default skin",IDC_SKIN,10,90,58,8 ! CONTROL "SIP1",IDC_SIP1,"SIPPREF",NOT WS_VISIBLE,121,85,14,14 END --- 128,132 ---- COMBOBOX IDC_SKINVAL,72,87,21,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Default skin",IDC_SKIN,10,90,58,8 ! CONTROL "SIP1",IDC_SIP,"SIPPREF",NOT WS_VISIBLE,121,85,14,14 END *************** *** 136,140 **** 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 --- 136,140 ---- FONT 8, "MS Shell Dlg" BEGIN ! LTEXT "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 *************** *** 157,161 **** CONTROL "Insert Help",IDC_INS_HELP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,80,139,78,10 GROUPBOX "Edit Assistance",IDC_ASSISTGROUP,0,130,160,22 ! CONTROL "SIP1",IDC_SIP1,"SIPPREF",NOT WS_VISIBLE,145,114,14,14 END --- 157,161 ---- CONTROL "Insert Help",IDC_INS_HELP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,80,139,78,10 GROUPBOX "Edit Assistance",IDC_ASSISTGROUP,0,130,160,22 ! CONTROL "SIP1",IDC_SIP,"SIPPREF",NOT WS_VISIBLE,145,114,14,14 END *************** *** 173,177 **** 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 --- 173,177 ---- FONT 8, "MS Sans Serif" BEGIN ! ICON IDI_EASYCALC,IDC_STATIC_1,12,12,21,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 *************** *** 184,192 **** 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 ///////////////////////////////////////////////////////////////////////////// --- 184,237 ---- FONT 8, "MS Sans Serif" BEGIN ! ICON IDI_EASYCALC,IDC_STATIC_1,9,12,20,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 + IDD_ASKTXT DIALOG 0, 0, 160, 63 + STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU + CAPTION "Ask Text" + FONT 8, "MS Shell Dlg" + BEGIN + DEFPUSHBUTTON "OK",IDOK,0,48,30,14 + PUSHBUTTON "V",IDC_VAR,111,48,16,14 + PUSHBUTTON "F",IDC_USERF,127,48,16,14 + PUSHBUTTON "f",IDC_CALCF,143,48,16,14 + EDITTEXT IDC_EDIT2,0,2,159,43,ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL + PUSHBUTTON "Cancel",IDCANCEL,33,48,50,14 + CONTROL "SIP1",IDC_SIP,"SIPPREF",NOT WS_VISIBLE,91,48,14,14 + END + + IDD_LISTEDIT DIALOG 0, 0, 160, 165 + STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU + CAPTION "List Editor" + FONT 8, "MS Shell Dlg" + BEGIN + CONTROL "",IDC_EDITLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_EDITLABELS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,1,15,158,133 + DEFPUSHBUTTON "OK",IDOK,0,150,30,14 + PUSHBUTTON "Append",IDC_APPEND,33,150,40,14 + PUSHBUTTON "Insert",IDC_INSERT,76,150,40,14 + PUSHBUTTON "Delete",IDC_DELETE,119,150,40,14 + COMBOBOX IDC_COMBO_LIST1,17,1,45,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_LIST2,61,1,45,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_COMBO_LIST3,105,1,45,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + CONTROL "SIP1",IDC_SIP,"SIPPREF",NOT WS_VISIBLE | WS_TABSTOP,1,1,14,14 + END + + IDD_VARSTRINGENTRY DIALOG 0, 0, 115, 45 + STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU + CAPTION "Get value" + FONT 8, "MS Shell Dlg" + BEGIN + DEFPUSHBUTTON "OK",IDOK,1,31,32,14 + PUSHBUTTON "Cancel",IDCANCEL,73,31,41,14 + LTEXT "Value:",IDC_VARNAME,3,3,35,12 + EDITTEXT IDC_EDIT2,43,1,71,14,ES_LOWERCASE | ES_AUTOHSCROLL + PUSHBUTTON "V",IDC_VAR,66,16,16,14 + PUSHBUTTON "F",IDC_USERF,82,16,16,14 + PUSHBUTTON "f",IDC_CALCF,98,16,16,14 + CONTROL "SIP1",IDC_SIP,"SIPPREF",NOT WS_VISIBLE | WS_TABSTOP,47,31,14,14 + END + ///////////////////////////////////////////////////////////////////////////// *************** *** 201,205 **** BEGIN RIGHTMARGIN, 114 ! TOPMARGIN, 7 END --- 246,250 ---- BEGIN RIGHTMARGIN, 114 ! TOPMARGIN, 1 END *************** *** 208,212 **** RIGHTMARGIN, 159 TOPMARGIN, 2 ! BOTTOMMARGIN, 84 END --- 253,257 ---- RIGHTMARGIN, 159 TOPMARGIN, 2 ! BOTTOMMARGIN, 80 END *************** *** 223,227 **** RIGHTMARGIN, 159 TOPMARGIN, 2 ! BOTTOMMARGIN, 84 END --- 268,272 ---- RIGHTMARGIN, 159 TOPMARGIN, 2 ! BOTTOMMARGIN, 80 END *************** *** 246,253 **** IDD_ABOUTBOX, DIALOG BEGIN ! LEFTMARGIN, 7 ! RIGHTMARGIN, 112 ! TOPMARGIN, 4 ! BOTTOMMARGIN, 95 END --- 291,296 ---- IDD_ABOUTBOX, DIALOG BEGIN ! RIGHTMARGIN, 119 ! BOTTOMMARGIN, 100 END *************** *** 259,262 **** --- 302,326 ---- BOTTOMMARGIN, 77 END + + IDD_ASKTXT, DIALOG + BEGIN + RIGHTMARGIN, 159 + TOPMARGIN, 2 + BOTTOMMARGIN, 62 + END + + IDD_LISTEDIT, DIALOG + BEGIN + LEFTMARGIN, 1 + RIGHTMARGIN, 159 + TOPMARGIN, 1 + BOTTOMMARGIN, 164 + END + + IDD_VARSTRINGENTRY, DIALOG + BEGIN + RIGHTMARGIN, 114 + TOPMARGIN, 1 + END END #endif // APSTUDIO_INVOKED *************** *** 291,294 **** --- 355,360 ---- MENUITEM SEPARATOR MENUITEM "Clear history", IDM_EDIT_CLEARHISTORY + MENUITEM SEPARATOR + MENUITEM "List Editor", IDM_EDIT_LISTEDITOR END POPUP "Help" *************** *** 304,308 **** // ! IDC_EASYCALC ACCELERATORS BEGIN "Q", IDM_FILE_EXIT, VIRTKEY, CONTROL, NOINVERT --- 370,374 ---- // ! IDC_EASYCALC_ACCEL ACCELERATORS BEGIN "Q", IDM_FILE_EXIT, VIRTKEY, CONTROL, NOINVERT Index: StateManager.h =================================================================== RCS file: /cvsroot/easycalc/PPCport/system - UI/StateManager.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** StateManager.h 21 Oct 2009 20:56:50 -0000 1.4 --- StateManager.h 2 Nov 2009 17:36:50 -0000 1.5 *************** *** 4,17 **** #define STATE_MANAGER_H 1 - #include "EasyCalc.h" #include "compat/DataManager.h" #include "core/prefs.h" typedef struct { ! TCHAR skinName[3][FILENAMELEN]; ! TCHAR langName[FILENAMELEN]; ! int cur_skin_nb; ! bool mouse_cont; ! tPrefs calcPrefs; } t_state; --- 4,21 ---- #define STATE_MANAGER_H 1 #include "compat/DataManager.h" #include "core/prefs.h" + #include "core/lstedit.h" + + // Filename, including path, max size. + #define FILENAMELEN 256 typedef struct { ! TCHAR skinName[3][FILENAMELEN]; ! TCHAR langName[FILENAMELEN]; ! int cur_skin_nb; ! bool mouse_cont; ! tPrefs calcPrefs; ! tlistPrefs listPrefs; } t_state; Index: resourceppc.h =================================================================== RCS file: /cvsroot/easycalc/PPCport/system - UI/resourceppc.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** resourceppc.h 25 Oct 2009 17:53:50 -0000 1.5 --- resourceppc.h 2 Nov 2009 17:36:50 -0000 1.6 *************** *** 5,8 **** --- 5,9 ---- #define IDS_APP_TITLE 1 #define IDC_EASYCALC 2 + #define IDC_EASYCALC_ACCEL 2 #define IDI_EASYCALC 101 #define IDR_MENU 102 *************** *** 22,25 **** --- 23,29 ---- #define IDD_SLIM_MENU 142 #define IDD_OPT_PREFS 145 + #define IDD_ASKTXT 146 + #define IDD_LISTEDIT 147 + #define IDD_VARSTRINGENTRY 148 #define IDC_STATIC_1 201 #define IDC_STATIC_2 202 *************** *** 38,44 **** #define IDC_NEW 1044 #define IDC_MODIFY 1045 - #define IDC_DELETE 1046 - #define IDC_EDIT1 1047 - #define IDC_EDIT2 1048 #define IDC_USERF 1054 #define IDC_CALCF 1055 --- 42,45 ---- *************** *** 70,83 **** #define IDC_INS_HELP 1084 #define IDC_ASSISTGROUP 1085 ! #define IDC_SIP1 1086 ! #define IDC_VARNAME1 1087 ! #define IDC_VARNAME2 1088 ! #define IDC_TITLE3 1089 ! #define IDC_TITLE1 1090 ! #define IDC_VARNAME3 1091 ! #define IDC_TITLE4 1091 ! #define IDC_TITLE2 1092 #define IDC_LANGUAGE_CB 1093 #define IDC_LANGUAGE 1094 #define IDM_EXIT 32774 #define IDM_FILE_EXIT 32777 --- 71,89 ---- #define IDC_INS_HELP 1084 #define IDC_ASSISTGROUP 1085 ! #define IDC_VARNAME 1088 ! #define IDC_TITLE 1090 #define IDC_LANGUAGE_CB 1093 #define IDC_LANGUAGE 1094 + #define IDC_EDIT2 1095 + #define IDC_INSERT 1096 + #define IDC_COMBO_LIST1 1099 + #define IDC_EDITLIST 1101 + #define IDC_COMBO_LIST2 1102 + #define IDC_COMBO_LIST3 1103 + #define IDC_APPEND 1107 + #define IDC_SUBITEMEDIT 1108 + #define IDC_DELETE 1116 + #define IDC_EDIT1 1117 + #define IDC_SIP 1120 #define IDM_EXIT 32774 #define IDM_FILE_EXIT 32777 *************** *** 87,90 **** --- 93,97 ---- #define IDM_FILE_OPTIONS 32786 #define IDM_EDIT_CLIPCOPY 32787 + #define IDM_EDIT_LISTEDITOR 32789 #define IDM_OK 40000 #define IDM_HELP 40001 *************** *** 99,104 **** #define _APS_NO_MFC 1 #define _APS_NEXT_RESOURCE_VALUE 149 ! #define _APS_NEXT_COMMAND_VALUE 32788 ! #define _APS_NEXT_CONTROL_VALUE 1095 #define _APS_NEXT_SYMED_VALUE 112 #endif --- 106,111 ---- #define _APS_NO_MFC 1 #define _APS_NEXT_RESOURCE_VALUE 149 ! #define _APS_NEXT_COMMAND_VALUE 32790 ! #define _APS_NEXT_CONTROL_VALUE 1128 #define _APS_NEXT_SYMED_VALUE 112 #endif Index: Skin.cpp =================================================================== RCS file: /cvsroot/easycalc/PPCport/system - UI/Skin.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Skin.cpp 25 Oct 2009 17:53:50 -0000 1.7 --- Skin.cpp 2 Nov 2009 17:36:50 -0000 1.8 *************** *** 45,59 **** extern LibLang *libLang; - /**********************************************************/ - /* Linked-in skins; defined in the skins.c, which in turn */ - /* is generated by skin2c.c under control of skin2c.conf */ - /**********************************************************/ - - //extern int skin_count; - //extern const TCHAR *skin_name[]; - //extern long skin_layout_size[]; [...1160 lines suppressed...] *** 1553,1557 **** int i = SendMessage((HWND) hWnd, LVM_INSERTITEM, (WPARAM) 0, (LPARAM) &lvi); - lvi.mask = LVIF_TEXT; lvi.iItem = i; lvi.iSubItem = 1; --- 1735,1738 ---- *************** *** 1563,1567 **** * Enable or disable screen repaints. * ********************************************************************************/ ! void Skin::display_set_enabled(bool enable) { display_enabled = enable; } --- 1744,1748 ---- * Enable or disable screen repaints. * ********************************************************************************/ ! void Skin::display_set_enabled (bool enable) { display_enabled = enable; } |
