suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fix DrawingView::onRelabel() to accept any page names

Browse Source
This commit is contained in:
wmayer 2014-08-21 17:26:52 +02:00
parent 7cc5167623
commit 1b4fb56cdc
2 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Mod/Drawing/Gui/DrawingView.cpp
View File

@ -349,21 +349,11 @@ bool DrawingView::onHasMsg(const char* pMsg) const
void DrawingView::onRelabel(Gui::Document *pDoc)
{
if (!bIsPassive) {
// Try to separate document name and object name if there is one
QString cap = windowTitle();
QRegExp rx(QString::fromLatin1(" : (\\w|\\s){1,}(\\[\\*\\]){0,1}$"));
int pos = rx.lastIndexIn(cap);
if (pos != -1) {
cap = QString::fromUtf8(pDoc->getDocument()->Label.getValue());
cap += rx.cap();
setWindowTitle(cap);
}
else {
cap = QString::fromUtf8(pDoc->getDocument()->Label.getValue());
cap = QString::fromAscii("%1[*]").arg(cap);
setWindowTitle(cap);
}
if (!bIsPassive && pDoc) {
QString cap = QString::fromLatin1("%1 : %2[*]")
.arg(QString::fromUtf8(pDoc->getDocument()->Label.getValue()))
.arg(objectName());
setWindowTitle(cap);
}
}

16
src/Mod/Drawing/Gui/ViewProviderPage.cpp
View File

@ -106,12 +106,11 @@ void ViewProviderDrawingPage::updateData(const App::Property* prop)
}
else if (pcObject && prop == &pcObject->Label) {
if (view){
const char* docname = pcObject->getDocument()->Label.getValue();
const char* objname = pcObject->Label.getValue();
QString title = QString::fromAscii("%1 : %2[*]")
.arg(QString::fromUtf8(docname))
.arg(QString::fromUtf8(objname));
view->setWindowTitle(title);
view->setObjectName(QString::fromUtf8(objname));
Gui::Document* doc = Gui::Application::Instance->getDocument
(pcObject->getDocument());
view->onRelabel(doc);
}
}
}
@ -147,12 +146,9 @@ DrawingView* ViewProviderDrawingPage::showDrawingView()
view = new DrawingView(doc, Gui::getMainWindow());
view->setWindowIcon(Gui::BitmapFactory().pixmap("actions/drawing-landscape"));
const char* docname = pcObject->getDocument()->Label.getValue();
const char* objname = pcObject->Label.getValue();
QString title = QString::fromAscii("%1 : %2[*]")
.arg(QString::fromUtf8(docname))
.arg(QString::fromUtf8(objname));
view->setWindowTitle(title);
view->setObjectName(QString::fromUtf8(objname));
view->onRelabel(doc);
Gui::getMainWindow()->addWindow(view);
}