Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-11 07:29:38 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2368 from defnax/ui-fix-17

Browse Source 
Wiki Editor and stylesheets fixes
This commit is contained in:
defnax 2021-03-07 12:52:07 +01:00 committed by GitHub
commit 51dbbfb222
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp
View File

@ -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();
}

18
retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui
View File

@ -14,10 +14,19 @@
<string/>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<property name="verticalSpacing">
<property name="leftMargin">
<number>0</number>
</property>
<property name="margin">
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="verticalSpacing">
<number>0</number>
</property>
<item row="0" column="0">
@ -112,6 +121,9 @@
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="topMargin">
<number>6</number>
</property>
<item>
<widget class="QToolButton" name="toolButton_Show">
<property name="text">
@ -246,7 +258,7 @@
<item>
<widget class="QPushButton" name="pushButton_History">
<property name="text">
<string>Show Edit History</string>
<string>History</string>
</property>
</widget>
</item>

1
retroshare-gui/src/gui/icons.qrc
View File

@ -93,6 +93,7 @@
<file>icons/png/forums.png</file>
<file>icons/png/fullscreen_arrows.png</file>
<file>icons/png/highlight.png</file>
<file>icons/png/history-clock-white.png</file>
<file>icons/png/help.png</file>
<file>icons/png/home.png</file>
<file>icons/png/info.png</file>

BIN
retroshare-gui/src/gui/icons/png/history-clock-blue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
retroshare-gui/src/gui/icons/png/history-clock-white.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

17
retroshare-gui/src/gui/qss/stylesheet/Standard.qss
View File

@ -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;
}

2
retroshare-gui/src/qss/qdarkstyle-v2.qss
View File

@ -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;
}

4
retroshare-gui/src/qss/qdarkstyle.qss
View File

@ -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;
}