Hello community,
here is the log from the commit of package amarok
checked in at Fri Aug 24 23:05:02 CEST 2007.
--------
--- KDE/amarok/amarok.changes 2007-08-21 08:59:24.000000000 +0200
+++ /mounts/work_src_done/STABLE/amarok/amarok.changes 2007-08-24 11:36:28.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Aug 24 11:35:39 CEST 2007 - llunak@suse.cz
+
+- make the splashscreen less intrusive (#298508)
+
+-------------------------------------------------------------------
New:
----
use-ksplashscreen.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ amarok.spec ++++++
--- /var/tmp/diff_new_pack.Q30236/_old 2007-08-24 23:04:15.000000000 +0200
+++ /var/tmp/diff_new_pack.Q30236/_new 2007-08-24 23:04:15.000000000 +0200
@@ -36,7 +36,7 @@
Group: Productivity/Multimedia/Sound/Players
Summary: Media Player for KDE
Version: 1.4.7
-Release: 10
+Release: 12
%if %suse_version > 1020
Requires: amarok-lang = %{version}
Recommends: libvisual-plugins
@@ -54,6 +54,7 @@
Patch11: amarok-threadmanager.diff
Patch12: undefined-entity.diff
Patch13: amarok-FrameworkVersion.diff
+Patch14: use-ksplashscreen.diff
%description
Amarok is a media player for all kinds of media. This includes MP3, Ogg
@@ -162,6 +163,7 @@
%if %suse_version > 1020
%patch13 -p1
%endif
+%patch14
. /etc/opt/kde3/common_options
update_admin --no-unsermake
@@ -295,6 +297,8 @@
%endif
%changelog
+* Fri Aug 24 2007 - llunak@suse.cz
+- make the splashscreen less intrusive (#298508)
* Tue Aug 21 2007 - stbinner@suse.de
- fix build on older distributions
* Mon Aug 20 2007 - ssommer@suse.de
++++++ use-ksplashscreen.diff ++++++
--- amarok/src/loader/loader.cpp.sav 2007-08-15 15:02:24.000000000 +0200
+++ amarok/src/loader/loader.cpp 2007-08-15 15:07:19.000000000 +0200
@@ -25,7 +25,7 @@
#include
#include
#include
-#include "splash.h"
+#include
extern "C"
{
@@ -142,8 +142,15 @@ Loader::Loader( QStringList args )
// we transmit the startup_id, so amarokapp can stop the startup animation
//FIXME QCString str( ::getenv( "DESKTOP_STARTUP_ID" ) );
- if( !QApplication::isSessionRestored() && isSplashEnabled() )
- m_splash = new Splash;
+ if( !QApplication::isSessionRestored())
+ {
+ KInstance instance("amarok"); // KGlobal::dirs() crashes without
+ if( isSplashEnabled() )
+ {
+ m_splash = new KSplashScreen( QPixmap( KStandardDirs().findResource("data", "amarok/images/splash_screen.jpg")));
+ m_splash->show();
+ }
+ }
args.prepend( "amarokapp" );
@@ -207,7 +214,6 @@ bool
isSplashEnabled()
{
//determine whether splash-screen is enabled in amarokrc
- KInstance instance("amarok"); // KGlobal::dirs() crashes without
(void)KGlobal::config(); // the kubuntu special directory is not present without this
QStringList dirs = KGlobal::dirs()->findAllResources( "config", "amarokrc" );
--- amarok/src/loader/Makefile.am.sav 2007-08-15 15:02:24.000000000 +0200
+++ amarok/src/loader/Makefile.am 2007-08-15 15:03:46.000000000 +0200
@@ -4,12 +4,11 @@ INCLUDES = \
$(all_includes)
amarok_SOURCES = \
- loader.cpp \
- splash.cpp
+ loader.cpp
amarok_LDADD = \
$(LIB_QT) \
- $(LIB_KDECORE)
+ $(LIB_KDEUI)
amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH)
--- amarok/src/loader/splash.cpp.sav 2007-08-15 15:02:24.000000000 +0200
+++ amarok/src/loader/splash.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,48 +0,0 @@
-/*
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-*/
-
-// begin: Fre Sep 26 2003
-// copyright: (C) 2003 Christian Muehlhaeuser
-// (C) 2005 Max Howell
-
-#include
-#include
-#include
-
-#include
-#include "splash.h"
-
-extern "C"
-{
- #include //usleep
-}
-
-Splash::Splash()
- : QWidget( 0, 0, WType_TopLevel | WX11BypassWM | WStyle_StaysOnTop )
-{
- QString path = KStandardDirs().findResource("data", "amarok/images/splash_screen.jpg");
-
- QPixmap splash( path );
- resize( splash.size() );
- setBackgroundPixmap( splash );
- setFocusPolicy( NoFocus );
-
- //NOTE Don't break Xinerama!
- const QRect d = QApplication::desktop()->screenGeometry( QApplication::desktop()->screenNumber( QPoint() ) );
- QPoint p = d.topLeft();
- p.rx() += (d.width() - width()) / 2;
- p.ry() += (d.height() - height()) / 2;
- move( p );
-
- show();
-}
-
-void
-Splash::mousePressEvent( QMouseEvent* )
-{
- hide();
-}
--- amarok/src/loader/splash.h.sav 2007-08-15 15:02:24.000000000 +0200
+++ amarok/src/loader/splash.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-/*
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-*/
-
-/*
- osd.h - Provides an interface to a plain QWidget, which is independent of KDE (bypassed to X11)
- begin: Fre Sep 26 2003
- copyright: (C) 2003 by Christian Muehlhaeuser
- email: muesli@chareit.net
-*/
-
-#ifndef SPLASH_H
-#define SPLASH_H
-
-#include //baseclass
-
-class Splash : public QWidget
-{
-public:
- Splash();
-
-protected:
- virtual void mousePressEvent( QMouseEvent* );
-};
-
-#endif
--- amarok/src/loader/loader.h.sav 2007-08-15 15:02:24.000000000 +0200
+++ amarok/src/loader/loader.h 2007-08-15 15:07:06.000000000 +0200
@@ -34,7 +34,7 @@ private:
QProcess *m_proc;
int m_counter;
- QObject *m_splash;
+ QWidget *m_splash;
static const int INTERVAL = 10; //ms
};
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org