[q-lang-cvs] qcalc qcalc.q,1.178,1.179
Brought to you by:
agraef
Menu
▾
▴
[q-lang-cvs] qcalc qcalc.q,1.178,1.179
|
From: Albert G. <ag...@us...> - 2007-11-23 22:09:22
|
Update of /cvsroot/q-lang/qcalc In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22943 Modified Files: qcalc.q Log Message: fix up computed values of actionbuttons for printing, copy/paste Index: qcalc.q =================================================================== RCS file: /cvsroot/q-lang/qcalc/qcalc.q,v retrieving revision 1.178 retrieving revision 1.179 diff -C2 -d -r1.178 -r1.179 *** qcalc.q 23 Nov 2007 18:21:38 -0000 1.178 --- qcalc.q 23 Nov 2007 22:09:18 -0000 1.179 *************** *** 1162,1165 **** --- 1162,1170 ---- = IT if eq () X; + gui_data (I,J) + where IT:QtObject = get CELLS!(I,J), (_,_,_,X|DATA) = qt_data IT: + = DATA if is_qt_object X; + = () if eq () X; + has_table_item (I,J) = true *************** *** 1959,1973 **** I in [I1..I2]]; sel_cellcvals ()= []; ! sel_cval (I,J) ! where X:QtObject = gui_elem (I,J): ! = str B where B:Bool = qt X "isChecked" (); ! = str B if not qt X "isToggleButton" () ! where B:Bool = qt X "isDown" (); ! = str B if qt X "isToggleButton" () ! where B:Bool = qt X "isOn" (); ! = S where S:String = qt X "cleanText" (); ! = S where S:String = qt X "text" (); ! = str V where V:Int = qt X "value" (); ! otherwise: = cell_text (I,J); sel_flag (I,J) = (take 1 S="=") and then not qt PM "isNull" () where S = cell_text (I,J), --- 1964,1970 ---- I in [I1..I2]]; sel_cellcvals ()= []; ! sel_cval (I,J) = S where X:QtObject = gui_elem (I,J), ! S:String = gui_getcval X; ! = cell_text (I,J) otherwise; sel_flag (I,J) = (take 1 S="=") and then not qt PM "isNull" () where S = cell_text (I,J), *************** *** 2617,2621 **** // slots [("guiUpdate()",gui_update)] [], ! IT:QtObject = make_table_item (I,J,X) (qt_val "QTableItem" "Never"); --- 2614,2618 ---- // slots [("guiUpdate()",gui_update)] [], ! IT:QtObject = make_table_item (I,J,X,ref "") (qt_val "QTableItem" "Never"); *************** *** 2752,2766 **** def GUI_TYPES = dict ! ["MyCheckBox", (checkbox_gui,gui_get_checkbox,gui_set_checkbox); ! "MyComboBox", (combobox_gui,gui_get_combobox,gui_set_combobox); ! "MyComboEdit", (comboedit_gui,gui_get_combobox,gui_set_combobox); ! "MySpinBox", (spinbox_gui,gui_get_spinbox,gui_set_spinbox); ! "MySlider", (slider_gui,gui_get_slider,gui_set_slider); ! "MyPushButton", (pushbutton_gui,gui_get_pushbutton,()); ! "MyToggleButton", (togglebutton_gui,gui_get_togglebutton, gui_set_togglebutton); ! "MyTaskButton", (taskbutton_gui,gui_get_togglebutton, gui_set_taskbutton); ! "MyActionButton", (actionbutton_gui,(),());]; /* Get our class name for a GUI element. Note that the checkbox and combobox --- 2749,2780 ---- def GUI_TYPES = dict ! ["MyCheckBox", (checkbox_gui, ! gui_get_checkbox,gui_getc_checkbox, ! gui_set_checkbox); ! "MyComboBox", (combobox_gui, ! gui_get_combobox,gui_getc_combobox, ! gui_set_combobox); ! "MyComboEdit", (comboedit_gui, ! gui_get_combobox,gui_getc_combobox, ! gui_set_combobox); ! "MySpinBox", (spinbox_gui, ! gui_get_spinbox,gui_getc_spinbox, ! gui_set_spinbox); ! "MySlider", (slider_gui, ! gui_get_slider,gui_getc_slider, ! gui_set_slider); ! "MyPushButton", (pushbutton_gui, ! gui_get_pushbutton,gui_getc_pushbutton, ! gui_set_nop); ! "MyToggleButton", (togglebutton_gui, ! gui_get_togglebutton,gui_getc_togglebutton, gui_set_togglebutton); ! "MyTaskButton", (taskbutton_gui, ! gui_get_togglebutton,gui_getc_togglebutton, gui_set_taskbutton); ! "MyActionButton", (actionbutton_gui, ! gui_get_nop,gui_getc_actionbutton, ! gui_set_actionbutton); ! ]; /* Get our class name for a GUI element. Note that the checkbox and combobox *************** *** 2780,2787 **** /* Get the value of a GUI element. */ ! gui_getval X = GV X where C:String = gui_class X, (_,GV,_) = GUI_TYPES!C; // = printf "unknown GUI element %s\n" (class_name X) || 0; = 0 otherwise; // default value gui_get_checkbox X = qt X "isChecked" (); --- 2794,2803 ---- /* Get the value of a GUI element. */ ! gui_getval X = GV X where C:String = gui_class X, (_,GV,_,_) = GUI_TYPES!C; // = printf "unknown GUI element %s\n" (class_name X) || 0; = 0 otherwise; // default value + gui_get_nop X = fail; + gui_get_checkbox X = qt X "isChecked" (); *************** *** 2799,2811 **** = spinbox_value $ qt X "cleanText" (); gui_get_slider X = qt X "value" (); ! spinbox_value S = X if checknum 'X where 'X = valq S; ! = S otherwise; /* Set the value of a GUI element from a string. */ ! gui_setval X S = SV X S where C:String = gui_class X, (_,_,SV) = GUI_TYPES!C; gui_set_checkbox X S --- 2815,2862 ---- = spinbox_value $ qt X "cleanText" (); + spinbox_value S = X if checknum 'X where 'X = valq S; + = S otherwise; + gui_get_slider X = qt X "value" (); ! /* Get the value in string form. */ ! ! gui_getcval X = GV X where C:String = gui_class X, (_,_,GV,_) = GUI_TYPES!C; ! // = printf "unknown GUI element %s\n" (class_name X) || ""; ! = "" otherwise; // default value ! ! gui_getc_nop X = fail; ! ! gui_getc_checkbox X ! = str $ qt X "isChecked" (); ! ! gui_getc_combobox X ! = qt X "currentText" (); ! ! gui_getc_pushbutton X ! = str $ qt X "isDown" (); ! ! gui_getc_togglebutton X ! = str $ qt X "isOn" (); ! ! gui_getc_actionbutton X ! = fformat S ! where (I,J) = qt_data X, (R:Ref|_) = gui_data (I,J), ! S:String = get R; ! = "" otherwise; ! ! gui_getc_spinbox X ! = qt X "cleanText" (); ! ! gui_getc_slider X ! = str $ qt X "value" (); /* Set the value of a GUI element from a string. */ ! gui_setval X S = SV X S where C:String = gui_class X, ! (_,_,_,SV) = GUI_TYPES!C; ! ! gui_set_nop X S = (); gui_set_checkbox X S *************** *** 2834,2837 **** --- 2885,2892 ---- if checkbool 'Y where 'Y = valq S; + gui_set_actionbutton X S + = R := S + where (I,J) = qt_data X, (R:Ref|_) = gui_data (I,J); + gui_set_taskbutton X S = if checkstr 'Y then |
