From 6556bc776af3608032f978904e5ffe92a3746343 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Sat, 16 Aug 2014 15:08:55 +0200
Subject: [PATCH] + fixes #0001689: Show name of the drawing page in the tab of
 the drawing

---
 src/Mod/Drawing/Gui/AppDrawingGuiPy.cpp  | 7 +++++--
 src/Mod/Drawing/Gui/DrawingView.cpp      | 9 +++++++++
 src/Mod/Drawing/Gui/DrawingView.h        | 1 +
 src/Mod/Drawing/Gui/ViewProviderPage.cpp | 2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/Mod/Drawing/Gui/AppDrawingGuiPy.cpp b/src/Mod/Drawing/Gui/AppDrawingGuiPy.cpp
index d1e7d7c5c..0f0930add 100644
--- a/src/Mod/Drawing/Gui/AppDrawingGuiPy.cpp
+++ b/src/Mod/Drawing/Gui/AppDrawingGuiPy.cpp
@@ -22,6 +22,7 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <QFileInfo>
 # include <QIcon>
 # include <QImage>
 # include <sstream>
@@ -61,7 +62,8 @@ open(PyObject *self, PyObject *args)
             DrawingView* view = new DrawingView(0, Gui::getMainWindow());
             view->load(fileName);
             view->setWindowIcon(Gui::BitmapFactory().pixmap("actions/drawing-landscape"));
-            view->setWindowTitle(QObject::tr("Drawing viewer"));
+            QFileInfo fi(fileName);
+            view->setWindowTitle(fi.fileName());
             view->resize( 400, 300 );
             Gui::getMainWindow()->addWindow(view);
         }
@@ -91,7 +93,8 @@ importer(PyObject *self, PyObject *args)
             DrawingView* view = new DrawingView(0, Gui::getMainWindow());
             view->load(fileName);
             view->setWindowIcon(Gui::BitmapFactory().pixmap("actions/drawing-landscape"));
-            view->setWindowTitle(QObject::tr("Drawing viewer"));
+            QFileInfo fi(fileName);
+            view->setWindowTitle(fi.fileName());
             view->resize( 400, 300 );
             Gui::getMainWindow()->addWindow(view);
         } else {
diff --git a/src/Mod/Drawing/Gui/DrawingView.cpp b/src/Mod/Drawing/Gui/DrawingView.cpp
index bb3ce9e01..2fc8851d7 100644
--- a/src/Mod/Drawing/Gui/DrawingView.cpp
+++ b/src/Mod/Drawing/Gui/DrawingView.cpp
@@ -347,6 +347,15 @@ bool DrawingView::onHasMsg(const char* pMsg) const
     return false;
 }
 
+void DrawingView::onRelabel(Gui::Document *pDoc)
+{
+    const char* name = pDoc->getDocument()->Label.getValue();
+    QString title = QString::fromAscii("%1 : %2[*]")
+        .arg(QString::fromUtf8(name))
+        .arg(tr("Drawing"));
+    this->setWindowTitle(title);
+}
+
 void DrawingView::printPdf()
 {
     Gui::FileOptionsDialog dlg(this, 0);
diff --git a/src/Mod/Drawing/Gui/DrawingView.h b/src/Mod/Drawing/Gui/DrawingView.h
index 47f8ee852..b3fe5e27e 100644
--- a/src/Mod/Drawing/Gui/DrawingView.h
+++ b/src/Mod/Drawing/Gui/DrawingView.h
@@ -89,6 +89,7 @@ public Q_SLOTS:
 public:
     bool onMsg(const char* pMsg,const char** ppReturn);
     bool onHasMsg(const char* pMsg) const;
+    void onRelabel(Gui::Document *pDoc);
     void print();
     void printPdf();
     void printPreview();
diff --git a/src/Mod/Drawing/Gui/ViewProviderPage.cpp b/src/Mod/Drawing/Gui/ViewProviderPage.cpp
index e7f054cfc..204712905 100644
--- a/src/Mod/Drawing/Gui/ViewProviderPage.cpp
+++ b/src/Mod/Drawing/Gui/ViewProviderPage.cpp
@@ -136,7 +136,7 @@ DrawingView* ViewProviderDrawingPage::showDrawingView()
             (this->pcObject->getDocument());
         view = new DrawingView(doc, Gui::getMainWindow());
         view->setWindowIcon(Gui::BitmapFactory().pixmap("actions/drawing-landscape"));
-        view->setWindowTitle(QObject::tr("Drawing viewer") + QString::fromAscii("[*]"));
+        view->onRelabel(doc);
         Gui::getMainWindow()->addWindow(view);
     }