From e8763912068f4501240cea0b5ae53b25c3d0aa04 Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Wed, 4 Nov 2015 00:06:19 +0300 Subject: Port the Gtk platform theme to Gtk+ 3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The major changes compared to the Gtk+ 2 version are: * Everything is ported to modern Gtk/Gdk API. * GtkFontChooserDialog is used instead of deprecated GtkFontSelectionDialog. * Hiding buttons on dialogs (like OK/Cancel) is no longer supported, as it is impossible to do that with dialogs using GtkHeaderBars. * Some workarounds were added to the QGtk3Theme constructor to correctly work with Gtk+ 3. [ChangeLog][Platform Specific Changes] The Gtk+ platform theme has been ported to Gtk+ 3. Change-Id: Iacb01279b6432e0901e3bb1353d5792543cc76e4 Done-with: J-P Nurmi Reviewed-by: Oswald Buddenhagen Reviewed-by: Lisandro Damián Nicanor Pérez Meyer Reviewed-by: J-P Nurmi --- .../platformthemes/gtk2/qgtk2dialoghelpers.h | 140 --------------------- 1 file changed, 140 deletions(-) delete mode 100644 src/plugins/platformthemes/gtk2/qgtk2dialoghelpers.h (limited to 'src/plugins/platformthemes/gtk2/qgtk2dialoghelpers.h') diff --git a/src/plugins/platformthemes/gtk2/qgtk2dialoghelpers.h b/src/plugins/platformthemes/gtk2/qgtk2dialoghelpers.h deleted file mode 100644 index 141056637e..0000000000 --- a/src/plugins/platformthemes/gtk2/qgtk2dialoghelpers.h +++ /dev/null @@ -1,140 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QGTK2DIALOGHELPERS_P_H -#define QGTK2DIALOGHELPERS_P_H - -#include -#include -#include -#include -#include -#include - -typedef struct _GtkDialog GtkDialog; -typedef struct _GtkFileFilter GtkFileFilter; - -QT_BEGIN_NAMESPACE - -class QGtk2Dialog; -class QColor; - -class QGtk2ColorDialogHelper : public QPlatformColorDialogHelper -{ - Q_OBJECT - -public: - QGtk2ColorDialogHelper(); - ~QGtk2ColorDialogHelper(); - - bool show(Qt::WindowFlags flags, Qt::WindowModality modality, QWindow *parent) Q_DECL_OVERRIDE; - void exec() Q_DECL_OVERRIDE; - void hide() Q_DECL_OVERRIDE; - - void setCurrentColor(const QColor &color) Q_DECL_OVERRIDE; - QColor currentColor() const Q_DECL_OVERRIDE; - -private Q_SLOTS: - void onAccepted(); - -private: - static void onColorChanged(QGtk2ColorDialogHelper *helper); - void applyOptions(); - - QScopedPointer d; -}; - -class QGtk2FileDialogHelper : public QPlatformFileDialogHelper -{ - Q_OBJECT - -public: - QGtk2FileDialogHelper(); - ~QGtk2FileDialogHelper(); - - bool show(Qt::WindowFlags flags, Qt::WindowModality modality, QWindow *parent) Q_DECL_OVERRIDE; - void exec() Q_DECL_OVERRIDE; - void hide() Q_DECL_OVERRIDE; - - bool defaultNameFilterDisables() const Q_DECL_OVERRIDE; - void setDirectory(const QUrl &directory) Q_DECL_OVERRIDE; - QUrl directory() const Q_DECL_OVERRIDE; - void selectFile(const QUrl &filename) Q_DECL_OVERRIDE; - QList selectedFiles() const Q_DECL_OVERRIDE; - void setFilter() Q_DECL_OVERRIDE; - void selectNameFilter(const QString &filter) Q_DECL_OVERRIDE; - QString selectedNameFilter() const Q_DECL_OVERRIDE; - -private Q_SLOTS: - void onAccepted(); - -private: - static void onSelectionChanged(GtkDialog *dialog, QGtk2FileDialogHelper *helper); - static void onCurrentFolderChanged(QGtk2FileDialogHelper *helper); - void applyOptions(); - void setNameFilters(const QStringList &filters); - - QUrl _dir; - QList _selection; - QHash _filters; - QHash _filterNames; - QScopedPointer d; -}; - -class QGtk2FontDialogHelper : public QPlatformFontDialogHelper -{ - Q_OBJECT - -public: - QGtk2FontDialogHelper(); - ~QGtk2FontDialogHelper(); - - bool show(Qt::WindowFlags flags, Qt::WindowModality modality, QWindow *parent) Q_DECL_OVERRIDE; - void exec() Q_DECL_OVERRIDE; - void hide() Q_DECL_OVERRIDE; - - void setCurrentFont(const QFont &font) Q_DECL_OVERRIDE; - QFont currentFont() const Q_DECL_OVERRIDE; - -private Q_SLOTS: - void onAccepted(); - -private: - void applyOptions(); - - QScopedPointer d; -}; - -QT_END_NAMESPACE - -#endif // QGTK2DIALOGHELPERS_P_H -- cgit v1.2.3