Hello community, here is the log from the commit of package umbrello for openSUSE:Factory checked in at 2014-06-19 13:18:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-22 06:54:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.umbrello.new/umbrello.changes 2014-06-19 13:18:54.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Jun 8 19:03:33 UTC 2014 - [email protected] + +- Update to 4.13.2 + * KDE 4.13 release + * See http://www.kde.org/announcements/announce-4.13.2.php + +------------------------------------------------------------------- Old: ---- umbrello-4.13.1.tar.xz New: ---- umbrello-4.13.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ umbrello.spec ++++++ --- /var/tmp/diff_new_pack.9d72fM/_old 2014-06-19 13:18:55.000000000 +0200 +++ /var/tmp/diff_new_pack.9d72fM/_new 2014-06-19 13:18:55.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.13.1 +Version: 4.13.2 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ umbrello-4.13.1.tar.xz -> umbrello-4.13.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.13.1/CMakeLists.txt new/umbrello-4.13.2/CMakeLists.txt --- old/umbrello-4.13.1/CMakeLists.txt 2014-05-08 08:07:02.000000000 +0200 +++ new/umbrello-4.13.2/CMakeLists.txt 2014-06-04 21:08:27.000000000 +0200 @@ -8,7 +8,7 @@ set(VERSION_MAJOR "2") set(VERSION_MINOR "13") -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.13.1/lib/cppparser/errors.cpp new/umbrello-4.13.2/lib/cppparser/errors.cpp --- old/umbrello-4.13.1/lib/cppparser/errors.cpp 2014-05-08 08:07:02.000000000 +0200 +++ new/umbrello-4.13.2/lib/cppparser/errors.cpp 2014-06-04 21:08:27.000000000 +0200 @@ -20,6 +20,26 @@ #include "errors.h" #include <klocale.h> -QT_STATIC_CONST_IMPL Error& Errors::InternalError = Error(1, -1, i18n("Internal Error")); -QT_STATIC_CONST_IMPL Error& Errors::SyntaxError = Error(2, -1, i18n("Syntax Error before '%1'")); -QT_STATIC_CONST_IMPL Error& Errors::ParseError = Error(3, -1, i18n("Parse Error before '%1'")); +Error& Errors::_InternalError() +{ + static Error *error = 0; + if (error == 0) + error = new Error(1, -1, i18n("Internal Error")); + return *error; +} + +Error &Errors::_SyntaxError() +{ + static Error *error = 0; + if (error == 0) + error = new Error(2, -1, i18n("Syntax Error before '%1'")); + return *error; +} + +Error &Errors::_ParseError() +{ + static Error *error = 0; + if (error == 0) + error = new Error(3, -1, i18n("Parse Error before '%1'")); + return *error; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.13.1/lib/cppparser/errors.h new/umbrello-4.13.2/lib/cppparser/errors.h --- old/umbrello-4.13.1/lib/cppparser/errors.h 2014-05-08 08:07:02.000000000 +0200 +++ new/umbrello-4.13.2/lib/cppparser/errors.h 2014-06-04 21:08:27.000000000 +0200 @@ -36,11 +36,14 @@ class Errors { public: - QT_STATIC_CONST Error& InternalError; - QT_STATIC_CONST Error& SyntaxError; - QT_STATIC_CONST Error& ParseError; + static Error& _InternalError(); + static Error& _SyntaxError(); + static Error& _ParseError(); }; +#define InternalError _InternalError() +#define SyntaxError _SyntaxError() +#define ParseError _ParseError() #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.13.1/umbrello/codegenerators/codegenerator.cpp new/umbrello-4.13.2/umbrello/codegenerators/codegenerator.cpp --- old/umbrello-4.13.1/umbrello/codegenerators/codegenerator.cpp 2014-05-08 08:07:02.000000000 +0200 +++ new/umbrello-4.13.2/umbrello/codegenerators/codegenerator.cpp 2014-06-04 21:08:27.000000000 +0200 @@ -592,6 +592,9 @@ } else { QDir outputDirectory = UMLApp::app()->commonPolicy()->getOutputDirectory(); + if (!outputDirectory.exists()) + outputDirectory.mkpath(outputDirectory.absolutePath()); + file.setFileName(outputDirectory.absoluteFilePath(fileName)); if(!file.open(QIODevice::WriteOnly)) { KMessageBox::sorry(0, i18n("Cannot open file %1 for writing. Please make sure the folder exists and you have permissions to write to it.", file.fileName()), i18n("Cannot Open File")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.13.1/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp new/umbrello-4.13.2/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp --- old/umbrello-4.13.1/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp 2014-05-08 08:07:02.000000000 +0200 +++ new/umbrello-4.13.2/umbrello/codeimport/kdevcppparser/cpptree2uml.cpp 2014-06-04 21:08:27.000000000 +0200 @@ -211,6 +211,10 @@ { TypeSpecifierAST* typeSpec = ast->typeSpec(); InitDeclaratorListAST* declarators = ast->initDeclaratorList(); + GroupAST* storageSpec = ast->storageSpecifier(); + + if (storageSpec && storageSpec->text() == "friend") + return; m_comment = ast->comment(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.13.1/umbrello/dialogs/diagrampropertiespage.ui new/umbrello-4.13.2/umbrello/dialogs/diagrampropertiespage.ui --- old/umbrello-4.13.1/umbrello/dialogs/diagrampropertiespage.ui 2014-05-08 08:07:02.000000000 +0200 +++ new/umbrello-4.13.2/umbrello/dialogs/diagrampropertiespage.ui 2014-06-04 21:08:27.000000000 +0200 @@ -235,36 +235,6 @@ </layout> </item> <item> - <layout class="QHBoxLayout"> - <property name="spacing"> - <number>6</number> - </property> - <property name="margin"> - <number>0</number> - </property> - <item> - <widget class="QLabel" name="ui_labeLineWidth"> - <property name="text"> - <string>Line width: </string> - </property> - <property name="wordWrap"> - <bool>false</bool> - </property> - </widget> - </item> - <item> - <widget class="QSpinBox" name="ui_lineWidth"> - <property name="minimum"> - <number>0</number> - </property> - <property name="maximum"> - <number>10</number> - </property> - </widget> - </item> - </layout> - </item> - <item> <widget class="Line" name="line"> <property name="orientation"> <enum>Qt::Horizontal</enum> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.13.1/umbrello/umldoc.cpp new/umbrello-4.13.2/umbrello/umldoc.cpp --- old/umbrello-4.13.1/umbrello/umldoc.cpp 2014-05-08 08:07:02.000000000 +0200 +++ new/umbrello-4.13.2/umbrello/umldoc.cpp 2014-06-04 21:08:27.000000000 +0200 @@ -537,6 +537,7 @@ if (filetype.endsWith(QLatin1String(".mdl"))) { status = Import_Rose::loadFromMDL(file); if (status) { + m_doc_url.setFileName(i18n("Untitled")); QString name = createDiagramName(Uml::DiagramType::Class, false); createDiagram(m_root[Uml::ModelType::Logical], Uml::DiagramType::Class, name); m_pCurrentRoot = m_root[Uml::ModelType::Logical]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.13.1/umbrello/widgets/associationline.cpp new/umbrello-4.13.2/umbrello/widgets/associationline.cpp --- old/umbrello-4.13.1/umbrello/widgets/associationline.cpp 2014-05-08 08:07:02.000000000 +0200 +++ new/umbrello-4.13.2/umbrello/widgets/associationline.cpp 2014-06-04 21:08:27.000000000 +0200 @@ -737,6 +737,7 @@ { QPainterPathStroker stroker; stroker.setWidth(qMax<qreal>(2*SelectedPointDiameter, pen().widthF()) + 2.0); // allow delta region + stroker.setCapStyle(Qt::FlatCap); return stroker.createStroke(path()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.13.1/umbrello/widgets/associationwidget.cpp new/umbrello-4.13.2/umbrello/widgets/associationwidget.cpp --- old/umbrello-4.13.1/umbrello/widgets/associationwidget.cpp 2014-05-08 08:07:02.000000000 +0200 +++ new/umbrello-4.13.2/umbrello/widgets/associationwidget.cpp 2014-06-04 21:08:27.000000000 +0200 @@ -3749,9 +3749,8 @@ { // check the path const qreal diameter(4.0); - QRectF circle(point.x(), point.y(), diameter, diameter); QPainterPath path = m_associationLine->shape(); - if (path.intersects(circle)) { + if (path.contains(point)) { DEBUG(DBG_SRC) << "on path"; return true; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
