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

List:       kde-commits
Subject:    kdebase/kcontrol/krdb
From:       Craig Drummond <craig () kde ! org>
Date:       2003-07-31 20:43:26
[Download RAW message or body]

CVS commit by craig: 

Set GTK2_RC_FILES as well as GTK_RC_FILES - so that colours are also applied to Gtk2 apps. 
Move generated gtkrc file from $HOME/.gtkrc to $KDEHOME/share/config/gtkrc


  M +23 -10    krdb.cpp   1.51


--- kdebase/kcontrol/krdb/krdb.cpp  #1.50:1.51
@@ -41,15 +41,29 @@
 #include <X11/Xlib.h>
 
+inline const char * gtkEnvVar(int version)
+{
+    return 2==version ? "GTK2_RC_FILES" : "GTK_RC_FILES";
+}
+
+inline const char * sysGtkrc(int version)
+{
+    return 2==version ? "/etc/gtk-2.0/gtkrc" : "/etc/gtk/gtkrc";
+}
+
+inline const char * userGtkrc(int version)
+{
+    return 2==version  ? "/.gtkrc-2.0" : "/.gtkrc";
+}
 
 // -----------------------------------------------------------------------------
-static void applyGtkStyles(bool active)
+static void applyGtkStyles(bool active, int version)
 {
-   QString gtkkde = QDir::homeDirPath()+"/.gtkrc-kde";
-   QCString gtkrc = getenv("GTK_RC_FILES");
+   QString gtkkde = locateLocal("config", "gtkrc");
+   QCString gtkrc = getenv(gtkEnvVar(version));
    QStringList list = QStringList::split(':', QFile::decodeName(gtkrc));
    if (list.count() == 0)
    {
-      list.append(QString::fromLatin1("/etc/gtk/gtkrc"));
-      list.append(QDir::homeDirPath()+"/.gtkrc");
+      list.append(QString::fromLatin1(sysGtkrc(version)));
+      list.append(QDir::homeDirPath()+userGtkrc(version));
    }
    list.remove(gtkkde);
@@ -59,5 +73,5 @@ static void applyGtkStyles(bool active)
 
    // Pass env. var to kdeinit.
-   QCString name = "GTK_RC_FILES";
+   QCString name = gtkEnvVar(version);
    QCString value = QFile::encodeName(list.join(":"));
    QByteArray params;
@@ -290,7 +304,5 @@ static QString color( const QColor& col 
 static void createGtkrc( bool exportColors, const QColorGroup& cg )
 {
-    QCString filename = ::getenv("HOME");
-    filename += "/.gtkrc-kde";
-    QFile f( filename );
+    QFile f( locateLocal("config", "gtkrc" ) );
 
     if ( f.open( IO_WriteOnly) ) {
@@ -446,5 +458,6 @@ void runRdb( uint flags )
   tmpFile.unlink();
 
-  applyGtkStyles(exportColors);
+  applyGtkStyles(exportColors, 1);
+  applyGtkStyles(exportColors, 2);
 
   /* Qt exports */


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