Browse Source

Split user css information and main engine css control files

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
4a7ce6c116
6 changed files with 17 additions and 7 deletions
  1. 1
    0
      Makefile.am
  2. 1
    1
      autogen.sh
  3. 2
    1
      configure.ac
  4. 2
    0
      rc/Makefile.am
  5. 7
    0
      rc/gtk.css
  6. 4
    5
      tdegtk/tdegtk-theme.cpp

+ 1
- 0
Makefile.am View File

@@ -1,6 +1,7 @@
1 1
 SUBDIRS = \
2 2
 	build \
3 3
 	tdegtk \
4
+	rc \
4 5
 	tests
5 6
 
6 7
 ACLOCAL_AMFLAGS = -I build

+ 1
- 1
autogen.sh View File

@@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=.
6 6
 
7 7
 PKG_NAME="tdegtk"
8 8
 
9
-(test -f $srcdir/tdegtk/tdegtk-theme.c) || {
9
+(test -f $srcdir/tdegtk/tdegtk-theme.cpp) || {
10 10
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
11 11
     echo " top-level $PKG_NAME directory"
12 12
     exit 1

+ 2
- 1
configure.ac View File

@@ -2,7 +2,7 @@ AC_PREREQ(2.63)
2 2
 
3 3
 # Package
4 4
 
5
-AC_INIT([tdegtk],[1.0.1],[https://bugs.launchpad.net/tdegtk],[tdegtk])
5
+AC_INIT([tdegtk],[1.0.1],[https://bugs.trinitydesktop.org],[tdegtk])
6 6
 AC_CONFIG_SRCDIR([tdegtk/tdegtk.h])
7 7
 AC_CONFIG_MACRO_DIR([build])
8 8
 AC_CONFIG_AUX_DIR([build])
@@ -115,6 +115,7 @@ build/Makefile
115 115
 po/Makefile
116 116
 tdegtk/Makefile
117 117
 tests/Makefile
118
+rc/Makefile
118 119
 ])
119 120
 AC_OUTPUT
120 121
 

+ 2
- 0
rc/Makefile.am View File

@@ -0,0 +1,2 @@
1
+styleconfdir=$(prefix)/share/themes/tdegtk/gtk-3.0
2
+styleconf_DATA = gtk.css

+ 7
- 0
rc/gtk.css View File

@@ -0,0 +1,7 @@
1
+/* This file is part of the Gtk TQt Theme Engine */
2
+
3
+* {
4
+	engine:tdegtk;
5
+}
6
+
7
+@import "tdegtk.css";

+ 4
- 5
tdegtk/tdegtk-theme.cpp View File

@@ -29,7 +29,7 @@
29 29
 // See upstream GTK bug #687173
30 30
 
31 31
 #define TDEGTK_THEME_THEME_DIRECTORY_NAME	"tdegtk"
32
-#define TDEGTK_THEME_CONTROL_FILE_NAME		"gtk.css"
32
+#define TDEGTK_THEME_CONTROL_FILE_NAME		"tdegtk.css"
33 33
 #define RC_CACHE_VERSION			TQString("1")
34 34
 #define DEBUG_PRINT(x)				if (gtk3TQtDebug) printf(x"\n\r");
35 35
 #define DEBUG_PRINT_ARGS(x,y)			if (gtk3TQtDebug) printf(x"\n\r",y);
@@ -145,6 +145,9 @@ G_MODULE_EXPORT GtkThemingEngine* create_engine(void) {
145 145
 	if (gtk3TQtDebug) {
146 146
 		writeGtkThemeControlFile(true);
147 147
 	}
148
+	else {
149
+		writeGtkThemeControlFile(false);
150
+	}
148 151
 
149 152
 	// Initialize hooks
150 153
 	m_widgetLookup.initializeHooks();
@@ -556,10 +559,6 @@ void writeGtkThemeControlFile(int forceRecreate) {
556 559
 	stream << "/* " << iconTheme << ", " << tqApp->style().name() << ", " << RC_CACHE_VERSION << " */\n\n";
557 560
 	stream << "/* This file was generated by the Gtk TQt Theme Engine */\n";
558 561
 	stream << "/* It will be recreated when you change your TDE icon theme or widget style */\n\n";
559
-
560
-	stream << "\n";
561
-	stream << "* {\n\tengine:tdegtk;\n}\n";
562
-	stream << "\n";
563 562
 	
564 563
 	TQScrollBar sbar(NULL);
565 564
 	sbar.setOrientation(TQt::Horizontal);

Loading…
Cancel
Save