Merge pull request #445 from agryson/drawing-artwork-alignment

Drawing artwork alignment
FreeCAD · Jan 15, 2017 · 177f36a · 177f36a
2 parents 17c6921 + f35d739
commit 177f36a
Show file tree

Hide file tree

Showing 28 changed files with 4,060 additions and 7,903 deletions.
diff --git a/src/Mod/Drawing/Gui/Command.cpp b/src/Mod/Drawing/Gui/Command.cpp
@@ -160,12 +160,10 @@ Gui::Action * CmdDrawingNewPage::createAction(void)
             lastPaper = paper;
             lastId = id;
 
-            QFile file(QString::fromLatin1(":/icons/actions/drawing-landscape-A0.svg"));
+            QFile file(QString::fromLatin1(":/icons/actions/drawing-%1-%2%3.svg").arg(orientation.toLower()).arg(paper).arg(id));
             QAction* a = pcAction->addAction(QString());
             if (file.open(QFile::ReadOnly)) {
-                QString s = QString::fromLatin1("style=\"font-size:22px\">%1%2</tspan></text>").arg(paper).arg(id);
                 QByteArray data = file.readAll();
-                data.replace("style=\"font-size:22px\">A0</tspan></text>", s.toLatin1());
                 a->setIcon(Gui::BitmapFactory().pixmapFromSvg(data, QSize(64,64)));
             }
 

diff --git a/src/Mod/Drawing/Gui/Resources/Drawing.qrc b/src/Mod/Drawing/Gui/Resources/Drawing.qrc
@@ -12,7 +12,11 @@
         <file>icons/actions/drawing-landscape-A4.svg</file>
         <file>icons/actions/drawing-landscape-new.svg</file>
         <file>icons/actions/drawing-landscape.svg</file>
-        <file>icons/actions/drawing-portrait-A4.svg</file>
+	<file>icons/actions/drawing-portrait-A0.svg</file>
+	<file>icons/actions/drawing-portrait-A1.svg</file>
+	<file>icons/actions/drawing-portrait-A2.svg</file>
+	<file>icons/actions/drawing-portrait-A3.svg</file>
+	<file>icons/actions/drawing-portrait-A4.svg</file>
         <file>icons/actions/drawing-view.svg</file>
         <file>icons/actions/drawing-orthoviews.svg</file>
         <file>icons/actions/drawing-openbrowser.svg</file>

diff --git a/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg b/src/Mod/Drawing/Gui/Resources/icons/DrawingWorkbench.svg
diff --git a/src/Mod/Drawing/Gui/Resources/icons/Page.svg b/src/Mod/Drawing/Gui/Resources/icons/Page.svg
diff --git a/src/Mod/Drawing/Gui/Resources/icons/Pages.svg b/src/Mod/Drawing/Gui/Resources/icons/Pages.svg