diff --git a/src/Gui/FileDialog.cpp b/src/Gui/FileDialog.cpp index 46b044aa6..c25f3498d 100644 --- a/src/Gui/FileDialog.cpp +++ b/src/Gui/FileDialog.cpp @@ -143,6 +143,9 @@ QString FileDialog::getSaveFileName (QWidget * parent, const QString & caption, } #else QString file = QFileDialog::getSaveFileName(parent, windowTitle, dirName, filter, selectedFilter, options); +#if QT_VERSION >= 0x040600 + file = QDir::fromNativeSeparators(file); +#endif #endif if (!file.isEmpty()) { setWorkingDirectory(file); @@ -217,6 +220,9 @@ QString FileDialog::getOpenFileName(QWidget * parent, const QString & caption, c } #else QString file = QFileDialog::getOpenFileName(parent, windowTitle, dirName, filter, selectedFilter, options); +#if QT_VERSION >= 0x040600 + file = QDir::fromNativeSeparators(file); +#endif #endif if (!file.isEmpty()) { setWorkingDirectory(file); @@ -272,6 +278,11 @@ QStringList FileDialog::getOpenFileNames (QWidget * parent, const QString & capt } #else QStringList files = QFileDialog::getOpenFileNames(parent, windowTitle, dirName, filter, selectedFilter, options); +#if QT_VERSION >= 0x040600 + for (QStringList::iterator it = files.begin(); it != files.end(); ++it) { + *it = QDir::fromNativeSeparators(*it); + } +#endif #endif if (!files.isEmpty()) { setWorkingDirectory(files.front()); @@ -520,9 +531,9 @@ void FileChooser::chooseFile() else fn = QFileDialog::getExistingDirectory( this, tr( "Select a directory" ), lineEdit->text() ); - if ( !fn.isEmpty() ) { - lineEdit->setText( fn ); - fileNameSelected( fn ); + if (!fn.isEmpty()) { + lineEdit->setText(fn); + fileNameSelected(fn); } } diff --git a/src/Mod/Mesh/Gui/AppMeshGui.cpp b/src/Mod/Mesh/Gui/AppMeshGui.cpp index 8fb68cf78..498ac2a41 100644 --- a/src/Mod/Mesh/Gui/AppMeshGui.cpp +++ b/src/Mod/Mesh/Gui/AppMeshGui.cpp @@ -88,10 +88,6 @@ void MeshGuiExport initMeshGui() Base::Console().Log("Loading GUI of Mesh module... done\n"); // Register icons - Gui::BitmapFactory().addXPM("curv_info", curv_info); - Gui::BitmapFactory().addXPM("import_mesh", import_mesh); - Gui::BitmapFactory().addXPM("export_mesh", export_mesh); - Gui::BitmapFactory().addXPM("solid_mesh", solid_mesh); Gui::BitmapFactory().addXPM("mesh_fillhole", mesh_fillhole); Gui::BitmapFactory().addXPM("mesh_pipette", mesh_pipette); diff --git a/src/Mod/Mesh/Gui/Command.cpp b/src/Mod/Mesh/Gui/Command.cpp index 810542fc3..f0876b6da 100644 --- a/src/Mod/Mesh/Gui/Command.cpp +++ b/src/Mod/Mesh/Gui/Command.cpp @@ -283,7 +283,7 @@ CmdMeshImport::CmdMeshImport() sToolTipText = QT_TR_NOOP("Imports a mesh from file"); sWhatsThis = "Mesh_Import"; sStatusTip = QT_TR_NOOP("Imports a mesh from file"); - sPixmap = "import_mesh"; + sPixmap = "Mesh_Import_Mesh"; } void CmdMeshImport::activated(int iMsg) @@ -335,7 +335,7 @@ CmdMeshExport::CmdMeshExport() sToolTipText = QT_TR_NOOP("Exports a mesh to file"); sWhatsThis = "Mesh_Export"; sStatusTip = QT_TR_NOOP("Exports a mesh to file"); - sPixmap = "export_mesh"; + sPixmap = "Mesh_Export_Mesh"; } void CmdMeshExport::activated(int iMsg) @@ -488,7 +488,7 @@ CmdMeshVertexCurvature::CmdMeshVertexCurvature() sToolTipText = QT_TR_NOOP("Calculates the curvature of the vertices of a mesh"); sWhatsThis = "Mesh_VertexCurvature"; sStatusTip = QT_TR_NOOP("Calculates the curvature of the vertices of a mesh"); - sPixmap = "curv_info"; + sPixmap = "Mesh_Curvature_Plot"; } void CmdMeshVertexCurvature::activated(int iMsg) @@ -1119,6 +1119,7 @@ CmdMeshRemoveComponents::CmdMeshRemoveComponents() sToolTipText = QT_TR_NOOP("Remove topologic independent components from the mesh"); sWhatsThis = "Mesh_RemoveComponents"; sStatusTip = QT_TR_NOOP("Remove topologic independent components from the mesh"); + sPixmap = "Mesh_Remove_Components"; } void CmdMeshRemoveComponents::activated(int iMsg) @@ -1304,6 +1305,7 @@ CmdMeshHarmonizeNormals::CmdMeshHarmonizeNormals() sToolTipText = QT_TR_NOOP("Harmonizes the normals of the mesh"); sWhatsThis = "Mesh_HarmonizeNormals"; sStatusTip = QT_TR_NOOP("Harmonizes the normals of the mesh"); + sPixmap = "Mesh_Harmonize_Normals"; } void CmdMeshHarmonizeNormals::activated(int iMsg) @@ -1337,6 +1339,7 @@ CmdMeshFlipNormals::CmdMeshFlipNormals() sToolTipText = QT_TR_NOOP("Flips the normals of the mesh"); sWhatsThis = "Mesh_FlipNormals"; sStatusTip = QT_TR_NOOP("Flips the normals of the mesh"); + sPixmap = "Mesh_Flip_Normals"; } void CmdMeshFlipNormals::activated(int iMsg) @@ -1409,7 +1412,7 @@ CmdMeshBuildRegularSolid::CmdMeshBuildRegularSolid() sToolTipText = QT_TR_NOOP("Builds a regular solid"); sWhatsThis = "Mesh_BuildRegularSolid"; sStatusTip = QT_TR_NOOP("Builds a regular solid"); - sPixmap = "solid_mesh"; + sPixmap = "Mesh_Regular_Solid"; } void CmdMeshBuildRegularSolid::activated(int iMsg) diff --git a/src/Mod/Mesh/Gui/Resources/Mesh.qrc b/src/Mod/Mesh/Gui/Resources/Mesh.qrc index 739812bfb..7cc2dd59b 100644 --- a/src/Mod/Mesh/Gui/Resources/Mesh.qrc +++ b/src/Mod/Mesh/Gui/Resources/Mesh.qrc @@ -3,7 +3,15 @@ icons/mesh_boundary.svg icons/mesh_cut.svg icons/Tree_Mesh.svg + icons/Mesh_Curvature_Plot.svg + icons/Mesh_Export_Mesh.svg + icons/Mesh_Import_Mesh.svg icons/Mesh_Mesh_from_Shape.svg + icons/Mesh_Flip_Normals.svg + icons/Mesh_Harmonize_Normals.svg + icons/Mesh_Regular_Solid.svg + icons/Mesh_Remove_Components.svg + icons/Mesh_Tree_Curvature_Plot.svg translations/Mesh_af.qm translations/Mesh_de.qm translations/Mesh_fi.qm diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Curvature_Plot.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Curvature_Plot.svg new file mode 100644 index 000000000..9cbf523b5 --- /dev/null +++ b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Curvature_Plot.svg @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Export_Mesh.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Export_Mesh.svg new file mode 100644 index 000000000..4f8e21d84 --- /dev/null +++ b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Export_Mesh.svg @@ -0,0 +1,876 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Lapo Calamandrei + + + + + + media + stop + playback + video + music + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Flip_Normals.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Flip_Normals.svg new file mode 100644 index 000000000..a074b4df0 --- /dev/null +++ b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Flip_Normals.svg @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Harmonize_Normals.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Harmonize_Normals.svg new file mode 100644 index 000000000..4c28d2fbc --- /dev/null +++ b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Harmonize_Normals.svg @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Import_Mesh.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Import_Mesh.svg new file mode 100644 index 000000000..5528af27f --- /dev/null +++ b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Import_Mesh.svg @@ -0,0 +1,846 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Lapo Calamandrei + + + + + + media + stop + playback + video + music + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Regular_Solid.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Regular_Solid.svg new file mode 100644 index 000000000..38b987211 --- /dev/null +++ b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Regular_Solid.svg @@ -0,0 +1,289 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Remove_Components.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Remove_Components.svg new file mode 100644 index 000000000..6d2f5084c --- /dev/null +++ b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Remove_Components.svg @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Tree_Curvature_Plot.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Tree_Curvature_Plot.svg new file mode 100644 index 000000000..2e819678b --- /dev/null +++ b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Tree_Curvature_Plot.svg @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp b/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp index 4f00aef2c..0fe1d5454 100644 --- a/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp +++ b/src/Mod/Mesh/Gui/ViewProviderCurvature.cpp @@ -59,6 +59,7 @@ #include #include #include +#include #include #include #include @@ -365,32 +366,7 @@ void ViewProviderMeshCurvature::setVertexCurvatureMode(int mode) QIcon ViewProviderMeshCurvature::getIcon() const { - static const char * Mesh_Feature_xpm[] = { - "16 16 7 1", - ". c None", - "# c #000000", - "s c #BEC2FC", - "g c #00FF00", - "y c #FFFF00", - "b c #0000FF", - "r c #FF0000", - ".......##.......", - "....#######.....", - "..##ggg#yyy#....", - "##ggggg#yyyy##..", - "#b#ggg#yyyyyy##.", - "#bb#gg#yyyy###s.", - "#bb#gg#yy##yy#s.", - "#bbb#####rrr#ss.", - "#bbbb##rrrr#ss..", - ".#b##b#rrrr#s...", - ".##bbb#rrr#ss...", - ".##bbb#r#ss.....", - "..s#####r#s.....", - "....sss##ss.....", - "........ss......", - "................"}; - QPixmap px(Mesh_Feature_xpm); + static QPixmap px = Gui::BitmapFactory().pixmap(":/icons/Mesh_Tree_Curvature_Plot.svg"); return px; } diff --git a/src/Mod/Mesh/Gui/images.h b/src/Mod/Mesh/Gui/images.h index f3390ed19..a231ce1fc 100644 --- a/src/Mod/Mesh/Gui/images.h +++ b/src/Mod/Mesh/Gui/images.h @@ -1,132 +1,3 @@ -/* XPM */ -static const char *curv_info[]={ -"22 22 11 1", -"a c #000000", -"g c #0000ff", -"f c #008080", -"c c #008000", -"d c #00ffff", -"# c #808080", -". c None", -"e c #ff0000", -"h c #ffaa00", -"b c #000000", -"k c #ffff00", -"......................", -"......................", -".......#aaaa#.........", -".bb...aa....aa........", -".bcb.a#ddd...#a...eee.", -".bcc#add......a#..eee.", -"..bcacd........a..hhh.", -"..bcacdb.......a..hhh.", -"..bcacccb......a..kkk.", -"..bcaccccb...d.a..kkk.", -"..bc#accccb.d.a#..ccc.", -"...bca#ccccdd#a...ccc.", -"...bccaaccccaaaa..fff.", -"...bccc#aaaa#.aaa.fff.", -"...bccccccccbb.aa.ddd.", -"....bccccbbb....a.ddd.", -"....bcbbb.........ggg.", -".....bb...........ggg.", -"......................", -"......................", -"......................", -"......................"}; -/* XPM */ -//"c c #84ad84", -static const char *import_mesh[]={ -"22 22 6 1", -". c None", -"# c #000000", -"c c #ffff00", -"a c #808080", -"b c #c0c0c0", -"f c #008000", -".............##.......", -".............###......", -".............#f##.....", -".............#ff##....", -"...####....#.#fff##...", -"..#....##.##.#ffff##..", -".........###.#fffff##.", -"........####.#ffffff##", -".......#####.#########", -".####.................", -"#abab##########.......", -"#babababababab#.......", -"#ababababababa#.......", -"#babab################", -"#abab##cccccccccccc##.", -"#bab##cccccccccccc##..", -"#ab##cccccccccccc##...", -"#b##cccccccccccc##....", -"###cccccccccccc##.....", -"##cccccccccccc##......", -"###############.......", -"......................"}; - -static const char *export_mesh[]={ -"22 22 6 1", -". c None", -"# c #000000", -"c c #ffff00", -"a c #808080", -"b c #c0c0c0", -"f c #008000", -".............##.......", -".............###......", -".............#f##.....", -".#....####...#ff##....", -".##.##....#..#fff##...", -".###.........#ffff##..", -".####........#fffff##.", -".#####.......#ffffff##", -".............#########", -".####.................", -"#abab##########.......", -"#babababababab#.......", -"#ababababababa#.......", -"#babab################", -"#abab##cccccccccccc##.", -"#bab##cccccccccccc##..", -"#ab##cccccccccccc##...", -"#b##cccccccccccc##....", -"###cccccccccccc##.....", -"##cccccccccccc##......", -"###############.......", -"......................"}; -/* XPM */ -static const char *solid_mesh[]={ -"22 22 4 1", -"# c #000000", -"a c #00ff00", -". c None", -"b c #ffffff", -".........#####........", -".......##aaaaa##......", -".....##aaaaaaaaa##....", -"....#aaaaaaaaaaaaa#...", -"...#aaaaaaaaaaaaaaa#..", -"...#aaabbbaaaaaaaaa#..", -"..#aaabbbbbaaaaaaaaa#.", -"..#aaabbbbbaaaaaaaaa#.", -".#aaaabbbbbaaaaaaaaaa#", -".#aaaaabbbaaaaaaaaaaa#", -".#aaaaaaaaaaaaaaaaaaa#", -".#aaaaaaaaaaaaaaaaaaa#", -".#aaaaaaaaaaaaaaaaaaa#", -"..#aaaaaaaaaaaaaaaaa#.", -"..#aaaaaaaaaaaaaaaaa#.", -"...#aaaaaaaaaaaaaaa#..", -"...#aaaaaaaaaaaaaaa#..", -"....#aaaaaaaaaaaaa#...", -".....##aaaaaaaaa##....", -".......##aaaaa##......", -".........#####........", -"......................"}; - /* XPM */ static const char *mesh_fillhole[]={ "32 32 3 1",