diff --git a/saoriconfiguredialog.cpp b/saoriconfiguredialog.cpp index 5666e95..f33d2ed 100644 --- a/saoriconfiguredialog.cpp +++ b/saoriconfiguredialog.cpp @@ -26,8 +26,10 @@ #include "saoriconfiguredialog.h" #include "ui_saoriconfiguredialog.h" -#include -#include +#include "saoridef.h" +#include "saoriapplication.h" +#include "saoriaddaccountdialog.h" + #include #include @@ -65,3 +67,15 @@ resetValue(); hide(); } + +void SaoriConfigureDialog::on_pushButton_addacount_clicked() +{ + auto dialog = new SaoriAddAccountDialog(this); + if (dialog->exec() == QDialog::Accepted) { + dialog->m_account->setParent(QApplication::instance()); + SaoriApplication::getAccountList()->append(dialog->m_account); + } + emit accountsUpdated(); + delete dialog; + +} diff --git a/saoriconfiguredialog.h b/saoriconfiguredialog.h index 7c4669f..df0f319 100644 --- a/saoriconfiguredialog.h +++ b/saoriconfiguredialog.h @@ -46,6 +46,12 @@ virtual void accept(); virtual void reject(); +signals: + void accountsUpdated(); + +private slots: + void on_pushButton_addacount_clicked(); + private: Ui::SaoriConfigureDialog *ui; }; diff --git a/saoriconfiguredialog.ui b/saoriconfiguredialog.ui index a1f2663..4758d7e 100644 --- a/saoriconfiguredialog.ui +++ b/saoriconfiguredialog.ui @@ -17,7 +17,7 @@ - 0 + 1 @@ -70,6 +70,53 @@ + + + Accounts Setting + + + + + + Account: + + + + + + + + + + Remove Account from list + + + + + + + Add Account + + + + + + + Qt::Vertical + + + QSizePolicy::Preferred + + + + 20 + 40 + + + + + + diff --git a/saoriwindow.cpp b/saoriwindow.cpp index 7a0f333..5c9f280 100644 --- a/saoriwindow.cpp +++ b/saoriwindow.cpp @@ -40,7 +40,7 @@ ui->setupUi(this); m_configDialog = new SaoriConfigureDialog(); m_configDialog->setModal(true); - connect(ui->actionAdd_Account,&QAction::triggered,this,&SaoriWindow::openAccountDialog); + connect(m_configDialog,&SaoriConfigureDialog::accountsUpdated,this,&SaoriWindow::updateTimelineList); updateTimelineList(); } @@ -142,17 +142,6 @@ sub->show(); } -void SaoriWindow::openAccountDialog() -{ - auto dialog = new SaoriAddAccountDialog(this); - if (dialog->exec() == QDialog::Accepted) { - dialog->m_account->setParent(QApplication::instance()); - SaoriApplication::getAccountList()->append(dialog->m_account); - } - updateTimelineList(); - delete dialog; -} - void SaoriWindow::updateTimelineList() { ui->timelineTree->clear(); diff --git a/saoriwindow.h b/saoriwindow.h index c3a8cb3..7db7886 100644 --- a/saoriwindow.h +++ b/saoriwindow.h @@ -54,7 +54,6 @@ void openAccountView(const QStringList viewName); protected slots: - void openAccountDialog(); void updateTimelineList(); protected: diff --git a/saoriwindow.ui b/saoriwindow.ui index 85ba9c2..810e40b 100644 --- a/saoriwindow.ui +++ b/saoriwindow.ui @@ -76,7 +76,6 @@ &Edit -