Hello community, here is the log from the commit of package umbrello for openSUSE:Factory checked in at 2013-10-03 16:10:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-09-09 11:11:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.umbrello.new/umbrello.changes 2013-10-03 16:10:25.000000000 +0200 @@ -1,0 +2,7 @@ +Sat Sep 28 15:46:25 UTC 2013 - [email protected] + +- Update to 4.11.2 + * KDE 4.11.2 bugfix release + * See http://www.kde.org/announcements/announce-4.11.2.php + +------------------------------------------------------------------- Old: ---- umbrello-4.11.1.tar.xz New: ---- umbrello-4.11.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ umbrello.spec ++++++ --- /var/tmp/diff_new_pack.DCejnL/_old 2013-10-03 16:10:26.000000000 +0200 +++ /var/tmp/diff_new_pack.DCejnL/_new 2013-10-03 16:10:26.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.11.1 +Version: 4.11.2 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ umbrello-4.11.1.tar.xz -> umbrello-4.11.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.1/umbrello/umllistview.cpp new/umbrello-4.11.2/umbrello/umllistview.cpp --- old/umbrello-4.11.1/umbrello/umllistview.cpp 2013-08-28 19:14:58.000000000 +0200 +++ new/umbrello-4.11.2/umbrello/umllistview.cpp 2013-09-26 21:30:16.000000000 +0200 @@ -152,16 +152,7 @@ if (lvitem == NULL || m_editItem == NULL) return; QString text = item->text(column); - if (lvitem->creating()) { - lvitem->setCreating(false); - m_editItem = NULL; - if (text.isEmpty()) { - text = lvitem->getSavedText(); - lvitem->setText(text); - } - DEBUG(DBG_SRC) << "creating text: " << text; - createItem(lvitem); - } else if (m_bRenameInProgress) { + if (m_bRenameInProgress) { DEBUG(DBG_SRC) << "text: " << text; endRename(lvitem); } @@ -682,11 +673,6 @@ uWarning() << "calling properties on unknown type"; } } - // Bug 268469: Changing the package of a class deletes the old widget. - // By reloading the current item we are sure to not use a destroyed object - currItem = (UMLListViewItem*)currentItem(); - if (currItem) - currItem->cancelRename(0); break; case ListPopupMenu::mt_Logical_Folder: @@ -2257,6 +2243,7 @@ */ void UMLListView::addNewItem(UMLListViewItem *parentItem, UMLListViewItem::ListViewType type) { + UMLListViewItem *newItem; if (type == UMLListViewItem::lvt_Datatype) { parentItem = m_datatypeFolder; } @@ -2270,7 +2257,7 @@ if (Model_Utils::typeIsDiagram(type)) { Uml::DiagramType::Enum dt = Model_Utils::convert_LVT_DT(type); name = uniqueDiagramName(dt); - m_editItem = new UMLListViewItem(parentItem, name, type, Uml::ID::None); + newItem = new UMLListViewItem(parentItem, name, type, Uml::ID::None); } else { UMLObject::ObjectType ot = Model_Utils::convert_LVT_OT(type); if (ot == UMLObject::ot_UMLObject) { @@ -2290,14 +2277,12 @@ } else { name = Model_Utils::uniqObjectName(ot, parentPkg); } - m_editItem = new UMLListViewItem(parentItem, name, type, (UMLObject *)0); + newItem = new UMLListViewItem(parentItem, name, type, (UMLObject *)0); } - m_editItem->setIcon(icon); - m_editItem->setOpen(true); + newItem->setIcon(icon); + newItem->setOpen(true); blockSignals(false); - m_editItem->setCreating(true); - m_bRenameInProgress = true; - editItem(m_editItem, 0); + createItem(newItem); } /** @@ -2310,7 +2295,6 @@ UMLListViewItem * renamedItem = static_cast< UMLListViewItem *>(item) ; UMLListViewItem::ListViewType type = renamedItem->type(); QString newText = renamedItem->text(col); - renamedItem->setCreating(false); // If the type is empty then delete it. if (newText.isEmpty() || newText.contains(QRegExp("^\\s+$"))) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.1/umbrello/umllistviewitem.cpp new/umbrello-4.11.2/umbrello/umllistviewitem.cpp --- old/umbrello-4.11.1/umbrello/umllistviewitem.cpp 2013-08-28 19:14:58.000000000 +0200 +++ new/umbrello-4.11.2/umbrello/umllistviewitem.cpp 2013-09-26 21:30:16.000000000 +0200 @@ -189,7 +189,6 @@ void UMLListViewItem::init() { m_type = lvt_Unknown; - m_bCreating = false; m_object = 0; m_id = Uml::ID::None; } @@ -448,18 +447,6 @@ } /** - * Sets if the item is in the middle of being created. - */ -void UMLListViewItem::setCreating( bool creating ) -{ - m_bCreating = creating; -} - -bool UMLListViewItem::creating() const { - return m_bCreating; -} - -/** * Set the pixmap corresponding to the given IconType. */ void UMLListViewItem::setIcon(Icon_Utils::IconType iconType) @@ -486,16 +473,6 @@ DEBUG(DBG_LVI) << this << " - column=" << col << ", text=" << text(col); UMLListView* listView = static_cast<UMLListView*>(treeWidget()); UMLDoc* doc = listView->document(); - if (m_bCreating) { - m_bCreating = false; - if (listView->itemRenamed(this, col)) { -//:TODO: listView->ensureItemVisible(this); - doc->setModified(true); - } else { - delete this; - } - return; - } QString newText = text(col); if (newText == m_label) { return; @@ -721,19 +698,6 @@ } /** - * Overrides default method to make public. - */ -void UMLListViewItem::cancelRename(int col) -{ - DEBUG(DBG_LVI) << this << " - column=" << col << ", text=" << text(col); - Q_UNUSED(col); - if (m_bCreating) { - UMLListView* listView = static_cast<UMLListView*>(treeWidget()); - listView->cancelRename(this); - } -} - -/** * Overrides the default sorting to sort by item type. * Sort the listview items by type and position within the corresponding list * of UMLObjects. If the item does not have an UMLObject then place it last. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/umbrello-4.11.1/umbrello/umllistviewitem.h new/umbrello-4.11.2/umbrello/umllistviewitem.h --- old/umbrello-4.11.1/umbrello/umllistviewitem.h 2013-06-28 20:06:03.000000000 +0200 +++ new/umbrello-4.11.2/umbrello/umllistviewitem.h 2013-09-26 21:30:16.000000000 +0200 @@ -119,13 +119,9 @@ QString toolTip(); - void setCreating(bool creating); - bool creating() const; - void setIcon(Icon_Utils::IconType iconType); void startRename(int col); - void cancelRename(int col); void okRename(int col); void addClassifierListItem(UMLClassifierListItem *child, UMLListViewItem *childItem); @@ -161,7 +157,6 @@ */ typedef QMap<UMLClassifierListItem*, UMLListViewItem*> ChildObjectMap; - bool m_bCreating; ///< flag to set the state of creating ListViewType m_type; Uml::ID::Type m_id; UMLObject * m_object; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
