Mailinglist Archive: opensuse-commit (1421 mails)
| < Previous | Next > |
commit kdebase4-workspace
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 09 May 2008 22:45:24 +0200
- Message-id: <20080509204525.4B42467816D@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package kdebase4-workspace
checked in at Fri May 9 22:45:24 CEST 2008.
--------
--- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-05-06
22:47:14.000000000 +0200
+++ kdebase4-workspace/kdebase4-wallpapers.changes 2008-05-09
22:44:16.633179000 +0200
@@ -1,0 +2,11 @@
+Fri May 9 15:31:33 CEST 2008 - stbinner@xxxxxxx
+
+- add Kontact/KDE4 instead of Kontact/KDE3 to Kickoff (bnc#386374)
+- fix potential Plasma crash after deleting plasmoids (bnc#386462)
+
+-------------------------------------------------------------------
+Fri May 9 11:27:54 CEST 2008 - llunak@xxxxxxx
+
+- Administrator mode for date/time module, to make it usable
+
+-------------------------------------------------------------------
kdebase4-workspace.changes: same change
New:
----
dateandtime.diff
oxygen-windeco-memory-usage.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-wallpapers.spec ++++++
--- /var/tmp/diff_new_pack.W14331/_old 2008-05-09 22:44:42.000000000 +0200
+++ /var/tmp/diff_new_pack.W14331/_new 2008-05-09 22:44:42.000000000 +0200
@@ -22,7 +22,7 @@
Summary: KDE 4 Wallpapers
Url: http://www.kde.org/
Version: 4.0.4
-Release: 1
+Release: 3
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -59,6 +59,11 @@
/usr/share/wallpapers
%changelog
+* Fri May 09 2008 stbinner@xxxxxxx
+- add Kontact/KDE4 instead of Kontact/KDE3 to Kickoff (bnc#386374)
+- fix potential Plasma crash after deleting plasmoids (bnc#386462)
+* Fri May 09 2008 llunak@xxxxxxx
+- Administrator mode for date/time module, to make it usable
* Tue May 06 2008 dmueller@xxxxxxx
- update to 4.0.4
* http://kde.org/announcements/changelog_4_0_3to4_0_4.php
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.W14331/_old 2008-05-09 22:44:42.000000000 +0200
+++ /var/tmp/diff_new_pack.W14331/_new 2008-05-09 22:44:42.000000000 +0200
@@ -27,7 +27,7 @@
Summary: The KDE Workspace Components
Url: http://www.kde.org/
Version: 4.0.4
-Release: 1
+Release: 3
%define rversion 4.0.4
Source0: kdebase-workspace-%rversion.tar.bz2
Source2: titlebar_decor.png
@@ -63,6 +63,8 @@
Patch77: systemsettings-desktop.diff
Patch78: kdm-use-radiobuttons.diff
Patch79: kdm-focus-handling-fix.diff
+Patch80: dateandtime.diff
+Patch81: oxygen-windeco-memory-usage.diff
%kde4_runtime_requires
Conflicts: yast2-theme-NLD
%if %suse_version > 1030
@@ -122,6 +124,8 @@
%patch77
%patch78
%patch79
+%patch80
+%patch81
%build
%cmake_kde4 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm
-DKDE4_KCHECKPASS_PAM_SERVICE=xdm
@@ -138,6 +142,9 @@
cat filelists/devel | while read line; do echo "%exclude $line";done
filelists/excludepopd
sed -ri "s,.*%{_kde_config_dir}/kdm/backgroundrc,," filelists/kdm
+ sed -ri "s,.*%{_kde_config_dir}/kdm/README,," filelists/kdm
+ sed -ri "s,.*(%{_kde_config_dir}/kdm/kdmrc),%config \1," filelists/kdm
+ rm -f $RPM_BUILD_ROOT/%{_kde_config_dir}/kdm/README
sed -ri "s,.*%{_kde_share_dir}/apps/kdm/themes/circles.*,," filelists/kdm
sed -ri "s,.*%{_kde_share_dir}/apps/kdm/pics.*,," filelists/kdm
mv $RPM_BUILD_ROOT/usr/share/wallpapers/EOS $RPM_BUILD_ROOT/usr/share/
@@ -415,6 +422,7 @@
%_libdir/kde4/kio_fonts.so
%_libdir/kde4/libexec/kfontprint
%_libdir/kde4/libexec/kio_fonts_helper
+%_libdir/kde4/libexec/kcmdatetimehelper
%_libdir/libtaskmanager.so.*
%_libdir/libweather_ion.so.*
%dir /usr/share/autostart
@@ -676,6 +684,11 @@
/usr/%_lib/kde4/kgreet_*.so
%changelog
+* Fri May 09 2008 stbinner@xxxxxxx
+- add Kontact/KDE4 instead of Kontact/KDE3 to Kickoff (bnc#386374)
+- fix potential Plasma crash after deleting plasmoids (bnc#386462)
+* Fri May 09 2008 llunak@xxxxxxx
+- Administrator mode for date/time module, to make it usable
* Tue May 06 2008 dmueller@xxxxxxx
- update to 4.0.4
* http://kde.org/announcements/changelog_4_0_3to4_0_4.php
++++++ dateandtime.diff ++++++
++++ 735 lines (skipped)
++++++ oxygen-windeco-memory-usage.diff ++++++
Subject: Make Oxygen windecoration use less memory
From: Lubos Lunak
Patch-upstream: kde >= 4.1
Patch-rediff: svn diff -r803665:805136 workspace/kwin/clients/ozone/lib ; svn
diff -r805133:805136 workspace/kwin/clients/ozone
This patch removes Oxygen's dependency on Qt's widget compositing and as such
also widget double-buffering, which in KWin decorations wastes quite a lot of
memory
per every window.
Index: kwin/clients/oxygen/lib/helper.cpp
===================================================================
--- kwin/clients/oxygen/lib/helper.cpp (revision 803664)
+++ kwin/clients/oxygen/lib/helper.cpp (revision 805136)
@@ -24,6 +24,7 @@
#include <KColorUtils>
#include <KColorScheme>
+#include <QtGui/QWidget>
#include <QtGui/QPainter>
#include <math.h>
@@ -61,6 +62,41 @@
invalidateCaches(); // contrast changed, invalidate our caches
}
+void OxygenHelper::renderWindowBackground(QPainter *p, const QRect &clipRect,
const QWidget *widget, const QPalette & pal)
+{
+ const QWidget* window = widget->window();
+ // get coordinates relative to the client area
+ const QWidget* w = widget;
+ int x = 0, y = 0;
+ while (!w->isWindow()) {
+ x += w->geometry().x();
+ y += w->geometry().y();
+ w = w->parentWidget();
+ }
+
+ p->setClipRegion(clipRect);
+ QRect r = window->rect();
+ QColor color = pal.color(window->backgroundRole());
+ int splitY = qMin(300, 3*r.height()/4);
+
+ QRect upperRect = QRect(-x, -y, r.width(), splitY);
+ QPixmap tile = verticalGradient(color, splitY);
+ p->drawTiledPixmap(upperRect, tile);
+
+ QRect lowerRect = QRect(-x, splitY-y, r.width(), r.height() - splitY);
+ p->fillRect(lowerRect, backgroundBottomColor(color));
+
+ int radialW = qMin(600, r.width());
+ int frameH = 32; // on first paint the frame may not have been done yet,
so just fixate it
+ QRect radialRect = QRect((r.width() - radialW) / 2-x, -y, radialW,
64-frameH);
+ if (clipRect.intersects(radialRect))
+ {
+ tile = radialGradient(color, radialW);
+ p->drawPixmap(radialRect, tile, QRect(0, frameH, radialW, 64-frameH));
+ }
+ p->setClipping(false);
+}
+
void OxygenHelper::invalidateCaches()
{
m_backgroundCache.clear();
Index: kwin/clients/oxygen/lib/helper.h
===================================================================
--- kwin/clients/oxygen/lib/helper.h (revision 803664)
+++ kwin/clients/oxygen/lib/helper.h (revision 805136)
@@ -40,6 +40,8 @@
KSharedConfigPtr config() const;
void reloadConfig();
+
+ void renderWindowBackground(QPainter *p, const QRect &clipRect, const
QWidget *widget, const QPalette & pal);
virtual void invalidateCaches();
static bool lowThreshold(const QColor &color);
Index: kwin/clients/oxygen/oxygenbutton.cpp
===================================================================
--- kwin/clients/oxygen/oxygenbutton.cpp (revision 805132)
+++ kwin/clients/oxygen/oxygenbutton.cpp (revision 805136)
@@ -158,6 +158,25 @@
QPainter painter(this);
QPalette pal = palette(); // de-const-ify
+
+ // Set palette to the right group.
+ // TODO - fix KWin to do this for us :-).
+ if (client_.isActive())
+ pal.setCurrentColorGroup(QPalette::Active);
+ else
+ pal.setCurrentColorGroup(QPalette::Inactive);
+
+// widget->window()setPalette(pal);
+
+ if( OxygenFactory::blendTitlebarColors())
+ helper_.renderWindowBackground(&painter, this->rect(), this, pal);
+ else {
+ QPalette pal2( pal );
+ pal2.setColor( window()->backgroundRole(), client_.options()->color(
+ KDecorationDefines::ColorTitleBar, client_.isActive()));
+ helper_.renderWindowBackground(&painter, this->rect(), this, pal2);
+ }
+
if (type_ == ButtonMenu) {
// we paint the mini icon (which is 16 pixels high)
int dx = (width() - 16) / 2;
@@ -166,12 +185,6 @@
return;
}
- // Set palette to the right group.
- // TODO - fix KWin to do this for us :-).
- if (client_.isActive())
- pal.setCurrentColorGroup(QPalette::Active);
- else
- pal.setCurrentColorGroup(QPalette::Inactive);
if(client_.maximizeMode() == OxygenClient::MaximizeRestore)
painter.translate(0,-1);
++++++ plasma.diff ++++++
--- /var/tmp/diff_new_pack.W14331/_old 2008-05-09 22:44:44.000000000 +0200
+++ /var/tmp/diff_new_pack.W14331/_new 2008-05-09 22:44:44.000000000 +0200
@@ -2471,24 +2471,6 @@
</widget>
<resources/>
<connections/>
---- applets/tasks/plasma-tasks-default.desktop
-+++ applets/tasks/plasma-tasks-default.desktop
-@@ -3,7 +3,6 @@
- Name[be]=Кіраванне заданнямі
- Name[bg]=Мениджър на задачи
- Name[ca]=Gestor de tasques
--Name[cs]=Správce úloh
- Name[csb]=Menedżer dzejaniów
- Name[da]=Opgavelinje
- Name[de]=Fensterleiste
-@@ -17,6 +16,7 @@
- Name[fy]=Taakbehearder
- Name[ga]=Bainisteoir na dTascanna
- Name[gl]=Xestor de tarefas
-+Name[gu]=ટાસ્ક વ્યવસ્થાપક
- Name[hu]=Feladatkezelő
- Name[is]=Verkefnastjóri
- Name[it]=Gestore dei processi
--- applets/tasks/windowtaskitem.cpp
+++ applets/tasks/windowtaskitem.cpp
@@ -94,7 +94,7 @@
@@ -2864,13 +2846,14 @@
#include <plasma/theme.h>
#include <plasma/layouts/boxlayout.h>
-@@ -46,12 +47,17 @@
+@@ -46,12 +47,18 @@
IconApplet::IconApplet(QObject *parent, const QVariantList &args)
: Plasma::Applet(parent, args),
- m_dialog(0)
+ m_dialog(0),
-+ m_mimetype(0)
++ m_mimetype(0),
++ m_delete_url_on_destruction(false)
{
setAcceptDrops(true);
setHasConfigurationInterface(true);
@@ -2884,7 +2867,7 @@
if (args.count() > 2) {
setUrl(args.at(2).toString());
-@@ -61,15 +67,14 @@
+@@ -61,15 +68,14 @@
void IconApplet::init()
{
KConfigGroup cg = config();
@@ -2904,7 +2887,19 @@
// we do this right away since we may have our config
// read shortly by the containment. usually applets don't need
-@@ -96,8 +101,7 @@
+@@ -84,6 +90,11 @@
+
+ IconApplet::~IconApplet()
+ {
++ if (m_delete_url_on_destruction) {
++ KUrl::List dellist;
++ dellist << m_url;
++ KIO::del(dellist);
++ }
+ delete m_dialog;
+ }
+
+@@ -96,8 +107,7 @@
{
m_url = url;
@@ -2914,7 +2909,7 @@
if (m_url.isLocalFile() &&
KDesktopFile::isDesktopFile(m_url.toLocalFile())) {
KDesktopFile f(m_url.toLocalFile());
-@@ -110,6 +114,35 @@
+@@ -110,6 +120,35 @@
m_genericName = f.readGenericName();
} else {
@@ -2950,7 +2945,7 @@
m_text = m_url.fileName();
m_icon->setIcon(KMimeType::iconNameForUrl(url));
}
-@@ -125,7 +158,7 @@
+@@ -125,7 +164,7 @@
if (containment()) {
containment()->emitLaunchActivated();
}
@@ -2959,7 +2954,7 @@
}
}
-@@ -134,19 +167,27 @@
+@@ -134,19 +173,27 @@
setDrawStandardBackground(false);
if (constraints & Plasma::FormFactorConstraint) {
@@ -2989,7 +2984,7 @@
}
}
-@@ -166,14 +207,6 @@
+@@ -166,14 +213,6 @@
m_dialog->show();
}
@@ -3004,7 +2999,7 @@
void IconApplet::setDisplayLines(int displayLines)
{
if (m_icon) {
-@@ -208,22 +241,11 @@
+@@ -208,22 +247,11 @@
void IconApplet::dropEvent(QGraphicsSceneDragDropEvent *event)
{
@@ -3029,7 +3024,7 @@
if (urls.count() > 0) {
event->accept();
-@@ -236,17 +258,18 @@
+@@ -236,17 +264,18 @@
setUrl(urls.first());
constraintsUpdated(Plasma::FormFactorConstraint);
} else if (m_url.isLocalFile() &&
@@ -3052,7 +3047,7 @@
}
}
-@@ -270,7 +293,7 @@
+@@ -270,7 +299,7 @@
KUrl dest(path);
KMimeType::Ptr mime = KMimeType::findByUrl(dest);
@@ -3061,7 +3056,7 @@
dropUrls(urls, dest, event->modifiers());
}
}
-@@ -279,8 +302,8 @@
+@@ -279,8 +308,8 @@
commandStr = KShell::quoteArg(m_url.path());
}
@@ -3072,7 +3067,7 @@
dropUrls(urls, m_url, event->modifiers());
}
}
-@@ -290,42 +313,11 @@
+@@ -290,42 +319,11 @@
return 0;
}
@@ -3117,7 +3112,7 @@
//dropUrls from DolphinDropController
void IconApplet::dropUrls(const KUrl::List& urls,
const KUrl& destination,
-@@ -411,15 +403,25 @@
+@@ -411,15 +409,23 @@
}
}
@@ -3136,11 +3131,9 @@
+ list << m_url.path();
+ if ( KMessageBox::warningContinueCancelList( 0, i18n( "Do you really
want to delete this file?" ), list,
+ i18n("Delete File"), KStandardGuiItem::del() ) ==
KMessageBox::Continue ) {
-+ KUrl::List dellist;
-+ dellist << m_url;
-+ KIO::del(dellist);
++ m_delete_url_on_destruction = true;
+ }
-+ return false;
++ return true;
+ }
+ return true;
}
@@ -3180,7 +3173,7 @@
protected slots:
void acceptedPropertiesDialog();
-@@ -69,13 +69,12 @@
+@@ -69,15 +69,15 @@
void dropUrls(const KUrl::List& urls,
const KUrl& destination,
Qt::KeyboardModifiers modifier);
@@ -3194,7 +3187,10 @@
+ KMimeType::Ptr m_mimetype;
KUrl m_url;
int m_displayLines;
++ bool m_delete_url_on_destruction;
};
+
+ K_EXPORT_PLASMA_APPLET(icon, IconApplet)
--- applets/analog-clock/clock.h
+++ applets/analog-clock/clock.h
@@ -56,8 +56,6 @@
@@ -4970,7 +4966,7 @@
{
QList<QString> applications;
- applications << "konqbrowser" << "kmail" << "systemsettings" <<
"dolphin";
-+ applications << "MozillaFirefox.desktop" << "kde-Kontact.desktop"
++ applications << "MozillaFirefox.desktop" << "kde4-Kontact.desktop"
+ << "writer.desktop" << "kde-amarok.desktop" <<
"kde-digikam.desktop" << "kde4-dolphin.desktop"
+ << "kde4-systemsettings.desktop" << "kde4-Help.desktop" <<
"kde4-konsole.desktop";
@@ -9912,33 +9908,6 @@
+ inkscape:groupmode="layer"
+ transform="translate(-2763.2,-868.36218)" />
</svg>
---- desktoptheme/metadata.desktop
-+++ desktoptheme/metadata.desktop
-@@ -2,6 +2,7 @@
- Name=Oxygen
- Name[csb]=Krziseń
- Name[es]=Oxígeno
-+Name[gu]=ઓક્સિજન
- Name[hi]=आक्सीजन
- Name[kk]=Оттегі
- Name[km]=អុកស៊ីហ្សែន
-@@ -30,6 +31,7 @@
- Comment[fy]=Tema werjûn yn de Oxygen styl
- Comment[ga]=Téama sa stíl Oxygen
- Comment[gl]=Tema feito no estilo Oxygen
-+Comment[gu]=થીમ ઓક્સિજન શૈલીમાં બનાવાઇ છે
- Comment[he]=ערכת נושא שמשתמשת בסגנון Oxygen
- Comment[hi]=प्रसंग को ऑक्सीजन शैली में किया गया है
- Comment[hu]=Oxygen-stílusú téma
-@@ -55,7 +57,7 @@
- Comment[sr]=Тема урађена у стилу Кисеоника
- Comment[sr@latin]=Tema urađena u stilu Kiseonika
- Comment[sv]=Tema skapat med Oxygen-stilen
--Comment[th]=ชุดตกแต่งที่ทำในรูปแบบ Oxygen
-+Comment[th]=ปรับชุดตกแต่งแล้วโดยใช้รูปแบบ Oxygen
- Comment[tr]=Oxygen biçimi ile yapılmış tema
- Comment[uk]=Тема в стилі Oxygen
- Comment[vi]=Sắc thái kiểu Oxygen
--- desktoptheme/opaque/dialogs/background.svg
+++ desktoptheme/opaque/dialogs/background.svg
@@ -0,0 +1,366 @@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |