Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 00:19:25 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2170 from defnax/wire-ui-fixes-2

Browse Source 
[TheWire] few ui fixes
This commit is contained in:
defnax 2020-12-18 18:18:40 +01:00 committed by GitHub
commit 45f259975a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 130 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/TheWire/PulseAddDialog.cpp
View File

@ -99,7 +99,7 @@ void PulseAddDialog::cleanup()
ui.frame_URL->setEnabled(false);
ui.pushButton_Post->setEnabled(false);
ui.pushButton_Post->setText("Post Pulse to Wire");
ui.pushButton_Post->setText("Post");
ui.frame_input->setVisible(true);
ui.widget_sentiment->setVisible(true);

51
retroshare-gui/src/gui/TheWire/PulseAddDialog.ui
View File

@ -7,17 +7,17 @@
<x>0</x>
<y>0</y>
<width>720</width>
<height>633</height>
<height>493</height>
</rect>
</property>
<property name="windowTitle">
<string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QFrame" name="frame">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -34,8 +34,8 @@
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="maximumSize">
<size>
@ -55,24 +55,37 @@
</property>
</widget>
</item>
<item>
<item row="0" column="1">
<widget class="QLabel" name="label_groupName">
<property name="text">
<string>GroupLabel</string>
</property>
</widget>
</item>
<item>
<item row="0" column="2">
<widget class="GxsIdLabel" name="label_idName">
<property name="text">
<string>IDLabel</string>
</property>
</widget>
</item>
<item row="0" column="3">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<item row="1" column="0">
<widget class="QFrame" name="frame_reply">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
@ -149,7 +162,7 @@
</layout>
</widget>
</item>
<item>
<item row="2" column="0">
<widget class="QFrame" name="frame_input">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
@ -286,15 +299,8 @@
</layout>
</widget>
</item>
<item>
<item row="3" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="pushButton_Cancel">
<property name="text">
<string>Cancel</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
@ -311,7 +317,14 @@
<item>
<widget class="QPushButton" name="pushButton_Post">
<property name="text">
<string>Post Pulse to Wire</string>
<string>Post </string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_Cancel">
<property name="text">
<string>Cancel</string>
</property>
</widget>
</item>

4
retroshare-gui/src/gui/TheWire/PulseTopLevel.ui
View File

@ -740,10 +740,6 @@
<property name="text">
<string>FOLLOW</string>
</property>
<property name="icon">
<iconset resource="TheWire_images.qrc">
<normaloff>:/images/invite.png</normaloff>:/images/invite.png</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>

4
retroshare-gui/src/gui/TheWire/PulseViewGroup.ui
View File

@ -509,10 +509,6 @@
<property name="text">
<string>FOLLOW</string>
</property>
<property name="icon">
<iconset resource="TheWire_images.qrc">
<normaloff>:/images/invite.png</normaloff>:/images/invite.png</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>

49
retroshare-gui/src/gui/TheWire/WireDialog.ui
View File

@ -20,6 +20,18 @@
<string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
<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="QFrame" name="frame_toolbar">
<property name="sizePolicy">
@ -29,12 +41,24 @@
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
<enum>QFrame::Plain</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<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="QToolButton" name="toolButton_createAccount">
<property name="text">
@ -63,13 +87,6 @@
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="toolButton_5">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
@ -192,7 +209,7 @@
<x>0</x>
<y>0</y>
<width>228</width>
<height>442</height>
<height>488</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
@ -253,6 +270,10 @@
<property name="text">
<string>&lt;</string>
</property>
<property name="icon">
<iconset resource="../icons.qrc">
<normaloff>:/icons/png/arrow-left.png</normaloff>:/icons/png/arrow-left.png</iconset>
</property>
</widget>
</item>
<item>
@ -260,6 +281,10 @@
<property name="text">
<string>&gt;</string>
</property>
<property name="icon">
<iconset resource="../icons.qrc">
<normaloff>:/icons/png/arrow-right.png</normaloff>:/icons/png/arrow-right.png</iconset>
</property>
</widget>
</item>
<item>
@ -357,8 +382,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>508</width>
<height>435</height>
<width>523</width>
<height>484</height>
</rect>
</property>
<property name="styleSheet">

2
retroshare-gui/src/gui/TheWire/WireGroupItem.cpp
View File

@ -138,7 +138,7 @@ void WireGroupItem::setSelected(bool on)
}
else
{
setBackground("gray");
setBackground("white");
}
}

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

@ -135,7 +135,9 @@ 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,
PulseAddDialog QPushButton#pushButton_Post, PulseTopLevel QToolButton#toolButton_follow,
PulseViewGroup QToolButton#toolButton_follow{
font: bold;
font-size: 15px;
color: white;
@ -144,16 +146,21 @@ GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#create
max-height: 27px;
min-width: 4em;
padding: 2px;
padding-left: 6px;
padding-right: 6px;
}
CreateCircleDialog QPushButton#createButton:hover, CreateLobbyDialog QPushButton#createButton:hover,
IdEditDialog QPushButton#createButton:hover, CreateGxsForumMsg QPushButton#postButton:hover,
GxsCreateCommentDialog QPushButton#postButton:hover, GxsGroupDialog QPushButton#createButton:hover,
ShareManager QPushButton#closeButton:hover {
ShareManager QPushButton#closeButton:hover, PulseAddDialog QPushButton#pushButton_Post:hover,
PulseTopLevel QToolButton#toolButton_follow:hover, PulseViewGroup QToolButton#toolButton_follow:hover{
background: #03b1f3;
border-radius: 4px;
min-width: 4em;
padding: 2px;
padding-left: 6px;
padding-right: 6px;
}
ShareManager QPushButton#closeButton {
@ -206,7 +213,8 @@ SearchDialog QPushButton#pushButtonSearch:hover{
}
CreateGxsForumMsg QPushButton#postButton:disabled, PostedCreatePostDialog QPushButton#submitButton:disabled,
CreateGxsChannelMsg QPushButton#postButton:disabled, GxsCreateCommentDialog QPushButton#postButton:disabled {
CreateGxsChannelMsg QPushButton#postButton:disabled, GxsCreateCommentDialog QPushButton#postButton:disabled,
PulseAddDialog QPushButton#pushButton_Post:disabled {
font: bold;
font-size: 15px;
color: white;
@ -214,7 +222,8 @@ CreateGxsChannelMsg QPushButton#postButton:disabled, GxsCreateCommentDialog QPus
border-radius: 4px;
max-height: 27px;
min-width: 4em;
padding: 2px;
padding-left: 6px;
padding-right: 6px;
}
/* Forums */
@ -492,6 +501,7 @@ GxsCircleItem QLabel#nameLabel, QLabel#titleLabel {
font: bold italic;
}
ForumNewItem > QFrame#frame, ForumMsgItem > QFrame#frame {
border: 2px solid #CCCCCC;
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEEEEE, stop: 1 #CCCCCC);
@ -1045,8 +1055,7 @@ MessageWidget QTextBrowser#toText , QTextBrowser#ccText , QTextBrowser#bccText {
border: none;
}
WireGroupItem QWidget:hover
{
WireGroupItem QWidget:hover{
background-color: #7ecbfb;
}

5
retroshare-gui/src/gui/qss/stylesheet/qss.default
View File

@ -89,6 +89,11 @@ GxsChannelPostsWidgetWithModel QLabel#channelName_LB
qproperty-fontSizeFactor: 250;
}
PostedListWidgetWithModel QLabel#namelabel
{
qproperty-fontSizeFactor: 250;
}
CreateLobbyDialog QLabel#lobbyInfoLabel
{
qproperty-fontSizeFactor: 150;

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

@ -2179,6 +2179,11 @@ GxsChannelPostItem QFrame#mainFrame {
background-color: #19232D;
}
GxsChannelPostItem QLabel#subjectLabel, GxsChannelPostItem QLabel#titleLabel {
font: 12pt;
font: bold italic;
}
BoardPostDisplayWidget_compact QPushButton#shareButton {
background-color: transparent;
min-width: 80px;
@ -2241,6 +2246,10 @@ BoardPostDisplayWidget_card QLabel#titleLabel{
font: bold;
}
GxsForumMsgItem QFrame#frame{
background-color: #19232D;
}
WireGroupItem QFrame#wire_frame{
background: transparent;
}

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

@ -1239,6 +1239,23 @@ GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton::menu-button {
}
GxsChannelPostItem QFrame#mainFrame {
background: #302F2F;
}
GxsChannelPostItem > QFrame#mainFrame [new=false]{
background: #302F2F;
}
GxsChannelPostItem > QFrame#mainFrame[new=true] {
background-color: #005000;
}
GxsChannelPostItem QLabel#subjectLabel, GxsChannelPostItem QLabel#titleLabel {
font: 12pt;
font: bold italic;
}
CreateGxsChannelMsg QPushButton#postButton {
font: bold;
font-size: 15px;
@ -1259,7 +1276,9 @@ 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,
PulseAddDialog QPushButton#pushButton_Post, PulseTopLevel QToolButton#toolButton_follow,
PulseViewGroup QToolButton#toolButton_follow {
font: bold;
font-size: 15px;
color: white;
@ -1268,12 +1287,15 @@ GxsCreateCommentDialog QPushButton#postButton, GxsGroupDialog QPushButton#create
max-height: 27px;
min-width: 4em;
padding: 2px;
padding-left: 6px;
padding-right: 6px;
}
CreateCircleDialog QPushButton#createButton:hover, CreateLobbyDialog QPushButton#createButton:hover,
IdEditDialog QPushButton#createButton:hover, CreateGxsForumMsg QPushButton#postButton:hover,
GxsCreateCommentDialog QPushButton#postButton:hover, GxsGroupDialog QPushButton#createButton:hover,
ShareManager QPushButton#closeButton {
ShareManager QPushButton#closeButton:hover, PulseAddDialog QPushButton#pushButton_Post:hover,
PulseTopLevel QToolButton#toolButton_follow:hover, PulseViewGroup QToolButton#toolButton_follow:hover{
background: #03b1f3;
border-radius: 4px;
min-width: 4em;
@ -1281,7 +1303,8 @@ ShareManager QPushButton#closeButton {
}
CreateGxsForumMsg QPushButton#postButton:disabled, PostedCreatePostDialog QPushButton#submitButton:disabled,
CreateGxsChannelMsg QPushButton#postButton:disabled, GxsCreateCommentDialog QPushButton#postButton:disabled {
CreateGxsChannelMsg QPushButton#postButton:disabled, GxsCreateCommentDialog QPushButton#postButton:disabled,
PulseAddDialog QPushButton#pushButton_Post:disabled {
font: bold;
font-size: 15px;
color: white;
@ -1358,6 +1381,10 @@ GxsForumThreadWidget QLabel#forumName
font: bold;
}
GxsForumMsgItem QFrame#frame{
background: #302F2F;
}
BoardPostDisplayWidget_compact QPushButton#shareButton
{
background-color: transparent;