diff --git a/saoriview.cpp b/saoriview.cpp index 5c9002e..3b5fd59 100644 --- a/saoriview.cpp +++ b/saoriview.cpp @@ -55,7 +55,7 @@ m_maxid = 0; m_config = "/" + m_account + "/" + m_viewname; - ui->pushButton_pin->setChecked( + ui->actionPin->setChecked( SaoriApplication::saori()->setting()->value(SAORI_SETTING_VIEW + m_config + SAORI_SETTING_VIEW_PINED,false).toBool()); ui->header->hide(); @@ -392,11 +392,11 @@ void SaoriView::closeEvent(QCloseEvent *event) { SaoriApplication::saori()->setting()->beginGroup(SAORI_SETTING_VIEW); - if (ui->pushButton_pin->isChecked()) { + if (ui->actionPin->isChecked()) { SaoriApplication::saori()->setting()->setValue(m_config + SAORI_SETTING_VIEW_GEOMETRY, qobject_cast(parent())->geometry()); } - SaoriApplication::saori()->setting()->setValue(m_config + SAORI_SETTING_VIEW_PINED,ui->pushButton_pin->isChecked()); + SaoriApplication::saori()->setting()->setValue(m_config + SAORI_SETTING_VIEW_PINED,ui->actionPin->isChecked()); SaoriApplication::saori()->setting()->endGroup(); QWidget::closeEvent(event); } @@ -461,7 +461,7 @@ void SaoriView::timerUpdate() { m_timecount ++; - if (ui->pushButton_autoreload->isChecked()) { + if (ui->actionAutoreload->isChecked()) { if (m_timecount >= SaoriApplication::saori()->setting()->value( SAORI_SETTING_RELOADINT,SAORI_SETTING_RELOADINT_DEFAULT).toInt()) { reload(); @@ -483,13 +483,13 @@ return; } -void SaoriView::on_pushButton_newest_clicked() +void SaoriView::on_actionReload_triggered() +{ + reload(); +} + +void SaoriView::on_actionNewest_triggered() { viewEntriesAdjustment(); ui->scrollArea->verticalScrollBar()->setValue(0); } - -void SaoriView::on_pushButton_reload_clicked() -{ - reload(); -} diff --git a/saoriview.h b/saoriview.h index f79bb82..b06f0c8 100644 --- a/saoriview.h +++ b/saoriview.h @@ -91,8 +91,8 @@ void openAccountView(const QStringList view); private slots: - void on_pushButton_newest_clicked(); - void on_pushButton_reload_clicked(); + void on_actionReload_triggered(); + void on_actionNewest_triggered(); }; #endif // SAORIVIEW_H diff --git a/saoriview.ui b/saoriview.ui index f3a845b..8d561c8 100644 --- a/saoriview.ui +++ b/saoriview.ui @@ -53,7 +53,7 @@ 0 0 297 - 363 + 368 @@ -82,78 +82,29 @@ QFrame::StyledPanel - QFrame::Raised + QFrame::Plain - 1 + 0 - + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + - - - Pin - - - - :/icons/ionicons/pin.svg:/icons/ionicons/pin.svg - - - true - - - - - - - Notify - - - - :/icons/ionicons/alert.svg:/icons/ionicons/alert.svg - - - true - - - - - - - Auto reload - - - - :/icons/ionicons/loop.svg:/icons/ionicons/loop.svg - - - true - - - - - - - Newest - - - - :/icons/ionicons/arrow-up-c.svg:/icons/ionicons/arrow-up-c.svg - - - - - - - Reload - - - - :/icons/ionicons/refresh.svg:/icons/ionicons/refresh.svg - - - - - + Qt::Horizontal @@ -166,29 +117,102 @@ - - - - 0 - 0 - + + + false - - Toot + + false - - - :/icons/ionicons/chatbox.svg:/icons/ionicons/chatbox.svg - - - true - + + + + + + + + + + + + :/icons/ionicons-md/md-refresh.svg:/icons/ionicons-md/md-refresh.svg + + + Reload + + + F5 + + + + + true + + + + :/icons/ionicons-md/md-notifications.svg:/icons/ionicons-md/md-notifications.svg + + + Notification + + + + + true + + + + :/icons/ionicons-md/md-sync.svg:/icons/ionicons-md/md-sync.svg + + + Autoreload + + + + + + :/icons/ionicons-md/md-arrow-round-up.svg:/icons/ionicons-md/md-arrow-round-up.svg + + + Newest + + + Ctrl+Home + + + + + true + + + + :/icons/ionicons-md/md-text.svg:/icons/ionicons-md/md-text.svg + + + Toot + + + Ctrl+T + + + + + true + + + + :/icons/ionicons-md/md-bookmark.svg:/icons/ionicons-md/md-bookmark.svg + + + Pin + + @@ -209,18 +233,18 @@ - pushButton_toot + actionToot toggled(bool) tootWidget setVisible(bool) - 306 - 442 + -1 + -1 165 - 418 + 355