Merged marius_stanciu/flatcam_beta/Beta_8.994 into Beta

CHANGELOG.md

@@ -12,6 +12,8 @@ CHANGELOG for FlatCAM beta
 - 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
 - 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
 

appGUI/GUIElements.py

@@ -2103,7 +2103,7 @@ class FCPlainTextAreaExtended(QtWidgets.QPlainTextEdit):
 
 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)
         self.setFocusPolicy(QtCore.Qt.StrongFocus)
         self.view = self.view()
@@ -2113,8 +2113,9 @@ class FCComboBox(QtWidgets.QComboBox):
         self._set_last = False
         self._obj_type = None
 
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Preferred)
-        self.setSizePolicy(sizePolicy)
+        if policy is True:
+            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:
         # pos = mouse right click click position

appObjects/AppObject.py

@@ -168,7 +168,7 @@ class AppObject(QtCore.QObject):
             return "fail"
 
         t2 = time.time()
-        msg = "New object with name: %s. %f seconds executing initialize()." % (name, (t2 - t1))
+        msg = "%s %s. %f seconds executing initialize()." % (_("New object with name:"), name, (t2 - t1))
         log.debug(msg)
         self.app.inform_shell.emit(msg)
 

appObjects/FlatCAMGeometry.py

@@ -203,7 +203,7 @@ class GeometryObject(FlatCAMObj, Geometry):
             self.ui.geo_tools_table.setItem(row_idx, 1, dia_item)  # Diameter
 
             # -------------------- OFFSET   ------------------------------------- #
-            offset_item = FCComboBox()
+            offset_item = FCComboBox(policy=False)
             for item in self.offset_item_options:
                 offset_item.addItem(item)
             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)
 
             # -------------------- TYPE     ------------------------------------- #
-            type_item = FCComboBox()
+            type_item = FCComboBox(policy=False)
             for item in self.type_item_options:
                 type_item.addItem(item)
             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)
 
             # -------------------- TOOL TYPE ------------------------------------- #
-            tool_type_item = FCComboBox()
+            tool_type_item = FCComboBox(policy=False)
             for item in self.tool_type_item_options:
                 tool_type_item.addItem(item)
             idx = tool_type_item.findText(tooluid_value['tool_type'])

locale/de/LC_MESSAGES/strings.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-11-05 16:25+0200\n"
-"PO-Revision-Date: 2020-11-05 16:25+0200\n"
+"POT-Creation-Date: 2020-11-05 16:40+0200\n"
+"PO-Revision-Date: 2020-11-05 16:45+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de\n"
@@ -13231,6 +13231,10 @@ msgstr ""
 "Objekt ({kind}) gescheitert weil: {error} \n"
 "\n"
 
+#: appObjects/AppObject.py:171
+msgid "New object with name:"
+msgstr "Neues Objekt mit Namen:"
+
 #: appObjects/AppObject.py:184
 msgid "Converting units to "
 msgstr "Einheiten umrechnen in "

locale/en/LC_MESSAGES/strings.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-11-05 16:26+0200\n"
-"PO-Revision-Date: 2020-11-05 16:26+0200\n"
+"POT-Creation-Date: 2020-11-05 16:40+0200\n"
+"PO-Revision-Date: 2020-11-05 16:40+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: en\n"
@@ -12767,6 +12767,11 @@ msgstr ""
 "Object ({kind}) failed because: {error} \n"
 "\n"
 
+#: appObjects/AppObject.py:171
+#| msgid "New Project - Not saved"
+msgid "New object with name:"
+msgstr "New object with name:"
+
 #: appObjects/AppObject.py:184
 msgid "Converting units to "
 msgstr "Converting units to "

locale/es/LC_MESSAGES/strings.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-11-05 16:26+0200\n"
-"PO-Revision-Date: 2020-11-05 16:26+0200\n"
+"POT-Creation-Date: 2020-11-05 16:45+0200\n"
+"PO-Revision-Date: 2020-11-05 16:45+0200\n"
 "Last-Translator: Marius Stanciu - Google Translate\n"
 "Language-Team: \n"
 "Language: es\n"
@@ -12933,6 +12933,10 @@ msgid ""
 "\n"
 msgstr "El objeto ({kind}) falló porque: {error}\n"
 
+#: appObjects/AppObject.py:171
+msgid "New object with name:"
+msgstr "Nuevo objeto con nombre:"
+
 #: appObjects/AppObject.py:184
 msgid "Converting units to "
 msgstr "Convertir unidades a "

locale/fr/LC_MESSAGES/strings.po

@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-11-05 16:26+0200\n"
-"PO-Revision-Date: 2020-11-05 16:26+0200\n"
+"POT-Creation-Date: 2020-11-05 16:44+0200\n"
+"PO-Revision-Date: 2020-11-05 16:44+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr\n"
@@ -13067,6 +13067,10 @@ msgid ""
 "\n"
 msgstr "L'objet ({kind}) a échoué car: {error}\n"
 
+#: appObjects/AppObject.py:171
+msgid "New object with name:"
+msgstr "Nouvel objet avec nom:"
+
 #: appObjects/AppObject.py:184
 msgid "Converting units to "
 msgstr "Conversion de l'unités en "

locale/it/LC_MESSAGES/strings.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-11-05 16:26+0200\n"
-"PO-Revision-Date: 2020-11-05 16:26+0200\n"
+"POT-Creation-Date: 2020-11-05 16:43+0200\n"
+"PO-Revision-Date: 2020-11-05 16:44+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: it\n"
@@ -12980,6 +12980,10 @@ msgstr ""
 "Oggetto ({kind}) fallito a causa di: {error} \n"
 "\n"
 
+#: appObjects/AppObject.py:171
+msgid "New object with name:"
+msgstr "Nuovo oggetto con nome:"
+
 #: appObjects/AppObject.py:184
 msgid "Converting units to "
 msgstr "Converti unità in "

locale/pt_BR/LC_MESSAGES/strings.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-11-05 16:26+0200\n"
-"PO-Revision-Date: 2020-11-05 16:26+0200\n"
+"POT-Creation-Date: 2020-11-05 16:41+0200\n"
+"PO-Revision-Date: 2020-11-05 16:43+0200\n"
 "Last-Translator: Carlos Stein <carlos.stein@gmail.com>\n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -12799,6 +12799,10 @@ msgstr ""
 "Objeto ({kind}) falhou porque: {error} \n"
 "\n"
 
+#: appObjects/AppObject.py:171
+msgid "New object with name:"
+msgstr "Novo objeto com nome:"
+
 #: appObjects/AppObject.py:184
 msgid "Converting units to "
 msgstr "Convertendo unidades para "

locale/ro/LC_MESSAGES/strings.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-11-05 16:26+0200\n"
-"PO-Revision-Date: 2020-11-05 16:32+0200\n"
+"POT-Creation-Date: 2020-11-05 16:41+0200\n"
+"PO-Revision-Date: 2020-11-05 16:43+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ro\n"
@@ -12937,6 +12937,10 @@ msgstr ""
 "Obiectul ({kind}) a eșuat din cauza: {error} \n"
 "\n"
 
+#: appObjects/AppObject.py:171
+msgid "New object with name:"
+msgstr "Obiect nou cu numele:"
+
 #: appObjects/AppObject.py:184
 msgid "Converting units to "
 msgstr "Se convertesc unitătile la "

locale/ru/LC_MESSAGES/strings.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-11-05 16:27+0200\n"
+"POT-Creation-Date: 2020-11-05 16:41+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Andrey Kultyapov <camellan@yandex.ru>\n"
 "Language-Team: \n"
@@ -12861,6 +12861,10 @@ msgstr ""
 "Объект ({kind}) не выполнен, потому что: {error} \n"
 "\n"
 
+#: appObjects/AppObject.py:171
+msgid "New object with name:"
+msgstr "Новый объект с именем:"
+
 #: appObjects/AppObject.py:184
 msgid "Converting units to "
 msgstr "Конвертирование единиц в "

locale/tr/LC_MESSAGES/strings.po

@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-11-05 16:27+0200\n"
-"PO-Revision-Date: 2020-11-05 16:30+0200\n"
+"POT-Creation-Date: 2020-11-05 16:42+0200\n"
+"PO-Revision-Date: 2020-11-05 18:58+0300\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: tr_TR\n"
@@ -1800,15 +1800,15 @@ msgstr "Seçili yuvaları deliklere dönüştürün."
 
 #: appEditors/AppExcEditor.py:3845
 msgid "Add/Delete Tool"
-msgstr "Delik Ekle/Kaldır"
+msgstr "Delik veya Yuva Ekle/Kaldır"
 
 #: appEditors/AppExcEditor.py:3847
 msgid ""
 "Add/Delete a tool to the tool list\n"
 "for this Excellon object."
 msgstr ""
-"Bu Excellon nesnesinin Araçlar Listesine\n"
-"bir delik ekleyin/silin."
+"Bu Excellon nesnesinin Araçlar Tablosuna\n"
+"bir delik veya yuva ekleyin/silin."
 
 #: appEditors/AppExcEditor.py:3861 appEditors/AppGeoEditor.py:441
 #: appGUI/ObjectUI.py:1080 appGUI/ObjectUI.py:1637
@@ -1817,7 +1817,7 @@ msgstr ""
 #: appTools/ToolCutOut.py:2077 appTools/ToolIsolation.py:3196
 #: appTools/ToolNCC.py:4079 appTools/ToolNCC.py:4090 appTools/ToolPaint.py:2900
 msgid "Tool Dia"
-msgstr "Uç kalınlığı"
+msgstr "Uç Kalınlığı"
 
 #: appEditors/AppExcEditor.py:3863 appGUI/ObjectUI.py:1082
 #: appGUI/preferences/excellon/ExcellonEditorPrefGroupUI.py:57
@@ -1847,15 +1847,15 @@ msgstr ""
 
 #: appEditors/AppExcEditor.py:3887
 msgid "Delete Tool"
-msgstr "Seçili Deliği Sil"
+msgstr "Deliği Sil"
 
 #: appEditors/AppExcEditor.py:3890
 msgid ""
 "Delete a tool in the tool list\n"
 "by selecting a row in the tool table."
 msgstr ""
-"Araçlar Tablosundan bir satır \n"
-"seçerek delik listesindeki bir deliği silin."
+"Araçlar Tablosundan bir satır seçerek \n"
+"delik listesindeki bir deliği silin."
 
 #: appEditors/AppExcEditor.py:3915
 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:8891
 msgid "Ok"
-msgstr "Evet"
+msgstr "Tamam"
 
 #: appGUI/GUIElements.py:3768
 msgid ""
@@ -12801,6 +12801,10 @@ msgstr ""
 "Nesne ({kind}) başarısız oldu çünkü: {error} \n"
 "\n"
 
+#: appObjects/AppObject.py:171
+msgid "New object with name:"
+msgstr "Yeni nesnenin adı:"
+
 #: appObjects/AppObject.py:184
 msgid "Converting units to "
 msgstr "Birimler şuna dönüştürülüyor "

locale_template/strings.pot

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2020-11-05 16:25+0200\n"
+"POT-Creation-Date: 2020-11-05 16:46+0200\n"
 "PO-Revision-Date: 2019-03-25 15:08+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -11060,6 +11060,10 @@ msgid ""
 "\n"
 msgstr ""
 
+#: appObjects/AppObject.py:171
+msgid "New object with name:"
+msgstr ""
+
 #: appObjects/AppObject.py:184
 msgid "Converting units to "
 msgstr ""