@@ -548,7 +548,7 @@ def _startup_message(self):
548548 messages = [ _ ("<b>3.5.0 (LinuxCNC 2.10.0): Gmoccapy does no longer automatically retain G43 after a toolchange!</b>\n " \
549549 "Automatic reactivation of G43 is possible using a REMAP.\n " \
550550 "Examples can be found in the Gmoccapy sim configurations." ),
551- _ ("<b>3.5.1 (LinuxCNC 2.10.0)</b>\n • The tool table and offset page uses now the calculator for entering values by default. " \
551+ _ ("<b>3.5.1 (LinuxCNC 2.10.0)</b>\n • The tool table and offset page use now the calculator for entering values by default. " \
552552 "This can be changed in the settings/by a button.\n • A button to call the calculator was added in MDI and G-code edit modes." ),
553553 # _("<b>3.5.2 (LinuxCNC 2.10.x): </b> Example for new feature"),
554554 ]
@@ -1420,7 +1420,7 @@ def _make_macro_button(self):
14201420 size = _DEFAULT_BB_SIZE ,
14211421 image = self .widgets .img_macro_menu_calculator
14221422 )
1423- btn .set_property ("tooltip-text" , _ ("Press to display the virtual calculator" ))
1423+ btn .set_property ("tooltip-text" , _ ("Press to display the calculator" ))
14241424 btn .connect ("clicked" , self .on_btn_show_calc_clicked )
14251425 self .widgets .hbtb_MDI .pack_start (btn ,True ,True ,0 )
14261426 btn = self .widgets .btn_macro_menu_toggle_keyboard = self ._new_button_with_predefined_image (
@@ -1993,13 +1993,13 @@ def _init_tooleditor(self):
19931993 # Modify the button box at the bottom
19941994 buttonbox = self .widgets .tooledit1 .wTree .get_object ("buttonbox" )
19951995 buttonbox .set_layout (Gtk .ButtonBoxStyle .EDGE )
1996- buttonbox .set_property ("homogeneous" , True )
1996+ buttonbox .set_property ("homogeneous" , False )
19971997 # Delete button
19981998 btn_delete = self .widgets .tooledit1 .wTree .get_object ("delete" )
19991999 btn_delete .set_size_request (56 , 56 )
20002000 btn_delete .set_label ("" )
20012001 btn_delete .set_image (self .widgets .img_tool_delete )
2002- btn_delete .set_tooltip_text (_ ("Delete selected tools " ))
2002+ btn_delete .set_tooltip_text (_ ("Delete selected tool " ))
20032003 btn_delete .set_always_show_image (True )
20042004 btn_delete .disconnect_by_func (self .widgets .tooledit1 .delete )
20052005 btn_delete .connect ("clicked" ,self .on_btn_delete_tool_clicked )
@@ -2066,7 +2066,7 @@ def toolfile_stale(self):
20662066 self .widgets .tooledit1 .set_selected_tool (self .widgets .tooledit1 .toolinfo_num )
20672067
20682068 def set_selected_tool (self , toolnumber ):
2069- lbl_tool_text = _ ("Tool loaded: " ) + str (toolnumber )
2069+ lbl_tool_text = _ ("Tool loaded:" ) + " " + str (toolnumber )
20702070 self .widgets .tooledit1 .lbl_tool .set_text (lbl_tool_text )
20712071 self .tooledit1_set_selected_tool (toolnumber )
20722072
@@ -2129,7 +2129,7 @@ def on_tool_col_edit_started(self, widget, filtered_path, new_text, col):
21292129 value = self .dialogs .entry_dialog (self ,
21302130 data = model [row ][col ],
21312131 header = _ ("Enter value" ),
2132- label = _ ("Tool %s, %s:" % ( model [row ][1 ], captations [col ])) ,
2132+ label = _ ("Tool" ) + f" { model [row ][1 ]} , { captations [col ]} :"
21332133 integer = col in [1 ,2 ,15 ])
21342134 if value == "ERROR" :
21352135 LOG .debug ("conversion error" )
@@ -2450,7 +2450,7 @@ def on_offset_col_edit_started(self, widget, filtered_path, new_text, col):
24502450 offset = self .dialogs .entry_dialog (self ,
24512451 data = offsetpage .store [row ][col ],
24522452 header = _ ("Enter value for offset" ),
2453- label = _ ( "%s %s-offset:" % ( offsetpage .store [row ][0 ], AXISLIST [col ]) ),
2453+ label = f" { offsetpage .store [row ][0 ]} { AXISLIST [col ]} -" + _ ( "offset:" ),
24542454 integer = False )
24552455 if offset == "ERROR" :
24562456 LOG .debug ("conversion error" )
@@ -4615,8 +4615,8 @@ def on_spc_rapid_value_changed(self, widget, data=None):
46154615 # this are the MDI thinks we need
46164616 def on_btn_delete_clicked (self , widget , data = None ):
46174617 message = _ ("Do you really want to delete the MDI history?\n " )
4618- message += _ ("This will not delete the MDI History file, but will\n " )
4619- message += _ ( "delete the listbox entries for this session." )
4618+ message += _ ("This will not delete the MDI History file, but will"
4619+ "delete the listbox entries for this session." )
46204620 result = self .dialogs .yesno_dialog (self , message , _ ("Attention!!" ))
46214621 if result :
46224622 self .widgets .hal_mdihistory .model .clear ()
@@ -4747,7 +4747,7 @@ def on_btn_back_clicked(self, widget, data=None):
47474747 tt .uoffset , tt .voffset , tt .woffset )
47484748 if (new_offset != self .stat .tool_offset ) and ("G43" in self .active_gcodes ):
47494749 message = _ ("Offset values for the tool in the spindle\n " \
4750- "have been changed whith tool compensation (G43) active.\n \n " \
4750+ "have been changed with tool compensation (G43) active.\n \n " \
47514751 "Do you want the new values to be applied as the currently\n " \
47524752 "active tool offset?" )
47534753 result = self .dialogs .yesno_dialog (self , message , _ ("Attention!" ))
@@ -5495,7 +5495,7 @@ def on_btn_delete_tool_clicked(self, widget, data=None):
54955495 selected_tool = self .widgets .tooledit1 .get_selected_row ()
54965496 if self .stat .tool_in_spindle == selected_tool :
54975497 message = _ ("You are trying to delete the tool mounted in the spindle\n " )
5498- message += _ ("This is not allowed, please change tool prior to delete it" )
5498+ message += _ ("This is not allowed, please change tool prior to delete it. " )
54995499 self .dialogs .warning_dialog (self , _ ("Warning Tool can not be deleted!" ), message )
55005500 return
55015501 self .widgets .tooledit1 .delete_selected_row (widget )
0 commit comments