diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | rc/Makefile.am | 2 | ||||
| -rw-r--r-- | rc/gtk.css | 7 | ||||
| -rw-r--r-- | tdegtk/tdegtk-theme.cpp | 9 |
6 files changed, 17 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 261c0fb..571511b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ SUBDIRS = \ build \ tdegtk \ + rc \ tests ACLOCAL_AMFLAGS = -I build @@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=. PKG_NAME="tdegtk" -(test -f $srcdir/tdegtk/tdegtk-theme.c) || { +(test -f $srcdir/tdegtk/tdegtk-theme.cpp) || { echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" echo " top-level $PKG_NAME directory" exit 1 diff --git a/configure.ac b/configure.ac index d8addef..2bee047 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ(2.63) # Package -AC_INIT([tdegtk],[1.0.1],[https://bugs.launchpad.net/tdegtk],[tdegtk]) +AC_INIT([tdegtk],[1.0.1],[https://bugs.trinitydesktop.org],[tdegtk]) AC_CONFIG_SRCDIR([tdegtk/tdegtk.h]) AC_CONFIG_MACRO_DIR([build]) AC_CONFIG_AUX_DIR([build]) @@ -115,6 +115,7 @@ build/Makefile po/Makefile tdegtk/Makefile tests/Makefile +rc/Makefile ]) AC_OUTPUT diff --git a/rc/Makefile.am b/rc/Makefile.am new file mode 100644 index 0000000..6587d3c --- /dev/null +++ b/rc/Makefile.am @@ -0,0 +1,2 @@ +styleconfdir=$(prefix)/share/themes/tdegtk/gtk-3.0 +styleconf_DATA = gtk.css diff --git a/rc/gtk.css b/rc/gtk.css new file mode 100644 index 0000000..5aa547e --- /dev/null +++ b/rc/gtk.css @@ -0,0 +1,7 @@ +/* This file is part of the Gtk TQt Theme Engine */ + +* { + engine:tdegtk; +} + +@import "tdegtk.css"; diff --git a/tdegtk/tdegtk-theme.cpp b/tdegtk/tdegtk-theme.cpp index fe4db01..9208ec2 100644 --- a/tdegtk/tdegtk-theme.cpp +++ b/tdegtk/tdegtk-theme.cpp @@ -29,7 +29,7 @@ // See upstream GTK bug #687173 #define TDEGTK_THEME_THEME_DIRECTORY_NAME "tdegtk" -#define TDEGTK_THEME_CONTROL_FILE_NAME "gtk.css" +#define TDEGTK_THEME_CONTROL_FILE_NAME "tdegtk.css" #define RC_CACHE_VERSION TQString("1") #define DEBUG_PRINT(x) if (gtk3TQtDebug) printf(x"\n\r"); #define DEBUG_PRINT_ARGS(x,y) if (gtk3TQtDebug) printf(x"\n\r",y); @@ -145,6 +145,9 @@ G_MODULE_EXPORT GtkThemingEngine* create_engine(void) { if (gtk3TQtDebug) { writeGtkThemeControlFile(true); } + else { + writeGtkThemeControlFile(false); + } // Initialize hooks m_widgetLookup.initializeHooks(); @@ -556,10 +559,6 @@ void writeGtkThemeControlFile(int forceRecreate) { stream << "/* " << iconTheme << ", " << tqApp->style().name() << ", " << RC_CACHE_VERSION << " */\n\n"; stream << "/* This file was generated by the Gtk TQt Theme Engine */\n"; stream << "/* It will be recreated when you change your TDE icon theme or widget style */\n\n"; - - stream << "\n"; - stream << "* {\n\tengine:tdegtk;\n}\n"; - stream << "\n"; TQScrollBar sbar(NULL); sbar.setOrientation(TQt::Horizontal); |