diff --git a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp index 1918df882..077641621 100644 --- a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp +++ b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp @@ -88,6 +88,7 @@ WikiEditDialog::WikiEditDialog(QWidget *parent) ui.toolButton_Show->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/down-arrow.png"))); ui.toolButton_Hide->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/up-arrow.png"))); ui.pushButton_Preview->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/search.png"))); + ui.pushButton_History->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/history-clock-white.png"))); ui.checkBox_OldHistory->setChecked(false); mOldHistoryEnabled = false; @@ -294,12 +295,12 @@ void WikiEditDialog::historyToggle() if (ui.groupBox_History->isHidden()) { ui.groupBox_History->show(); - ui.pushButton_History->setText(tr("Hide Edit History")); + ui.pushButton_History->setToolTip(tr("Hide Edit History")); } else { ui.groupBox_History->hide(); - ui.pushButton_History->setText(tr("Show Edit History")); + ui.pushButton_History->setToolTip(tr("Show Edit History")); } } @@ -409,7 +410,7 @@ void WikiEditDialog::setPreviousPage(RsWikiSnapshot &page) void WikiEditDialog::setNewPage() { mNewPage = true; - mRepublishMode = false; + mRepublishMode = false; mHistoryLoaded = false; ui.lineEdit_Page->setText(""); ui.lineEdit_PrevVersion->setText(""); @@ -418,14 +419,14 @@ void WikiEditDialog::setNewPage() redrawPage(); ui.treeWidget_History->clear(); ui.groupBox_History->hide(); - ui.pushButton_History->setText(tr("Show Edit History")); + ui.pushButton_History->setToolTip(tr("Show Edit History")); - ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/addpage.png")); + ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/addpage.png")); ui.headerFrame->setHeaderText(tr("Create New Wiki Page")); setWindowTitle(tr("Create New Wiki Page")); /* No need for for REQUIRED ID */ - ui.comboBox_IdChooser->loadIds(0, RsGxsId()); + ui.comboBox_IdChooser->loadIds(0, RsGxsId()); textReset(); } diff --git a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui index 04ce626fa..c971c1398 100644 --- a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui +++ b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui @@ -14,10 +14,19 @@ - + 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -112,6 +121,9 @@ + + 6 + @@ -246,7 +258,7 @@ - Show Edit History + History diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index 995157b69..48071b201 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -93,6 +93,7 @@ icons/png/forums.png icons/png/fullscreen_arrows.png icons/png/highlight.png + icons/png/history-clock-white.png icons/png/help.png icons/png/home.png icons/png/info.png diff --git a/retroshare-gui/src/gui/icons/png/history-clock-blue.png b/retroshare-gui/src/gui/icons/png/history-clock-blue.png new file mode 100644 index 000000000..562667468 Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/history-clock-blue.png differ diff --git a/retroshare-gui/src/gui/icons/png/history-clock-white.png b/retroshare-gui/src/gui/icons/png/history-clock-white.png new file mode 100644 index 000000000..95e93d7ae Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/history-clock-white.png differ diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index a9c191749..2b9dcab67 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -1224,3 +1224,20 @@ NewFriendList QTreeView::branch:open:has-children:has-siblings { border-image: none; image: url(:/images/arrow-down.png); } + +WikiEditDialog QPushButton#pushButton_History { + font: bold; + font-size: 15px; + color: white; + background: #5bb62b; + border-radius: 4px; + max-height: 20px; + min-width: 4em; + padding: 2px; + padding-left: 6px; + padding-right: 6px; +} + +WikiEditDialog QPushButton#pushButton_History:hover { + background: #57af29; +} diff --git a/retroshare-gui/src/qss/qdarkstyle-v2.qss b/retroshare-gui/src/qss/qdarkstyle-v2.qss index 985143edd..a98b1e08f 100644 --- a/retroshare-gui/src/qss/qdarkstyle-v2.qss +++ b/retroshare-gui/src/qss/qdarkstyle-v2.qss @@ -2243,7 +2243,7 @@ BoardPostDisplayWidget_card QFrame#mainFrame[new=true] { BoardPostDisplayWidget_compact QLabel#titleLabel, BoardPostDisplayWidget_card QLabel#titleLabel{ - font-size: 14pt; + font-size: 12pt; font: bold; } diff --git a/retroshare-gui/src/qss/qdarkstyle.qss b/retroshare-gui/src/qss/qdarkstyle.qss index 77987ce4f..bac32c219 100644 --- a/retroshare-gui/src/qss/qdarkstyle.qss +++ b/retroshare-gui/src/qss/qdarkstyle.qss @@ -1173,7 +1173,7 @@ PostedListWidgetWithModel QToolButton#subscribeToolButton:hover { GxsForumThreadWidget QToolButton#subscribeToolButton { font: bold; - font-size: 14pt; + font-size: 12pt; color: white; background: #0099cc; border-radius: 4px; @@ -1473,7 +1473,7 @@ BoardPostDisplayWidget_card QLabel#newLabel { BoardPostDisplayWidget_compact QLabel#titleLabel, BoardPostDisplayWidget_card QLabel#titleLabel{ - font-size: 14pt; + font-size: 12pt; font: bold; }