giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Turkish language strings updated 

- set some policy rules back the way they were for the combo boxes in Geometry Object properties
This commit is contained in:
Marius Stanciu 2020-11-05 20:17:02 +02:00 committed by Marius Stanciu
parent a6a7e5edcc
commit 1d88fd0d4c
5 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -12,6 +12,8 @@ CHANGELOG for FlatCAM beta
- fixed the annotation plotting in the CNCJob object - fixed the annotation plotting in the CNCJob object
- created a new InputDialog widget that has the buttons and the context menu translated and replaced the old widget throughout the app - created a new InputDialog widget that has the buttons and the context menu translated and replaced the old widget throughout the app
- updated the translation strings - updated the translation strings
- Turkish language strings updated
- set some policy rules back the way they were for the combo boxes in Geometry Object properties
4.11.2020 4.11.2020

7
appGUI/GUIElements.py
View File

@ -2103,7 +2103,7 @@ class FCPlainTextAreaExtended(QtWidgets.QPlainTextEdit):
class FCComboBox(QtWidgets.QComboBox): class FCComboBox(QtWidgets.QComboBox):
def __init__(self, parent=None, callback=None): def __init__(self, parent=None, callback=None, policy=True):
super(FCComboBox, self).__init__(parent) super(FCComboBox, self).__init__(parent)
self.setFocusPolicy(QtCore.Qt.StrongFocus) self.setFocusPolicy(QtCore.Qt.StrongFocus)
self.view = self.view() self.view = self.view()
@ -2113,8 +2113,9 @@ class FCComboBox(QtWidgets.QComboBox):
self._set_last = False self._set_last = False
self._obj_type = None self._obj_type = None
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Preferred) if policy is True:
self.setSizePolicy(sizePolicy) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Preferred)
self.setSizePolicy(sizePolicy)
# the callback() will be called on customcontextmenu event and will be be passed 2 parameters: # the callback() will be called on customcontextmenu event and will be be passed 2 parameters:
# pos = mouse right click click position # pos = mouse right click click position

6
appObjects/FlatCAMGeometry.py
View File

@ -203,7 +203,7 @@ class GeometryObject(FlatCAMObj, Geometry):
self.ui.geo_tools_table.setItem(row_idx, 1, dia_item) # Diameter self.ui.geo_tools_table.setItem(row_idx, 1, dia_item) # Diameter
# -------------------- OFFSET ------------------------------------- # # -------------------- OFFSET ------------------------------------- #
offset_item = FCComboBox() offset_item = FCComboBox(policy=False)
for item in self.offset_item_options: for item in self.offset_item_options:
offset_item.addItem(item) offset_item.addItem(item)
idx = offset_item.findText(tooluid_value['offset']) idx = offset_item.findText(tooluid_value['offset'])
@ -215,7 +215,7 @@ class GeometryObject(FlatCAMObj, Geometry):
self.ui.geo_tools_table.setCellWidget(row_idx, 2, offset_item) self.ui.geo_tools_table.setCellWidget(row_idx, 2, offset_item)
# -------------------- TYPE ------------------------------------- # # -------------------- TYPE ------------------------------------- #
type_item = FCComboBox() type_item = FCComboBox(policy=False)
for item in self.type_item_options: for item in self.type_item_options:
type_item.addItem(item) type_item.addItem(item)
idx = type_item.findText(tooluid_value['type']) idx = type_item.findText(tooluid_value['type'])
@ -227,7 +227,7 @@ class GeometryObject(FlatCAMObj, Geometry):
self.ui.geo_tools_table.setCellWidget(row_idx, 3, type_item) self.ui.geo_tools_table.setCellWidget(row_idx, 3, type_item)
# -------------------- TOOL TYPE ------------------------------------- # # -------------------- TOOL TYPE ------------------------------------- #
tool_type_item = FCComboBox() tool_type_item = FCComboBox(policy=False)
for item in self.tool_type_item_options: for item in self.tool_type_item_options:
tool_type_item.addItem(item) tool_type_item.addItem(item)
idx = tool_type_item.findText(tooluid_value['tool_type']) idx = tool_type_item.findText(tooluid_value['tool_type'])

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

Binary file not shown.

20
locale/tr/LC_MESSAGES/strings.po
View File

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"POT-Creation-Date: 2020-11-05 16:42+0200\n" "POT-Creation-Date: 2020-11-05 16:42+0200\n"
"PO-Revision-Date: 2020-11-05 16:47+0200\n" "PO-Revision-Date: 2020-11-05 18:58+0300\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: tr_TR\n" "Language: tr_TR\n"
@ -1800,15 +1800,15 @@ msgstr "Seçili yuvaları deliklere dönüştürün."
#: appEditors/AppExcEditor.py:3845 #: appEditors/AppExcEditor.py:3845
msgid "Add/Delete Tool" msgid "Add/Delete Tool"
msgstr "Delik Ekle/Kaldır" msgstr "Delik veya Yuva Ekle/Kaldır"
#: appEditors/AppExcEditor.py:3847 #: appEditors/AppExcEditor.py:3847
msgid "" msgid ""
"Add/Delete a tool to the tool list\n" "Add/Delete a tool to the tool list\n"
"for this Excellon object." "for this Excellon object."
msgstr "" msgstr ""
"Bu Excellon nesnesinin Araçlar Listesine\n" "Bu Excellon nesnesinin Araçlar Tablosuna\n"
"bir delik ekleyin/silin." "bir delik veya yuva ekleyin/silin."
#: appEditors/AppExcEditor.py:3861 appEditors/AppGeoEditor.py:441 #: appEditors/AppExcEditor.py:3861 appEditors/AppGeoEditor.py:441
#: appGUI/ObjectUI.py:1080 appGUI/ObjectUI.py:1637 #: appGUI/ObjectUI.py:1080 appGUI/ObjectUI.py:1637
@ -1817,7 +1817,7 @@ msgstr ""
#: appTools/ToolCutOut.py:2077 appTools/ToolIsolation.py:3196 #: appTools/ToolCutOut.py:2077 appTools/ToolIsolation.py:3196
#: appTools/ToolNCC.py:4079 appTools/ToolNCC.py:4090 appTools/ToolPaint.py:2900 #: appTools/ToolNCC.py:4079 appTools/ToolNCC.py:4090 appTools/ToolPaint.py:2900
msgid "Tool Dia" msgid "Tool Dia"
msgstr "Uç kalınlığı" msgstr "Uç Kalınlığı"
#: appEditors/AppExcEditor.py:3863 appGUI/ObjectUI.py:1082 #: appEditors/AppExcEditor.py:3863 appGUI/ObjectUI.py:1082
#: appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py:57 #: appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py:57
@ -1847,15 +1847,15 @@ msgstr ""
#: appEditors/AppExcEditor.py:3887 #: appEditors/AppExcEditor.py:3887
msgid "Delete Tool" msgid "Delete Tool"
msgstr "Seçili Deliği Sil" msgstr "Deliği Sil"
#: appEditors/AppExcEditor.py:3890 #: appEditors/AppExcEditor.py:3890
msgid "" msgid ""
"Delete a tool in the tool list\n" "Delete a tool in the tool list\n"
"by selecting a row in the tool table." "by selecting a row in the tool table."
msgstr "" msgstr ""
"Araçlar Tablosundan bir satır \n" "Araçlar Tablosundan bir satır seçerek \n"
"seçerek delik listesindeki bir deliği silin." "delik listesindeki bir deliği silin."
#: appEditors/AppExcEditor.py:3915 #: appEditors/AppExcEditor.py:3915
msgid "Resize Tool" msgid "Resize Tool"
@ -3946,7 +3946,7 @@ msgstr "Değeri Azalt"
#: app_Main.py:4723 app_Main.py:8520 app_Main.py:8535 app_Main.py:8879 #: app_Main.py:4723 app_Main.py:8520 app_Main.py:8535 app_Main.py:8879
#: app_Main.py:8891 #: app_Main.py:8891
msgid "Ok" msgid "Ok"
msgstr "Evet" msgstr "Tamam"
#: appGUI/GUIElements.py:3768 #: appGUI/GUIElements.py:3768
msgid "" msgid ""
@ -12803,7 +12803,7 @@ msgstr ""
#: appObjects/AppObject.py:171 #: appObjects/AppObject.py:171
msgid "New object with name:" msgid "New object with name:"
msgstr "Adı olan yeni nesne:" msgstr "Yeni nesnenin adı:"
#: appObjects/AppObject.py:184 #: appObjects/AppObject.py:184
msgid "Converting units to " msgid "Converting units to "