diff options
author | Norbert Schechner <nieson@web.de> | 2014-01-02 20:52:04 +0100 |
---|---|---|
committer | Norbert Schechner <nieson@web.de> | 2014-01-02 20:52:04 +0100 |
commit | 6ee9fb49aba0a774cd1e20fe9ad9de7ac0ebc354 (patch) | |
tree | be51b4772bca8105d0008f4176113549958164f7 /share | |
parent | 448493a7889ac90ea5535bc4c5bd185b3c2004e6 (diff) | |
download | linuxcnc-6ee9fb49aba0a774cd1e20fe9ad9de7ac0ebc354.tar.gz linuxcnc-6ee9fb49aba0a774cd1e20fe9ad9de7ac0ebc354.zip |
gmoccapy_0_9_9_7_5 - deleted gscreen statusbar
ver. 0.9.9.7.5
- deleted the statusbar widget
- no more option to use gscreen error handling
- no more option to use desktop notify
- the optional stops button worked oposite it should
- renamed some stuff from emc to linuxcnc or shortend the names
- onboard keyboard showing in edit mode corrected
- plasma.py changed order of getting widgets from builder,
to avoid errors at load time
- notification change line wrape mode to caracter,
so longer file names will not be cut
Diffstat (limited to 'share')
-rwxr-xr-x | share/gscreen/skins/gmoccapy/gmoccapy.glade | 560 | ||||
-rwxr-xr-x | share/gscreen/skins/gmoccapy/gmoccapy_handler.py | 137 | ||||
-rw-r--r-- | share/gscreen/skins/gmoccapy/python/notification.py | 3 | ||||
-rwxr-xr-x | share/gscreen/skins/gmoccapy/release_notes.txt | 12 |
4 files changed, 238 insertions, 474 deletions
diff --git a/share/gscreen/skins/gmoccapy/gmoccapy.glade b/share/gscreen/skins/gmoccapy/gmoccapy.glade index 5a5e1486d..528c15e10 100755 --- a/share/gscreen/skins/gmoccapy/gmoccapy.glade +++ b/share/gscreen/skins/gmoccapy/gmoccapy.glade @@ -58,8 +58,8 @@ <property name="visible">True</property> <property name="double_buffered">False</property> <property name="use_commanded">False</property> - <property name="enable_dro">False</property> <property name="show_dtg">False</property> + <property name="enable_dro">False</property> </object> </child> </object> @@ -334,8 +334,8 @@ <child> <object class="OffsetPage" id="offsetpage1"> <property name="visible">True</property> - <property name="foreground_color">#ffff00000000</property> <property name="highlight_color">#adadd8d8e6e6</property> + <property name="foreground_color">#ffff00000000</property> </object> <packing> <property name="position">1</property> @@ -482,10 +482,10 @@ <property name="visible">True</property> <property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property> <property name="font_size">28</property> - <property name="homed_color">#0000ffff0000</property> <property name="unhomed_color">#ffff00000000</property> <property name="abs_color">#00000000ffff</property> <property name="dtg_color">#ffffffff0000</property> + <property name="homed_color">#0000ffff0000</property> <property name="rel_color">#000000000000</property> <signal name="system_changed" handler="on_Combi_DRO_system_changed"/> <signal name="units_changed" handler="on_Combi_DRO_units_changed"/> @@ -500,11 +500,11 @@ <property name="visible">True</property> <property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property> <property name="font_size">28</property> - <property name="homed_color">#0000ffff0000</property> <property name="unhomed_color">#ffff00000000</property> - <property name="abs_color">#00000000ffff</property> <property name="joint_number">1</property> + <property name="abs_color">#00000000ffff</property> <property name="dtg_color">#ffffffff0000</property> + <property name="homed_color">#0000ffff0000</property> <property name="rel_color">#000000000000</property> <signal name="clicked" handler="on_Combi_DRO_clicked"/> </object> @@ -517,11 +517,11 @@ <property name="visible">True</property> <property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property> <property name="font_size">28</property> - <property name="homed_color">#0000ffff0000</property> <property name="unhomed_color">#ffff00000000</property> - <property name="abs_color">#00000000ffff</property> <property name="joint_number">2</property> + <property name="abs_color">#00000000ffff</property> <property name="dtg_color">#ffffffff0000</property> + <property name="homed_color">#0000ffff0000</property> <property name="rel_color">#000000000000</property> <signal name="clicked" handler="on_Combi_DRO_clicked"/> </object> @@ -534,11 +534,11 @@ <property name="visible">True</property> <property name="tooltip_text" translatable="yes">Klick to toggle through the DRO modes</property> <property name="font_size">28</property> - <property name="homed_color">#0000ffff0000</property> <property name="unhomed_color">#ffff00000000</property> - <property name="abs_color">#00000000ffff</property> <property name="joint_number">3</property> + <property name="abs_color">#00000000ffff</property> <property name="dtg_color">#ffffffff0000</property> + <property name="homed_color">#0000ffff0000</property> <property name="rel_color">#000000000000</property> <signal name="clicked" handler="on_Combi_DRO_clicked"/> </object> @@ -971,7 +971,7 @@ </child> <child> <object class="GtkVBox" id="box_info"> - <property name="height_request">250</property> + <property name="height_request">200</property> <property name="visible">True</property> <child> <object class="GtkNotebook" id="ntb_info"> @@ -999,7 +999,7 @@ <property name="left_padding">5</property> <property name="right_padding">5</property> <child> - <object class="GtkTable" id="table2tbl_tool_info"> + <object class="GtkTable" id="tbl_tool_info"> <property name="visible">True</property> <property name="n_rows">3</property> <property name="n_columns">4</property> @@ -1773,15 +1773,15 @@ <property name="visible">True</property> <property name="tooltip_text" translatable="yes">The feedback spindle speed</property> <property name="z1_border">0.80000001192092896</property> - <property name="target_color">#0000ffff0000</property> - <property name="z0_color">#0000ffff0000</property> - <property name="z0_border">0.40000000596046448</property> - <property name="text_template">%i</property> - <property name="target_value">-0.039999999105930328</property> <property name="z1_color">#0000ffff0000</property> - <property name="bg_color">#bebebebebebe</property> <property name="z2_color">#0000ffff0000</property> + <property name="z0_border">0.40000000596046448</property> + <property name="z0_color">#0000ffff0000</property> + <property name="target_color">#0000ffff0000</property> <property name="max">6000</property> + <property name="bg_color">#bebebebebebe</property> + <property name="target_value">-0.039999999105930328</property> + <property name="text_template">%i</property> <signal name="hal_pin_changed" handler="on_spindle_feedback_bar_hal_pin_changed"/> </object> <packing> @@ -1877,200 +1877,101 @@ </packing> </child> <child> - <object class="GtkNotebook" id="ntb_message"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_tabs">False</property> - <property name="show_border">False</property> - <property name="tab_border">0</property> - <property name="tab_hborder">0</property> - <property name="tab_vborder">0</property> + <object class="GtkTable" id="tbl_search"> + <property name="height_request">50</property> + <property name="n_columns">7</property> <child> - <object class="GtkFrame" id="frm_message"> - <property name="height_request">50</property> + <object class="GtkEntry" id="search_entry"> <property name="visible">True</property> - <property name="label_xalign">0.5</property> - <child> - <object class="GtkVBox" id="vbox12"> - <property name="visible">True</property> - <child> - <object class="GtkHBox" id="hbox15"> - <property name="visible">True</property> - <child> - <object class="GtkStatusbar" id="statusbar1"> - <property name="visible">True</property> - <property name="spacing">2</property> - <property name="has_resize_grip">False</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="btn_clear_statusbar"> - <property name="width_request">32</property> - <property name="height_request">32</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">clear the statusbar messages</property> - <signal name="clicked" handler="on_btn_clear_statusbar_clicked"/> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-delete</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">5</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="lbl_frame_information"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Messages</b></property> - <property name="use_markup">True</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> </object> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="y_options">GTK_SHRINK</property> + </packing> </child> - <child type="tab"> - <object class="GtkLabel" id="lbl_ntb_message_frm_message"> + <child> + <object class="GtkButton" id="btn_undo"> + <property name="label" translatable="yes">undo</property> + <property name="height_request">48</property> <property name="visible">True</property> - <property name="label">message</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="on_btn_undo_clicked"/> </object> <packing> - <property name="tab_fill">False</property> + <property name="x_options">GTK_SHRINK</property> + <property name="y_options">GTK_SHRINK</property> </packing> </child> <child> - <object class="GtkTable" id="table3"> - <property name="visible">True</property> - <property name="n_columns">7</property> - <child> - <object class="GtkEntry" id="search_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">enter the textr to search for</property> - <property name="invisible_char">●</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="y_options">GTK_SHRINK</property> - </packing> - </child> - <child> - <object class="GtkButton" id="btn_undo"> - <property name="label" translatable="yes">undo</property> - <property name="height_request">48</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Undo</property> - <signal name="clicked" handler="on_btn_undo_clicked"/> - </object> - <packing> - <property name="x_options">GTK_SHRINK</property> - <property name="y_options">GTK_SHRINK</property> - </packing> - </child> - <child> - <object class="GtkButton" id="btn_search_back"> - <property name="label" translatable="yes">search + <object class="GtkButton" id="btn_search_back"> + <property name="label" translatable="yes">search back</property> - <property name="height_request">48</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Search back</property> - <signal name="clicked" handler="on_btn_search_back_clicked"/> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_SHRINK</property> - <property name="y_options">GTK_SHRINK</property> - </packing> - </child> - <child> - <object class="GtkButton" id="btn_search_forward"> - <property name="label" translatable="yes">search + <property name="height_request">48</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="on_btn_search_back_clicked"/> + </object> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_SHRINK</property> + <property name="y_options">GTK_SHRINK</property> + </packing> + </child> + <child> + <object class="GtkButton" id="btn_search_forward"> + <property name="label" translatable="yes">search fwd</property> - <property name="height_request">48</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Search forward</property> - <signal name="clicked" handler="on_btn_search_forward_clicked"/> - </object> - <packing> - <property name="left_attach">4</property> - <property name="right_attach">5</property> - <property name="x_options">GTK_SHRINK</property> - <property name="y_options">GTK_SHRINK</property> - </packing> - </child> - <child> - <object class="GtkButton" id="btn_redo"> - <property name="label" translatable="yes">redo</property> - <property name="height_request">48</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">redo</property> - <signal name="clicked" handler="on_btn_redo_clicked"/> - </object> - <packing> - <property name="left_attach">6</property> - <property name="right_attach">7</property> - <property name="x_options">GTK_SHRINK</property> - <property name="y_options">GTK_SHRINK</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lbl_space"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lbl_spac"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">5</property> - <property name="right_attach">6</property> - </packing> - </child> + <property name="height_request">48</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="on_btn_search_forward_clicked"/> </object> <packing> - <property name="position">1</property> + <property name="left_attach">4</property> + <property name="right_attach">5</property> + <property name="x_options">GTK_SHRINK</property> + <property name="y_options">GTK_SHRINK</property> </packing> </child> - <child type="tab"> - <object class="GtkLabel" id="lbl_ntb_message_frm_search"> + <child> + <object class="GtkButton" id="btn_redo"> + <property name="label" translatable="yes">redo</property> + <property name="height_request">48</property> <property name="visible">True</property> - <property name="label">search</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="on_btn_redo_clicked"/> </object> <packing> - <property name="position">1</property> - <property name="tab_fill">False</property> + <property name="left_attach">6</property> + <property name="right_attach">7</property> + <property name="x_options">GTK_SHRINK</property> + <property name="y_options">GTK_SHRINK</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lbl_space"> + <property name="visible">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lbl_spac"> + <property name="visible">True</property> + </object> + <packing> + <property name="left_attach">5</property> + <property name="right_attach">6</property> </packing> </child> </object> @@ -3679,178 +3580,104 @@ Aux Screen</property> <property name="left_padding">5</property> <property name="right_padding">5</property> <child> - <object class="GtkVBox" id="vbox_error_style"> + <object class="GtkFrame" id="frm_message_position"> <property name="visible">True</property> + <property name="label_xalign">0.5</property> <child> - <object class="GtkFrame" id="frm_error_usage"> - <property name="visible">True</property> - <property name="label_xalign">0.5</property> - <child> - <object class="GtkAlignment" id="ali_error_usage"> - <property name="visible">True</property> - <property name="top_padding">5</property> - <property name="bottom_padding">5</property> - <property name="left_padding">5</property> - <property name="right_padding">5</property> - <child> - <object class="GtkVBox" id="vbox_error_options"> - <property name="visible">True</property> - <child> - <object class="GtkRadioButton" id="rbt_use_gmoccapy"> - <property name="label" translatable="yes">Use gmoccapy style</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Use the gmoccapy error reporting style, showing the errors in little popup windows. You can delete the last one with the "Window" key on the keyboard or all messages at ones with <CTRL><SPACE>, or you click the delete button with the mouse</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_rbt_use_gmoccapy_toggled"/> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="rbt_use_gscreen"> - <property name="label" translatable="yes">Use gscreen style</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Use the gscreen style for error reporting, showing the messages in the status bar, yxou will only see the last one. Deleting that one will show the previous one and so on </property> - <property name="draw_indicator">True</property> - <property name="group">rbt_use_gmoccapy</property> - <signal name="toggled" handler="on_rbt_use_gscreen_toggled"/> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="lbl_frm_error_options"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Style to use</b></property> - <property name="use_markup">True</property> - </object> - </child> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frm_message_position"> + <object class="GtkAlignment" id="ali_message_style"> <property name="visible">True</property> - <property name="label_xalign">0.5</property> + <property name="top_padding">5</property> + <property name="bottom_padding">5</property> + <property name="left_padding">5</property> + <property name="right_padding">5</property> <child> - <object class="GtkAlignment" id="ali_message_style"> + <object class="GtkTable" id="table2"> <property name="visible">True</property> - <property name="top_padding">5</property> - <property name="bottom_padding">5</property> - <property name="left_padding">5</property> - <property name="right_padding">5</property> + <property name="n_rows">7</property> + <property name="n_columns">2</property> <child> - <object class="GtkTable" id="table2"> - <property name="visible">True</property> - <property name="n_rows">7</property> - <property name="n_columns">2</property> - <child> - <object class="GtkCheckButton" id="chk_use_frames"> + <object class="GtkCheckButton" id="chk_use_frames"> <property name="label" translatable="yes">Use frames</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Use frames for each message, will need a little bit more space but the messages are separated in a clearer way</property> <property name="draw_indicator">True</property> <signal name="toggled" handler="on_chk_use_frames_toggled"/> - </object> - <packing> + </object> + <packing> <property name="right_attach">2</property> <property name="top_attach">5</property> <property name="bottom_attach">6</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lbl_font_popup"> + </packing> + </child> + <child> + <object class="GtkLabel" id="lbl_font_popup"> <property name="visible">True</property> <property name="xalign">0</property> <property name="xpad">5</property> <property name="ypad">5</property> <property name="label" translatable="yes">Font</property> - </object> - <packing> + </object> + <packing> <property name="top_attach">4</property> <property name="bottom_attach">5</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lbl_max_popup"> + </packing> + </child> + <child> + <object class="GtkLabel" id="lbl_max_popup"> <property name="visible">True</property> <property name="xalign">0</property> <property name="xpad">5</property> <property name="ypad">5</property> <property name="label" translatable="yes">max.</property> - </object> - <packing> + </object> + <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> <property name="x_options">GTK_SHRINK | GTK_FILL</property> <property name="y_options">GTK_SHRINK</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lbl_width_popup"> + </packing> + </child> + <child> + <object class="GtkLabel" id="lbl_width_popup"> <property name="visible">True</property> <property name="xalign">0</property> <property name="xpad">5</property> <property name="ypad">5</property> <property name="label" translatable="yes">Width</property> - </object> - <packing> + </object> + <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_SHRINK | GTK_FILL</property> <property name="y_options">GTK_SHRINK</property> - </packing> - </child> - <child> - <object class="GtkFontButton" id="fontbutton_popup"> + </packing> + </child> + <child> + <object class="GtkFontButton" id="fontbutton_popup"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Select the font to be used for the messages</property> <property name="font_name">Sans 10</property> <signal name="font_set" handler="on_fontbutton_popup_font_set"/> - </object> - <packing> + </object> + <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">4</property> <property name="bottom_attach">5</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spbtn_max_popup"> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spbtn_max_popup"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Give the maximum number of messages you want to be displayed</property> <property name="invisible_char">●</property> <property name="xalign">1</property> <property name="adjustment">adj_max_messages</property> <property name="numeric">True</property> - </object> - <packing> + </object> + <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">3</property> @@ -3858,20 +3685,19 @@ Aux Screen</property> <property name="y_options">GTK_SHRINK</property> <property name="x_padding">5</property> <property name="y_padding">2</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spbtn_width_popup"> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spbtn_width_popup"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Select the width of the messages</property> <property name="invisible_char">●</property> <property name="xalign">1</property> <property name="progress_fraction">0.0099999997764825821</property> <property name="adjustment">adj_width_popup</property> <property name="numeric">True</property> - </object> - <packing> + </object> + <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">2</property> @@ -3879,65 +3705,63 @@ Aux Screen</property> <property name="y_options">GTK_SHRINK</property> <property name="x_padding">5</property> <property name="y_padding">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lbl_y_pos_popup"> + </packing> + </child> + <child> + <object class="GtkLabel" id="lbl_y_pos_popup"> <property name="visible">True</property> <property name="xalign">0</property> <property name="xpad">5</property> <property name="ypad">5</property> <property name="label" translatable="yes">Y Pos.</property> - </object> - <packing> + </object> + <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_SHRINK | GTK_FILL</property> <property name="y_options">GTK_SHRINK</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lbl_x_pos_popup"> + </packing> + </child> + <child> + <object class="GtkLabel" id="lbl_x_pos_popup"> <property name="visible">True</property> <property name="xalign">0</property> <property name="xpad">5</property> <property name="ypad">5</property> <property name="label" translatable="yes">X Pos.</property> - </object> - <packing> + </object> + <packing> <property name="x_options">GTK_SHRINK | GTK_FILL</property> <property name="y_options">GTK_SHRINK</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spbtn_x_pos_popup"> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spbtn_x_pos_popup"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Select the X position to display the first message, counted from the left top corner of the screen</property> <property name="invisible_char">●</property> <property name="xalign">1</property> <property name="adjustment">adj_x_pos_popup</property> <property name="numeric">True</property> - </object> - <packing> + </object> + <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="y_options">GTK_SHRINK</property> <property name="x_padding">5</property> <property name="y_padding">2</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spbtn_y_pos_popup"> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spbtn_y_pos_popup"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Select the Y position to display the first message, counted from the left top corner of the screen</property> <property name="invisible_char">●</property> <property name="xalign">1</property> <property name="adjustment">adj_y_pos_popup</property> <property name="numeric">True</property> - </object> - <packing> + </object> + <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">1</property> @@ -3945,61 +3769,33 @@ Aux Screen</property> <property name="y_options">GTK_SHRINK</property> <property name="x_padding">5</property> <property name="y_padding">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="btn_launch_test_message"> + </packing> + </child> + <child> + <object class="GtkButton" id="btn_launch_test_message"> <property name="label" translatable="yes">Launch test message</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <signal name="pressed" handler="on_btn_launch_test_message_pressed"/> - </object> - <packing> + </object> + <packing> <property name="right_attach">2</property> <property name="top_attach">6</property> <property name="bottom_attach">7</property> - </packing> - </child> - </object> + </packing> </child> </object> </child> - <child type="label"> - <object class="GtkLabel" id="lbl_frm_message_style"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b> gmoccapy message - behavior and aperance </b></property> - <property name="use_markup">True</property> - </object> - </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label10"> - <property name="visible">True</property> </object> - <packing> - <property name="position">3</property> - </packing> </child> - <child> - <object class="GtkCheckButton" id="chk_use_desktop_notify"> - <property name="label" translatable="yes">Use desktop notify</property> + <child type="label"> + <object class="GtkLabel" id="lbl_frm_message_style"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Show the errors and warnings also in the Desktop Notify style of the OS, This is not recommended, because the messages will desapear allone after a while.</property> - <property name="relief">none</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_chk_use_desktop_notify_toggled"/> + <property name="label" translatable="yes"><b> gmoccapy message + behavior and aperance </b></property> + <property name="use_markup">True</property> </object> - <packing> - <property name="position">4</property> - </packing> </child> </object> </child> diff --git a/share/gscreen/skins/gmoccapy/gmoccapy_handler.py b/share/gscreen/skins/gmoccapy/gmoccapy_handler.py index 41b8683ff..79882b293 100755 --- a/share/gscreen/skins/gmoccapy/gmoccapy_handler.py +++ b/share/gscreen/skins/gmoccapy/gmoccapy_handler.py @@ -46,8 +46,8 @@ color = gtk.gdk.Color() INVISABLE = gtk.gdk.Cursor(pixmap, pixmap, color, color, 0, 0) # constants -_RELEASE = "0.9.9.7.4" -_IMPERIAL = 0 # Imperial Units are active +_RELEASE = "0.9.9.7.5" +_INCH = 0 # imperial units are active _MM = 1 # metric units are active _MANUAL = 1 # Check for the mode Manual _AUTO = 2 # Check for the mode Auto @@ -98,8 +98,8 @@ class HandlerClass: self.data = gscreen.data self.widgets = gscreen.widgets self.gscreen = gscreen - self.emcstat = linuxcnc.stat() - self.emcerror = linuxcnc.error_channel() + self.stat = linuxcnc.stat() + self.error_channel = linuxcnc.error_channel() self.distance = 0 # This global will hold the jog distance self.interpreter = _IDLE # This hold the interpreter state, so we could check if actions are allowed @@ -120,7 +120,12 @@ class HandlerClass: def initialize_preferences(self): self.data.theme_name = self.gscreen.prefs.getpref("gtk_theme", "Follow System Theme", str) - self.gscreen.init_general_pref() + self.data.alert_sound = self.gscreen.prefs.getpref('audio_alert', self.data.alert_sound, str) + self.data.error_sound = self.gscreen.prefs.getpref('audio_error', self.data.error_sound, str) + self.data.grid_size = self.gscreen.prefs.getpref('grid_size', 1.0 , float) + self.data.hide_cursor = self.gscreen.prefs.getpref('hide_cursor', False, bool) + self.data.plot_voniew = self.gscreen.prefs.getpref('view', ("p","x","y","y2","z","z2"), repr) + self.data.spindle_start_rpm = self.gscreen.prefs.getpref('spindle_start_rpm', 300 , float) self._init_axis_four() def _init_axis_four(self): @@ -157,12 +162,10 @@ class HandlerClass: # gscreen.change_theme() is a method in gscreen that changes the GTK theme of window1 # gscreen.data.theme_name is the name of the theme from the preference file # To truely be friendly, we should add a way to change the theme directly in the custom screen. - # we also set up the statusbar and add a ready-to-home message def initialize_widgets(self): # These are gscreen widgets included in this screen self.gscreen.init_show_windows() self.gscreen.init_dynamic_tabs() - self.gscreen.init_statusbar() self.gscreen.init_tooleditor() self.gscreen.init_embeded_terminal() self.gscreen.init_themes() # load all avaiable themes in the combo box @@ -195,7 +198,7 @@ class HandlerClass: print(_("Default path to ~/linuxcnc/nc_files does not exist")) print(_("setting now home as path")) default_path = os.path.expanduser("~/") - self.widgets.hal_action_open.currentfolder = os.path.expanduser(default_path) + #self.widgets.hal_action_open.currentfolder = os.path.expanduser(default_path) self.widgets.IconFileSelection1.set_property("start_dir",default_path) # set the slider limmits @@ -236,14 +239,6 @@ class HandlerClass: self.widgets.adj_width.set_value(self.gscreen.prefs.getpref("width", 979, float)) self.widgets.adj_height.set_value(self.gscreen.prefs.getpref("height", 750, float)) - # Get the type of error handling - self.data.error_style = self.gscreen.prefs.getpref("error_style", "gmoccapy", str) - # and set the corresponding button active - self.widgets["rbt_use_%s"%self.data.error_style].set_active(True) - # unsensitize the gmoccastyle adjustments if gscreen shall be usede - if self.data.error_style == "gscreen": - self.widgets.frm_message_position.set_sensitive(False) - # Popup Messages position and size self.widgets.adj_x_pos_popup.set_value(self.gscreen.prefs.getpref("x_pos_popup", 15, float)) self.widgets.adj_y_pos_popup.set_value(self.gscreen.prefs.getpref("y_pos_popup", 55, float)) @@ -265,10 +260,6 @@ class HandlerClass: self.widgets.tbtn_units.modify_bg(gtk.STATE_ACTIVE, gtk.gdk.color_parse("#FFFF00")) # end of the button usage - # Use desktop notify ? - self.data.desktop_notify = self.gscreen.prefs.getpref("desktop_notify", False, bool) - self.widgets.chk_use_desktop_notify.set_active(self.data.desktop_notify) - # this sets the background colors of several buttons # the colors are different for the states of the button self.widgets.tbtn_on.modify_bg(gtk.STATE_ACTIVE, gtk.gdk.color_parse("#FFFF00")) @@ -507,10 +498,6 @@ class HandlerClass: if not self.gscreen.inifile.find("DISPLAY", "EMBED_TAB_COMMAND"): self.widgets.tbtn_user_tabs.set_sensitive(False) - # we click the clear button from statusbar, because else ready for homing will be displayed. - # but this is not true, because the machine is not in On state - self.widgets.btn_clear_statusbar.emit("clicked") - # call the function to change the button status # so every thing is ready to start widgetlist = ["rbt_manual", "rbt_mdi", "rbt_auto", "btn_homing", "btn_touch", "btn_tool", @@ -930,7 +917,7 @@ class HandlerClass: # in this case we do not return true, otherwise entering code in MDI history # and the integrated editor will not work # we also check if we are in settings or terminal or alarm page - if self.emcstat.task_mode <> _MANUAL or not self.widgets.ntb_main.get_current_page() == 0: + if self.stat.task_mode <> _MANUAL or not self.widgets.ntb_main.get_current_page() == 0: return # offset page is active, so keys must go through @@ -1057,7 +1044,6 @@ class HandlerClass: message += _("so the corresponding file could not be found") self.gscreen.warning_dialog(_("Important Warning"), True, message) self.gscreen.add_alarm_entry( message) - self.widgets.statusbar1.push(1, message) return file = subroutines_folder + "/" + o_codes[0] + ".ngc" if not os.path.isfile(file): @@ -1065,7 +1051,6 @@ class HandlerClass: message += _("we searched in subdirectory %s"%[subroutines_folder]) self.gscreen.warning_dialog(_("Important Warning"), True, message) self.gscreen.add_alarm_entry( message) - self.widgets.statusbar1.push(1, message) return command = str("O<" + o_codes[0] + "> call") for code in o_codes[1:]: @@ -1114,8 +1099,9 @@ class HandlerClass: # if a file should be loaded, we will do so file = self.gscreen.prefs.getpref("open_file", "", str) - if file: + if file : self.widgets.file_to_load_chooser.set_filename(file) + #self.emc.emccommand.program_open(file) self.widgets.hal_action_open.load_file(file) # check how to start the GUI @@ -1207,30 +1193,14 @@ class HandlerClass: def on_rbt_manual_pressed(self, widget, data=None): if self.log: self.gscreen.add_alarm_entry("rbt_manual_pressed") self.emc.set_manual_mode() - #self.widgets.ntb_main.set_current_page(0) - #self.widgets.ntb_button.set_current_page(0) - #self.widgets.ntb_info.set_current_page(0) - #self.widgets.ntb_jog.set_current_page(0) def on_rbt_mdi_pressed(self, widget, data=None): if self.log: self.gscreen.add_alarm_entry("rbt_mdi_pressed") self.emc.set_mdi_mode() - #if self.widgets.chk_use_kb_on_mdi.get_active(): - # self.widgets.ntb_info.set_current_page(1) - #else: - # self.widgets.ntb_info.set_current_page(0) - #self.widgets.ntb_main.set_current_page(0) - #self.widgets.ntb_button.set_current_page(1) - #self.widgets.ntb_jog.set_current_page(1) - #self.widgets.hal_mdihistory.entry.grab_focus() def on_rbt_auto_pressed(self, widget, data=None): if self.log: self.gscreen.add_alarm_entry("rbt_auto_pressed") self.emc.set_auto_mode() - #self.widgets.ntb_main.set_current_page(0) - #self.widgets.ntb_button.set_current_page(2) - #self.widgets.ntb_info.set_current_page(0) - #self.widgets.ntb_jog.set_current_page(2) def on_ntb_main_switch_page(self, widget, page, page_num, data=None): if self.log: @@ -1267,7 +1237,6 @@ class HandlerClass: code = False # Lets see if the user has the right to enter settings if code: -# self.emc.set_manual_mode() self.widgets.ntb_main.set_current_page(1) self.widgets.ntb_setup.set_current_page(1) self.widgets.ntb_button.set_current_page(5) @@ -1278,7 +1247,6 @@ class HandlerClass: message = _("wrong code entered, Access denied") self.gscreen.warning_dialog(_("Just to warn you"), True, message) self.gscreen.add_alarm_entry( message) - self.widgets.statusbar1.push(1, message) else: # check witch button should be sensitive, depending on the state of the machine if self.data.estopped: @@ -1296,8 +1264,7 @@ class HandlerClass: self.widgets.rbt_manual.set_sensitive(True) self.widgets.rbt_mdi.set_sensitive(True) self.widgets.rbt_auto.set_sensitive(True) -# self.emc.set_manual_mode() - # set the pages to manual mode page, this is needed here, because we do not + # this is needed here, because we do not # change mode, so on_hal_status_manual will not be called self.widgets.ntb_main.set_current_page(0) self.widgets.ntb_button.set_current_page(0) @@ -1519,7 +1486,7 @@ class HandlerClass: self.widgets.spindle_feedback_bar.set_property("max",widget.get_value()) def _update_spindle_btn(self): - if self.emcstat.task_mode == _AUTO and self.interpreter == _RUN: + if self.stat.task_mode == _AUTO and self.interpreter == _RUN: return if not self.data.spindle_speed: self.widgets.rbt_stop.set_active(True) @@ -1623,7 +1590,7 @@ class HandlerClass: def on_btn_jog_pressed(self, widget, data = None): # only in manual mode we will allow jogging the axis at this development state - if not self.emcstat.task_mode == _MANUAL: + if not self.stat.task_mode == _MANUAL: return # if data = True, then the user pressed SHIFT for Jogging and @@ -1721,6 +1688,14 @@ class HandlerClass: self.widgets.ntb_info.set_current_page(0) else: self.widgets.ntb_info.set_current_page(1) + # special case if we are in edit mode + if self.widgets.ntb_button.get_current_page() == 6: + if self.widgets.ntb_info.get_visible(): + self.widgets.box_info.set_size_request(-1,50) + self.widgets.ntb_info.hide() + else: + self.widgets.box_info.set_size_request(-1,250) + self.widgets.ntb_info.show() def on_ntb_info_switch_page(self, widget, page, page_num, data=None): if self.emc.get_mode() == _MDI: @@ -1741,9 +1716,6 @@ class HandlerClass: self.widgets.ntb_main.set_current_page(0) self.widgets.ntb_preview.set_current_page(0) - def on_btn_clear_statusbar_clicked(self, widget, data=None): - self.widgets.statusbar1.pop(self.gscreen.statusbar_id) - # The offset settings, set to zero def on_btn_touch_clicked(self, widget, data=None): if self.log: self.gscreen.add_alarm_entry("btn_touch_clicked") @@ -1938,10 +1910,6 @@ class HandlerClass: def on_chk_use_kb_on_file_selection_toggled(self, widget, data = None): self.gscreen.prefs.putpref("show_keyboard_on_file_selection", widget.get_active(), bool) - def on_chk_use_desktop_notify_toggled(self, widget, data = None): - self.gscreen.prefs.putpref("desktop_notify", widget.get_active(), bool) - self.data.desktop_notify = widget.get_active() - def on_chk_use_kb_shortcuts_toggled(self, widget, data = None): self.gscreen.prefs.putpref("use_keyboard_shortcuts", widget.get_active(), bool) @@ -1964,17 +1932,6 @@ class HandlerClass: self.gscreen.prefs.putpref("scale_spindle_override", widget.get_value(), float) self.scale_spindle_override = widget.get_value() - def on_rbt_use_gmoccapy_toggled(self, widget): - if widget.get_active(): - self.gscreen.prefs.putpref("error_style", "gmoccapy", str) - self.widgets.frm_message_position.set_sensitive(True) - self.init_notification() - - def on_rbt_use_gscreen_toggled(self, widget): - if widget.get_active(): - self.gscreen.prefs.putpref("error_style", "gscreen", str) - self.widgets.frm_message_position.set_sensitive(False) - def on_rbtn_fullscreen_toggled(self, widget): if self.log: self.gscreen.add_alarm_entry("rbtn_fullscreen_toggled to %s"%widget.get_active()) if widget.get_active(): @@ -2159,7 +2116,6 @@ class HandlerClass: if change: tooldescr = self.widgets.tooledit1.get_toolinfo(toolnumber)[16] message = _("Please change to tool\n\n# {0:d} {1}\n\n then click OK.").format(toolnumber, tooldescr) - self.data.tool_message = self.gscreen.notify(_("INFO:"),message,None) self.gscreen.warning_dialog(message, True,pinname="TOOLCHANGE") else: halcomp['tool-changed'] = False @@ -2310,7 +2266,6 @@ class HandlerClass: else: message = _("Could not understand the entered tool number. Will not change anything") self.gscreen.warning_dialog(_("Important Warning!"), True, message) - self.widgets.statusbar1.push(1,message) # gremlin relevant calls def on_rbt_view_p_toggled(self, widget, data=None): @@ -2411,13 +2366,16 @@ class HandlerClass: def on_IconFileSelection1_selected(self,widget,path=None): if path: try: - self.widgets.hal_action_open.load_file(path) + #self.emc.emccommand.program_open(path) + self.widgets.hhal_action_open.load_file(path) self.widgets.ntb_preview.set_current_page(0) self.widgets.tbtn_fullsize_preview.set_active(False) self.widgets.ntb_button.set_current_page(2) + self._show_iconview_tab(False) except: - print(_("error trying opening file %s"%path)) - self._show_iconview_tab(False) + message = _("error trying opening file %s"%path) + self.gscreen.warning_dialog(_("Important Warning"), True, message) + self.notification.add_message(message, INFO_ICON) def on_IconFileSelection1_exit(self,widget): self.widgets.ntb_preview.set_current_page(0) @@ -2437,9 +2395,11 @@ class HandlerClass: self.widgets.gcode_view.grab_focus() if self.widgets.chk_use_kb_on_edit.get_active(): self.widgets.ntb_info.set_current_page(1) + self.widgets.box_info.set_size_request(-1,250) else: - self.widgets.ntb_info.set_current_page(0) - self.widgets.ntb_message.set_current_page(1) + self.widgets.ntb_info.hide() + self.widgets.box_info.set_size_request(-1,50) + self.widgets.tbl_search.show() # search forward while in edit mode def on_btn_search_forward_clicked(self, widget, data=None): @@ -2484,7 +2444,9 @@ class HandlerClass: self.widgets.btn_save.set_sensitive(True) self.widgets.hal_action_reload.emit("activate") self.widgets.ntb_info.set_current_page(0) - self.widgets.ntb_message.set_current_page(0) + self.widgets.ntb_info.show() + self.widgets.box_info.set_size_request(-1,200) + self.widgets.tbl_search.hide() # Save all changes and run the program def on_btn_save_and_run_clicked(self, widget, data=None): @@ -2509,7 +2471,8 @@ class HandlerClass: if self.widgets.lbl_program.get_label() == tempfilename: self.widgets.hal_action_reload.emit("activate") else: - self.emc.emccommand.program_open(tempfilename) + self.widgets.hal_action_open.load_file(tempfilename) + #self.emc.emccommand.program_open(tempfilename) self.widgets.gcode_view.grab_focus() self.widgets.btn_save.set_sensitive(False) @@ -2521,15 +2484,14 @@ class HandlerClass: def on_tbtn_optional_stops_toggled(self, widget, data=None): if self.log: self.gscreen.add_alarm_entry("on_tbtn_optional_stops_toggled to %s"%widget.get_active()) - self.emc.opstop(not widget.get_active()) - self.gscreen.prefs.putpref("opstop", not widget.get_active()) + self.emc.opstop(widget.get_active()) + self.gscreen.prefs.putpref("opstop", widget.get_active()) # use the hal_status widget to control buttons and # actions allowed by the user and sensitive widgets def on_hal_status_all_homed(self,widget): self.data.all_homed = True self.gscreen.add_alarm_entry("all_homed") - self.widgets.statusbar1.push(1,"") self.widgets.ntb_button.set_current_page(0) widgetlist = ["rbt_mdi", "rbt_auto", "btn_index_tool", "btn_change_tool","btn_select_tool_by_no", "btn_tool_touchoff_x", "btn_tool_touchoff_z", "btn_touch" @@ -2602,7 +2564,7 @@ class HandlerClass: "btn_tool_touchoff_x", "btn_tool_touchoff_z", "btn_touch" ] # in MDI it should be possible to add more commands, even if the interpreter is running - if self.emcstat.task_mode <> _MDI: + if self.stat.task_mode <> _MDI: widgetlist.append("ntb_jog") self.gscreen.sensitize_widgets(widgetlist,False) @@ -2732,10 +2694,10 @@ class HandlerClass: # check linuxcnc for status, error and then update the readout def timer_interrupt(self): self.emc.mask() - self.emcstat.poll() + self.stat.poll() self.gscreen.status.periodic() self.data.system = self.gscreen.status.get_current_system() - e = self.emcerror.poll() + e = self.error_channel.poll() if e: kind, text = e #print kind,text @@ -2752,14 +2714,7 @@ class HandlerClass: elif kind in (linuxcnc.NML_DISPLAY, linuxcnc.OPERATOR_DISPLAY): icon = INFO_ICON type = _("Message") - if self.widgets.rbt_use_gmoccapy.get_active(): - self.notification.add_message(text,icon) - else: - if self.data.desktop_notify: # otherwise it will apear twice, - # because notify add the message also to the statusbar - self.gscreen.notify(type,text,icon,3) - else: - self.widgets.statusbar1.push(1, str(kind) + " " + text) + self.notification.add_message(text,icon) if self.data.audio_available: if kind != 13: diff --git a/share/gscreen/skins/gmoccapy/python/notification.py b/share/gscreen/skins/gmoccapy/python/notification.py index 77e9e2e99..44c0b8c7b 100644 --- a/share/gscreen/skins/gmoccapy/python/notification.py +++ b/share/gscreen/skins/gmoccapy/python/notification.py @@ -101,6 +101,7 @@ class Notification(gtk.Window): hbox.pack_start(icon) label=gtk.Label() label.set_line_wrap(True) + label.set_line_wrap_mode(pango.WRAP_CHAR) label.set_text(text) label.set_size_request(self.message_width,-1) font_desc = pango.FontDescription(self.font) @@ -267,4 +268,4 @@ def main(): gtk.main() if __name__ == "__main__": - main()
\ No newline at end of file + main() diff --git a/share/gscreen/skins/gmoccapy/release_notes.txt b/share/gscreen/skins/gmoccapy/release_notes.txt index ebf374606..e675c8951 100755 --- a/share/gscreen/skins/gmoccapy/release_notes.txt +++ b/share/gscreen/skins/gmoccapy/release_notes.txt @@ -1,3 +1,15 @@ +ver. 0.9.9.7.5 +- deleted the statusbar widget +- no more option to use gscreen error handling +- no more option to use desktop notify +- the optional stops button worked oposite it should +- renamed some stuff from emc to linuxcnc or shortend the names +- onboard keyboard showing in edit mode corrected +- plasma.py changed order of getting widgets from builder, + to avoid errors at load time +- notification change line wrape mode to caracter, + so longer file names will not be cut + ver. 0.9.9.7.4 - the default tool change dialog now shows the tool number and the tool description |