From f26eccff40467307de614391271537a136c7ab9e Mon Sep 17 00:00:00 2001 From: jmaustpc Date: Sat, 21 Dec 2013 21:54:56 +1100 Subject: [PATCH] Add Mesh Regular Solids icons to dialogue drop down list --- src/Mod/Mesh/Gui/DlgRegularSolid.ui | 664 +++++++++--------- src/Mod/Mesh/Gui/Resources/Mesh.qrc | 6 + .../icons/RegularSolids/Mesh_Cone.svg | 141 ++++ .../icons/RegularSolids/Mesh_Cube.svg | 232 ++++++ .../icons/RegularSolids/Mesh_Cylinder.svg | 195 +++++ .../icons/RegularSolids/Mesh_Ellipsoid.svg | 283 ++++++++ .../icons/RegularSolids/Mesh_Sphere.svg | 207 ++++++ .../icons/RegularSolids/Mesh_Torus.svg | 209 ++++++ 8 files changed, 1617 insertions(+), 320 deletions(-) create mode 100644 src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Cone.svg create mode 100644 src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Cube.svg create mode 100644 src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Cylinder.svg create mode 100644 src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Ellipsoid.svg create mode 100644 src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Sphere.svg create mode 100644 src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Torus.svg diff --git a/src/Mod/Mesh/Gui/DlgRegularSolid.ui b/src/Mod/Mesh/Gui/DlgRegularSolid.ui index ba441653dc..41b32fc9b9 100644 --- a/src/Mod/Mesh/Gui/DlgRegularSolid.ui +++ b/src/Mod/Mesh/Gui/DlgRegularSolid.ui @@ -1,10 +1,8 @@ - - - - + + MeshGui::DlgRegularSolid - - + + 0 0 @@ -12,36 +10,36 @@ 319 - + Regular Solid - + true - - + + 10 - + 6 - - - - 0 - - + + + 6 + + 0 + - + Qt::Horizontal - + QSizePolicy::Expanding - + 20 20 @@ -50,168 +48,192 @@ - - + + &Create - + Alt+C - + true - + true - - + + Cl&ose - + Alt+O - + true - - - + + + Solid: - - + + 10 - + 6 - - + + - + Cube + + + :/icons/RegularSolids/Mesh_Cube.svg:/icons/RegularSolids/Mesh_Cube.svg + - + Cylinder + + + :/icons/RegularSolids/Mesh_Cylinder.svg:/icons/RegularSolids/Mesh_Cylinder.svg + - + Cone + + + :/icons/RegularSolids/Mesh_Cone.svg:/icons/RegularSolids/Mesh_Cone.svg + - + Sphere - - - - Ellipsoid + + + :/icons/RegularSolids/Mesh_Sphere.svg:/icons/RegularSolids/Mesh_Sphere.svg - + + Ellipsoid + + + + :/icons/RegularSolids/Mesh_Ellipsoid.svg:/icons/RegularSolids/Mesh_Ellipsoid.svg + + + + Torus + + + :/icons/RegularSolids/Mesh_Torus.svg:/icons/RegularSolids/Mesh_Torus.svg + - - - + + + 0 - - - + + + 0 - + 6 - - - + + + 0 - + 6 - - - + + + Height: - - - - 1000 + + + + 1000.000000000000000 - - 10 + + 10.000000000000000 - - - - 1000 + + + + 0.000000000000000 - - 0 + + 1000.000000000000000 - - 10 + + 10.000000000000000 - - - + + + Length: - - - - 1000 + + + + 1000.000000000000000 - - 10 + + 10.000000000000000 - - - + + + Width: - + - + Qt::Vertical - + QSizePolicy::Expanding - + 20 51 @@ -221,122 +243,122 @@ - - - + + + 0 - + 6 - - - + + + 0 - + 6 - - - + + + Radius: - - - - 2 + + + + 2.000000000000000 - - - - 10 + + + + 10.000000000000000 - - - + + + Length: - - - + + + QFrame::HLine - + QFrame::Sunken - - - + + + 0 - + 6 - - - + + + Closed - + true - - - + + + 50 - - - + + + Sampling: - - - + + + Edge length: - - - - 10 + + + + 10.000000000000000 - - 1 + + 1.000000000000000 - + - + Qt::Vertical - + QSizePolicy::Expanding - + 31 81 @@ -346,133 +368,133 @@ - - - + + + 0 - + 6 - - - + + + 0 - + 6 - - - - 4 + + + + 4.000000000000000 - - - + + + Length: - - - - 10 + + + + 10.000000000000000 - - - + + + Radius 1: - - - + + + Radius 2: - - - - 2 + + + + 2.000000000000000 - - - + + + QFrame::HLine - + QFrame::Sunken - - - + + + 0 - + 6 - - - - 1 + + + + 1.000000000000000 - - - + + + Sampling: - - - + + + Closed - + true - - - + + + 50 - - - + + + Edge length: - + - + Qt::Vertical - + QSizePolicy::Expanding - + 31 91 @@ -482,81 +504,81 @@ - - - + + + 0 - + 6 - - - - 0 - - + + + 6 + + 0 + - - + + Radius: - - - 5 + + + 5.000000000000000 - - - + + + QFrame::HLine - + QFrame::Sunken - - - - 0 - - + + + 6 + + 0 + - - + + Sampling: - - + + 50 - + - + Qt::Vertical - + QSizePolicy::Expanding - + 21 151 @@ -566,95 +588,95 @@ - - - + + + 0 - + 6 - - - + + + 0 - + 6 - - - - 4 + + + + 4.000000000000000 - - - + + + Radius 2: - - - - 2 + + + + 2.000000000000000 - - - + + + Radius 1: - - - + + + QFrame::HLine - + QFrame::Sunken - - - - 0 - - + + + 6 + + 0 + - - + + Sampling: - - + + 50 - + - + Qt::Vertical - + QSizePolicy::Expanding - + 31 81 @@ -664,95 +686,95 @@ - - - + + + 0 - + 6 - - - + + + 0 - + 6 - - - + + + Radius 2: - - - + + + Radius 1: - - - - 2 + + + + 2.000000000000000 - - - - 10 + + + + 10.000000000000000 - - - + + + QFrame::HLine - + QFrame::Sunken - - - - 0 - - + + + 6 + + 0 + - - + + Sampling: - - + + 50 - + - + Qt::Vertical - + QSizePolicy::Expanding - + 20 91 @@ -769,7 +791,7 @@ - + comboBox1 boxLength @@ -797,7 +819,9 @@ createSolidButton buttonClose - + + + comboBox1 @@ -805,11 +829,11 @@ widgetStack2 setCurrentIndex(int) - + 74 48 - + 230 116 @@ -821,11 +845,11 @@ MeshGui::DlgRegularSolid reject() - + 222 284 - + 52 296 diff --git a/src/Mod/Mesh/Gui/Resources/Mesh.qrc b/src/Mod/Mesh/Gui/Resources/Mesh.qrc index 7cc2dd59b8..60bc2d52c6 100644 --- a/src/Mod/Mesh/Gui/Resources/Mesh.qrc +++ b/src/Mod/Mesh/Gui/Resources/Mesh.qrc @@ -12,6 +12,12 @@ icons/Mesh_Regular_Solid.svg icons/Mesh_Remove_Components.svg icons/Mesh_Tree_Curvature_Plot.svg + icons/RegularSolids/Mesh_Cone.svg + icons/RegularSolids/Mesh_Cube.svg + icons/RegularSolids/Mesh_Cylinder.svg + icons/RegularSolids/Mesh_Ellipsoid.svg + icons/RegularSolids/Mesh_Sphere.svg + icons/RegularSolids/Mesh_Torus.svg translations/Mesh_af.qm translations/Mesh_de.qm translations/Mesh_fi.qm diff --git a/src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Cone.svg b/src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Cone.svg new file mode 100644 index 0000000000..2b37d31577 --- /dev/null +++ b/src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Cone.svg @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Cube.svg b/src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Cube.svg new file mode 100644 index 0000000000..5b0078b362 --- /dev/null +++ b/src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Cube.svg @@ -0,0 +1,232 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Cylinder.svg b/src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Cylinder.svg new file mode 100644 index 0000000000..e70961f8e7 --- /dev/null +++ b/src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Cylinder.svg @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Ellipsoid.svg b/src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Ellipsoid.svg new file mode 100644 index 0000000000..3ba9b26f56 --- /dev/null +++ b/src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Ellipsoid.svg @@ -0,0 +1,283 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Sphere.svg b/src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Sphere.svg new file mode 100644 index 0000000000..5f9a123e01 --- /dev/null +++ b/src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Sphere.svg @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Torus.svg b/src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Torus.svg new file mode 100644 index 0000000000..01eafdcdde --- /dev/null +++ b/src/Mod/Mesh/Gui/Resources/icons/RegularSolids/Mesh_Torus.svg @@ -0,0 +1,209 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + +