Hello community, here is the log from the commit of package umbrello for openSUSE:Factory checked in at 2015-05-15 10:04:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-11 19:22:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.umbrello.new/umbrello.changes 2015-05-15 10:04:22.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 11 11:29:04 UTC 2015 - [email protected] + +- Update to KDE Applications 15.04.1 + * KDE Applications 15.04.1 + * https://www.kde.org/announcements/announce-applications-15.04.1.php + + +------------------------------------------------------------------- Old: ---- umbrello-15.04.0.tar.xz New: ---- umbrello-15.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ umbrello.spec ++++++ --- /var/tmp/diff_new_pack.AnNFFE/_old 2015-05-15 10:04:23.000000000 +0200 +++ /var/tmp/diff_new_pack.AnNFFE/_new 2015-05-15 10:04:23.000000000 +0200 @@ -24,7 +24,7 @@ License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/Other Url: http://www.kde.org/ -Version: 15.04.0 +Version: 15.04.1 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ umbrello-15.04.0.tar.xz -> umbrello-15.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/CMakeLists.txt new/umbrello-15.04.1/CMakeLists.txt --- old/umbrello-15.04.0/CMakeLists.txt 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/CMakeLists.txt 2015-05-07 12:44:41.000000000 +0200 @@ -8,7 +8,7 @@ set(VERSION_MAJOR "2") set(VERSION_MINOR "16") -set(VERSION_PATCH "0") +set(VERSION_PATCH "1") # 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-15.04.0/umbrello/codegenerators/codegenfactory.cpp new/umbrello-15.04.1/umbrello/codegenerators/codegenfactory.cpp --- old/umbrello-15.04.0/umbrello/codegenerators/codegenfactory.cpp 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/codegenerators/codegenfactory.cpp 2015-05-07 12:44:41.000000000 +0200 @@ -216,8 +216,10 @@ default: break; } - retval->initCodeClassFields(); - retval->synchronize(); + if (retval) { + retval->initCodeClassFields(); + retval->synchronize(); + } return retval; } @@ -283,7 +285,8 @@ default: break; } - retval->finishInitialization(); + if (retval) + retval->finishInitialization(); return retval; } @@ -306,7 +309,8 @@ default: break; } - retval->finishInitialization(); + if (retval) + retval->finishInitialization(); return retval; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/codegenerators/codeparameter.cpp new/umbrello-15.04.1/umbrello/codegenerators/codeparameter.cpp --- old/umbrello-15.04.0/umbrello/codegenerators/codeparameter.cpp 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/codegenerators/codeparameter.cpp 2015-05-07 12:44:41.000000000 +0200 @@ -227,7 +227,8 @@ << Uml::ID::toString(id) << " w/role_id:" << role_id; // init using UMLRole obj - initFields (m_parentDocument, role); + if (role) + initFields (m_parentDocument, role); } else initFields (m_parentDocument, obj); // just the regular approach diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/codegenerators/cpp/cppheadercodedocument.cpp new/umbrello-15.04.1/umbrello/codegenerators/cpp/cppheadercodedocument.cpp --- old/umbrello-15.04.0/umbrello/codegenerators/cpp/cppheadercodedocument.cpp 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/codegenerators/cpp/cppheadercodedocument.cpp 2015-05-07 12:44:41.000000000 +0200 @@ -347,6 +347,7 @@ { // Gather info on the various fields and parent objects of this class... UMLClassifier * c = getParentClassifier(); + Q_ASSERT(c != NULL); CodeGenPolicyExt *pe = UMLApp::app()->policyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); @@ -381,11 +382,9 @@ CodeClassFieldList privCompositionClassFields = getSpecificClassFields (CodeClassField::Composition, Uml::Visibility::Private); bool hasOperationMethods = false; - Q_ASSERT(c != NULL); - if (c) { - UMLOperationList list = c->getOpList(); - hasOperationMethods = ! list.isEmpty(); - } + UMLOperationList list = c->getOpList(); + hasOperationMethods = ! list.isEmpty(); + bool hasNamespace = false; bool isEnumeration = false; bool isInterface = parentIsInterface(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/codegenerators/d/dclassifiercodedocument.cpp new/umbrello-15.04.1/umbrello/codegenerators/d/dclassifiercodedocument.cpp --- old/umbrello-15.04.0/umbrello/codegenerators/d/dclassifiercodedocument.cpp 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/codegenerators/d/dclassifiercodedocument.cpp 2015-05-07 12:44:41.000000000 +0200 @@ -290,6 +290,7 @@ { // Gather info on the various fields and parent objects of this class... UMLClassifier * c = getParentClassifier(); + Q_ASSERT(c != NULL); CodeGenerationPolicy * commonPolicy = UMLApp::app()->commonPolicy(); CodeGenPolicyExt * pe = UMLApp::app()->policyExt(); DCodeGenerationPolicy * policy = dynamic_cast<DCodeGenerationPolicy*>(pe); @@ -319,11 +320,10 @@ bool isInterface = parentIsInterface(); bool hasOperationMethods = false; - Q_ASSERT(c != NULL); - if (c) { - UMLOperationList list = c->getOpList(); - hasOperationMethods = ! list.isEmpty(); - } + + UMLOperationList list = c->getOpList(); + hasOperationMethods = ! list.isEmpty(); + QString endLine = commonPolicy->getNewLineEndingChars(); // a shortcut..so we don't have to call this all the time // diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/codegenerators/java/javaclassifiercodedocument.cpp new/umbrello-15.04.1/umbrello/codegenerators/java/javaclassifiercodedocument.cpp --- old/umbrello-15.04.0/umbrello/codegenerators/java/javaclassifiercodedocument.cpp 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/codegenerators/java/javaclassifiercodedocument.cpp 2015-05-07 12:44:41.000000000 +0200 @@ -282,6 +282,7 @@ { // Gather info on the various fields and parent objects of this class... UMLClassifier * c = getParentClassifier(); + Q_ASSERT(c != NULL); CodeGenerationPolicy * commonPolicy = UMLApp::app()->commonPolicy(); CodeGenPolicyExt * pe = UMLApp::app()->policyExt(); JavaCodeGenerationPolicy * policy = dynamic_cast<JavaCodeGenerationPolicy*>(pe); @@ -311,11 +312,9 @@ bool isInterface = parentIsInterface(); bool hasOperationMethods = false; - Q_ASSERT(c != NULL); - if (c) { - UMLOperationList list = c->getOpList(); - hasOperationMethods = ! list.isEmpty(); - } + UMLOperationList list = c->getOpList(); + hasOperationMethods = ! list.isEmpty(); + QString endLine = commonPolicy->getNewLineEndingChars(); // a shortcut..so we don't have to call this all the time // diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/codegenerators/sql/sqlwriter.cpp new/umbrello-15.04.1/umbrello/codegenerators/sql/sqlwriter.cpp --- old/umbrello-15.04.0/umbrello/codegenerators/sql/sqlwriter.cpp 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/codegenerators/sql/sqlwriter.cpp 2015-05-07 12:44:41.000000000 +0200 @@ -600,7 +600,7 @@ foreach(UMLClassifierListItem* cli, constrList) { UMLCheckConstraint* chConstr = dynamic_cast<UMLCheckConstraint*>(cli); if (!chConstr) { - uError() << "Invalid cast from" << chConstr->baseTypeStr() << "'" << chConstr->name() << "' to UMLCheckConstraint*"; + uError() << "Invalid cast from" << cli->baseTypeStr() << "'" << cli->name() << "' to UMLCheckConstraint*"; return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/codegenerators/tcl/tclwriter.cpp new/umbrello-15.04.1/umbrello/codegenerators/tcl/tclwriter.cpp --- old/umbrello-15.04.0/umbrello/codegenerators/tcl/tclwriter.cpp 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/codegenerators/tcl/tclwriter.cpp 2015-05-07 12:44:41.000000000 +0200 @@ -78,6 +78,7 @@ * Constructor, initialises a couple of variables. */ TclWriter::TclWriter() + : mStream(0) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/codeimport/adaimport.cpp new/umbrello-15.04.1/umbrello/codeimport/adaimport.cpp --- old/umbrello-15.04.0/umbrello/codeimport/adaimport.cpp 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/codeimport/adaimport.cpp 2015-05-07 12:44:41.000000000 +0200 @@ -270,7 +270,8 @@ skipStmt(QLatin1String("is")); } if (m_inGenericFormalPart) { - ns->setStereotype(QLatin1String("generic")); + if (ns) + ns->setStereotype(QLatin1String("generic")); m_inGenericFormalPart = false; } return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/codeimpwizard/codeimpthread.h new/umbrello-15.04.1/umbrello/codeimpwizard/codeimpthread.h --- old/umbrello-15.04.0/umbrello/codeimpwizard/codeimpthread.h 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/codeimpwizard/codeimpthread.h 2015-05-07 12:44:41.000000000 +0200 @@ -61,7 +61,6 @@ QFileInfo m_file; //QWaitCondition m_waitCondition; //QMutex m_mutex; - ClassImport* m_importer; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/dialogs/classpropertiesdialog.cpp new/umbrello-15.04.1/umbrello/dialogs/classpropertiesdialog.cpp --- old/umbrello-15.04.0/umbrello/dialogs/classpropertiesdialog.cpp 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/dialogs/classpropertiesdialog.cpp 2015-05-07 12:44:41.000000000 +0200 @@ -123,9 +123,12 @@ void ClassPropertiesDialog::init() { setCaption(i18n("Properties")); + m_pAssocPage = 0; + m_pChooser = 0; m_pGenPage = 0; m_pAttPage = 0; m_pOpsPage = 0; + m_pPkgContentsPage = 0; m_pTemplatePage = 0; m_pEnumLiteralPage = 0; m_pEntityAttributePage = 0; @@ -244,6 +247,8 @@ QHBoxLayout * topLayout = new QHBoxLayout(page); if (m_pWidget && m_pWidget->baseType() == UMLWidget::wt_Object) m_pGenPage = new ClassGeneralPage(m_doc, page, static_cast<ObjectWidget*>(m_pWidget)); + else if (m_pWidget && !m_pObject) + m_pGenPage = new ClassGeneralPage(m_doc, page, m_pWidget); else m_pGenPage = new ClassGeneralPage(m_doc, page, m_pObject); topLayout->addWidget(m_pGenPage); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/dialogs/pages/classgeneralpage.cpp new/umbrello-15.04.1/umbrello/dialogs/pages/classgeneralpage.cpp --- old/umbrello-15.04.0/umbrello/dialogs/pages/classgeneralpage.cpp 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/dialogs/pages/classgeneralpage.cpp 2015-05-07 12:44:41.000000000 +0200 @@ -58,7 +58,19 @@ m_pWidget(0), m_pInstanceWidget(0), m_pUmldoc(d), + m_pInstanceL(0), + m_pStereoTypeL(0), + m_pMultiCB(0), + m_pDrawActorCB(0), + m_pAbstractCB(0), + m_pDeconCB(0), + m_pExecutableCB(0), + m_docWidget(0), + m_nameWidget(0), + m_instanceNameWidget(0), m_stereotypeWidget(0), + m_packageWidget(0), + m_artifactTypeWidget(0), m_visibilityEnumWidget(0) { if (!m_pObject) { @@ -80,9 +92,6 @@ m_nameWidget = new UMLObjectNameWidget(name, m_pObject->name()); m_nameWidget->addToLayout(m_pNameLayout, 0); - m_pAbstractCB = 0; - m_pDeconCB = 0; - if (t != UMLObject::ot_Stereotype) { m_stereotypeWidget = new UMLStereotypeWidget(m_pObject); if (t == UMLObject::ot_Interface || t == UMLObject::ot_Datatype || t == UMLObject::ot_Enum) { @@ -148,6 +157,19 @@ m_pWidget(o), m_pInstanceWidget(0), m_pUmldoc(d), + m_pInstanceL(0), + m_pStereoTypeL(0), + m_pMultiCB(0), + m_pDrawActorCB(0), + m_pAbstractCB(0), + m_pDeconCB(0), + m_pExecutableCB(0), + m_docWidget(0), + m_nameWidget(0), + m_instanceNameWidget(0), + m_stereotypeWidget(0), + m_packageWidget(0), + m_artifactTypeWidget(0), m_visibilityEnumWidget(0) { if (!m_pWidget) { @@ -155,9 +177,6 @@ return; } - m_pDeconCB = 0; - m_pMultiCB = 0; - setMinimumSize(310, 330); QVBoxLayout * topLayout = new QVBoxLayout(this); topLayout->setSpacing(6); @@ -204,11 +223,21 @@ m_pWidget(0), m_pInstanceWidget(widget), m_pUmldoc(d), + m_pInstanceL(0), + m_pStereoTypeL(0), + m_pMultiCB(0), + m_pDrawActorCB(0), + m_pAbstractCB(0), + m_pDeconCB(0), + m_pExecutableCB(0), + m_docWidget(0), + m_nameWidget(0), + m_instanceNameWidget(0), + m_stereotypeWidget(0), + m_packageWidget(0), + m_artifactTypeWidget(0), m_visibilityEnumWidget(0) { - m_pDeconCB = 0; - m_pMultiCB = 0; - setMinimumSize(310, 330); QGridLayout* topLayout = new QGridLayout(this); topLayout->setSpacing(6); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/dialogs/statedialog.cpp new/umbrello-15.04.1/umbrello/dialogs/statedialog.cpp --- old/umbrello-15.04.0/umbrello/dialogs/statedialog.cpp 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/dialogs/statedialog.cpp 2015-05-07 12:44:41.000000000 +0200 @@ -39,7 +39,8 @@ : MultiPageDialogBase(parent), m_pActivityPage(0), m_pStateWidget(pWidget), - m_bChangesMade(false) + m_bChangesMade(false), + pageActivity(0) { setCaption(i18n("Properties")); setupPages(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/dialogs/umlviewdialog.cpp new/umbrello-15.04.1/umbrello/dialogs/umlviewdialog.cpp --- old/umbrello-15.04.0/umbrello/dialogs/umlviewdialog.cpp 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/dialogs/umlviewdialog.cpp 2015-05-07 12:44:41.000000000 +0200 @@ -36,7 +36,8 @@ * Constructor. */ UMLViewDialog::UMLViewDialog(QWidget * pParent, UMLScene * pScene) - : MultiPageDialogBase(pParent) + : MultiPageDialogBase(pParent), + m_pOptionsPage(0) { setCaption(i18n("Properties")); m_pScene = pScene; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/refactoring/refactoringassistant.cpp new/umbrello-15.04.1/umbrello/refactoring/refactoringassistant.cpp --- old/umbrello-15.04.0/umbrello/refactoring/refactoringassistant.cpp 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/refactoring/refactoringassistant.cpp 2015-05-07 12:44:41.000000000 +0200 @@ -830,11 +830,11 @@ UMLClassifier *oldClassifier = dynamic_cast<UMLClassifier*>(op->parent()); if (oldClassifier) { oldClassifier->removeOperation(op); + DEBUG(DBG_SRC) << "oldClassifier=" << oldClassifier->name() << " / newClassifier=" << newClassifier->name(); //:TODO:fischer } newClassifier->addOperation(newOp); m_doc->signalUMLObjectCreated(newOp); //:TODO: really? -DEBUG(DBG_SRC) << "oldClassifier=" << oldClassifier->name() << " / newClassifier=" << newClassifier->name(); //:TODO:fischer } else if (t == UMLObject::ot_Attribute) { DEBUG(DBG_SRC) << "Moving attribute"; @@ -851,11 +851,11 @@ UMLClassifier *oldClassifier = dynamic_cast<UMLClassifier*>(att->parent()); if (oldClassifier) { oldClassifier->removeAttribute(att); + DEBUG(DBG_SRC) << "oldClassifier=" << oldClassifier->name() << " / newClassifier=" << newClassifier->name(); //:TODO:fischer } newClassifier->addAttribute(newAtt); m_doc->signalUMLObjectCreated(newAtt); //:TODO: really? -DEBUG(DBG_SRC) << "oldClassifier=" << oldClassifier->name() << " / newClassifier=" << newClassifier->name(); //:TODO:fischer } // emit moved(); refactor(m_umlObject); //:TODO:fischer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/umbrello.kcfg new/umbrello-15.04.1/umbrello/umbrello.kcfg --- old/umbrello-15.04.0/umbrello/umbrello.kcfg 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/umbrello.kcfg 2015-05-07 12:44:41.000000000 +0200 @@ -211,7 +211,7 @@ <entry name="showPublicOnly" type="Bool"> <label>Show Public Only</label> <whatsthis>Enables/Disables showing of public attributes/methods</whatsthis> - <default>true</default> + <default>false</default> </entry> <entry name="showAttSig" type="Bool"> <label>Show Attribute Signature</label> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/umbrelloui.rc new/umbrello-15.04.1/umbrello/umbrelloui.rc --- old/umbrello-15.04.0/umbrello/umbrelloui.rc 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/umbrelloui.rc 2015-05-07 12:44:41.000000000 +0200 @@ -84,7 +84,6 @@ <Action name="view_show_tree"/> <Action name="view_show_doc"/> <Action name="view_show_undo"/> - <Action name="view_show_bird"/> </Menu> </MenuBar> <ToolBar name="mainToolBar" fullWidth="true" newline="true"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/uml.cpp new/umbrello-15.04.1/umbrello/uml.cpp --- old/umbrello-15.04.0/umbrello/uml.cpp 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/uml.cpp 2015-05-07 12:44:41.000000000 +0200 @@ -892,10 +892,12 @@ //addDockWidget(Qt::LeftDockWidgetArea, m_propertyDock); //:TODO: // create the bird's eye view +#ifdef ENABLE_BIRDVIEW m_birdViewDock = new BirdViewDockWidget(i18n("&Bird's eye view"), this); m_birdViewDock->setObjectName(QLatin1String("BirdViewDock")); addDockWidget(Qt::RightDockWidgetArea, m_birdViewDock); connect(m_birdViewDock, SIGNAL(visibilityChanged(bool)), viewShowBirdView, SLOT(setChecked(bool))); +#endif tabifyDockWidget(m_documentationDock, m_cmdHistoryDock); tabifyDockWidget(m_cmdHistoryDock, m_logDock); @@ -3040,7 +3042,9 @@ } DEBUG(DBG_SRC) << "Changed view to" << view->umlScene(); +#ifdef ENABLE_BIRDVIEW createBirdView(view); +#endif } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/umldoc.cpp new/umbrello-15.04.1/umbrello/umldoc.cpp --- old/umbrello-15.04.0/umbrello/umldoc.cpp 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/umldoc.cpp 2015-05-07 12:44:41.000000000 +0200 @@ -92,6 +92,8 @@ m_pCurrentRoot(0), m_bClosing(false) { + for (int i = 0; i < Uml::ModelType::N_MODELTYPES; ++i) + m_root[i] = 0; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/widgets/associationwidget.cpp new/umbrello-15.04.1/umbrello/widgets/associationwidget.cpp --- old/umbrello-15.04.0/umbrello/widgets/associationwidget.cpp 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/widgets/associationwidget.cpp 2015-05-07 12:44:41.000000000 +0200 @@ -956,11 +956,13 @@ UMLAssociation *umlassoc = association(); if (umlassoc) { umlassoc->setStereotype(stereo); - } - if (m_nameWidget) { - m_nameWidget->setText(umlassoc->stereotype(true)); + if (m_nameWidget) { + m_nameWidget->setText(umlassoc->stereotype(true)); + } else { + uDebug() << "not setting " << stereo << " because m_nameWidget is NULL"; + } } else { - uDebug() << "not setting " << stereo << " because m_nameWidget is NULL"; + uDebug() << "not setting " << stereo << " because association is NULL"; } } @@ -2948,7 +2950,7 @@ m_scene->clearSelected(); } - if (me->button() == Qt::LeftButton && me->modifiers() && Qt::ControlModifier) { + if (me->button() == Qt::LeftButton && me->modifiers() == Qt::ControlModifier) { if (checkRemovePoint(me->scenePos())) return; } @@ -4281,6 +4283,7 @@ ft->setParentItem(this); ft->setLink(this); ft->setSequenceNumber(m_SequenceNumber); + ft->setFontCmd(ft->font()); switch(role) { case Uml::TextRole::MultiA: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/widgets/boxwidget.cpp new/umbrello-15.04.1/umbrello/widgets/boxwidget.cpp --- old/umbrello-15.04.0/umbrello/widgets/boxwidget.cpp 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/widgets/boxwidget.cpp 2015-05-07 12:44:41.000000000 +0200 @@ -11,6 +11,13 @@ // own header #include "boxwidget.h" +// app includes +#include "uml.h" +#include "umldoc.h" + +// qt includes +#include <QColorDialog> + /** * Constructs a BoxWidget. * @@ -57,3 +64,16 @@ UMLWidget::saveToXMI(qDoc, boxElement); qElement.appendChild(boxElement); } + +/** + * Show a properties dialog for a BoxWidget. + */ +void BoxWidget::showPropertiesDialog() +{ + QColor newColor = QColorDialog::getColor(lineColor()); // krazy:exclude=qclasses + if (newColor != lineColor()) { + setLineColor(newColor); + setUsesDiagramLineColor(false); + umlDoc()->setModified(true); + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/widgets/boxwidget.h new/umbrello-15.04.1/umbrello/widgets/boxwidget.h --- old/umbrello-15.04.0/umbrello/widgets/boxwidget.h 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/widgets/boxwidget.h 2015-05-07 12:44:41.000000000 +0200 @@ -33,6 +33,7 @@ virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); virtual void saveToXMI(QDomDocument& qDoc, QDomElement& qElement); + virtual void showPropertiesDialog(); }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-15.04.0/umbrello/widgets/classifierwidget.cpp new/umbrello-15.04.1/umbrello/widgets/classifierwidget.cpp --- old/umbrello-15.04.0/umbrello/widgets/classifierwidget.cpp 2015-04-07 22:32:52.000000000 +0200 +++ new/umbrello-15.04.1/umbrello/widgets/classifierwidget.cpp 2015-05-07 12:44:41.000000000 +0200 @@ -925,13 +925,11 @@ painter->setFont(font); int lines = 1; - if (m_umlObject != NULL) { - QString stereotype = m_umlObject->stereotype(); - if (!stereotype.isEmpty()) { - painter->drawText(0, fontHeight + PACKAGE_MARGIN, - w, fontHeight, Qt::AlignCenter, m_umlObject->stereotype(true)); - lines = 2; - } + QString stereotype = m_umlObject->stereotype(); + if (!stereotype.isEmpty()) { + painter->drawText(0, fontHeight + PACKAGE_MARGIN, + w, fontHeight, Qt::AlignCenter, m_umlObject->stereotype(true)); + lines = 2; } painter->drawText(0, (fontHeight*lines) + PACKAGE_MARGIN,
