Hello community, here is the log from the commit of package umbrello for openSUSE:Factory checked in at 2013-09-09 11:11:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/umbrello (Old) and /work/SRC/openSUSE:Factory/.umbrello.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "umbrello" Changes: -------- --- /work/SRC/openSUSE:Factory/umbrello/umbrello.changes 2013-08-16 13:47:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.umbrello.new/umbrello.changes 2013-09-09 11:11:13.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Sep 1 10:38:51 UTC 2013 - [email protected] + +- Update to 4.11.1 + * KDE 4.11.1 bugfix release + * See http://www.kde.org/announcements/announce-4.11.1.php + +------------------------------------------------------------------- Old: ---- umbrello-4.11.0.tar.xz New: ---- umbrello-4.11.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ umbrello.spec ++++++ --- /var/tmp/diff_new_pack.NvawgD/_old 2013-09-09 11:11:14.000000000 +0200 +++ /var/tmp/diff_new_pack.NvawgD/_new 2013-09-09 11:11:14.000000000 +0200 @@ -24,7 +24,7 @@ License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/Other Url: http://www.kde.org/ -Version: 4.11.0 +Version: 4.11.1 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ umbrello-4.11.0.tar.xz -> umbrello-4.11.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/.krazy new/umbrello-4.11.1/.krazy --- old/umbrello-4.11.0/.krazy 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/.krazy 2013-08-28 19:14:58.000000000 +0200 @@ -1 +1 @@ -SKIP /umbrello/headings/\|/umbrello/_unused/ +SKIP /umbrello/headings/|/umbrello/_unused/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/doc/authors.docbook new/umbrello-4.11.1/doc/authors.docbook --- old/umbrello-4.11.0/doc/authors.docbook 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/doc/authors.docbook 2013-08-28 19:14:58.000000000 +0200 @@ -36,6 +36,6 @@ everyone is welcome to participate. </para> <para> -The &umbrello; developers can be reached at <email>[email protected]</email>. +The &umbrello; developers can be reached at <email>[email protected]</email>. </para> </chapter> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/doc/introduction.docbook new/umbrello-4.11.1/doc/introduction.docbook --- old/umbrello-4.11.0/doc/introduction.docbook 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/doc/introduction.docbook 2013-08-28 19:14:58.000000000 +0200 @@ -38,7 +38,7 @@ <para> We hope you enjoy &umbrello; and that it helps you create high quality software. &umbrello; is Free Software and available at no cost, the only thing we ask from you is to report any bugs, problems, or suggestions -to the &umbrello; developers at <email>[email protected]</email> or +to the &umbrello; developers at <email>[email protected]</email> or <ulink url="http://bugs.kde.org";>http://bugs.kde.org</ulink>. </para> </chapter> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/listpopupmenu.cpp new/umbrello-4.11.1/umbrello/listpopupmenu.cpp --- old/umbrello-4.11.0/umbrello/listpopupmenu.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/listpopupmenu.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -1831,6 +1831,8 @@ setActionChecked(mt_SnapToGrid, view->umlScene()->snapToGrid() ); insert(mt_ShowSnapGrid, i18n("Show Grid"), CHECKABLE); setActionChecked(mt_ShowSnapGrid, view->umlScene()->isSnapGridVisible() ); + insert(mt_ShowDocumentationIndicator, i18n("Show Documentation Indicator"), CHECKABLE); + setActionChecked(mt_ShowDocumentationIndicator, view->umlScene()->isShowDocumentationIndicator()); insert(mt_Properties); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/listpopupmenu.h new/umbrello-4.11.1/umbrello/listpopupmenu.h --- old/umbrello-4.11.0/umbrello/listpopupmenu.h 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/listpopupmenu.h 2013-08-28 19:14:58.000000000 +0200 @@ -193,6 +193,7 @@ mt_Change_Font, mt_Change_Font_Selection, mt_SnapToGrid, + mt_ShowDocumentationIndicator, mt_ShowSnapGrid, mt_Resize, mt_Activity_Selected, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/umlobject.cpp new/umbrello-4.11.1/umbrello/umlobject.cpp --- old/umbrello-4.11.0/umbrello/umlobject.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/umlobject.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -359,17 +359,6 @@ } /** - * Sets the documentation for the object. - * - * @param d The documentation for the object. - */ -void UMLObject::setDoc(const QString &d) -{ - m_Doc = d; - //emit modified(); No, this is done centrally at DocWindow::updateDocumentation() -} - -/** * Returns the type of the object. * * @return Returns the type of the object. @@ -418,6 +407,27 @@ } /** + * Returns state of documentation for the object. + * + * @return false if documentation is empty + */ +bool UMLObject::hasDoc() const +{ + return !m_Doc.isEmpty(); +} + +/** + * Sets the documentation for the object. + * + * @param d The documentation for the object. + */ +void UMLObject::setDoc(const QString &d) +{ + m_Doc = d; + //emit modified(); No, this is done centrally at DocWindow::updateDocumentation() +} + +/** * Returns the visibility of the object. * * @return Returns the visibility of the object. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/umlobject.h new/umbrello-4.11.1/umbrello/umlobject.h --- old/umbrello-4.11.0/umbrello/umlobject.h 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/umlobject.h 2013-08-28 19:14:58.000000000 +0200 @@ -94,8 +94,9 @@ virtual void setID(Uml::ID::Type NewID); virtual Uml::ID::Type id() const; - void setDoc(const QString &d); QString doc() const; + bool hasDoc() const; + void setDoc(const QString &d); void setVisibility(Uml::Visibility::Enum visibility); void setVisibilityCmd(Uml::Visibility::Enum visibility); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/umlscene.cpp new/umbrello-4.11.1/umbrello/umlscene.cpp --- old/umbrello-4.11.0/umbrello/umlscene.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/umlscene.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -91,6 +91,7 @@ // static members const UMLSceneValue UMLScene::defaultCanvasSize = 5000; +bool UMLScene::m_showDocumentationIndicator = false; using namespace Uml; @@ -3309,6 +3310,11 @@ m_doc->setModified(); break; + case ListPopupMenu::mt_ShowDocumentationIndicator: + setShowDocumentationIndicator(!isShowDocumentationIndicator()); + update(); + break; + case ListPopupMenu::mt_Properties: if (m_view->showPropDialog() == true) m_doc->setModified(); @@ -3656,6 +3662,22 @@ } /** + * Returns whether to show documentation indicator. + */ +bool UMLScene::isShowDocumentationIndicator() const +{ + return m_showDocumentationIndicator; +} + +/** + * sets whether to show documentation indicator. + */ +void UMLScene::setShowDocumentationIndicator(bool bShow) +{ + m_showDocumentationIndicator = bShow; +} + +/** * Returns whether to show operation signatures. */ bool UMLScene::showOpSig() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/umlscene.h new/umbrello-4.11.1/umbrello/umlscene.h --- old/umbrello-4.11.0/umbrello/umlscene.h 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/umlscene.h 2013-08-28 19:14:58.000000000 +0200 @@ -137,6 +137,9 @@ bool isSnapGridVisible() const; void setSnapGridVisible(bool bShow); + bool isShowDocumentationIndicator() const; + void setShowDocumentationIndicator(bool bShow); + bool useFillColor() const; void setUseFillColor(bool ufc); @@ -373,6 +376,7 @@ private: static const UMLSceneValue defaultCanvasSize; ///< The default size of a diagram in pixels. + static bool m_showDocumentationIndicator; ///< Status of documentation indicator UMLView *m_view; ///< The view to which this scene is related. UMLFolder *m_pFolder; ///< The folder in which this UMLView is contained. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/activitywidget.cpp new/umbrello-4.11.1/umbrello/widgets/activitywidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/activitywidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/activitywidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -291,8 +291,7 @@ break; } - if (m_selected) - paintSelected(painter); + UMLWidget::paint(painter, option, widget); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/actorwidget.cpp new/umbrello-4.11.1/umbrello/widgets/actorwidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/actorwidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/actorwidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -70,8 +70,7 @@ painter->setPen(textColor()); painter->drawText(A_MARGIN, h - fontHeight, w - A_MARGIN * 2, fontHeight, Qt::AlignCenter, name()); - if(m_selected) - paintSelected(painter); + UMLWidget::paint(painter, option, widget); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/artifactwidget.cpp new/umbrello-4.11.1/umbrello/widgets/artifactwidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/artifactwidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/artifactwidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -174,9 +174,7 @@ painter->drawText(0, h - fontHeight, w, fontHeight, Qt::AlignCenter, name()); - if(m_selected) { - paintSelected(painter); - } + UMLWidget::paint(painter, 0); } /** @@ -211,9 +209,7 @@ painter->drawText(0, h - fontHeight, w, fontHeight, Qt::AlignCenter, name()); - if(m_selected) { - paintSelected(painter); - } + UMLWidget::paint(painter, 0); } /** @@ -250,9 +246,7 @@ painter->drawText(0, h - fontHeight, w, fontHeight, Qt::AlignCenter, name()); - if(m_selected) { - paintSelected(painter); - } + UMLWidget::paint(painter, 0); } /** @@ -293,8 +287,6 @@ w, fontHeight, Qt::AlignCenter, name()); } - if(m_selected) { - paintSelected(painter); - } + UMLWidget::paint(painter, 0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/boxwidget.cpp new/umbrello-4.11.1/umbrello/widgets/boxwidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/boxwidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/boxwidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -43,9 +43,7 @@ setPenFromSettings(painter); painter->drawRect(0, 0, width(), height()); - if (m_selected) { - paintSelected(painter); - } + UMLWidget::paint(painter, option, widget); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/categorywidget.cpp new/umbrello-4.11.1/umbrello/widgets/categorywidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/categorywidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/categorywidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -86,8 +86,8 @@ painter->drawText(UC_MARGIN, textStartY, r - UC_MARGIN * 2, fontHeight, Qt::AlignCenter, letterType); UMLWidget::setPenFromSettings(painter); - if(m_selected) - paintSelected(painter); + + UMLWidget::paint(painter, option, widget); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/classifierwidget.cpp new/umbrello-4.11.1/umbrello/widgets/classifierwidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/classifierwidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/classifierwidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -678,8 +678,7 @@ m_bodyOffsetY, fontHeight); } - if (m_selected) - paintSelected(painter); + UMLWidget::paint(painter, option, widget); } /** @@ -706,9 +705,7 @@ painter->setFont(font); painter->drawText(0, CIRCLE_SIZE, w, fontHeight, Qt::AlignCenter, name); - if (m_selected) { - paintSelected(painter); - } + UMLWidget::paint(painter, 0); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/combinedfragmentwidget.cpp new/umbrello-4.11.1/umbrello/widgets/combinedfragmentwidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/combinedfragmentwidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/combinedfragmentwidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -177,8 +177,7 @@ painter->drawLine(line_width, 20, line_width + 10, 10); painter->drawLine(line_width + 10, 10, line_width + 10, 0); - if(m_selected) - paintSelected(painter); + UMLWidget::paint(painter, option, widget); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/componentwidget.cpp new/umbrello-4.11.1/umbrello/widgets/componentwidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/componentwidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/componentwidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -104,9 +104,7 @@ w - (COMPONENT_MARGIN*4), fontHeight, Qt::AlignCenter, nameStr ); } - if(m_selected) { - paintSelected(painter); - } + UMLWidget::paint(painter, option, widget); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/datatypewidget.cpp new/umbrello-4.11.1/umbrello/widgets/datatypewidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/datatypewidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/datatypewidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -79,9 +79,7 @@ painter->drawText(DATATYPE_MARGIN, fontHeight, w - DATATYPE_MARGIN * 2, fontHeight, Qt::AlignCenter, name()); - if (m_selected) { - paintSelected(painter); - } + UMLWidget::paint(painter, option, widget); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/entitywidget.cpp new/umbrello-4.11.1/umbrello/widgets/entitywidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/entitywidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/entitywidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -121,9 +121,7 @@ y+=fontHeight; } - if (m_selected) { - paintSelected(painter); - } + UMLWidget::paint(painter, option, widget); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/floatingdashlinewidget.cpp new/umbrello-4.11.1/umbrello/widgets/floatingdashlinewidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/floatingdashlinewidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/floatingdashlinewidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -68,8 +68,8 @@ Qt::AlignLeft, '[' + m_Text + ']'); painter->setPen(QPen(UMLWidget::lineColor(), 0, Qt::DashLine)); painter->drawLine(0, 0, width(), 0); - if(m_selected) - paintSelected(painter); + + UMLWidget::paint(painter, option, widget); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/floatingtextwidget.cpp new/umbrello-4.11.1/umbrello/widgets/floatingtextwidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/floatingtextwidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/floatingtextwidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -472,8 +472,8 @@ painter->setFont( UMLWidget::font() ); painter->setPen(textColor()); painter->drawText(0, 0, w, h, Qt::AlignCenter, displayText()); - if(m_selected) - paintSelected(painter); + + UMLWidget::paint(painter, option, widget); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/forkjoinwidget.cpp new/umbrello-4.11.1/umbrello/widgets/forkjoinwidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/forkjoinwidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/forkjoinwidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -65,9 +65,7 @@ painter->fillRect(0, 0, width(), height(), QBrush( Qt::black )); - if (m_selected) { - paintSelected(painter); - } + UMLWidget::paint(painter, option, widget); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/nodewidget.cpp new/umbrello-4.11.1/umbrello/widgets/nodewidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/nodewidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/nodewidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -96,9 +96,7 @@ bodyWidth, fontHeight, Qt::AlignCenter, nameStr); } - if(m_selected) { - paintSelected(painter); - } + UMLWidget::paint(painter, option, widget); } UMLSceneSize NodeWidget::minimumSize() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/notewidget.cpp new/umbrello-4.11.1/umbrello/widgets/notewidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/notewidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/notewidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -59,8 +59,8 @@ Q_UNUSED(widget); const int margin = 10; - int w = width()-1; - int h = height()-1; + int w = width(); + int h = height(); const QFontMetrics &fm = getFontMetrics(FT_NORMAL); const int fontHeight = fm.lineSpacing(); QPolygon poly(6); @@ -96,9 +96,7 @@ break; } - if (m_selected) { - paintSelected(painter); - } + UMLWidget::paint(painter, option, widget); // paintText(&p, 0, 0); paintTextWordWrap(painter); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/objectnodewidget.cpp new/umbrello-4.11.1/umbrello/widgets/objectnodewidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/objectnodewidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/objectnodewidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -116,9 +116,7 @@ break; } - if(m_selected) - paintSelected(painter); - + UMLWidget::paint(painter, option, widget); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/objectwidget.cpp new/umbrello-4.11.1/umbrello/widgets/objectwidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/objectwidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/objectwidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -138,8 +138,8 @@ paintObject(painter); setPenFromSettings(painter); - if(m_selected) - paintSelected(painter); + + UMLWidget::paint(painter, option, widget); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/packagewidget.cpp new/umbrello-4.11.1/umbrello/widgets/packagewidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/packagewidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/packagewidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -99,9 +99,7 @@ painter->drawText(0, (fontHeight*lines) + PACKAGE_MARGIN, w, fontHeight, Qt::AlignCenter, name() ); - if(m_selected) { - paintSelected(painter); - } + UMLWidget::paint(painter, option, widget); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/pinwidget.cpp new/umbrello-4.11.1/umbrello/widgets/pinwidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/pinwidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/pinwidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -42,6 +42,7 @@ : UMLWidget(scene, WidgetBase::wt_Pin, id), m_pOw(a) { + setParent(a); m_ignoreSnapToGrid = true; m_ignoreSnapComponentSizeToGrid = true; m_resizable = false; @@ -64,6 +65,8 @@ */ PinWidget::~PinWidget() { + if (m_scene->widgetList().contains(this)) + m_scene->widgetList().removeAll(this); } /** @@ -144,8 +147,8 @@ setPenFromSettings(painter); m_pName->setVisible(( m_pName->text().length() > 0 )); m_pName->updateGeometry(); - if(m_selected) - paintSelected(painter); + + UMLWidget::paint(painter, option, widget); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/preconditionwidget.cpp new/umbrello-4.11.1/umbrello/widgets/preconditionwidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/preconditionwidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/preconditionwidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -105,8 +105,8 @@ painter->drawText(PRECONDITION_MARGIN, textStartY, w - PRECONDITION_MARGIN * 2, fontHeight, Qt::AlignCenter, precondition_value); } - if(m_selected) - paintSelected(painter); + + UMLWidget::paint(painter, option, widget); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/regionwidget.cpp new/umbrello-4.11.1/umbrello/widgets/regionwidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/regionwidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/regionwidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -58,9 +58,7 @@ painter->setPen(pen); painter->drawRoundRect(0, 0, w, h, (h * 60) / w, 60); - if (m_selected) { - paintSelected(painter); - } + UMLWidget::paint(painter, option, widget); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/signalwidget.cpp new/umbrello-4.11.1/umbrello/widgets/signalwidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/signalwidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/signalwidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -155,8 +155,8 @@ uWarning() << "Unknown signal type:" << m_signalType; break; } - if(m_selected) - paintSelected(painter); + + UMLWidget::paint(painter, option, widget); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/statewidget.cpp new/umbrello-4.11.1/umbrello/widgets/statewidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/statewidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/statewidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -185,9 +185,8 @@ uWarning() << "Unknown state type: " << stateTypeStr(); break; } - if (m_selected) { - paintSelected(painter); - } + + UMLWidget::paint(painter, option, widget); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/umlwidget.cpp new/umbrello-4.11.1/umbrello/widgets/umlwidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/umlwidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/umlwidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -1135,6 +1135,25 @@ } } +void UMLWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) +{ + Q_UNUSED(option); + Q_UNUSED(widget); + + if (m_selected) + paintSelected(painter); + + if (umlScene()->isShowDocumentationIndicator() && hasDocumentation()) { + const qreal h = height(); + const qreal d = 8; + QPolygonF p; + p << QPointF(0, h - d) << QPointF(d, h) << QPointF(0, h); + painter->setPen(Qt::blue); + painter->setBrush(Qt::red); + painter->drawPolygon(p); + } +} + /** * Template Method, override this to set the default font metric. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/umlwidget.h new/umbrello-4.11.1/umbrello/widgets/umlwidget.h --- old/umbrello-4.11.0/umbrello/widgets/umlwidget.h 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/umlwidget.h 2013-08-28 19:14:58.000000000 +0200 @@ -246,6 +246,8 @@ void setFontMetrics(UMLWidget::FontType fontType, QFontMetrics fm); void setupFontType(QFont &font, UMLWidget::FontType fontType); + virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + ///////////////// Data Loaded/Saved ///////////////////////////////// /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/usecasewidget.cpp new/umbrello-4.11.1/umbrello/widgets/usecasewidget.cpp --- old/umbrello-4.11.0/umbrello/widgets/usecasewidget.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/usecasewidget.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -59,8 +59,8 @@ painter->setPen(textColor()); painter->drawText(UC_MARGIN, textStartY, w - UC_MARGIN * 2, fontHeight, Qt::AlignCenter, name()); setPenFromSettings(painter); - if(m_selected) - paintSelected(painter); + + UMLWidget::paint(painter, option, widget); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/widgetbase.cpp new/umbrello-4.11.1/umbrello/widgets/widgetbase.cpp --- old/umbrello-4.11.0/umbrello/widgets/widgetbase.cpp 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/widgetbase.cpp 2013-08-28 19:14:58.000000000 +0200 @@ -161,6 +161,18 @@ } /** + * Returns state of documentation for the widget. + * + * @return false if documentation is empty + */ +bool WidgetBase::hasDocumentation() +{ + if (m_umlObject) + return m_umlObject->hasDoc(); + return !m_Doc.isEmpty(); +} + +/** * Used by some child classes to set documentation. * * @param doc The documentation to be set in the UMLObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.0/umbrello/widgets/widgetbase.h new/umbrello-4.11.1/umbrello/widgets/widgetbase.h --- old/umbrello-4.11.0/umbrello/widgets/widgetbase.h 2013-07-10 01:43:24.000000000 +0200 +++ new/umbrello-4.11.1/umbrello/widgets/widgetbase.h 2013-08-28 19:14:58.000000000 +0200 @@ -89,6 +89,7 @@ UMLDoc* umlDoc() const; QString documentation() const; + bool hasDocumentation(); void setDocumentation(const QString& doc); QString name() const; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
