From 459e603976f44f49df729056fb043e2065678dab Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 21 Oct 2020 22:05:14 +0200 Subject: [PATCH] Moved the Subscribe Button for Boards to a new place & set Stylesheet for the "Apply & Close" button --- .../gui/Posted/PostedListWidgetWithModel.ui | 371 ++++++++++-------- .../src/gui/qss/stylesheet/Standard.qss | 49 ++- retroshare-gui/src/qss/qdarkstyle.qss | 34 +- 3 files changed, 285 insertions(+), 169 deletions(-) diff --git a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui index 615021115..11c6bd63f 100644 --- a/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui +++ b/retroshare-gui/src/gui/Posted/PostedListWidgetWithModel.ui @@ -17,7 +17,7 @@ - 1 + 0 true @@ -44,61 +44,90 @@ false - - - 6 - - - - - 0 - - - + + + + + - 75 - true + 14 - Popularity + TextLabel - - - - - 75 - true - + + + + QLayout::SetMinimumSize - - 0 + + 0 - + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 13 + + + + + + + + + 0 + 0 + + + + + 50 + false + false + + + + + + + Subscribe + + + false + + + + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 13 + + + + + - - - - - 0 - 0 - - - - - 75 - true - - - - Posts - - - - + @@ -111,96 +140,14 @@ - - - - - 75 - true - - - - Created - - - - - - - unknown - - - - - - - - 75 - true - - - - Administrator: - - - - - - - unknown - - - true - - - - - - - - 75 - true - - - - Distribution: - - - - + unknown - - - - - 0 - 0 - - - - - 75 - true - - - - Last Post: - - - - - - - unknown - - - - + @@ -222,47 +169,149 @@ - - + + - 14 + 75 + true - TextLabel + Created + + + + + 75 + true + + + + 0 + + + + + + + unknown + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Posts + + + + + + + + 75 + true + + + + Administrator: + + + + + + + unknown + + + true + + + + + + + + 75 + true + + + + Popularity + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Last Post: + + + + + + + + 75 + true + + + + Distribution: + + + + + + + unknown + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + - - - - - 0 - 0 - - - - - 50 - false - false - - - - - - - Subscribe - - - false - - - - + @@ -271,7 +320,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">Description</span></p></body></html> diff --git a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss index a5ea03eca..9d1c0d17a 100644 --- a/retroshare-gui/src/gui/qss/stylesheet/Standard.qss +++ b/retroshare-gui/src/gui/qss/stylesheet/Standard.qss @@ -135,7 +135,7 @@ CreateGxsChannelMsg QPushButton#postButton:hover { CreateCircleDialog QPushButton#createButton, CreateLobbyDialog QPushButton#createButton, IdEditDialog QPushButton#createButton, CreateGxsForumMsg QPushButton#postButton, -GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#createButton { +GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#createButton{ font: bold; font-size: 15px; color: white; @@ -148,14 +148,46 @@ GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#create CreateCircleDialog QPushButton#createButton:hover, CreateLobbyDialog QPushButton#createButton:hover, IdEditDialog QPushButton#createButton:hover, CreateGxsForumMsg QPushButton#postButton:hover, -GxsCreateCommentDialog QPushButton#postButton:hover, GxsGroupDialog QPushButton#createButton:hover { +GxsCreateCommentDialog QPushButton#postButton:hover, GxsGroupDialog QPushButton#createButton:hover, +ShareManager QPushButton#closeButton:hover { background: #03b1f3; border-radius: 4px; min-width: 4em; padding: 2px; } -CreateGxsForumMsg QPushButton#postButton:disabled { +ShareManager QPushButton#closeButton { + font: bold; + font-size: 15px; + color: white; + background: #0099cc; + border-radius: 4px; + max-height: 27px; + min-width: 4em; + padding: 2px; + padding-left: 6px; + padding-right: 6px; +} + +ShareManager QPushButton#addButton { + font: bold; + font-size: 15px; + color: white; + background: #32CD32; + border-radius: 4px; + max-height: 27px; + min-width: 4em; + padding: 4px; +} + +ShareManager QPushButton#addButton:hover { + background: #5AD75A; + border-radius: 4px; + min-width: 4em; + padding: 4px; +} + +CreateGxsForumMsg QPushButton#postButton:disabled, PostedCreatePostDialog QPushButton#postButton:disabled { font: bold; font-size: 15px; color: white; @@ -822,17 +854,20 @@ GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton:disabled { } /* only for MenuButtonPopup */ -GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton[popupMode="1"] { + +GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton[popupMode="1"], +PostedListWidgetWithModel QToolButton#subscribeToolButton[popupMode="1"]{ padding-right: 0px; } -GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton::menu-arrow { +GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton::menu-arrow, +PostedListWidgetWithModel QToolButton#subscribeToolButton::menu-arrow{ image: none; } -GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton::menu-button { +GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton::menu-button, +PostedListWidgetWithModel QToolButton#subscribeToolButton::menu-button{ image: none; - } GxsChannelFilesStatusWidget QToolButton#openFolderToolButton::menu-indicator { diff --git a/retroshare-gui/src/qss/qdarkstyle.qss b/retroshare-gui/src/qss/qdarkstyle.qss index 7e3a78506..da0a73ac4 100644 --- a/retroshare-gui/src/qss/qdarkstyle.qss +++ b/retroshare-gui/src/qss/qdarkstyle.qss @@ -1254,7 +1254,8 @@ GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#create CreateCircleDialog QPushButton#createButton:hover, CreateLobbyDialog QPushButton#createButton:hover, IdEditDialog QPushButton#createButton:hover, CreateGxsForumMsg QPushButton#postButton:hover, -GxsCreateCommentDialog QPushButton#postButton:hover, GxsGroupDialog QPushButton#createButton:hover { +GxsCreateCommentDialog QPushButton#postButton:hover, GxsGroupDialog QPushButton#createButton:hover, +ShareManager QPushButton#closeButton { background: #03b1f3; border-radius: 4px; min-width: 4em; @@ -1272,6 +1273,37 @@ CreateGxsForumMsg QPushButton#postButton:disabled { padding: 2px; } +ShareManager QPushButton#closeButton { + font: bold; + font-size: 15px; + color: white; + background: #0099cc; + border-radius: 4px; + max-height: 27px; + min-width: 4em; + padding: 2px; + padding-left: 6px; + padding-right: 6px; +} + +ShareManager QPushButton#addButton { + font: bold; + font-size: 15px; + color: white; + background: #32CD32; + border-radius: 4px; + max-height: 27px; + min-width: 4em; + padding: 4px; +} + +ShareManager QPushButton#addButton:hover { + background: #5AD75A; + border-radius: 4px; + min-width: 4em; + padding: 4px; +} + QTabBar#smTab::tab{ height: 32px; width: 32px;