[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-3/digikam
From:       Gilles Caulier <caulier.gilles () free ! fr>
Date:       2005-04-01 15:12:22
Message-ID: 20050401151222.E7A6E490 () office ! kde ! org
[Download RAW message or body]

CVS commit by cgilles: 

Showfoto Add splashscreen support.


  A            showfoto/showfoto-splash.png   1.1
  M +1 -1      digikam/digikamapp.cpp   1.94
  M +4 -0      showfoto/Makefile.am   1.17
  M +16 -1     showfoto/showfoto.cpp   1.38
  M +5 -0      showfoto/showfoto.h   1.28
  M +10 -6     utilities/splashscreen/splashscreen.cpp   1.10
  M +5 -2      utilities/splashscreen/splashscreen.h   1.6


--- kdeextragear-3/digikam/digikam/digikamapp.cpp  #1.93:1.94
@@ -87,5 +87,5 @@ DigikamApp::DigikamApp(bool detectCamera
        !kapp->isRestored())
     {
-        mSplash = new SplashScreen();
+        mSplash = new SplashScreen("digikam-splash.png");
     }
 

--- kdeextragear-3/digikam/showfoto/Makefile.am  #1.16:1.17
@@ -3,4 +3,5 @@
 INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor \
            -I$(top_srcdir)/digikam/libs/thumbbar/ \
+           -I$(top_srcdir)/digikam/utilities/splashscreen \
            $(LIBKEXIF_CFLAGS) $(all_includes)
 
@@ -22,4 +23,7 @@
 rc_DATA = showfotoui.rc
 
+showfotosplashpicdir = $(kde_datadir)/showfoto
+showfotosplashpic_DATA = showfoto-splash.png
+
 xdg_apps_DATA = showfoto.desktop
 

--- kdeextragear-3/digikam/showfoto/showfoto.cpp  #1.37:1.38
@@ -71,11 +71,15 @@
 #include "imageprint.h"
 #include "imlibinterface.h"
+#include "splashscreen.h"
 #include "showfoto.h"
 
 ShowFoto::ShowFoto(const KURL::List& urlList)
+        : KMainWindow( 0, "Showfoto" )
 {
+    m_splash     = 0;
     m_config     = kapp->config();
     m_fullScreen = false;
     
+    m_splash     = new SplashScreen("showfoto-splash.png");
     QWidget* widget  = new QWidget(this);
     QHBoxLayout *lay = new QHBoxLayout(widget);
@@ -97,5 +101,5 @@ ShowFoto::ShowFoto(const KURL::List& url
     // Load image plugins.
     
-    m_imagePluginLoader = new ImagePluginLoader(this);
+    m_imagePluginLoader = new ImagePluginLoader(this, m_splash);
     
     for (Digikam::ImagePlugin* plugin = m_imagePluginLoader->pluginList().first();
@@ -1029,3 +1033,14 @@ void ShowFoto::slotResize()
 }
 
+void ShowFoto::show()
+{
+    if(m_splash)
+    {
+        m_splash->finish(this);
+        delete m_splash;
+        m_splash = 0;
+    }
+    KMainWindow::show();
+}
+
 #include "showfoto.moc"

--- kdeextragear-3/digikam/showfoto/showfoto.h  #1.27:1.28
@@ -37,4 +37,5 @@ class KToolBarPopupAction;
 class Canvas;
 class ImagePluginLoader;
+class SplashScreen;
 
 namespace Digikam
@@ -52,4 +53,6 @@ public:
     ~ShowFoto();
 
+    virtual void show();
+
 protected:
 
@@ -105,4 +108,6 @@ private:
     Digikam::ThumbBarView *m_bar;
     
+    SplashScreen          *m_splash;
+                           
     KConfig               *m_config;
     

--- kdeextragear-3/digikam/utilities/splashscreen/splashscreen.cpp  #1.9:1.10
@@ -5,5 +5,5 @@
  *
  * Copyright 2003 by Renchi Raju
-
+ *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -19,18 +19,22 @@
  * ============================================================ */
 
+// Qt includes. 
+ 
 #include <qpixmap.h>
-#include <qstring.h>
 #include <qapplication.h>
 #include <qtimer.h>
 #include <qpainter.h>
 
+// KDE includes.
+
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 
-#include "splashscreen.h"
+// Local includes.
 
+#include "splashscreen.h"
 
-SplashScreen::SplashScreen()
+SplashScreen::SplashScreen(const QString& splash)
     : QWidget(0, 0, WStyle_Customize|WStyle_Splash)
 {
@@ -38,5 +42,5 @@ SplashScreen::SplashScreen()
     progressBarSize_ = 3;
     
-    QString file = locate( "appdata", "digikam-splash.png" );
+    QString file = locate( "appdata", splash );
 
     pix_ = new QPixmap(file);

--- kdeextragear-3/digikam/utilities/splashscreen/splashscreen.h  #1.5:1.6
@@ -5,5 +5,5 @@
  *
  * Copyright 2003 by Renchi Raju
-
+ *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -22,5 +22,8 @@
 #define SPLASHSCREEN_H
 
+// Qt includes.
+
 #include <qwidget.h>
+#include <qstring.h>
 
 class QPixmap;
@@ -33,5 +36,5 @@ class SplashScreen : public QWidget
 public:
 
-    SplashScreen();
+    SplashScreen(const QString& splash);
     ~SplashScreen();
 


[prev in list] [next in list] [prev in thread] [next in thread]