diff options
Diffstat (limited to 'tqt3integration/utils/qt')
| -rw-r--r-- | tqt3integration/utils/qt/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | tqt3integration/utils/qt/Makefile.am | 1 | ||||
| -rw-r--r-- | tqt3integration/utils/qt/in/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | tqt3integration/utils/qt/in/qt.patch | 270 | ||||
| -rw-r--r-- | tqt3integration/utils/qt/in/qtkdeintegration_x11_0.cpp.cmake | 1 | ||||
| -rw-r--r-- | tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp | 73 | ||||
| -rw-r--r-- | tqt3integration/utils/qt/in/qtkdeintegration_x11_2.cpp | 81 | ||||
| -rw-r--r-- | tqt3integration/utils/qt/in/qtkdeintegration_x11_p_1.h | 35 | ||||
| -rw-r--r-- | tqt3integration/utils/qt/in/qtkdeintegration_x11_p_2.h | 28 |
9 files changed, 0 insertions, 513 deletions
diff --git a/tqt3integration/utils/qt/CMakeLists.txt b/tqt3integration/utils/qt/CMakeLists.txt deleted file mode 100644 index de5ffb4e8..000000000 --- a/tqt3integration/utils/qt/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -################################################# -# -# (C) 2011 Timothy Pearson -# kb9vqf (AT) pearsoncomputing.net -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_subdirectory( in )
\ No newline at end of file diff --git a/tqt3integration/utils/qt/Makefile.am b/tqt3integration/utils/qt/Makefile.am deleted file mode 100644 index c4667d0bd..000000000 --- a/tqt3integration/utils/qt/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -CLEANFILES = qt.patch qtkdeintegration_x11.cpp qtkdeintegration_x11_p.h diff --git a/tqt3integration/utils/qt/in/CMakeLists.txt b/tqt3integration/utils/qt/in/CMakeLists.txt deleted file mode 100644 index e6fa392d5..000000000 --- a/tqt3integration/utils/qt/in/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -################################################# -# -# (C) 2011 Timothy Pearson -# kb9vqf (AT) pearsoncomputing.net -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -configure_file( qtkdeintegration_x11_0.cpp.cmake qtkdeintegration_x11_0.cpp @ONLY )
\ No newline at end of file diff --git a/tqt3integration/utils/qt/in/qt.patch b/tqt3integration/utils/qt/in/qt.patch deleted file mode 100644 index b67571887..000000000 --- a/tqt3integration/utils/qt/in/qt.patch +++ /dev/null @@ -1,270 +0,0 @@ ---- src/dialogs/qfiledialog.cpp.sav 2004-12-08 15:39:41.000000000 +0100 -+++ src/dialogs/qfiledialog.cpp 2004-12-13 16:53:40.000000000 +0100 -@@ -92,6 +92,10 @@ - #include "qvbox.h" - #include "qwidgetstack.h" - -+#ifdef Q_WS_X11 -+#include "private/qtkdeintegration_x11_p.h" -+#endif -+ - #ifdef Q_WS_WIN - #ifdef TQT_THREAD_SUPPORT - # include <private/qmutexpool_p.h> -@@ -3428,7 +3432,11 @@ QString QFileDialog::getOpenFileName( co - if ( workingDirectory->isNull() ) - *workingDirectory = QDir::currentDirPath(); - --#if defined(Q_WS_WIN) -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name, -+ caption, selectedFilter, false ).first(); -+#elif defined(Q_WS_WIN) - if ( qt_use_native_dialogs && tqApp->style().styleHint( QStyle::SH_GUIStyle ) == WindowsStyle ) - return winGetOpenFileName( initialSelection, filter, workingDirectory, - parent, name, caption, selectedFilter ); -@@ -3546,7 +3554,11 @@ QString QFileDialog::getSaveFileName( co - if ( workingDirectory->isNull() ) - *workingDirectory = QDir::currentDirPath(); - --#if defined(Q_WS_WIN) -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::getSaveFileName( initialSelection, filter, workingDirectory, -+ parent, name, caption, selectedFilter ); -+#elif defined(Q_WS_WIN) - if ( qt_use_native_dialogs && tqApp->style().styleHint( QStyle::SH_GUIStyle ) == WindowsStyle ) - return winGetSaveFileName( initialSelection, filter, workingDirectory, - parent, name, caption, selectedFilter ); -@@ -4433,7 +4445,17 @@ QString QFileDialog::getExistingDirector - if ( workingDirectory ) - wd = *workingDirectory; - --#if defined(Q_WS_WIN) -+#if defined(Q_WS_X11) -+ QString initialDir; -+ if ( !dir.isEmpty() ) { -+ QUrlOperator u( dir ); -+ if ( QFileInfo( u.path() ).isDir() ) -+ initialDir = dir; -+ } else -+ initialDir = QString::null; -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::getExistingDirectory( initialDir, parent, name, caption ); -+#elif defined(Q_WS_WIN) - QString initialDir; - if ( !dir.isEmpty() ) { - QUrlOperator u( dir ); -@@ -5586,7 +5608,10 @@ QStringList QFileDialog::getOpenFileName - } - } - --#if defined(Q_WS_WIN) -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::getOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter, true ); -+#elif defined(Q_WS_WIN) - if ( qt_use_native_dialogs && tqApp->style().styleHint( QStyle::SH_GUIStyle ) == WindowsStyle ) - return winGetOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter ); - #elif defined(Q_WS_MAC) ---- src/dialogs/qmessagebox.cpp.sav 2003-12-22 12:24:32.000000000 +0100 -+++ src/dialogs/qmessagebox.cpp 2005-01-05 18:05:29.638723917 +0100 -@@ -54,6 +54,12 @@ - #endif - - -+#ifdef Q_WS_X11 -+#include "private/qtkdeintegration_x11_p.h" -+#endif -+ -+extern bool qt_use_native_dialogs; -+ - // Internal class - don't touch - - class QMessageBoxLabel : public QLabel -@@ -1104,6 +1110,10 @@ int QMessageBox::information( QWidget *p - const QString& caption, const QString& text, - int button0, int button1, int button2 ) - { -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::information( parent, caption, text, button0, button1, button2 ); -+#endif - QMessageBox *mb = new QMessageBox( caption, text, Information, - button0, button1, button2, - parent, "qt_msgbox_information", TRUE, -@@ -1151,6 +1161,10 @@ int QMessageBox::question( QWidget *pare - const QString& caption, const QString& text, - int button0, int button1, int button2 ) - { -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::question( parent, caption, text, button0, button1, button2 ); -+#endif - QMessageBox *mb = new QMessageBox( caption, text, Question, - button0, button1, button2, - parent, "qt_msgbox_information", TRUE, -@@ -1199,6 +1213,10 @@ int QMessageBox::warning( QWidget *paren - const QString& caption, const QString& text, - int button0, int button1, int button2 ) - { -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::warning( parent, caption, text, button0, button1, button2 ); -+#endif - QMessageBox *mb = new QMessageBox( caption, text, Warning, - button0, button1, button2, - parent, "qt_msgbox_warning", TRUE, -@@ -1247,6 +1265,10 @@ int QMessageBox::critical( QWidget *pare - const QString& caption, const QString& text, - int button0, int button1, int button2 ) - { -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::critical( parent, caption, text, button0, button1, button2 ); -+#endif - QMessageBox *mb = new QMessageBox( caption, text, Critical, - button0, button1, button2, - parent, "qt_msgbox_critical", TRUE, -@@ -1394,6 +1416,11 @@ int QMessageBox::information( QWidget *p - int defaultButtonNumber, - int escapeButtonNumber ) - { -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::information( parent, caption, text, -+ button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber ); -+#endif - return textBox( parent, Information, caption, text, - button0Text, button1Text, button2Text, - defaultButtonNumber, escapeButtonNumber ); -@@ -1436,6 +1463,11 @@ int QMessageBox::question( QWidget *pare - int defaultButtonNumber, - int escapeButtonNumber ) - { -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::question( parent, caption, text, -+ button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber ); -+#endif - return textBox( parent, Question, caption, text, - button0Text, button1Text, button2Text, - defaultButtonNumber, escapeButtonNumber ); -@@ -1480,6 +1512,11 @@ int QMessageBox::warning( QWidget *paren - int defaultButtonNumber, - int escapeButtonNumber ) - { -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::warning( parent, caption, text, -+ button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber ); -+#endif - return textBox( parent, Warning, caption, text, - button0Text, button1Text, button2Text, - defaultButtonNumber, escapeButtonNumber ); -@@ -1520,6 +1557,11 @@ int QMessageBox::critical( QWidget *pare - int defaultButtonNumber, - int escapeButtonNumber ) - { -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::critical( parent, caption, text, -+ button0Text, button1Text, button2Text, defaultButtonNumber, escapeButtonNumber ); -+#endif - return textBox( parent, Critical, caption, text, - button0Text, button1Text, button2Text, - defaultButtonNumber, escapeButtonNumber ); ---- src/dialogs/qfontdialog.cpp.sav 2004-08-12 14:32:06.000000000 +0200 -+++ src/dialogs/qfontdialog.cpp 2004-12-13 19:02:31.000000000 +0100 -@@ -56,6 +56,10 @@ - #include <private/qfontdata_p.h> - #include <qvalidator.h> - -+#ifdef Q_WS_X11 -+#include "private/qtkdeintegration_x11_p.h" -+#endif -+ - /*! - \class QFontDialog qfontdialog.h - \ingroup dialogs -@@ -384,9 +388,15 @@ QFont QFontDialog::getFont( bool *ok, QW - return getFont( ok, 0, parent, name ); - } - -+extern bool qt_use_native_dialogs; -+ - QFont QFontDialog::getFont( bool *ok, const QFont *def, - QWidget *parent, const char* name) - { -+#if defined(Q_WS_X11) -+ if ( qt_use_native_dialogs && QKDEIntegration::enabled()) -+ return QKDEIntegration::getFont( ok, def, parent, name ); -+#endif - QFont result; - if ( def ) - result = *def; ---- src/dialogs/qcolordialog.cpp.sav 2004-04-30 12:00:05.000000000 +0200 -+++ src/dialogs/qcolordialog.cpp 2004-12-13 16:53:40.000000000 +0100 -@@ -60,6 +60,10 @@ QRgb macGetRgba( QRgb initial, bool *ok, - QColor macGetColor( const QColor& initial, QWidget *parent, const char *name ); - #endif - -+#ifdef Q_WS_X11 -+#include "private/qtkdeintegration_x11_p.h" -+#endif -+ - //////////// QWellArray BEGIN - - struct QWellArrayData; -@@ -1478,7 +1482,10 @@ QColorDialog::QColorDialog(QWidget* pare - QColor QColorDialog::getColor( const QColor& initial, QWidget *parent, - const char *name ) - { --#if defined(Q_WS_MAC) -+#if defined(Q_WS_X11) -+ if( QKDEIntegration::enabled()) -+ return QKDEIntegration::getColor( initial, parent, name ); -+#elif defined(Q_WS_MAC) - return macGetColor(initial, parent, name); - #endif - -@@ -1516,6 +1523,13 @@ QRgb QColorDialog::getRgba( QRgb initial - QWidget *parent, const char* name ) - { - #if defined(Q_WS_MAC) -+ if( QKDEIntegration::enabled()) { -+ QColor color = QKDEIntegration::getColor( QColor( initial ), parent, name ); -+ if( ok ) -+ *ok = color.isValid(); -+ return color.rgba(); -+ } -+#elif defined(Q_WS_MAC) - return macGetRgba(initial, ok, parent, name); - #endif - ---- src/kernel/qt_x11.pri.sav 2004-11-15 17:51:45.000000000 +0100 -+++ src/kernel/qt_x11.pri 2004-12-13 16:53:40.000000000 +0100 -@@ -10,6 +10,9 @@ unix { - - SOURCES += $$KERNEL_CPP/qtaddons_x11.cpp - PRECOMPILED_HEADER = kernel/qt_pch.h -+ -+ SOURCES += $$KERNEL_CPP/qtkdeintegration_x11.cpp -+ HEADERS += $$KERNEL_H/qtkdeintegration_x11_p.h - } - - nas { ---- src/kernel/qt.h.sav 2004-02-16 15:05:19.000000000 +0100 -+++ src/kernel/qt.h 2004-12-13 16:53:40.000000000 +0100 -@@ -313,6 +313,10 @@ - #endif // Private headers - - -+#ifdef Q_WS_X11 -+#include "private/qtkdeintegration_x11_p.h" -+#endif -+ - #ifdef Q_WS_MAC - #include <qaquastyle.h> - #include <qmacstyle_mac.h> diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_0.cpp.cmake b/tqt3integration/utils/qt/in/qtkdeintegration_x11_0.cpp.cmake deleted file mode 100644 index b0d5fd517..000000000 --- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_0.cpp.cmake +++ /dev/null @@ -1 +0,0 @@ -#define TQTKDELIBDIR @PLUGIN_INSTALL_DIR@/plugins/integration diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp b/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp deleted file mode 100644 index 36d4e075c..000000000 --- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_1.cpp +++ /dev/null @@ -1,73 +0,0 @@ - /* - * This file is part of the Trinity Desktop Environment - * - * Original file taken from the OpenSUSE tdebase builds - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include "tqtkdeintegration_x11_p.h" - -#include <tqcolordialog.h> -#include <tqfiledialog.h> -#include <tqfontdialog.h> -#include <tqlibrary.h> -#include <tqregexp.h> -#include <tqmessagebox.h> -#include <tqapplication.h> -#include <stdlib.h> - -bool TQKDEIntegration::inited = false; -bool TQKDEIntegration::enable = false; - -bool TQKDEIntegration::enabled() - { - if( !inited ) - initLibrary(); - return enable; - } - -static TQCString findLibrary() - { - if( getenv( "TDE_FULL_SESSION" ) == NULL ) - return ""; - if( getenv( "TDE_FULL_SESSION" )[ 0 ] != 't' && getenv( "TDE_FULL_SESSION" )[ 0 ] != '1' ) - return ""; - if( getenv( "TQT_NO_KDE_INTEGRATION" ) == NULL - || getenv( "TQT_NO_KDE_INTEGRATION" )[ 0 ] == '0' ) - { - return TQCString( TQTKDELIBDIR ) + "/libtqtkde"; - } - return ""; - } - -static long parentToWinId( const TQWidget* w ) - { - if( w != NULL ) - return w->topLevelWidget()->winId(); - // try to find some usable parent - if( tqApp->activeWindow() && w != tqApp->activeWindow()) - return tqApp->activeWindow()->winId(); - if( tqApp->mainWidget() && w != tqApp->mainWidget()) - return tqApp->mainWidget()->winId(); - return 0; - } - -inline static TQFont fontPtrToFontRef( const TQFont* f ) - { - return f != NULL ? *f : TQFont(); - } - -// --- diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_2.cpp b/tqt3integration/utils/qt/in/qtkdeintegration_x11_2.cpp deleted file mode 100644 index ffd8d1fe6..000000000 --- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_2.cpp +++ /dev/null @@ -1,81 +0,0 @@ - /* - * This file is part of the Trinity Desktop Environment - * - * Original file taken from the OpenSUSE tdebase builds - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -// --- - -int TQKDEIntegration::information( TQWidget* parent, const TQString& caption, - const TQString& text, int button0, int button1, int button2 ) - { - return qtkde_messageBox1( - TQMessageBox::Information, parentToWinId( parent ), caption, text, button0, button1, button2 ); - } - -int TQKDEIntegration::question( TQWidget* parent, const TQString& caption, - const TQString& text, int button0, int button1, int button2 ) - { - return qtkde_messageBox1( - TQMessageBox::Question, parentToWinId( parent ), caption, text, button0, button1, button2 ); - } - -int TQKDEIntegration::warning( TQWidget* parent, const TQString& caption, - const TQString& text, int button0, int button1, int button2 ) - { - return qtkde_messageBox1( - TQMessageBox::Warning, parentToWinId( parent ), caption, text, button0, button1, button2 ); - } - -int TQKDEIntegration::critical( TQWidget* parent, const TQString& caption, - const TQString& text, int button0, int button1, int button2 ) - { - return qtkde_messageBox1( - TQMessageBox::Critical, parentToWinId( parent ), caption, text, button0, button1, button2 ); - } - -int TQKDEIntegration::information( TQWidget* parent, const TQString& caption, - const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text, - int defaultButton, int escapeButton ) - { - return qtkde_messageBox2( - TQMessageBox::Information, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); - } - -int TQKDEIntegration::question( TQWidget* parent, const TQString& caption, - const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text, - int defaultButton, int escapeButton ) - { - return qtkde_messageBox2( - TQMessageBox::Question, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); - } - -int TQKDEIntegration::warning( TQWidget* parent, const TQString& caption, - const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text, - int defaultButton, int escapeButton ) - { - return qtkde_messageBox2( - TQMessageBox::Warning, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); - } - -int TQKDEIntegration::critical( TQWidget* parent, const TQString& caption, - const TQString& text, const TQString& button0Text, const TQString& button1Text, const TQString& button2Text, - int defaultButton, int escapeButton ) - { - return qtkde_messageBox2( - TQMessageBox::Critical, parentToWinId( parent ), caption, text, button0Text, button1Text, button2Text, defaultButton, escapeButton ); - } diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_p_1.h b/tqt3integration/utils/qt/in/qtkdeintegration_x11_p_1.h deleted file mode 100644 index 2a23b74b7..000000000 --- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_p_1.h +++ /dev/null @@ -1,35 +0,0 @@ - /* - * This file is part of the Trinity Desktop Environment - * - * Original file taken from the OpenSUSE tdebase builds - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef TQKDEINTEGRATION_H -#define TQKDEINTEGRATION_H - -#include <tqstringlist.h> - -class TQLibrary; -class TQWidget; -class TQColor; -class TQFont; - -class TQKDEIntegration - { - public: - static bool enabled(); -// --- diff --git a/tqt3integration/utils/qt/in/qtkdeintegration_x11_p_2.h b/tqt3integration/utils/qt/in/qtkdeintegration_x11_p_2.h deleted file mode 100644 index 63d569fc0..000000000 --- a/tqt3integration/utils/qt/in/qtkdeintegration_x11_p_2.h +++ /dev/null @@ -1,28 +0,0 @@ - /* - * This file is part of the Trinity Desktop Environment - * - * Original file taken from the OpenSUSE tdebase builds - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -// --- - private: - static void initLibrary(); - static bool inited; - static bool enable; - }; - -#endif |