commit umbrello for openSUSE:Factory
Hello community, here is the log from the commit of package umbrello for openSUSE:Factory checked in at 2017-07-29 09:01:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/umbrello (Old) and /work/SRC/openSUSE:Factory/.umbrello.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "umbrello" Sat Jul 29 09:01:16 2017 rev:54 rq:510840 version:17.04.3 Changes: -------- --- /work/SRC/openSUSE:Factory/umbrello/umbrello.changes 2017-06-26 15:55:13.190646588 +0200 +++ /work/SRC/openSUSE:Factory/.umbrello.new/umbrello.changes 2017-07-29 09:01:17.845761581 +0200 @@ -1,0 +2,19 @@ +Sun Jul 16 08:49:48 CEST 2017 - lbeltrame@kde.org + +- Update to 17.04.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04.3.php +- Changes since 17.04.2: + * Fix crash on importing sequence lines from qt creator. + * Make bounding box debug display of class UMLWidget visible with default border colors. + * Fix 'class diagram: class-box not resizable'. (kde#381730) + * Fixup of 'org.kde.umbrello5.desktop has wrong Exec line'. (kde#381565) + * Fix 'org.kde.umbrello5.desktop has wrong Exec line'. (kde#381565) + * Fix 'Documentation widgets in property dialogs have a border margin'. (kde#381393) + * Fix 'Documentation window does not show the correct icon'. (kde#381363) + * Fix 'Documentation window does not show the correct icon'. (kde#381363) + * Fix 'Documentation window does not show doc for association widgets with non empty name'. (kde#381360) + * Fix 'Association documentation not shown in Documentation panel'. (kde#381016) + +------------------------------------------------------------------- Old: ---- umbrello-17.04.2.tar.xz New: ---- umbrello-17.04.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ umbrello.spec ++++++ --- /var/tmp/diff_new_pack.6QCoxp/_old 2017-07-29 09:01:18.609653658 +0200 +++ /var/tmp/diff_new_pack.6QCoxp/_new 2017-07-29 09:01:18.613653093 +0200 @@ -16,7 +16,7 @@ # Name: umbrello -Version: 17.04.2 +Version: 17.04.3 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) @@ -82,8 +82,6 @@ %install %kf5_makeinstall -C build - # fix desktop file (boo#1045654) - sed -i "s/Exec=umbrello/Exec=umbrello5/" %{buildroot}%{_kf5_applicationsdir}/org.kde.umbrello5.desktop %suse_update_desktop_file org.kde.umbrello5 Development Design %post -p /sbin/ldconfig ++++++ umbrello-17.04.2.tar.xz -> umbrello-17.04.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-17.04.2/CMakeLists.txt new/umbrello-17.04.3/CMakeLists.txt --- old/umbrello-17.04.2/CMakeLists.txt 2017-06-05 21:12:48.000000000 +0200 +++ new/umbrello-17.04.3/CMakeLists.txt 2017-07-10 00:56:51.000000000 +0200 @@ -3,7 +3,7 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "17") set (KDE_APPLICATIONS_VERSION_MINOR "04") -set (KDE_APPLICATIONS_VERSION_MICRO "2") +set (KDE_APPLICATIONS_VERSION_MICRO "3") set(UMBRELLO_VERSION_MAJOR "2") MATH(EXPR UMBRELLO_VERSION_MINOR "18+${KDE_APPLICATIONS_VERSION_MINOR}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-17.04.2/umbrello/CMakeLists.txt new/umbrello-17.04.3/umbrello/CMakeLists.txt --- old/umbrello-17.04.2/umbrello/CMakeLists.txt 2017-06-05 21:12:48.000000000 +0200 +++ new/umbrello-17.04.3/umbrello/CMakeLists.txt 2017-07-10 00:56:51.000000000 +0200 @@ -602,6 +602,7 @@ else() file(READ umbrello.desktop UMBRELLO_DESKTOP) string(REPLACE "-caption" "-qwindowtitle" UMBRELLO_DESKTOP_OUT "${UMBRELLO_DESKTOP}") + string(REPLACE "Exec=umbrello" "Exec=umbrello5" UMBRELLO_DESKTOP_OUT "${UMBRELLO_DESKTOP_OUT}") file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/umbrello.desktop "${UMBRELLO_DESKTOP_OUT}") install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/umbrello.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} RENAME org.kde.umbrello5.desktop) file(READ org.kde.umbrello.appdata.xml UMBRELLO_APPDATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-17.04.2/umbrello/diagram_utils.cpp new/umbrello-17.04.3/umbrello/diagram_utils.cpp --- old/umbrello-17.04.2/umbrello/diagram_utils.cpp 2017-06-05 21:12:48.000000000 +0200 +++ new/umbrello-17.04.3/umbrello/diagram_utils.cpp 2017-07-10 00:56:51.000000000 +0200 @@ -135,9 +135,12 @@ * Qtcreator/gdb * 6 Driver::ParseHelper::ParseHelper driver.cpp 299 0x634c44 * 31 g_main_context_dispatch /usr/lib64/libglib-2.0.so.0 0x7fffefe16316 + * ignoring + * ... <more> 0x7ffff41152d9 + * 13 ?? 0x7ffff41152d9 */ else if (cols[cols.size()-1].startsWith(QLatin1String("0x"))) { - if (cols[0] == QLatin1String("...")) + if (cols[0] == QLatin1String("...") || cols[1] == QLatin1String("??")) return false; sequence = cols.takeFirst(); @@ -147,7 +150,7 @@ if (cols.size() == 2) { module = cols.takeLast(); identifier = cols.join(QLatin1String(" ")); - } else { + } else if (cols.size() > 2) { line = cols.takeLast(); file = cols.takeLast(); identifier = cols.join(QLatin1String(" ")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-17.04.2/umbrello/dialogs/widgets/documentationwidget.cpp new/umbrello-17.04.3/umbrello/dialogs/widgets/documentationwidget.cpp --- old/umbrello-17.04.2/umbrello/dialogs/widgets/documentationwidget.cpp 2017-06-05 21:12:48.000000000 +0200 +++ new/umbrello-17.04.3/umbrello/dialogs/widgets/documentationwidget.cpp 2017-07-10 00:56:51.000000000 +0200 @@ -74,6 +74,7 @@ void DocumentationWidget::init(const QString &text) { QHBoxLayout *l = new QHBoxLayout; + l->setMargin(0); m_box = new QGroupBox; m_box->setTitle(i18n("Documentation")); m_editField = new KTextEdit(m_box); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-17.04.2/umbrello/docwindow.cpp new/umbrello-17.04.3/umbrello/docwindow.cpp --- old/umbrello-17.04.2/umbrello/docwindow.cpp 2017-06-05 21:12:48.000000000 +0200 +++ new/umbrello-17.04.3/umbrello/docwindow.cpp 2017-07-10 00:56:51.000000000 +0200 @@ -244,10 +244,7 @@ return; } if (widget == m_pAssocWidget) { - if (overwrite) { - updateDocumentation(true); - } - else { + if (!overwrite) { return; } } @@ -429,28 +426,26 @@ */ void DocWindow::updateLabel(const QString& name) { - if (!name.isEmpty()) { - Icon_Utils::IconType icon = Icon_Utils::it_Home; - switch (m_Showing) { - case st_Project: - icon = Icon_Utils::it_Code_Gen_Wizard; - break; - case st_UMLScene: - icon = Icon_Utils::it_Diagram_Class; - break; - case st_UMLObject: - icon = Icon_Utils::it_Object; - break; - case st_UMLWidget: - icon = Icon_Utils::it_Class; - break; - case st_Association: - icon = Icon_Utils::it_Association; - break; - } - m_typeLabel->setPixmap(Icon_Utils::SmallIcon(icon)); - m_nameLabel->setText(name); + Icon_Utils::IconType icon = Icon_Utils::it_Home; + switch (m_Showing) { + case st_Project: + icon = Icon_Utils::it_Code_Gen_Wizard; + break; + case st_UMLScene: + icon = Icon_Utils::it_Diagram_Class; + break; + case st_UMLObject: + icon = UMLObject::toIcon(m_pUMLObject->baseType()); + break; + case st_UMLWidget: + icon = WidgetBase::toIcon(m_pUMLWidget->baseType()); + break; + case st_Association: + icon = Icon_Utils::it_Association; + break; } + m_typeLabel->setPixmap(Icon_Utils::SmallIcon(icon)); + m_nameLabel->setText(name); m_modifiedWidget->setModified(isModified()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-17.04.2/umbrello/layouts/object-export.desktop new/umbrello-17.04.3/umbrello/layouts/object-export.desktop --- old/umbrello-17.04.2/umbrello/layouts/object-export.desktop 2017-06-05 21:12:48.000000000 +0200 +++ new/umbrello-17.04.3/umbrello/layouts/object-export.desktop 2017-07-10 00:56:51.000000000 +0200 @@ -46,6 +46,7 @@ Comment[de]=Layout für Objektdiagramme exportieren Comment[en_GB]=Export Layout for Object Diagrams Comment[es]=Exportar disposición de diagramas de objetos +Comment[fr]=Disposition d'exportation pour les diagrammes d'objets Comment[it]=Disposizione di esportazione per i diagrammi degli oggetti Comment[nl]=Indeling voor objectdiagrammen exporteren Comment[pt]=Exportar a Disposição dos Diagramas de Objectos diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-17.04.2/umbrello/org.kde.umbrello.appdata.xml new/umbrello-17.04.3/umbrello/org.kde.umbrello.appdata.xml --- old/umbrello-17.04.2/umbrello/org.kde.umbrello.appdata.xml 2017-06-05 21:12:48.000000000 +0200 +++ new/umbrello-17.04.3/umbrello/org.kde.umbrello.appdata.xml 2017-07-10 00:56:51.000000000 +0200 @@ -12,6 +12,7 @@ <name xml:lang="es">Umbrello</name> <name xml:lang="et">Umbrello</name> <name xml:lang="fi">Umbrello</name> + <name xml:lang="fr">Umbrello</name> <name xml:lang="gl">Umbrello</name> <name xml:lang="it">Umbrello</name> <name xml:lang="ko">Umbrello</name> @@ -33,6 +34,7 @@ <summary xml:lang="es">Modelador UML</summary> <summary xml:lang="et">UML-i modelleerimise rakendus</summary> <summary xml:lang="fi">UML-mallinnusohjelma</summary> + <summary xml:lang="fr">Modeleur UML</summary> <summary xml:lang="gl">Modelador de UML</summary> <summary xml:lang="it">Modellatore UML</summary> <summary xml:lang="ko">UML 모델러</summary> @@ -58,6 +60,7 @@ <p xml:lang="es">Umbrello es una herramienta de modelado y de generación de código para el lenguaje unificado de modelado (UML). Puede crear diagramas de software y de otros sistemas en el formato estándar de la industria UML, además de generar código a partir de diagramas UML en diversos lenguajes de programación.</p> <p xml:lang="et">Umbrello on unifitseeritud modelleerimiskeele UML modelleerimistööriist ja koodi genereerija. See võib luua tarkvara ja muude süsteemide skeeme standardses UML-vormingus, samuti genereerida UML-skeemide põhjal koodi mitmes programmeerimiskeeles.</p> <p xml:lang="fi">Umbrello on UML-mallinnusohjelma. Umbrellolla voi luoda kaavioita ohjelmistoista ja muista järjestelmistä käyttäen standardia UML-muotoa. Sillä voi myös luoda koodin UML-kaavioiden perusteella useille ohjelmointikielille.</p> + <p xml:lang="fr">Umbrello est un outil de modélisation est de génération de code utilisant Unified Modelling Language (UML). Il peut créer des diagrammes de logiciels et d'autres systèmes dans le format standard de l'industrie UML, il peut également générer du code à partir de diagrammes UML dans de nombreux langages de programmation.</p> <p xml:lang="gl">Umbrello é unha ferramenta de modelaxe e xerador de código baseado na linguaxe de modelaxe UML. Pode crear diagramas de software e doutros sistemas usando o formato estándar da industria, UML, e pode tamén xerar código a partir de diagramas UML en varios linguaxes de programación.</p> <p xml:lang="it">Umbrello è uno strumento per diagrammi UML e un generatore di codice. Può creare diagrammi di software e altri sistemi nello standard industriale UML, e può anche generare codice partendo dai diagrammi UML in diversi linguaggi di programmazione.</p> <p xml:lang="ko">Umbrello는 통합 모델링 언어(UML) 모델링 도구 및 코드 생성기입니다. 산업 표준 UML 포맷으로 소프트웨어 및 기타 시스템 다이어그램을 생성할 수 있으며, UML 다이어그램에서 여러 프로그래밍 언어로 코드를 생성할 수 있습니다.</p> @@ -79,6 +82,7 @@ <p xml:lang="es">Funciones:</p> <p xml:lang="et">Omadused:</p> <p xml:lang="fi">Ominaisuuksia:</p> + <p xml:lang="fr">Fonctionnalités :</p> <p xml:lang="gl">Funcionalidades:</p> <p xml:lang="it">Funzionalità:</p> <p xml:lang="ko">기능:</p> @@ -101,6 +105,7 @@ <li xml:lang="es">Formatos permitidos: XMI</li> <li xml:lang="et">Toetatud vormingud: XMI</li> <li xml:lang="fi">Tukee XMI-tiedostomuotoa</li> + <li xml:lang="fr">Formats pris en charge : XMI</li> <li xml:lang="gl">Formatos compatíbeis: XMI.</li> <li xml:lang="it">Formati supportati: XMI</li> <li xml:lang="ko">지원하는 형식: XMI</li> @@ -120,6 +125,7 @@ <li xml:lang="en-GB">Several type of diagrams supported: use case, class, sequence, communication, state, activity, component, deployment, entity relationship</li> <li xml:lang="es">Permite usar varios tipos de diagramas: casos de uso, clase, secuencia, comunicación, estado, actividad, componente, despliegue y relación de entidades</li> <li xml:lang="fi">Tukee monenlaisia kaavioita: käyttötapauskaavio, luokkakaavio, sekvenssikaavio, kommunikointikaavio, tilakaavio, aktiviteettikaavio, komponenttikaavio, sijoittelukaavio, käsitekaavio</li> + <li xml:lang="fr">Différents types de diagrammes sont gérés : cas d'utilisations, classes, séquences, communications, états, activités, composants, déploiements, relations entre entités</li> <li xml:lang="gl">Permite traballar con varios tipos de diagramas: caso de uso, clase, secuencia, comunicación, estado, actividade, compoñente, distribución, e entidade-relación.</li> <li xml:lang="it">Diversi tipi di diagrammi supportati: casi d'uso, classe, sequenza, comunicazione, stato, attività, componente, dispiegamento, relazione tra entità</li> <li xml:lang="ko">지원하는 다이어그램 종류: 사용 예시, 클래스, 시퀀스, 통신, 상태, 활동, 구성 요소, 배포, 엔티티 관계</li> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-17.04.2/umbrello/uml1model/umlobject.cpp new/umbrello-17.04.3/umbrello/uml1model/umlobject.cpp --- old/umbrello-17.04.2/umbrello/uml1model/umlobject.cpp 2017-06-05 21:12:48.000000000 +0200 +++ new/umbrello-17.04.3/umbrello/uml1model/umlobject.cpp 2017-07-10 00:56:51.000000000 +0200 @@ -1194,6 +1194,73 @@ } /** + * Returns the given object type value as icon type. + * @param ot ObjectType of which an icon type is wanted + * @return the ObjectType as icon type + */ +Icon_Utils::IconType UMLObject::toIcon(ObjectType t) +{ + Icon_Utils::IconType icon; + + switch (t) { + case UMLObject::ot_Actor: + icon = Icon_Utils::it_Actor; + break; + case UMLObject::ot_Artifact: + icon = Icon_Utils::it_Artifact; + break; + case UMLObject::ot_Association: + icon = Icon_Utils::it_Association; + break; + case UMLObject::ot_Class: + icon = Icon_Utils::it_Class; + break; + case UMLObject::ot_Component: + icon = Icon_Utils::it_Component; + break; + case UMLObject::ot_Datatype: + icon = Icon_Utils::it_Datatype; + break; + case UMLObject::ot_Entity: + icon = Icon_Utils::it_Entity; + break; + case UMLObject::ot_Enum: + icon = Icon_Utils::it_Enum; + break; + case UMLObject::ot_Folder: + icon = Icon_Utils::it_Folder; + break; + case UMLObject::ot_Instance: + icon = Icon_Utils::it_Instance; + break; + case UMLObject::ot_Interface: + icon = Icon_Utils::it_Interface; + break; + case UMLObject::ot_Node: + icon = Icon_Utils::it_Node; + break; + case UMLObject::ot_Package: + icon = Icon_Utils::it_Package; + break; + case UMLObject::ot_Port: + icon = Icon_Utils::it_Port; + break; +// case UMLObject::ot_Stereotype: +// icon = Icon_Utils::it_Stereotype; +// break; + case UMLObject::ot_UseCase: + icon = Icon_Utils::it_UseCase; + break; + + default: + icon = Icon_Utils::it_Home; + uWarning() << "unknown object type"; + break; + } + return icon; +} + +/** * Print UML Object to debug output stream, so it can be used like * uDebug() << "This object shouldn't be here: " << illegalObject; */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-17.04.2/umbrello/uml1model/umlobject.h new/umbrello-17.04.3/umbrello/uml1model/umlobject.h --- old/umbrello-17.04.2/umbrello/uml1model/umlobject.h 2017-06-05 21:12:48.000000000 +0200 +++ new/umbrello-17.04.3/umbrello/uml1model/umlobject.h 2017-07-10 00:56:51.000000000 +0200 @@ -12,6 +12,7 @@ #define UMLOBJECT_H #include "basictypes.h" +#include "icon_utils.h" #include "umlpackagelist.h" //qt includes @@ -111,6 +112,7 @@ static QString toString(ObjectType ot); static QString toI18nString(ObjectType t); + static Icon_Utils::IconType toIcon(ObjectType t); explicit UMLObject(const UMLObject& other); explicit UMLObject(UMLObject* parent, const QString& name, Uml::ID::Type id = Uml::ID::None); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-17.04.2/umbrello/umlwidgets/associationwidget.cpp new/umbrello-17.04.3/umbrello/umlwidgets/associationwidget.cpp --- old/umbrello-17.04.2/umbrello/umlwidgets/associationwidget.cpp 2017-06-05 21:12:48.000000000 +0200 +++ new/umbrello-17.04.3/umbrello/umlwidgets/associationwidget.cpp 2017-07-10 00:56:51.000000000 +0200 @@ -3762,8 +3762,7 @@ // overwrites the docwindow, but we want the main association doc // to win. if (_select) { - if (m_scene->selectedCount() == 0) - UMLApp::app()->docWindow()->showDocumentation(this, false); + UMLApp::app()->docWindow()->showDocumentation(this, false); } else UMLApp::app()->docWindow()->updateDocumentation(true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-17.04.2/umbrello/umlwidgets/classifierwidget.cpp new/umbrello-17.04.3/umbrello/umlwidgets/classifierwidget.cpp --- old/umbrello-17.04.2/umbrello/umlwidgets/classifierwidget.cpp 2017-06-05 21:12:48.000000000 +0200 +++ new/umbrello-17.04.3/umbrello/umlwidgets/classifierwidget.cpp 2017-07-10 00:56:51.000000000 +0200 @@ -887,11 +887,7 @@ path.addEllipse(rect()); return path; } -#ifdef ENABLE_WIDGET_SHOW_DOC QSizeF mainSize = rect().size(); -#else - QSizeF mainSize = calculateSize(false); -#endif QSize templatesBoxSize = calculateTemplatesBoxSize(); qreal mainY = 0.0; if (templatesBoxSize.height() > 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-17.04.2/umbrello/umlwidgets/umlwidget.cpp new/umbrello-17.04.3/umbrello/umlwidgets/umlwidget.cpp --- old/umbrello-17.04.2/umbrello/umlwidgets/umlwidget.cpp 2017-06-05 21:12:48.000000000 +0200 +++ new/umbrello-17.04.3/umbrello/umlwidgets/umlwidget.cpp 2017-07-10 00:56:51.000000000 +0200 @@ -1729,7 +1729,7 @@ painter->setPen(Qt::green); painter->setBrush(Qt::NoBrush); painter->drawPath(shape()); - painter->setPen(Qt::red); + painter->setPen(Qt::blue); painter->drawRect(boundingRect()); // origin painter->drawLine(-10, 0, 10, 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-17.04.2/umbrello/umlwidgets/widgetbase.cpp new/umbrello-17.04.3/umbrello/umlwidgets/widgetbase.cpp --- old/umbrello-17.04.2/umbrello/umlwidgets/widgetbase.cpp 2017-06-05 21:12:48.000000000 +0200 +++ new/umbrello-17.04.3/umbrello/umlwidgets/widgetbase.cpp 2017-07-10 00:56:51.000000000 +0200 @@ -1156,6 +1156,114 @@ return name; } +/** + * Returns the given enum value as icon type. + * @param wt WidgetType of which an icon type representation is wanted + * @return the WidgetType as icon type + */ +Icon_Utils::IconType WidgetBase::toIcon(WidgetBase::WidgetType wt) +{ + Icon_Utils::IconType icon; + + switch (wt) { + case wt_Activity: + icon = Icon_Utils::it_Activity; + break; + case wt_Actor: + icon = Icon_Utils::it_Actor; + break; + case wt_Artifact: + icon = Icon_Utils::it_Artifact; + break; + case wt_Association: + icon = Icon_Utils::it_Association; + break; + case wt_Box: + icon = Icon_Utils::it_Box; + break; + case wt_Category: + icon = Icon_Utils::it_Category; + break; + case wt_CombinedFragment: + icon = Icon_Utils::it_Combined_Fragment; + break; + case wt_Component: + icon = Icon_Utils::it_Component; + break; + case wt_Class: + icon = Icon_Utils::it_Class; + break; + case wt_Datatype: + icon = Icon_Utils::it_Datatype; + break; + case wt_Entity: + icon = Icon_Utils::it_Entity; + break; + case wt_Enum: + icon = Icon_Utils::it_Enum; + break; + case wt_FloatingDashLine: + icon = Icon_Utils::it_Association; + break; + case wt_ForkJoin: + icon = Icon_Utils::it_Fork_Join; + break; + case wt_Instance: + icon = Icon_Utils::it_Instance; + break; + case wt_Interface: + icon = Icon_Utils::it_Interface; + break; + case wt_Message: + icon = Icon_Utils::it_Message_Synchronous; + break; + case wt_Node: + icon = Icon_Utils::it_Node; + break; + case wt_Note: + icon = Icon_Utils::it_Note; + break; + case wt_Object: + icon = Icon_Utils::it_Object; + break; + case wt_ObjectNode: + icon = Icon_Utils::it_Object_Node; + break; + case wt_Package: + icon = Icon_Utils::it_Package; + break; + case wt_Pin: + icon = Icon_Utils::it_Pin; + break; + case wt_Port: + icon = Icon_Utils::it_Port; + break; + case wt_Precondition: + icon = Icon_Utils::it_Precondition; + break; + case wt_Region: + icon = Icon_Utils::it_Region; + break; + case wt_Signal: + icon = Icon_Utils::it_Send_Signal; + break; + case wt_State: + icon = Icon_Utils::it_State; + break; + case wt_Text: + icon = Icon_Utils::it_Text; + break; + case wt_UseCase: + icon = Icon_Utils::it_UseCase; + break; + default: + icon = Icon_Utils::it_Home; + uWarning() << "unknown widget type"; + break; + } + return icon; +} + #include "activitywidget.h" #include "actorwidget.h" #include "artifactwidget.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-17.04.2/umbrello/umlwidgets/widgetbase.h new/umbrello-17.04.3/umbrello/umlwidgets/widgetbase.h --- old/umbrello-17.04.2/umbrello/umlwidgets/widgetbase.h 2017-06-05 21:12:48.000000000 +0200 +++ new/umbrello-17.04.3/umbrello/umlwidgets/widgetbase.h 2017-07-10 00:56:51.000000000 +0200 @@ -12,6 +12,7 @@ #define WIDGETBASE_H #include "basictypes.h" +#include "icon_utils.h" #include <QColor> #include <QDomDocument> @@ -109,6 +110,7 @@ static QString toString(WidgetType wt); static QString toI18nString(WidgetType wt); + static Icon_Utils::IconType toIcon(WidgetType wt); explicit WidgetBase(UMLScene * scene, WidgetType type= wt_UMLWidget); virtual ~WidgetBase();
participants (1)
-
root＠hilbert.suse.de