Merge branch 'master' of github.com:nextgis/lib_ngstd

nextgis · Dec 24, 2018 · 2bd8f2a · 2bd8f2a
2 parents 2d7fe7a + c9730d7
commit 2bd8f2a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/src/framework/CMakeLists.txt b/src/framework/CMakeLists.txt
@@ -40,10 +40,10 @@ set(PROJECT_SOURCES
 set(ACCESS_HHEADERS
     ${PROJECT_SOURCE_DIR}/access/access.h
     ${PROJECT_SOURCE_DIR}/access/signbutton.h
+    ${PROJECT_SOURCE_DIR}/access/signdialog.h
 )
 
 set(PRIVATE_HEADERS ${PRIVATE_HEADERS}
-    ${PROJECT_SOURCE_DIR}/access/signdialog.h
     ${PROJECT_SOURCE_DIR}/access/signserver.h
 )
 

diff --git a/src/framework/access/signbutton.h b/src/framework/access/signbutton.h
@@ -31,7 +31,8 @@ class NGFRAMEWORK_EXPORT NGSignInButton : public QToolButton
 public:
     NGSignInButton(const QString &clientId, const QString &scope = "user_info.read",
                    QWidget * parent = nullptr);
-    virtual ~NGSignInButton() = default;               
+    virtual ~NGSignInButton() = default;
+    inline QDialog *getDialog () const { return m_signDialog; }
 
 signals:
     void userInfoUpdated();

diff --git a/src/framework/access/signdialog.cpp b/src/framework/access/signdialog.cpp
@@ -47,6 +47,11 @@ void NGSignDialog::updateContent()
     }
 }
 
+QPushButton *NGSignDialog::getSignButton () const
+{
+    return ui->signButton;
+}
+
 void NGSignDialog::onSignClicked()
 {
     if(NGAccess::instance().isUserAuthorized()) {

diff --git a/src/framework/access/signdialog.h b/src/framework/access/signdialog.h
@@ -1,13 +1,15 @@
 #ifndef SIGNDIALOG_H
 #define SIGNDIALOG_H
 
+#include "framework/framework.h"
+
 #include <QDialog>
 
 namespace Ui {
 class NGSignDialog;
 }
 
-class Q_DECL_HIDDEN NGSignDialog : public QDialog
+class NGFRAMEWORK_EXPORT NGSignDialog : public QDialog
 {
     Q_OBJECT
 
@@ -16,6 +18,8 @@ class Q_DECL_HIDDEN NGSignDialog : public QDialog
     virtual ~NGSignDialog();
     void updateContent();
 
+    QPushButton *getSignButton () const;
+
 private slots:
     void onSignClicked();