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

List:       kde-commits
Subject:    extragear/graphics/digikam
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2007-05-11 22:11:43
Message-ID: 1178921503.689629.8609.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 663654 by cgilles:

digikam from trunk : add Color Theme Designer tool


 M  +4 -3      Makefile.am  
 M  +22 -0     libs/themeengine/themeengine.cpp  
 M  +2 -0      libs/themeengine/themeengine.h  
 A             themedesigner (directory)  
 A             themedesigner/Makefile.am  
 A             themedesigner/digikamthemedesigner.desktop  
 AM            themedesigner/main.cpp   [License: GPL]
 AM            themedesigner/mainwindow.cpp   [License: GPL]
 AM            themedesigner/mainwindow.h   [License: GPL]
 AM            themedesigner/themedicongroupitem.cpp   [License: GPL]
 AM            themedesigner/themedicongroupitem.h   [License: GPL]
 AM            themedesigner/themediconitem.cpp   [License: GPL]
 AM            themedesigner/themediconitem.h   [License: GPL]
 AM            themedesigner/themediconview.cpp   [License: GPL]
 AM            themedesigner/themediconview.h   [License: GPL]


--- trunk/extragear/graphics/digikam/Makefile.am #663653:663654
@@ -1,12 +1,13 @@
-SUBDIRS = sqlite libs utilities digikam showfoto data kioslave imageplugins
+COMPILE_FIRST = sqlite
 
-EXTRA_DIST = digikam.kdevelop AUTHORS COPYING ChangeLog INSTALL README TODO digikam.lsm 
+SUBDIRS = sqlite libs utilities digikam themedesigner showfoto data kioslave imageplugins
 
+EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO digikam.lsm 
+
 AUTOMAKE_OPTIONS = foreign 
 
 MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files 
 
-COMPILE_FIRST = sqlite
 
 tip_DATA = tips
 tipdir = $(kde_datadir)/digikam
--- trunk/extragear/graphics/digikam/libs/themeengine/themeengine.cpp #663653:663654
@@ -186,6 +186,28 @@
     QTimer::singleShot(0, this, SIGNAL(signalThemeChanged()));
 }
 
+void ThemeEngine::setCurrentTheme(const Theme& theme, const QString& name, bool loadFromDisk)
+{
+    Theme* t = d->themeDict.find(name);
+    if (t)
+    {
+        d->themeDict.remove(name);
+        d->themeList.remove(t);
+        delete t;
+    }
+
+    t = new Theme(theme);
+    t->filePath = theme.filePath;
+    d->themeDict.insert(name, t);
+    d->themeList.append(t);
+
+    d->currTheme = t;
+    if (loadFromDisk)
+        loadTheme();
+    
+    QTimer::singleShot(0, this, SIGNAL(signalThemeChanged()));
+}
+
 Theme* ThemeEngine::getCurrentTheme()
 {
     return d->currTheme;
--- trunk/extragear/graphics/digikam/libs/themeengine/themeengine.h #663653:663654
@@ -55,6 +55,8 @@
     QStringList themeNames() const;
     
     void    setCurrentTheme(const QString& name);
+    void    setCurrentTheme(const Theme& theme, const QString& name,
+                            bool loadFromDisk=false);
     Theme*  getCurrentTheme();
 
     QColor  baseColor()     const;
** trunk/extragear/graphics/digikam/themedesigner/main.cpp #property svn:eol-style
   + native
** trunk/extragear/graphics/digikam/themedesigner/mainwindow.cpp #property svn:eol-style
   + native
** trunk/extragear/graphics/digikam/themedesigner/mainwindow.h #property svn:eol-style
   + native
** trunk/extragear/graphics/digikam/themedesigner/themedicongroupitem.cpp #property svn:eol-style
   + native
** trunk/extragear/graphics/digikam/themedesigner/themedicongroupitem.h #property svn:eol-style
   + native
** trunk/extragear/graphics/digikam/themedesigner/themediconitem.cpp #property svn:eol-style
   + native
** trunk/extragear/graphics/digikam/themedesigner/themediconitem.h #property svn:eol-style
   + native
** trunk/extragear/graphics/digikam/themedesigner/themediconview.cpp #property svn:eol-style
   + native
** trunk/extragear/graphics/digikam/themedesigner/themediconview.h #property svn:eol-style
   + native
[prev in list] [next in list] [prev in thread] [next in thread]