François Andriot
12 years ago
parent
700ec26353
commit
0c4b32438a
@ -0,0 +1,28 @@
|
|||||||
|
--- gtk-qt-engine/kcm_gtk/kcmgtk.cpp.ORI 2013-07-23 23:35:16.614406882 +0200
|
||||||
|
+++ gtk-qt-engine/kcm_gtk/kcmgtk.cpp 2013-07-23 23:56:39.121594541 +0200
|
||||||
|
@@ -261,13 +261,21 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ bool gtk3installed = false;
|
||||||
|
widget->styleBox3->clear();
|
||||||
|
TQStringList otherGtk3Styles = gtk3Themes.keys();
|
||||||
|
- otherGtk3Styles.remove(otherGtk3Styles.find("tdegtk"));
|
||||||
|
- widget->styleBox3->insertStringList(otherGtk3Styles);
|
||||||
|
-
|
||||||
|
- bool gtk3installed = (gtk3Themes.find("tdegtk") != gtk3Themes.end());
|
||||||
|
+ if(!otherGtk3Styles.empty()) {
|
||||||
|
+ otherGtk3Styles.remove(otherGtk3Styles.find("tdegtk"));
|
||||||
|
+ if(!otherGtk3Styles.empty()) {
|
||||||
|
+ gtk3installed = (gtk3Themes.find("tdegtk") != gtk3Themes.end());
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ if(gtk3installed) {
|
||||||
|
+ widget->styleBox3->insertStringList(otherGtk3Styles);
|
||||||
|
+ }
|
||||||
|
widget->styleKde3->setEnabled(gtk3installed);
|
||||||
|
+ widget->styleBox3->setEnabled(gtk3installed);
|
||||||
|
+ widget->styleOther3->setEnabled(gtk3installed);
|
||||||
|
widget->warning4->setHidden(gtk3installed);
|
||||||
|
widget->warning5->setHidden(gtk3installed);
|
||||||
|
widget->warning6->setHidden(gtk3installed);
|
||||||
@ -0,0 +1,64 @@
|
|||||||
|
diff --git a/configure b/configure
|
||||||
|
index 0ced074..7a6fcfe 100755
|
||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -44,7 +44,7 @@ while [ $# -gt 0 ]; do
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
|
-echo "Configuring qca-tls ..."
|
||||||
|
+echo "Configuring tqca-tls ..."
|
||||||
|
|
||||||
|
if [ "$QC_DEBUG" = "Y" ]; then
|
||||||
|
echo
|
||||||
|
diff --git a/qca-tls.pro b/qca-tls.pro
|
||||||
|
index c1541bf..2457746 100644
|
||||||
|
--- a/qca-tls.pro
|
||||||
|
+++ b/qca-tls.pro
|
||||||
|
@@ -1,8 +1,8 @@
|
||||||
|
-# qca-tls qmake profile
|
||||||
|
+# tqca-tls qmake profile
|
||||||
|
|
||||||
|
TEMPLATE = lib
|
||||||
|
CONFIG += qt thread release plugin
|
||||||
|
-TARGET = qca-tls
|
||||||
|
+TARGET = tqca-tls
|
||||||
|
|
||||||
|
!exists(qcaprovider.h) {
|
||||||
|
Q_PREFIX = ../../src
|
||||||
|
@@ -13,9 +13,9 @@ HEADERS += ($$Q_PREFIX)qcaprovider.h
|
||||||
|
HEADERS = qca-tls.h
|
||||||
|
SOURCES = qca-tls.cpp
|
||||||
|
|
||||||
|
-DEFINES += QCA_PLUGIN
|
||||||
|
+DEFINES += TQCA_PLUGIN
|
||||||
|
win32:{
|
||||||
|
- DEFINES += QCA_PLUGIN_DLL OSSL_097
|
||||||
|
+ DEFINES += TQCA_PLUGIN_DLL OSSL_097
|
||||||
|
INCLUDEPATH += c:\local\include
|
||||||
|
LIBS += c:\local\lib\libeay32.lib c:\local\lib\ssleay32.lib
|
||||||
|
}
|
||||||
|
diff --git a/qca-tls.qc b/qca-tls.qc
|
||||||
|
index ef0a739..91179cf 100644
|
||||||
|
--- a/qca-tls.qc
|
||||||
|
+++ b/qca-tls.qc
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
<qconf>
|
||||||
|
- <name>qca-tls</name>
|
||||||
|
+ <name>tqca-tls</name>
|
||||||
|
<profile>qca-tls.pro</profile>
|
||||||
|
<noprefix/>
|
||||||
|
<dep type='openssl'>
|
||||||
|
diff --git a/qca.h b/qca.h
|
||||||
|
index 184a4b0..ccd6d03 100644
|
||||||
|
--- a/qca.h
|
||||||
|
+++ b/qca.h
|
||||||
|
@@ -49,7 +49,7 @@
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
#ifndef TQCA_PLUGIN_EXPORT
|
||||||
|
-#define TQCA_PLUGIN_EXPORT extern "C"
|
||||||
|
+#define TQCA_PLUGIN_EXPORT extern "C" __attribute__ ((visibility ("default")))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
class TQHostAddress;
|
||||||
@ -0,0 +1,361 @@
|
|||||||
|
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
|
||||||
|
%if "%{?tde_prefix}" != "/usr"
|
||||||
|
%define _variant .opt
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# TDE 3.5.13 specific building variables
|
||||||
|
%define tde_bindir %{tde_prefix}/bin
|
||||||
|
%define tde_datadir %{tde_prefix}/share
|
||||||
|
%define tde_docdir %{tde_datadir}/doc
|
||||||
|
%define tde_includedir %{tde_prefix}/include
|
||||||
|
%define tde_libdir %{tde_prefix}/%{_lib}
|
||||||
|
%define tde_mandir %{tde_datadir}/man
|
||||||
|
|
||||||
|
%define tde_tdeappdir %{tde_datadir}/applications/kde
|
||||||
|
%define tde_tdedocdir %{tde_docdir}/tde
|
||||||
|
%define tde_tdeincludedir %{tde_includedir}/tde
|
||||||
|
%define tde_tdelibdir %{tde_libdir}/trinity
|
||||||
|
|
||||||
|
%define _docdir %{tde_docdir}
|
||||||
|
|
||||||
|
Summary: Audio-decoding framework
|
||||||
|
Name: trinity-akode
|
||||||
|
Version: 2.0.2
|
||||||
|
Release: 5%{?dist}%{?_variant}
|
||||||
|
|
||||||
|
License: LGPLv2+
|
||||||
|
Group: System Environment/Libraries
|
||||||
|
#URL: http://carewolf.com/akode/
|
||||||
|
URL: http://www.kde-apps.org/content/show.php?content=30375
|
||||||
|
Source0: akode-2.0.2.tar.bz2
|
||||||
|
|
||||||
|
Prefix: %{tde_prefix}
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
|
|
||||||
|
# Legacy Fedora 9 patches
|
||||||
|
Patch1: akode-pulseaudio.patch
|
||||||
|
Patch2: akode-2.0.2-multilib.patch
|
||||||
|
Patch3: akode-2.0.2-flac113-portable.patch
|
||||||
|
Patch4: akode-2.0.2-gcc43.patch
|
||||||
|
|
||||||
|
# New patch for Fedora 16 / TDE 3.5.13
|
||||||
|
Patch10: akode-autotools.patch
|
||||||
|
Patch11: akode-2.0.2-fix_ffmpeg_include.patch
|
||||||
|
|
||||||
|
|
||||||
|
# FLAC support
|
||||||
|
%define _with_flac --with-flac
|
||||||
|
%if 0%{?mgaversion} || 0%{?mdkversion}
|
||||||
|
%if 0%{?pclinuxos}
|
||||||
|
BuildRequires: libflac-devel
|
||||||
|
%else
|
||||||
|
BuildRequires: %{_lib}flac-devel
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
|
||||||
|
BuildRequires: flac-devel
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# JACK support
|
||||||
|
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
|
||||||
|
%define _with_jack --with-jack
|
||||||
|
%if 0%{?mgaversion} || 0%{?mdkversion}
|
||||||
|
BuildRequires: %{_lib}jack-devel
|
||||||
|
%endif
|
||||||
|
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
|
||||||
|
BuildRequires: jack-audio-connection-kit-devel
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# SAMPLERATE support
|
||||||
|
%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
|
||||||
|
%define _with_libsamplerate --with-libsamplerate
|
||||||
|
BuildRequires: libsamplerate-devel
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# PULSEAUDIO support
|
||||||
|
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
|
||||||
|
%define _with_pulseaudio --with-pulseaudio
|
||||||
|
%if 0%{?mgaversion} || 0%{?mdkversion}
|
||||||
|
BuildRequires: %{_lib}pulseaudio-devel
|
||||||
|
%endif
|
||||||
|
%if 0%{?rhel} || 0%{?fedora}
|
||||||
|
BuildRequires: pulseaudio-libs-devel
|
||||||
|
%endif
|
||||||
|
%if 0%{?suse_version}
|
||||||
|
BuildRequires: pulseaudio-devel
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# MAD support
|
||||||
|
%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
|
||||||
|
%define _with_libmad --with-libmad
|
||||||
|
%if 0%{?mdkversion} || 0%{?mgaversion}
|
||||||
|
BuildRequires: %{_lib}mad-devel
|
||||||
|
%endif
|
||||||
|
%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
|
||||||
|
BuildRequires: libmad-devel
|
||||||
|
%endif
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
BuildRequires: automake libtool
|
||||||
|
BuildRequires: alsa-lib-devel
|
||||||
|
BuildRequires: libvorbis-devel
|
||||||
|
BuildRequires: speex-devel
|
||||||
|
|
||||||
|
|
||||||
|
%description
|
||||||
|
aKode is a simple audio-decoding frame-work that provides a uniform
|
||||||
|
interface to decode the most common audio-formats. It also has a direct
|
||||||
|
playback option for a number of audio-outputs.
|
||||||
|
|
||||||
|
aKode currently has the following decoder plugins:
|
||||||
|
* mpc: Decodes musepack aka mpc audio.
|
||||||
|
* xiph: Decodes FLAC, Ogg/FLAC, Speex and Ogg Vorbis audio.
|
||||||
|
|
||||||
|
aKode also has the following audio outputs:
|
||||||
|
* alsa: Outputs to ALSA (dmix is recommended).
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%doc rpmdocs/*
|
||||||
|
%{tde_bindir}/akodeplay
|
||||||
|
%{tde_libdir}/libakode.so.*
|
||||||
|
%{tde_libdir}/libakode_alsa_sink.la
|
||||||
|
%{tde_libdir}/libakode_alsa_sink.so
|
||||||
|
%{tde_libdir}/libakode_mpc_decoder.la
|
||||||
|
%{tde_libdir}/libakode_mpc_decoder.so
|
||||||
|
%{tde_libdir}/libakode_oss_sink.la
|
||||||
|
%{tde_libdir}/libakode_oss_sink.so
|
||||||
|
%{tde_libdir}/libakode_xiph_decoder.la
|
||||||
|
%{tde_libdir}/libakode_xiph_decoder.so
|
||||||
|
|
||||||
|
%post
|
||||||
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
%postun
|
||||||
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
##########
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Summary: Headers for developing programs that will use %{name}
|
||||||
|
Group: Development/Libraries
|
||||||
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
%{?_with_jack:Requires: %{name}-jack = %{version}-%{release}}
|
||||||
|
%{?_with_pulseaudio:Requires: %{name}-pulseaudio = %{version}-%{release}}
|
||||||
|
%{?_with_libsamplerate:Requires: %{name}-libsamplerate = %{version}-%{release}}
|
||||||
|
%{?_with_libmad:Requires: %{name}-libmad = %{version}-%{release}}
|
||||||
|
Requires: pkgconfig
|
||||||
|
|
||||||
|
%description devel
|
||||||
|
%{summary}.
|
||||||
|
|
||||||
|
%files devel
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%{tde_bindir}/akode-config
|
||||||
|
%{tde_includedir}/*
|
||||||
|
%{tde_libdir}/libakode.la
|
||||||
|
%{tde_libdir}/libakode.so
|
||||||
|
%{tde_libdir}/pkgconfig/*.pc
|
||||||
|
|
||||||
|
%post devel
|
||||||
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
%postun devel
|
||||||
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
##########
|
||||||
|
|
||||||
|
%if "%{?_with_jack}" != ""
|
||||||
|
|
||||||
|
%package jack
|
||||||
|
Summary: Jack audio output backend for %{name}
|
||||||
|
Group: Development/Libraries
|
||||||
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
|
||||||
|
%description jack
|
||||||
|
%{summary}.
|
||||||
|
|
||||||
|
%files jack
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%{tde_libdir}/libakode_jack_sink.la
|
||||||
|
%{tde_libdir}/libakode_jack_sink.so
|
||||||
|
|
||||||
|
%post jack
|
||||||
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
%postun jack
|
||||||
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##########
|
||||||
|
|
||||||
|
%if "%{?_with_pulseaudio}" != ""
|
||||||
|
|
||||||
|
%package pulseaudio
|
||||||
|
Summary: Pulseaudio output backend for %{name}
|
||||||
|
Group: Development/Libraries
|
||||||
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
|
||||||
|
%description pulseaudio
|
||||||
|
%{summary}.
|
||||||
|
Recommended for network transparent audio.
|
||||||
|
|
||||||
|
%files pulseaudio
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%{tde_libdir}/libakode_polyp_sink.la
|
||||||
|
%{tde_libdir}/libakode_polyp_sink.so
|
||||||
|
|
||||||
|
%post pulseaudio
|
||||||
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
%postun pulseaudio
|
||||||
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##########
|
||||||
|
|
||||||
|
# Packaged separately to keep main/core %{akode} package LGPL-clean.
|
||||||
|
%if "%{?_with_libsamplerate:1}" == "1"
|
||||||
|
|
||||||
|
%package libsamplerate
|
||||||
|
Summary: Resampler based on libsamplerate for %{name}
|
||||||
|
Group: Development/Libraries
|
||||||
|
License: GPLv2+
|
||||||
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
|
||||||
|
%description libsamplerate
|
||||||
|
%{summary}.
|
||||||
|
|
||||||
|
# License: GPLv2+
|
||||||
|
%files libsamplerate
|
||||||
|
%defattr(-,root,root,-)
|
||||||
|
%{tde_libdir}/libakode_src_resampler.la
|
||||||
|
%{tde_libdir}/libakode_src_resampler.so
|
||||||
|
|
||||||
|
%post libsamplerate
|
||||||
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
%postun libsamplerate
|
||||||
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##########
|
||||||
|
|
||||||
|
%if "%{?_with_libmad}" != ""
|
||||||
|
|
||||||
|
%package libmad
|
||||||
|
Summary: Decoder based on libmad for %{name}
|
||||||
|
Group: Development/Libraries
|
||||||
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
|
||||||
|
%description libmad
|
||||||
|
%{summary}.
|
||||||
|
|
||||||
|
%files libmad
|
||||||
|
%{tde_libdir}/libakode_mpeg_decoder.la
|
||||||
|
%{tde_libdir}/libakode_mpeg_decoder.so
|
||||||
|
|
||||||
|
%post libmad
|
||||||
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
%postun libmad
|
||||||
|
/sbin/ldconfig
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##########
|
||||||
|
|
||||||
|
%if 0%{?suse_version} || 0%{?pclinuxos}
|
||||||
|
%debug_package
|
||||||
|
%endif
|
||||||
|
|
||||||
|
##########
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q -n akode-%{version}
|
||||||
|
|
||||||
|
%patch1 -p1 -b .pulseaudio
|
||||||
|
%patch2 -p1 -b .multilib
|
||||||
|
%patch3 -p4 -b .flac113_portable
|
||||||
|
%patch4 -p1 -b .gcc43
|
||||||
|
|
||||||
|
%patch10 -p1 -b .autotools
|
||||||
|
%patch11 -p1 -b .ffmpeg
|
||||||
|
|
||||||
|
# Ugly hack to modify TQT include directory inside autoconf files.
|
||||||
|
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
|
||||||
|
%__sed -i "admin/acinclude.m4.in" \
|
||||||
|
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
|
||||||
|
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
|
||||||
|
|
||||||
|
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
|
||||||
|
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
|
||||||
|
%__make -f admin/Makefile.common cvs
|
||||||
|
|
||||||
|
%build
|
||||||
|
%configure \
|
||||||
|
--bindir=%{tde_bindir} \
|
||||||
|
--libdir=%{tde_libdir} \
|
||||||
|
--includedir=%{tde_includedir} \
|
||||||
|
--datadir=%{tde_datadir} \
|
||||||
|
--disable-static \
|
||||||
|
--enable-shared \
|
||||||
|
--disable-debug --disable-warnings --disable-dependency-tracking \
|
||||||
|
--without-libltdl \
|
||||||
|
--with-alsa \
|
||||||
|
--with-oss \
|
||||||
|
%{?_with_flac} %{!?_with_flac:--without-flac} \
|
||||||
|
%{?_with_jack} %{!?_with_jack:--without-jack} \
|
||||||
|
%{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \
|
||||||
|
%{?_with_pulseaudio} %{!?_with_pulseaudio:--without-pulseaudio} \
|
||||||
|
--with-speex \
|
||||||
|
--with-vorbis \
|
||||||
|
--without-ffmpeg \
|
||||||
|
%{?_with_libmad} %{!?_with_libmad:--without-libmad} \
|
||||||
|
--enable-closure \
|
||||||
|
--enable-new-ldflags \
|
||||||
|
--enable-final
|
||||||
|
|
||||||
|
%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
|
||||||
|
|
||||||
|
|
||||||
|
%install
|
||||||
|
%__rm -rf %{buildroot}
|
||||||
|
%__make install DESTDIR=%{buildroot}
|
||||||
|
|
||||||
|
# unpackaged files
|
||||||
|
%__rm -f %{buildroot}%{tde_libdir}/*.a
|
||||||
|
|
||||||
|
# rpmdocs
|
||||||
|
for file in AUTHORS COPYING NEWS README TODO ; do
|
||||||
|
test -s "$file" && install -p -m644 -D "$file" "rpmdocs/$file"
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
|
%clean
|
||||||
|
%__rm -rf %{buildroot}
|
||||||
|
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-5
|
||||||
|
- Initial release for TDE 14.0.0
|
||||||
|
|
||||||
|
* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 2.0.2-4
|
||||||
|
- Initial release for TDE 3.5.13.2
|
||||||
|
|
||||||
|
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-3
|
||||||
|
- Initial release for TDE 3.5.13.1
|
||||||
|
|
||||||
|
* Mon Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-2
|
||||||
|
- Re-adds '.la' files
|
||||||
|
|
||||||
|
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 2.0.2-1
|
||||||
|
- Port to TDE 3.5.13
|
||||||
|
- Based on spec file from Fedora 9 'akode-2.0.2-5'
|
||||||
@ -0,0 +1,136 @@
|
|||||||
|
--- tdebase/kcontrol/input/xcursor/themepage.cpp.ORI 2013-07-22 19:33:45.153674930 +0200
|
||||||
|
+++ tdebase/kcontrol/input/xcursor/themepage.cpp 2013-07-23 15:24:01.664497762 +0200
|
||||||
|
@@ -33,6 +33,8 @@
|
||||||
|
#include <tdeio/netaccess.h>
|
||||||
|
#include <ktar.h>
|
||||||
|
|
||||||
|
+#include "../../krdb/krdb.h"
|
||||||
|
+
|
||||||
|
#include <tqlayout.h>
|
||||||
|
#include <tqdir.h>
|
||||||
|
#include <tqpixmap.h>
|
||||||
|
@@ -42,6 +44,7 @@
|
||||||
|
#include <tqpainter.h>
|
||||||
|
#include <tqfileinfo.h>
|
||||||
|
#include <tqpushbutton.h>
|
||||||
|
+#include <dcopref.h>
|
||||||
|
|
||||||
|
#include <cstdlib> // for getenv()
|
||||||
|
|
||||||
|
@@ -53,6 +56,10 @@
|
||||||
|
#include <X11/Xlib.h>
|
||||||
|
#include <X11/Xcursor/Xcursor.h>
|
||||||
|
|
||||||
|
+#ifdef HAVE_XFIXES
|
||||||
|
+# include <X11/extensions/Xfixes.h>
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
// Check for older version
|
||||||
|
#if !defined(XCURSOR_LIB_MAJOR) && defined(XCURSOR_MAJOR)
|
||||||
|
# define XCURSOR_LIB_MAJOR XCURSOR_MAJOR
|
||||||
|
@@ -133,6 +140,65 @@
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
+bool ThemePage::applyTheme(TQString theme, TQString size)
|
||||||
|
+{
|
||||||
|
+#ifdef HAVE_XCURSOR
|
||||||
|
+ if (theme.isEmpty()) {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // Apply the TDE cursor theme to ourselves
|
||||||
|
+ XcursorSetTheme(tqt_xdisplay(), theme.latin1());
|
||||||
|
+
|
||||||
|
+ // Tell tdelauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment
|
||||||
|
+ // variables when launching applications.
|
||||||
|
+ DCOPRef tdelauncher("tdelauncher");
|
||||||
|
+ tdelauncher.send("setLaunchEnv", TQCString("XCURSOR_THEME"), TQFile::encodeName(theme));
|
||||||
|
+ if( !size.isEmpty()) {
|
||||||
|
+ tdelauncher.send("setLaunchEnv", TQCString("XCURSOR_SIZE"), size);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // Update the Xcursor X resources
|
||||||
|
+ runRdb(0);
|
||||||
|
+
|
||||||
|
+ // Apply the TDE cursor size to ourselves
|
||||||
|
+ if (!size.isEmpty()) {
|
||||||
|
+ XcursorSetDefaultSize(tqt_xdisplay(), size.toUInt());
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // Reload the standard cursors
|
||||||
|
+ TQStringList names;
|
||||||
|
+
|
||||||
|
+ // Qt cursors
|
||||||
|
+ names << "left_ptr" << "up_arrow" << "cross" << "wait"
|
||||||
|
+ << "left_ptr_watch" << "ibeam" << "size_ver" << "size_hor"
|
||||||
|
+ << "size_bdiag" << "size_fdiag" << "size_all" << "split_v"
|
||||||
|
+ << "split_h" << "pointing_hand" << "openhand"
|
||||||
|
+ << "closedhand" << "forbidden" << "whats_this" << "copy" << "move" << "link";
|
||||||
|
+
|
||||||
|
+ // X core cursors
|
||||||
|
+ names << "X_cursor" << "right_ptr" << "hand1"
|
||||||
|
+ << "hand2" << "watch" << "xterm"
|
||||||
|
+ << "crosshair" << "left_ptr_watch" << "center_ptr"
|
||||||
|
+ << "sb_h_double_arrow" << "sb_v_double_arrow" << "fleur"
|
||||||
|
+ << "top_left_corner" << "top_side" << "top_right_corner"
|
||||||
|
+ << "right_side" << "bottom_right_corner" << "bottom_side"
|
||||||
|
+ << "bottom_left_corner" << "left_side" << "question_arrow"
|
||||||
|
+ << "pirate";
|
||||||
|
+
|
||||||
|
+ for (int i = 0; i < names.size(); ++i)
|
||||||
|
+ {
|
||||||
|
+ const char* name = (*(names.at(i))).ascii();
|
||||||
|
+ Cursor handle = XcursorLibraryLoadCursor(tqt_xdisplay(), name);
|
||||||
|
+ XFixesChangeCursorByName(tqt_xdisplay(), handle, TQFile::encodeName(name));
|
||||||
|
+ XFreeCursor(tqt_xdisplay(), handle); // Don't leak the cursor
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return true;
|
||||||
|
+#else // HAVE_XCURSOR
|
||||||
|
+ return false;
|
||||||
|
+#endif
|
||||||
|
+}
|
||||||
|
|
||||||
|
void ThemePage::save()
|
||||||
|
{
|
||||||
|
@@ -145,10 +209,17 @@
|
||||||
|
c.setGroup( "Mouse" );
|
||||||
|
c.writeEntry( "cursorTheme", selectedTheme != "system" ? selectedTheme : TQString::null );
|
||||||
|
|
||||||
|
- KMessageBox::information( this, i18n("You have to restart TDE for these "
|
||||||
|
+ // The Kcontrol panel does not allow to set cursor size for now.
|
||||||
|
+ // So we keep the same size as written in config file.
|
||||||
|
+ TQCString size = c.readEntry("cursorSize", TQString()).local8Bit();
|
||||||
|
+
|
||||||
|
+ if (!applyTheme(selectedTheme, size))
|
||||||
|
+ {
|
||||||
|
+ KMessageBox::information( this, i18n("You have to restart TDE for these "
|
||||||
|
"changes to take effect."), i18n("Cursor Settings Changed"),
|
||||||
|
"CursorSettingsChanged" );
|
||||||
|
-
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
currentTheme = selectedTheme;
|
||||||
|
}
|
||||||
|
|
||||||
|
--- tdebase/kcontrol/input/xcursor/themepage.h.ORI 2013-07-22 19:49:33.467191658 +0200
|
||||||
|
+++ tdebase/kcontrol/input/xcursor/themepage.h 2013-07-22 19:56:03.990484896 +0200
|
||||||
|
@@ -45,6 +45,7 @@
|
||||||
|
void load();
|
||||||
|
void load( bool useDefaults );
|
||||||
|
void defaults();
|
||||||
|
+ bool applyTheme(TQString theme, TQString size);
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void changed( bool );
|
||||||
|
--- tdebase/kcontrol/input/xcursor/CMakeLists.txt.ORI 2013-07-23 15:24:41.178064068 +0200
|
||||||
|
+++ tdebase/kcontrol/input/xcursor/CMakeLists.txt 2013-07-23 15:27:31.694851294 +0200
|
||||||
|
@@ -21,5 +21,6 @@
|
||||||
|
|
||||||
|
tde_add_library( themepage STATIC_PIC AUTOMOC
|
||||||
|
SOURCES
|
||||||
|
- themepage.cpp previewwidget.cpp
|
||||||
|
+ themepage.cpp previewwidget.cpp ../../krdb/krdb.cpp
|
||||||
|
+ LINK Xfixes
|
||||||
|
)
|
||||||
Loading…
Reference in new issue