Hello community,
here is the log from the commit of package kdebase4-workspace
checked in at Thu Jan 24 21:15:01 CET 2008.
--------
--- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-01-21 00:52:55.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-01-24 21:11:39.709350000 +0100
@@ -1,0 +2,10 @@
+Wed Jan 23 16:27:17 CET 2008 - stbinner@suse.de
+
+- update KDE_4_0_BRANCH.diff (incl. taskbar attention flash)
+- don't migrate ~/Desktop icons to Dashboard which will not work
+- migrate Trash.desktop to Trash plasmoid (added it for that)
+- open Dashboard toolbox when Dashboard view is activated
+- set GTK2_RC_FILES for better style of GTK applications
+- fix locking of session (#355155)
+
+-------------------------------------------------------------------
kdebase4-workspace.changes: same change
New:
----
dashboard-toolbox.diff
plasma-iconloader.diff
startkde-gtk2.diff
trash-plasmoid.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-wallpapers.spec ++++++
--- /var/tmp/diff_new_pack.s32204/_old 2008-01-24 21:12:01.000000000 +0100
+++ /var/tmp/diff_new_pack.s32204/_new 2008-01-24 21:12:01.000000000 +0100
@@ -21,7 +21,7 @@
Summary: KDE 4 Wallpapers
Url: http://www.kde.org/
Version: 4.0
-Release: 7
+Release: 9
%define rversion 4.0.0
Source0: kdebase-workspace-%rversion.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -59,6 +59,13 @@
/usr/share/wallpapers
%changelog
+* Wed Jan 23 2008 stbinner@suse.de
+- update KDE_4_0_BRANCH.diff (incl. taskbar attention flash)
+- don't migrate ~/Desktop icons to Dashboard which will not work
+- migrate Trash.desktop to Trash plasmoid (added it for that)
+- open Dashboard toolbox when Dashboard view is activated
+- set GTK2_RC_FILES for better style of GTK applications
+- fix locking of session (#355155)
* Sun Jan 20 2008 stbinner@suse.de
- update KDE_4_0_BRANCH.diff
- more SUSE-like default panel setup (size, icons, plasmoids):
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.s32204/_old 2008-01-24 21:12:01.000000000 +0100
+++ /var/tmp/diff_new_pack.s32204/_new 2008-01-24 21:12:01.000000000 +0100
@@ -11,7 +11,7 @@
Name: kdebase4-workspace
BuildRequires: NetworkManager-devel bluez-libs libkde4-devel libqimageblitz-devel
-BuildRequires: libraw1394-devel libsmbclient-devel libusb-devel libxklavier-devel
+BuildRequires: libkonq4-devel libraw1394-devel libsmbclient-devel libusb-devel libxklavier-devel
%if %suse_version > 1020
BuildRequires: fdupes libusb-devel
%else
@@ -22,7 +22,7 @@
Summary: The KDE Workspace Components
Url: http://www.kde.org/
Version: 4.0
-Release: 7
+Release: 9
%define rversion 4.0.0
Source0: kdebase-workspace-%rversion.tar.bz2
Source1: opensuse.png
@@ -44,6 +44,10 @@
Patch12: lock_logout.diff
Patch13: panel-height.diff
Patch14: tasks.diff
+Patch15: dashboard-toolbox.diff
+Patch16: plasma-iconloader.diff
+Patch17: trash-plasmoid.diff
+Patch18: startkde-gtk2.diff
%kde4_runtime_requires
Conflicts: yast2-theme-NLD
Suggests: kdebase4-ksysguardd
@@ -77,6 +81,10 @@
%patch12
%patch13
%patch14
+%patch15
+%patch16
+%patch17
+%patch18
%build
%cmake_kde4 -d build
@@ -248,8 +256,6 @@
%doc COPYING COPYING-DOCS README
%doc %lang(en) /usr/share/doc/kde/HTML/en/kdm
%dir /etc/kde4/kdm
-%_libdir/kde4/kgreet_classic.so
-%_libdir/kde4/kgreet_winbind.so
%_libdir/kde4/kcm_kdm.so
%_kde_share_dir/services/kdm.desktop
%config %_kde_config_dir/kdm.knsrc
@@ -589,8 +595,17 @@
/usr/%_lib/kde4/kfontviewpart.so
/usr/share/kde4/apps/kconf_update/khotkeys_printscreen.upd
/usr/share/kde4/services/plasma-applet-showdesktop.desktop
+/usr/share/kde4/services/plasma-applet-trash.desktop
+/usr/%_lib/kde4/kgreet_*.so
%changelog
+* Wed Jan 23 2008 stbinner@suse.de
+- update KDE_4_0_BRANCH.diff (incl. taskbar attention flash)
+- don't migrate ~/Desktop icons to Dashboard which will not work
+- migrate Trash.desktop to Trash plasmoid (added it for that)
+- open Dashboard toolbox when Dashboard view is activated
+- set GTK2_RC_FILES for better style of GTK applications
+- fix locking of session (#355155)
* Sun Jan 20 2008 stbinner@suse.de
- update KDE_4_0_BRANCH.diff
- more SUSE-like default panel setup (size, icons, plasmoids):
++++++ 4_0_BRANCH.diff ++++++
++++ 8219 lines (skipped)
++++ between KDE/kdebase4-workspace/4_0_BRANCH.diff
++++ and /mounts/work_src_done/STABLE/kdebase4-workspace/4_0_BRANCH.diff
++++++ dashboard-toolbox.diff ++++++
Index: libs/plasma/desktoptoolbox.cpp
===================================================================
--- libs/plasma/desktoptoolbox.cpp (revision 763694)
+++ libs/plasma/desktoptoolbox.cpp (working copy)
@@ -158,7 +158,16 @@
QGraphicsItem::hoverEnterEvent(event);
return;
}
+ showToolbox();
+ QGraphicsItem::hoverEnterEvent(event);
+}
+void DesktopToolbox::showToolbox()
+{
+ if (m_showing) {
+ return;
+ }
+
int maxwidth = 0;
foreach (QGraphicsItem* tool, QGraphicsItem::children()) {
if (!tool->isEnabled()) {
@@ -198,7 +207,6 @@
// TODO: 10 and 200 shouldn't be hardcoded here. There needs to be a way to
// match whatever the time is that moveItem() takes. Same in hoverLeaveEvent().
m_animId = phase->customAnimation(10, 240, Plasma::Phase::EaseInCurve, this, "animate");
- QGraphicsItem::hoverEnterEvent(event);
}
void DesktopToolbox::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
@@ -208,7 +216,16 @@
QGraphicsItem::hoverLeaveEvent(event);
return;
}
+ hideToolbox();
+ QGraphicsItem::hoverLeaveEvent(event);
+}
+void DesktopToolbox::hideToolbox()
+{
+ if (!m_showing) {
+ return;
+ }
+
int x = m_size*2;
int y = 0;
Plasma::Phase* phase = Plasma::Phase::self();
@@ -231,7 +248,6 @@
if (m_toolBacker) {
m_toolBacker->hide();
}
- QGraphicsItem::hoverLeaveEvent(event);
}
void DesktopToolbox::animate(qreal progress)
Index: libs/plasma/desktoptoolbox_p.h
===================================================================
--- libs/plasma/desktoptoolbox_p.h (revision 763694)
+++ libs/plasma/desktoptoolbox_p.h (working copy)
@@ -47,6 +47,9 @@
bool isToolEnabled(const QString &tool) const;
QGraphicsItem* tool(const QString &tool) const;
+ void showToolbox();
+ void hideToolbox();
+
protected:
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
Index: libs/plasma/containment.h
===================================================================
--- libs/plasma/containment.h (revision 763694)
+++ libs/plasma/containment.h (working copy)
@@ -247,6 +247,16 @@
*/
void containmentConstraintsUpdated(Plasma::Constraints constraints);
+ /**
+ * Open the Plasma toolbox
+ */
+ void showToolbox();
+
+ /**
+ * Close the Plasma toolbox
+ */
+ void hideToolbox();
+
Q_SIGNALS:
/**
* This signal is emitted when a new applet is created by the containment
Index: libs/plasma/containment.cpp
===================================================================
--- libs/plasma/containment.cpp (revision 763694)
+++ libs/plasma/containment.cpp (working copy)
@@ -862,6 +862,16 @@
return d->createToolbox()->isToolEnabled(toolname);
}
+void Containment::showToolbox()
+{
+ d->createToolbox()->showToolbox();
+}
+
+void Containment::hideToolbox()
+{
+ d->createToolbox()->hideToolbox();
+}
+
} // Plasma namespace
#include "containment.moc"
Index: plasma/plasma/dashboardview.cpp
===================================================================
--- plasma/plasma/dashboardview.cpp (revision 764726)
+++ plasma/plasma/dashboardview.cpp (working copy)
@@ -130,6 +130,7 @@
m_suppressShow = true;
QTimer::singleShot(SUPPRESS_SHOW_TIMEOUT, this, SLOT(suppressShowTimeout()));
+ containment()->showToolbox();
} else {
hideView();
}
@@ -141,6 +142,7 @@
m_appletBrowserWidget->hide();
}
+ containment()->hideToolbox();
containment()->enableToolBoxTool("zoomOut", m_zoomOut);
containment()->enableToolBoxTool("zoomIn", m_zoomIn);
containment()->enableToolBoxTool("hideDashboard", false);
++++++ plasma-iconloader.diff ++++++
Index: plasma/containments/desktop/iconloader.cpp
===================================================================
--- plasma/containments/desktop/iconloader.cpp (revision 764726)
+++ plasma/containments/desktop/iconloader.cpp (working copy)
@@ -65,6 +65,9 @@
if (applet->name() == i18n("Icon")) {
addIcon(applet);
}
+ else if (applet->name() == i18n("Trashcan")) {
+ m_iconMap["trash"] = applet;
+ }
}
//list ~/Desktop and add new applets
@@ -183,12 +186,25 @@
return;
}
+ QStringList blacklist;
+ blacklist << "Printer.desktop" << "myComputer.desktop" << "trash.desktop" << "System.desktop" << "Home.desktop";
+ bool new_added = false;
foreach (KFileItem item, items) {
- if (!m_iconMap.contains(item.url().path())) {
+ if (item.url().fileName()=="trash.desktop" && !m_iconMap.contains("trash")) {
+ Plasma::Applet *newApplet = m_desktop->addApplet("trash", QVariantList(), 0);
+ if (newApplet) {
+ m_iconMap["trash"] = newApplet;
+ new_added = true;
+ }
+ }
+ if (!blacklist.contains(item.url().fileName()) && !m_iconMap.contains(item.url().path())) {
addIcon(item.url());
+ new_added = true;
}
}
+ if (new_added)
+ slotAlignHorizontal();
}
void IconLoader::deleteItem(const KFileItem item)
++++++ startkde-gtk2.diff ++++++
Index: startkde.cmake
===================================================================
--- startkde.cmake (revision 764726)
+++ startkde.cmake (working copy)
@@ -189,6 +189,36 @@
done
done
+#
+# Do we have a special Gtk theming for our Qt widget theme ?
+#
+if [ ! -e $HOME/.no-qtrc-to-gtkrc-mapping ]; then
+
+ # Defaults for openSUSE 10.3
+ GTK2_SYSCONFDIR=/etc
+ GTK2_DATADIR=/usr/share/themes/
+
+ # use general gtk-qt-engine
+ if [ -e "$GTK2_DATADIR/Qt/gtk-2.0/gtkrc" ] ; then
+ GTK2_THEME_RC="$GTK2_DATADIR/Qt/gtk-2.0/gtkrc"
+ else
+ # use QtCurve engine
+ if [ -e "$GTK2_DATADIR/QtCurve/gtk-2.0/gtkrc" ] ; then
+ GTK2_THEME_RC="$GTK2_DATADIR/QtCurve/gtk-2.0/gtkrc"
+ fi
+ fi
+
+ # GTK2
+ # NOTE: ~/.gtkrc-2.0-kde is added later (in latest KDE only)
+ if [ "$GTK2_RC_FILES" ]; then
+ export GTK2_RC_FILES="$GTK2_RC_FILES:$GTK2_THEME_RC:$HOME/.gtkrc-2.0-qtengine:$HOME/.gtkrc-2.0"
+ else
+ export GTK2_RC_FILES="$GTK2_SYSCONFDIR/gtk-2.0/gtkrc:$GTK2_THEME_RC:$HOME/.gtkrc-2.0-qtengine:$HOME/.gtkrc-2.0"
+ fi
+
+fi
+
+
# Set the path for Qt plugins provided by KDE
if test -n "$QT_PLUGIN_PATH"; then
QT_PLUGIN_PATH="$QT_PLUGIN_PATH:`kde4-config --path qtplugins`"
++++++ trash-plasmoid.diff ++++++
Index: plasma/applets/CMakeLists.txt
===================================================================
--- plasma/applets/CMakeLists.txt (revision 764726)
+++ plasma/applets/CMakeLists.txt (working copy)
@@ -1,3 +1,4 @@
+add_subdirectory(trash)
add_subdirectory(analog-clock)
add_subdirectory(battery)
add_subdirectory(digital-clock)
Index: plasma/applets/trash/trash.cpp
===================================================================
--- plasma/applets/trash/trash.cpp (revision 0)
+++ plasma/applets/trash/trash.cpp (revision 0)
@@ -0,0 +1,310 @@
+/***************************************************************************
+ * Copyright 2007 by Marco Martin