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<QWidget *>(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 @@
<x>0</x>
<y>0</y>
<width>297</width>
- <height>363</height>
+ <height>368</height>
</rect>
</property>
<property name="sizePolicy">
@@ -82,78 +82,29 @@
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
- <enum>QFrame::Raised</enum>
+ <enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
- <number>1</number>
+ <number>0</number>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
<item>
- <widget class="QPushButton" name="pushButton_pin">
- <property name="toolTip">
- <string>Pin</string>
- </property>
- <property name="icon">
- <iconset resource="saori.qrc">
- <normaloff>:/icons/ionicons/pin.svg</normaloff>:/icons/ionicons/pin.svg</iconset>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_notify">
- <property name="toolTip">
- <string>Notify</string>
- </property>
- <property name="icon">
- <iconset resource="saori.qrc">
- <normaloff>:/icons/ionicons/alert.svg</normaloff>:/icons/ionicons/alert.svg</iconset>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_autoreload">
- <property name="toolTip">
- <string>Auto reload</string>
- </property>
- <property name="icon">
- <iconset resource="saori.qrc">
- <normaloff>:/icons/ionicons/loop.svg</normaloff>:/icons/ionicons/loop.svg</iconset>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_newest">
- <property name="toolTip">
- <string>Newest</string>
- </property>
- <property name="icon">
- <iconset resource="saori.qrc">
- <normaloff>:/icons/ionicons/arrow-up-c.svg</normaloff>:/icons/ionicons/arrow-up-c.svg</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_reload">
- <property name="toolTip">
- <string>Reload</string>
- </property>
- <property name="icon">
- <iconset resource="saori.qrc">
- <normaloff>:/icons/ionicons/refresh.svg</normaloff>:/icons/ionicons/refresh.svg</iconset>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer">
+ <spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
@@ -166,29 +117,102 @@
</spacer>
</item>
<item>
- <widget class="QPushButton" name="pushButton_toot">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <widget class="QToolBar" name="toolBar">
+ <property name="movable">
+ <bool>false</bool>
</property>
- <property name="toolTip">
- <string>Toot</string>
+ <property name="floatable">
+ <bool>false</bool>
</property>
- <property name="icon">
- <iconset resource="saori.qrc">
- <normaloff>:/icons/ionicons/chatbox.svg</normaloff>:/icons/ionicons/chatbox.svg</iconset>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
+ <addaction name="actionPin"/>
+ <addaction name="actionNotification"/>
+ <addaction name="actionAutoreload"/>
+ <addaction name="separator"/>
+ <addaction name="actionNewest"/>
+ <addaction name="actionReload"/>
+ <addaction name="separator"/>
+ <addaction name="actionToot"/>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
+ <action name="actionReload">
+ <property name="icon">
+ <iconset resource="saori.qrc">
+ <normaloff>:/icons/ionicons-md/md-refresh.svg</normaloff>:/icons/ionicons-md/md-refresh.svg</iconset>
+ </property>
+ <property name="text">
+ <string>Reload</string>
+ </property>
+ <property name="shortcut">
+ <string>F5</string>
+ </property>
+ </action>
+ <action name="actionNotification">
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="icon">
+ <iconset resource="saori.qrc">
+ <normaloff>:/icons/ionicons-md/md-notifications.svg</normaloff>:/icons/ionicons-md/md-notifications.svg</iconset>
+ </property>
+ <property name="text">
+ <string>Notification</string>
+ </property>
+ </action>
+ <action name="actionAutoreload">
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="icon">
+ <iconset resource="saori.qrc">
+ <normaloff>:/icons/ionicons-md/md-sync.svg</normaloff>:/icons/ionicons-md/md-sync.svg</iconset>
+ </property>
+ <property name="text">
+ <string>Autoreload</string>
+ </property>
+ </action>
+ <action name="actionNewest">
+ <property name="icon">
+ <iconset resource="saori.qrc">
+ <normaloff>:/icons/ionicons-md/md-arrow-round-up.svg</normaloff>:/icons/ionicons-md/md-arrow-round-up.svg</iconset>
+ </property>
+ <property name="text">
+ <string>Newest</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+Home</string>
+ </property>
+ </action>
+ <action name="actionToot">
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="icon">
+ <iconset resource="saori.qrc">
+ <normaloff>:/icons/ionicons-md/md-text.svg</normaloff>:/icons/ionicons-md/md-text.svg</iconset>
+ </property>
+ <property name="text">
+ <string>Toot</string>
+ </property>
+ <property name="shortcut">
+ <string>Ctrl+T</string>
+ </property>
+ </action>
+ <action name="actionPin">
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="icon">
+ <iconset resource="saori.qrc">
+ <normaloff>:/icons/ionicons-md/md-bookmark.svg</normaloff>:/icons/ionicons-md/md-bookmark.svg</iconset>
+ </property>
+ <property name="text">
+ <string>Pin</string>
+ </property>
+ </action>
</widget>
<customwidgets>
<customwidget>
@@ -209,18 +233,18 @@
</resources>
<connections>
<connection>
- <sender>pushButton_toot</sender>
+ <sender>actionToot</sender>
<signal>toggled(bool)</signal>
<receiver>tootWidget</receiver>
<slot>setVisible(bool)</slot>
<hints>
<hint type="sourcelabel">
- <x>306</x>
- <y>442</y>
+ <x>-1</x>
+ <y>-1</y>
</hint>
<hint type="destinationlabel">
<x>165</x>
- <y>418</y>
+ <y>355</y>
</hint>
</hints>
</connection>