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

fixed up merge

Browse Source
This commit is contained in:
csoler 2020-06-14 13:22:58 +02:00
commit 7765b87049
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
4 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
View File

@ -239,6 +239,10 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
ui->postDetails_TE->setPlaceholderText(tr("No post selected")); ui->postDetails_TE->setPlaceholderText(tr("No post selected"));
// Set initial size of the splitter
ui->splitter->setStretchFactor(0, 1);
ui->splitter->setStretchFactor(1, 0);
QFontMetricsF fm(font()); QFontMetricsF fm(font());
for(int i=0;i<mChannelPostsModel->columnCount();++i) for(int i=0;i<mChannelPostsModel->columnCount();++i)
@ -544,6 +548,8 @@ void GxsChannelPostsWidgetWithModel::processSettings(bool load)
/* View mode */ /* View mode */
//setViewMode(Settings->value("viewMode", VIEW_MODE_FEEDS).toInt()); //setViewMode(Settings->value("viewMode", VIEW_MODE_FEEDS).toInt());
#endif #endif
// state of splitter
ui->splitter->restoreState(Settings->value("SplitterChannelPosts").toByteArray());
} else { } else {
#ifdef TO_REMOVE #ifdef TO_REMOVE
// save settings // save settings
@ -554,6 +560,8 @@ void GxsChannelPostsWidgetWithModel::processSettings(bool load)
/* View mode */ /* View mode */
//Settings->setValue("viewMode", viewMode()); //Settings->setValue("viewMode", viewMode());
#endif #endif
// state of splitter
Settings->setValue("SplitterChannelPosts", ui->splitter->saveState());
} }
Settings->endGroup(); Settings->endGroup();

9
retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
View File

@ -169,7 +169,7 @@
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QLabel" name="channelName_LB"> <widget class="StyledElidedLabel" name="channelName_LB">
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight> <weight>75</weight>
@ -337,7 +337,7 @@
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Description&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Description&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="textInteractionFlags"> <property name="textInteractionFlags">
@ -550,6 +550,11 @@ p, li { white-space: pre-wrap; }
<extends>QToolButton</extends> <extends>QToolButton</extends>
<header>gui/common/SubscribeToolButton.h</header> <header>gui/common/SubscribeToolButton.h</header>
</customwidget> </customwidget>
<customwidget>
<class>StyledElidedLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledElidedLabel.h</header>
</customwidget>
<customwidget> <customwidget>
<class>RSTreeView</class> <class>RSTreeView</class>
<extends>QTreeView</extends> <extends>QTreeView</extends>

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

@ -745,12 +745,7 @@ GxsForumMsgItem QFrame#frame{
background-color: white; background-color: white;
} }
GxsChannelPostsWidget QFrame#infoFrame GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton {
{
}
GxsChannelPostsWidget QToolButton#subscribeToolButton {
font: bold; font: bold;
font-size: 14px; font-size: 14px;
color: white; color: white;
@ -759,18 +754,18 @@ GxsChannelPostsWidget QToolButton#subscribeToolButton {
max-height: 27px; max-height: 27px;
} }
GxsChannelPostsWidget QToolButton#subscribeToolButton:hover { GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton:hover {
background: #03b1f3; background: #03b1f3;
border-radius: 4px; border-radius: 4px;
} }
GxsChannelPostsWidget QToolButton#subscribeToolButton:pressed { GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton:pressed {
background: #03b1f3; background: #03b1f3;
border-radius: 4px; border-radius: 4px;
border: 1px solid gray; border: 1px solid gray;
} }
GxsChannelPostsWidget QToolButton#subscribeToolButton:disabled { GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton:disabled {
background: gray; background: gray;
border-radius: 4px; border-radius: 4px;
border: 1px solid gray; border: 1px solid gray;
@ -778,15 +773,15 @@ GxsChannelPostsWidget QToolButton#subscribeToolButton:disabled {
} }
/* only for MenuButtonPopup */ /* only for MenuButtonPopup */
GxsChannelPostsWidget QToolButton#subscribeToolButton[popupMode="1"] { GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton[popupMode="1"] {
padding-right: 0px; padding-right: 0px;
} }
GxsChannelPostsWidget QToolButton#subscribeToolButton::menu-arrow { GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton::menu-arrow {
image: none; image: none;
} }
GxsChannelPostsWidget QToolButton#subscribeToolButton::menu-button { GxsChannelPostsWidgetWithModel QToolButton#subscribeToolButton::menu-button {
image: none; image: none;
} }
@ -799,6 +794,14 @@ GxsChannelFilesStatusWidget QToolButton#openFolderToolButton[popupMode="0"] {
padding-right: 0px; padding-right: 0px;
} }
GxsChannelFilesStatusWidget QToolButton#openFolderToolButton::menu-indicator {
image: none;
}
GxsChannelFilesStatusWidget QToolButton#openFolderToolButton[popupMode="0"] {
padding-right: 0px;
}
GxsGroupDialog QLabel#groupLogo{ GxsGroupDialog QLabel#groupLogo{
border: 2px solid #CCCCCC; border: 2px solid #CCCCCC;
border-radius: 3px; border-radius: 3px;

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

@ -84,7 +84,7 @@ ConfCertDialog QLabel#servicePermissionsLabel
qproperty-fontSizeFactor: 125; qproperty-fontSizeFactor: 125;
} }
GxsChannelPostsWidget QLabel#nameLabel GxsChannelPostsWidgetWithModel QLabel#channelName_LB
{ {
qproperty-fontSizeFactor: 250; qproperty-fontSizeFactor: 250;
} }