Hello community,
here is the log from the commit of package kdebase4-workspace
checked in at Tue Feb 19 02:28:42 CET 2008.
--------
--- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-02-15 10:51:30.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-02-19 02:27:51.144041000 +0100
@@ -1,0 +2,6 @@
+Mon Feb 18 10:03:12 CET 2008 - stbinner@suse.de
+
+- update branch diff after Plasma backport week-end
+- backport kickoff/simpleapplet view selection feature
+
+-------------------------------------------------------------------
kdebase4-workspace.changes: same change
Old:
----
dashboard-toolbox.diff
kickoff-app-reset.diff
kickoff-favorites-starter.diff
panel-resize.diff
tasks.diff
New:
----
kickoff-tabs.diff
panel-size.diff
systemsettings-desktop.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-wallpapers.spec ++++++
--- /var/tmp/diff_new_pack.P10135/_old 2008-02-19 02:28:02.000000000 +0100
+++ /var/tmp/diff_new_pack.P10135/_new 2008-02-19 02:28:02.000000000 +0100
@@ -22,7 +22,7 @@
Summary: KDE 4 Wallpapers
Url: http://www.kde.org/
Version: 4.0.1
-Release: 13
+Release: 16
%define rversion 4.0.1
Source0: kdebase-workspace-%rversion.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -60,6 +60,9 @@
/usr/share/wallpapers
%changelog
+* Mon Feb 18 2008 stbinner@suse.de
+- update branch diff after Plasma backport week-end
+- backport kickoff/simpleapplet view selection feature
* Mon Feb 11 2008 coolo@suse.de
- remove sessions already in other packages
- let kdm require workspace for the greeter plugins
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.P10135/_old 2008-02-19 02:28:02.000000000 +0100
+++ /var/tmp/diff_new_pack.P10135/_new 2008-02-19 02:28:02.000000000 +0100
@@ -27,7 +27,7 @@
Summary: The KDE Workspace Components
Url: http://www.kde.org/
Version: 4.0.1
-Release: 13
+Release: 16
%define rversion 4.0.1
Source0: kdebase-workspace-%rversion.tar.bz2
Source1: opensuse.png
@@ -43,16 +43,11 @@
Patch6: kickoff-defaults.diff
Patch7: kickoff-footer.diff
Patch8: kwin-suse.diff
-Patch9: kickoff-favorites-starter.diff
Patch10: kwin-two-desktops.diff
Patch12: lock_logout.diff
-Patch13: panel-resize.diff
-Patch14: tasks.diff
-Patch15: dashboard-toolbox.diff
Patch16: plasma-iconloader.diff
Patch18: startkde.diff
Patch19: short-menus.diff
-Patch20: kickoff-app-reset.diff
Patch21: simpleapplet.diff
Patch60: kdm-audit-log.diff
Patch61: kdm-consolekit.diff
@@ -63,6 +58,9 @@
Patch66: kdm-wordbreak.diff
Patch67: kdm-remove-duplicated-sessions.diff
Patch68: kdm-make_it_cool.diff
+Patch69: systemsettings-desktop.diff
+Patch70: panel-size.diff
+Patch71: kickoff-tabs.diff
%kde4_runtime_requires
Conflicts: yast2-theme-NLD
Recommends: kdebase4-workspace-plasmoids
@@ -93,17 +91,11 @@
%patch6
%patch7
%patch8
-%patch9
%patch10
%patch12
-%patch14
-# needs rediff
-#%patch13
-%patch15
%patch16
%patch18
%patch19
-%patch20
%patch21
%patch60
%if %suse_version > 1020
@@ -116,6 +108,9 @@
%patch66
%patch67
%patch68
+%patch69
+%patch70
+%patch71
%build
%cmake_kde4 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE4_KCHECKPASS_PAM_SERVICE=xdm
@@ -607,6 +602,9 @@
/usr/%_lib/kde4/kgreet_*.so
%changelog
+* Mon Feb 18 2008 stbinner@suse.de
+- update branch diff after Plasma backport week-end
+- backport kickoff/simpleapplet view selection feature
* Mon Feb 11 2008 coolo@suse.de
- remove sessions already in other packages
- let kdm require workspace for the greeter plugins
++++++ 4_0_BRANCH.diff ++++++
++++ 7284 lines (skipped)
++++ between KDE/kdebase4-workspace/4_0_BRANCH.diff
++++ and /mounts/work_src_done/STABLE/kdebase4-workspace/4_0_BRANCH.diff
++++++ kickoff-defaults.diff ++++++
--- /var/tmp/diff_new_pack.P10135/_old 2008-02-19 02:28:05.000000000 +0100
+++ /var/tmp/diff_new_pack.P10135/_new 2008-02-19 02:28:05.000000000 +0100
@@ -1,13 +1,27 @@
Index: plasma/applets/kickoff/core/systemmodel.cpp
===================================================================
---- plasma/applets/kickoff/core/systemmodel.cpp (revision 758549)
+--- plasma/applets/kickoff/core/systemmodel.cpp (revision 776459)
+++ plasma/applets/kickoff/core/systemmodel.cpp (working copy)
-@@ -110,7 +110,11 @@
+@@ -87,7 +87,7 @@
+ connect(placesModel, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ q, SLOT(sourceRowsRemoved(QModelIndex,int,int)));
+
+- topLevelSections << i18n("Applications")
++ topLevelSections << i18n("Administration")
+ << i18n("Places")
+ << i18n("Removable Storage")
+ << i18n("Storage");
+@@ -109,7 +109,16 @@
{
KConfigGroup appsGroup = componentData().config()->group("SystemApplications");
QStringList defaultApps;
- defaultApps << "kde4-systemsettings.desktop";
-+ defaultApps << "kde4-systemsettings.desktop" << "YaST.desktop" << "package-manager.desktop";
++
++ if (QFile::exists("/usr/share/applications/YaST.desktop"))
++ defaultApps << "YaST.desktop";
++
++ if (QFile::exists("/usr/share/applications/package-manager.desktop"))
++ defaultApps << "package-manager.desktop";
+
+ if (KService::serviceByStorageId("YaST2/live-installer.desktop"))
+ defaultApps << "YaST2/live-installer.desktop";
++++++ kickoff-tabs.diff ++++++
Index: plasma/applets/kickoff/ui/tabbar.cpp
===================================================================
--- plasma/applets/kickoff/ui/tabbar.cpp (revision 760968)
+++ plasma/applets/kickoff/ui/tabbar.cpp (revision 760969)
@@ -1,4 +1,4 @@
-/*
+/*
Copyright 2007 Robert Knight
This library is free software; you can redistribute it and/or
@@ -26,6 +26,11 @@
#include <QPainter>
#include <QtDebug>
+#include <QGradient>
+#include <QLinearGradient>
+
+#include "plasma/plasma.h"
+
using namespace Kickoff;
TabBar::TabBar(QWidget *parent)
@@ -82,10 +87,7 @@
m_animStates.resize(numTabs);
}
- QBrush bgBrush = palette().button();
- QColor bgColor = bgBrush.color();
-
- for (int i=0 ; i 0) {
- bgColor.setAlphaF(m_animStates[i] / qreal(m_animator.endFrame()));
- bgBrush.setColor(bgColor);
- painter.fillRect(tabRect(i), bgBrush);
+ // Draws the selected item with a gradient
+ qreal alpha = m_animStates[i] / qreal(m_animator.endFrame());
+ QLinearGradient g(0, 0, 0, tabRect(i).height());
+ QColor base(palette().highlight().color());
+ base.setAlphaF(alpha);
+ g.setColorAt(0, base);
+ g.setColorAt(0.3, base.lighter(110));
+ g.setColorAt(1, base.lighter(125));
+ QBrush bgBrush(g);
+ painter.save();
+ painter.setRenderHint(QPainter::Antialiasing);
+ painter.fillPath(Plasma::roundedRectangle(tabRect(i).adjusted(2, 0, -2, 0), 6), bgBrush);
}
// draw tab icon and text
QFontMetrics metrics(painter.font());
int textHeight = metrics.height();
QRect iconRect = rect;
- int delta = m_animStates[i] / m_animator.endFrame() * 4;
+ int delta = int(m_animStates[i] / qreal(m_animator.endFrame()) * 4);
iconRect.setBottom(iconRect.bottom()-textHeight);
iconRect.adjust(0, -delta, 0, -delta);
tabIcon(i).paint(&painter,iconRect);
++++++ panel-size.diff ++++++
Index: plasma/containments/panel/panel.cpp
===================================================================
--- plasma/containments/panel/panel.cpp (revision 776459)
+++ plasma/containments/panel/panel.cpp (working copy)
@@ -45,7 +45,7 @@
m_drawLeft(true),
m_drawRight(true),
m_drawBottom(true),
- m_size(48)
+ m_size(40)
{
m_background = new Plasma::SvgPanel("widgets/panel-background", this);
m_background->setBorderFlags(Plasma::SvgPanel::DrawAllBorders);
++++++ plasma-corona.diff ++++++
--- /var/tmp/diff_new_pack.P10135/_old 2008-02-19 02:28:05.000000000 +0100
+++ /var/tmp/diff_new_pack.P10135/_new 2008-02-19 02:28:05.000000000 +0100
@@ -1,6 +1,6 @@
Index: libs/plasma/corona.cpp
===================================================================
---- libs/plasma/corona.cpp (revision 770908)
+--- libs/plasma/corona.cpp (revision 776459)
+++ libs/plasma/corona.cpp (working copy)
@@ -29,6 +29,7 @@
#include <QGraphicsView>
@@ -10,7 +10,7 @@
#include <KDebug>
#include <KLocale>
-@@ -324,18 +325,32 @@
+@@ -324,18 +325,36 @@
Containment* panel = addContainment("panel");
panel->setScreen(topLeftScreen);
panel->setLocation(Plasma::BottomEdge);
@@ -21,14 +21,18 @@
+ if (QFile::exists("/usr/share/kde4/services/plasma-applet-showdesktop.desktop")) panel->addApplet("showdesktop");
+
+ QVariantList args;
-+ args << "/usr/share/applications/kde4/dolphin.desktop";
-+ QRectF rect(100, 0, 40, panel->contentSize().height());
-+ panel->addApplet("icon", args, 0, rect);
++ if (QFile::exists("/usr/share/applications/kde4/dolphin.desktop")) {
++ args << "/usr/share/applications/kde4/dolphin.desktop";
++ QRectF rect(100, 0, 40, panel->contentSize().height());
++ panel->addApplet("icon", args, 0, rect);
++ }
+
+ args.clear();
-+ args << "/usr/share/applications/kde4/konqbrowser.desktop";
-+ rect.setRect(104, 0, 40, panel->contentSize().height());
-+ panel->addApplet("icon", args, 0, rect);
++ if (QFile::exists("/usr/share/applications/kde4/konqbrowser.desktop")) {
++ args << "/usr/share/applications/kde4/konqbrowser.desktop";
++ QRectF rect(104, 0, 40, panel->contentSize().height());
++ panel->addApplet("icon", args, 0, rect);
++ }
+
+ panel->addApplet("pager");
panel->addApplet("tasks");
++++++ plasma-iconloader.diff ++++++
--- /var/tmp/diff_new_pack.P10135/_old 2008-02-19 02:28:05.000000000 +0100
+++ /var/tmp/diff_new_pack.P10135/_new 2008-02-19 02:28:05.000000000 +0100
@@ -1,6 +1,6 @@
Index: plasma/containments/desktop/iconloader.cpp
===================================================================
---- plasma/containments/desktop/iconloader.cpp (revision 770908)
+--- plasma/containments/desktop/iconloader.cpp (revision 776459)
+++ plasma/containments/desktop/iconloader.cpp (working copy)
@@ -30,6 +30,7 @@
#include <KAuthorized>
@@ -8,9 +8,9 @@
#include <KConfigGroup>
+#include <QFile>
- IconLoader::IconLoader(DefaultDesktop *parent)
- : QObject(parent),
-@@ -65,6 +66,9 @@
+ static const int topBorder = 20;
+
+@@ -67,6 +68,9 @@
if (applet->name() == i18n("Icon")) {
addIcon(applet);
}
@@ -20,14 +20,18 @@
}
//list ~/Desktop and add new applets
-@@ -183,12 +187,25 @@
+@@ -185,12 +189,29 @@
return;
}
+ QStringList blacklist;
-+ blacklist << "Printer.desktop" << "myComputer.desktop" << "trash.desktop" << "System.desktop" << "Home.desktop";
-+ bool new_added = false;
++ blacklist << "Printer.desktop" << "GnomeOnlineHelp.desktop" << "trash.desktop" << "System.desktop" << "Home.desktop";
++ if (!QFile::exists("/usr/share/kde4/services/sysinfo.protocol"))
++ blacklist << "myComputer.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") && QFile::exists("/usr/share/kde4/services/plasma-applet-trash.desktop")) {
++++++ simpleapplet.diff ++++++
--- /var/tmp/diff_new_pack.P10135/_old 2008-02-19 02:28:05.000000000 +0100
+++ /var/tmp/diff_new_pack.P10135/_new 2008-02-19 02:28:05.000000000 +0100
@@ -1,8 +1,20 @@
Index: plasma/applets/kickoff/simpleapplet/menuview.cpp
===================================================================
---- plasma/applets/kickoff/simpleapplet/menuview.cpp (revision 769443)
+--- plasma/applets/kickoff/simpleapplet/menuview.cpp (revision 776459)
+++ plasma/applets/kickoff/simpleapplet/menuview.cpp (working copy)
-@@ -35,14 +35,14 @@
+@@ -23,8 +23,10 @@
+ // Qt
+ #include
+ #include
+-#include
+
++// KDE
++#include <KUrl>
++
+ // Local
+ #include "core/models.h"
+ #include "core/itemhandlers.h"
+@@ -34,14 +36,14 @@
class MenuView::Private
{
public:
@@ -19,7 +31,7 @@
if (model->hasChildren(index)) {
QMenu *childMenu = new QMenu(parent);
QObject::connect(childMenu,SIGNAL(aboutToShow()),q,SLOT(fillSubMenu()));
-@@ -55,20 +55,21 @@
+@@ -54,20 +56,21 @@
return action;
}
@@ -43,8 +55,21 @@
};
MenuView::MenuView(QWidget *parent)
-@@ -86,12 +87,48 @@
+@@ -75,24 +78,64 @@
+ , d(new Private(this))
+ {
+ }
++
+ MenuView::~MenuView()
+ {
+ delete d;
+ }
++
+ QAction *MenuView::createLeafAction(const QModelIndex&,QObject *parent)
+ {
+ return new QAction(parent);
}
++
void MenuView::updateAction(QAction *action,const QModelIndex& index)
{
- QString text = index.data(Qt::DisplayRole).value<QString>();
@@ -97,27 +122,110 @@
+ }
action->setIcon(index.data(Qt::DecorationRole).value<QIcon>());
}
++
void MenuView::setModel(QAbstractItemModel *model)
-@@ -261,6 +298,14 @@
+ {
+ d->model = model;
+@@ -101,14 +144,17 @@
+ d->buildBranch(this,QModelIndex());
+ }
+ }
++
+ QAbstractItemModel *MenuView::model() const
+ {
+ return d->model;
+ }
++
+ UrlItemLauncher *MenuView::launcher() const
+ {
+ return d->launcher;
+ }
++
+ QModelIndex MenuView::indexForAction(QAction *action) const
+ {
+ Q_ASSERT(d->model);
+@@ -149,6 +195,7 @@
+
+ return index;
+ }
++
+ QAction *MenuView::actionForIndex(const QModelIndex& index) const
+ {
+ Q_ASSERT(d->model);
+@@ -181,6 +228,7 @@
+ }
+ return menu->actions()[index.row()];
+ }
++
+ void MenuView::rowsInserted(const QModelIndex& parent,int start,int end)
+ {
+ QAction *menuAction = actionForIndex(parent);
+@@ -200,6 +248,7 @@
+ Q_ASSERT(menu->actions().count() > start);
+ insertActions(menu->actions()[start],newActions);
+ }
++
+ void MenuView::rowsRemoved(const QModelIndex& parent,int start,int end)
+ {
+ QAction *menuAction = actionForIndex(parent);
+@@ -215,6 +264,7 @@
+ menu->removeAction(actions[row]);
+ }
+ }
++
+ void MenuView::dataChanged(const QModelIndex& topLeft,const QModelIndex& bottomRight)
+ {
+ QAction *menuAction = actionForIndex(topLeft.parent());
+@@ -228,6 +278,7 @@
+ updateAction(actions[row],d->model->index(row,d->column,topLeft.parent()));
+ }
+ }
++
+ void MenuView::modelReset()
+ {
+ // force clearance of the menu
+@@ -235,6 +286,7 @@
+ // rebuild the menu from scratch
+ setModel(d->model);
+ }
++
+ void MenuView::fillSubMenu()
+ {
+ QMenu *subMenu = qobject_cast(sender());
+@@ -251,15 +303,28 @@
+
+ disconnect(sender(),0,this,SLOT(fillSubMenu()));
+ }
++
+ void MenuView::setColumn(int column)
+ {
+ d->column = column;
+ modelReset();
+ }
++
+ int MenuView::column() const
{
return d->column;
}
++
+MenuView::FormatType MenuView::formatType() const
+{
+ return d->formattype;
+}
++
+void MenuView::setFormatType(MenuView::FormatType formattype)
+{
+ d->formattype = formattype;
+}
++
void MenuView::actionTriggered(QAction *action)
{
QModelIndex index = indexForAction(action);
Index: plasma/applets/kickoff/simpleapplet/simpleapplet.cpp
===================================================================
---- plasma/applets/kickoff/simpleapplet/simpleapplet.cpp (revision 769443)
+--- plasma/applets/kickoff/simpleapplet/simpleapplet.cpp (revision 776459)
+++ plasma/applets/kickoff/simpleapplet/simpleapplet.cpp (working copy)
-@@ -22,14 +22,19 @@
+@@ -22,8 +22,9 @@
#include "simpleapplet/menuview.h"
// Qt
@@ -127,11 +235,9 @@
+#include <QComboBox>
+#include <QGridLayout>
#include <QGraphicsView>
- #include <QtDebug>
-+#include <QMetaObject>
-+#include <QMetaEnum>
-+#include <QPointer>
-
+ #include <QMetaObject>
+ #include <QMetaEnum>
+@@ -32,6 +33,7 @@
// KDE
#include <KIcon>
#include <KDialog>
@@ -139,7 +245,7 @@
// Plasma
#include
-@@ -41,29 +46,67 @@
+@@ -43,29 +45,100 @@
#include "core/models.h"
#include "core/applicationmodel.h"
#include "core/favoritesmodel.h"
@@ -177,8 +283,13 @@
+ Private() : menuview(0), launcher(0), dialog(0) {}
+ ~Private() { delete dialog; delete menuview; }
+
-+ void addItem(QComboBox* combo, const QString& caption, int index) {
-+ combo->addItem(caption, index);
++ void addItem(QComboBox* combo, const QString& caption, int index, const QString& icon = QString()) {
++ if( icon.isNull() ) {
++ combo->addItem(caption, index);
++ }
++ else {
++ combo->addItem(KIcon(icon), caption, index);
++ }
+ }
+
+ void setCurrentItem(QComboBox* combo, int currentIndex) {
@@ -188,8 +299,9 @@
+ return;
+ }
+ }
-+ if( combo->count() > 0 )
++ if( combo->count() > 0 ) {
+ combo->setCurrentIndex(0);
++ }
+ }
+
+ Kickoff::MenuView *createMenuView(QAbstractItemModel *model = 0) {
@@ -207,20 +319,47 @@
+ foreach(QAction *action, actions) {
+ if( action->menu() && mergeFirstLevel ) {
+ QMetaObject::invokeMethod(action->menu(),"aboutToShow"); //fetch the children
-+ if( actions.count() > 1 )
++ QList subactions;
++ foreach(QAction *a, action->menu()->actions()) {
++ if( a->menu() || ! view->indexForAction(a).data(Kickoff::UrlRole).isNull() ) {
++ subactions << a;
++ }
++ }
++ if( actions.count() > 1 && subactions.count() > 0 ) {
+ menuview->addTitle(action->text());
-+ foreach(QAction *a, action->menu()->actions())
++ }
++ foreach(QAction *a, subactions) {
+ menuview->addAction(a);
++ }
+ }
+ else {
+ menuview->addAction(action);
+ }
+ }
+ }
++
++ QString viewIcon() {
++ switch( viewtype ) {
++ case Combined:
++ return "start-here-kde";
++ case Favorites:
++ return "bookmarks";
++ case Applications:
++ return "applications-other";
++ case Computer:
++ return "computer";
++ case RecentlyUsed:
++ return "view-history";
++ case Leave:
++ return "application-exit";
++ }
++ return QString();
++ }
++
};
MenuLauncherApplet::MenuLauncherApplet(QObject *parent, const QVariantList &args)
-@@ -76,10 +119,8 @@
+@@ -78,10 +151,8 @@
d->icon->setFlag(ItemIsMovable, false);
connect(d->icon, SIGNAL(pressed(bool)), this, SLOT(toggleMenu(bool)));
@@ -233,14 +372,11 @@
}
MenuLauncherApplet::~MenuLauncherApplet()
-@@ -94,10 +135,16 @@
- d->icon->setIcon(KIcon(cg.readEntry("icon","start-here-kde")));
- //setMinimumContentSize(d->icon->iconSize()); //setSize(d->icon->iconSize())
+@@ -93,29 +164,25 @@
+ {
+ KConfigGroup cg = config();
-- d->showFavorites = cg.readEntry("showFavorites",d->showFavorites);
-- d->showLeaveSwitchUser = cg.readEntry("showLeaveSwitchUser",d->showLeaveSwitchUser);
-- d->showLeaveLock = cg.readEntry("showLeaveLock",d->showLeaveLock);
-- d->showLeaveLogout = cg.readEntry("showLeaveLogout",d->showLeaveLogout);
+- d->icon->setIcon(KIcon(cg.readEntry("icon","start-here-kde")));
+ {
+ QMetaEnum e = metaObject()->enumerator(metaObject()->indexOfEnumerator("ViewType"));
+ QByteArray ba = cg.readEntry("view", QByteArray(e.valueToKey(d->viewtype)));
@@ -251,10 +387,44 @@
+ QByteArray ba = cg.readEntry("format", QByteArray(e.valueToKey(d->formattype)));
+ d->formattype = (MenuLauncherApplet::FormatType) e.keyToValue(ba);
+ }
++
++ d->icon->setIcon(KIcon(d->viewIcon()));
++ //d->icon->setIcon(KIcon(cg.readEntry("icon","start-here-kde")));
+ //setMinimumContentSize(d->icon->iconSize()); //setSize(d->icon->iconSize())
+- d->showFavorites = cg.readEntry("showFavorites",d->showFavorites);
+- d->showLeaveSwitchUser = cg.readEntry("showLeaveSwitchUser",d->showLeaveSwitchUser);
+- d->showLeaveLock = cg.readEntry("showLeaveLock",d->showLeaveLock);
+- d->showLeaveLogout = cg.readEntry("showLeaveLogout",d->showLeaveLogout);
+-
Kickoff::UrlItemLauncher::addGlobalHandler(Kickoff::UrlItemLauncher::ExtensionHandler,"desktop",new Kickoff::ServiceItemHandler);
Kickoff::UrlItemLauncher::addGlobalHandler(Kickoff::UrlItemLauncher::ProtocolHandler, "leave", new Kickoff::LeaveItemHandler);
-@@ -139,44 +186,65 @@
+ }
+
+-Qt::Orientations MenuLauncherApplet::expandingDirections() const
+-{
+- return 0;
+-}
+-
+-QSizeF MenuLauncherApplet::sizeHint() const
+-{
+- //ensure a square size in the panel
+- return QSizeF(size().height(), size().height());
+-}
+-
+ void MenuLauncherApplet::constraintsUpdated(Plasma::Constraints constraints)
+ {
+ if (constraints & Plasma::FormFactorConstraint) {
+@@ -123,7 +190,7 @@
+ formFactor() == Plasma::MediaCenter) {
+ setMinimumContentSize(d->icon->sizeFromIconSize(IconSize(KIconLoader::Desktop)));
+ } else {
+- setMinimumContentSize(d->icon->sizeFromIconSize(IconSize(KIconLoader::Panel)));
++ setMinimumContentSize(d->icon->sizeFromIconSize(IconSize(KIconLoader::Small)));
+ }
+ }
+
+@@ -141,46 +208,79 @@
connect(d->dialog, SIGNAL(applyClicked()), this, SLOT(configAccepted()));
connect(d->dialog, SIGNAL(okClicked()), this, SLOT(configAccepted()));
@@ -266,20 +436,24 @@
- d->showFavCheckBox = new QCheckBox(i18n("Favorites"), d->dialog->mainWidget());
- layout->addWidget(d->showFavCheckBox);
-+ l->addWidget(new QLabel(i18n("View:"), p), 0, 0);
++ QLabel *viewLabel = new QLabel(i18n("View:"), p);
++ l->addWidget(viewLabel, 0, 0);
+ d->viewComboBox = new QComboBox(p);
-+ d->addItem(d->viewComboBox, i18n("Combined"), MenuLauncherApplet::Combined);
-+ d->addItem(d->viewComboBox, i18n("Favorites"), MenuLauncherApplet::Favorites);
-+ d->addItem(d->viewComboBox, i18n("Applications"), MenuLauncherApplet::Applications);
-+ d->addItem(d->viewComboBox, i18n("Computer"), MenuLauncherApplet::Computer);
-+ d->addItem(d->viewComboBox, i18n("Recently Used"), MenuLauncherApplet::RecentlyUsed);
-+ d->addItem(d->viewComboBox, i18n("Leave"), MenuLauncherApplet::Leave);
++ viewLabel->setBuddy(d->viewComboBox);
++ d->addItem(d->viewComboBox, i18n("Standard"), MenuLauncherApplet::Combined, "start-here-kde");
++ d->addItem(d->viewComboBox, i18n("Favorites"), MenuLauncherApplet::Favorites, "bookmarks");
++ d->addItem(d->viewComboBox, i18n("Applications"), MenuLauncherApplet::Applications, "applications-other");
++ d->addItem(d->viewComboBox, i18n("Computer"), MenuLauncherApplet::Computer, "computer");
++ d->addItem(d->viewComboBox, i18n("Recently Used"), MenuLauncherApplet::RecentlyUsed, "view-history");
++ d->addItem(d->viewComboBox, i18n("Leave"), MenuLauncherApplet::Leave, "application-exit");
+ l->addWidget(d->viewComboBox, 0, 1);
- d->showSwitchUserCheckBox = new QCheckBox(i18n("Switch user"), d->dialog->mainWidget());
- layout->addWidget(d->showSwitchUserCheckBox);
-+ l->addWidget(new QLabel(i18n("Format:"), p), 1, 0);
++ QLabel *formatLabel = new QLabel(i18n("Format:"), p);
++ l->addWidget(formatLabel, 1, 0);
+ d->formatComboBox = new QComboBox(p);
++ formatLabel->setBuddy(d->formatComboBox);
+ d->addItem(d->formatComboBox, i18n("Name Only"), MenuLauncherApplet::Name);
+ d->addItem(d->formatComboBox, i18n("Description Only"), MenuLauncherApplet::Description);
+ d->addItem(d->formatComboBox, i18n("Name (Description)"), MenuLauncherApplet::NameDescription);
@@ -327,6 +501,9 @@
+
+ QMetaEnum e = metaObject()->enumerator(metaObject()->indexOfEnumerator("ViewType"));
+ cg.writeEntry("view", QByteArray(e.valueToKey(d->viewtype)));
++
++ d->icon->setIcon(KIcon(d->viewIcon()));
++ d->icon->update();
+ }
+
+ int ft = d->formatComboBox->itemData(d->formatComboBox->currentIndex()).toInt();
@@ -346,8 +523,15 @@
+ }
}
++Qt::Orientations MenuLauncherApplet::expandingDirections() const
++{
++ return 0;
++}
++
void MenuLauncherApplet::toggleMenu(bool pressed)
-@@ -186,44 +254,51 @@
+ {
+ if (!pressed) {
+@@ -188,44 +288,51 @@
}
if (!d->menuview) {
@@ -394,14 +578,16 @@
- if (d->showLeaveLock) {
+ d->menuview->addSeparator();
+ QAction *switchaction = d->menuview->addAction(KIcon("system-switch-user"),i18n("Switch User"));
-+ switchaction->setData(QUrl("leave:/switch"));
++ switchaction->setData(KUrl("leave:/switch"));
QAction *lockaction = d->menuview->addAction(KIcon("system-lock-screen"),i18n("Lock"));
- lockaction->setData(QUrl("leave:/lock"));
+- lockaction->setData(QUrl("leave:/lock"));
- }
- if (d->showLeaveLogout) {
++ lockaction->setData(KUrl("leave:/lock"));
QAction *logoutaction = d->menuview->addAction(KIcon("system-log-out"),i18n("Logout"));
- logoutaction->setData(QUrl("leave:/logout"));
+- logoutaction->setData(QUrl("leave:/logout"));
- }
++ logoutaction->setData(KUrl("leave:/logout"));
+ } break;
+ case Favorites: {
+ Kickoff::MenuView *favview = d->createMenuView(new Kickoff::FavoritesModel(d->menuview));
@@ -428,23 +614,92 @@
}
}
-@@ -250,9 +325,10 @@
- if (action->data().type() == QVariant::Url) {
- QUrl url = action->data().toUrl();
- if (url.scheme() == "leave") {
+@@ -249,20 +356,18 @@
+
+ void MenuLauncherApplet::actionTriggered(QAction *action)
+ {
+- if (action->data().type() == QVariant::Url) {
+- QUrl url = action->data().toUrl();
+- if (url.scheme() == "leave") {
- Kickoff::UrlItemLauncher *launcher = d->appview ? d->appview->launcher() : 0;
- if (launcher)
- launcher->openUrl(url.toString());
-+ if ( ! d->launcher ) {
-+ d->launcher = new Kickoff::UrlItemLauncher(d->menuview);
-+ }
-+ d->launcher->openUrl(url.toString());
++ KUrl url = action->data().value<KUrl>();
++ if (url.scheme() == "leave") {
++ if ( ! d->launcher ) {
++ d->launcher = new Kickoff::UrlItemLauncher(d->menuview);
}
++ d->launcher->openUrl(url.url());
++ return;
}
- else {
+- else {
+- for(QWidget* w = action->parentWidget(); w; w = w->parentWidget()) {
+- if (Kickoff::MenuView *view = dynamic_castKickoff::MenuView*(w)) {
+- view->actionTriggered(action);
+- break;
+- }
++ for(QWidget* w = action->parentWidget(); w; w = w->parentWidget()) {
++ if (Kickoff::MenuView *view = dynamic_castKickoff::MenuView*(w)) {
++ view->actionTriggered(action);
++ break;
+ }
+ }
+ }
+Index: plasma/applets/kickoff/simpleapplet/plasma-applet-simplelauncher.desktop
+===================================================================
+--- plasma/applets/kickoff/simpleapplet/plasma-applet-simplelauncher.desktop (revision 776459)
++++ plasma/applets/kickoff/simpleapplet/plasma-applet-simplelauncher.desktop (working copy)
+@@ -2,7 +2,6 @@
+ Name=Application Launcher Menu
+ Name[bg]=Стартиране на програми
+ Name[ca]=Menú de l'engegador d'aplicacions
+-Name[cs]=Nabídka spouštěče aplikací
+ Name[csb]=Menu zrëszôcza programów
+ Name[da]=Menu til programstart
+ Name[de]=K-Menü (traditionell)
+@@ -15,6 +14,7 @@
+ Name[fr]=Menu de lancement des applications
+ Name[fy]=Applikaasje úteinsetter menu
+ Name[ga]=Roghchlár Tosaitheora Feidhmchlár
++Name[gu]=કાર્યક્રમ ચલાવનાર મેનુ
+ Name[hu]=Programindító menü
+ Name[is]=Valmynd forritaræsingar
+ Name[it]=Menu per il lancio di applicazioni
+@@ -29,6 +29,7 @@
+ Name[pl]=Menu uruchamiania programów
+ Name[pt]=Menu do Lançador de Aplicações
+ Name[pt_BR]=Menu do Lançador de Aplicativos
++Name[ro]=Meniu pentru lansatorul de aplicaţii
+ Name[se]=Prográmmaálggahanfállu
+ Name[sl]=Meni za zaganjanje programov
+ Name[sr]=мени за покретање програма
+@@ -43,7 +44,6 @@
+ Name[zh_TW]=應用程式啟動器選單
+ Comment=Traditional menu based application launcher
+ Comment[ca]=Engegador d'aplicacions basat en el menú tradicional
+-Comment[cs]=Tradiční spouštěč aplikací založený na nabídce
+ Comment[da]=Traditionel menubaseret programstarter
+ Comment[de]=Programmstarter mit traditionellen Menüs
+ Comment[el]=Παραδοσιακό μενού εκτέλεσης εφαρμογών
+@@ -54,6 +54,7 @@
+ Comment[fr]=Lanceur d'application basé sur le menu traditionnel
+ Comment[fy]=Tradisjoneel menu bassearre applikaasje úteinsetter
+ Comment[ga]=Tosaitheoir traidisiúnta feidhmchlár bunaithe ar roghchlár
++Comment[gu]=પરંપરાગત મેનુ આધારિત કાર્યક્રમમ ચલાવનાર
+ Comment[hu]=Hagyományos programindító menü
+ Comment[is]=Venjuleg valmyndabyggð forritaræsing
+ Comment[it]=Menu tradizionale
+@@ -68,6 +69,7 @@
+ Comment[pl]=Tradycyjny, oparty o menu moduł do uruchamiania programów
+ Comment[pt]=Lançador de aplicações baseado num menu tradicional
+ Comment[pt_BR]=Lançador de aplicativos baseado em um menu tradicional
++Comment[ro]=Lansator de aplicaţii bazat pe meniu tradiţional
+ Comment[se]=Árbevirolaš fállovuođđoduvvun prográmmaálggaheaddji
+ Comment[sl]=Tradicionalni meni za zaganjanje programov
+ Comment[sr]=Традиционално покретање програма помоћу менија
Index: plasma/applets/kickoff/simpleapplet/menuview.h
===================================================================
---- plasma/applets/kickoff/simpleapplet/menuview.h (revision 769443)
+--- plasma/applets/kickoff/simpleapplet/menuview.h (revision 776459)
+++ plasma/applets/kickoff/simpleapplet/menuview.h (working copy)
@@ -50,8 +50,8 @@
class MenuView : public KMenu
@@ -477,9 +732,9 @@
* Creates a new action to represent a leaf index in the tree. A leaf index
Index: plasma/applets/kickoff/simpleapplet/simpleapplet.h
===================================================================
---- plasma/applets/kickoff/simpleapplet/simpleapplet.h (revision 769443)
+--- plasma/applets/kickoff/simpleapplet/simpleapplet.h (revision 776459)
+++ plasma/applets/kickoff/simpleapplet/simpleapplet.h (working copy)
-@@ -28,8 +28,26 @@
+@@ -28,15 +28,33 @@
class MenuLauncherApplet : public Plasma::Applet
{
Q_OBJECT
@@ -507,3 +762,11 @@
MenuLauncherApplet(QObject *parent, const QVariantList &args);
virtual ~MenuLauncherApplet();
+ void init();
+
+- virtual QSizeF sizeHint() const;
+ void constraintsUpdated(Plasma::Constraints constraints);
++
+ Qt::Orientations expandingDirections() const;
+
+ public slots:
++++++ systemsettings-desktop.diff ++++++
--- ./systemsettings/systemsettings.desktop 2008/02/18 09:32:23 1.2
+++ ./systemsettings/systemsettings.desktop 2008/02/18 09:32:52
@@ -5,7 +5,7 @@
X-DocPath=systemsettings/index.html
X-KDE-StartupNotify=true
-GenericName=System Settings
+GenericName=Configure Desktop
GenericName[ar]=إعدادات النظام
GenericName[bg]=Системни настройки
GenericName[ca]=Arranjament del sistema
@@ -54,7 +54,7 @@
GenericName[zh_CN]=系统设置
GenericName[zh_TW]=系統設定
-Name=System Settings
+Name=Personal Settings
Name[ar]=إعدادات النظام
Name[be]=Сістэмныя настаўленні
Name[bg]=Системни настройки
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org