From 69eb8e2101d3f176816000bce7751d42b2c888d2 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Wed, 28 Mar 2018 17:53:26 +0200 Subject: [PATCH] keyboard: adapt some files from downstream --- src/controls/QskVirtualKeyboard.cpp | 68 +++++++++---------- src/controls/QskVirtualKeyboard.h | 12 ++-- ...outs.cpp => QskVirtualKeyboardLayouts.cpp} | 0 src/src.pro | 8 +-- 4 files changed, 44 insertions(+), 44 deletions(-) rename src/controls/{QskInputPanelLayouts.cpp => QskVirtualKeyboardLayouts.cpp} (100%) diff --git a/src/controls/QskVirtualKeyboard.cpp b/src/controls/QskVirtualKeyboard.cpp index d1a30484..34e88c80 100644 --- a/src/controls/QskVirtualKeyboard.cpp +++ b/src/controls/QskVirtualKeyboard.cpp @@ -34,7 +34,7 @@ namespace }; } -struct QskInputPanelLayouts +struct QskVirtualKeyboardLayouts { struct KeyCodes { @@ -72,9 +72,9 @@ struct QskInputPanelLayouts }; #define LOWER(x) Qt::Key(x + 32) // Convert an uppercase key to lowercase -static constexpr const QskInputPanelLayouts qskInputPanelLayouts = +static constexpr const QskVirtualKeyboardLayouts qskKeyboardLayouts = { -#include "QskInputPanelLayouts.cpp" +#include "QskVirtualKeyboardLayouts.cpp" }; #undef LOWER @@ -239,7 +239,7 @@ class QskVirtualKeyboard::PrivateData } public: - const QskInputPanelLayouts::Layout* currentLayout; + const QskVirtualKeyboardLayouts::Layout* currentLayout; QskVirtualKeyboard::Mode mode; qint16 selectedGroup; @@ -269,11 +269,6 @@ QskVirtualKeyboard::QskVirtualKeyboard( QQuickItem* parent ): initSizePolicy( QskSizePolicy::Expanding, QskSizePolicy::Expanding ); - setAutoFillBackground( true ); - - auto margins = marginsHint( Panel | QskAspect::Margin ); - setMargins( margins ); - updateLocale( locale() ); QObject::connect( this, &QskControl::localeChanged, @@ -741,23 +736,23 @@ void QskVirtualKeyboard::updateLocale( const QLocale& locale ) switch( locale.language() ) { case QLocale::Bulgarian: - m_data->currentLayout = &qskInputPanelLayouts.bg; + m_data->currentLayout = &qskKeyboardLayouts.bg; break; case QLocale::Czech: - m_data->currentLayout = &qskInputPanelLayouts.cs; + m_data->currentLayout = &qskKeyboardLayouts.cs; break; case QLocale::German: - m_data->currentLayout = &qskInputPanelLayouts.de; + m_data->currentLayout = &qskKeyboardLayouts.de; break; case QLocale::Danish: - m_data->currentLayout = &qskInputPanelLayouts.da; + m_data->currentLayout = &qskKeyboardLayouts.da; break; case QLocale::Greek: - m_data->currentLayout = &qskInputPanelLayouts.el; + m_data->currentLayout = &qskKeyboardLayouts.el; break; case QLocale::English: @@ -768,11 +763,11 @@ void QskVirtualKeyboard::updateLocale( const QLocale& locale ) case QLocale::UnitedStates: case QLocale::UnitedStatesMinorOutlyingIslands: case QLocale::UnitedStatesVirginIslands: - m_data->currentLayout = &qskInputPanelLayouts.en_US; + m_data->currentLayout = &qskKeyboardLayouts.en_US; break; default: - m_data->currentLayout = &qskInputPanelLayouts.en_GB; + m_data->currentLayout = &qskKeyboardLayouts.en_GB; break; } @@ -780,72 +775,77 @@ void QskVirtualKeyboard::updateLocale( const QLocale& locale ) } case QLocale::Spanish: - m_data->currentLayout = &qskInputPanelLayouts.es; + m_data->currentLayout = &qskKeyboardLayouts.es; break; case QLocale::Finnish: - m_data->currentLayout = &qskInputPanelLayouts.fi; + m_data->currentLayout = &qskKeyboardLayouts.fi; break; case QLocale::French: - m_data->currentLayout = &qskInputPanelLayouts.fr; + m_data->currentLayout = &qskKeyboardLayouts.fr; break; case QLocale::Hungarian: - m_data->currentLayout = &qskInputPanelLayouts.hu; + m_data->currentLayout = &qskKeyboardLayouts.hu; break; case QLocale::Italian: - m_data->currentLayout = &qskInputPanelLayouts.it; + m_data->currentLayout = &qskKeyboardLayouts.it; break; case QLocale::Japanese: - m_data->currentLayout = &qskInputPanelLayouts.ja; + m_data->currentLayout = &qskKeyboardLayouts.ja; break; case QLocale::Latvian: - m_data->currentLayout = &qskInputPanelLayouts.lv; + m_data->currentLayout = &qskKeyboardLayouts.lv; break; case QLocale::Lithuanian: - m_data->currentLayout = &qskInputPanelLayouts.lt; + m_data->currentLayout = &qskKeyboardLayouts.lt; break; case QLocale::Dutch: - m_data->currentLayout = &qskInputPanelLayouts.nl; + m_data->currentLayout = &qskKeyboardLayouts.nl; break; case QLocale::Portuguese: - m_data->currentLayout = &qskInputPanelLayouts.pt; + m_data->currentLayout = &qskKeyboardLayouts.pt; break; case QLocale::Romanian: - m_data->currentLayout = &qskInputPanelLayouts.ro; + m_data->currentLayout = &qskKeyboardLayouts.ro; break; case QLocale::Russia: - m_data->currentLayout = &qskInputPanelLayouts.ru; + m_data->currentLayout = &qskKeyboardLayouts.ru; break; case QLocale::Slovenian: - m_data->currentLayout = &qskInputPanelLayouts.sl; + m_data->currentLayout = &qskKeyboardLayouts.sl; break; case QLocale::Slovak: - m_data->currentLayout = &qskInputPanelLayouts.sk; + m_data->currentLayout = &qskKeyboardLayouts.sk; break; case QLocale::Turkish: - m_data->currentLayout = &qskInputPanelLayouts.tr; + m_data->currentLayout = &qskKeyboardLayouts.tr; break; case QLocale::Chinese: - m_data->currentLayout = &qskInputPanelLayouts.zh; + m_data->currentLayout = &qskKeyboardLayouts.zh; break; - +#if 1 + case QLocale::C: + m_data->currentLayout = &qskKeyboardLayouts.en_US; + break; +#endif default: qWarning() << "QskInputPanel: unsupported locale:" << locale; - m_data->currentLayout = &qskInputPanelLayouts.en_US; + m_data->currentLayout = &qskKeyboardLayouts.en_US; + } Q_EMIT displayLanguageNameChanged(); diff --git a/src/controls/QskVirtualKeyboard.h b/src/controls/QskVirtualKeyboard.h index 82d246d4..083a414a 100644 --- a/src/controls/QskVirtualKeyboard.h +++ b/src/controls/QskVirtualKeyboard.h @@ -14,7 +14,7 @@ class QskInputCompositionModel; class QskVirtualKeyboard; -class QskVirtualKeyboardButton : public QskPushButton +class QSK_EXPORT QskVirtualKeyboardButton : public QskPushButton { Q_OBJECT @@ -107,14 +107,14 @@ public: void registerCompositionModelForLocale( const QLocale& locale, QskInputCompositionModel* model ); -public Q_SLOTS: - void setPreeditGroups( const QVector< Qt::Key >& ); - void setPreeditCandidates( const QVector< Qt::Key >& ); - void handleKey( int keyIndex ); KeyData& keyDataAt( int ) const; QString currentTextForKeyIndex( int keyIndex ) const; +public Q_SLOTS: + void setPreeditGroups( const QVector< Qt::Key >& ); + void setPreeditCandidates( const QVector & ); + protected: virtual void geometryChanged( const QRectF&, const QRectF& ) override; virtual void updateLayout() override; @@ -139,7 +139,7 @@ Q_SIGNALS: void modeChanged( QskVirtualKeyboard::Mode mode ); void cancelPressed(); -public: +private: class PrivateData; std::unique_ptr< PrivateData > m_data; }; diff --git a/src/controls/QskInputPanelLayouts.cpp b/src/controls/QskVirtualKeyboardLayouts.cpp similarity index 100% rename from src/controls/QskInputPanelLayouts.cpp rename to src/controls/QskVirtualKeyboardLayouts.cpp diff --git a/src/src.pro b/src/src.pro index 6e51b64f..5e6b2503 100644 --- a/src/src.pro +++ b/src/src.pro @@ -48,8 +48,7 @@ HEADERS += \ common/QskObjectCounter.h \ common/QskSizePolicy.h \ common/QskTextColors.h \ - common/QskTextOptions.h \ - controls/QskVirtualKeyboard.h + common/QskTextOptions.h SOURCES += \ common/QskAspect.cpp \ @@ -66,8 +65,7 @@ SOURCES += \ common/QskObjectCounter.cpp \ common/QskSizePolicy.cpp \ common/QskTextColors.cpp \ - common/QskTextOptions.cpp \ - controls/QskVirtualKeyboard.cpp + common/QskTextOptions.cpp HEADERS += \ graphic/QskColorFilter.h \ @@ -182,6 +180,7 @@ HEADERS += \ controls/QskTextLabel.h \ controls/QskTextLabelSkinlet.h \ controls/QskVariantAnimator.h \ + controls/QskVirtualKeyboard.h \ controls/QskWindow.h SOURCES += \ @@ -245,6 +244,7 @@ SOURCES += \ controls/QskTextLabel.cpp \ controls/QskTextLabelSkinlet.cpp \ controls/QskVariantAnimator.cpp \ + controls/QskVirtualKeyboard.cpp \ controls/QskWindow.cpp HEADERS += \