diff --git a/configs/sim/gmoccapy/lathe_configs/gmoccapy_lathe.pref b/configs/sim/gmoccapy/lathe_configs/gmoccapy_lathe.pref index 9b9f354a229..263c2bccba9 100644 --- a/configs/sim/gmoccapy/lathe_configs/gmoccapy_lathe.pref +++ b/configs/sim/gmoccapy/lathe_configs/gmoccapy_lathe.pref @@ -76,6 +76,6 @@ offset_axis_r = 50.0 radius offset_axis_x = 0 use_toolmeasurement = False kbd_height = 250 -icon_theme = None +icon_theme = classic hide_tooltips = False diff --git a/configs/sim/gmoccapy/lathe_configs/lathe.ini b/configs/sim/gmoccapy/lathe_configs/lathe.ini index 986a4aeef3d..078086c6af9 100644 --- a/configs/sim/gmoccapy/lathe_configs/lathe.ini +++ b/configs/sim/gmoccapy/lathe_configs/lathe.ini @@ -24,7 +24,7 @@ MAX_SPINDLE_OVERRIDE = 1.2 MIN_SPINDLE_OVERRIDE = .5 # Prefix to be used -PROGRAM_PREFIX = ../../nc_files/:. +PROGRAM_PREFIX = ../../nc_files/ # Introductory graphic INTRO_GRAPHIC = linuxcnc.gif diff --git a/configs/sim/gmoccapy/lathe_configs/lathe_macros.ini b/configs/sim/gmoccapy/lathe_configs/lathe_macros.ini index 8cddc771c65..91dbbb42576 100644 --- a/configs/sim/gmoccapy/lathe_configs/lathe_macros.ini +++ b/configs/sim/gmoccapy/lathe_configs/lathe_macros.ini @@ -25,7 +25,7 @@ MIN_SPINDLE_OVERRIDE = .5 # Prefix to be used -PROGRAM_PREFIX = ../../nc_files/:./ +PROGRAM_PREFIX = ../../nc_files/ # Introductory graphic INTRO_GRAPHIC = linuxcnc.gif diff --git a/configs/sim/gmoccapy/non_trivial_kinematics/Gantry/gantry_mm.ini b/configs/sim/gmoccapy/non_trivial_kinematics/Gantry/gantry_mm.ini index 7c925d19d59..87604b36863 100644 --- a/configs/sim/gmoccapy/non_trivial_kinematics/Gantry/gantry_mm.ini +++ b/configs/sim/gmoccapy/non_trivial_kinematics/Gantry/gantry_mm.ini @@ -9,7 +9,7 @@ DISPLAY = gmoccapy CYCLE_TIME = 0.200 POSITION_OFFSET = RELATIVE POSITION_FEEDBACK = ACTUAL -PROGRAM_PREFIX = ../../nc_files/ +PROGRAM_PREFIX = ../../../nc_files/ INTRO_GRAPHIC = linuxcnc.gif INTRO_TIME = 5 diff --git a/configs/sim/gmoccapy/non_trivial_kinematics/scara/scara.ini b/configs/sim/gmoccapy/non_trivial_kinematics/scara/scara.ini index d7141e05caf..67cfecbeb30 100644 --- a/configs/sim/gmoccapy/non_trivial_kinematics/scara/scara.ini +++ b/configs/sim/gmoccapy/non_trivial_kinematics/scara/scara.ini @@ -10,7 +10,7 @@ CYCLE_TIME = 0.200 POSITION_OFFSET = RELATIVE POSITION_FEEDBACK = ACTUAL MAX_FEED_OVERRIDE = 2.0 -PROGRAM_PREFIX = ../../nc_files/ +PROGRAM_PREFIX = ../../../nc_files/ INTRO_GRAPHIC = linuxcnc.gif INTRO_TIME = 5 MIN_SPINDLE_OVERRIDE = 0.25 diff --git a/configs/sim/gmoccapy/non_trivial_kinematics/table-rotary-tilting/xyzac-trt.ini b/configs/sim/gmoccapy/non_trivial_kinematics/table-rotary-tilting/xyzac-trt.ini index cb6695484b1..9362b1ba400 100644 --- a/configs/sim/gmoccapy/non_trivial_kinematics/table-rotary-tilting/xyzac-trt.ini +++ b/configs/sim/gmoccapy/non_trivial_kinematics/table-rotary-tilting/xyzac-trt.ini @@ -10,7 +10,7 @@ DISPLAY = gmoccapy POSITION_OFFSET = RELATIVE POSITION_FEEDBACK = ACTUAL MAX_FEED_OVERRIDE = 2 -PROGRAM_PREFIX = ../../nc_files +PROGRAM_PREFIX = ../../../nc_files INTRO_GRAPHIC = emc2.gif INTRO_TIME = 1 diff --git a/docs/src/gui/images/gmoccapy_3_axis.png b/docs/src/gui/images/gmoccapy_3_axis.png index 9367c7c7c63..0e8f0c90af7 100644 Binary files a/docs/src/gui/images/gmoccapy_3_axis.png and b/docs/src/gui/images/gmoccapy_3_axis.png differ diff --git a/docs/src/gui/images/gmoccapy_3_axis_mid.png b/docs/src/gui/images/gmoccapy_3_axis_mid.png index fbc7f2df7d1..a8d9731095f 100644 Binary files a/docs/src/gui/images/gmoccapy_3_axis_mid.png and b/docs/src/gui/images/gmoccapy_3_axis_mid.png differ diff --git a/docs/src/gui/images/gmoccapy_5_axis.png b/docs/src/gui/images/gmoccapy_5_axis.png index 4790b3af5af..80e79a5c752 100644 Binary files a/docs/src/gui/images/gmoccapy_5_axis.png and b/docs/src/gui/images/gmoccapy_5_axis.png differ diff --git a/docs/src/gui/images/gmoccapy_5_axis_mid.png b/docs/src/gui/images/gmoccapy_5_axis_mid.png index 3106284938d..0b12fd3e002 100644 Binary files a/docs/src/gui/images/gmoccapy_5_axis_mid.png and b/docs/src/gui/images/gmoccapy_5_axis_mid.png differ diff --git a/lib/python/gladevcp/iconview.py b/lib/python/gladevcp/iconview.py index 492f8b5a893..8c748ddca50 100755 --- a/lib/python/gladevcp/iconview.py +++ b/lib/python/gladevcp/iconview.py @@ -76,7 +76,7 @@ class IconFileSelection(Gtk.Box): 'icon_size' : (GObject.TYPE_INT, 'Icon Size', 'Sets the size of the displayed icon', 12, 96, 48, GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT), 'start_dir' : (GObject.TYPE_STRING, 'start directory', 'Sets the directory to start in', - "/", GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT), + ".", GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT), 'jump_to_dir' : (GObject.TYPE_STRING, 'jump to directory', 'Sets the directory to jump to ', "~", GObject.ParamFlags.READWRITE | GObject.ParamFlags.CONSTRUCT), 'filetypes' : (GObject.TYPE_STRING, 'file filter', 'Sets the filter for the file types to be shown', @@ -298,9 +298,6 @@ def _fill_store(self): number = 0 dirs = [] files = [] - # TODO: Why is iconview looking in "/" ? - # if self.cur_dir == "/": - # LOG.info("current dir is /") for fl in os.listdir(self.cur_dir): # we don't want to add hidden files diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.glade b/src/emc/usr_intf/gmoccapy/gmoccapy.glade index 53eba48071a..fc09ca37111 100644 --- a/src/emc/usr_intf/gmoccapy/gmoccapy.glade +++ b/src/emc/usr_intf/gmoccapy/gmoccapy.glade @@ -1,155 +1,155 @@ - + - + 1 5 3 - 1 + 1 20 96 32 - 1 + 1 100 - 0.10000000000000001 + 0.10 750 3920 750 - 1 + 1 150 500 - 1 - 10 + 1 + 10 1 25 10 - 1 + 1 999 - 32.429000000000002 - 0.001 + 32.429 + 0.001 100 10 - 1 + 1 100 - 1 + 1 - 0.10000000000000001 + 0.10 10 1 - 0.10000000000000001 + 0.10 - 0.10000000000000001 + 0.10 1000 1 - 0.10000000000000001 + 0.10 - 0.10000000000000001 + 0.10 10 1 - 0.10000000000000001 + 0.10 - 0.10000000000000001 + 0.10 10 1 - 0.10000000000000001 + 0.10 10000 100 - 1 + 1 100000 6000 - 50 + 50 10000 - 50 + 50 50 10000 300 - 25 + 25 1 100 20 - 1 + 1 979 3920 979 - 1 + 1 100 1280 200 - 1 + 1 1024 40 - 1 + 1 2000 30 - 1 + 1 768 30 - 1 + 1 2000 55 - 1 + 1 @@ -182,494 +182,494 @@ True - False + False True - False + False True - False - edit-undo + False + edit-undo True - False - edit-undo + False + edit-undo True - False + False True - False + False True - False + False True - False + False True - False - go-up + False + go-up True - False - edit-undo + False + edit-undo True - False + False True - False + False True - False - document-new + False + document-new True - False - view-refresh + False + view-refresh True - False - document-save + False + document-save True - False - document-save-as + False + document-save-as True - False + False True - False + False - 48 - 48 + 48 + 48 True - False + False True - False + False True - False + False True - False + False True - False + False True - False - go-home + False + go-home True - False - go-jump + False + go-jump True - False + False True - False + False True - False + False True - False + False True - False + False True - False - go-next + False + go-next True - False - go-previous + False + go-previous True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False - document-open + False + document-open True - False - pause the running program + False + pause the running program True - False - pause the running program + False + pause the running program True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False - edit-undo + False + edit-undo True - False - go-next + False + go-next True - False - go-previous + False + go-previous True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True False - False + False True - False - go-next + False + go-next True - False - go-next + False + go-next True - False - go-previous + False + go-previous True - False - go-previous + False + go-previous True - False - go-previous + False + go-previous True - False + False True - False + False True - False + False True - False + False True - False + False - 48 - 48 + 48 + 48 True - False + False - 48 - 48 + 48 + 48 True - False + False - 48 - 48 + 48 + 48 True - False + False - 48 - 48 + 48 + 48 True - False + False - 48 - 48 + 48 + 48 True - False + False - 48 - 48 + 48 + 48 True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False - edit-undo + False + edit-undo True - False + False True - False - go-next + False + go-next True - False - go-previous + False + go-previous True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False - 36 - 36 + 36 + 36 True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False True - False + False @@ -740,29 +740,29 @@ gcode_view - 979 - 750 - False + 979 + 750 + False gmoccapy icons/Logo.png - - - - + - + True - False + False + vertical - + True - False + False + horizontal - + True - False + False + horizontal @@ -776,44 +776,48 @@ True - True - False - False + True + False + False - + True - False + False + vertical True - True - True + True + True - + True - False + False + vertical True - False - False + False + False - + True - False + False + vertical - + True - False + False + vertical True - False + False True - False + False No Program loaded @@ -831,15 +835,15 @@ True - False + False True - False - False - False - False - False + False + False + False + False + False @@ -853,11 +857,11 @@ - False + False True - False + False blockheight = 0.0 @@ -880,224 +884,203 @@ - + + True - False - 11 - 5 + False + 5 + True + True - - False - 48 - 48 + + False + 48 + 48 True - True - True - clear plot - img_tool_clear - + True + False + view perspective + img_view_p + True + False + - 10 - 11 - GTK_SHRINK - GTK_SHRINK + 0 + 0 - - False - 48 - 48 + + False + 48 + 48 True - True - True - Zoom in - img_zoom_in - + True + False + view along the X axis from positive to negative + img_view_x + False + - 6 - 7 - GTK_SHRINK - GTK_SHRINK + 1 + 0 - - False - 48 - 48 + + False + 48 + 48 True - True - True - Zoom out - img_zoom_out - + True + False + view along the Y axis from positive to negative + img_view_y + False + - 7 - 8 - GTK_SHRINK - GTK_SHRINK + 2 + 0 - - False - 48 - 48 + + False + 48 + 48 True - True - False - view perspective - img_view_p - True - False - + True + False + view along the Z axis from positive to negative + img_view_z + False + - GTK_SHRINK - GTK_SHRINK + 3 + 0 - - False - 48 - 48 + + False + 48 + 48 True - True - False - view along the X axis from positive to negative - img_view_x - False - rbt_view_p - + True + False + view along the Y axis from positive to negative as viewn for a back tool lathe + img_view_y2 + False + - 1 - 2 - GTK_SHRINK - GTK_SHRINK + 4 + 0 - - False - 48 - 48 + True - True - False - view along the Y axis from positive to negative - img_view_y - False - rbt_view_p - + False - 2 - 3 - GTK_SHRINK - GTK_SHRINK + 5 + 0 - - False - 48 - 48 + + False + 48 + 48 True - True - False - view along the Z axis from positive to negative - img_view_z - False - rbt_view_p - + True + True + Zoom in + img_zoom_in + - 3 - 4 - GTK_SHRINK - GTK_SHRINK + 6 + 0 - - False - 48 - 48 + + False + 48 + 48 True - True - True - Show or hide tool path - img_tool_path - + True + True + Zoom out + img_zoom_out + - 9 - 10 - GTK_SHRINK - GTK_SHRINK + 7 + 0 - False - 48 - 48 + False + 48 + 48 True - True - True - Show or hide dimensions + True + True + Show or hide dimensions img_dimensions - 8 - 9 - GTK_SHRINK - GTK_SHRINK + 8 + 0 - - False - 48 - 48 + + False + 48 + 48 True - True - False - view along the Y axis from positive to negative as viewn for a back tool lathe - img_view_y2 - False - rbt_view_p - + True + True + Show or hide tool path + img_tool_path + - 4 - 5 - GTK_SHRINK - GTK_SHRINK + 9 + 0 - + + False + 48 + 48 True - False + True + True + clear plot + img_tool_clear + - 5 - 6 + 10 + 0 False True - 1 1 @@ -1106,19 +1089,19 @@ True - False + False Preview - False + False True - False - rgb(255,0,0) - rgb(173,216,230) + False + rgb(255,0,0) + rgb(173,216,230) @@ -1128,18 +1111,18 @@ True - False + False Offset Page 1 - False + False True - False + False 2 @@ -1148,18 +1131,18 @@ True - False + False Tooledit 2 - False + False True - False + False ngc,py,bmp @@ -1172,12 +1155,12 @@ True - False + False File Selection 3 - False + False @@ -1195,48 +1178,19 @@ - - 360 + + 360 True - False + False + vertical - + + True - False - 5 - 2 - 2 - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + False + 3 + True + True @@ -1277,38 +1231,41 @@ True - False - False - False + False + False + False - + True - False + False + vertical True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 5 + False + 5 + 5 + 5 - + True - False + False + vertical - - 50 + + 50 True - False + False + horizontal True - False + False rgb(255,129,22) 10500 mm/min @@ -1322,18 +1279,18 @@ - 50 - 50 + 50 + 50 True - True - True + True + True - 36 - 36 + 36 + 36 True - False + False @@ -1353,7 +1310,7 @@ True - False + False rgb(255,129,22) 3600 %.d @@ -1367,149 +1324,31 @@ - + True - False + False + horizontal - + True - False + False + vertical True - True - False - False + True + False + False - + + True - False - 5 - 4 - 5 - 3 - 3 - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + False + center + 3 + 3 + True + True @@ -1571,150 +1410,26 @@ - - False - True - False + False jog axes - False + False - + + True - False - 5 - 4 - 5 - 3 - 3 - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + False + 3 + 3 + True + True @@ -1778,24 +1493,23 @@ 1 - False True - False + False jog joints 1 - False + False 2 @@ -1804,12 +1518,12 @@ 2 - False + False @@ -1822,18 +1536,18 @@ Ignore limits - False + False True - True - False - True + True + False + True False False 5 - end + end 1 @@ -1845,10 +1559,11 @@ - - 110 + + 110 True - False + False + vertical 3 @@ -1869,7 +1584,7 @@ False True - end + end 1 @@ -1888,9 +1603,9 @@ True - False + False <b>Jogging</b> - True + True @@ -1905,18 +1620,18 @@ True - False + False Manual - False + False True - False - True + False + True @@ -1928,32 +1643,32 @@ True - False + False MDI 1 - False + False True - True + True gcode_view True - True - Shows the code to execute - 2 - 2 - True - True - 4 - True - True - False + True + Shows the code to execute + 2 + 2 + True + True + 4 + True + True + False @@ -1965,86 +1680,327 @@ True - False + False Auto 2 - False + False - True - True - 2 - 1 + True + True + 2 + 1 + + + + + False + False + + + + + True + True + 0 + + + + + True + False + vertical + + + False + 16 + + + Undo + False + gcode_edit + 48 + True + False + False + + + + GTK_SHRINK + GTK_SHRINK + + + + + Search + back + False + gcode_edit + 48 + True + False + False + + + + 2 + 3 + GTK_SHRINK + GTK_SHRINK + + + + + Search + fwd + False + gcode_edit + 48 + True + False + False + + + + 10 + 11 + GTK_SHRINK + GTK_SHRINK + + + + + Redo + False + gcode_edit + 48 + True + False + False + + + + 15 + 16 + GTK_SHRINK + GTK_SHRINK + + + + + True + False + + + 1 + 2 + + + + + True + False + + + 6 + 7 + + + + + gcode_edit + True + False + Replace + Text: + + + 7 + 8 + + + + + Replace + All + False + True + False + False + True + + + 12 + 13 + + + + + Ignore + Case + False + True + False + False + True + True + + + 11 + 12 + + + + + True + False + + + 9 + 10 + + + + + Replace + False + gcode_edit + 48 + True + False + False + + + + 13 + 14 + GTK_SHRINK + GTK_SHRINK + + + + + gcode_edit + True + False + Search + Text: + + + 4 + 5 + + + + + True + False + + + 3 + 4 + + + + + True + False + + + 14 + 15 + + + + + with_padding + True + True + ● + False + False + + + 5 + 6 + + + + + + with_padding + True + True + ● + False + False + + + 8 + 9 + - False - False + False + True + 0 - - - True - True - 0 - - - - - True - False True - True - False - False + True + False + False - + True - False + False + horizontal - + True - False + False + vertical True - False + False vertical True - False - Information over the tool in spindle - 0.5 + False + Information over the tool in spindle + 0.5 True - False - 5 - 5 - 5 - 5 + False + 5 + 5 + 5 + 5 True - False - 3 - 4 + False + 3 + 4 True True - False + False Tool no. - 8 + 8 @@ -2053,117 +2009,117 @@ True - False + False 0 center - 8 + 8 - 1 - 2 + 1 + 2 True - False + False Diameter - 8 + 8 - 1 - 2 + 1 + 2 True - False + False 0 center - 8 + 8 - 1 - 2 - 1 - 2 + 1 + 2 + 1 + 2 True - False + False offset z - 8 + 8 - 2 - 3 + 2 + 3 True - False + False 0 center - 8 + 8 - 2 - 3 - 1 - 2 + 2 + 3 + 1 + 2 True - False + False offset x - 8 + 8 - 3 - 4 + 3 + 4 True - False + False 0 center - 8 + 8 - 3 - 4 - 1 - 2 + 3 + 4 + 1 + 2 True - False + False No tool description available @@ -2171,23 +2127,23 @@ - 3 - 2 - 3 + 3 + 2 + 3 True - False + False Vc= 0.00 - 0.94999998807907104 + 0.949999988079071 - 3 - 4 - 2 - 3 + 3 + 4 + 2 + 3 @@ -2197,9 +2153,9 @@ True - False + False <b>Tool information</b> - True + True @@ -2219,34 +2175,36 @@ True - False + False vertical True - False - G and M code information as well as speed and feed - 0.5 + False + G and M code information as well as speed and feed + 0.5 True - False - 5 - 5 - 5 - 5 + False + 5 + 5 + 5 + 5 - + True - False + False + vertical - + True - False + False + horizontal True - False + False active_mcodes_label 0 @@ -2263,7 +2221,7 @@ True - False + False F 1 @@ -2279,9 +2237,9 @@ - 50 + 50 True - False + False 10000 1 @@ -2303,13 +2261,14 @@ - + True - False + False + horizontal True - False + False active_gcodes_label 0 @@ -2326,7 +2285,7 @@ True - False + False 3 S 1 @@ -2343,9 +2302,9 @@ - 50 + 50 True - False + False 3 0 1 @@ -2374,16 +2333,16 @@ True - False + False <b>G-Code</b> - True + True True True - end + end 0 @@ -2402,78 +2361,80 @@ - + True - False + False + horizontal - + True - False + False + horizontal True - False - 0.5 + False + 0.5 True - False + False 0 0 - 5 - 5 - 2 + 5 + 5 + 2 True - False - 5 - 3 + False + 5 + 3 True - False - 56 - 56 + False + 56 + 56 True - True - True + True + True img_coolant_off - GTK_SHRINK - GTK_SHRINK + GTK_SHRINK + GTK_SHRINK - False - 56 - 56 + False + 56 + 56 True - True - True + True + True img_mist_off - 2 - 3 - GTK_SHRINK - GTK_SHRINK + 2 + 3 + GTK_SHRINK + GTK_SHRINK True - False + False - 1 - 2 - GTK_EXPAND - GTK_EXPAND + 1 + 2 + GTK_EXPAND + GTK_EXPAND @@ -2483,9 +2444,9 @@ True - False + False <b>Cooling</b> - True + True @@ -2503,8 +2464,9 @@ - - False + + False + horizontal @@ -2516,39 +2478,43 @@ - + True - False + False + horizontal - 200 + 200 True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 5 - 5 + False + 5 + 5 + 5 + 5 - + True - False + False + vertical - + True - False + False + vertical - + True - False + False + horizontal True - False + False S 0 @@ -2564,12 +2530,12 @@ 100% - False - 48 - 48 + False + 48 + 48 True - True - True + True + True @@ -2588,7 +2554,7 @@ True - False + False rgb(255,129,22) 120 %d @@ -2610,96 +2576,97 @@ - + True - False + False + vertical 2 True - False - 5 - 5 + False + 5 + 5 - False - 56 - 56 + False + 56 + 56 True - True - False + True + False img_spindle_reverse - False + False rbt_stop - GTK_SHRINK - GTK_SHRINK + GTK_SHRINK + GTK_SHRINK - False - 56 - 56 + False + 56 + 56 True - True - False + True + False img_spindle_forward - False + False rbt_stop - 4 - 5 - GTK_SHRINK - GTK_SHRINK + 4 + 5 + GTK_SHRINK + GTK_SHRINK - False - 56 - 56 + False + 56 + 56 True - True - False + True + False img_spindle_stop_on True - False + False - 2 - 3 - GTK_SHRINK - GTK_SHRINK + 2 + 3 + GTK_SHRINK + GTK_SHRINK True - False + False - 1 - 2 - GTK_EXPAND - GTK_EXPAND + 1 + 2 + GTK_EXPAND + GTK_EXPAND True - False + False - 3 - 4 - GTK_EXPAND - GTK_EXPAND + 3 + 4 + GTK_EXPAND + GTK_EXPAND @@ -2710,23 +2677,24 @@ - + True - False + False + horizontal True - False - #bebebebebebe + False + #bebebebebebe 6000 - #0000ffff0000 - -0.039999999105930328 - %i - 0.40000000596046448 - #0000ffff0000 - 0.80000001192092896 - #0000ffff0000 - #0000ffff0000 + #0000ffff0000 + -0.039999999105930328 + %i + 0.40000000596046448 + #0000ffff0000 + 0.8000000119209289 + #0000ffff0000 + #0000ffff0000 True @@ -2737,9 +2705,9 @@ True - False - 0 - #0000ffff0000 + False + 0 + #0000ffff0000 False @@ -2770,16 +2738,16 @@ True - False + False <b>Spindle [rpm]</b> - True + True True True - end + end 0 @@ -2791,8 +2759,9 @@ - - False + + False + horizontal @@ -2807,13 +2776,14 @@ True True - end + end 1 - - False + + False + horizontal @@ -2825,39 +2795,43 @@ - - 175 + + 175 True - False + False + vertical - + True - False + False + vertical True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 5 - 5 + False + 5 + 5 + 5 + 5 - + True - False + False + vertical - + True - False + False + horizontal True - False + False Vel. @@ -2874,10 +2848,10 @@ True - False - True - Displays the current velocity - Displays the current velocity + False + True + Displays the current velocity + Displays the current velocity 5 5 10000 @@ -2904,7 +2878,7 @@ True - False + False rgb(255,129,22) 120 %.d @@ -2925,9 +2899,9 @@ True - False + False <b>Rapid Override</b> - True + True @@ -2940,31 +2914,33 @@ True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 5 - 5 + False + 5 + 5 + 5 + 5 - + True - False + False + vertical - + True - False + False + horizontal True - False - True - Displays the programmed feed rate - Displays the programmed feed rate + False + True + Displays the programmed feed rate + Displays the programmed feed rate F 275 @@ -2980,15 +2956,15 @@ 100% - False - 48 - 48 + False + 48 + 48 True - True - True - True - reset feed override to 100 % - reset feed override to 100 % + True + True + True + reset feed override to 100 % + reset feed override to 100 % @@ -3007,7 +2983,7 @@ True - False + False rgb(255,129,22) 120 %d @@ -3028,9 +3004,9 @@ True - False + False <b>Feed Override</b> - True + True @@ -3055,8 +3031,9 @@ - - False + + False + horizontal @@ -3072,17 +3049,18 @@ True - False + False Info - False + False - + True - False + False + horizontal @@ -3094,12 +3072,12 @@ True - False + False Embedded keyboard 1 - False + False @@ -3109,244 +3087,6 @@ 1 - - - False - 16 - - - Undo - gcode_edit - False - 48 - True - False - False - - - - GTK_SHRINK - GTK_SHRINK - - - - - Search - back - gcode_edit - False - 48 - True - False - False - - - - 2 - 3 - GTK_SHRINK - GTK_SHRINK - - - - - Search - fwd - gcode_edit - False - 48 - True - False - False - - - - 10 - 11 - GTK_SHRINK - GTK_SHRINK - - - - - Redo - gcode_edit - False - 48 - True - False - False - - - - 15 - 16 - GTK_SHRINK - GTK_SHRINK - - - - - True - False - - - 1 - 2 - - - - - True - False - - - 6 - 7 - - - - - True - False - Replace - Text: - gcode_edit - - - 7 - 8 - - - - - Replace - All - False - True - False - False - True - - - 12 - 13 - - - - - Ignore - Case - False - True - False - False - True - True - - - 11 - 12 - - - - - True - False - - - 9 - 10 - - - - - Replace - gcode_edit - False - 48 - True - False - False - - - - 13 - 14 - GTK_SHRINK - GTK_SHRINK - - - - - True - False - Search - Text: - gcode_edit - - - 4 - 5 - - - - - True - False - - - 3 - 4 - - - - - True - False - - - 14 - 15 - - - - - True - True - ● - False - False - with_padding - - - 5 - 6 - - - - - - True - True - ● - False - False - with_padding - - - 8 - 9 - - - - - - False - True - 0 - - False @@ -3359,52 +3099,55 @@ True - False + False Main - False + False True - True - left + True + left - + True - False + False + horizontal - + True - False + False + vertical True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 3 - 3 + False + 5 + 5 + 3 + 3 - + True - False + False + vertical Start as fullscreen - False + False True - True - False + True + False True - True + True @@ -3416,11 +3159,11 @@ Start maximized - False + False True - True - False - True + True + False + True rbtn_fullscreen @@ -3433,11 +3176,11 @@ Start as window - False + False True - True - False - True + True + False + True rbtn_fullscreen @@ -3450,151 +3193,151 @@ True - False - 4 - 2 + False + 4 + 2 True - False + False 5 5 X Pos. 0 - GTK_SHRINK | GTK_FILL - GTK_SHRINK + GTK_SHRINK | GTK_FILL + GTK_SHRINK True - False + False 5 5 Y Pos. 0 - 1 - 2 - GTK_SHRINK | GTK_FILL - GTK_SHRINK + 1 + 2 + GTK_SHRINK | GTK_FILL + GTK_SHRINK True - False + False 5 5 Width 0 - 2 - 3 - GTK_SHRINK | GTK_FILL - GTK_SHRINK + 2 + 3 + GTK_SHRINK | GTK_FILL + GTK_SHRINK True - False + False 5 5 Height 0 - 3 - 4 - GTK_SHRINK | GTK_FILL - GTK_SHRINK + 3 + 4 + GTK_SHRINK | GTK_FILL + GTK_SHRINK True False - True - ● + True + ● 1 - False - False + False + False adj_x_pos - 1 - 2 - GTK_SHRINK - 5 - 2 + 1 + 2 + GTK_SHRINK + 5 + 2 True False - True - ● + True + ● 1 - False - False + False + False adj_y_pos - 1 - 2 - 1 - 2 - GTK_SHRINK - 5 - 2 + 1 + 2 + 1 + 2 + GTK_SHRINK + 5 + 2 True False - True - ● + True + ● 1 - False - False + False + False adj_width - 1 - 2 - 2 - 3 - GTK_SHRINK - 5 - 2 + 1 + 2 + 2 + 3 + GTK_SHRINK + 5 + 2 True False - True - ● + True + ● 1 - False - False + False + False adj_height - 1 - 2 - 3 - 4 - GTK_SHRINK - 5 - 2 + 1 + 2 + 3 + 4 + GTK_SHRINK + 5 + 2 @@ -3607,11 +3350,11 @@ hide cursor - False + False True - True - False - True + True + False + True @@ -3625,9 +3368,9 @@ hide tooltips True - True - False - True + True + False + True @@ -3643,9 +3386,9 @@ True - False + False <b>Main Window</b> - True + True @@ -3658,29 +3401,30 @@ True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 3 - 3 + False + 5 + 5 + 3 + 3 - + True - False + False + vertical Show keyboard on offset - False + False True - True - False + True + False True - True + True @@ -3692,12 +3436,12 @@ Show keyboard on tooledit - False + False True - True - False + True + False True - True + True @@ -3709,12 +3453,12 @@ Show keyboard on MDI - False + False True - True - False + True + False True - True + True @@ -3726,12 +3470,12 @@ Show keyboard on EDIT - False + False True - True - False + True + False True - True + True @@ -3743,11 +3487,11 @@ Show keyboard on load file - False + False True - True - False - True + True + False + True @@ -3759,11 +3503,11 @@ True - False + False True - False + False 5 5 Height @@ -3778,7 +3522,7 @@ True - True + True adj_kbd_height 250 @@ -3802,9 +3546,9 @@ True - False + False <b>Virtual Keyboard</b> - True + True @@ -3818,29 +3562,30 @@ True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 3 - 3 + False + 5 + 5 + 3 + 3 - + True - False + False + vertical show preview - False + False True - True - False + True + False True - True + True @@ -3852,11 +3597,11 @@ show offsets - False + False True - True - False - True + True + False + True rbtn_show_preview @@ -3872,9 +3617,9 @@ True - False + False <b>On Touch off</b> - True + True @@ -3894,29 +3639,30 @@ - + True - False + False + vertical True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 3 - 3 + False + 5 + 5 + 3 + 3 True - False - 12 - 2 - 3 + False + 12 + 2 + 3 @@ -3932,186 +3678,188 @@ True - False + False Relative Color 0 - GTK_SHRINK | GTK_FILL - GTK_SHRINK - 5 + GTK_SHRINK | GTK_FILL + GTK_SHRINK + 5 - False + False True - True - True + True + True #000000000000 - 1 - 2 - GTK_SHRINK - 2 + 1 + 2 + GTK_SHRINK + 2 True - False + False Absolute Color 0 - 1 - 2 - GTK_SHRINK | GTK_FILL - GTK_SHRINK - 5 + 1 + 2 + GTK_SHRINK | GTK_FILL + GTK_SHRINK + 5 - False + False True - True - True + True + True #00000000ffff - 1 - 2 - 1 - 2 - GTK_SHRINK - 2 + 1 + 2 + 1 + 2 + GTK_SHRINK + 2 True - False + False DTG Color 0 - 2 - 3 - GTK_SHRINK | GTK_FILL - GTK_SHRINK - 5 + 2 + 3 + GTK_SHRINK | GTK_FILL + GTK_SHRINK + 5 - False + False True - True - True + True + True #ffffffff0000 - 1 - 2 - 2 - 3 - GTK_SHRINK - 2 + 1 + 2 + 2 + 3 + GTK_SHRINK + 2 True - False + False - 2 - 5 - 6 + 2 + 5 + 6 True - False + False Homed color 0 - 3 - 4 - GTK_SHRINK | GTK_FILL - GTK_SHRINK - 5 + 3 + 4 + GTK_SHRINK | GTK_FILL + GTK_SHRINK + 5 True - False + False Unhomed color 0 - 4 - 5 - GTK_SHRINK | GTK_FILL - GTK_SHRINK - 5 + 4 + 5 + GTK_SHRINK | GTK_FILL + GTK_SHRINK + 5 - False + False True - True - True + True + True #0000ffff0000 - 1 - 2 - 3 - 4 - GTK_SHRINK - 2 + 1 + 2 + 3 + 4 + GTK_SHRINK + 2 - False + False True - True - True + True + True #ffff00000000 - 1 - 2 - 4 - 5 - GTK_SHRINK - 2 + 1 + 2 + 4 + 5 + GTK_SHRINK + 2 - + True - False + False + The real font size is reduced to 0.75*FontSize when four DRO elements are present and to 0.65*FontSize for more than five elements. + horizontal True - False + False 5 5 - Size + Font size 0 @@ -4121,40 +3869,54 @@ 0 + + + True + False + dialog-information + 2 + + + False + True + 1 + + True - True - ● + True + ● 1 - False - False + False + False adj_dro_size - 1 + 1 True False True - end - 1 + end + 2 - 2 - 8 - 9 + 2 + 8 + 9 - + True - False + False + horizontal True - False + False 5 5 Digits @@ -4170,59 +3932,59 @@ True - True - ● + True + ● 1 - False - False + False + False adj_dro_digits - 1 + 1 True False True - end + end 1 - 2 - 9 - 10 + 2 + 9 + 10 True - False + False - 2 - 10 - 11 + 2 + 10 + 11 toggle DRO mode clicking on the DRO - False + False True - True - False + True + False True - True + True - 2 - 11 - 12 - GTK_SHRINK | GTK_FILL - GTK_SHRINK - 5 + 2 + 11 + 12 + GTK_SHRINK | GTK_FILL + GTK_SHRINK + 5 @@ -4232,9 +3994,9 @@ clicking on the DRO True - False + False <b>DRO</b> - True + True @@ -4247,28 +4009,30 @@ clicking on the DRO True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 5 - 5 + False + 5 + 5 + 5 + 5 - + True - False + False + vertical - + True - False + False + horizontal True - False + False Grid size 0 @@ -4281,11 +4045,11 @@ clicking on the DRO True - True - ● + True + ● 1 - False - False + False + False adj_grid_size 3 @@ -4306,11 +4070,11 @@ clicking on the DRO Show DRO - False + False True - True - False - True + True + False + True @@ -4322,11 +4086,11 @@ clicking on the DRO Show offsets - False + False True - True - False - True + True + False + True @@ -4338,12 +4102,12 @@ clicking on the DRO Show DTG - False + False True - True - False + True + False 1 - True + True @@ -4355,7 +4119,7 @@ clicking on the DRO True - False + False False @@ -4366,9 +4130,9 @@ clicking on the DRO True - False + False <b>Mouse Button mode</b> - True + True False @@ -4379,16 +4143,16 @@ clicking on the DRO True - False + False lst_button_mode 0 - True - 1 - 0 + True + 1 + 0 - False + False @@ -4405,9 +4169,9 @@ clicking on the DRO True - False + False <b>Preview</b> - True + True @@ -4426,30 +4190,32 @@ clicking on the DRO - + True - False + False + vertical True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 3 - 3 + False + 5 + 5 + 3 + 3 - + True - False + False + vertical True - False + False ff_file_to_load @@ -4460,19 +4226,19 @@ clicking on the DRO - + True - False + False current file - False - 56 + False + 56 True False - True - True + True + True @@ -4485,10 +4251,10 @@ clicking on the DRO none - False + False True - True - True + True + True @@ -4513,9 +4279,9 @@ clicking on the DRO True - False + False <b>File to load on start</b> - True + True @@ -4528,22 +4294,22 @@ clicking on the DRO True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 3 - 3 + False + 5 + 5 + 3 + 3 True - False + False select-folder - True + True Select user dir @@ -4553,9 +4319,9 @@ clicking on the DRO True - False + False <b>Select jump to dir</b> - True + True @@ -4569,38 +4335,38 @@ clicking on the DRO True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 3 - 3 + False + 5 + 5 + 3 + 3 True - False - 6 - 2 + False + 6 + 2 True - False + False Themes - 2 - GTK_SHRINK - 5 + 2 + GTK_SHRINK + 5 True - False + False lstst_themes @@ -4611,92 +4377,92 @@ clicking on the DRO - 2 - 1 - 2 - GTK_SHRINK - 5 + 2 + 1 + 2 + GTK_SHRINK + 5 True - False + False Warning Audio 0 - 4 - 5 - GTK_SHRINK | GTK_FILL - GTK_SHRINK + 4 + 5 + GTK_SHRINK | GTK_FILL + GTK_SHRINK True - False + False Alert Audio 0 - 5 - 6 - GTK_SHRINK | GTK_FILL - GTK_SHRINK + 5 + 6 + GTK_SHRINK | GTK_FILL + GTK_SHRINK True - False + False - 1 - 2 - 4 - 5 - GTK_SHRINK | GTK_FILL - GTK_SHRINK + 1 + 2 + 4 + 5 + GTK_SHRINK | GTK_FILL + GTK_SHRINK True - False + False - 1 - 2 - 5 - 6 - GTK_SHRINK | GTK_FILL - GTK_SHRINK + 1 + 2 + 5 + 6 + GTK_SHRINK | GTK_FILL + GTK_SHRINK True - False + False Icon Theme - 2 - 2 - 3 - GTK_SHRINK - 5 + 2 + 2 + 3 + GTK_SHRINK + 5 True - False + False lstst_icon_themes 0 - 0 + 0 @@ -4706,11 +4472,11 @@ clicking on the DRO - 2 - 3 - 4 - GTK_SHRINK - 5 + 2 + 3 + 4 + GTK_SHRINK + 5 @@ -4720,9 +4486,9 @@ clicking on the DRO True - False + False <b>Themes and sound</b> - True + True @@ -4736,7 +4502,7 @@ clicking on the DRO True - False + False True @@ -4757,178 +4523,180 @@ clicking on the DRO True - False + False Appearance - False + False - + True - False + False + horizontal - + True - False + False + vertical True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 3 - 3 + False + 5 + 5 + 3 + 3 True - False - 4 - 2 + False + 4 + 2 True - False + False 5 5 Scale rapid override 0 - 1 - 2 - GTK_SHRINK | GTK_FILL - GTK_SHRINK | GTK_FILL + 1 + 2 + GTK_SHRINK | GTK_FILL + GTK_SHRINK | GTK_FILL True - False + False 5 5 Scale jog velocity 0 - GTK_SHRINK | GTK_FILL - GTK_SHRINK | GTK_FILL + GTK_SHRINK | GTK_FILL + GTK_SHRINK | GTK_FILL True - False + False 5 5 Scale feed override 0 - 2 - 3 - GTK_SHRINK | GTK_FILL - GTK_SHRINK | GTK_FILL + 2 + 3 + GTK_SHRINK | GTK_FILL + GTK_SHRINK | GTK_FILL True - False + False 5 5 Scale spindle override 0 - 3 - 4 - GTK_SHRINK | GTK_FILL - GTK_SHRINK | GTK_FILL + 3 + 4 + GTK_SHRINK | GTK_FILL + GTK_SHRINK | GTK_FILL True - True - ● + True + ● 1 - False - False + False + False adj_scale_rapid_override 1 - 1 - 2 - 1 - 2 - 5 - 2 + 1 + 2 + 1 + 2 + 5 + 2 True - True - ● + True + ● 1 - False - False + False + False adj_scale_jog_vel 1 - 1 - 2 - 5 - 2 + 1 + 2 + 5 + 2 True - True - ● + True + ● 1 - False - False + False + False adj_scale_feed_override 1 - 1 - 2 - 2 - 3 - 5 - 2 + 1 + 2 + 2 + 3 + 5 + 2 True - True - ● + True + ● 1 - False - False + False + False adj_scale_spindle_override 1 - 1 - 2 - 3 - 4 - 5 - 2 + 1 + 2 + 3 + 4 + 5 + 2 @@ -4938,9 +4706,9 @@ clicking on the DRO True - False + False <b>Hardware MPG Scale</b> - True + True @@ -4953,24 +4721,24 @@ clicking on the DRO True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 3 - 3 + False + 5 + 5 + 3 + 3 Use keyboard shortcuts - False + False True - True - False - True + True + False + True @@ -4979,9 +4747,9 @@ clicking on the DRO True - False + False <b>Keyboard shortcuts</b> - True + True @@ -4994,29 +4762,30 @@ clicking on the DRO True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 3 - 3 + False + 5 + 5 + 3 + 3 - + True - False + False + vertical Use unlock code - False + False True - True - False + True + False True - True + True @@ -5028,11 +4797,11 @@ clicking on the DRO Do not use unlock code - False + False True - True - False - True + True + False + True rbt_use_unlock @@ -5045,11 +4814,11 @@ clicking on the DRO Use hal pin to unlock - False + False True - True - False - True + True + False + True rbt_use_unlock @@ -5066,9 +4835,9 @@ clicking on the DRO True - False + False <b>Unlock settings</b> - True + True @@ -5082,127 +4851,127 @@ clicking on the DRO True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 3 - 3 + False + 5 + 5 + 3 + 3 True - False - 3 - 2 + False + 3 + 2 True - False + False Starting RPM 0 - GTK_SHRINK - 5 + GTK_SHRINK + 5 True - True - ● - True + True + ● + True 1 - etched-in - False - False + etched-in + False + False adj_start_spindle_RPM - 1 + 1 True - 1 - 2 - GTK_SHRINK | GTK_FILL - 2 + 1 + 2 + GTK_SHRINK | GTK_FILL + 2 True - True - ● - True + True + ● + True 1 - etched-in - False - False + etched-in + False + False adj_spindle_bar_min - 1 + 1 True - 1 - 2 - 1 - 2 - GTK_SHRINK | GTK_FILL - 2 + 1 + 2 + 1 + 2 + GTK_SHRINK | GTK_FILL + 2 True - True - ● - True + True + ● + True 1 - etched-in - False - False + etched-in + False + False adj_spindle_bar_max - 1 + 1 True - 1 - 2 - 2 - 3 - GTK_SHRINK | GTK_FILL - 2 + 1 + 2 + 2 + 3 + GTK_SHRINK | GTK_FILL + 2 True - False + False Spindle bar min 0 - 1 - 2 - GTK_SHRINK - 5 + 1 + 2 + GTK_SHRINK + 5 True - False + False Spindle bar max 0 - 2 - 3 - GTK_SHRINK - 5 + 2 + 3 + GTK_SHRINK + 5 @@ -5212,9 +4981,9 @@ clicking on the DRO True - False + False <b>Spindle</b> - True + True @@ -5227,28 +4996,29 @@ clicking on the DRO True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 5 - 5 + False + 5 + 5 + 5 + 5 - + True - False + False + vertical Hide turtle Jog Button - False + False True - True - False - True + True + False + True @@ -5260,7 +5030,7 @@ clicking on the DRO True - False + False False @@ -5271,36 +5041,36 @@ clicking on the DRO True - False - 2 + False + 2 True - False + False 5 5 Turtle jog Factor 0 - + True - True - ● + True + ● 1 - False - False + False + False adj_turtle_jog_factor True - 1 - 2 - GTK_SHRINK | GTK_FILL + 1 + 2 + GTK_SHRINK | GTK_FILL @@ -5318,9 +5088,9 @@ clicking on the DRO True - False + False <b>Turtle Jog</b> - True + True @@ -5349,7 +5119,7 @@ clicking on the DRO True - False + False True @@ -5365,51 +5135,55 @@ clicking on the DRO True - False + False Hardware 1 - False + False - + True - False + False + horizontal - + True - False + False + horizontal - + True - False + False + vertical True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 3 - 3 + False + 5 + 5 + 3 + 3 - + True - False + False + vertical Use auto tool measurement - False + False True - True - False - True + True + False + True @@ -5422,175 +5196,175 @@ clicking on the DRO True False - False - 0.5 + False + 0.5 True - False - 5 - 5 - 3 - 3 + False + 5 + 5 + 3 + 3 True - False - 5 - 2 + False + 5 + 2 True - False + False X Pos. 0 - GTK_SHRINK | GTK_FILL - GTK_SHRINK + GTK_SHRINK | GTK_FILL + GTK_SHRINK True - False + False Y Pos. 0 - 1 - 2 - GTK_SHRINK | GTK_FILL - GTK_SHRINK + 1 + 2 + GTK_SHRINK | GTK_FILL + GTK_SHRINK True - False + False Probe Height 0 - 4 - 5 - GTK_SHRINK | GTK_FILL - GTK_SHRINK + 4 + 5 + GTK_SHRINK | GTK_FILL + GTK_SHRINK True - True - ● + True + ● 1 - False - False + False + False adj_probe_height 3 - 1 - 2 - 4 - 5 - GTK_SHRINK - 5 - 2 + 1 + 2 + 4 + 5 + GTK_SHRINK + 5 + 2 True - False + False 0.000 1 - 1 - 2 - 5 - 2 + 1 + 2 + 5 + 2 True - False + False 0.000 1 - 1 - 2 - 1 - 2 - GTK_SHRINK - 5 - 2 + 1 + 2 + 1 + 2 + GTK_SHRINK + 5 + 2 True - False + False Z Pos. 0 - 2 - 3 - GTK_SHRINK | GTK_FILL - GTK_SHRINK + 2 + 3 + GTK_SHRINK | GTK_FILL + GTK_SHRINK True - False + False 0.000 1 - 1 - 2 - 2 - 3 - GTK_SHRINK - 5 - 2 + 1 + 2 + 2 + 3 + GTK_SHRINK + 5 + 2 True - False + False Max. Probe 0 - 3 - 4 - GTK_SHRINK | GTK_FILL - GTK_SHRINK + 3 + 4 + GTK_SHRINK | GTK_FILL + GTK_SHRINK True - False + False 0.000 1 - 1 - 2 - 3 - 4 - GTK_SHRINK - 5 - 2 + 1 + 2 + 3 + 4 + GTK_SHRINK + 5 + 2 @@ -5600,9 +5374,9 @@ clicking on the DRO True - False + False <b>Probe Information</b> - True + True @@ -5616,86 +5390,86 @@ clicking on the DRO True False - False - 0.5 + False + 0.5 True - False - 5 - 5 - 3 - 3 + False + 5 + 5 + 3 + 3 True - False - 2 - 2 + False + 2 + 2 True - False + False Search Vel. 0 - GTK_SHRINK | GTK_FILL - GTK_SHRINK + GTK_SHRINK | GTK_FILL + GTK_SHRINK True - False + False Probe Vel. 0 - 1 - 2 - GTK_SHRINK | GTK_FILL - GTK_SHRINK + 1 + 2 + GTK_SHRINK | GTK_FILL + GTK_SHRINK True - True - ● + True + ● 1 - False - False + False + False adj_search_vel - 1 - 2 - GTK_SHRINK - 5 - 2 + 1 + 2 + GTK_SHRINK + 5 + 2 True - True - ● + True + ● 1 - False - False + False + False adj_probe_vel - 1 - 2 - 1 - 2 - GTK_SHRINK - 5 - 2 + 1 + 2 + 1 + 2 + GTK_SHRINK + 5 + 2 @@ -5705,9 +5479,9 @@ clicking on the DRO True - False + False <b>Probe velocitys</b> - True + True @@ -5720,7 +5494,7 @@ clicking on the DRO True - False + False No valid configuration found in your INI file, please take a look at @@ -5741,9 +5515,9 @@ to configure the settings. True - False + False <b>Tool Measurement</b> - True + True @@ -5756,35 +5530,36 @@ to configure the settings. True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 5 - 5 + False + 5 + 5 + 5 + 5 - + True - False + False + vertical Reload Tool on Start - False + False True - True - False - If checked, the tool in spindle + True + False + If checked, the tool in spindle will be saved on each change and the last tool will be reloaded at start of the GUI. Also it's length offset will be reloaded. True - True + True @@ -5795,7 +5570,7 @@ length offset will be reloaded. - False + False 4 You use NO_FORCE_HOMING, so the reload of a tool at start @@ -5814,9 +5589,9 @@ is not possible. True - False + False <b>Reload Tool</b> - True + True @@ -5835,35 +5610,37 @@ is not possible. - + True - False + False + vertical True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 5 - 5 + False + 5 + 5 + 5 + 5 - + True - False + False + vertical Do not use run from line - False + False True - True - False + True + False True - True + True @@ -5875,11 +5652,11 @@ is not possible. Use run from line - False + False True - True - False - True + True + False + True rbtn_no_run_from_line @@ -5896,9 +5673,9 @@ is not possible. True - False + False <b>Run from line</b> - True + True @@ -5912,7 +5689,7 @@ is not possible. True - False + False False @@ -5923,235 +5700,235 @@ is not possible. True - False - 0.5 + False + 0.5 True - False - 5 - 5 - 5 - 5 + False + 5 + 5 + 5 + 5 True - False - 7 - 2 + False + 7 + 2 Use frames - False + False True - True - False - If checked, the messages + True + False + If checked, the messages will be in a frame. - True + True - 2 - 5 - 6 + 2 + 5 + 6 True - False + False 5 5 Font 0 - 4 - 5 + 4 + 5 True - False + False 5 5 Max. messages 0 - 3 - 4 - GTK_SHRINK | GTK_FILL - GTK_SHRINK + 3 + 4 + GTK_SHRINK | GTK_FILL + GTK_SHRINK True - False + False 5 5 Width 0 - 2 - 3 - GTK_SHRINK | GTK_FILL - GTK_SHRINK + 2 + 3 + GTK_SHRINK | GTK_FILL + GTK_SHRINK - False + False True - True - True - The font to use + True + True + The font to use Sans 12 - 1 - 2 - 4 - 5 + 1 + 2 + 4 + 5 True - True - The maximum messages you want to be shown - ● + True + The maximum messages you want to be shown + ● 1 - False - False + False + False adj_max_messages True - 1 - 2 - 3 - 4 - GTK_SHRINK - 5 - 2 + 1 + 2 + 3 + 4 + GTK_SHRINK + 5 + 2 True - True - The width of the messages - ● + True + The width of the messages + ● 1 - 0.0099999997764825821 - False - False + 0.009999999776482582 + False + False adj_width_popup True - 1 - 2 - 2 - 3 - GTK_SHRINK - 5 - 2 + 1 + 2 + 2 + 3 + GTK_SHRINK + 5 + 2 True - False + False 5 5 Y Pos. 0 - 1 - 2 - GTK_SHRINK | GTK_FILL - GTK_SHRINK + 1 + 2 + GTK_SHRINK | GTK_FILL + GTK_SHRINK True - False + False 5 5 X Pos. 0 - GTK_SHRINK | GTK_FILL - GTK_SHRINK + GTK_SHRINK | GTK_FILL + GTK_SHRINK True - True - X-position in pixel from top left corner of the screen - ● + True + X-position in pixel from top left corner of the screen + ● 1 - False - False + False + False adj_x_pos_popup True - 1 - 2 - GTK_SHRINK - 5 - 2 + 1 + 2 + GTK_SHRINK + 5 + 2 True - True - Y-position in pixel from top left corner of the screen - ● + True + Y-position in pixel from top left corner of the screen + ● 1 - False - False + False + False adj_y_pos_popup True - 1 - 2 - 1 - 2 - GTK_SHRINK - 5 - 2 + 1 + 2 + 1 + 2 + GTK_SHRINK + 5 + 2 Launch test message - False + False True - True - True - Push here to launch a test message + True + True + Push here to launch a test message to test your settings. - 2 - 6 - 7 + 2 + 6 + 7 @@ -6161,10 +5938,10 @@ to test your settings. True - False + False <b> gmoccapy message behavior and appearance </b> - True + True @@ -6198,13 +5975,13 @@ to test your settings. True - False + False Advanced Settings 2 - False + False @@ -6215,22 +5992,22 @@ to test your settings. True - False + False Settings 1 - False + False True - True + True True - False + False @@ -6239,11 +6016,11 @@ to test your settings. True - False + False User tab 1 - False + False @@ -6254,12 +6031,12 @@ to test your settings. True - False + False User tabs 2 - False + False @@ -6270,9 +6047,10 @@ to test your settings. - + True - False + False + horizontal @@ -6284,20 +6062,21 @@ to test your settings. - - 100 + + 100 True - False + False + vertical True - False - 90 - 56 + False + 90 + 56 True - True - True - Estop the machine + True + True + Estop the machine [F1] center center @@ -6312,13 +6091,13 @@ to test your settings. - False - 90 - 56 + False + 90 + 56 True - True - True - Turn the machine on/off + True + True + Turn the machine on/off [F2] center center @@ -6333,19 +6112,19 @@ to test your settings. - False - 90 - 56 + False + 90 + 56 True - True - True - enter manual mode to jog axis by hand or touch off + True + True + enter manual mode to jog axis by hand or touch off [F3] center center img_manual True - False + False rbt_auto @@ -6358,18 +6137,18 @@ to test your settings. - False - 90 - 56 + False + 90 + 56 True - True - False - enter MDI mode to launch G-code commands + True + False + enter MDI mode to launch G-code commands [F5] center center img_mdi - False + False rbt_auto @@ -6382,17 +6161,17 @@ to test your settings. - False - 90 - 56 + False + 90 + 56 True - True - False - enter auto mode to run programs + True + False + enter auto mode to run programs center center img_auto - False + False @@ -6403,49 +6182,49 @@ to test your settings. - - False - 90 - 56 + + False + 90 + 56 True - True - True - Enter the settings page, the default code is "123" + True + False + show user tabs center center - img_settings - + img_user_tabs + False False - 6 + 5 - - False - 90 - 56 + + False + 90 + 56 True - True - False - show user tabs + True + True + Enter the settings page, the default code is "123" center center - img_user_tabs - + img_settings + False False - 5 + 6 True - False + False Time Date center @@ -6472,26 +6251,26 @@ Date - 62 + 62 True - False - False - False + False + False + False - + True - False + False True - False - 90 - 56 + False + 90 + 56 True - True - True - open homing button list + True + True + open homing button list center center img_ref_menu @@ -6505,13 +6284,13 @@ Date - False - 90 - 56 + False + 90 + 56 True - True - True - open touch off button list + True + True + open touch off button list center center img_touch_off @@ -6525,10 +6304,10 @@ Date - 90 - 56 + 90 + 56 True - False + False False @@ -6538,17 +6317,17 @@ Date - False - 90 - 56 + False + 90 + 56 True - True - True - Open the tooleditor page + True + True + Open the tooleditor page center center img_tools - top + top @@ -6559,10 +6338,10 @@ Date - 90 - 56 + 90 + 56 True - False + False False @@ -6572,10 +6351,10 @@ Date - 90 - 56 + 90 + 56 True - False + False False @@ -6587,13 +6366,13 @@ Date World Mode - False - 90 - 56 + False + 90 + 56 True - True - True - Switch motion mode between Joint and World mode + True + True + Switch motion mode between Joint and World mode F12 or $ key does the same center center @@ -6607,10 +6386,10 @@ F12 or $ key does the same - 90 - 56 + 90 + 56 True - False + False False @@ -6620,10 +6399,10 @@ F12 or $ key does the same - 90 - 56 + 90 + 56 True - False + False False @@ -6633,13 +6412,13 @@ F12 or $ key does the same - False - 90 - 56 + False + 90 + 56 True - True - True - make the preview as large as possible + True + True + make the preview as large as possible center center img_fullsize_preview0_open @@ -6653,13 +6432,13 @@ F12 or $ key does the same - False - 90 - 56 + False + 90 + 56 True - True - True - Close gmoccapy / leave the program + True + True + Close gmoccapy / leave the program center center img_close @@ -6673,23 +6452,23 @@ F12 or $ key does the same - False + False True - False + False manuel - False + False - + True - False + False True @@ -6729,28 +6508,28 @@ F12 or $ key does the same True - False + False MDI 1 - False + False - + True - False + False True - False - 90 - 56 + False + 90 + 56 True - True - True - Load a new program + True + True + Load a new program center center img_open @@ -6764,20 +6543,20 @@ F12 or $ key does the same - hal_action_reload - 90 - 56 + hal_action_reload + 90 + 56 True - True - True + True + True center center - True + True True - False - view-refresh + False + view-refresh @@ -6789,13 +6568,13 @@ F12 or $ key does the same - False - 90 - 56 + False + 90 + 56 True - True - True - Run the loaded program + True + True + Run the loaded program center center img_run @@ -6809,13 +6588,13 @@ F12 or $ key does the same - hal_action_stop - 90 - 56 + hal_action_stop + 90 + 56 True - True - True - Stop the running program + True + True + Stop the running program center center img_stop @@ -6829,13 +6608,13 @@ F12 or $ key does the same - hal_tgl_pause - 90 - 56 + hal_tgl_pause + 90 + 56 True - True - True - Pause the running program + True + True + Pause the running program center center img_pause @@ -6849,13 +6628,13 @@ F12 or $ key does the same - hal_action_step - 90 - 56 + hal_action_step + 90 + 56 True - True - True - Run the loaded program step by step + True + True + Run the loaded program step by step center center img_step @@ -6868,13 +6647,13 @@ F12 or $ key does the same - False - 90 - 56 + False + 90 + 56 True - True - True - run the program from a certain line, attention, that is dangerous, because the previous lines will not checked! + True + True + run the program from a certain line, attention, that is dangerous, because the previous lines will not checked! center center img_run_from @@ -6888,13 +6667,13 @@ F12 or $ key does the same - False - 90 - 56 + False + 90 + 56 True - True - True - Machine or not the optional blocks of the program. If the button is pressed, the optional blocks will not be machined. The button will indicate this by a yellow background. + True + True + Machine or not the optional blocks of the program. If the button is pressed, the optional blocks will not be machined. The button will indicate this by a yellow background. center center img_skip_optional_inactive @@ -6908,12 +6687,12 @@ F12 or $ key does the same - False - 90 - 56 + False + 90 + 56 True - True - True + True + True center center img_fullsize_preview1_open @@ -6927,13 +6706,13 @@ F12 or $ key does the same - False - 90 - 56 + False + 90 + 56 True - True - True - Edit the loaded program + True + True + Edit the loaded program center center img_editor @@ -6953,18 +6732,18 @@ F12 or $ key does the same True - False + False Auto 2 - False + False - + True - False + False True @@ -7012,18 +6791,18 @@ F12 or $ key does the same - False + False home axes 3 - False + False - + True - False + False True @@ -7063,35 +6842,35 @@ F12 or $ key does the same True - False + False touch_off 4 - False + False - + True - False + False True - False - 90 - 56 + False + 90 + 56 True - True - True - delete MDI history + True + True + delete MDI history center center True - False + False Delete MDI history center @@ -7106,10 +6885,10 @@ MDI history - 90 - 56 + 90 + 56 True - False + False False @@ -7119,13 +6898,13 @@ MDI history - 90 - 56 + 90 + 56 True - False + False <b>gmoccapy 2.?.??</b> - True + True False @@ -7135,10 +6914,10 @@ MDI history - 90 - 56 + 90 + 56 True - False + False False @@ -7149,13 +6928,13 @@ MDI history Cl.-ladder - False - 90 - 56 + False + 90 + 56 True - True - True - Open classicladder + True + True + Open classicladder center center @@ -7169,13 +6948,13 @@ MDI history Hal-Scope - False - 90 - 56 + False + 90 + 56 True - True - True - launch hal scope + True + True + launch hal scope center center @@ -7189,13 +6968,13 @@ MDI history Status - False - 90 - 56 + False + 90 + 56 True - True - True - launch linuxcnc status + True + True + launch linuxcnc status center center @@ -7209,13 +6988,13 @@ MDI history Hal Meter - False - 90 - 56 + False + 90 + 56 True - True - True - launch hal meter + True + True + launch hal meter center center 0.51999998092651367 @@ -7230,13 +7009,13 @@ MDI history Calibration - False - 90 - 56 + False + 90 + 56 True - True - True - launch calibration + True + True + launch calibration center center @@ -7250,13 +7029,13 @@ MDI history Halshow - False - 90 - 56 + False + 90 + 56 True - True - True - opens the show hal tool + True + True + opens the show hal tool center center @@ -7275,25 +7054,25 @@ MDI history True - False + False setup 5 - False + False - + True - False + False True - 90 - 56 + 90 + 56 True - False + False False @@ -7303,16 +7082,16 @@ MDI history - hal_action_reload - 90 - 56 + hal_action_reload + 90 + 56 True - True - True + True + True center center img_edit_menu_reload - True + True False @@ -7322,13 +7101,13 @@ MDI history - hal_action_save - 90 - 56 + hal_action_save + 90 + 56 True - True - True - save the file using the original name + True + True + save the file using the original name center center img_edit_menu_save @@ -7341,13 +7120,13 @@ MDI history - hal_action_saveas - 90 - 56 + hal_action_saveas + 90 + 56 True - False - False - save the file with a new name + False + False + save the file with a new name center center img_edit_menu_save_as @@ -7360,10 +7139,10 @@ MDI history - 90 - 56 + 90 + 56 True - False + False False @@ -7373,10 +7152,10 @@ MDI history - 90 - 56 + 90 + 56 True - False + False False @@ -7386,13 +7165,13 @@ MDI history - False - 90 - 56 + False + 90 + 56 True - False - False - clear the edit field and make a new file + False + False + clear the edit field and make a new file center center img_edit_menu_new @@ -7406,10 +7185,10 @@ MDI history - 90 - 56 + 90 + 56 True - False + False False @@ -7419,13 +7198,13 @@ MDI history - False - 90 - 56 + False + 90 + 56 True - False - False - Show or hide the virtual keyboard + False + False + Show or hide the virtual keyboard center center img_edit_menu_keyboard @@ -7439,13 +7218,13 @@ MDI history - False - 90 - 56 + False + 90 + 56 True - False - False - Go back to main button list + False + False + Go back to main button list center center img_edit_menu_close @@ -7465,28 +7244,28 @@ MDI history True - False + False edit 6 - False + False - + True - False + False Delete - False - 90 - 56 + False + 90 + 56 True - True - True - delete selected tool or tools + True + True + delete selected tool or tools center center @@ -7500,13 +7279,13 @@ MDI history Add - False - 90 - 56 + False + 90 + 56 True - True - True - add a new tool to tool table + True + True + add a new tool to tool table center center @@ -7520,13 +7299,13 @@ MDI history Reload - False - 90 - 56 + False + 90 + 56 True - True - True - reload tool table from file + True + True + reload tool table from file center center @@ -7540,13 +7319,13 @@ MDI history Apply - False - 90 - 56 + False + 90 + 56 True - True - True - apply the changes you made, G43 will be executed only if it is active G-code + True + True + apply the changes you made, G43 will be executed only if it is active G-code center center @@ -7559,20 +7338,20 @@ MDI history - False - 90 - 56 + False + 90 + 56 True - True - True - Select a tool by number + True + True + Select a tool by number center center True - False + False @@ -7584,20 +7363,20 @@ MDI history - False - 90 - 56 + False + 90 + 56 True - True - True - change tool with the command M61 Q?, no machine move will be done + True + True + change tool with the command M61 Q?, no machine move will be done center center True - False + False @@ -7609,13 +7388,13 @@ MDI history - False - 90 - 56 + False + 90 + 56 True - True - True - change tool to the selected one + True + True + change tool to the selected one center center img_toolchange @@ -7629,24 +7408,24 @@ MDI history - False - 90 - 56 + False + 90 + 56 True False - True - True - touch off the tool and set the value to the tool table + True + True + touch off the tool and set the value to the tool table center center True - False - center + False touchoff tool x + center @@ -7658,10 +7437,10 @@ tool x - 90 - 56 + 90 + 56 True - False + False False @@ -7671,23 +7450,23 @@ tool x - False - 90 - 56 + False + 90 + 56 True False - True - True - touch off the tool and set the value to the tool table + True + True + touch off the tool and set the value to the tool table center center + True + False touchoff tool z - True - False center @@ -7700,13 +7479,13 @@ tool z - False - 90 - 56 + False + 90 + 56 True - True - True - Go back to main button list + True + True + Go back to main button list center center img_back_tool @@ -7726,28 +7505,28 @@ tool z True - False + False tool 7 - False + False - + True - False + False True - False - 90 - 56 + False + 90 + 56 True - True - True - Move to your home directory + True + True + Move to your home directory center center img_home @@ -7761,13 +7540,13 @@ tool z - False - 90 - 56 + False + 90 + 56 True - True - True - Move to parent directory + True + True + Move to parent directory center center img_dir_up @@ -7781,10 +7560,10 @@ tool z - 90 - 56 + 90 + 56 True - False + False False @@ -7794,17 +7573,17 @@ tool z - False - 90 - 56 + False + 90 + 56 True - True - True - Select the previous file + True + True + Select the previous file center center img_sel_prev - top + top @@ -7815,17 +7594,17 @@ tool z - False - 90 - 56 + False + 90 + 56 True - True - True - Select the next file + True + True + Select the next file center center img_sel_next - top + top @@ -7836,17 +7615,17 @@ tool z - False - 90 - 56 + False + 90 + 56 True - True - True - Jump to user defined directory + True + True + Jump to user defined directory center center img_jump_to - top + top @@ -7857,10 +7636,10 @@ tool z - 90 - 56 + 90 + 56 True - False + False False @@ -7870,17 +7649,17 @@ tool z - False - 90 - 56 + False + 90 + 56 True - True - True - select the highlighted file and return the path + True + True + select the highlighted file and return the path center center img_select - top + top @@ -7891,10 +7670,10 @@ tool z - 90 - 56 + 90 + 56 True - False + False False @@ -7904,13 +7683,13 @@ tool z - False - 90 - 56 + False + 90 + 56 True - True - True - Close without returning a file path + True + True + Close without returning a file path center center img_back_file_load @@ -7930,18 +7709,18 @@ tool z True - False + False Load File 8 - False + False - + True - False + False True @@ -7990,19 +7769,19 @@ tool z True - False + False home joints 9 - False + False False False - end + end 1 diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py index 9b98bd6dbdd..4f477595028 100644 --- a/src/emc/usr_intf/gmoccapy/gmoccapy.py +++ b/src/emc/usr_intf/gmoccapy/gmoccapy.py @@ -76,7 +76,7 @@ def excepthook(exc_type, exc_obj, exc_tb): # constants # # gmoccapy #" -_RELEASE = " 3.4.2" +_RELEASE = " 3.4.2.1" _INCH = 0 # imperial units are active _MM = 1 # metric units are active @@ -141,6 +141,15 @@ def __init__(self, argv): padding: 3px; margin: 1px; } + /* #__jog_incr_buttons *:checked { + background: rgba(230,230,50,0.8); + } */ + #jog_incr_buttons *:active, #jog_buttons *:active { + background: rgba(230,230,50,0.8); + } + #eb_program_label, #eb_blockheight_label { + background: rgba(0,0,0,1); + } """ screen = Gdk.Screen.get_default() provider = Gtk.CssProvider() @@ -979,7 +988,8 @@ def _make_touch_button(self): btn.connect("toggled", self.on_tbtn_edit_offsets_toggled) btn.set_property("tooltip-text", _("Press to edit the offsets")) btn.set_property("name", "edit_offsets") - btn.override_background_color(Gtk.StateFlags.ACTIVE, Gdk.RGBA(1.0, 1.0, 0.0, 1.0)) + # TODO: Use CSS for this if still needed + # btn.override_background_color(Gtk.StateFlags.ACTIVE, Gdk.RGBA(1.0, 1.0, 0.0, 1.0)) self.widgets.hbtb_touch_off.pack_start(btn,True,True,0) btn.show() @@ -1133,7 +1143,6 @@ def _make_jog_increments(self): self.widgets.vbtb_jog_incr.pack_start(rbt, True, True, 0) rbt.set_property("draw_indicator", False) rbt.show() - rbt.override_background_color(Gtk.StateFlags.ACTIVE, Gdk.RGBA(1.0, 1.0, 0.0, 1.0)) self.incr_rbt_dic[rbt.get_property("name")] = rbt # the rest of the buttons are now added to the group # self.no_increments is set while setting the hal pins with self._check_len_increments @@ -1146,10 +1155,11 @@ def _make_jog_increments(self): self.widgets.vbtb_jog_incr.pack_start(rbt, True, True, 0) rbt.set_property("draw_indicator", False) rbt.show() - rbt.override_background_color(Gtk.StateFlags.ACTIVE, Gdk.RGBA(1.0, 1.0, 0.0, 1.0)) self.incr_rbt_dic[rbt.get_property("name")] = rbt self.incr_rbt_dic["rbt_0"].set_active(True) self.active_increment = "rbt_0" + # Set name to assign CSS + self.widgets.vbtb_jog_incr.set_property("name","jog_incr_buttons") def _jog_increment_changed(self, widget,): # first cancel any joints jogging @@ -1273,7 +1283,8 @@ def _make_jog_button(self): btn.connect("pressed", self._on_btn_jog_pressed, name) btn.connect("released", self._on_btn_jog_released, name) btn.set_property("tooltip-text", _("Press to jog axis {0}".format(axis))) - btn.override_background_color(Gtk.StateFlags.ACTIVE, Gdk.RGBA(1.0, 1.0, 0.0, 1.0)) + # Set name to assign CSS + self.widgets.vbx_jog_button.set_property("name", "jog_buttons") btn.set_size_request(48,48) self.jog_button_dic[name] = btn @@ -1293,7 +1304,6 @@ def _make_joints_button(self): btn.connect("pressed", self._on_btn_jog_pressed, name) btn.connect("released", self._on_btn_jog_released, name) btn.set_property("tooltip-text", _("Press to jog joint {0}".format(joint))) - btn.override_background_color(Gtk.StateFlags.ACTIVE, Gdk.RGBA(1.0, 1.0, 0.0, 1.0)) btn.set_size_request(48,48) self.joints_button_dic[name] = btn @@ -1482,11 +1492,7 @@ def _make_lathe(self): self.dialogs.warning_dialog(self, _("Very critical situation"), message, sound = False) sys.exit() else: - if len(self.axis_list) == 2: - self.widgets.tbl_jog_btn_axes.resize(3,3) - elif len(self.axis_list) < 6: - self.widgets.tbl_jog_btn_axes.resize(3,4) - else: + if not len(self.axis_list) == 2 and not len(self.axis_list) < 6: self._arrange_jog_button_by_axis() return count = 0 @@ -1520,83 +1526,72 @@ def _make_lathe(self): row = 2 count +=1 - self.widgets.tbl_jog_btn_axes.attach(self.jog_button_dic[btn_name], col, col + 1, row, row + 1) + self.widgets.grid_jog_btn_axes.attach(self.jog_button_dic[btn_name], col, row, 1, 1) self.jog_button_dic[btn_name].show() - def _arrange_dro(self): - LOG.debug("arrange DRO") - LOG.debug(len(self.dro_dic)) + def _arrange_dro(self, attach=True): + def _place_special(attach): + LOG.debug("Place DRO 3x2") + dro_order = self._get_DRO_order() + for dro, dro_name in enumerate(dro_order): + if dro < 3: + size = self.dro_size * 0.75 + if attach: + self.widgets.grid_DRO.attach(self.dro_dic[dro_name], 0, int(dro), 2, 1) + else: + size = self.dro_size * 0.65 + if attach: + if dro == 3: + self.widgets.grid_DRO.attach(self.dro_dic[dro_name], 0, int(dro), 1, 1) + else: + self.widgets.grid_DRO.attach(self.dro_dic[dro_name], 1, int(dro-1), 1, 1) + self.dro_dic[dro_name].set_property("font_size", size) + + def _place_in_table(cols, dro_size, attach): + LOG.debug("Place DRO in table") + col = 0 + row = 0 + dro_order = self._get_DRO_order() + for dro, dro_name in enumerate(dro_order): + # as a lathe might not have all Axis, we check if the key is in directory + if dro_name not in list(self.dro_dic.keys()): + continue + self.dro_dic[dro_name].set_property("font_size", dro_size) + if attach: + self.widgets.grid_DRO.attach(self.dro_dic[dro_name], col, row, 1, 1) + if cols > 1: + # calculate if we have to place in the first or the second column + if (dro % 2 == 1): + col = 0 + row +=1 + else: + col += 1 + else: + row += 1 + LOG.debug("Arrange DRO, length = {}".format(len(self.dro_dic))) + # if we have less than 4 axis, we can resize the table, as we have # enough space to display each one in it's own line - if len(self.dro_dic) < 4: - self._place_in_table(len(self.dro_dic),1, self.dro_size) + _place_in_table(1, self.dro_size, attach) # having 4 DRO we need to reduce the size, to fit the available space elif len(self.dro_dic) == 4: - self._place_in_table(len(self.dro_dic),1, self.dro_size * 0.75) + _place_in_table(1, self.dro_size * 0.75, attach) # having 5 axis we will display 3 in an one line and two DRO share # the last line, the size of the DRO must be reduced also # this is a special case so we do not use _place_in_table elif len(self.dro_dic) == 5: - self.widgets.tbl_DRO.resize(4,2) - dro_order = self._get_DRO_order() - - for dro, dro_name in enumerate(dro_order): - # as a lathe might not have all Axis, we check if the key is in directory - if dro < 3: - size = self.dro_size * 0.75 - self.widgets.tbl_DRO.attach(self.dro_dic[dro_name], - 0, 2, int(dro), int(dro + 1), ypadding = 0) - else: - size = self.dro_size * 0.65 - if dro == 3: - self.widgets.tbl_DRO.attach(self.dro_dic[dro_name], - 0, 1, int(dro), int(dro + 1), ypadding = 0) - else: - self.widgets.tbl_DRO.attach(self.dro_dic[dro_name], - 1, 2, int(dro-1), int(dro), ypadding = 0) - self.dro_dic[dro_name].set_property("font_size", size) + _place_special(attach) else: - LOG.debug("more than 5 axis ") - # check if amount of axis is an even number, adapt the needed lines - if len(self.dro_dic) % 2 == 0: - rows = len(self.dro_dic) / 2 - else: - rows = (len(self.dro_dic) + 1) / 2 - self._place_in_table(rows, 2, self.dro_size * 0.65) + LOG.debug("DRO: more than 5 axes ") + _place_in_table(2, self.dro_size * 0.65, attach) # set values to dro size adjustments self.widgets.adj_dro_size.set_value(self.dro_size) - def _place_in_table(self, rows, cols, dro_size): - LOG.debug("Place in table") - - self.widgets.tbl_DRO.resize(rows, cols) - col = 0 - row = 0 - - dro_order = self._get_DRO_order() - - for dro, dro_name in enumerate(dro_order): - # as a lathe might not have all Axis, we check if the key is in directory - if dro_name not in list(self.dro_dic.keys()): - continue - self.dro_dic[dro_name].set_property("font_size", dro_size) - - self.widgets.tbl_DRO.attach(self.dro_dic[dro_name], - col, col+1, row, row + 1, ypadding = 0) - if cols > 1: - # calculate if we have to place in the first or the second column - if (dro % 2 == 1): - col = 0 - row +=1 - else: - col += 1 - else: - row += 1 def _get_DRO_order(self): LOG.debug("get DRO order") @@ -1633,12 +1628,8 @@ def _arrange_jog_button(self): if len(self.axis_list) < 3: LOG.debug("Less than 3 axis") - # we can resize the jog_btn_table - self.widgets.tbl_jog_btn_axes.resize(3, 3) else: LOG.debug("less than 6 axis") - # we can resize the jog_btn_table - self.widgets.tbl_jog_btn_axes.resize(3, 4) count = 0 for btn_name in self.jog_button_dic: @@ -1672,8 +1663,8 @@ def _arrange_jog_button(self): else: row = 2 count +=1 - self.widgets.tbl_jog_btn_axes.attach(self.jog_button_dic[btn_name], col, col + 1, row, row + 1) - self.widgets.tbl_jog_btn_axes.show_all() + self.widgets.grid_jog_btn_axes.attach(self.jog_button_dic[btn_name], col, row, 1, 1) + self.widgets.grid_jog_btn_axes.show_all() def _arrange_jog_button_by_axis(self): LOG.debug("arrange JOG button by axis") @@ -1685,7 +1676,6 @@ def _arrange_jog_button_by_axis(self): else: rows = (len(self.dro_dic) + 1) / 2 - self.widgets.tbl_jog_btn_axes.resize(rows, cols) #print (cols,rows) col = 0 @@ -1696,11 +1686,11 @@ def _arrange_jog_button_by_axis(self): if btn_name not in list(self.jog_button_dic.keys()): continue - self.widgets.tbl_jog_btn_axes.attach(self.jog_button_dic[btn_name], - col, col+1, row, row + 1, ypadding = 0) + self.widgets.grid_jog_btn_axes.attach(self.jog_button_dic[btn_name], + col, row, 1, 1) btn_name = "{0}+".format(btn) - self.widgets.tbl_jog_btn_axes.attach(self.jog_button_dic[btn_name], - col+1, col+2, row, row + 1, ypadding = 0) + self.widgets.grid_jog_btn_axes.attach(self.jog_button_dic[btn_name], + col+1, row, 1, 1) row +=1 @@ -1708,7 +1698,7 @@ def _arrange_jog_button_by_axis(self): if row >= rows: col = 2 row = 0 - self.widgets.tbl_jog_btn_axes.show_all() + self.widgets.grid_jog_btn_axes.show_all() def _arrange_joint_button(self): LOG.debug("arrange JOINTS button") @@ -1720,7 +1710,6 @@ def _arrange_joint_button(self): else: rows = (self.stat.joints + 1) / 2 - self.widgets.tbl_jog_btn_joints.resize(rows, cols) col = 0 row = 0 @@ -1729,12 +1718,12 @@ def _arrange_joint_button(self): #print(joint) joint_name = "{0}-".format(joint) - self.widgets.tbl_jog_btn_joints.attach(self.joints_button_dic[joint_name], - col, col+1, row, row + 1, ypadding = 0) + self.widgets.grid_jog_btn_joints.attach(self.joints_button_dic[joint_name], + col, row, 1, 1) joint_name = "{0}+".format(joint) - self.widgets.tbl_jog_btn_joints.attach(self.joints_button_dic[joint_name], - col+1, col+2, row, row + 1, ypadding = 0) + self.widgets.grid_jog_btn_joints.attach(self.joints_button_dic[joint_name], + col+1, row, 1, 1) row +=1 @@ -1743,7 +1732,7 @@ def _arrange_joint_button(self): col = 2 row = 0 - self.widgets.tbl_jog_btn_joints.show_all() + self.widgets.grid_jog_btn_joints.show_all() def _init_preferences(self): # check if NO_FORCE_HOMING is used in INI @@ -2016,7 +2005,7 @@ def _init_icon_themes(self): selected_index = [icon_theme[1] for icon_theme in valid_icon_themes].index(icon_theme_preference) icon_theme_choice.set_active(selected_index) except ValueError: - LOG.warning(f"Preferred icon-theme '{icon_theme_preference}' not found. Switching to '{DEFAULT_ICON_THEME}'.") + LOG.warning(f"Preferred icon-theme '{icon_theme_preference}' not found. Switching to first valid icon theme: '{valid_icon_themes[0][1]}'.") icon_theme_choice.set_active(0) # load icon theme @@ -2057,8 +2046,9 @@ def _init_gremlin( self ): self.widgets.gremlin.set_property("mouse_btn_mode", self.prefs.getpref( "mouse_btn_mode", 4, int ) ) self.widgets.gremlin.set_property("use_commanded", not self.dro_actual) self.widgets.gremlin.set_property("enable_dro", self.enable_gremlin_dro) - self.widgets.eb_program_label.override_background_color(Gtk.StateFlags.NORMAL, Gdk.RGBA(0.0, 0.0, 0.0, 1.0)) - self.widgets.eb_blockheight_label.override_background_color(Gtk.StateFlags.NORMAL, Gdk.RGBA(0.0, 0.0, 0.0, 1.0)) + # Set name to assign CSS + self.widgets.eb_program_label.set_name("eb_program_label") + self.widgets.eb_blockheight_label.set_name("eb_blockheight_label") def _init_kinematics_type (self): LOG.debug("Kinematics type changed") @@ -4719,10 +4709,7 @@ def on_adj_dro_size_value_changed(self, widget, data=None): value = int(widget.get_value()) self.prefs.putpref("dro_size", value, int) self.dro_size = value - - for dro in self.dro_dic: - size = self.dro_size - self.dro_dic[dro].set_property("font_size", size) + self._arrange_dro(attach=False) def on_chk_hide_cursor_toggled(self, widget, data=None): self.prefs.putpref("hide_cursor", widget.get_active()) @@ -5139,7 +5126,7 @@ def on_btn_edit_clicked(self, widget, data=None): self.hbox2_position = self.widgets.hbox2.get_position() self.widgets.ntb_button.set_current_page(_BB_EDIT) self.widgets.ntb_preview.hide() - self.widgets.tbl_DRO.hide() + self.widgets.grid_DRO.hide() width = self.widgets.window1.get_size().width width -= self.widgets.vbtb_main.get_allocated_width() width -= self.widgets.box_right.get_allocated_width() @@ -5220,7 +5207,7 @@ def on_ntb_button_switch_page(self, *args): self.widgets.ntb_preview.get_current_page() == _BB_LOAD_FILE: LOG.debug("we are in special case") self.widgets.ntb_preview.show() - self.widgets.tbl_DRO.show() + self.widgets.grid_DRO.show() self.widgets.vbx_jog.set_size_request(360, -1) self.widgets.hbox2.set_position(self.hbox2_position) self.widgets.gcode_view.set_sensitive(False) diff --git a/src/emc/usr_intf/gmoccapy/icon_theme_helper.py b/src/emc/usr_intf/gmoccapy/icon_theme_helper.py index 440907081af..9fb062da024 100644 --- a/src/emc/usr_intf/gmoccapy/icon_theme_helper.py +++ b/src/emc/usr_intf/gmoccapy/icon_theme_helper.py @@ -29,7 +29,7 @@ def find_valid_icon_themes(search_paths): # path, name ] for base_dir in [e for e in search_paths if os.path.exists(e)]: - for theme_name in os.listdir(base_dir): + for theme_name in sorted(os.listdir(base_dir)): theme_dir = os.path.join(base_dir, theme_name) if os.path.exists(os.path.join(theme_dir, "index.theme")): # theme_dir acts here as unique key for the model and is not used as a dir later diff --git a/src/emc/usr_intf/gmoccapy/release_notes.txt b/src/emc/usr_intf/gmoccapy/release_notes.txt index ed3b1470a69..580f617eff1 100644 --- a/src/emc/usr_intf/gmoccapy/release_notes.txt +++ b/src/emc/usr_intf/gmoccapy/release_notes.txt @@ -1,3 +1,10 @@ +ver 3.4.2.1 + + - Replaced deprecated Gtk widgets in GladeVCP library (#2381, thanks phillc54) + - Replaced deprecated Gtk widgets inside gmoccapy (reduced warnings) + - Fixed default icon theme in lathe configs + - Fixed DRO size after change in settings (#2374, thanks zz912 for reporting) + ver 3.4.2 New: