Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at Thu Aug 4 09:22:12 CEST 2011.
-------- --- KDE/kdebase4-workspace/kdebase4-workspace.changes 2011-07-22 20:23:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-workspace.changes 2011-08-02 15:45:55.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Aug 2 13:24:06 UTC 2011 - idon...@novell.com + +- Refresh and apply plasma-branding-defaults-corona.diff, + plasma-kickoff-newly-collapsing.diff +- Drop kdm-themer-wallpaper-sizes.diff, fixed in upstream in + different way. + +------------------------------------------------------------------- python-kdebase4.changes: same change calling whatdependson for head-i586 Old: ---- kdm-themer-wallpaper-sizes.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.ZxwFzH/_old 2011-08-04 09:21:35.000000000 +0200 +++ /var/tmp/diff_new_pack.ZxwFzH/_new 2011-08-04 09:21:35.000000000 +0200 @@ -23,7 +23,7 @@ Summary: The KDE Workspace Components Url: http://www.kde.org/ Version: 4.7.0 -Release: 1 +Release: 2 BuildRequires: ConsoleKit-devel %if %suse_version > 1140 BuildRequires: NetworkManager-devel > 0.8.997 @@ -98,7 +98,6 @@ Patch124: kdm-fix-labelcolors.diff Patch125: pam-translate.diff Patch201: plasma-notifications-kill-timer.diff -Patch208: kdm-themer-wallpaper-sizes.diff Patch211: disable-python-support.diff Requires: kde4-kgreeter-plugins = %version Requires: kdebase4-workspace-liboxygenstyle = %version @@ -167,20 +166,16 @@ #%patch94 %patch98 %patch99 -###KDE47: rediff! -#%patch103 +%patch103 %patch104 %patch106 -###KDE47: rediff! -#%patch107 +%patch107 -p1 %patch108 %patch123 -p1 %patch124 -p1 -###KDE47: rediff! +###KDE47: rediff #%patch125 %patch201 -p1 -###KDE47: rediff - kdm code may have added similar functionality -#%patch208 %patch211 cp %{SOURCE3} kwin/effects/cube/data/cubecap.png ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.ZxwFzH/_old 2011-08-04 09:21:35.000000000 +0200 +++ /var/tmp/diff_new_pack.ZxwFzH/_new 2011-08-04 09:21:35.000000000 +0200 @@ -29,7 +29,7 @@ Summary: Python bindings for KDE 4 desktop shell Url: http://www.kde.org/ Version: 4.7.0 -Release: 1 +Release: 2 Source0: kde-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: python-kde4 = %{version} ++++++ plasma-branding-defaults-corona.diff ++++++ --- /var/tmp/diff_new_pack.ZxwFzH/_old 2011-08-04 09:21:36.000000000 +0200 +++ /var/tmp/diff_new_pack.ZxwFzH/_new 2011-08-04 09:21:36.000000000 +0200 @@ -1,11 +1,9 @@ -Index: plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js -=================================================================== ---- plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js.orig 2011-01-19 23:05:32.000000000 +0100 -+++ plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js 2011-02-24 16:02:45.209930414 +0100 -@@ -5,7 +5,15 @@ if (panelIds.length == 1) { +--- plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js 2011-05-20 22:32:08.000000000 +0200 ++++ plasma/desktop/shell/data/layouts/org.kde.plasma-desktop.defaultPanel/contents/layout.js 2011-08-02 15:14:29.914115917 +0200 +@@ -5,7 +5,15 @@ } - panel.height = 27 + panel.height = screenGeometry(panel.screen).height > 1024 ? 35 : 27 -panel.addWidget("launcher") +var launcher = panel.addWidget("launcher") +launcher.globalShortcut = "Alt+F1"; @@ -16,6 +14,6 @@ +var dolphin = panel.addWidget("icon"); +dolphin.writeConfig("Url", "dolphin.desktop"); +// end SUSE branding + panel.addWidget("org.kde.showActivityManager") panel.addWidget("pager") - panel.addWidget("tasks") - panel.addWidget("systemtray") + tasks = panel.addWidget("tasks") ++++++ plasma-kickoff-newly-collapsing.diff ++++++ --- /var/tmp/diff_new_pack.ZxwFzH/_old 2011-08-04 09:21:36.000000000 +0200 +++ /var/tmp/diff_new_pack.ZxwFzH/_new 2011-08-04 09:21:36.000000000 +0200 @@ -1,15 +1,16 @@ ---- plasma/desktop/applets/kickoff/applet/applet.cpp 2011-01-19 23:05:33.000000000 +0100 -+++ plasma/desktop/applets/kickoff/applet/applet.cpp_patched 2011-02-06 22:00:41.000000000 +0100 +diff -urN kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/applet/applet.cpp kde-workspace-4.7.0/plasma/desktop/applets/kickoff/applet/applet.cpp +--- kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/applet/applet.cpp 2011-08-02 15:20:44.912157708 +0200 ++++ kde-workspace-4.7.0/plasma/desktop/applets/kickoff/applet/applet.cpp 2011-08-02 15:20:55.501158687 +0200 @@ -165,6 +165,8 @@ d->ui.iconButton->setIcon(popupIcon()); d->ui.switchOnHoverCheckBox->setChecked(d->launcher->switchTabsOnHover()); d->ui.appsByNameCheckBox->setChecked(d->launcher->showAppsByName()); + d->ui.showRecentlyInstalledCheckBox->setChecked(d->launcher->showRecentlyInstalled()); -+ d->ui.reduceMenuDepthCheckBox->setChecked(d->launcher->reduceMenuDepth()); - } - - void LauncherApplet::popupEvent(bool show) -@@ -201,6 +203,9 @@ ++ d->ui.reduceMenuDepthCheckBox->setChecked(d->launcher->reduceMenuDepth()); + connect(d->ui.iconButton, SIGNAL(iconChanged(QString)), parent, SLOT(settingsModified())); + connect(d->ui.switchOnHoverCheckBox, SIGNAL(toggled(bool)), parent, SLOT(settingsModified())); + connect(d->ui.appsByNameCheckBox, SIGNAL(toggled(bool)), parent, SLOT(settingsModified())); +@@ -204,6 +206,9 @@ bool switchTabsOnHover = d->ui.switchOnHoverCheckBox->isChecked(); bool showAppsByName = d->ui.appsByNameCheckBox->isChecked(); @@ -19,7 +20,7 @@ const QString iconname = d->ui.iconButton->icon(); // TODO: should this be moved into Launcher as well? perhaps even the config itself? -@@ -220,6 +225,9 @@ +@@ -223,6 +228,9 @@ d->launcher->setSwitchTabsOnHover(switchTabsOnHover); d->launcher->setShowAppsByName(showAppsByName); @@ -29,8 +30,68 @@ } QList<QAction*> LauncherApplet::contextualActions() ---- plasma/desktop/applets/kickoff/core/applicationmodel.cpp 2011-01-19 23:05:34.000000000 +0100 -+++ plasma/desktop/applets/kickoff/core/applicationmodel.cpp_patched 2011-02-11 19:54:17.000000000 +0100 +diff -urN kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/applet/kickoffConfig.ui kde-workspace-4.7.0/plasma/desktop/applets/kickoff/applet/kickoffConfig.ui +--- kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/applet/kickoffConfig.ui 2011-08-02 15:20:44.912157708 +0200 ++++ kde-workspace-4.7.0/plasma/desktop/applets/kickoff/applet/kickoffConfig.ui 2011-08-02 15:20:55.502158687 +0200 +@@ -54,7 +54,7 @@ + </property> + </spacer> + </item> +- <item row="3" column="1"> ++ <item row="5" column="1"> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> +@@ -93,6 +93,46 @@ + </property> + </widget> + </item> ++ <item row="3" column="2"> ++ <widget class="QCheckBox" name="showRecentlyInstalledCheckBox"> ++ <property name="text"> ++ <string/> ++ </property> ++ </widget> ++ </item> ++ <item row="4" column="2"> ++ <widget class="QCheckBox" name="reduceMenuDepthCheckBox"> ++ <property name="text"> ++ <string/> ++ </property> ++ </widget> ++ </item> ++ <item row="4" column="1"> ++ <widget class="QLabel" name="label_4"> ++ <property name="text"> ++ <string>Reduce menu depth:</string> ++ </property> ++ <property name="alignment"> ++ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> ++ </property> ++ <property name="buddy"> ++ <cstring>reduceMenuDepthCheckBox</cstring> ++ </property> ++ </widget> ++ </item> ++ <item row="3" column="1"> ++ <widget class="QLabel" name="label"> ++ <property name="text"> ++ <string>Show 'Recently Installed':</string> ++ </property> ++ <property name="alignment"> ++ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> ++ </property> ++ <property name="buddy"> ++ <cstring>showRecentlyInstalledCheckBox</cstring> ++ </property> ++ </widget> ++ </item> + </layout> + </widget> + <customwidgets> +diff -urN kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/core/applicationmodel.cpp kde-workspace-4.7.0/plasma/desktop/applets/kickoff/core/applicationmodel.cpp +--- kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/core/applicationmodel.cpp 2011-08-02 15:20:44.913157708 +0200 ++++ kde-workspace-4.7.0/plasma/desktop/applets/kickoff/core/applicationmodel.cpp 2011-08-02 15:20:55.501158687 +0200 @@ -109,7 +109,10 @@ systemApplicationPolicy(ApplicationModel::ShowSystemOnlyPolicy), primaryNamePolicy(ApplicationModel::GenericNamePrimary), @@ -379,7 +440,7 @@ int ApplicationModel::columnCount(const QModelIndex &parent) const { Q_UNUSED(parent) -@@ -512,8 +629,9 @@ +@@ -516,8 +633,9 @@ { delete d->root; d->root = new AppNode(); @@ -390,7 +451,7 @@ } void ApplicationModel::checkSycocaChange(const QStringList &changes) -@@ -533,6 +651,104 @@ +@@ -537,6 +655,104 @@ return d->systemApplicationPolicy; } @@ -495,8 +556,9 @@ /** * FIXME This is a temporary workaround to map the icon names found * in the desktop directory files (from /usr/share/desktop-directories) ---- plasma/desktop/applets/kickoff/core/applicationmodel.h 2011-01-19 23:05:34.000000000 +0100 -+++ plasma/desktop/applets/kickoff/core/applicationmodel.h_patched 2011-02-08 19:12:43.000000000 +0100 +diff -urN kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/core/applicationmodel.h kde-workspace-4.7.0/plasma/desktop/applets/kickoff/core/applicationmodel.h +--- kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/core/applicationmodel.h 2011-08-02 15:20:44.913157708 +0200 ++++ kde-workspace-4.7.0/plasma/desktop/applets/kickoff/core/applicationmodel.h 2011-08-02 15:20:55.501158687 +0200 @@ -114,10 +114,19 @@ virtual QModelIndex parent(const QModelIndex &index) const; virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; @@ -526,143 +588,9 @@ Q_DISABLE_COPY(ApplicationModel) }; ---- plasma/desktop/applets/kickoff/applet/kickoffConfig.ui 2011-01-19 23:05:33.000000000 +0100 -+++ plasma/desktop/applets/kickoff/applet/kickoffConfig.ui_patched 2011-02-06 22:05:12.000000000 +0100 -@@ -54,7 +54,7 @@ - </property> - </spacer> - </item> -- <item row="3" column="1"> -+ <item row="5" column="1"> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> -@@ -93,6 +93,46 @@ - </property> - </widget> - </item> -+ <item row="3" column="2"> -+ <widget class="QCheckBox" name="showRecentlyInstalledCheckBox"> -+ <property name="text"> -+ <string/> -+ </property> -+ </widget> -+ </item> -+ <item row="4" column="2"> -+ <widget class="QCheckBox" name="reduceMenuDepthCheckBox"> -+ <property name="text"> -+ <string/> -+ </property> -+ </widget> -+ </item> -+ <item row="4" column="1"> -+ <widget class="QLabel" name="label_4"> -+ <property name="text"> -+ <string>Reduce menu depth:</string> -+ </property> -+ <property name="alignment"> -+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> -+ </property> -+ <property name="buddy"> -+ <cstring>reduceMenuDepthCheckBox</cstring> -+ </property> -+ </widget> -+ </item> -+ <item row="3" column="1"> -+ <widget class="QLabel" name="label"> -+ <property name="text"> -+ <string>Show 'Recently Installed':</string> -+ </property> -+ <property name="alignment"> -+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> -+ </property> -+ <property name="buddy"> -+ <cstring>showRecentlyInstalledCheckBox</cstring> -+ </property> -+ </widget> -+ </item> - </layout> - </widget> - <customwidgets> ---- plasma/desktop/applets/kickoff/ui/launcher.cpp 2011-01-19 23:05:34.000000000 +0100 -+++ plasma/desktop/applets/kickoff/ui/launcher.cpp_patched 2011-02-07 21:19:38.000000000 +0100 -@@ -647,6 +647,30 @@ - } - } - -+void Launcher::setShowRecentlyInstalled(bool showRecentlyInstalled) -+{ -+ const bool wasShowRecentlyInstalled = d->applicationModel->showRecentlyInstalled(); -+ if (d->applet && showRecentlyInstalled != wasShowRecentlyInstalled) { -+ KConfigGroup cg = d->applet->config(); -+ cg.writeEntry("ShowRecentlyInstalled", showRecentlyInstalled); -+ emit configNeedsSaving(); -+ } -+ -+ d->applicationModel->setShowRecentlyInstalled(showRecentlyInstalled); -+} -+ -+void Launcher::setReduceMenuDepth(bool showReduceMenuDepth) -+{ -+ const bool wasReduceMenuDepth = d->applicationModel->reduceMenuDepth(); -+ if (d->applet && showReduceMenuDepth != wasReduceMenuDepth) { -+ KConfigGroup cg = d->applet->config(); -+ cg.writeEntry("ReduceMenuDepth", showReduceMenuDepth); -+ emit configNeedsSaving(); -+ } -+ -+ d->applicationModel->setReduceMenuDepth(showReduceMenuDepth); -+} -+ - bool Launcher::switchTabsOnHover() const - { - return d->contentSwitcher->switchTabsOnHover(); -@@ -657,6 +681,16 @@ - return d->applicationModel->nameDisplayOrder() == Kickoff::NameBeforeDescription; - } - -+bool Launcher::showRecentlyInstalled() const -+{ -+ return d->applicationModel->showRecentlyInstalled(); -+} -+ -+bool Launcher::reduceMenuDepth() const -+{ -+ return d->applicationModel->reduceMenuDepth(); -+} -+ - void Launcher::setVisibleItemCount(int count) - { - d->visibleItemCount = count; -@@ -675,6 +709,9 @@ - cg = applet->config(); - setShowAppsByName(cg.readEntry("ShowAppsByName", showAppsByName())); - setVisibleItemCount(cg.readEntry("VisibleItemsCount", visibleItemCount())); -+ setShowRecentlyInstalled(cg.readEntry("ShowRecentlyInstalled", showRecentlyInstalled())); -+ setReduceMenuDepth(cg.readEntry("ReduceMenuDepth", reduceMenuDepth())); -+ - - d->applet = applet; - d->contextMenuFactory->setApplet(applet); ---- plasma/desktop/applets/kickoff/ui/launcher.h 2011-01-19 23:05:34.000000000 +0100 -+++ plasma/desktop/applets/kickoff/ui/launcher.h_patched 2011-02-07 21:21:04.000000000 +0100 -@@ -77,6 +77,14 @@ - we don't display old searches and switch back to the favorite-view. */ - void reset(); - -+ /** Specifies whether 'Recently Installed' hierarchy shall be shown in application view */ -+ void setShowRecentlyInstalled(bool showRecentlyInstalled); -+ bool showRecentlyInstalled() const; -+ -+ /** Specifies whether single item sub-menus shall be collapsed to upper hierarchy */ -+ void setReduceMenuDepth(bool reduceMenuDepth); -+ bool reduceMenuDepth() const; -+ - signals: - void aboutToHide(); - void configNeedsSaving(); ---- plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2011-02-08 19:16:09.000000000 +0100 -+++ plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp_patched 2011-02-10 21:55:19.000000000 +0100 +diff -urN kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp kde-workspace-4.7.0/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp +--- kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2011-08-02 15:20:44.913157708 +0200 ++++ kde-workspace-4.7.0/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp 2011-08-02 15:20:55.502158687 +0200 @@ -114,12 +114,17 @@ MenuLauncherApplet::FormatType formattype; int maxRecentApps; @@ -711,7 +639,7 @@ parent->addPage(p, i18n("Options"), "configure"); connect(parent, SIGNAL(applyClicked()), this, SLOT(configAccepted())); -@@ -546,6 +565,19 @@ +@@ -551,6 +570,19 @@ d->showMenuTitles = showMenuTitles; cg.writeEntry("showMenuTitles", showMenuTitles); } @@ -731,7 +659,7 @@ if (needssaving) { d->updateTooltip(); -@@ -613,6 +645,9 @@ +@@ -618,6 +650,9 @@ appModel->setPrimaryNamePolicy(Kickoff::ApplicationModel::AppNamePrimary); appModel->setSystemApplicationPolicy(Kickoff::ApplicationModel::ShowApplicationAndSystemPolicy); @@ -741,7 +669,7 @@ menuview->addModel(appModel, Kickoff::MenuView::None, d->relativePath); if (d->relativePath.isEmpty()) { -@@ -851,6 +886,8 @@ +@@ -862,6 +897,8 @@ d->setMaxRecentApps(cg.readEntry("maxRecentApps", qMin(5, Kickoff::RecentApplications::self()->maximum()))); d->showMenuTitles = cg.readEntry("showMenuTitles", false); @@ -750,3 +678,82 @@ d->icon->setIcon(KIcon(cg.readEntry("icon", d->iconname))); +diff -urN kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/ui/launcher.cpp kde-workspace-4.7.0/plasma/desktop/applets/kickoff/ui/launcher.cpp +--- kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/ui/launcher.cpp 2011-08-02 15:20:44.912157708 +0200 ++++ kde-workspace-4.7.0/plasma/desktop/applets/kickoff/ui/launcher.cpp 2011-08-02 15:20:55.502158687 +0200 +@@ -680,6 +680,30 @@ + } + } + ++void Launcher::setShowRecentlyInstalled(bool showRecentlyInstalled) ++{ ++ const bool wasShowRecentlyInstalled = d->applicationModel->showRecentlyInstalled(); ++ if (d->applet && showRecentlyInstalled != wasShowRecentlyInstalled) { ++ KConfigGroup cg = d->applet->config(); ++ cg.writeEntry("ShowRecentlyInstalled", showRecentlyInstalled); ++ emit configNeedsSaving(); ++ } ++ ++ d->applicationModel->setShowRecentlyInstalled(showRecentlyInstalled); ++} ++ ++void Launcher::setReduceMenuDepth(bool showReduceMenuDepth) ++{ ++ const bool wasReduceMenuDepth = d->applicationModel->reduceMenuDepth(); ++ if (d->applet && showReduceMenuDepth != wasReduceMenuDepth) { ++ KConfigGroup cg = d->applet->config(); ++ cg.writeEntry("ReduceMenuDepth", showReduceMenuDepth); ++ emit configNeedsSaving(); ++ } ++ ++ d->applicationModel->setReduceMenuDepth(showReduceMenuDepth); ++} ++ + bool Launcher::switchTabsOnHover() const + { + return d->contentSwitcher->switchTabsOnHover(); +@@ -690,6 +714,16 @@ + return d->applicationModel->nameDisplayOrder() == Kickoff::NameBeforeDescription; + } + ++bool Launcher::showRecentlyInstalled() const ++{ ++ return d->applicationModel->showRecentlyInstalled(); ++} ++ ++bool Launcher::reduceMenuDepth() const ++{ ++ return d->applicationModel->reduceMenuDepth(); ++} ++ + void Launcher::setVisibleItemCount(int count) + { + d->visibleItemCount = count; +@@ -708,6 +742,9 @@ + cg = applet->config(); + setShowAppsByName(cg.readEntry("ShowAppsByName", showAppsByName())); + setVisibleItemCount(cg.readEntry("VisibleItemsCount", visibleItemCount())); ++ setShowRecentlyInstalled(cg.readEntry("ShowRecentlyInstalled", showRecentlyInstalled())); ++ setReduceMenuDepth(cg.readEntry("ReduceMenuDepth", reduceMenuDepth())); ++ + + d->applet = applet; + d->contextMenuFactory->setApplet(applet); +diff -urN kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/ui/launcher.h kde-workspace-4.7.0/plasma/desktop/applets/kickoff/ui/launcher.h +--- kde-workspace-4.7.0.orig/plasma/desktop/applets/kickoff/ui/launcher.h 2011-08-02 15:20:44.912157708 +0200 ++++ kde-workspace-4.7.0/plasma/desktop/applets/kickoff/ui/launcher.h 2011-08-02 15:20:55.502158687 +0200 +@@ -78,6 +78,14 @@ + we don't display old searches and switch back to the favorite-view. */ + void reset(); + ++ /** Specifies whether 'Recently Installed' hierarchy shall be shown in application view */ ++ void setShowRecentlyInstalled(bool showRecentlyInstalled); ++ bool showRecentlyInstalled() const; ++ ++ /** Specifies whether single item sub-menus shall be collapsed to upper hierarchy */ ++ void setReduceMenuDepth(bool reduceMenuDepth); ++ bool reduceMenuDepth() const; ++ + signals: + void aboutToHide(); + void configNeedsSaving(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
