diff --git a/common/lc_arraydialog.cpp b/common/lc_arraydialog.cpp index e5b4ab36..29767fcb 100644 --- a/common/lc_arraydialog.cpp +++ b/common/lc_arraydialog.cpp @@ -1,6 +1,6 @@ #include "lc_global.h" -#include "lc_qarraydialog.h" -#include "ui_lc_qarraydialog.h" +#include "lc_arraydialog.h" +#include "ui_lc_arraydialog.h" #include "lc_qutils.h" lcArrayDialog::lcArrayDialog(QWidget* Parent) diff --git a/common/lc_categorydialog.cpp b/common/lc_categorydialog.cpp index 45bb0eda..81115cda 100644 --- a/common/lc_categorydialog.cpp +++ b/common/lc_categorydialog.cpp @@ -1,6 +1,6 @@ #include "lc_global.h" -#include "lc_qcategorydialog.h" -#include "ui_lc_qcategorydialog.h" +#include "lc_categorydialog.h" +#include "ui_lc_categorydialog.h" #include "lc_category.h" lcCategoryDialog::lcCategoryDialog(QWidget* Parent, lcLibraryCategory* Options) diff --git a/common/lc_colorpicker.cpp b/common/lc_colorpicker.cpp index 58dfdca7..fc05329d 100644 --- a/common/lc_colorpicker.cpp +++ b/common/lc_colorpicker.cpp @@ -1,5 +1,5 @@ #include "lc_global.h" -#include "lc_qcolorpicker.h" +#include "lc_colorpicker.h" #include "lc_colorlist.h" #include "lc_colors.h" diff --git a/common/lc_findreplacewidget.cpp b/common/lc_findreplacewidget.cpp index a93c9f02..e8e94017 100644 --- a/common/lc_findreplacewidget.cpp +++ b/common/lc_findreplacewidget.cpp @@ -1,6 +1,6 @@ #include "lc_global.h" #include "lc_findreplacewidget.h" -#include "lc_qcolorpicker.h" +#include "lc_colorpicker.h" #include "lc_library.h" #include "lc_mainwindow.h" #include "pieceinf.h" diff --git a/common/lc_minifigdialog.cpp b/common/lc_minifigdialog.cpp index 2bc47e62..77a858e0 100644 --- a/common/lc_minifigdialog.cpp +++ b/common/lc_minifigdialog.cpp @@ -2,7 +2,7 @@ #include "lc_minifigdialog.h" #include "ui_lc_minifigdialog.h" #include "lc_viewwidget.h" -#include "lc_qcolorpicker.h" +#include "lc_colorpicker.h" #include "minifig.h" #include "lc_application.h" #include "pieceinf.h" diff --git a/common/lc_minifigdialog.ui b/common/lc_minifigdialog.ui index 5f082448..0b0b5c42 100644 --- a/common/lc_minifigdialog.ui +++ b/common/lc_minifigdialog.ui @@ -743,7 +743,7 @@ lcColorPicker QToolButton -
lc_qcolorpicker.h
+
lc_colorpicker.h
 diff --git a/common/lc_model.cpp b/common/lc_model.cpp index 62879cea..59a1ad1e 100644 --- a/common/lc_model.cpp +++ b/common/lc_model.cpp @@ -15,7 +15,7 @@ #include "pieceinf.h" #include "lc_view.h" #include "minifig.h" -#include "lc_qarraydialog.h" +#include "lc_arraydialog.h" #include "lc_qselectdialog.h" #include "lc_minifigdialog.h" #include "lc_groupdialog.h" diff --git a/leocad.pro b/leocad.pro index 6bcda6ab..6b588bfe 100644 --- a/leocad.pro +++ b/leocad.pro @@ -174,10 +174,13 @@ SOURCES += \ common/light.cpp \ common/lc_aboutdialog.cpp \ common/lc_application.cpp \ + common/lc_arraydialog.cpp \ common/lc_bricklink.cpp \ common/lc_category.cpp \ + common/lc_categorydialog.cpp \ common/lc_collapsiblewidget.cpp \ common/lc_colorlist.cpp \ + common/lc_colorpicker.cpp \ common/lc_colors.cpp \ common/lc_commands.cpp \ common/lc_context.cpp \ @@ -217,18 +220,15 @@ SOURCES += \ common/camera.cpp \ qt/system.cpp \ qt/qtmain.cpp \ - qt/lc_qarraydialog.cpp \ qt/lc_qeditgroupsdialog.cpp \ qt/lc_qselectdialog.cpp \ qt/lc_qpropertiesdialog.cpp \ qt/lc_qhtmldialog.cpp \ qt/lc_qpreferencesdialog.cpp \ - qt/lc_qcategorydialog.cpp \ qt/lc_qimagedialog.cpp \ qt/lc_qupdatedialog.cpp \ qt/lc_qutils.cpp \ qt/lc_qpropertiestree.cpp \ - qt/lc_qcolorpicker.cpp \ qt/lc_renderdialog.cpp \ qt/lc_setsdatabasedialog.cpp \ common/lc_partpalettedialog.cpp @@ -243,10 +243,13 @@ HEADERS += \ common/lc_aboutdialog.h \ common/lc_application.h \ common/lc_array.h \ + common/lc_arraydialog.h \ common/lc_bricklink.h \ common/lc_category.h \ + common/lc_categorydialog.h \ common/lc_collapsiblewidget.h \ common/lc_colorlist.h \ + common/lc_colorpicker.h \ common/lc_colors.h \ common/lc_commands.h \ common/lc_context.h \ @@ -286,34 +289,31 @@ HEADERS += \ common/image.h \ common/group.h \ common/camera.h \ - qt/lc_qarraydialog.h \ qt/lc_qeditgroupsdialog.h \ qt/lc_qselectdialog.h \ qt/lc_qpropertiesdialog.h \ qt/lc_qhtmldialog.h \ qt/lc_qpreferencesdialog.h \ - qt/lc_qcategorydialog.h \ qt/lc_qimagedialog.h \ qt/lc_qupdatedialog.h \ qt/lc_qutils.h \ qt/lc_qpropertiestree.h \ - qt/lc_qcolorpicker.h \ qt/lc_renderdialog.h \ qt/lc_setsdatabasedialog.h \ common/lc_partpalettedialog.h FORMS += \ - qt/lc_qarraydialog.ui \ qt/lc_qeditgroupsdialog.ui \ qt/lc_qselectdialog.ui \ qt/lc_qpropertiesdialog.ui \ qt/lc_qhtmldialog.ui \ qt/lc_qpreferencesdialog.ui \ - qt/lc_qcategorydialog.ui \ qt/lc_qimagedialog.ui \ qt/lc_qupdatedialog.ui \ qt/lc_renderdialog.ui \ qt/lc_setsdatabasedialog.ui \ common/lc_aboutdialog.ui \ + common/lc_arraydialog.ui \ + common/lc_categorydialog.ui \ common/lc_groupdialog.ui \ common/lc_minifigdialog.ui \ common/lc_modellistdialog.ui \ diff --git a/qt/lc_qpreferencesdialog.cpp b/qt/lc_qpreferencesdialog.cpp index 9176bc12..78220a26 100644 --- a/qt/lc_qpreferencesdialog.cpp +++ b/qt/lc_qpreferencesdialog.cpp @@ -2,7 +2,7 @@ #include "lc_qpreferencesdialog.h" #include "ui_lc_qpreferencesdialog.h" #include "lc_qutils.h" -#include "lc_qcategorydialog.h" +#include "lc_categorydialog.h" #include "lc_library.h" #include "lc_application.h" #include "lc_qutils.h" diff --git a/qt/lc_qpropertiestree.cpp b/qt/lc_qpropertiestree.cpp index b3a7637e..a19c3f9b 100644 --- a/qt/lc_qpropertiestree.cpp +++ b/qt/lc_qpropertiestree.cpp @@ -1,6 +1,6 @@ #include "lc_global.h" #include "lc_qpropertiestree.h" -#include "lc_qcolorpicker.h" +#include "lc_colorpicker.h" #include "lc_application.h" #include "lc_model.h" #include "lc_mainwindow.h" diff --git a/resources/leocad_cs.ts b/resources/leocad_cs.ts index 173f1f12..b3a735fa 100644 --- a/resources/leocad_cs.ts +++ b/resources/leocad_cs.ts @@ -5999,37 +5999,37 @@ Informace o tom, jak stáhnout a nainstalovat knihovnu, naleznete na adrese http lcAboutDialog - + About LeoCAD O LeoCADu - + LeoCAD Version 0.00.0 LeoCAD verze 0.00.0 - + LeoCAD is a free application for creating virtual LEGO models. LeoCAD je bezplatná aplikace pro vytváření návrhů LEGO modelů. - + System Information Systémové informace - + LeoCAD Continuous Build %1 LeoCAD průběžné sestavení %1 - + LeoCAD Version %1 LeoCAD verze %1 - + Qt Version %1 (compiled with %2) @@ -6038,7 +6038,7 @@ Informace o tom, jak stáhnout a nainstalovat knihovnu, naleznete na adrese http - + OpenGL Version %1 (GLSL %2) %3 - %4 @@ -6049,7 +6049,7 @@ Informace o tom, jak stáhnout a nainstalovat knihovnu, naleznete na adrese http - + Color Buffer: %1 bits Depth Buffer: %2 bits Stencil Buffer: %3 bits @@ -6058,7 +6058,7 @@ Stencil Buffer: %3 bits - + Buffers: %1 Shaders: %2 Framebuffers: %3 @@ -6102,24 +6102,24 @@ GL_EXT_texture_filter_anisotropic rozšíření: %5 - - - - + + + + Supported Podporováno - - - - - + + + + + Not supported Není podporováno - + Supported (max %1) Podporováno (max %1) @@ -6127,27 +6127,27 @@ GL_EXT_texture_filter_anisotropic rozšíření: %5 lcArrayDialog - + Array Pole - + Dimensions Rozměry - + Offsets Posuny - + Rotations Otočení - + Array is empty. Pole je prázdné. @@ -6155,37 +6155,37 @@ GL_EXT_texture_filter_anisotropic rozšíření: %5 lcCategoryDialog - + Category Kategorie - + Name: Název: - + Keywords: Klíčová slova: - + Edit Category Upravit kategorii - + New Category Nová kategorie - + Name cannot be empty. Název nesmí být prázdný. - + Keywords cannot be empty. Klíčové slovo nesmí být prázdné. diff --git a/resources/leocad_de.ts b/resources/leocad_de.ts index 2111c05c..f714bd70 100644 --- a/resources/leocad_de.ts +++ b/resources/leocad_de.ts @@ -5975,32 +5975,32 @@ Bitte lesen sie unter https://www.leocad.org nach wie man eine Bibliothek herunt lcAboutDialog - + About LeoCAD Über LeoCAD - + LeoCAD Version 0.00.0 LeoCAD Version 0.00.0 - + LeoCAD is a free application for creating virtual LEGO models. LeoCAD ist eine freie Anwendung zur Gestaltung virtueller LEGO Modelle. - + System Information Systeminformationen - + LeoCAD Version %1 LeoCAD Version %1 - + OpenGL Version %1 (GLSL %2) %3 - %4 @@ -6045,19 +6045,19 @@ GL_EXT_texture_filter_anisotropic extension: %5 - + LeoCAD Continuous Build %1 - + Qt Version %1 (compiled with %2) - + Color Buffer: %1 bits Depth Buffer: %2 bits Stencil Buffer: %3 bits @@ -6066,7 +6066,7 @@ Stencil Buffer: %3 bits - + Buffers: %1 Shaders: %2 Framebuffers: %3 @@ -6076,24 +6076,24 @@ Anisotropic: %5 - - - - + + + + Supported Unterstützt - - - - - + + + + + Not supported Nicht unterstützt - + Supported (max %1) Unterstützt (maximal %1) @@ -6101,27 +6101,27 @@ Anisotropic: %5 lcArrayDialog - + Array Array - + Dimensions Abmessungen - + Offsets Versatz - + Rotations Drehungen - + Array is empty. Array ist leer. @@ -6129,37 +6129,37 @@ Anisotropic: %5 lcCategoryDialog - + Category Kategorie - + Name: Name: - + Keywords: Schlüsselwörter: - + Edit Category Kategorie bearbeiten - + New Category Neue Kategorie - + Name cannot be empty. Der Name kann nicht leer sein. - + Keywords cannot be empty. Schlüsselwörter müssen vorhanden sein. diff --git a/resources/leocad_es.ts b/resources/leocad_es.ts index 6b97f7a4..be484c24 100644 --- a/resources/leocad_es.ts +++ b/resources/leocad_es.ts @@ -6067,27 +6067,27 @@ Por favor, visita https://www.leocad.org para saber cómo descargar e instalar u lcAboutDialog - + About LeoCAD Acerca de LeoCAD - + LeoCAD Version 0.00.0 LeoCAD Version 0.00.0 - + LeoCAD is a free application for creating virtual LEGO models. LeoCAD es un programa libre para crear modelos virtuales de LEGO. - + System Information Información del Sistema - + LeoCAD Version %1 LeoCAD versión %1 @@ -6098,7 +6098,7 @@ Por favor, visita https://www.leocad.org para saber cómo descargar e instalar u - + OpenGL Version %1 (GLSL %2) %3 - %4 @@ -6143,12 +6143,12 @@ GL_EXT_texture_filter_anisotropic extension: %5 - + LeoCAD Continuous Build %1 LeoCAD compilación continua %1 - + Qt Version %1 (compiled with %2) @@ -6157,7 +6157,7 @@ GL_EXT_texture_filter_anisotropic extension: %5 - + Color Buffer: %1 bits Depth Buffer: %2 bits Stencil Buffer: %3 bits @@ -6170,7 +6170,7 @@ Stencil Búfer: %3 bits - + Buffers: %1 Shaders: %2 Framebuffers: %3 @@ -6185,24 +6185,24 @@ Anisotropic: %5 - - - - + + + + Supported Soportado - - - - - + + + + + Not supported No soportado - + Supported (max %1) Soportado (máximo %1) @@ -6210,27 +6210,27 @@ Anisotropic: %5 lcArrayDialog - + Array Secuencia - + Dimensions Dimensiones - + Offsets Desplazamientos - + Rotations Rotaciones - + Array is empty. La secuencia está vacía. @@ -6238,37 +6238,37 @@ Anisotropic: %5 lcCategoryDialog - + Category Categoría - + Name: Nombre: - + Keywords: Palabras clave: - + Edit Category Editar categoría - + New Category Nueva categoría - + Name cannot be empty. El nombre no puede estar vacío. - + Keywords cannot be empty. El palabras clave no puede estar vacío. diff --git a/resources/leocad_fr.ts b/resources/leocad_fr.ts index 17f5ca66..98584deb 100644 --- a/resources/leocad_fr.ts +++ b/resources/leocad_fr.ts @@ -5919,32 +5919,32 @@ SVP visitez https://www.leocad.org pour apprendre comment télécharger et insta lcAboutDialog - + About LeoCAD À propos de LeoCAD - + LeoCAD Version 0.00.0 LeoCAD Version 0.00.0 - + LeoCAD is a free application for creating virtual LEGO models. LeoCAD est une application libre pour créer les modèles LEGO virtuels. - + System Information Informations système - + LeoCAD Version %1 LeoCAD Version %1 - + OpenGL Version %1 (GLSL %2) %3 - %4 @@ -5975,19 +5975,19 @@ Stencil Buffer: %5 bits double tampon - + LeoCAD Continuous Build %1 - + Qt Version %1 (compiled with %2) - + Color Buffer: %1 bits Depth Buffer: %2 bits Stencil Buffer: %3 bits @@ -5996,7 +5996,7 @@ Stencil Buffer: %3 bits - + Buffers: %1 Shaders: %2 Framebuffers: %3 @@ -6006,24 +6006,24 @@ Anisotropic: %5 - - - - + + + + Supported Pris en charge - - - - - + + + + + Not supported Non pris en charge - + Supported (max %1) Pris en charge (maximum %1) @@ -6031,27 +6031,27 @@ Anisotropic: %5 lcArrayDialog - + Array Arrangement - + Dimensions Dimensions - + Offsets Décalages - + Rotations Rotations - + Array is empty. L’arrangement est vide. @@ -6059,37 +6059,37 @@ Anisotropic: %5 lcCategoryDialog - + Category Catégorie - + Name: Nom : - + Keywords: Mots clés : - + Edit Category Éditer la catégorie - + New Category Nouvelle catégorie - + Name cannot be empty. Le nom ne peut pas être vide. - + Keywords cannot be empty. Le champ mots clés ne peut pas être vide. diff --git a/resources/leocad_pt.ts b/resources/leocad_pt.ts index a0551bed..bfee18a7 100644 --- a/resources/leocad_pt.ts +++ b/resources/leocad_pt.ts @@ -5919,32 +5919,32 @@ Veja https://www.leocad.org para saber como descarragar e instalar uma bibliotec lcAboutDialog - + About LeoCAD Sobre LeoCAD - + LeoCAD Version 0.00.0 LeoCAD Versão 0.00.0 - + LeoCAD is a free application for creating virtual LEGO models. LeoCAD é um programa libre para criar modelos LEGO virtuais. - + System Information Informações do Sistema - + LeoCAD Version %1 LeoCAD Versão %1 - + OpenGL Version %1 (GLSL %2) %3 - %4 @@ -5975,19 +5975,19 @@ Tampão de Desenho: %5 bits tampão duplo - + LeoCAD Continuous Build %1 - + Qt Version %1 (compiled with %2) - + Color Buffer: %1 bits Depth Buffer: %2 bits Stencil Buffer: %3 bits @@ -5996,7 +5996,7 @@ Stencil Buffer: %3 bits - + Buffers: %1 Shaders: %2 Framebuffers: %3 @@ -6006,24 +6006,24 @@ Anisotropic: %5 - - - - + + + + Supported Aceite - - - - - + + + + + Not supported Recusado - + Supported (max %1) Aceite (máximo %1) @@ -6031,27 +6031,27 @@ Anisotropic: %5 lcArrayDialog - + Array Quadro - + Dimensions Dimensões - + Offsets Espaços - + Rotations Rotações - + Array is empty. O quadro está vazio. @@ -6059,37 +6059,37 @@ Anisotropic: %5 lcCategoryDialog - + Category Categoria - + Name: Nome: - + Keywords: Palavras Chave: - + Edit Category Editar Categoria - + New Category Nova Categoria - + Name cannot be empty. O nome não pode ser vazio. - + Keywords cannot be empty. As palavras chave não podem ser vazias. diff --git a/resources/leocad_uk.ts b/resources/leocad_uk.ts index 3c659b2e..48c29f6c 100644 --- a/resources/leocad_uk.ts +++ b/resources/leocad_uk.ts @@ -5908,37 +5908,37 @@ Please visit https://www.leocad.org for information on how to download and insta lcAboutDialog - + About LeoCAD Про LeoCAD - + LeoCAD Version 0.00.0 LeoCAD Версія 0.00.0 - + LeoCAD is a free application for creating virtual LEGO models. LeoCAD є вільною програмою для створення віртуальних моделей LEGO. - + System Information Системна інформація - + LeoCAD Continuous Build %1 LeoCAD Continuous Build %1 - + LeoCAD Version %1 LeoCAD Версія %1 - + Qt Version %1 (compiled with %2) @@ -5947,7 +5947,7 @@ Please visit https://www.leocad.org for information on how to download and insta - + OpenGL Version %1 (GLSL %2) %3 - %4 @@ -5958,7 +5958,7 @@ Please visit https://www.leocad.org for information on how to download and insta - + Color Buffer: %1 bits Depth Buffer: %2 bits Stencil Buffer: %3 bits @@ -5967,7 +5967,7 @@ Stencil Buffer: %3 bits - + Buffers: %1 Shaders: %2 Framebuffers: %3 @@ -6011,24 +6011,24 @@ GL_EXT_texture_filter_anisotropic extension: %5 - - - - + + + + Supported Supported - - - - - + + + + + Not supported Not supported - + Supported (max %1) Supported (max %1) @@ -6036,27 +6036,27 @@ GL_EXT_texture_filter_anisotropic extension: %5 lcArrayDialog - + Array Масив - + Dimensions Розміри - + Offsets Відступи - + Rotations Обертання - + Array is empty. Масив порожній. @@ -6064,37 +6064,37 @@ GL_EXT_texture_filter_anisotropic extension: %5 lcCategoryDialog - + Category Категорія - + Name: Назва: - + Keywords: Ключові слова: - + Edit Category Редагувати категорію - + New Category Нова категорія - + Name cannot be empty. Назва не може бути порожньою. - + Keywords cannot be empty. Ключові слова не можуть бути порожніми.