Hello community,
here is the log from the commit of package kdebase4-workspace for openSUSE:12.3
checked in at 2013-02-09 10:11:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3/kdebase4-workspace (Old)
and /work/SRC/openSUSE:12.3/.kdebase4-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace", Maintainer is "kde-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:12.3/kdebase4-workspace/kdebase4-workspace.changes
2013-02-08 23:39:30.000000000 +0100
+++ /work/SRC/openSUSE:12.3/.kdebase4-workspace.new/kdebase4-workspace.changes
2013-02-09 10:12:00.000000000 +0100
@@ -8,0 +9,7 @@
+Thu Feb 7 19:00:15 UTC 2013 - wba...@tmo.at
+
+- changed plasma-kickoff-newly-collapsing.diff:
+ * add ":F" to the sortOrder list if it isn't included to make sure
+ collapsed entries are really shown (bnc#356553)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma-kickoff-newly-collapsing.diff ++++++
--- /var/tmp/diff_new_pack.B6vaMu/_old 2013-02-09 10:12:04.000000000 +0100
+++ /var/tmp/diff_new_pack.B6vaMu/_new 2013-02-09 10:12:04.000000000 +0100
@@ -121,7 +121,7 @@
static QHash<QString, QString> iconNameMap();
ApplicationModel *q;
-@@ -132,78 +137,117 @@ public:
+@@ -132,78 +137,118 @@ public:
QStringList systemApplications;
DisplayOrder displayOrder;
bool allowSeparators;
@@ -237,6 +237,7 @@
+ slist.insert( p->name().toLocal8Bit(), p);
+ }
+
++ if (reduceMenuDepth) root->addSortOrderEntry(":F"); // add ":F" to the
sortOrder list if it isn't included (bnc#356553)
+ list = root->SuSEsortEntries( slist, glist, true /*excludeNoDisplay_*/,
false );
+
+ for( KServiceGroup::List::ConstIterator it = list.begin();
@@ -285,7 +286,7 @@
}
if (systemApplicationPolicy ==
ApplicationModel::ShowSystemOnlyPolicy &&
-@@ -213,9 +257,33 @@ void ApplicationModelPrivate::fillNode(c
+@@ -213,9 +258,33 @@ void ApplicationModelPrivate::fillNode(c
continue;
}
@@ -321,7 +322,7 @@
if (serviceGroup->noDisplay() || serviceGroup->childCount() == 0)
{
continue;
-@@ -224,41 +292,42 @@ void ApplicationModelPrivate::fillNode(c
+@@ -224,41 +293,42 @@ void ApplicationModelPrivate::fillNode(c
kDebug(250) << "Service group" << serviceGroup->entryPath() <<
serviceGroup->icon()
<< serviceGroup->relPath() << serviceGroup->directoryEntryPath();
@@ -379,7 +380,7 @@
}
// set the subTitleMandatory field for nodes that do not provide a unique
generic
-@@ -273,6 +342,20 @@ void ApplicationModelPrivate::fillNode(c
+@@ -273,6 +343,20 @@ void ApplicationModelPrivate::fillNode(c
}
}
@@ -400,7 +401,7 @@
ApplicationModel::ApplicationModel(QObject *parent, bool allowSeparators)
: KickoffAbstractModel(parent),
d(new ApplicationModelPrivate(this, allowSeparators))
-@@ -282,6 +365,7 @@ ApplicationModel::ApplicationModel(QObje
+@@ -282,6 +366,7 @@ ApplicationModel::ApplicationModel(QObje
QDBusConnection::sessionBus().registerObject("/kickoff", this);
dbus.connect(QString(), "/kickoff", "org.kde.plasma", "reloadMenu", this,
SLOT(reloadMenu()));
connect(KSycoca::self(), SIGNAL(databaseChanged(QStringList)), this,
SLOT(checkSycocaChange(QStringList)));
@@ -408,7 +409,7 @@
}
ApplicationModel::~ApplicationModel()
-@@ -308,6 +392,32 @@ DisplayOrder ApplicationModel::nameDispl
+@@ -308,6 +393,32 @@ DisplayOrder ApplicationModel::nameDispl
return d->displayOrder;
}
@@ -441,7 +442,7 @@
int ApplicationModel::columnCount(const QModelIndex &parent) const
{
Q_UNUSED(parent)
-@@ -515,8 +625,9 @@ void ApplicationModel::reloadMenu()
+@@ -515,8 +626,9 @@ void ApplicationModel::reloadMenu()
{
delete d->root;
d->root = new AppNode();
@@ -452,7 +453,7 @@
}
void ApplicationModel::checkSycocaChange(const QStringList &changes)
-@@ -536,6 +647,104 @@ ApplicationModel::SystemApplicationPolic
+@@ -536,6 +648,104 @@ ApplicationModel::SystemApplicationPolic
return d->systemApplicationPolicy;
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
