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

Merge pull request #1653 from defnax/removed-default-stylsheets-from-titlebar-frames

Browse Source 
Removed default stylesheets from titlebar frames
This commit is contained in:
csoler 2019-09-30 22:05:54 +02:00 committed by GitHub
commit 2dc03a64bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 51 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
retroshare-gui/src/gui/ChatLobbyWidget.ui
View File

@ -32,7 +32,7 @@
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
@ -116,6 +116,9 @@
</property>
<widget class="QWidget" name="layoutWidget">
<layout class="QVBoxLayout" name="lobbyTreeVLayout">
<property name="spacing">
<number>1</number>
</property>
<item>
<widget class="QFrame" name="toolBarFrame">
<property name="styleSheet">

4
retroshare-gui/src/gui/FileTransfer/TransfersDialog.ui
View File

@ -32,7 +32,7 @@
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
@ -176,7 +176,7 @@
<widget class="QWidget" name="dwloadsTab">
<layout class="QGridLayout" name="dwloadsTabGLayout">
<item row="0" column="0">
<widget class="LineEditClear" name="filterLineEdit"/>
<widget class="LineEditClear" name="filterLineEdit"/>
</item>
<item row="1" column="0">
<widget class="QTreeView" name="downloadList">

2
retroshare-gui/src/gui/FriendsDialog.ui
View File

@ -32,7 +32,7 @@
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>

12
retroshare-gui/src/gui/Identity/IdDialog.ui
View File

@ -32,6 +32,9 @@
<property name="bottomMargin">
<number>0</number>
</property>
<property name="horizontalSpacing">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QFrame" name="titleBarFrame">
<property name="sizePolicy">
@ -41,7 +44,7 @@
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
@ -138,6 +141,9 @@
</property>
<widget class="QWidget" name="layoutWidget">
<layout class="QVBoxLayout" name="leftVLayout">
<property name="spacing">
<number>1</number>
</property>
<item>
<widget class="QFrame" name="toolBarFrame">
<property name="frameShape">
@ -283,8 +289,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1372</width>
<height>999</height>
<width>1003</width>
<height>1094</height>
</rect>
</property>
<layout class="QVBoxLayout" name="scrollAreaWidgetContentsVLayout">

2
retroshare-gui/src/gui/NewsFeed.ui
View File

@ -32,7 +32,7 @@
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>

2
retroshare-gui/src/gui/common/GroupTreeWidget.cpp
View File

@ -210,7 +210,7 @@ void GroupTreeWidget::addToolButton(QToolButton *toolButton)
toolButton->setIconSize(ui->displayButton->iconSize());
toolButton->setFocusPolicy(ui->displayButton->focusPolicy());
ui->titleBarFrame->layout()->addWidget(toolButton);
ui->toolBarFrame->layout()->addWidget(toolButton);
}
// Load and save settings (group must be started from the caller)

2
retroshare-gui/src/gui/common/GroupTreeWidget.ui
View File

@ -27,7 +27,7 @@
<number>0</number>
</property>
<item>
<widget class="QFrame" name="titleBarFrame">
<widget class="QFrame" name="toolBarFrame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>

2
retroshare-gui/src/gui/gxs/GxsGroupFrameDialog.ui
View File

@ -32,7 +32,7 @@
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>

60
retroshare-gui/src/gui/msgs/MessagesDialog.ui
View File

@ -24,7 +24,7 @@
<number>0</number>
</property>
<item>
<widget class="QFrame" name="toolBarFrame">
<widget class="QFrame" name="titleBarFrame">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
@ -40,11 +40,11 @@
<property name="maximumSize">
<size>
<width>16777215</width>
<height>36</height>
<height>28</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
@ -96,7 +96,7 @@
<string>Compose</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<iconset resource="../images.qrc">
<normaloff>:/images/folder-draft24.png</normaloff>:/images/folder-draft24.png</iconset>
</property>
<property name="iconSize">
@ -137,7 +137,7 @@
<string>Delete</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<iconset resource="../images.qrc">
<normaloff>:/images/deletemail24.png</normaloff>:/images/deletemail24.png</iconset>
</property>
<property name="iconSize">
@ -201,7 +201,7 @@
<string>Foward</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<iconset resource="../images.qrc">
<normaloff>:/images/mailforward24-hover.png</normaloff>:/images/mailforward24-hover.png</iconset>
</property>
<property name="iconSize">
@ -248,7 +248,7 @@
<string>Print</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<iconset resource="../images.qrc">
<normaloff>:/images/print24.png</normaloff>:/images/print24.png</iconset>
</property>
<property name="iconSize">
@ -283,7 +283,7 @@
<string>Display</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<iconset resource="../images.qrc">
<normaloff>:/images/looknfeel.png</normaloff>:/images/looknfeel.png</iconset>
</property>
<property name="iconSize">
@ -324,7 +324,7 @@
<string/>
</property>
<property name="pixmap">
<pixmap resource="icons.qrc">:/icons/png/messages.png</pixmap>
<pixmap resource="../icons.qrc">:/icons/png/messages.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@ -343,7 +343,7 @@
<string>Tags</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<iconset resource="../images.qrc">
<normaloff>:/images/tag24.png</normaloff>:/images/tag24.png</iconset>
</property>
<property name="iconSize">
@ -390,7 +390,7 @@
<string>Reply</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<iconset resource="../images.qrc">
<normaloff>:/images/replymail-pressed.png</normaloff>:/images/replymail-pressed.png</iconset>
</property>
<property name="iconSize">
@ -431,7 +431,7 @@
<string>Reply all</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<iconset resource="../images.qrc">
<normaloff>:/images/replymailall24-hover.png</normaloff>:/images/replymailall24-hover.png</iconset>
</property>
<property name="iconSize">
@ -454,7 +454,7 @@
<enum>Qt::NoFocus</enum>
</property>
<property name="icon">
<iconset resource="images.qrc">
<iconset resource="../images.qrc">
<normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset>
</property>
<property name="checkable">
@ -570,7 +570,7 @@
<string>Inbox</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<iconset resource="../images.qrc">
<normaloff>:/images/folder-inbox.png</normaloff>:/images/folder-inbox.png</iconset>
</property>
</item>
@ -579,7 +579,7 @@
<string>Outbox</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<iconset resource="../images.qrc">
<normaloff>:/images/folder-outbox.png</normaloff>:/images/folder-outbox.png</iconset>
</property>
</item>
@ -588,7 +588,7 @@
<string>Draft</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<iconset resource="../images.qrc">
<normaloff>:/images/folder-draft.png</normaloff>:/images/folder-draft.png</iconset>
</property>
</item>
@ -597,7 +597,7 @@
<string>Sent</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<iconset resource="../images.qrc">
<normaloff>:/images/folder-sent.png</normaloff>:/images/folder-sent.png</iconset>
</property>
</item>
@ -606,7 +606,7 @@
<string>Trash</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<iconset resource="../images.qrc">
<normaloff>:/images/folder-trash.png</normaloff>:/images/folder-trash.png</iconset>
</property>
</item>
@ -662,7 +662,7 @@
</size>
</property>
<property name="pixmap">
<pixmap resource="images.qrc">:/images/foldermail.png</pixmap>
<pixmap resource="../images.qrc">:/images/foldermail.png</pixmap>
</property>
</widget>
</item>
@ -703,7 +703,7 @@
</size>
</property>
<property name="pixmap">
<pixmap resource="images.qrc">:/images/tag24.png</pixmap>
<pixmap resource="../images.qrc">:/images/tag24.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@ -804,7 +804,7 @@
</action>
<action name="actionReply">
<property name="icon">
<iconset resource="images.qrc">
<iconset resource="../images.qrc">
<normaloff>:/images/mail_reply.png</normaloff>:/images/mail_reply.png</iconset>
</property>
<property name="text">
@ -813,7 +813,7 @@
</action>
<action name="actionReplyAll">
<property name="icon">
<iconset resource="images.qrc">
<iconset resource="../images.qrc">
<normaloff>:/images/mail_replyall.png</normaloff>:/images/mail_replyall.png</iconset>
</property>
<property name="text">
@ -822,7 +822,7 @@
</action>
<action name="actionForward">
<property name="icon">
<iconset resource="images.qrc">
<iconset resource="../images.qrc">
<normaloff>:/images/mail_forward.png</normaloff>:/images/mail_forward.png</iconset>
</property>
<property name="text">
@ -831,16 +831,16 @@
</action>
</widget>
<customwidgets>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
<customwidget>
<class>LineEditClear</class>
<extends>QLineEdit</extends>
<header location="global">gui/common/LineEditClear.h</header>
</customwidget>
<customwidget>
<class>StyledLabel</class>
<extends>QLabel</extends>
<header>gui/common/StyledLabel.h</header>
</customwidget>
<customwidget>
<class>RSTabWidget</class>
<extends>QTabWidget</extends>
@ -853,8 +853,8 @@
<tabstop>listWidget</tabstop>
</tabstops>
<resources>
<include location="images.qrc"/>
<include location="icons.qrc"/>
<include location="../images.qrc"/>
<include location="../icons.qrc"/>
</resources>
<connections/>
</ui>

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

@ -2,7 +2,7 @@
/* Standard rules */
QFrame#titleBarFrame, QFrame#toolBarFrame {
QFrame#toolBarFrame {
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FEFEFE, stop:1 #E8E8E8);
border: 1px solid #CCCCCC;
}