From 810f34ea11dca01ee833e7c625f87feac39ae2c1 Mon Sep 17 00:00:00 2001 From: David Carter Date: Mon, 15 Jul 2024 15:11:11 +0000 Subject: [PATCH] Material: Update translation paths Correct issue where the translations were being generated from the wrong source. All translatable files were moved to the MatGui library. --- src/Mod/Material/CMakeLists.txt | 28 +- src/Mod/Material/Gui/CMakeLists.txt | 8 +- src/Mod/Material/Gui/Resources/Material.qrc | 1 + .../Gui/Resources/translations/Material.ts | 915 +++++++++++- .../Resources/translations/Material_be.ts | 0 .../Resources/translations/Material_ca.ts | 0 .../Resources/translations/Material_cs.ts | 0 .../Resources/translations/Material_da.ts | 0 .../Resources/translations/Material_de.ts | 0 .../Resources/translations/Material_el.ts | 0 .../Resources/translations/Material_es-AR.ts | 0 .../Resources/translations/Material_es-ES.ts | 0 .../Resources/translations/Material_eu.ts | 0 .../Resources/translations/Material_fi.ts | 0 .../Resources/translations/Material_fr.ts | 0 .../Resources/translations/Material_hr.ts | 0 .../Resources/translations/Material_hu.ts | 0 .../Resources/translations/Material_id.ts | 0 .../Resources/translations/Material_it.ts | 0 .../Resources/translations/Material_ja.ts | 0 .../Resources/translations/Material_ka.ts | 0 .../Resources/translations/Material_ko.ts | 0 .../Resources/translations/Material_nl.ts | 0 .../Resources/translations/Material_pl.ts | 0 .../Resources/translations/Material_pt-BR.ts | 0 .../Resources/translations/Material_pt-PT.ts | 0 .../Resources/translations/Material_ro.ts | 0 .../Resources/translations/Material_ru.ts | 0 .../Resources/translations/Material_sl.ts | 0 .../Resources/translations/Material_sr-CS.ts | 0 .../Resources/translations/Material_sr.ts | 0 .../Resources/translations/Material_sv-SE.ts | 0 .../Resources/translations/Material_tr.ts | 0 .../Resources/translations/Material_uk.ts | 0 .../Resources/translations/Material_val-ES.ts | 0 .../Resources/translations/Material_zh-CN.ts | 0 .../Resources/translations/Material_zh-TW.ts | 0 .../Resources/ui/materials-editor.ui | 0 src/Mod/Material/Resources/Material.qrc | 7 - .../Resources/icons/preview-rendered.svg | 65 - .../Resources/icons/preview-vector.svg | 157 -- .../Resources/translations/Material.ts | 1259 ----------------- src/Tools/updatecrowdin.py | 4 +- src/Tools/updatets.py | 2 +- 44 files changed, 909 insertions(+), 1537 deletions(-) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_be.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_ca.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_cs.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_da.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_de.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_el.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_es-AR.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_es-ES.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_eu.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_fi.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_fr.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_hr.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_hu.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_id.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_it.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_ja.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_ka.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_ko.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_nl.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_pl.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_pt-BR.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_pt-PT.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_ro.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_ru.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_sl.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_sr-CS.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_sr.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_sv-SE.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_tr.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_uk.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_val-ES.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_zh-CN.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/translations/Material_zh-TW.ts (100%) rename src/Mod/Material/{ => Gui}/Resources/ui/materials-editor.ui (100%) delete mode 100644 src/Mod/Material/Resources/Material.qrc delete mode 100644 src/Mod/Material/Resources/icons/preview-rendered.svg delete mode 100644 src/Mod/Material/Resources/icons/preview-vector.svg delete mode 100644 src/Mod/Material/Resources/translations/Material.ts diff --git a/src/Mod/Material/CMakeLists.txt b/src/Mod/Material/CMakeLists.txt index 0130bd8fec..d4cfc8f458 100644 --- a/src/Mod/Material/CMakeLists.txt +++ b/src/Mod/Material/CMakeLists.txt @@ -4,10 +4,6 @@ if(BUILD_GUI) add_subdirectory(Gui) endif(BUILD_GUI) -IF(BUILD_GUI) - PYSIDE_WRAP_RC(Material_QRC_SRCS Resources/Material.qrc) -ENDIF(BUILD_GUI) - SET(MaterialScripts_Files Init.py InitGui.py @@ -17,20 +13,12 @@ SET(MaterialScripts_Files Templatematerial.yml ) -SET(Material_Ui_Files - Resources/ui/materials-editor.ui -) - # SOURCE_GROUP("MaterialScripts" FILES ${MaterialScripts_Files}) SET(MaterialTools_Files materialtools/__init__.py materialtools/cardutils.py materialtools/MaterialModels.py ) -SET(Material_Icon_Files - Resources/icons/preview-rendered.svg - Resources/icons/preview-vector.svg -) # collect all the material cards: SET(MaterialLib_Files @@ -335,38 +323,26 @@ fc_target_copy_resource(MaterialPythonTestData ${MaterialPythonTestData_Files}) ADD_CUSTOM_TARGET(MaterialScripts ALL - SOURCES ${MaterialScripts_Files} ${Material_Ui_Files} ${Material_QRC_SRCS} + SOURCES ${MaterialScripts_Files} ${Material_QRC_SRCS} ) fc_target_copy_resource(MaterialScripts ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/Mod/Material - ${MaterialScripts_Files} - ${Material_Ui_Files}) + ${MaterialScripts_Files}) INSTALL(FILES ${MaterialScripts_Files} DESTINATION Mod/Material) -INSTALL(FILES ${Material_Ui_Files} DESTINATION Mod/Material/Resources/ui) ADD_CUSTOM_TARGET(MaterialToolsLib ALL SOURCES ${MaterialTools_Files} ) -ADD_CUSTOM_TARGET(MaterialIconsLib ALL - SOURCES ${Material_Icon_Files} -) - fc_target_copy_resource(MaterialToolsLib ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/Mod/Material ${MaterialTools_Files}) -fc_target_copy_resource(MaterialIconsLib - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/Mod/Material - ${Material_Icon_Files}) - INSTALL(FILES ${MaterialTools_Files} DESTINATION Mod/Material/materialtools) -INSTALL(FILES ${Material_Icon_Files} DESTINATION Mod/Material/Resources/icons) ADD_CUSTOM_TARGET(MaterialLib ALL SOURCES ${MaterialLib_Files} diff --git a/src/Mod/Material/Gui/CMakeLists.txt b/src/Mod/Material/Gui/CMakeLists.txt index 06761b3143..c5a8524ce1 100644 --- a/src/Mod/Material/Gui/CMakeLists.txt +++ b/src/Mod/Material/Gui/CMakeLists.txt @@ -154,7 +154,11 @@ SET(MatGuiImages Resources/images/default_image.png ) -add_library(MatGui SHARED ${MatGui_SRCS} ${MatGuiIcon_SVG} ${MatGuiImages}) +SET(Material_Ui_Files + Resources/ui/materials-editor.ui +) + +add_library(MatGui SHARED ${MatGui_SRCS} ${MatGuiIcon_SVG} ${MatGuiImages} ${Material_Ui_Files}) target_link_libraries(MatGui ${MatGui_LIBS}) if (FREECAD_WARN_ERROR) target_compile_warn_error(MatGui) @@ -165,7 +169,9 @@ SET_PYTHON_PREFIX_SUFFIX(MatGui) fc_copy_sources(MatGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Material" ${MatGuiIcon_SVG}) fc_copy_sources(MatGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Material" ${MatGuiImages}) +fc_copy_sources(MatGui "${CMAKE_BINARY_DIR}/Mod/Material" ${Material_Ui_Files}) INSTALL(TARGETS MatGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) INSTALL(FILES ${MatGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Material/Resources/icons") INSTALL(FILES ${MatGuiImages} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Material/Resources/images") +INSTALL(FILES ${Material_Ui_Files} DESTINATION "${CMAKE_BINARY_DIR}/Mod/Material/Resources/ui") diff --git a/src/Mod/Material/Gui/Resources/Material.qrc b/src/Mod/Material/Gui/Resources/Material.qrc index 66b472e7cc..3e9650798d 100644 --- a/src/Mod/Material/Gui/Resources/Material.qrc +++ b/src/Mod/Material/Gui/Resources/Material.qrc @@ -9,5 +9,6 @@ icons/preview-vector.svg icons/table.svg images/default_image.png + ui/materials-editor.ui diff --git a/src/Mod/Material/Gui/Resources/translations/Material.ts b/src/Mod/Material/Gui/Resources/translations/Material.ts index 181e028255..17cdb171c5 100644 --- a/src/Mod/Material/Gui/Resources/translations/Material.ts +++ b/src/Mod/Material/Gui/Resources/translations/Material.ts @@ -1,84 +1,961 @@ + + CmdInspectAppearance + + Inspect Appearance... + + + + Inspect the appearance properties of the selected object + + + + + CmdInspectMaterial + + Inspect Material... + + + + Inspect the material properties of the selected object + + + + + CmdMaterialsEdit + + Material + + + + Edit... + + + + Edit material properties + + + + + MatGui::Array2D + + 2D Array + + + + Delete row + + + + Context menu + + + + + MatGui::Array3D + + 3D Array + + + + Delete row + + + + Context menu + + + + Confirm Delete + + + + Are you sure you want to delete the row? + + + + Removing this will also remove all 2D contents. + + + + + MatGui::ArrayDelegate + + False + + + + True + + + + + MatGui::BaseDelegate + + False + + + + True + + + + + MatGui::DlgDisplayProperties + + Display properties + + + + Viewing mode + + + + Document window: + + + + Plot mode: + + + + Display + + + + Point size: + + + + Line width: + + + + Transparency: + + + + Line transparency: + + + + Material + + + + Color plot: + + + + Custom appearance: + + + + Point color: + + + + Line color: + + + + + MatGui::DlgDisplayPropertiesImp + + Basic Appearance + + + + Texture Appearance + + + + All Materials + + + + + MatGui::DlgInspectAppearance + + Form + + + + Document + + + + Document Name + + + + Name of the active document + + + + Label / Internal Name + + + + Sub.Shape / Type + + + + Shape.TypeID / TypeID + + + + Appearance + + + + Tab 1 + + + + Tab 2 + + + + Diffuse Color + + + + Ambient Color + + + + Emissive Color + + + + Specular Color + + + + Shininess + + + + + MatGui::DlgInspectMaterial + + Form + + + + Document + + + + Document Name + + + + Name of the active document + + + + Label / Internal Name + + + + Sub.Shape / Type + + + + Shape.TypeID / TypeID + + + + Material + + + + Copy to clipboard + + + + Document: + + + + Label: + + + + Internal Name: + + + + Type: + + + + TypeID: + + + + Name: + + + + None + + + + UUID: + + + + Library: + + + + Library Directory: + + + + Sub Directory: + + + + Inherits: + + + + Model UUID: + + + + Has value: + + + + No + + + + Yes + + + + Appearance Models: + + + + Physical Models: + + + + Appearance Properties: + + + + Physical Properties: + + + + + MatGui::DlgMaterial + + Material + + + + + MatGui::DlgSettingsDefaultMaterial + + Default Material + + + + Physical + + + + + MatGui::DlgSettingsMaterial + + General + + + + Card resources + + + + The cards built-in to FreeCAD will be listed as available. + + + + Use built-in materials + + + + Use materials added by external workbenches. + + + + Use materials from external workbenches + + + + Also cards from FreeCAD's preferences directory will be listed as available. + + + + Use materials from Materials directory in user's FreeCAD preference directory + + + + Also material cards also from the specified directory +will be listed as available. + + + + Use materials from user defined directory + + + + User directory + + + + Card sorting and duplicates + + + + Duplicate cards will be deleted from the displayed material card list. + + + + Delete card duplicates + + + + Material cards appear sorted by their resources (locations). +If unchecked, they will be sorted by their name. + + + + Sort by resources + + + + Material Selector + + + + Show favorites + + + + Show recent + + + + Show empty libraries + + + + Show empty folders + + + + Show legacy files + + + + Material Editor + + + + + MatGui::ImageEdit + + Image + + + + Thumbnail + + + + File... + + + + Height + + + + Width + + + + Select an image + + + + Image files (*.jpg *.jpeg *.png *.bmp);;All files (*) + + + + Image files (*.svg);;All files (*) + + + + + MatGui::ListEdit + + List Edit + + + + Delete Row + + + + + MatGui::MaterialDelegate + + False + + + + True + + + + + MatGui::MaterialSave + + Save Material + + + + Library: + + + + New Folder + + + + Filename: + + + + Save as Inherited + + + + Delete + + + + Are you sure you want to save over '%1'? + + + + Saving over the original file may cause other documents to break. This is not recommended. + + + + Confirm Save As New Material + + + + Save as new material + + + + This material already exists in this library. Would you like to save as a new material? + + + + Confirm Save As Copy + + + + Save as Copy + + + + Saving a copy is not recommended as it can break other documents. We recommend you save as a new material. + + + + Save Copy + + + + Save As New + + + + Context menu + + + + + MatGui::MaterialTreeWidget + + Launch editor + + + + Favorites + + + + Recent + + + + + MatGui::MaterialsEditor + + Materials + + + + General + + + + Parent + + + + Tags + + + + Source URL + + + + Description + + + + Name + + + + Author + + + + Source Reference + + + + License + + + + &New + + + + Inherit New + + + + Add to favorites + + + + Physical + + + + Add physical model + + + + Delete physical model + + + + Appearance + + + + Add appearance model + + + + Delete appearance model + + + + Unnamed + + + + Old Format Material + + + + This file is in the old material card format. + + + + This card uses the old format and must be saved before use + + + + Property + + + + Value + + + + Type + + + + Favorites + + + + Recent + + + + Units + + + + Context menu + + + + Inherit from + + + + Inherit new material + + + + + MatGui::ModelSelect + + Material Models + + + + General + + + + URL + + + + Description + + + + DOI + + + + Name + + + + Add to favorites + + + + Properties + + + + Favorites + + + + Recent + + + + Inherited + + + + Property + + + + Units + + + + Appearance + + + + + MatGui::TextEdit + + Text Edit + + + MaterialEditor - Material Editor - Material card - Opens the Product URL of this material in an external browser - Existing material cards - Opens an existing material card - Open... - Saves this material as a card - Save as... - Material parameter - Add / remove parameter - Add property - Delete property - Material + QDockWidget - - Product URL + Display properties - - UserDefined + Material + + + + + QObject + + Material workbench - - Name + Material + + + + Confirm Overwrite + + + + No writeable library + + + + Are you sure you want to delete '%1'? + + + + Removing this will also remove all contents. + + + + You must save the material before using it. + + + + Unsaved Material + + + + Do you want to save your changes to the material before closing? + + + + If you don't save, your changes will be lost. + + + + Confirm Delete + + + + Are you sure you want to delete the row? + + + + + StdCmdSetAppearance + + Appearance... + + + + Sets the display properties of the selected object + + + + + StdCmdSetMaterial + + Material... + + + + Sets the material of the selected object + + + + + Workbench + + &Materials + + + + Materials diff --git a/src/Mod/Material/Resources/translations/Material_be.ts b/src/Mod/Material/Gui/Resources/translations/Material_be.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_be.ts rename to src/Mod/Material/Gui/Resources/translations/Material_be.ts diff --git a/src/Mod/Material/Resources/translations/Material_ca.ts b/src/Mod/Material/Gui/Resources/translations/Material_ca.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_ca.ts rename to src/Mod/Material/Gui/Resources/translations/Material_ca.ts diff --git a/src/Mod/Material/Resources/translations/Material_cs.ts b/src/Mod/Material/Gui/Resources/translations/Material_cs.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_cs.ts rename to src/Mod/Material/Gui/Resources/translations/Material_cs.ts diff --git a/src/Mod/Material/Resources/translations/Material_da.ts b/src/Mod/Material/Gui/Resources/translations/Material_da.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_da.ts rename to src/Mod/Material/Gui/Resources/translations/Material_da.ts diff --git a/src/Mod/Material/Resources/translations/Material_de.ts b/src/Mod/Material/Gui/Resources/translations/Material_de.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_de.ts rename to src/Mod/Material/Gui/Resources/translations/Material_de.ts diff --git a/src/Mod/Material/Resources/translations/Material_el.ts b/src/Mod/Material/Gui/Resources/translations/Material_el.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_el.ts rename to src/Mod/Material/Gui/Resources/translations/Material_el.ts diff --git a/src/Mod/Material/Resources/translations/Material_es-AR.ts b/src/Mod/Material/Gui/Resources/translations/Material_es-AR.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_es-AR.ts rename to src/Mod/Material/Gui/Resources/translations/Material_es-AR.ts diff --git a/src/Mod/Material/Resources/translations/Material_es-ES.ts b/src/Mod/Material/Gui/Resources/translations/Material_es-ES.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_es-ES.ts rename to src/Mod/Material/Gui/Resources/translations/Material_es-ES.ts diff --git a/src/Mod/Material/Resources/translations/Material_eu.ts b/src/Mod/Material/Gui/Resources/translations/Material_eu.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_eu.ts rename to src/Mod/Material/Gui/Resources/translations/Material_eu.ts diff --git a/src/Mod/Material/Resources/translations/Material_fi.ts b/src/Mod/Material/Gui/Resources/translations/Material_fi.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_fi.ts rename to src/Mod/Material/Gui/Resources/translations/Material_fi.ts diff --git a/src/Mod/Material/Resources/translations/Material_fr.ts b/src/Mod/Material/Gui/Resources/translations/Material_fr.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_fr.ts rename to src/Mod/Material/Gui/Resources/translations/Material_fr.ts diff --git a/src/Mod/Material/Resources/translations/Material_hr.ts b/src/Mod/Material/Gui/Resources/translations/Material_hr.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_hr.ts rename to src/Mod/Material/Gui/Resources/translations/Material_hr.ts diff --git a/src/Mod/Material/Resources/translations/Material_hu.ts b/src/Mod/Material/Gui/Resources/translations/Material_hu.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_hu.ts rename to src/Mod/Material/Gui/Resources/translations/Material_hu.ts diff --git a/src/Mod/Material/Resources/translations/Material_id.ts b/src/Mod/Material/Gui/Resources/translations/Material_id.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_id.ts rename to src/Mod/Material/Gui/Resources/translations/Material_id.ts diff --git a/src/Mod/Material/Resources/translations/Material_it.ts b/src/Mod/Material/Gui/Resources/translations/Material_it.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_it.ts rename to src/Mod/Material/Gui/Resources/translations/Material_it.ts diff --git a/src/Mod/Material/Resources/translations/Material_ja.ts b/src/Mod/Material/Gui/Resources/translations/Material_ja.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_ja.ts rename to src/Mod/Material/Gui/Resources/translations/Material_ja.ts diff --git a/src/Mod/Material/Resources/translations/Material_ka.ts b/src/Mod/Material/Gui/Resources/translations/Material_ka.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_ka.ts rename to src/Mod/Material/Gui/Resources/translations/Material_ka.ts diff --git a/src/Mod/Material/Resources/translations/Material_ko.ts b/src/Mod/Material/Gui/Resources/translations/Material_ko.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_ko.ts rename to src/Mod/Material/Gui/Resources/translations/Material_ko.ts diff --git a/src/Mod/Material/Resources/translations/Material_nl.ts b/src/Mod/Material/Gui/Resources/translations/Material_nl.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_nl.ts rename to src/Mod/Material/Gui/Resources/translations/Material_nl.ts diff --git a/src/Mod/Material/Resources/translations/Material_pl.ts b/src/Mod/Material/Gui/Resources/translations/Material_pl.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_pl.ts rename to src/Mod/Material/Gui/Resources/translations/Material_pl.ts diff --git a/src/Mod/Material/Resources/translations/Material_pt-BR.ts b/src/Mod/Material/Gui/Resources/translations/Material_pt-BR.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_pt-BR.ts rename to src/Mod/Material/Gui/Resources/translations/Material_pt-BR.ts diff --git a/src/Mod/Material/Resources/translations/Material_pt-PT.ts b/src/Mod/Material/Gui/Resources/translations/Material_pt-PT.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_pt-PT.ts rename to src/Mod/Material/Gui/Resources/translations/Material_pt-PT.ts diff --git a/src/Mod/Material/Resources/translations/Material_ro.ts b/src/Mod/Material/Gui/Resources/translations/Material_ro.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_ro.ts rename to src/Mod/Material/Gui/Resources/translations/Material_ro.ts diff --git a/src/Mod/Material/Resources/translations/Material_ru.ts b/src/Mod/Material/Gui/Resources/translations/Material_ru.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_ru.ts rename to src/Mod/Material/Gui/Resources/translations/Material_ru.ts diff --git a/src/Mod/Material/Resources/translations/Material_sl.ts b/src/Mod/Material/Gui/Resources/translations/Material_sl.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_sl.ts rename to src/Mod/Material/Gui/Resources/translations/Material_sl.ts diff --git a/src/Mod/Material/Resources/translations/Material_sr-CS.ts b/src/Mod/Material/Gui/Resources/translations/Material_sr-CS.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_sr-CS.ts rename to src/Mod/Material/Gui/Resources/translations/Material_sr-CS.ts diff --git a/src/Mod/Material/Resources/translations/Material_sr.ts b/src/Mod/Material/Gui/Resources/translations/Material_sr.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_sr.ts rename to src/Mod/Material/Gui/Resources/translations/Material_sr.ts diff --git a/src/Mod/Material/Resources/translations/Material_sv-SE.ts b/src/Mod/Material/Gui/Resources/translations/Material_sv-SE.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_sv-SE.ts rename to src/Mod/Material/Gui/Resources/translations/Material_sv-SE.ts diff --git a/src/Mod/Material/Resources/translations/Material_tr.ts b/src/Mod/Material/Gui/Resources/translations/Material_tr.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_tr.ts rename to src/Mod/Material/Gui/Resources/translations/Material_tr.ts diff --git a/src/Mod/Material/Resources/translations/Material_uk.ts b/src/Mod/Material/Gui/Resources/translations/Material_uk.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_uk.ts rename to src/Mod/Material/Gui/Resources/translations/Material_uk.ts diff --git a/src/Mod/Material/Resources/translations/Material_val-ES.ts b/src/Mod/Material/Gui/Resources/translations/Material_val-ES.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_val-ES.ts rename to src/Mod/Material/Gui/Resources/translations/Material_val-ES.ts diff --git a/src/Mod/Material/Resources/translations/Material_zh-CN.ts b/src/Mod/Material/Gui/Resources/translations/Material_zh-CN.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_zh-CN.ts rename to src/Mod/Material/Gui/Resources/translations/Material_zh-CN.ts diff --git a/src/Mod/Material/Resources/translations/Material_zh-TW.ts b/src/Mod/Material/Gui/Resources/translations/Material_zh-TW.ts similarity index 100% rename from src/Mod/Material/Resources/translations/Material_zh-TW.ts rename to src/Mod/Material/Gui/Resources/translations/Material_zh-TW.ts diff --git a/src/Mod/Material/Resources/ui/materials-editor.ui b/src/Mod/Material/Gui/Resources/ui/materials-editor.ui similarity index 100% rename from src/Mod/Material/Resources/ui/materials-editor.ui rename to src/Mod/Material/Gui/Resources/ui/materials-editor.ui diff --git a/src/Mod/Material/Resources/Material.qrc b/src/Mod/Material/Resources/Material.qrc deleted file mode 100644 index f5f3ad827c..0000000000 --- a/src/Mod/Material/Resources/Material.qrc +++ /dev/null @@ -1,7 +0,0 @@ - - - icons/preview-rendered.svg - icons/preview-vector.svg - ui/materials-editor.ui - - diff --git a/src/Mod/Material/Resources/icons/preview-rendered.svg b/src/Mod/Material/Resources/icons/preview-rendered.svg deleted file mode 100644 index 212e5a2775..0000000000 --- a/src/Mod/Material/Resources/icons/preview-rendered.svg +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - $committer - - - preview-rendered - 2013-11-19 - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Material/Resources/icons/preview-rendered.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - diff --git a/src/Mod/Material/Resources/icons/preview-vector.svg b/src/Mod/Material/Resources/icons/preview-vector.svg deleted file mode 100644 index 34810f0747..0000000000 --- a/src/Mod/Material/Resources/icons/preview-vector.svg +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - $committer - - - preview-vector - 2013-11-19 - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Material/Resources/icons/preview-vector.svg - - - FreeCAD LGPL2+ - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - - - - - - - - - - - - - diff --git a/src/Mod/Material/Resources/translations/Material.ts b/src/Mod/Material/Resources/translations/Material.ts deleted file mode 100644 index b690d3213a..0000000000 --- a/src/Mod/Material/Resources/translations/Material.ts +++ /dev/null @@ -1,1259 +0,0 @@ - - - - - MaterialEditor - - - Material Editor - - - - - Material card - - - - - Opens the Product URL of this material in an external browser - - - - - Existing material cards - - - - - Opens an existing material card - - - - - Open... - - - - - Saves this material as a card - - - - - Save as... - - - - - Material parameter - - - - - Add / remove parameter - - - - - Add property - - - - - Delete property - - - - - Material - - - - The document has been modified. - - - - - - Do you want to save your changes? - - - - - Product URL - - - - - UserDefined - - - - - Name - - - - - MatGui::Array2D - - - 2D Array - - - - - Delete row - - - - - Context menu - - - - - MatGui::Array3D - - - 3D Array - - - - - - Delete row - - - - - - Context menu - - - - - - Confirm Delete - - - - - - Are you sure you want to delete the row? - - - - - Removing this will also remove all 2D contents. - - - - - MatGui::DlgSettingsMaterial - - - General - - - - - Card resources - - - - - The cards built-in to FreeCAD will be listed as available. - - - - - Use built-in materials - - - - - Use materials added by external workbenches. - - - - - Use materials from external workbenches - - - - - Also cards from FreeCAD's preferences directory will be listed as available. - - - - - Use materials from Materials directory in user's FreeCAD preference directory - - - - - Also material cards also from the specified directory -will be listed as available. - - - - - Use materials from user defined directory - - - - - User directory - - - - - Card sorting and duplicates - - - - - Duplicate cards will be deleted from the displayed material card list. - - - - - Delete card duplicates - - - - - Material cards appear sorted by their resources (locations). -If unchecked, they will be sorted by their name. - - - - - Sort by resources - - - - - Material Editor - - - - - Material Selector - - - - - - Show favorites - - - - - - Show recent - - - - - - Show empty libraries - - - - - - Show empty folders - - - - - - Show legacy files - - - - - MatGui::MaterialSave - - - Save Material - - - - - Library: - - - - - - - New Folder - - - - - Filename: - - - - - Save as Inherited - - - - - Delete - - - - - Are you sure you want to save over '%1'? - - - - - Saving over the original file may cause other documents to break. This is not recommended. - - - - - Confirm Save As New Material - - - - - Save as new material - - - - - This material already exists in this library. Would you like to save as a new material? - - - - - Confirm Save As Copy - - - - - Save as Copy - - - - - Saving a copy is not recommended as it can break other documents. We recommend you save as a new material. - - - - - Save Copy - - - - - Save As New - - - - - Context menu - - - - - MatGui::MaterialsEditor - - - Materials - - - - - General - - - - - Description - - - - - Name - - - - - Source Reference - - - - - Parent - - - - - Tags - - - - - Source URL - - - - - Author - - - - - License - - - - - &New - - - - - Inherit New - - - - - Add to favorites - - - - - Add physical model - - - - - Delete physical model - - - - - Add appearance model - - - - - Delete appearance model - - - - - Physical - - - - - Appearance - - - - - Unnamed - - - - - Old Format Material - - - - - This file is in the old material card format. - - - - - This card uses the old format and must be saved before use - - - - - - - - Property - - - - - - - - Value - - - - - - - - Type - - - - - Favorites - - - - - Recent - - - - - Units - - - - - Context menu - - - - - Inherit from - - - - - Inherit new material - - - - - MatGui::ModelSelect - - - Material Models - - - - - General - - - - - - URL - - - - - - Description - - - - - DOI - - - - - Name - - - - - Add to favorites - - - - - - - Properties - - - - - Favorites - - - - - Recent - - - - - Inherited - - - - - Property - - - - - Units - - - - - Appearance - - - - - QObject - - - Material workbench - - - - - - Material - - - - - Confirm Overwrite - - - - - - No writeable library - - - - - Are you sure you want to delete '%1'? - - - - - Removing this will also remove all contents. - - - - - You must save the material before using it. - - - - - Unsaved Material - - - - - Do you want to save your changes to the material before closing? - - - - - If you don't save, your changes will be lost. - - - - - - - Confirm Delete - - - - - - Are you sure you want to delete the row? - - - - - CmdMaterialsEdit - - - Material - - - - - Edit... - - - - - Edit material properties - - - - - MatGui::ArrayDelegate - - - False - - - - - True - - - - - MatGui::MaterialDelegate - - - False - - - - - True - - - - - Workbench - - - &Materials - - - - - Materials - - - - - MatGui::ListEdit - - - List Edit - - - - - Delete Row - - - - - MatGui::TextEdit - - - Text Edit - - - - - MatGui::ImageEdit - - - Image - - - - - Thumbnail - - - - - File... - - - - - Height - - - - - Width - - - - - Select an image - - - - - Image files (*.jpg *.jpeg *.png *.bmp);;All files (*) - - - - - Image files (*.svg);;All files (*) - - - - - MatGui::BaseDelegate - - - False - - - - - True - - - - - MatGui::DlgDisplayProperties - - - Display properties - - - - - Viewing mode - - - - - Document window: - - - - - Plot mode: - - - - - Display - - - - - Point size: - - - - - Line width: - - - - - Transparency: - - - - - Line transparency: - - - - - Material - - - - - Color plot: - - - - - Custom appearance: - - - - - Point color: - - - - - Line color: - - - - - MatGui::DlgMaterial - - - Material - - - - - StdCmdSetAppearance - - - Appearance... - - - - - - Sets the display properties of the selected object - - - - - StdCmdSetMaterial - - - Material... - - - - - - Sets the material of the selected object - - - - - QDockWidget - - - Display properties - - - - - Material - - - - - MatGui::MaterialTreeWidget - - - Launch editor - - - - - - Favorites - - - - - - Recent - - - - - MatGui::DlgDisplayPropertiesImp - - - Basic Appearance - - - - - Texture Appearance - - - - - All Materials - - - - - MatGui::DlgSettingsDefaultMaterial - - - - Default Material - - - - - Physical - - - - - MatGui::DlgInspectAppearance - - - Form - - - - - Document - - - - - Document Name - - - - - Name of the active document - - - - - Label / Internal Name - - - - - Sub.Shape / Type - - - - - Shape.TypeID / TypeID - - - - - Appearance - - - - - Tab 1 - - - - - Tab 2 - - - - - Diffuse Color - - - - - Ambient Color - - - - - Emissive Color - - - - - Specular Color - - - - - Shininess - - - - - MatGui::DlgInspectMaterial - - - Form - - - - - Document - - - - - Document Name - - - - - Name of the active document - - - - - Label / Internal Name - - - - - Sub.Shape / Type - - - - - Shape.TypeID / TypeID - - - - - Material - - - - - Copy to clipboard - - - - - Document: - - - - - Label: - - - - - Internal Name: - - - - - - Type: - - - - - TypeID: - - - - - - - - - Name: - - - - - - - - None - - - - - - UUID: - - - - - - Library: - - - - - - Library Directory: - - - - - - Sub Directory: - - - - - - Inherits: - - - - - Model UUID: - - - - - Has value: - - - - - No - - - - - Yes - - - - - Appearance Models: - - - - - Physical Models: - - - - - Appearance Properties: - - - - - Physical Properties: - - - - - CmdInspectAppearance - - - Inspect Appearance... - - - - - - Inspect the appearance properties of the selected object - - - - - CmdInspectMaterial - - - Inspect Material... - - - - - - Inspect the material properties of the selected object - - - - diff --git a/src/Tools/updatecrowdin.py b/src/Tools/updatecrowdin.py index e548d65635..f7b601e91c 100755 --- a/src/Tools/updatecrowdin.py +++ b/src/Tools/updatecrowdin.py @@ -145,8 +145,8 @@ locations = [ ], [ "Material", - "../Mod/Material/Resources/translations", - "../Mod/Material/Resources/Material.qrc", + "../Mod/Material/Gui/Resources/translations", + "../Mod/Material/Gui/Resources/Material.qrc", ], [ "Mesh", diff --git a/src/Tools/updatets.py b/src/Tools/updatets.py index 6123fed014..680bfd30f2 100755 --- a/src/Tools/updatets.py +++ b/src/Tools/updatets.py @@ -94,7 +94,7 @@ directories = [ }, { "tsname": "Material", - "workingdir": "./src/Mod/Material/", + "workingdir": "./src/Mod/Material/Gui", "tsdir": "Resources/translations", }, {