Hello community, here is the log from the commit of package umbrello for openSUSE:Factory checked in at 2015-02-11 16:42:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-21 22:13:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.umbrello.new/umbrello.changes 2015-02-11 16:42:56.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Feb 1 11:25:18 UTC 2015 - tittiatc...@gmail.com + +- Update to KDE Applications 14.12.2 + * KDE Applications 14.12.2 + * See https://www.kde.org/announcements/announce-applications-14.12.2.php + +------------------------------------------------------------------- Old: ---- umbrello-14.12.1.tar.xz New: ---- umbrello-14.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ umbrello.spec ++++++ --- /var/tmp/diff_new_pack.u8j9XQ/_old 2015-02-11 16:42:57.000000000 +0100 +++ /var/tmp/diff_new_pack.u8j9XQ/_new 2015-02-11 16:42:57.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package umbrello # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ License: GPL-2.0 and GFDL-1.2 Group: Development/Tools/Other Url: http://www.kde.org/ -Version: 14.12.1 +Version: 14.12.2 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ umbrello-14.12.1.tar.xz -> umbrello-14.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-14.12.1/CMakeLists.txt new/umbrello-14.12.2/CMakeLists.txt --- old/umbrello-14.12.1/CMakeLists.txt 2014-12-30 11:47:35.000000000 +0100 +++ new/umbrello-14.12.2/CMakeLists.txt 2015-01-19 13:30:42.000000000 +0100 @@ -8,7 +8,7 @@ set(VERSION_MAJOR "2") set(VERSION_MINOR "15") -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-14.12.1/umbrello/dialogs/pages/classgeneralpage.cpp new/umbrello-14.12.2/umbrello/dialogs/pages/classgeneralpage.cpp --- old/umbrello-14.12.1/umbrello/dialogs/pages/classgeneralpage.cpp 2014-12-30 11:47:35.000000000 +0100 +++ new/umbrello-14.12.2/umbrello/dialogs/pages/classgeneralpage.cpp 2015-01-19 13:30:42.000000000 +0100 @@ -13,6 +13,7 @@ // app includes #include "debug_utils.h" +#include "documentationwidget.h" #include "dialog_utils.h" #include "classifier.h" #include "umlobject.h" @@ -205,19 +206,11 @@ scopeLayout->addWidget(m_pImplementationRB); topLayout->addWidget(m_pButtonGB); - // setup documentation - m_docGB = new QGroupBox(this); - QHBoxLayout * docLayout = new QHBoxLayout(m_docGB); - docLayout->setMargin(margin); - m_docGB->setTitle(i18n("Documentation")); - - m_doc = new KTextEdit(m_docGB); - docLayout->addWidget(m_doc); - topLayout->addWidget(m_docGB); + m_docWidget = new DocumentationWidget(m_pObject, this); + topLayout->addWidget(m_docWidget); // setup fields m_pClassNameLE->setText(m_pObject->name()); - m_doc->setText(m_pObject->doc()); switch (m_pObject->visibility()) { case Uml::Visibility::Public: @@ -238,8 +231,6 @@ m_pStereoTypeCB->setDuplicatesEnabled(false); // only allow one of each type in box m_pStereoTypeCB->setCompletionMode(KGlobalSettings::CompletionPopup); Dialog_Utils::insertStereotypesSorted(m_pStereoTypeCB, m_pObject->stereotype()); - - m_doc->setLineWrapMode(QTextEdit::WidgetWidth); } ClassGeneralPage::ClassGeneralPage(UMLDoc* d, QWidget* parent, ObjectWidget* o) @@ -254,8 +245,6 @@ m_pDeconCB = 0; m_pMultiCB = 0; - int margin = fontMetrics().height(); - setMinimumSize(310, 330); QVBoxLayout * topLayout = new QVBoxLayout(this); topLayout->setSpacing(6); @@ -296,17 +285,9 @@ m_pDeconCB->setChecked(m_pWidget->showDestruction()); m_pNameLayout->addWidget(m_pDeconCB, 2, 1); } - // setup documentation - m_docGB = new QGroupBox(this); - QHBoxLayout * docLayout = new QHBoxLayout(m_docGB); - docLayout->setMargin(margin); - m_docGB->setTitle(i18n("Documentation")); - - m_doc = new KTextEdit(m_docGB); - m_doc->setLineWrapMode(QTextEdit::WidgetWidth); - m_doc->setText(m_pWidget->documentation()); - docLayout->addWidget(m_doc); - topLayout->addWidget(m_docGB); + m_docWidget = new DocumentationWidget(m_pObject, this); + topLayout->addWidget(m_docWidget); + if (m_pMultiCB) { connect(m_pDrawActorCB, SIGNAL(toggled(bool)), this, SLOT(slotActorToggled(bool))); } @@ -319,8 +300,6 @@ m_pDeconCB = 0; m_pMultiCB = 0; - int margin = fontMetrics().height(); - setMinimumSize(310, 330); QGridLayout* topLayout = new QGridLayout(this); topLayout->setSpacing(6); @@ -360,17 +339,8 @@ m_pInstanceLE->setText(widget->instanceName()); m_pNameLayout->addWidget(m_pInstanceLE, 2, 1); - //setup documentation - m_docGB = new QGroupBox(this); - topLayout->addWidget(m_docGB, 1, 0); - QHBoxLayout* docLayout = new QHBoxLayout(m_docGB); - docLayout->setMargin(margin); - m_docGB->setTitle(i18n("Documentation")); - - m_doc = new KTextEdit(m_docGB); - m_doc->setLineWrapMode(QTextEdit::WidgetWidth); - m_doc->setText(widget->documentation()); - docLayout->addWidget(m_doc); + m_docWidget = new DocumentationWidget(widget, this); + topLayout->addWidget(m_docWidget); } ClassGeneralPage::~ClassGeneralPage() @@ -386,7 +356,7 @@ if (m_pObject) { QString name = m_pClassNameLE->text(); - m_pObject->setDoc(m_doc->toPlainText()); + m_docWidget->apply(); if (m_pStereoTypeCB) { m_pObject->setStereotype(m_pStereoTypeCB->currentText()); @@ -461,7 +431,6 @@ m_pWidget->setShowDestruction(m_pDeconCB->isChecked()); } QString name = m_pClassNameLE->text(); - m_pWidget->setDocumentation(m_doc->toPlainText()); UMLObject * o = m_pWidget->umlObject(); UMLObject * old = m_pUmldoc->findUMLObject(name); if (old && o != old) { @@ -474,7 +443,6 @@ else if (m_pInstanceWidget) { m_pInstanceWidget->setInstanceName(m_pInstanceLE->text()); QString name = m_pClassNameLE->text(); - m_pInstanceWidget->setDocumentation(m_doc->toPlainText()); UMLObject* o = m_pInstanceWidget->umlObject(); UMLObject* old = m_pUmldoc->findUMLObject(name); if (old && o != old) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-14.12.1/umbrello/dialogs/pages/classgeneralpage.h new/umbrello-14.12.2/umbrello/dialogs/pages/classgeneralpage.h --- old/umbrello-14.12.1/umbrello/dialogs/pages/classgeneralpage.h 2014-12-30 11:47:35.000000000 +0100 +++ new/umbrello-14.12.2/umbrello/dialogs/pages/classgeneralpage.h 2015-01-19 13:30:42.000000000 +0100 @@ -13,13 +13,13 @@ #include "dialogpagebase.h" +class DocumentationWidget; class QGroupBox; class QLabel; class QRadioButton; class QCheckBox; class KComboBox; class KLineEdit; -class KTextEdit; class UMLObject; class UMLWidget; @@ -78,14 +78,13 @@ UMLWidget * m_pInstanceWidget; UMLDoc * m_pUmldoc; - QGroupBox * m_docGB; QGroupBox * m_pButtonGB; QLabel * m_pNameL, * m_pInstanceL, * m_pStereoTypeL, * m_pPackageL; KLineEdit * m_pClassNameLE, * m_pInstanceLE, * m_pPackageLE; KComboBox * m_pStereoTypeCB, * m_pPackageCB ; QRadioButton * m_pPublicRB, * m_pPrivateRB, * m_pProtectedRB, * m_pImplementationRB; QCheckBox * m_pMultiCB, * m_pDrawActorCB, * m_pAbstractCB, * m_pDeconCB; - KTextEdit * m_doc; + DocumentationWidget *m_docWidget; QGroupBox * m_pDrawAsGB; QRadioButton * m_pDefaultRB, * m_pFileRB, * m_pLibraryRB, * m_pTableRB; QCheckBox * m_pExecutableCB; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-14.12.1/umbrello/dialogs/widgets/documentationwidget.cpp new/umbrello-14.12.2/umbrello/dialogs/widgets/documentationwidget.cpp --- old/umbrello-14.12.1/umbrello/dialogs/widgets/documentationwidget.cpp 2014-12-30 11:47:35.000000000 +0100 +++ new/umbrello-14.12.2/umbrello/dialogs/widgets/documentationwidget.cpp 2015-01-19 13:30:42.000000000 +0100 @@ -11,6 +11,7 @@ #include "documentationwidget.h" #include "umlobject.h" +#include "umlwidget.h" #include <KTextEdit> #include <KLocalizedString> @@ -20,19 +21,20 @@ DocumentationWidget::DocumentationWidget(UMLObject *o, QWidget *parent) : QWidget(parent), - m_object(o) + m_object(o), + m_widget(0) { Q_ASSERT(o); + init(o->doc()); +} - QVBoxLayout *l = new QVBoxLayout; - m_box = new QGroupBox; - m_box->setTitle(i18n("Documentation")); - m_editField = new KTextEdit(m_box); - m_editField->setText(o->doc()); - QVBoxLayout *layout = new QVBoxLayout(m_box); - layout->addWidget(m_editField); - l->addWidget(m_box); - setLayout(l); +DocumentationWidget::DocumentationWidget(UMLWidget *w, QWidget *parent) : + QWidget(parent), + m_object(0), + m_widget(w) +{ + Q_ASSERT(w); + init(w->documentation()); } DocumentationWidget::~DocumentationWidget() @@ -46,6 +48,27 @@ */ void DocumentationWidget::apply() { - m_object->setDoc(m_editField->toPlainText()); + if (m_object) + m_object->setDoc(m_editField->toPlainText()); + else if (m_widget) + m_widget->setDocumentation(m_editField->toPlainText()); } +/** + * initialize widget + * @param text text to display + */ +void DocumentationWidget::init(const QString &text) +{ + QHBoxLayout *l = new QHBoxLayout; + m_box = new QGroupBox; + m_box->setTitle(i18n("Documentation")); + m_editField = new KTextEdit(m_box); + m_editField->setLineWrapMode(QTextEdit::WidgetWidth); + m_editField->setText(text); + QHBoxLayout *layout = new QHBoxLayout(m_box); + layout->addWidget(m_editField); + layout->setMargin(fontMetrics().height()); + l->addWidget(m_box); + setLayout(l); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-14.12.1/umbrello/dialogs/widgets/documentationwidget.h new/umbrello-14.12.2/umbrello/dialogs/widgets/documentationwidget.h --- old/umbrello-14.12.1/umbrello/dialogs/widgets/documentationwidget.h 2014-12-30 11:47:35.000000000 +0100 +++ new/umbrello-14.12.2/umbrello/dialogs/widgets/documentationwidget.h 2015-01-19 13:30:42.000000000 +0100 @@ -14,6 +14,7 @@ #include <QWidget> class UMLObject; +class UMLWidget; class KTextEdit; @@ -25,6 +26,7 @@ Q_OBJECT public: DocumentationWidget(UMLObject *o, QWidget *parent = 0); + DocumentationWidget(UMLWidget *w, QWidget *parent = 0); ~DocumentationWidget(); void apply(); @@ -33,6 +35,8 @@ QGroupBox *m_box; KTextEdit *m_editField; UMLObject *m_object; + UMLWidget *m_widget; + void init(const QString &text); }; #endif // DOCUMENTATIONWIDGET_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-14.12.1/umbrello/docwindow.cpp new/umbrello-14.12.2/umbrello/docwindow.cpp --- old/umbrello-14.12.1/umbrello/docwindow.cpp 2014-12-30 11:47:35.000000000 +0100 +++ new/umbrello-14.12.2/umbrello/docwindow.cpp 2015-01-19 13:30:42.000000000 +0100 @@ -233,16 +233,18 @@ // we don't do this on startup/load of a xmi file, because every time // modified is set, we get another undo/redo backup point if (isModified()) { - if (m_pUMLObject) { + if (m_Showing == st_UMLObject && m_pUMLObject) { m_pUMLObject->setDoc(m_docTE->toPlainText()); - } else if(m_pUMLScene) { + } else if(m_Showing == st_UMLScene && m_pUMLScene) { m_pUMLScene->setDocumentation(m_docTE->toPlainText()); - } else if (m_pUMLWidget) { + } else if (m_Showing == st_UMLWidget && m_pUMLWidget) { m_pUMLWidget->setDocumentation(m_docTE->toPlainText()); - } else if (m_pAssocWidget) { + } else if (m_Showing == st_Association && m_pAssocWidget) { m_pAssocWidget->setDocumentation(m_docTE->toPlainText()); - } else { + } else if (m_Showing == st_Project) { m_pUMLDoc->setDocumentation(m_docTE->toPlainText()); + } else { + uError() << "could not update documentation because of unkown type and object combination"; } // now do the setModified call diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-14.12.1/umbrello/icon_utils.cpp new/umbrello-14.12.2/umbrello/icon_utils.cpp --- old/umbrello-14.12.1/umbrello/icon_utils.cpp 2014-12-30 11:47:35.000000000 +0100 +++ new/umbrello-14.12.2/umbrello/icon_utils.cpp 2015-01-19 13:30:42.000000000 +0100 @@ -496,7 +496,7 @@ case it_Align_HorizontalDistribute: return QLatin1String("distribute-horizontal"); case it_Code_Gen_Wizard: - return QLatin1String("hi64-app-umbrello.png"); + return QLatin1String("umbrello"); case it_Document_Edit: return QLatin1String("document-edit"); case it_ClassOrPackage: Files old/umbrello-14.12.1/umbrello/pics/category.png and new/umbrello-14.12.2/umbrello/pics/category.png differ Files old/umbrello-14.12.1/umbrello/pics/cursor-category.png and new/umbrello-14.12.2/umbrello/pics/cursor-category.png differ Files old/umbrello-14.12.1/umbrello/pics/hi16-action-umbrello_diagram_activity.png and new/umbrello-14.12.2/umbrello/pics/hi16-action-umbrello_diagram_activity.png differ Files old/umbrello-14.12.1/umbrello/pics/hi16-action-umbrello_diagram_class.png and new/umbrello-14.12.2/umbrello/pics/hi16-action-umbrello_diagram_class.png differ Files old/umbrello-14.12.1/umbrello/pics/hi16-action-umbrello_diagram_collaboration.png and new/umbrello-14.12.2/umbrello/pics/hi16-action-umbrello_diagram_collaboration.png differ Files old/umbrello-14.12.1/umbrello/pics/hi16-action-umbrello_diagram_component.png and new/umbrello-14.12.2/umbrello/pics/hi16-action-umbrello_diagram_component.png differ Files old/umbrello-14.12.1/umbrello/pics/hi16-action-umbrello_diagram_deployment.png and new/umbrello-14.12.2/umbrello/pics/hi16-action-umbrello_diagram_deployment.png differ Files old/umbrello-14.12.1/umbrello/pics/hi16-action-umbrello_diagram_sequence.png and new/umbrello-14.12.2/umbrello/pics/hi16-action-umbrello_diagram_sequence.png differ Files old/umbrello-14.12.1/umbrello/pics/hi16-action-umbrello_diagram_state.png and new/umbrello-14.12.2/umbrello/pics/hi16-action-umbrello_diagram_state.png differ Files old/umbrello-14.12.1/umbrello/pics/hi16-action-umbrello_diagram_usecase.png and new/umbrello-14.12.2/umbrello/pics/hi16-action-umbrello_diagram_usecase.png differ Files old/umbrello-14.12.1/umbrello/pics/hi16-actions-umbrello_diagram_activity.png and new/umbrello-14.12.2/umbrello/pics/hi16-actions-umbrello_diagram_activity.png differ Files old/umbrello-14.12.1/umbrello/pics/hi16-actions-umbrello_diagram_class.png and new/umbrello-14.12.2/umbrello/pics/hi16-actions-umbrello_diagram_class.png differ Files old/umbrello-14.12.1/umbrello/pics/hi16-actions-umbrello_diagram_collaboration.png and new/umbrello-14.12.2/umbrello/pics/hi16-actions-umbrello_diagram_collaboration.png differ Files old/umbrello-14.12.1/umbrello/pics/hi16-actions-umbrello_diagram_component.png and new/umbrello-14.12.2/umbrello/pics/hi16-actions-umbrello_diagram_component.png differ Files old/umbrello-14.12.1/umbrello/pics/hi16-actions-umbrello_diagram_deployment.png and new/umbrello-14.12.2/umbrello/pics/hi16-actions-umbrello_diagram_deployment.png differ Files old/umbrello-14.12.1/umbrello/pics/hi16-actions-umbrello_diagram_sequence.png and new/umbrello-14.12.2/umbrello/pics/hi16-actions-umbrello_diagram_sequence.png differ Files old/umbrello-14.12.1/umbrello/pics/hi16-actions-umbrello_diagram_state.png and new/umbrello-14.12.2/umbrello/pics/hi16-actions-umbrello_diagram_state.png differ Files old/umbrello-14.12.1/umbrello/pics/hi16-actions-umbrello_diagram_usecase.png and new/umbrello-14.12.2/umbrello/pics/hi16-actions-umbrello_diagram_usecase.png differ Files old/umbrello-14.12.1/umbrello/pics/hi22-action-umbrello_diagram_activity.png and new/umbrello-14.12.2/umbrello/pics/hi22-action-umbrello_diagram_activity.png differ Files old/umbrello-14.12.1/umbrello/pics/hi22-action-umbrello_diagram_class.png and new/umbrello-14.12.2/umbrello/pics/hi22-action-umbrello_diagram_class.png differ Files old/umbrello-14.12.1/umbrello/pics/hi22-action-umbrello_diagram_collaboration.png and new/umbrello-14.12.2/umbrello/pics/hi22-action-umbrello_diagram_collaboration.png differ Files old/umbrello-14.12.1/umbrello/pics/hi22-action-umbrello_diagram_component.png and new/umbrello-14.12.2/umbrello/pics/hi22-action-umbrello_diagram_component.png differ Files old/umbrello-14.12.1/umbrello/pics/hi22-action-umbrello_diagram_deployment.png and new/umbrello-14.12.2/umbrello/pics/hi22-action-umbrello_diagram_deployment.png differ Files old/umbrello-14.12.1/umbrello/pics/hi22-action-umbrello_diagram_entityrelationship.png and new/umbrello-14.12.2/umbrello/pics/hi22-action-umbrello_diagram_entityrelationship.png differ Files old/umbrello-14.12.1/umbrello/pics/hi22-action-umbrello_diagram_sequence.png and new/umbrello-14.12.2/umbrello/pics/hi22-action-umbrello_diagram_sequence.png differ Files old/umbrello-14.12.1/umbrello/pics/hi22-action-umbrello_diagram_state.png and new/umbrello-14.12.2/umbrello/pics/hi22-action-umbrello_diagram_state.png differ Files old/umbrello-14.12.1/umbrello/pics/hi22-action-umbrello_diagram_usecase.png and new/umbrello-14.12.2/umbrello/pics/hi22-action-umbrello_diagram_usecase.png differ Files old/umbrello-14.12.1/umbrello/pics/hi22-actions-umbrello_diagram_activity.png and new/umbrello-14.12.2/umbrello/pics/hi22-actions-umbrello_diagram_activity.png differ Files old/umbrello-14.12.1/umbrello/pics/hi22-actions-umbrello_diagram_class.png and new/umbrello-14.12.2/umbrello/pics/hi22-actions-umbrello_diagram_class.png differ Files old/umbrello-14.12.1/umbrello/pics/hi22-actions-umbrello_diagram_collaboration.png and new/umbrello-14.12.2/umbrello/pics/hi22-actions-umbrello_diagram_collaboration.png differ Files old/umbrello-14.12.1/umbrello/pics/hi22-actions-umbrello_diagram_component.png and new/umbrello-14.12.2/umbrello/pics/hi22-actions-umbrello_diagram_component.png differ Files old/umbrello-14.12.1/umbrello/pics/hi22-actions-umbrello_diagram_deployment.png and new/umbrello-14.12.2/umbrello/pics/hi22-actions-umbrello_diagram_deployment.png differ Files old/umbrello-14.12.1/umbrello/pics/hi22-actions-umbrello_diagram_entityrelationship.png and new/umbrello-14.12.2/umbrello/pics/hi22-actions-umbrello_diagram_entityrelationship.png differ Files old/umbrello-14.12.1/umbrello/pics/hi22-actions-umbrello_diagram_sequence.png and new/umbrello-14.12.2/umbrello/pics/hi22-actions-umbrello_diagram_sequence.png differ Files old/umbrello-14.12.1/umbrello/pics/hi22-actions-umbrello_diagram_state.png and new/umbrello-14.12.2/umbrello/pics/hi22-actions-umbrello_diagram_state.png differ Files old/umbrello-14.12.1/umbrello/pics/hi22-actions-umbrello_diagram_usecase.png and new/umbrello-14.12.2/umbrello/pics/hi22-actions-umbrello_diagram_usecase.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-14.12.1/umbrello/pics/sources/category.svg new/umbrello-14.12.2/umbrello/pics/sources/category.svg --- old/umbrello-14.12.1/umbrello/pics/sources/category.svg 2014-12-30 11:47:35.000000000 +0100 +++ new/umbrello-14.12.2/umbrello/pics/sources/category.svg 2015-01-19 13:30:42.000000000 +0100 @@ -1,20 +1,21 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> + <svg xmlns:dc="http://purl.org/dc/elements/1.1/"; - xmlns:cc="http://web.resource.org/cc/"; + xmlns:cc="http://creativecommons.org/ns#"; xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; xmlns:svg="http://www.w3.org/2000/svg"; xmlns="http://www.w3.org/2000/svg"; xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; - width="48px" - height="48px" + width="25.219999" + height="25.21875" id="svg1930" sodipodi:version="0.32" - inkscape:version="0.44.1" - sodipodi:docbase="/home/kde-devel/kde/src/KDE/kdesdk/umbrello/umbrello/pics/sources" - sodipodi:docname="category.svg"> + inkscape:version="0.48.4 r9939" + sodipodi:docname="category.svg" + version="1.1"> <defs id="defs1932" /> <sodipodi:namedview @@ -25,16 +26,31 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="7" - inkscape:cx="24" - inkscape:cy="24" + inkscape:cx="2.0982142" + inkscape:cy="23.4375" inkscape:current-layer="layer1" showgrid="true" inkscape:grid-bbox="true" inkscape:document-units="px" - inkscape:window-width="902" - inkscape:window-height="583" - inkscape:window-x="0" - inkscape:window-y="105" /> + inkscape:window-width="904" + inkscape:window-height="514" + inkscape:window-x="692" + inkscape:window-y="0" + inkscape:window-maximized="0" + fit-margin-top="0" + fit-margin-left="-2.7755576e-17" + fit-margin-right="0" + fit-margin-bottom="0"> + <inkscape:grid + type="xygrid" + id="grid2986" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" + originx="-3.84375px" + originy="-0.59374966px" /> + </sodipodi:namedview> <metadata id="metadata1935"> <rdf:RDF> @@ -49,40 +65,44 @@ <g id="layer1" inkscape:label="Layer 1" - inkscape:groupmode="layer"> + inkscape:groupmode="layer" + transform="translate(-3.84375,-22.1875)"> <path sodipodi:type="arc" - style="fill:yellow;fill-opacity:1;fill-rule:evenodd;stroke:red;stroke-width:6.55090475;stroke-dasharray:none;stroke-opacity:1" + style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:6.55090475;stroke-opacity:1;stroke-dasharray:none" id="path863" sodipodi:cx="63.4375" sodipodi:cy="39.375" sodipodi:rx="31.25" sodipodi:ry="31.5625" - d="M 94.6875 39.375 A 31.25 31.5625 0 1 1 32.1875,39.375 A 31.25 31.5625 0 1 1 94.6875 39.375 z" - transform="matrix(0.257743,0,0,0.228556,0.119829,7.473148)" + d="m 94.6875,39.375 a 31.25,31.5625 0 1 1 -62.5,0 31.25,31.5625 0 1 1 62.5,0 z" + transform="matrix(0.257743,0,0,0.228556,0.4055424,27.330291)" inkscape:export-filename="/home/kde-devel/kde/src/KDE/kdesdk/umbrello/umbrello/pics/category.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> <path - style="fill:red;fill-rule:evenodd;stroke:red;stroke-width:1.75128698;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 16.470176,2.3391041 C 16.470176,9.8105948 16.470176,9.8105948 16.470176,9.8105948 L 16.470176,9.8105948" + style="fill:#ff0000;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.75128698;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m 16.755888,22.196247 c 0,7.471491 0,7.471491 0,7.471491 l 0,0" id="path2823" inkscape:export-filename="/home/kde-devel/kde/src/KDE/kdesdk/umbrello/umbrello/pics/category.png" inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> + inkscape:export-ydpi="90" + inkscape:connector-curvature="0" /> <path - style="fill:red;fill-rule:evenodd;stroke:red;stroke-width:1.79869914;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 11.270042,21.334798 L 5.9003429,26.756832 L 5.9568665,26.700938" + style="fill:#ff0000;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.79869914;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m 11.555754,41.191941 -5.369698,5.422034 0.05652,-0.05589" id="path3714" inkscape:export-filename="/home/kde-devel/kde/src/KDE/kdesdk/umbrello/umbrello/pics/category.png" inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> + inkscape:export-ydpi="90" + inkscape:connector-curvature="0" /> <path - style="fill:red;fill-rule:evenodd;stroke:red;stroke-width:2.02780581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - d="M 21.050699,21.895895 L 26.190016,26.81061 L 26.190016,26.81061" + style="fill:#ff0000;fill-rule:evenodd;stroke:#ff0000;stroke-width:2.02780581;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m 21.336411,41.753038 5.139317,4.914715 0,0" id="path4609" inkscape:export-filename="/home/kde-devel/kde/src/KDE/kdesdk/umbrello/umbrello/pics/category.png" inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> + inkscape:export-ydpi="90" + inkscape:connector-curvature="0" /> </g> </svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-14.12.1/umbrello/pics/sources/cursor-category.svg new/umbrello-14.12.2/umbrello/pics/sources/cursor-category.svg --- old/umbrello-14.12.1/umbrello/pics/sources/cursor-category.svg 2014-12-30 11:47:35.000000000 +0100 +++ new/umbrello-14.12.2/umbrello/pics/sources/cursor-category.svg 2015-01-19 13:30:42.000000000 +0100 @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> + <svg xmlns:dc="http://purl.org/dc/elements/1.1/"; - xmlns:cc="http://web.resource.org/cc/"; + xmlns:cc="http://creativecommons.org/ns#"; xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; xmlns:svg="http://www.w3.org/2000/svg"; xmlns="http://www.w3.org/2000/svg"; @@ -15,9 +16,8 @@ x="0.00000000" version="1.0" sodipodi:version="0.32" - inkscape:version="0.44.1" + inkscape:version="0.48.4 r9939" sodipodi:docname="cursor-category.svg" - sodipodi:docbase="/home/kde-devel/kde/src/KDE/kdesdk/umbrello/umbrello/pics/sources" inkscape:export-filename="/home/kde-devel/kde/src/KDE/kdesdk/umbrello/umbrello/pics/cursor-category.png" inkscape:export-xdpi="90.000000" inkscape:export-ydpi="90.000000"> @@ -29,6 +29,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -39,14 +40,16 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:window-width="1016" - inkscape:window-height="688" + inkscape:window-width="1600" + inkscape:window-height="845" inkscape:zoom="21.75" inkscape:cx="16" - inkscape:cy="11.576571" - inkscape:window-x="0" - inkscape:window-y="0" - inkscape:current-layer="g191" /> + inkscape:cy="7.8609689" + inkscape:window-x="-2" + inkscape:window-y="-3" + inkscape:current-layer="g191" + showgrid="false" + inkscape:window-maximized="1" /> <defs id="defs3"> <marker @@ -477,27 +480,28 @@ id="path349" /> <path sodipodi:type="arc" - style="fill:white;fill-opacity:1;stroke:red;stroke-width:0.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + style="fill:#ffffff;fill-opacity:1;stroke:#ff0000;stroke-width:0.89999998;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path1933" sodipodi:cx="19.218391" sodipodi:cy="22.505747" sodipodi:rx="5.1954021" sodipodi:ry="4.3448277" - d="M 24.413794 22.505747 A 5.1954021 4.3448277 0 1 1 14.022989,22.505747 A 5.1954021 4.3448277 0 1 1 24.413794 22.505747 z" - transform="matrix(1.231731,0,0,1.345881,362.8294,506.4527)" /> + d="m 24.413794,22.505747 a 5.1954021,4.3448277 0 1 1 -10.390805,0 5.1954021,4.3448277 0 1 1 10.390805,0 z" + transform="matrix(1.231731,0,0,1.345881,365.40426,506.4527)" /> <path - style="fill:red;fill-rule:evenodd;stroke:red;stroke-width:1.01853251px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 386.46459,530.66451 L 386.49202,526.26925" - id="path3707" /> + style="fill:#ff0000;fill-rule:evenodd;stroke:#ff0000;stroke-width:1.01853251px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 389.03945,530.66451 0.0274,-4.39526" + id="path3707" + inkscape:connector-curvature="0" /> <path - style="fill:none;fill-rule:evenodd;stroke:red;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" - d="M 14.16092,27.402299 L 10.712644,30.850575" + style="fill:none;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 384.61638,540.4209 -3.44828,3.44828" id="path8138" - transform="translate(367.8806,513.0186)" /> + inkscape:connector-curvature="0" /> <path - style="fill:red;fill-rule:evenodd;stroke:red;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 23.034483,27.632184 L 26.206897,30.62069" + style="fill:#ff0000;fill-rule:evenodd;stroke:#ff0000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 393.48994,540.65078 3.17241,2.98851" id="path9035" - transform="translate(367.8806,513.0186)" /> + inkscape:connector-curvature="0" /> </g> </svg> -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
