Hello community, here is the log from the commit of package umbrello for openSUSE:Factory checked in at 2015-03-11 09:55:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-02-11 16:42:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.umbrello.new/umbrello.changes 2015-03-11 09:55:44.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Mar 3 10:49:50 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 14.12.3 + * KDE Applications 14.12.3 + * See https://www.kde.org/announcements/announce-applications-14.12.3.php + +------------------------------------------------------------------- Old: ---- umbrello-14.12.2.tar.xz New: ---- umbrello-14.12.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ umbrello.spec ++++++ --- /var/tmp/diff_new_pack.xdFYyC/_old 2015-03-11 09:55:45.000000000 +0100 +++ /var/tmp/diff_new_pack.xdFYyC/_new 2015-03-11 09:55:45.000000000 +0100 @@ -24,7 +24,7 @@ License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/Other Url: http://www.kde.org/ -Version: 14.12.2 +Version: 14.12.3 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ umbrello-14.12.2.tar.xz -> umbrello-14.12.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-14.12.2/CMakeLists.txt new/umbrello-14.12.3/CMakeLists.txt --- old/umbrello-14.12.2/CMakeLists.txt 2015-01-19 13:30:42.000000000 +0100 +++ new/umbrello-14.12.3/CMakeLists.txt 2015-02-26 23:52:34.000000000 +0100 @@ -8,7 +8,7 @@ set(VERSION_MAJOR "2") set(VERSION_MINOR "15") -set(VERSION_PATCH "2") +set(VERSION_PATCH "3") # set default umbrello version # umbrello version could be overridden by cmake command line using -DUMBRELLO_VERSION_STRING=major.minor.patch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-14.12.2/umbrello/dialogs/pages/classgeneralpage.cpp new/umbrello-14.12.3/umbrello/dialogs/pages/classgeneralpage.cpp --- old/umbrello-14.12.2/umbrello/dialogs/pages/classgeneralpage.cpp 2015-01-19 13:30:42.000000000 +0100 +++ new/umbrello-14.12.3/umbrello/dialogs/pages/classgeneralpage.cpp 2015-02-26 23:52:34.000000000 +0100 @@ -285,7 +285,7 @@ m_pDeconCB->setChecked(m_pWidget->showDestruction()); m_pNameLayout->addWidget(m_pDeconCB, 2, 1); } - m_docWidget = new DocumentationWidget(m_pObject, this); + m_docWidget = new DocumentationWidget(m_pWidget, this); topLayout->addWidget(m_docWidget); if (m_pMultiCB) { @@ -353,11 +353,11 @@ */ void ClassGeneralPage::updateObject() { + m_docWidget->apply(); + if (m_pObject) { QString name = m_pClassNameLE->text(); - m_docWidget->apply(); - if (m_pStereoTypeCB) { m_pObject->setStereotype(m_pStereoTypeCB->currentText()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-14.12.2/umbrello/docwindow.cpp new/umbrello-14.12.3/umbrello/docwindow.cpp --- old/umbrello-14.12.2/umbrello/docwindow.cpp 2015-01-19 13:30:42.000000000 +0100 +++ new/umbrello-14.12.3/umbrello/docwindow.cpp 2015-02-26 23:52:34.000000000 +0100 @@ -16,6 +16,7 @@ #include "debug_utils.h" #include "folder.h" #include "icon_utils.h" +#include "uml.h" #include "umldoc.h" #include "umlobject.h" #include "umlscene.h" @@ -31,6 +32,41 @@ #include <QVBoxLayout> /** + * Displays the 'modified' state of class DocWindow documentation. + * + * Also provides left mouse click handler to apply documentation back + * to the related object/widget. + */ +class ModifiedWidget : public QLabel +{ +public: + ModifiedWidget(DocWindow *_parent) + : QLabel(_parent), + parent(_parent) + { + setAlignment(Qt::AlignCenter); + setToolTip(i18n("Flag whether documentation was modified. Press left mouse button to apply modified content.")); + } + + void setModified(bool state) + { + if (state) + setPixmap(Icon_Utils::SmallIcon(Icon_Utils::it_Document_Edit)); + else + setPixmap(QPixmap()); + } + + virtual void mousePressEvent(QMouseEvent *ev) + { + QLabel::mousePressEvent(ev); + parent->updateDocumentation(); + setPixmap(QPixmap()); + } + + DocWindow *parent; +}; + +/** * Constructor. */ DocWindow::DocWindow(UMLDoc * doc, QWidget *parent) @@ -51,9 +87,8 @@ m_nameLabel->setFrameStyle(QFrame::Panel | QFrame::Raised); m_nameLabel->setAlignment(Qt::AlignHCenter); statusLayout->addWidget(m_nameLabel, 0, 1, 1, 4); - m_modifiedLabel = createPixmapLabel(); - m_modifiedLabel->setToolTip(i18n("Flag whether documentation was modified")); - statusLayout->addWidget(m_modifiedLabel, 0, 5, 1, 1); + m_modifiedWidget = new ModifiedWidget(this); + statusLayout->addWidget(m_modifiedWidget, 0, 5, 1, 1); m_docTE = new KTextEdit(this); m_docTE->setText(QString()); //m_docTE->setWordWrapMode(QTextEdit::WidgetWidth); @@ -115,6 +150,7 @@ } else updateLabel(m_pUMLObject->name()); + toForeground(); } /** @@ -146,6 +182,7 @@ m_pUMLScene = scene; m_docTE->setText(m_pUMLScene->documentation()); updateLabel(m_pUMLScene->name()); + toForeground(); } /** @@ -185,6 +222,7 @@ m_pUMLWidget = widget; m_docTE->setText(m_pUMLWidget->documentation()); updateLabel(m_pUMLWidget->name()); + toForeground(); } /** @@ -213,6 +251,7 @@ m_pAssocWidget = widget; m_docTE->setText(m_pAssocWidget->documentation()); updateLabel(m_pAssocWidget->name()); + toForeground(); } /** @@ -397,12 +436,7 @@ m_typeLabel->setPixmap(Icon_Utils::SmallIcon(icon)); m_nameLabel->setText(name); } - if (isModified()) { - m_modifiedLabel->setPixmap(Icon_Utils::SmallIcon(Icon_Utils::it_Document_Edit)); - } - else { - m_modifiedLabel->setPixmap(QPixmap()); - } + m_modifiedWidget->setModified(isModified()); } /** @@ -416,4 +450,17 @@ return label; } +/** + * Bring doc window to foreground if it is tabbed with other dock widgets. + */ +void DocWindow::toForeground() +{ + foreach(QTabBar *tab, UMLApp::app()->findChildren<QTabBar *>()) { + for(int i = 0; i < tab->count(); i++) { + if (tab->tabText(i) == parentWidget()->windowTitle()) + tab->setCurrentIndex(i); + } + } +} + #include "docwindow.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-14.12.2/umbrello/docwindow.h new/umbrello-14.12.3/umbrello/docwindow.h --- old/umbrello-14.12.2/umbrello/docwindow.h 2015-01-19 13:30:42.000000000 +0100 +++ new/umbrello-14.12.3/umbrello/docwindow.h 2015-02-26 23:52:34.000000000 +0100 @@ -15,6 +15,7 @@ class AssociationWidget; class KTextEdit; +class ModifiedWidget; class QLabel; class UMLObject; class UMLDoc; @@ -74,12 +75,13 @@ QLabel *m_typeLabel; ///< label for type icon QLabel *m_nameLabel; ///< label for name text - QLabel *m_modifiedLabel; ///< label for modified flag icon + ModifiedWidget *m_modifiedWidget; ///< label for modified flag icon KTextEdit *m_docTE; ///< documentation widget bool isModified(); QLabel* createPixmapLabel(); void updateLabel(const QString &name = QString()); + void toForeground(); }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-14.12.2/umbrello/uml.cpp new/umbrello-14.12.3/umbrello/uml.cpp --- old/umbrello-14.12.2/umbrello/uml.cpp 2015-01-19 13:30:42.000000000 +0100 +++ new/umbrello-14.12.3/umbrello/uml.cpp 2015-02-26 23:52:34.000000000 +0100 @@ -481,7 +481,7 @@ viewProperties = actionCollection()->addAction(QLatin1String("view_properties")); viewProperties->setIcon(Icon_Utils::SmallIcon(Icon_Utils::it_Properties)); viewProperties->setText(i18n("&Properties")); - connect(viewProperties, SIGNAL(triggered(bool)), this, SLOT(slotCurrentViewProperties())); + connect(viewProperties, SIGNAL(triggered(bool)), this, SLOT(slotCurrentProperties())); viewSnapToGrid->setChecked(false); viewShowGrid->setChecked(false); @@ -2543,11 +2543,15 @@ } /** - * Menu selection for current view properties. + * Menu selection for current view and contained widgets properties. */ -void UMLApp::slotCurrentViewProperties() +void UMLApp::slotCurrentProperties() { - currentView()->showPropertiesDialog(); + UMLWidgetList items = currentView()->umlScene()->selectedWidgets(); + if (items.count() == 0) + currentView()->showPropertiesDialog(); + else if (items.count() == 1) + items.at(0)->showPropertiesDialog(); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-14.12.2/umbrello/uml.h new/umbrello-14.12.3/umbrello/uml.h --- old/umbrello-14.12.2/umbrello/uml.h 2015-01-19 13:30:42.000000000 +0100 +++ new/umbrello-14.12.3/umbrello/uml.h 2015-02-26 23:52:34.000000000 +0100 @@ -251,7 +251,7 @@ void slotCurrentViewToggleShowGrid(); void slotCurrentViewExportImage(); void slotAllViewsExportImage(); - void slotCurrentViewProperties(); + void slotCurrentProperties(); void slotClassWizard(); void slotAddDefaultDatatypes(); void slotCurrentViewChanged(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-14.12.2/umbrello/widgets/forkjoinwidget.cpp new/umbrello-14.12.3/umbrello/widgets/forkjoinwidget.cpp --- old/umbrello-14.12.2/umbrello/widgets/forkjoinwidget.cpp 2015-01-19 13:30:42.000000000 +0100 +++ new/umbrello-14.12.3/umbrello/widgets/forkjoinwidget.cpp 2015-02-26 23:52:34.000000000 +0100 @@ -27,6 +27,7 @@ : BoxWidget(scene, id, WidgetBase::wt_ForkJoin), m_orientation(ori) { + setSize(10, 40); } /** -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
