bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix toggle workspace. Edit Russian language.

Browse Source
This commit is contained in:
camellan
2020-01-03 00:10:16 +04:00
parent 2322b8ca57
commit 0fdab86319
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
FlatCAMApp.py
View File

@@ -6625,7 +6625,7 @@ class App(QtCore.QObject):
self.plotcanvas.draw_workspace(workspace_size=self.defaults['global_workspaceT']) self.plotcanvas.draw_workspace(workspace_size=self.defaults['global_workspaceT'])
def on_workspace(self): def on_workspace(self):
if self.ui.general_defaults_form.general_gui_group.workspace_cb.get_value(): if self.ui.general_defaults_form.general_app_set_group.workspace_cb.get_value():
self.plotcanvas.draw_workspace(workspace_size=self.defaults['global_workspaceT']) self.plotcanvas.draw_workspace(workspace_size=self.defaults['global_workspaceT'])
else: else:
self.plotcanvas.delete_workspace() self.plotcanvas.delete_workspace()
@@ -6633,13 +6633,13 @@ class App(QtCore.QObject):
# self.save_defaults(silent=True) # self.save_defaults(silent=True)
def on_workspace_toggle(self): def on_workspace_toggle(self):
state = False if self.ui.general_defaults_form.general_gui_group.workspace_cb.get_value() else True state = False if self.ui.general_defaults_form.general_app_set_group.workspace_cb.get_value() else True
try: try:
self.ui.general_defaults_form.general_gui_group.workspace_cb.stateChanged.disconnect(self.on_workspace) self.ui.general_defaults_form.general_app_set_group.workspace_cb.stateChanged.disconnect(self.on_workspace)
except TypeError: except TypeError:
pass pass
self.ui.general_defaults_form.general_gui_group.workspace_cb.set_value(state) self.ui.general_defaults_form.general_app_set_group.workspace_cb.set_value(state)
self.ui.general_defaults_form.general_gui_group.workspace_cb.stateChanged.connect(self.on_workspace) self.ui.general_defaults_form.general_app_set_group.workspace_cb.stateChanged.connect(self.on_workspace)
self.on_workspace() self.on_workspace()
def on_layout(self, index=None, lay=None): def on_layout(self, index=None, lay=None):

BIN
locale/ru/LC_MESSAGES/strings.mo
View File

Binary file not shown.

4
locale/ru/LC_MESSAGES/strings.po
View File

@@ -5628,7 +5628,7 @@ msgstr "&Привязка к сетке\tG"
#: flatcamGUI/FlatCAMGUI.py:437 #: flatcamGUI/FlatCAMGUI.py:437
msgid "&Toggle Grid Lines\tALT+G" msgid "&Toggle Grid Lines\tALT+G"
msgstr "&Переключить линии сетки \tALT+G" msgstr "&Сетка вкл/откл\tALT+G"
#: flatcamGUI/FlatCAMGUI.py:439 #: flatcamGUI/FlatCAMGUI.py:439
msgid "&Toggle Axis\tSHIFT+G" msgid "&Toggle Axis\tSHIFT+G"
@@ -8711,7 +8711,7 @@ msgstr ""
#: flatcamGUI/PreferencesUI.py:369 #: flatcamGUI/PreferencesUI.py:369
msgid "Layout" msgid "Layout"
msgstr "Расположение" msgstr "Макет"
#: flatcamGUI/PreferencesUI.py:371 #: flatcamGUI/PreferencesUI.py:371
msgid "" msgid ""