Hello community, here is the log from the commit of package umbrello for openSUSE:Factory checked in at 2014-10-16 18:14:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-09-18 08:01:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.umbrello.new/umbrello.changes 2014-10-16 18:16:10.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Oct 12 12:41:14 UTC 2014 - [email protected] + +- Update to 4.14.2 + * KDE 4.14.2 SC Bugfix Release + * See http://www.kde.org/announcements/announce-4.14.2.php + +------------------------------------------------------------------- Old: ---- umbrello-4.14.1.tar.xz New: ---- umbrello-4.14.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ umbrello.spec ++++++ --- /var/tmp/diff_new_pack.Bjj7Ap/_old 2014-10-16 18:16:11.000000000 +0200 +++ /var/tmp/diff_new_pack.Bjj7Ap/_new 2014-10-16 18:16:11.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.14.1 +Version: 4.14.2 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ umbrello-4.14.1.tar.xz -> umbrello-4.14.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.14.1/CMakeLists.txt new/umbrello-4.14.2/CMakeLists.txt --- old/umbrello-4.14.1/CMakeLists.txt 2014-09-10 23:54:21.000000000 +0200 +++ new/umbrello-4.14.2/CMakeLists.txt 2014-10-09 12:29:41.000000000 +0200 @@ -8,7 +8,7 @@ set(VERSION_MAJOR "2") set(VERSION_MINOR "14") -set(VERSION_PATCH "1") +set(VERSION_PATCH "2") # 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-4.14.1/umbrello/docwindow.cpp new/umbrello-4.14.2/umbrello/docwindow.cpp --- old/umbrello-4.14.1/umbrello/docwindow.cpp 2014-09-10 23:54:21.000000000 +0200 +++ new/umbrello-4.14.2/umbrello/docwindow.cpp 2014-10-09 12:29:41.000000000 +0200 @@ -91,17 +91,21 @@ reset(); return; } - if (object == m_pUMLObject) { - if (overwrite) { - updateDocumentation(true); - } - else { + + if (m_Showing == st_UMLObject && object == m_pUMLObject) { + if (!overwrite) { return; } } + else if (m_Showing == st_UMLWidget && object == m_pUMLWidget->umlObject()) { + if (!overwrite) { + updateDocumentation(); + } + } else { updateDocumentation(true); } + m_Showing = st_UMLObject; m_pUMLObject = object; m_docTE->setText(m_pUMLObject->doc()); @@ -123,17 +127,21 @@ reset(); return; } - if (scene == m_pUMLScene) { - if (overwrite) { - updateDocumentation(true); - } - else { + + if (m_Showing == st_UMLScene && scene == m_pUMLScene) { + if (!overwrite) { return; } } + else if (m_Showing == st_UMLWidget && scene == m_pUMLWidget->umlScene()) { + if (!overwrite) { + updateDocumentation(); + } + } else { updateDocumentation(true); } + m_Showing = st_UMLScene; m_pUMLScene = scene; m_docTE->setText(m_pUMLScene->documentation()); @@ -151,17 +159,28 @@ reset(); return; } - if (widget == m_pUMLWidget) { - if (overwrite) { - updateDocumentation(true); - } - else { + + if (m_Showing == st_UMLWidget && widget == m_pUMLWidget) { + if (!overwrite) { return; } } + else if (m_Showing == st_UMLObject && widget->umlObject() == m_pUMLObject) + { + if (!overwrite) { + updateDocumentation(); + } + } + else if (m_Showing == st_UMLScene && widget->umlScene() == m_pUMLScene) + { + if (!overwrite) { + updateDocumentation(); + } + } else { updateDocumentation(true); } + m_Showing = st_UMLWidget; m_pUMLWidget = widget; m_docTE->setText(m_pUMLWidget->documentation()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.14.1/umbrello/petaltree2uml.cpp new/umbrello-4.14.2/umbrello/petaltree2uml.cpp --- old/umbrello-4.14.1/umbrello/petaltree2uml.cpp 2014-09-10 23:54:21.000000000 +0200 +++ new/umbrello-4.14.2/umbrello/petaltree2uml.cpp 2014-10-09 12:29:41.000000000 +0200 @@ -457,7 +457,6 @@ return NULL; } UMLPackage *controlledUnit = loadFromMDL(file, parentPkg); - file.close(); return controlledUnit; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.14.1/umbrello/umldoc.cpp new/umbrello-4.14.2/umbrello/umldoc.cpp --- old/umbrello-4.14.1/umbrello/umldoc.cpp 2014-09-10 23:54:21.000000000 +0200 +++ new/umbrello-4.14.2/umbrello/umldoc.cpp 2014-10-09 12:29:41.000000000 +0200 @@ -88,7 +88,7 @@ m_Doc(QString()), m_pAutoSaveTimer(0), m_nViewID(Uml::ID::None), - m_bTypesAreResolved(false), + m_bTypesAreResolved(true), m_pCurrentRoot(0), m_bClosing(false) { @@ -358,7 +358,6 @@ */ } m_bClosing = false; - m_bTypesAreResolved = false; } /** @@ -443,6 +442,7 @@ KTar archive(tmpfile, mimetype); if (archive.open(QIODevice::ReadOnly) == false) { KMessageBox::error(0, i18n("The file %1 seems to be corrupted.", url.pathOrUrl()), i18n("Load Error")); + KIO::NetAccess::removeTempFile(tmpfile); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -481,6 +481,7 @@ if (entry == 0) { KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.", url.pathOrUrl()), i18n("Load Error")); + KIO::NetAccess::removeTempFile(tmpfile); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -493,6 +494,7 @@ if (fileEntry == 0) { KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.", url.pathOrUrl()), i18n("Load Error")); + KIO::NetAccess::removeTempFile(tmpfile); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -507,11 +509,13 @@ if(!xmi_file.open(QIODevice::ReadOnly)) { KMessageBox::error(0, i18n("There was a problem loading the extracted file: %1", url.pathOrUrl()), i18n("Load Error")); + KIO::NetAccess::removeTempFile(tmpfile); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); return false; } + m_bTypesAreResolved = false; status = loadFromXMI(xmi_file, ENC_UNKNOWN); // close the extracted file and the temporary directory @@ -519,6 +523,7 @@ } else { KMessageBox::error(0, i18n("There was no XMI file found in the compressed file %1.", url.pathOrUrl()), i18n("Load Error")); + KIO::NetAccess::removeTempFile(tmpfile); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); @@ -528,54 +533,49 @@ archive.close(); } else { // no, it seems to be an ordinary file - if(!file.open(QIODevice::ReadOnly)) { + if (!file.open(QIODevice::ReadOnly)) { KMessageBox::error(0, i18n("There was a problem loading file: %1", url.pathOrUrl()), i18n("Load Error")); + KIO::NetAccess::removeTempFile(tmpfile); m_doc_url.setFileName(i18n("Untitled")); m_bLoading = false; newDocument(); return false; } if (filetype.endsWith(QLatin1String(".mdl"))) { + m_doc_url.setFileName(i18n("Untitled")); + m_bTypesAreResolved = false; status = Import_Rose::loadFromMDL(file); if (status) { - m_doc_url.setFileName(i18n("Untitled")); if (UMLApp::app()->currentView() == 0) { QString name = createDiagramName(Uml::DiagramType::Class, false); createDiagram(m_root[Uml::ModelType::Logical], Uml::DiagramType::Class, name); setCurrentRoot(Uml::ModelType::Logical); } } - else - newDocument(); } else if (filetype.endsWith(QLatin1String(".zargo"))) { m_doc_url.setFileName(i18n("Untitled")); status = Import_Argo::loadFromZArgoFile(file); - if (!status) { - KMessageBox::error(0, i18n("There was a problem loading file: %1", url.pathOrUrl()), - i18n("Load Error")); - m_bLoading = false; - newDocument(); - return false; - } } else { + m_bTypesAreResolved = false; status = loadFromXMI(file, ENC_UNKNOWN); } } - file.close(); + if (file.isOpen()) + file.close(); KIO::NetAccess::removeTempFile(tmpfile); + m_bLoading = false; + m_bTypesAreResolved = true; if (!status) { KMessageBox::error(0, i18n("There was a problem loading file: %1", url.pathOrUrl()), i18n("Load Error")); - m_bLoading = false; newDocument(); return false; } setModified(false); - m_bLoading = false; initSaveTimer(); UMLApp::app()->enableUndoAction(false); @@ -1243,7 +1243,7 @@ */ bool UMLDoc::loading() const { - return m_bLoading; + return m_bLoading || !m_bTypesAreResolved; } /** @@ -2152,7 +2152,6 @@ if (m_bTypesAreResolved) { return; } - m_bTypesAreResolved = true; writeToStatusBar(i18n("Resolving object references...")); for (int i = 0; i < Uml::ModelType::N_MODELTYPES; ++i) { UMLFolder *obj = m_root[i]; @@ -2162,6 +2161,7 @@ #endif obj->resolveRef(); } + m_bTypesAreResolved = true; qApp->processEvents(); // give UI events a chance } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.14.1/umbrello/umllistview.cpp new/umbrello-4.14.2/umbrello/umllistview.cpp --- old/umbrello-4.14.1/umbrello/umllistview.cpp 2014-09-10 23:54:21.000000000 +0200 +++ new/umbrello-4.14.2/umbrello/umllistview.cpp 2014-10-09 12:29:41.000000000 +0200 @@ -834,6 +834,8 @@ item->setSelected(true); UMLApp::app()->docWindow()->showDocumentation(scene, false); } + } else { + uError() << "UmlDoc::findView(" << Uml::ID::toString(id) << ") returns NULL"; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.14.1/umbrello/umlscene.cpp new/umbrello-4.14.2/umbrello/umlscene.cpp --- old/umbrello-4.14.1/umbrello/umlscene.cpp 2014-09-10 23:54:21.000000000 +0200 +++ new/umbrello-4.14.2/umbrello/umlscene.cpp 2014-10-09 12:29:41.000000000 +0200 @@ -890,7 +890,7 @@ UMLWidget* widget = widgetAt(event->scenePos()); if (widget) { DEBUG(DBG_SRC) << "widget = " << widget->name() << " / type = " << widget->baseTypeStr(); - UMLApp::app()->docWindow()->showDocumentation(widget, true); + UMLApp::app()->docWindow()->showDocumentation(widget); event->accept(); } else { @@ -905,7 +905,7 @@ //:TODO: UMLApp::app()->docWindow()->showDocumentation(umlObject, true); else { // clicking on an empty space in the diagram with arrow tool - UMLApp::app()->docWindow()->showDocumentation(this, true); + UMLApp::app()->docWindow()->showDocumentation(this); event->accept(); } } @@ -917,7 +917,8 @@ */ void UMLScene::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event) { - m_pToolBarState->mouseDoubleClick(event); + if (!m_doc->loading()) + m_pToolBarState->mouseDoubleClick(event); if (!event->isAccepted()) { // show properties dialog of the scene if (m_view->showPropDialog() == true) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.14.1/umbrello/widgets/associationwidget.cpp new/umbrello-4.14.2/umbrello/widgets/associationwidget.cpp --- old/umbrello-4.14.1/umbrello/widgets/associationwidget.cpp 2014-09-10 23:54:21.000000000 +0200 +++ new/umbrello-4.14.2/umbrello/widgets/associationwidget.cpp 2014-10-09 12:29:41.000000000 +0200 @@ -434,6 +434,7 @@ */ void AssociationWidget::showPropertiesDialog() { + UMLApp::app()->docWindow()->updateDocumentation(); QPointer<AssociationPropertiesDialog> dlg = new AssociationPropertiesDialog(static_cast<QWidget*>(m_scene->activeView()), this); if (dlg->exec()) { //rules built into these functions to stop updating incorrect values diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.14.1/umbrello/widgets/notewidget.cpp new/umbrello-4.14.2/umbrello/widgets/notewidget.cpp --- old/umbrello-4.14.1/umbrello/widgets/notewidget.cpp 2014-09-10 23:54:21.000000000 +0200 +++ new/umbrello-4.14.2/umbrello/widgets/notewidget.cpp 2014-10-09 12:29:41.000000000 +0200 @@ -232,7 +232,7 @@ */ void NoteWidget::rename() { - UMLApp::app()->docWindow()->showDocumentation(this, true); + UMLApp::app()->docWindow()->showDocumentation(this); UMLApp::app()->docWindow()->setFocus(); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
