diff options
-rw-r--r-- | .gitmodules | 6 | ||||
-rw-r--r-- | CMakeLists.txt | 79 | ||||
-rw-r--r-- | ChangeLog | 0 | ||||
-rw-r--r-- | ConfigureChecks.cmake | 59 | ||||
-rw-r--r-- | INSTALL | 373 | ||||
-rw-r--r-- | Makefile.am | 23 | ||||
-rw-r--r-- | NEWS | 0 | ||||
-rw-r--r-- | README | 0 | ||||
-rw-r--r-- | README.md | 18 | ||||
m--------- | admin | 0 | ||||
-rwxr-xr-x | autogen.sh | 23 | ||||
m--------- | cmake | 0 | ||||
-rw-r--r-- | config.h.cmake | 8 | ||||
-rw-r--r-- | config.h.in | 274 | ||||
-rw-r--r-- | configure.in.in | 155 | ||||
-rw-r--r-- | po/Makefile.in | 217 | ||||
-rw-r--r-- | rc/CMakeLists.txt | 7 | ||||
-rw-r--r-- | rc/Makefile.am | 2 | ||||
-rw-r--r-- | tdegtk/CMakeLists.txt | 69 | ||||
-rw-r--r-- | tdegtk/Makefile.am | 60 | ||||
-rw-r--r-- | tdegtk/tdegtk-draw.cpp | 112 | ||||
-rw-r--r-- | tdegtk/tdegtk-tabwidgetdata.h | 2 | ||||
-rw-r--r-- | tdegtk/tdegtk-theme.cpp | 38 | ||||
-rw-r--r-- | tdegtk/tqtcairopainter.cpp | 41 | ||||
-rw-r--r-- | tdegtk/tqtcairopainter.h | 21 | ||||
-rw-r--r-- | tests/CMakeLists.txt | 47 | ||||
-rw-r--r-- | tests/Makefile.am | 39 | ||||
-rwxr-xr-x | tests/compare | 3 | ||||
-rw-r--r-- | tests/test-painter.cpp | 8 |
29 files changed, 414 insertions, 1270 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index bdec8fc..0000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "admin"] - path = admin - url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin -[submodule "cmake"] - path = cmake - url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..edce73a --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,79 @@ +############################################ +# # +# Improvements and feedbacks are welcome # +# # +# This file is released under GPL >= 3 # +# # +############################################ + + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) + + +#### general package setup + +project( gtk3-tqt-engine ) + + +#### include essential cmake modules + +include( FindPkgConfig ) +include( CheckFunctionExists ) +include( CheckSymbolExists ) +include( CheckIncludeFile ) +include( CheckLibraryExists ) +include( CheckCSourceCompiles ) +include( CheckCXXSourceCompiles ) + +#### include our cmake modules + +include( TDEMacros ) +enable_testing( ) + + +##### setup install paths + +include( TDESetupPaths ) +tde_setup_paths( ) + + +##### optional stuff + +option( WITH_ALL_OPTIONS "Enable all optional support" OFF ) +option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) + + +##### user requested modules + +option( BUILD_ALL "Build all" ON ) +option( BUILD_TESTS "Build test programs" ${BUILD_ALL} ) + + +##### configure checks + +include( ConfigureChecks.cmake ) + + +###### global compiler settings + +add_definitions( -DHAVE_CONFIG_H ) + +set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) +set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) +set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" ) + + +##### directories + +add_subdirectory( rc ) +add_subdirectory( tdegtk ) +tde_conditional_add_subdirectory( BUILD_TESTS tests ) + + +##### write configure files + +configure_file( config.h.cmake config.h @ONLY ) diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index e69de29..0000000 --- a/ChangeLog +++ /dev/null diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake new file mode 100644 index 0000000..483464f --- /dev/null +++ b/ConfigureChecks.cmake @@ -0,0 +1,59 @@ +########################################### +# # +# Improvements and feedback are welcome # +# # +# This file is released under GPL >= 3 # +# # +########################################### + +# required stuff +find_package( TQt ) +find_package( TDE ) + +tde_setup_architecture_flags( ) + +include(TestBigEndian) +test_big_endian(WORDS_BIGENDIAN) + +tde_setup_largefiles( ) + + +##### check for gcc visibility support + +if( WITH_GCC_VISIBILITY ) + tde_setup_gcc_visibility( ) +endif( WITH_GCC_VISIBILITY ) + + +#### cairo + +pkg_search_module( CAIRO cairo ) + +if( NOT CAIRO_FOUND ) + tde_message_fatal( "cairo is required but was not found on your system" ) +endif( ) + + +#### gtk+-3.0 + +pkg_search_module( GTK3 gtk+-3.0 ) + +if( NOT GTK3_FOUND ) + tde_message_fatal( "gtk3 is required but was not found on your system" ) +endif( ) + +execute_process( + COMMAND ${PKG_CONFIG_EXECUTABLE} + gtk+-3.0 --variable=gtk_binary_version + OUTPUT_VARIABLE GTK3_BIN_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE +) + + +#### pango + +pkg_search_module( PANGO pango ) + +if( NOT PANGO_FOUND ) + tde_message_fatal( "pango is required but was not found on your system" ) +endif( ) @@ -1,365 +1,24 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. - - Copying and distribution of this file, with or without modification, -are permitted in any medium without royalty provided the copyright -notice and this notice are preserved. This file is offered as-is, -without warranty of any kind. - Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented -below. The lack of an optional feature in a given package is not -necessarily a bug. More recommendations for GNU packages can be found -in *note Makefile Conventions: (standards)Makefile Conventions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - - The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package, generally using the just-built uninstalled binaries. - - 4. Type `make install' to install the programs and any data files and - documentation. When installing into a prefix owned by root, it is - recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root - privileges. - - 5. Optionally, type `make installcheck' to repeat any self-tests, but - this time using the binaries in their final installed location. - This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required - root privileges, verifies that the installation completed - correctly. - - 6. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - - 7. Often, you can also type `make uninstall' to remove the installed - files again. In practice, not all packages have tested that - uninstallation works correctly, even though it is required by the - GNU Coding Standards. - - 8. Some packages, particularly those that use Automake, provide `make - distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. - This target is generally not run by end users. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - -Installation Names -================== - - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an -absolute file name. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory -specifications that were not explicitly provided. - - The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or -both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without -having to reconfigure or recompile. - - The first method involves providing an override variable for each -affected directory. For example, `make install -prefix=/alternate/directory' will choose an alternate location for all -directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and -does not work on platforms that have drive letters. On the other hand, -it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. - -Optional Features -================= - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - - Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure ---enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure ---disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. - -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `<wchar.h>' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - - On Solaris, don't put `/usr/ucb' early in your `PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. - - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: - - ./configure --prefix=/boot/common - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS - KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: - - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. - -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). +gtk3-tqt-engine relies on cmake to build. -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. +Here are suggested default options: -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. + -DCMAKE_INSTALL_PREFIX="/opt/trinity" \ + -DCONFIG_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_VERBOSE_MAKEFILE="ON" \ + -DCMAKE_SKIP_RPATH="OFF" \ + -DBUILD_ALL="ON" \ + -DWITH_ALL_OPTIONS="ON" -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. +Requirements: +============= +- cairo +- gtk+-3.0 +- pango diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 48f5153..0000000 --- a/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -SUBDIRS = \ - tdegtk \ - rc \ - tests - -ACLOCAL_AMFLAGS = -I build - -EXTRA_DIST = autogen.sh COPYING - -DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper - -MAINTAINERCLEANFILES = \ - Makefile.in \ - config.h.in \ - configure \ - aclocal.m4 - -release: dist - make $(PACKAGE)-$(VERSION).tar.gz.md5 - make $(PACKAGE)-$(VERSION).tar.bz2.md5 - -%.md5: % - md5sum $< > $@ diff --git a/README.md b/README.md new file mode 100644 index 0000000..8277b6d --- /dev/null +++ b/README.md @@ -0,0 +1,18 @@ + +GTK3-tqt-engine - GTK3 theme engine for TDE + + +GTK3 style engine which uses the active TDE style to draw its widgets. + +. + +Contributing +-------------- + +If you wish to contribute to gtk3-tqt-engine, you might do so: + +- TDE Gitea Workspace (TGW) collaboration tool. + https://mirror.git.trinitydesktop.org/gitea + +- TDE Weblate Translation Workspace (TWTW) collaboration tool. + https://mirror.git.trinitydesktop.org/weblate diff --git a/admin b/admin deleted file mode 160000 -Subproject 68f23556e638353e46b444d3a4863a64936bd36 diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index fdad100..0000000 --- a/autogen.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -PKG_NAME="tdegtk" - -(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 -} - -which gnome-autogen.sh || { - echo "You need to install gnome-common from the GNOME CVS" - exit 1 -} - -REQUIRED_AUTOCONF_VERSION=2.63 -REQUIRED_AUTOMAKE_VERSION=1.9 -REQUIRED_INTLTOOL_VERSION=0.40.0 -REQUIRED_PKG_CONFIG_VERSION=0.16.0 . gnome-autogen.sh diff --git a/cmake b/cmake deleted file mode 160000 -Subproject 5121b9a41d671dbaf7350c349d246793d8d8a4e diff --git a/config.h.cmake b/config.h.cmake new file mode 100644 index 0000000..61ede3a --- /dev/null +++ b/config.h.cmake @@ -0,0 +1,8 @@ +#define VERSION "@VERSION@" + +// Defined if you have fvisibility and fvisibility-inlines-hidden support. +#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1 + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@ diff --git a/config.h.in b/config.h.in deleted file mode 100644 index c3ca294..0000000 --- a/config.h.in +++ /dev/null @@ -1,274 +0,0 @@ -/* config.h.in. Generated from configure.in by autoheader. */ - -/* Define if building universal (internal helper macro) */ -#undef AC_APPLE_UNIVERSAL_BUILD - -/* Defines if your system has the Cairo library */ -#undef HAVE_CAIRO - -/* Define to 1 if you have the <Carbon/Carbon.h> header file. */ -#undef HAVE_CARBON_CARBON_H - -/* Define if you have the CoreAudio API */ -#undef HAVE_COREAUDIO - -/* Define to 1 if you have the <crt_externs.h> header file. */ -#undef HAVE_CRT_EXTERNS_H - -/* Defines if your system has the crypt function */ -#undef HAVE_CRYPT - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - -/* Defines if your system has the GTK3 library */ -#undef HAVE_GTK3 - -/* Define to 1 if you have the <inttypes.h> header file. */ -#undef HAVE_INTTYPES_H - -/* Define if you have libjpeg */ -#undef HAVE_LIBJPEG - -/* Define if you have libpng */ -#undef HAVE_LIBPNG - -/* Define if you have a working libpthread (will enable threaded code) */ -#undef HAVE_LIBPTHREAD - -/* Define if you have libz */ -#undef HAVE_LIBZ - -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - -/* Define if your system needs _NSGetEnviron to set up the environment */ -#undef HAVE_NSGETENVIRON - -/* Defines if your system has the Pango library */ -#undef HAVE_PANGO - -/* Define if you have res_init */ -#undef HAVE_RES_INIT - -/* Define if you have the res_init prototype */ -#undef HAVE_RES_INIT_PROTO - -/* Define if you have a STL implementation by SGI */ -#undef HAVE_SGI_STL - -/* Define to 1 if you have the `snprintf' function. */ -#undef HAVE_SNPRINTF - -/* Define to 1 if you have the <stdint.h> header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the <stdlib.h> header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the <strings.h> header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the <string.h> header file. */ -#undef HAVE_STRING_H - -/* Define if you have strlcat */ -#undef HAVE_STRLCAT - -/* Define if you have the strlcat prototype */ -#undef HAVE_STRLCAT_PROTO - -/* Define if you have strlcpy */ -#undef HAVE_STRLCPY - -/* Define if you have the strlcpy prototype */ -#undef HAVE_STRLCPY_PROTO - -/* Define to 1 if you have the <sys/bitypes.h> header file. */ -#undef HAVE_SYS_BITYPES_H - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the <sys/types.h> header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the <unistd.h> header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you have the `vsnprintf' function. */ -#undef HAVE_VSNPRINTF - -/* Suffix for lib directories */ -#undef KDELIBSUFF - -/* Define a safe value for MAXPATHLEN */ -#undef KDEMAXPATHLEN - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* The size of `char *', as computed by sizeof. */ -#undef SIZEOF_CHAR_P - -/* The size of `int', as computed by sizeof. */ -#undef SIZEOF_INT - -/* The size of `long', as computed by sizeof. */ -#undef SIZEOF_LONG - -/* The size of `short', as computed by sizeof. */ -#undef SIZEOF_SHORT - -/* The size of `size_t', as computed by sizeof. */ -#undef SIZEOF_SIZE_T - -/* The size of `unsigned long', as computed by sizeof. */ -#undef SIZEOF_UNSIGNED_LONG - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Version number of package */ -#undef VERSION - -/* Defined if compiling without arts */ -#undef WITHOUT_ARTS - -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel). */ -#if defined AC_APPLE_UNIVERSAL_BUILD -# if defined __BIG_ENDIAN__ -# define WORDS_BIGENDIAN 1 -# endif -#else -# ifndef WORDS_BIGENDIAN -# undef WORDS_BIGENDIAN -# endif -#endif - -/* - * jpeg.h needs HAVE_BOOLEAN, when the system uses boolean in system - * headers and I'm too lazy to write a configure test as long as only - * unixware is related - */ -#ifdef _UNIXWARE -#define HAVE_BOOLEAN -#endif - - - -/* - * AIX defines FD_SET in terms of bzero, but fails to include <strings.h> - * that defines bzero. - */ - -#if defined(_AIX) -#include <strings.h> -#endif - - - -#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H) -# include <sys/time.h> -# include <crt_externs.h> -# define environ (*_NSGetEnviron()) -#endif - - - -#if !defined(HAVE_RES_INIT_PROTO) -#ifdef __cplusplus -extern "C" { -#endif -int res_init(void); -#ifdef __cplusplus -} -#endif -#endif - - - -#if !defined(HAVE_STRLCAT_PROTO) -#ifdef __cplusplus -extern "C" { -#endif -unsigned long strlcat(char*, const char*, unsigned long); -#ifdef __cplusplus -} -#endif -#endif - - - -#if !defined(HAVE_STRLCPY_PROTO) -#ifdef __cplusplus -extern "C" { -#endif -unsigned long strlcpy(char*, const char*, unsigned long); -#ifdef __cplusplus -} -#endif -#endif - - - -/* - * On HP-UX, the declaration of vsnprintf() is needed every time ! - */ - -#if !defined(HAVE_VSNPRINTF) || defined(hpux) -#if __STDC__ -#include <stdarg.h> -#include <stdlib.h> -#else -#include <varargs.h> -#endif -#ifdef __cplusplus -extern "C" -#endif -int vsnprintf(char *str, size_t n, char const *fmt, va_list ap); -#ifdef __cplusplus -extern "C" -#endif -int snprintf(char *str, size_t n, char const *fmt, ...); -#endif - - - -#if defined(__SVR4) && !defined(__svr4__) -#define __svr4__ 1 -#endif - - -/* type to use in place of socklen_t if not defined */ -#undef kde_socklen_t - -/* type to use in place of socklen_t if not defined (deprecated, use - kde_socklen_t) */ -#undef ksize_t diff --git a/configure.in.in b/configure.in.in deleted file mode 100644 index afebcb0..0000000 --- a/configure.in.in +++ /dev/null @@ -1,155 +0,0 @@ -#MIN_CONFIG(3.2.0) - -AM_INIT_AUTOMAKE(tdegtk3, 0.1) -AC_C_BIGENDIAN -AC_CHECK_KDEMAXPATHLEN - -# C support -AM_PROG_CC_C_O - -# --- Cairo check --- - -KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ - AC_MSG_WARN([Could not find pkg-config]) -]) - -AC_MSG_CHECKING([for Cairo]) - -if test -n "$PKGCONFIG"; then - vers=`$PKGCONFIG cairo --modversion 2>/dev/null` - if test -n "$vers" - then - CAIRO_LIBS="`$PKGCONFIG cairo --libs`" - CAIRO_RPATH= - for args in $CAIRO_LIBS; do - case $args in - -L*) - CAIRO_RPATH="$CAIRO_RPATH $args" - ;; - esac - done - CAIRO_RPATH=`echo $CAIRO_RPATH | $SED -e "s/-L/-R/g"` - CAIRO_CFLAGS="`$PKGCONFIG cairo --cflags`" - - AC_DEFINE_UNQUOTED(HAVE_CAIRO, 1, [Defines if your system has the Cairo library]) - fi -fi - -if test ! "$USE_RPATH" = "yes"; then - CAIRO_RPATH= -fi - -if test -n "$CAIRO_LIBS" -then - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([not found]) -fi - -AC_SUBST(CAIRO_LIBS) -AC_SUBST(CAIRO_CFLAGS) -AC_SUBST(CAIRO_RPATH) - -AM_CONDITIONAL(have_openexr, test -n "$CAIRO_LIBS") - -# --- End of Cairo check --- - -# --- GTK3 check --- - -KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ - AC_MSG_WARN([Could not find pkg-config]) -]) - -AC_MSG_CHECKING([for GTK3]) - -if test -n "$PKGCONFIG"; then - vers=`$PKGCONFIG gtk+-3.0 --modversion 2>/dev/null` - if test -n "$vers" - then - GTK3_LIBS="`$PKGCONFIG gtk+-3.0 --libs`" - GTK3_RPATH= - for args in $GTK3_LIBS; do - case $args in - -L*) - GTK3_RPATH="$GTK3_RPATH $args" - ;; - esac - done - GTK3_RPATH=`echo $GTK3_RPATH | $SED -e "s/-L/-R/g"` - GTK3_CFLAGS="`$PKGCONFIG gtk+-3.0 --cflags`" - GTK3_PREFIX=`$PKG_CONFIG --variable=prefix gtk+-3.0` - GTK3_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0` - GTK3_LIBDIR=`$PKG_CONFIG --variable=libdir gtk+-3.0` - - AC_DEFINE_UNQUOTED(HAVE_GTK3, 1, [Defines if your system has the GTK3 library]) - fi -fi - -if test ! "$USE_RPATH" = "yes"; then - GTK3_RPATH= -fi - -if test -n "$GTK3_LIBS" -then - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([not found]) -fi - -AC_SUBST(GTK3_LIBS) -AC_SUBST(GTK3_CFLAGS) -AC_SUBST(GTK3_RPATH) -AC_SUBST(GTK3_PREFIX) -AC_SUBST(GTK3_LIBDIR) -AC_SUBST(GTK3_VERSION) - -AM_CONDITIONAL(have_openexr, test -n "$GTK3_LIBS") - -# --- End of GTK3 check --- - -# --- Pango check --- - -KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ - AC_MSG_WARN([Could not find pkg-config]) -]) - -AC_MSG_CHECKING([for Pango]) - -if test -n "$PKGCONFIG"; then - vers=`$PKGCONFIG pango --modversion 2>/dev/null` - if test -n "$vers" - then - PANGO_LIBS="`$PKGCONFIG pango --libs`" - PANGO_RPATH= - for args in $PANGO_LIBS; do - case $args in - -L*) - PANGO_RPATH="$PANGO_RPATH $args" - ;; - esac - done - PANGO_RPATH=`echo $PANGO_RPATH | $SED -e "s/-L/-R/g"` - PANGO_CFLAGS="`$PKGCONFIG pango --cflags`" - - AC_DEFINE_UNQUOTED(HAVE_PANGO, 1, [Defines if your system has the Pango library]) - fi -fi - -if test ! "$USE_RPATH" = "yes"; then - PANGO_RPATH= -fi - -if test -n "$PANGO_LIBS" -then - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([not found]) -fi - -AC_SUBST(PANGO_LIBS) -AC_SUBST(PANGO_CFLAGS) -AC_SUBST(PANGO_RPATH) - -AM_CONDITIONAL(have_openexr, test -n "$PANGO_LIBS") - -# --- End of Pango check --- diff --git a/po/Makefile.in b/po/Makefile.in deleted file mode 100644 index cc8a222..0000000 --- a/po/Makefile.in +++ /dev/null @@ -1,217 +0,0 @@ -# Makefile for program source directory in GNU NLS utilities package. -# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu> -# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com> -# -# This file may be copied and used freely without restrictions. It may -# be used in projects which are not available under a GNU Public License, -# but which still want to provide support for the GNU gettext functionality. -# -# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE -# instead of PACKAGE and to look for po2tbl in ./ not in intl/ -# -# - Modified by jacob berkman <jacob@ximian.com> to install -# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize -# -# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool -# -# We have the following line for use by intltoolize: -# INTLTOOL_MAKEFILE - -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -PACKAGE = @PACKAGE@ -VERSION = @VERSION@ - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = @top_builddir@ -VPATH = @srcdir@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -datadir = @datadir@ -datarootdir = @datarootdir@ -libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale -subdir = po -install_sh = @install_sh@ -# Automake >= 1.8 provides @mkdir_p@. -# Until it can be supposed, use the safe fallback: -mkdir_p = $(install_sh) -d - -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ - -GMSGFMT = @GMSGFMT@ -MSGFMT = @MSGFMT@ -XGETTEXT = @XGETTEXT@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot - -ALL_LINGUAS = @ALL_LINGUAS@ - -PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) - -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi) - -USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) - -POFILES=$(shell LINGUAS="$(PO_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) - -DISTFILES = Makefile.in.in POTFILES.in $(POFILES) -EXTRA_DISTFILES = ChangeLog POTFILES.skip Makevars LINGUAS - -POTFILES = \ -# This comment gets stripped out - -CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) - -.SUFFIXES: -.SUFFIXES: .po .pox .gmo .mo .msg .cat - -.po.pox: - $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox - -.po.mo: - $(MSGFMT) -o $@ $< - -.po.gmo: - file=`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) -o $$file $< - -.po.cat: - sed -f ../intl/po2msg.sed < $< > $*.msg \ - && rm -f $@ && gencat $@ $*.msg - - -all: all-@USE_NLS@ - -all-yes: $(CATALOGS) -all-no: - -$(GETTEXT_PACKAGE).pot: $(POTFILES) - $(GENPOT) - -install: install-data -install-data: install-data-@USE_NLS@ -install-data-no: all -install-data-yes: all - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ - $(mkdir_p) $$dir; \ - if test -r $$lang.gmo; then \ - $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ - else \ - $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ - echo "installing $(srcdir)/$$lang.gmo as" \ - "$$dir/$(GETTEXT_PACKAGE).mo"; \ - fi; \ - if test -r $$lang.gmo.m; then \ - $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ - else \ - if test -r $(srcdir)/$$lang.gmo.m ; then \ - $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ - $$dir/$(GETTEXT_PACKAGE).mo.m; \ - echo "installing $(srcdir)/$$lang.gmo.m as" \ - "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ - else \ - true; \ - fi; \ - fi; \ - done - -# Empty stubs to satisfy archaic automake needs -dvi info ctags tags CTAGS TAGS ID: - -# Define this as empty until I found a useful application. -install-exec installcheck: - -uninstall: - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ - done - -check: all $(GETTEXT_PACKAGE).pot - rm -f missing notexist - srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m - if [ -r missing -o -r notexist ]; then \ - exit 1; \ - fi - -mostlyclean: - rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp - rm -f .intltool-merge-cache - -clean: mostlyclean - -distclean: clean - rm -f Makefile Makefile.in POTFILES stamp-it - rm -f *.mo *.msg *.cat *.cat.m *.gmo - -maintainer-clean: distclean - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - rm -f Makefile.in.in - -distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: $(DISTFILES) - dists="$(DISTFILES)"; \ - extra_dists="$(EXTRA_DISTFILES)"; \ - for file in $$extra_dists; do \ - test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ - done; \ - for file in $$dists; do \ - test -f $$file || file="$(srcdir)/$$file"; \ - ln $$file $(distdir) 2> /dev/null \ - || cp -p $$file $(distdir); \ - done - -update-po: Makefile - $(MAKE) $(GETTEXT_PACKAGE).pot - tmpdir=`pwd`; \ - linguas="$(USE_LINGUAS)"; \ - for lang in $$linguas; do \ - echo "$$lang:"; \ - result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ - if $$result; then \ - if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ - rm -f $$tmpdir/$$lang.new.po; \ - else \ - if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ - :; \ - else \ - echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ - rm -f $$tmpdir/$$lang.new.po; \ - exit 1; \ - fi; \ - fi; \ - else \ - echo "msgmerge for $$lang.gmo failed!"; \ - rm -f $$tmpdir/$$lang.new.po; \ - fi; \ - done - -Makefile POTFILES: stamp-it - @if test ! -f $@; then \ - rm -f stamp-it; \ - $(MAKE) stamp-it; \ - fi - -stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ - $(SHELL) ./config.status - -# Tell versions [3.59,3.63) of GNU make not to export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/rc/CMakeLists.txt b/rc/CMakeLists.txt new file mode 100644 index 0000000..d6182ff --- /dev/null +++ b/rc/CMakeLists.txt @@ -0,0 +1,7 @@ + +##### other data + +install( + FILES gtk.css + DESTINATION ${GTK3_PREFIX}/share/themes/tdegtk/gtk-3.0 +) diff --git a/rc/Makefile.am b/rc/Makefile.am deleted file mode 100644 index 23a4fc3..0000000 --- a/rc/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -styleconfdir=$(GTK3_PREFIX)/share/themes/tdegtk/gtk-3.0 -styleconf_DATA = gtk.css diff --git a/tdegtk/CMakeLists.txt b/tdegtk/CMakeLists.txt new file mode 100644 index 0000000..0737888 --- /dev/null +++ b/tdegtk/CMakeLists.txt @@ -0,0 +1,69 @@ +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CAIRO_INCLUDE_DIRS} + ${GTK3_INCLUDE_DIRS} + ${PANGO_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} + ${CAIRO_LIBARY_DIRS} + ${GTK3_LIBRARY_DIRS} + ${PANGO_LIBRARY_DIRS} +) + + +##### tqtcairo (shared) + +tde_add_library( tqtcairo SHARED AUTOMOC + + SOURCES + tqtcairopainter.cpp + + LINK + tdeui-shared + ${GLADE_LIBRARIES} + ${GTK3_LIBRARIES} + + VERSION 0.0.0 + + DESTINATION ${LIB_INSTALL_DIR} +) + + +##### tdegtk (shared) + +tde_add_library( tdegtk SHARED AUTOMOC + + SOURCES + exponential-blur.c + gtkroundedbox.c + tdegtk-cairo-support.c + tdegtk-draw.cpp + tdegtk-engine.c + tdegtk-support.c + tdegtk-hooks.cpp + tdegtk-signals.cpp + tdegtk-widgetlookup.cpp + tdegtk-utils.cpp + tdegtk-tabwidgetdata.cpp + tdegtk-animations.cpp + tdegtk-baseengine.cpp + tdegtk-theme.cpp + + LINK + tdecore-shared + tdeui-shared + tqtcairo-shared + ${GLADE_LIBRARIES} + ${GTK3_LIBRARIES} + + VERSION 0.0.0 + + DESTINATION ${GTK3_LIBDIR}/gtk-3.0/${GTK3_BIN_VERSION}/theming-engines +) diff --git a/tdegtk/Makefile.am b/tdegtk/Makefile.am deleted file mode 100644 index abc1c82..0000000 --- a/tdegtk/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -INCLUDES= $(all_includes) $(KDE_INCLUDES)/tde - -source_h = \ - $(srcdir)/tdegtk.h \ - $(srcdir)/exponential-blur.h \ - $(srcdir)/gtkroundedboxprivate.h \ - $(srcdir)/tdegtk-cairo-support.h \ - $(srcdir)/tdegtk-draw.h \ - $(srcdir)/tdegtk-engine.h \ - $(srcdir)/tdegtk-support.h \ - $(srcdir)/tdegtk-hooks.h \ - $(srcdir)/tdegtk-signals.h \ - $(srcdir)/tdegtk-widgetlookup.h \ - $(srcdir)/tdegtk-utils.h \ - $(srcdir)/tdegtk-tabwidgetdata.h \ - $(srcdir)/tdegtk-animations.h \ - $(srcdir)/tdegtk-datamap.h \ - $(srcdir)/tdegtk-baseengine.h \ - $(srcdir)/tdegtk-genericengine.h \ - $(srcdir)/tdegtk-tabwidgetengine.h \ - $(srcdir)/tdegtk-types.h - -source_c = \ - $(srcdir)/exponential-blur.c \ - $(srcdir)/gtkroundedbox.c \ - $(srcdir)/tdegtk-cairo-support.c \ - $(srcdir)/tdegtk-draw.cpp \ - $(srcdir)/tdegtk-engine.c \ - $(srcdir)/tdegtk-support.c \ - $(srcdir)/tdegtk-hooks.cpp \ - $(srcdir)/tdegtk-signals.cpp \ - $(srcdir)/tdegtk-widgetlookup.cpp \ - $(srcdir)/tdegtk-utils.cpp \ - $(srcdir)/tdegtk-tabwidgetdata.cpp \ - $(srcdir)/tdegtk-animations.cpp \ - $(srcdir)/tdegtk-baseengine.cpp \ - $(srcdir)/tdegtk-theme.cpp - -enginedir = $(GTK3_LIBDIR)/gtk-3.0/$(GTK3_VERSION)/theming-engines -engine_LTLIBRARIES = libtdegtk.la - -libtdegtk_la_SOURCES = $(source_h) $(source_c) - -libtdegtk_la_CFLAGS = $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) -libtdegtk_la_CXXFLAGS = $(KDE_CXXFLAGS) $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) - -libtdegtk_la_LIBADD = $(KDE_LIBADD) libtqtcairo.la $(all_libraries) $(CAIRO_LIBS) $(GTK3_LIBS) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) - -libtdegtk_la_LDFLAGS = $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS) - -lib_LTLIBRARIES = libtqtcairo.la - -libtqtcairo_la_SOURCES = tqtcairopainter.h tqtcairopainter.cpp - -libtqtcairo_la_CFLAGS = $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) -libtqtcairo_la_CXXFLAGS = $(KDE_CXXFLAGS) $(KDE_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) - -libtqtcairo_la_LIBADD = $(KDE_LIBADD) $(LIB_TQT) $(LIB_TDEUI) - -libtqtcairo_la_LDFLAGS = $(KDE_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS) diff --git a/tdegtk/tdegtk-draw.cpp b/tdegtk/tdegtk-draw.cpp index 33cd63b..28c6987 100644 --- a/tdegtk/tdegtk-draw.cpp +++ b/tdegtk/tdegtk-draw.cpp @@ -477,7 +477,7 @@ draw_combobox_frame(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, G TQPainter p(&pd); TQStringList objectTypes; - objectTypes.append(TQCOMBOBOX_OBJECT_NAME_STRING); + objectTypes.append("TQComboBox"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -520,7 +520,7 @@ draw_progressbar_frame(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state TQPainter p(&pd); TQStringList objectTypes; - objectTypes.append(TQPROGRESSBAR_OBJECT_NAME_STRING); + objectTypes.append("TQProgressBar"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -610,7 +610,7 @@ draw_slider_frame(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, Gtk GtkScale* scaleWidget = GTK_SCALE(widget); TQStringList objectTypes; - objectTypes.append(TQSLIDER_OBJECT_NAME_STRING); + objectTypes.append("TQSlider"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -669,7 +669,7 @@ draw_scrollbar_frame(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, GtkScrollbar* scrollbarWidget = GTK_SCROLLBAR(widget); TQStringList objectTypes; - objectTypes.append(TQSLIDER_OBJECT_NAME_STRING); + objectTypes.append("TQSlider"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -812,7 +812,7 @@ draw_scrollbar_frame(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, static void draw_checkbox(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, GtkWidget* widget, TQt3WidgetType tqt3WidgetType) { TQStringList objectTypes; - objectTypes.append(TQCHECKBOX_OBJECT_NAME_STRING); + objectTypes.append("TQCheckBox"); TQPalette objectPalette = tqApp->palette(objectTypes); TQRect boundingRect(0, 0, width, height); @@ -835,7 +835,7 @@ draw_checkbox(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, GtkWidg static void draw_radiobutton(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, GtkWidget* widget, TQt3WidgetType tqt3WidgetType) { TQStringList objectTypes; - objectTypes.append(TQCHECKBOX_OBJECT_NAME_STRING); + objectTypes.append("TQCheckBox"); TQPalette objectPalette = tqApp->palette(objectTypes); TQRect boundingRect(0, 0, width, height); @@ -858,7 +858,7 @@ draw_radiobutton(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, GtkW static void draw_pushbutton(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, GtkWidget* widget, TQt3WidgetType tqt3WidgetType) { TQStringList objectTypes; - objectTypes.append(TQCHECKBOX_OBJECT_NAME_STRING); + objectTypes.append("TQCheckBox"); TQPalette objectPalette = tqApp->palette(objectTypes); TQRect boundingRect(0, 0, width, height); @@ -886,7 +886,7 @@ draw_toolbar_button(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, G bool mousedown = (state & GTK_STATE_FLAG_ACTIVE) != 0; TQStringList objectTypes; - objectTypes.append(TQTOOLBUTTON_OBJECT_NAME_STRING); + objectTypes.append("TQToolButton"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -904,7 +904,7 @@ draw_toolbar_button(DRAW_ARGS, const GtkWidgetPath* path, GtkStateFlags state, G GtkWidget* parent = (widget)?Gtk::gtk_widget_find_parent(widget, GTK_TYPE_TOOLBAR):0L; if (parent) { TQStringList parentObjectTypes; - parentObjectTypes.append(TQTOOLBAR_OBJECT_NAME_STRING); + parentObjectTypes.append("TQToolBar"); TQPalette parentObjectPalette = tqApp->palette(parentObjectTypes); const GtkAllocation allocation = Gtk::gtk_widget_get_allocation(parent); @@ -983,7 +983,7 @@ tdegtk_draw_activity (DRAW_ARGS) if (gtk_widget_path_is_type(path, GTK_TYPE_PROGRESS_BAR)) { #if 0 TQStringList objectTypes; - objectTypes.append(TQPROGRESSBAR_OBJECT_NAME_STRING); + objectTypes.append("TQProgressBar"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -1062,7 +1062,7 @@ tdegtk_draw_arrow (GtkThemingEngine *engine, if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_SCROLLBAR)) { #ifdef DRAW_SCROLLBAR_PIECES_INSTEAD_OF_ENTIRE_BAR TQStringList objectTypes; - objectTypes.append(TQSCROLLBAR_OBJECT_NAME_STRING); + objectTypes.append("TQScrollBar"); TQPalette objectPalette = tqApp->palette(objectTypes); GtkRange* rangeWidget = GTK_RANGE(widget); @@ -1162,12 +1162,12 @@ tdegtk_draw_arrow (GtkThemingEngine *engine, TQt3WidgetType tqt3WidgetType = TQT3WT_NONE; TQStringList objectTypes; - objectTypes.append(TQWIDGET_OBJECT_NAME_STRING); + objectTypes.append("TQWidget"); if ((gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENU)) || (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUITEM))) { GtkWidget* parent(widget?gtk_widget_get_parent(widget):0L); if (!GTK_IS_MENU_BAR(parent)) { objectTypes.clear(); - objectTypes.append(TQPOPUPMENU_OBJECT_NAME_STRING); + objectTypes.append("TQPopupMenu"); tqt3WidgetType = TQT3WT_TQMenuItem; } } @@ -1208,7 +1208,7 @@ tdegtk_draw_cell_background (DRAW_ARGS, if (gtk_widget_path_is_type(path, GTK_TYPE_TREE_VIEW)) { TQStringList objectTypes; - objectTypes.append(TQLISTVIEW_OBJECT_NAME_STRING); + objectTypes.append("TQListView"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -1262,7 +1262,7 @@ tdegtk_draw_cell_frame (DRAW_ARGS, if (gtk_widget_path_is_type(path, GTK_TYPE_TREE_VIEW)) { #if 0 TQStringList objectTypes; - objectTypes.append(TQLISTVIEW_OBJECT_NAME_STRING); + objectTypes.append("TQListView"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -1355,7 +1355,7 @@ tdegtk_draw_common_background (DRAW_ARGS) if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_SCROLLBAR)) { #ifdef DRAW_SCROLLBAR_PIECES_INSTEAD_OF_ENTIRE_BAR TQStringList objectTypes; - objectTypes.append(TQSCROLLBAR_OBJECT_NAME_STRING); + objectTypes.append("TQScrollBar"); TQPalette objectPalette = tqApp->palette(objectTypes); GtkRange* rangeWidget = GTK_RANGE(widget); @@ -1378,7 +1378,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (gtk_widget_path_is_type(path, GTK_TYPE_SCROLLED_WINDOW)) { if ((x == 0) && (y == 0)) { TQStringList objectTypes; - objectTypes.append(TQFRAME_OBJECT_NAME_STRING); + objectTypes.append("TQFrame"); TQPalette objectPalette = tqApp->palette(objectTypes); int groupBoxLineWidth = 1; @@ -1413,7 +1413,7 @@ tdegtk_draw_common_background (DRAW_ARGS) || (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_COMBOBOX_ENTRY)) ) { TQStringList objectTypes; - objectTypes.append(TQLINEEDIT_OBJECT_NAME_STRING); + objectTypes.append("TQLineEdit"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -1426,7 +1426,7 @@ tdegtk_draw_common_background (DRAW_ARGS) bool mousedown = (state & GTK_STATE_FLAG_ACTIVE) != 0; TQStringList objectTypes; - objectTypes.append(TQCOMBOBOX_OBJECT_NAME_STRING); + objectTypes.append("TQComboBox"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -1448,7 +1448,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (gtk_widget_path_is_type(path, GTK_TYPE_BUTTON)) { #if 0 TQStringList objectTypes; - objectTypes.append(TQBUTTON_OBJECT_NAME_STRING); + objectTypes.append("TQButton"); TQPalette objectPalette = tqApp->palette(objectTypes); if (Gtk::gtk_widget_path_has_type(path, GTK_TYPE_TOOLBAR)) { @@ -1471,7 +1471,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_TOOLBAR)) { TQStringList objectTypes; - objectTypes.append(TQTOOLBAR_OBJECT_NAME_STRING); + objectTypes.append("TQToolBar"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -1481,7 +1481,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENUBAR)) { TQStringList objectTypes; - objectTypes.append(TQMENUBAR_OBJECT_NAME_STRING); + objectTypes.append("TQMenuBar"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -1491,7 +1491,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_TOOLTIP)) { TQStringList objectTypes; - objectTypes.append(TQTIPLABEL_OBJECT_NAME_STRING); + objectTypes.append("TQTipLabel"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -1519,7 +1519,7 @@ tdegtk_draw_common_background (DRAW_ARGS) // bool selectedTab = (tabIndex==currentPage); TQStringList objectTypes; - objectTypes.append(TQPOPUPMENU_OBJECT_NAME_STRING); + objectTypes.append("TQPopupMenu"); TQPalette objectPalette = tqApp->palette(objectTypes); bool pressed = false; @@ -1550,7 +1550,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (gtk_widget_path_is_type(path, GTK_TYPE_NOTEBOOK)) { TQStringList objectTypes; - objectTypes.append(TQTABWIDGET_OBJECT_NAME_STRING); + objectTypes.append("TQTabWidget"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -1564,7 +1564,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (gtk_widget_path_is_type(path, GTK_TYPE_HANDLE_BOX)) { TQStringList objectTypes; - objectTypes.append(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING); + objectTypes.append("TQDockWindowHandle"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -1574,7 +1574,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_CELL)) { TQStringList objectTypes; - objectTypes.append(TQLISTVIEW_OBJECT_NAME_STRING); + objectTypes.append("TQListView"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -1602,7 +1602,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (gtk_widget_path_is_type(path, GTK_TYPE_LABEL)) { if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_FRAME)) { TQStringList objectTypes; - objectTypes.append(TQFRAME_OBJECT_NAME_STRING); + objectTypes.append("TQFrame"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -1620,7 +1620,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (gtk_widget_path_is_type(path, GTK_TYPE_SWITCH)) { TQStringList objectTypes; - objectTypes.append(TQSCROLLBAR_OBJECT_NAME_STRING); + objectTypes.append("TQScrollBar"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -1637,7 +1637,7 @@ tdegtk_draw_common_background (DRAW_ARGS) #ifdef GTK_TYPE_LEVEL_BAR else if (gtk_widget_path_is_type(path, GTK_TYPE_LEVEL_BAR)) { TQStringList objectTypes; - objectTypes.append(TQPROGRESSBAR_OBJECT_NAME_STRING); + objectTypes.append("TQProgressBar"); TQPalette objectPalette = tqApp->palette(objectTypes); if (gtk_theming_engine_has_class(engine, "fill-block")) { @@ -1675,7 +1675,7 @@ tdegtk_draw_common_background (DRAW_ARGS) else if (widgetThemingEnginePath.endsWith("GtkTreeView.view")) { TQStringList objectTypes; - objectTypes.append(TQLISTVIEW_OBJECT_NAME_STRING); + objectTypes.append("TQListView"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -1691,7 +1691,7 @@ tdegtk_draw_common_background (DRAW_ARGS) || (gtk_widget_path_is_type(path, GTK_TYPE_FRAME)) ) { TQStringList objectTypes; - objectTypes.append(TQWIDGET_OBJECT_NAME_STRING); + objectTypes.append("TQWidget"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -1727,7 +1727,7 @@ tdegtk_draw_common_frame (DRAW_ARGS) state = gtk_theming_engine_get_state(engine); widget = m_widgetLookup.find(cr, path); - TQString widgetPath(Gtk::gtk_widget_path(widget)); + TQString widgetPath(Gtk::gtk_widget_path(widget).c_str()); if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_SCROLLBAR)) { #ifdef DRAW_SCROLLBAR_PIECES_INSTEAD_OF_ENTIRE_BAR @@ -1736,7 +1736,7 @@ tdegtk_draw_common_frame (DRAW_ARGS) } else { TQStringList objectTypes; - objectTypes.append(TQSCROLLBAR_OBJECT_NAME_STRING); + objectTypes.append("TQScrollBar"); TQPalette objectPalette = tqApp->palette(objectTypes); GtkRange* rangeWidget = GTK_RANGE(widget); @@ -1791,7 +1791,7 @@ tdegtk_draw_common_frame (DRAW_ARGS) GtkWidget* parent(widget?gtk_widget_get_parent(widget):0L); if (GTK_IS_MENU_BAR(parent)) { TQStringList objectTypes; - objectTypes.append(TQMENUBAR_OBJECT_NAME_STRING); + objectTypes.append("TQMenuBar"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -1820,7 +1820,7 @@ tdegtk_draw_common_frame (DRAW_ARGS) // Certain styles (highcolor) paint over the color swatches if this is enabled, rendering the picker useless else if (widgetPath.endsWith(".GtkColorSwatch")) { TQStringList objectTypes; - objectTypes.append(TQLINEEDIT_OBJECT_NAME_STRING); + objectTypes.append("TQLineEdit"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw frame @@ -1835,7 +1835,7 @@ tdegtk_draw_common_frame (DRAW_ARGS) else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_ENTRY)) { TQStringList objectTypes; - objectTypes.append(TQLINEEDIT_OBJECT_NAME_STRING); + objectTypes.append("TQLineEdit"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw frame @@ -1866,7 +1866,7 @@ tdegtk_draw_common_frame (DRAW_ARGS) else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_MENU)) { TQStringList objectTypes; - objectTypes.append(TQPOPUPMENU_OBJECT_NAME_STRING); + objectTypes.append("TQPopupMenu"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -1881,7 +1881,7 @@ tdegtk_draw_common_frame (DRAW_ARGS) else if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_TOOLTIP)) { TQStringList objectTypes; - objectTypes.append(TQTOOLTIP_OBJECT_NAME_STRING); + objectTypes.append("TQToolTip"); TQPalette objectPalette = tqApp->palette(objectTypes); int groupBoxLineWidth = 1; @@ -1921,7 +1921,7 @@ tdegtk_draw_common_frame (DRAW_ARGS) TQPainter p2(&pd2); TQStringList objectTypes; - objectTypes.append(TQPROGRESSBAR_OBJECT_NAME_STRING); + objectTypes.append("TQProgressBar"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -2059,7 +2059,7 @@ tdegtk_draw_extension (DRAW_ARGS, bool selectedTab = (tabIndex==currentPage); TQStringList objectTypes; - objectTypes.append(TQTABBAR_OBJECT_NAME_STRING); + objectTypes.append("TQTabBar"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -2072,7 +2072,7 @@ tdegtk_draw_extension (DRAW_ARGS, TQStyleOption tabOpt(&tqt3Tab, (prelight)?&tqt3Tab:(TQTab*)NULL); elementFlags = elementFlags | TQStyle::CEF_HasParentWidget; - ceData.parentWidgetData.widgetObjectTypes.append(TQTABBAR_OBJECT_NAME_STRING); + ceData.parentWidgetData.widgetObjectTypes.append("TQTabBar"); int tab_overlap = tqApp->style().pixelMetric(TQStyle::PM_TabBarTabOverlap); int tab_to_frame_gap_height = 2; @@ -2191,16 +2191,16 @@ tdegtk_draw_focus (DRAW_ARGS) || (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_ENTRY)) || (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_COMBOBOX_ENTRY)) ) { - objectTypes.append(TQLINEEDIT_OBJECT_NAME_STRING); + objectTypes.append("TQLineEdit"); } else if (gtk_widget_path_is_type(path, GTK_TYPE_TREE_VIEW)) { - objectTypes.append(TQLISTVIEW_OBJECT_NAME_STRING); + objectTypes.append("TQListView"); } else if (gtk_widget_path_is_type(path, GTK_TYPE_BUTTON)) { - objectTypes.append(TQPUSHBUTTON_OBJECT_NAME_STRING); + objectTypes.append("TQPushButton"); } else { - objectTypes.append(TQWIDGET_OBJECT_NAME_STRING); + objectTypes.append("TQWidget"); } TQPalette objectPalette = tqApp->palette(objectTypes); @@ -2219,7 +2219,7 @@ tdegtk_draw_focus (DRAW_ARGS) if (gtk_widget_path_is_type(path, GTK_TYPE_BUTTON)) { TQStringList objectTypes; - objectTypes.append(TQBUTTON_OBJECT_NAME_STRING); + objectTypes.append("TQButton"); ceData.widgetObjectTypes = objectTypes; ceData.rect = boundingRect; @@ -2272,7 +2272,7 @@ tdegtk_draw_frame_gap (DRAW_ARGS, GtkShadowType gtkShadowType = gtk_frame_get_shadow_type(frame); TQStringList objectTypes; - objectTypes.append(TQGROUPBOX_OBJECT_NAME_STRING); + objectTypes.append("TQGroupBox"); TQPalette objectPalette = tqApp->palette(objectTypes); int groupBoxLineWidth = 1; @@ -2343,7 +2343,7 @@ tdegtk_draw_grip (DRAW_ARGS) widget = m_widgetLookup.find(cr, path); TQStringList objectTypes; - objectTypes.append(TQSTATUSBAR_OBJECT_NAME_STRING); + objectTypes.append("TQStatusBar"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -2378,7 +2378,7 @@ tdegtk_draw_handle (DRAW_ARGS) if (gtk_widget_path_is_type(path, GTK_TYPE_HANDLE_BOX)) { TQStringList objectTypes; - objectTypes.append(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING); + objectTypes.append("TQDockWindowHandle"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw handle @@ -2387,7 +2387,7 @@ tdegtk_draw_handle (DRAW_ARGS) else if (gtk_widget_path_is_type(path, GTK_TYPE_PANED)) { TQStringList objectTypes; - objectTypes.append(TQSPLITTER_OBJECT_NAME_STRING); + objectTypes.append("TQSplitter"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw handle @@ -2453,7 +2453,7 @@ tdegtk_draw_notebook (DRAW_ARGS, if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_NOTEBOOK)) { TQStringList objectTypes; - objectTypes.append(TQTABWIDGET_OBJECT_NAME_STRING); + objectTypes.append("TQTabWidget"); TQPalette objectPalette = tqApp->palette(objectTypes); // Draw background @@ -2498,7 +2498,7 @@ tdegtk_draw_radio (DRAW_ARGS) int maxIconWidth = IconSize(TDEIcon::Small) + 4; TQStringList objectTypes; - objectTypes.append(TQPOPUPMENU_OBJECT_NAME_STRING); + objectTypes.append("TQPopupMenu"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -2541,7 +2541,7 @@ tdegtk_draw_separator (DRAW_ARGS) if (gtk_widget_path_is_type(path, GTK_TYPE_SEPARATOR_MENU_ITEM)) { TQStringList objectTypes; - objectTypes.append(TQPOPUPMENU_OBJECT_NAME_STRING); + objectTypes.append("TQPopupMenu"); TQPalette objectPalette = tqApp->palette(objectTypes); bool pressed = false; @@ -2631,7 +2631,7 @@ tdegtk_draw_slider (DRAW_ARGS, if (gtk_theming_engine_has_class(engine, GTK_STYLE_CLASS_SCROLLBAR)) { #ifdef DRAW_SCROLLBAR_PIECES_INSTEAD_OF_ENTIRE_BAR TQStringList objectTypes; - objectTypes.append(TQSCROLLBAR_OBJECT_NAME_STRING); + objectTypes.append("TQScrollBar"); TQPalette objectPalette = tqApp->palette(objectTypes); GtkRange* rangeWidget = GTK_RANGE(widget); @@ -2666,7 +2666,7 @@ tdegtk_draw_slider (DRAW_ARGS, else if (gtk_widget_path_is_type(path, GTK_TYPE_SWITCH)) { TQStringList objectTypes; - objectTypes.append(TQSCROLLBAR_OBJECT_NAME_STRING); + objectTypes.append("TQScrollBar"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; diff --git a/tdegtk/tdegtk-tabwidgetdata.h b/tdegtk/tdegtk-tabwidgetdata.h index e7284bf..fb2a243 100644 --- a/tdegtk/tdegtk-tabwidgetdata.h +++ b/tdegtk/tdegtk-tabwidgetdata.h @@ -1,5 +1,5 @@ #ifndef tdegtk_tabwidgetdata_h -#define tdegtk_widgetdata_h +#define tdegtk_tabwidgetdata_h /* * this file was largely taken from the oxygen gtk engine * Copyright (c) 2010 Hugo Pereira Da Costa <hugo@oxygen-icons.org> diff --git a/tdegtk/tdegtk-theme.cpp b/tdegtk/tdegtk-theme.cpp index b99c485..60df928 100644 --- a/tdegtk/tdegtk-theme.cpp +++ b/tdegtk/tdegtk-theme.cpp @@ -47,23 +47,25 @@ bool m_scrollbarForward1 = false; bool m_scrollbarBack2 = false; bool m_scrollbarForward2 = false; +#include <gmodule.h> +#include <kdemacros.h> + extern "C" { - #include <gmodule.h> #include <gtk/gtk.h> #include "tdegtk-engine.h" - G_MODULE_EXPORT void theme_init(GTypeModule *module); + KDE_EXPORT void theme_init(GTypeModule *module); - G_MODULE_EXPORT void theme_exit(void); + KDE_EXPORT void theme_exit(void); - G_MODULE_EXPORT GtkThemingEngine* create_engine(void); + KDE_EXPORT GtkThemingEngine* create_engine(void); - G_MODULE_EXPORT void theme_init(GTypeModule *module) { + KDE_EXPORT void theme_init(GTypeModule *module) { tdegtk_engine_register_types(module); } - G_MODULE_EXPORT void theme_exit(void) { + KDE_EXPORT void theme_exit(void) { // } } @@ -199,7 +201,7 @@ TQString tdeFindDir(const TQString& suffix, const TQString& file1, const TQStrin } TQString runCommand(const TQString& command) { - FILE* p = popen(command.latin1(), "r"); + FILE* p = popen(command.local8Bit(), "r"); if (p == NULL) { return TQString(); } @@ -343,7 +345,7 @@ GtkIconSet* generateIconSet(const std::string& gtkIconName, const std::string& t // loop over provided path to see if at least one icon is found for (TQStringList::const_iterator pathIter = pathList.begin(); pathIter != pathList.end(); ++pathIter) { - std::string filename((*pathIter + '/' + iconFileStream.str()).latin1()); + std::string filename((*pathIter + '/' + iconFileStream.str().c_str()).local8Bit()); if (!std::ifstream(filename.c_str())) { continue; } @@ -409,7 +411,7 @@ void setColour(TQString name, TQString state, TQColor color, TQString widgetType if (state == ":normal") { state = ""; } - gtk3_tqt_load_resource_string(parse_rc_string(name + ": " + colorString(color), widgetTypes + state).latin1()); + gtk3_tqt_load_resource_string(parse_rc_string(name + ": " + colorString(color), widgetTypes + state).local8Bit()); } static TQStringList iconInheritsDirs(const TQString& icondir) { @@ -494,7 +496,7 @@ void writeGtkThemeControlFile(int forceRecreate) { // Menu items { TQStringList objectTypes; - objectTypes.append(TQPOPUPMENU_OBJECT_NAME_STRING); + objectTypes.append("TQPopupMenu"); TQPalette objectPalette = tqApp->palette(objectTypes); setColour("color", "hover:insensitive", objectPalette.color(TQPalette::Disabled, TQColorGroup::Text), "GtkMenu>GtkMenuItem"); // setColour("color", "hover:normal", objectPalette.color(TQPalette::Active, TQColorGroup::HighlightedText), "GtkMenu>GtkMenuItem"); @@ -749,13 +751,13 @@ void writeGtkThemeControlFile(int forceRecreate) { if (!forceRecreate && themeFile.exists()) { themeFile.open(IO_ReadOnly); - stream.setDevice(TQT_TQIODEVICE(&themeFile)); + stream.setDevice(&themeFile); if (stream.readLine() == "/* " + iconTheme + ", " + tqApp->style().name() + ", " + RC_CACHE_VERSION + ", " + __DATE__ + ", " + __TIME__ + " */") { // This cache matches the current icon theme and style themeFile.close(); - gtk3_tqt_reload_theme_definition_file(themeFilePath.latin1()); + gtk3_tqt_reload_theme_definition_file(themeFilePath.local8Bit()); return; } @@ -765,11 +767,11 @@ void writeGtkThemeControlFile(int forceRecreate) { if (gtk3TQtDebug) { // Load possibly modified theme control file before writing a new one - gtk3_tqt_reload_theme_definition_file(themeFilePath.latin1()); + gtk3_tqt_reload_theme_definition_file(themeFilePath.local8Bit()); } themeFile.open(IO_WriteOnly | IO_Truncate); - stream.setDevice(TQT_TQIODEVICE(&themeFile)); + stream.setDevice(&themeFile); stream << "/* " << iconTheme << ", " << tqApp->style().name() << ", " << RC_CACHE_VERSION << ", " << __DATE__ << ", " << __TIME__ << " */\n\n"; stream << "/* This file was generated by the Gtk TQt Theme Engine */\n"; @@ -907,7 +909,7 @@ void writeGtkThemeControlFile(int forceRecreate) { probeRect = TQRect(0, 0, 100, 100); TQStringList objectTypes; - objectTypes.append(TQCOMBOBOX_OBJECT_NAME_STRING); + objectTypes.append("TQComboBox"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -954,7 +956,7 @@ void writeGtkThemeControlFile(int forceRecreate) { // See upstream GTK bug #687363 { TQStringList objectTypes; - objectTypes.append(TQTEXTEDIT_OBJECT_NAME_STRING); + objectTypes.append("TQTextEdit"); TQPalette objectPalette = tqApp->palette(objectTypes); // stream << parse_rc_string("background-color: " + colorString(objectPalette.color(TQPalette::Active, TQColorGroup::Base)), "GtkTextView"); // stream << parse_rc_string("background-color: " + colorString(objectPalette.color(TQPalette::Disabled, TQColorGroup::Base)), "GtkTextView:insensitive"); @@ -971,7 +973,7 @@ void writeGtkThemeControlFile(int forceRecreate) { int tdeMenuFrameWidth; { TQStringList objectTypes; - objectTypes.append(TQPOPUPMENU_OBJECT_NAME_STRING); + objectTypes.append("TQPopupMenu"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -1028,7 +1030,7 @@ void writeGtkThemeControlFile(int forceRecreate) { themeFile.close(); if (!gtk3TQtDebug) { - gtk3_tqt_reload_theme_definition_file(themeFilePath.latin1()); + gtk3_tqt_reload_theme_definition_file(themeFilePath.local8Bit()); } } // ========================================================================================================= diff --git a/tdegtk/tqtcairopainter.cpp b/tdegtk/tqtcairopainter.cpp index dac2c72..0a68d18 100644 --- a/tdegtk/tqtcairopainter.cpp +++ b/tdegtk/tqtcairopainter.cpp @@ -25,7 +25,6 @@ #include "tqtcairopainter.h" -#define TQT_NO_COMPAT_NAMES #include "tqpainter.h" #include "tqpixmap.h" #include "tqbitmap.h" @@ -62,7 +61,7 @@ inline int cairoPainterRectSubtraction(TQPen* pen) { } inline void standardAlphaToPremultipliedAlpha(unsigned char *a, unsigned char *r, unsigned char *g, unsigned char *b) { - register double alpha_adjust; + double alpha_adjust; alpha_adjust = (*a / 255.0); *r = char( *r * alpha_adjust ); @@ -72,7 +71,7 @@ inline void standardAlphaToPremultipliedAlpha(unsigned char *a, unsigned char *r } inline void premultipliedAlphaToStandardAlpha(unsigned char *a, unsigned char *r, unsigned char *g, unsigned char *b) { - register double alpha_adjust; + double alpha_adjust; alpha_adjust = (*a / 255.0); *r = char( *r / alpha_adjust ); @@ -180,9 +179,9 @@ void TQt3CairoPaintDevice::transferIntermediateSurface() { cairo_surface_flush(m_surface); cairo_surface_flush(m_intermediateSurface); updateSurfaceDimensions(); - register int height = m_height; - register int width = m_width; - register int stride = cairo_format_stride_for_width(cairo_image_surface_get_format(m_surface), width); + int height = m_height; + int width = m_width; + int stride = cairo_format_stride_for_width(cairo_image_surface_get_format(m_surface), width); cairo_surface_t *usableDeviceSurface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); cairo_t *copyPainter = cairo_create(usableDeviceSurface); cairo_set_source_surface(copyPainter, m_surface, 0, 0); @@ -192,21 +191,21 @@ void TQt3CairoPaintDevice::transferIntermediateSurface() { cairo_destroy(copyPainter); unsigned char* device_surface_data = cairo_image_surface_get_data(usableDeviceSurface); unsigned char* intermediate_surface_data = cairo_image_surface_get_data(m_intermediateSurface); - register int x; - register int y; - register long long offset; - register unsigned char devicePixel_a; - register unsigned char devicePixel_r; - register unsigned char devicePixel_g; - register unsigned char devicePixel_b; - register unsigned char intermediatePixel_a; - register unsigned char intermediatePixel_r; - register unsigned char intermediatePixel_g; - register unsigned char intermediatePixel_b; - register unsigned char combinedPixel_a; - register unsigned char combinedPixel_r; - register unsigned char combinedPixel_g; - register unsigned char combinedPixel_b; + int x; + int y; + long long offset; + unsigned char devicePixel_a; + unsigned char devicePixel_r; + unsigned char devicePixel_g; + unsigned char devicePixel_b; + unsigned char intermediatePixel_a; + unsigned char intermediatePixel_r; + unsigned char intermediatePixel_g; + unsigned char intermediatePixel_b; + unsigned char combinedPixel_a; + unsigned char combinedPixel_r; + unsigned char combinedPixel_g; + unsigned char combinedPixel_b; // Execute the desired raster operation // WARNING // This is VERY SLOW diff --git a/tdegtk/tqtcairopainter.h b/tdegtk/tqtcairopainter.h index dcca6f9..c8f53de 100644 --- a/tdegtk/tqtcairopainter.h +++ b/tdegtk/tqtcairopainter.h @@ -21,16 +21,15 @@ #ifndef TQTCAIROPAINTER_H #define TQTCAIROPAINTER_H -#define TQT_NO_COMPAT_NAMES -#include "ntqpaintdevice.h" -#include "ntqbuffer.h" -#include "ntqcolor.h" -#include "ntqpen.h" -#include "ntqbrush.h" -#include "ntqfont.h" -#include "ntqimage.h" -#include "ntqptrstack.h" -#include "ntqpainter.h" +#include "tqpaintdevice.h" +#include "tqbuffer.h" +#include "tqcolor.h" +#include "tqpen.h" +#include "tqbrush.h" +#include "tqfont.h" +#include "tqimage.h" +#include "tqptrstack.h" +#include "tqpainter.h" #include <cairo.h> #include <pango/pangocairo.h> @@ -39,7 +38,7 @@ typedef TQPtrStack<TQWMatrix> TQWMatrixStack; class KPixmapIO; -class Q_EXPORT TQt3CairoPaintDevice : public TQPaintDevice // picture class +class TQ_EXPORT TQt3CairoPaintDevice : public TQPaintDevice // picture class { public: TQt3CairoPaintDevice( cairo_surface_t *, int x = 0, int y = 0, int width = -1, int height = -1, cairo_t *overridepainter = NULL ); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100644 index 0000000..94707cc --- /dev/null +++ b/tests/CMakeLists.txt @@ -0,0 +1,47 @@ +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/tdegtk + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${CAIRO_INCLUDE_DIRS} + ${GTK3_INCLUDE_DIRS} + ${PANGO_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} + ${CAIRO_LIBRARY_DIRS} + ${GTK3_LIBRARY_DIRS} + ${PANGO_LIBRARY_DIRS} +) + + +##### test-widgets (executable) + +tde_add_check_executable( test-widgets AUTOMOC + + SOURCES + test-widgets.c + + LINK + ${CAIRO_LIBRARIES} + ${GTK3_LIBRARIES} +) + + +##### test-painter (executable) + +tde_add_check_executable( test-painter AUTOMOC + + SOURCES + test-painter.cpp + + LINK + tqtcairo-shared + tdeui-shared + ${CAIRO_LIBRARIES} + ${GTK3_LIBRARIES} +) diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index 5dccd1b..0000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -INCLUDES= $(all_includes) $(KDE_INCLUDES)/tde - -EXTRA_DIST = \ - test-widgets.glade - -noinst_PROGRAMS = \ - test-widgets \ - test-painter - -test_widgets_CFLAGS = \ - -I$(top_srcdir) \ - $(KDE_CFLAGS) \ - $(CAIRO_CFLAGS) \ - $(GTK3_CFLAGS) - -test_widgets_LDADD = \ - $(KDE_LIBADD) - -test_widgets_LDFLAGS = \ - $(KDE_LDFLAGS) \ - $(CAIRO_LIBS) \ - $(GTK3_LIBS) - -test_painter_SOURCES = test-painter.cpp - -test_painter_CXXFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/tdegtk \ - $(KDE_CFLAGS) \ - $(CAIRO_CFLAGS) \ - $(GTK3_CFLAGS) - -test_painter_LDADD = \ - $(KDE_LIBADD) ../tdegtk/libtqtcairo.la $(all_libraries) $(CAIRO_LIBS) $(GTK3_LIBS) $(LIB_TQT) $(LIB_TDEUI) - -test_painter_LDFLAGS = \ - $(KDE_LDFLAGS) \ - $(CAIRO_LIBS) \ - $(GTK3_LIBS) diff --git a/tests/compare b/tests/compare deleted file mode 100755 index 83726c5..0000000 --- a/tests/compare +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -composite -compose subtract tqt3.png stroke.png diff.png diff --git a/tests/test-painter.cpp b/tests/test-painter.cpp index ad3eb36..9f5ba89 100644 --- a/tests/test-painter.cpp +++ b/tests/test-painter.cpp @@ -288,7 +288,7 @@ void runTests(TQPaintDevice* pd) { TQRect boundingRect(0, 0, width, height); TQStringList objectTypes; - objectTypes.append(TQTABBAR_OBJECT_NAME_STRING); + objectTypes.append("TQTabBar"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -301,7 +301,7 @@ void runTests(TQPaintDevice* pd) { TQStyleOption tabOpt(&tqt3Tab, (TQTab*)NULL); elementFlags = elementFlags | TQStyle::CEF_HasParentWidget; - ceData.parentWidgetData.widgetObjectTypes.append(TQTABBAR_OBJECT_NAME_STRING); + ceData.parentWidgetData.widgetObjectTypes.append("TQTabBar"); int tab_overlap = tqApp->style().pixelMetric(TQStyle::PM_TabBarTabOverlap); x = x + width + tab_overlap; @@ -332,7 +332,7 @@ void runTests(TQPaintDevice* pd) { TQRect boundingRect(0, 0, width, height); TQStringList objectTypes; - objectTypes.append(TQTABBAR_OBJECT_NAME_STRING); + objectTypes.append("TQTabBar"); TQPalette objectPalette = tqApp->palette(objectTypes); TQStyleControlElementData ceData; @@ -345,7 +345,7 @@ void runTests(TQPaintDevice* pd) { TQStyleOption tabOpt(&tqt3Tab, (TQTab*)NULL); elementFlags = elementFlags | TQStyle::CEF_HasParentWidget; - ceData.parentWidgetData.widgetObjectTypes.append(TQTABBAR_OBJECT_NAME_STRING); + ceData.parentWidgetData.widgetObjectTypes.append("TQTabBar"); int tab_overlap = tqApp->style().pixelMetric(TQStyle::PM_TabBarTabOverlap); x = x - width - tab_overlap; |