From 2874d68d23bf34512095b84c8bf5597c53eb54ea Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Mon, 5 Nov 2018 13:50:41 +0100 Subject: [PATCH] API cleanup --- src/controls/QskSubWindow.cpp | 5 +++++ src/controls/QskSubWindow.h | 1 + src/dialogs/QskDialog.cpp | 8 ++++---- src/dialogs/QskInputSubWindow.cpp | 10 +++++----- src/dialogs/QskInputSubWindow.h | 14 ++++++++++---- src/dialogs/QskInputWindow.cpp | 16 ++++++++-------- src/dialogs/QskInputWindow.h | 14 ++++++++++---- src/dialogs/QskSelectionSubWindow.cpp | 2 +- 8 files changed, 44 insertions(+), 26 deletions(-) diff --git a/src/controls/QskSubWindow.cpp b/src/controls/QskSubWindow.cpp index 8c9b6775..53b65311 100644 --- a/src/controls/QskSubWindow.cpp +++ b/src/controls/QskSubWindow.cpp @@ -109,6 +109,11 @@ QskTextOptions QskSubWindow::windowTitleTextOptions() const return m_data->windowTitleTextOptions; } +void QskSubWindow::setWindowIconSource( const QString& url ) +{ + setWindowIconSource( QUrl( url ) ); +} + void QskSubWindow::setWindowIconSource( const QUrl& url ) { if ( m_data->windowIconSource == url ) diff --git a/src/controls/QskSubWindow.h b/src/controls/QskSubWindow.h index 9ac6d08d..ad1913d1 100644 --- a/src/controls/QskSubWindow.h +++ b/src/controls/QskSubWindow.h @@ -61,6 +61,7 @@ class QSK_EXPORT QskSubWindow : public QskPopup void setWindowTitle( const QString& ); QString windowTitle() const; + void setWindowIconSource( const QString& ); void setWindowIconSource( const QUrl& ); QUrl windowIconSource() const; diff --git a/src/dialogs/QskDialog.cpp b/src/dialogs/QskDialog.cpp index 1be6c871..5d72803d 100644 --- a/src/dialogs/QskDialog.cpp +++ b/src/dialogs/QskDialog.cpp @@ -54,12 +54,12 @@ static void qskSetupSubWindow( { subWindow->setModal( true ); subWindow->setWindowTitle( title ); - subWindow->setActions( actions ); + subWindow->setDialogActions( actions ); if ( defaultAction == QskDialog::NoAction ) defaultAction = subWindow->buttonBox()->defaultActionCandidate(); - subWindow->setDefaultAction( defaultAction ); + subWindow->setDefaultDialogAction( defaultAction ); } static void qskSetupWindow( @@ -70,12 +70,12 @@ static void qskSetupWindow( window->setTransientParent( transientParent ); window->setTitle( title ); - window->setActions( actions ); + window->setDialogActions( actions ); if ( defaultAction == QskDialog::NoAction ) defaultAction = window->buttonBox()->defaultActionCandidate(); - window->setDefaultAction( defaultAction ); + window->setDefaultDialogAction( defaultAction ); window->setModality( transientParent ? Qt::WindowModal : Qt::ApplicationModal ); diff --git a/src/dialogs/QskInputSubWindow.cpp b/src/dialogs/QskInputSubWindow.cpp index be149ef1..cc252505 100644 --- a/src/dialogs/QskInputSubWindow.cpp +++ b/src/dialogs/QskInputSubWindow.cpp @@ -122,7 +122,7 @@ QskInputSubWindow::~QskInputSubWindow() { } -void QskInputSubWindow::setActions( QskDialog::Actions actions ) +void QskInputSubWindow::setDialogActions( QskDialog::Actions actions ) { if ( m_data->actions == actions ) return; @@ -139,17 +139,17 @@ void QskInputSubWindow::setActions( QskDialog::Actions actions ) #endif } -QskDialog::Actions QskInputSubWindow::actions() const +QskDialog::Actions QskInputSubWindow::dialogActions() const { return m_data->buttonBox->actions(); } -QskDialog::Action QskInputSubWindow::defaultAction() const +QskDialog::Action QskInputSubWindow::defaultDialogAction() const { return m_data->defaultAction; } -void QskInputSubWindow::setDefaultAction( QskDialog::Action action ) +void QskInputSubWindow::setDefaultDialogAction( QskDialog::Action action ) { m_data->defaultAction = action; } @@ -245,7 +245,7 @@ void QskInputSubWindow::keyPressEvent( QKeyEvent* event ) { if ( QskDialogButtonBox::isDefaultButtonKeyEvent( event ) ) { - QskPushButton* button = m_data->buttonBox->button( defaultAction() ); + auto button = m_data->buttonBox->button( defaultDialogAction() ); if ( button && button->isEnabled() ) button->click(); } diff --git a/src/dialogs/QskInputSubWindow.h b/src/dialogs/QskInputSubWindow.h index a066d72b..fb835c19 100644 --- a/src/dialogs/QskInputSubWindow.h +++ b/src/dialogs/QskInputSubWindow.h @@ -25,17 +25,23 @@ class QSK_EXPORT QskInputSubWindow : public QskDialogSubWindow Q_PROPERTY( QUrl symbolSource READ symbolSource WRITE setSymbolSource NOTIFY symbolSourceChanged FINAL ) + Q_PROPERTY( QskDialog::Actions dialogActions + READ dialogActions WRITE setDialogActions ) + + Q_PROPERTY( QskDialog::Action defaultDialogAction + READ defaultDialogAction WRITE setDefaultDialogAction ) + using Inherited = QskDialogSubWindow; public: QskInputSubWindow( QQuickItem* parent = nullptr ); ~QskInputSubWindow() override; - QskDialog::Actions actions() const; - void setActions( QskDialog::Actions ); + QskDialog::Actions dialogActions() const; + void setDialogActions( QskDialog::Actions ); - QskDialog::Action defaultAction() const; - void setDefaultAction( QskDialog::Action ); + QskDialog::Action defaultDialogAction() const; + void setDefaultDialogAction( QskDialog::Action ); void setInfoTextOptions( const QskTextOptions& ); QskTextOptions infoTextOptions() const; diff --git a/src/dialogs/QskInputWindow.cpp b/src/dialogs/QskInputWindow.cpp index 9642b550..37b6f0b7 100644 --- a/src/dialogs/QskInputWindow.cpp +++ b/src/dialogs/QskInputWindow.cpp @@ -55,26 +55,26 @@ QskInputSubWindow* QskInputWindow::subWindow() const return m_subWindow; } -QskDialog::Actions QskInputWindow::actions() const +QskDialog::Actions QskInputWindow::dialogActions() const { - return m_subWindow ? m_subWindow->actions() : QskDialog::NoAction; + return m_subWindow ? m_subWindow->dialogActions() : QskDialog::NoAction; } -void QskInputWindow::setActions( QskDialog::Actions actions ) +void QskInputWindow::setDialogActions( QskDialog::Actions actions ) { if ( m_subWindow ) - m_subWindow->setActions( actions ); + m_subWindow->setDialogActions( actions ); } -QskDialog::Action QskInputWindow::defaultAction() const +QskDialog::Action QskInputWindow::defaultDialogAction() const { - return m_subWindow ? m_subWindow->defaultAction() : QskDialog::NoAction; + return m_subWindow ? m_subWindow->defaultDialogAction() : QskDialog::NoAction; } -void QskInputWindow::setDefaultAction( QskDialog::Action action ) +void QskInputWindow::setDefaultDialogAction( QskDialog::Action action ) { if ( m_subWindow ) - m_subWindow->setDefaultAction( action ); + m_subWindow->setDefaultDialogAction( action ); } void QskInputWindow::setInfoText( const QString& text ) diff --git a/src/dialogs/QskInputWindow.h b/src/dialogs/QskInputWindow.h index 921659fb..5cc3455d 100644 --- a/src/dialogs/QskInputWindow.h +++ b/src/dialogs/QskInputWindow.h @@ -27,17 +27,23 @@ class QSK_EXPORT QskInputWindow : public QskDialogWindow Q_PROPERTY( QUrl symbolSource READ symbolSource WRITE setSymbolSource NOTIFY symbolSourceChanged FINAL ) + Q_PROPERTY( QskDialog::Actions dialogActions + READ dialogActions WRITE setDialogActions ) + + Q_PROPERTY( QskDialog::Action defaultDialogAction + READ defaultDialogAction WRITE setDefaultDialogAction ) + using Inherited = QskDialogWindow; public: QskInputWindow( QWindow* parent = nullptr ); ~QskInputWindow() override; - QskDialog::Actions actions() const; - void setActions( QskDialog::Actions ); + QskDialog::Actions dialogActions() const; + void setDialogActions( QskDialog::Actions ); - QskDialog::Action defaultAction() const; - void setDefaultAction( QskDialog::Action ); + QskDialog::Action defaultDialogAction() const; + void setDefaultDialogAction( QskDialog::Action ); void setInfoTextOptions( const QskTextOptions& ); QskTextOptions infoTextOptions() const; diff --git a/src/dialogs/QskSelectionSubWindow.cpp b/src/dialogs/QskSelectionSubWindow.cpp index 4da5ba3a..e46d757c 100644 --- a/src/dialogs/QskSelectionSubWindow.cpp +++ b/src/dialogs/QskSelectionSubWindow.cpp @@ -39,7 +39,7 @@ QskSelectionSubWindow::QskSelectionSubWindow( QQuickItem* parent ) : Inherited( parent ) { setInputControl( new ListBox( this ) ); - setActions( QskDialog::Ok | QskDialog::Cancel ); + setDialogActions( QskDialog::Ok | QskDialog::Cancel ); } QskSelectionSubWindow::~QskSelectionSubWindow()