mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-07-19 20:59:02 -04:00
Merge branch 'RetroShare:master' into color-links-v3
This commit is contained in:
commit
752b51cb53
22 changed files with 172 additions and 257 deletions
|
@ -102,7 +102,7 @@
|
|||
<enum>Qt::NoFocus</enum>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="images.qrc">
|
||||
<iconset resource="icons.qrc">
|
||||
<normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset>
|
||||
</property>
|
||||
<property name="checkable">
|
||||
|
@ -132,10 +132,10 @@
|
|||
<string notr="true"/>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::Box</enum>
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="headerBFrame_GL">
|
||||
<property name="leftMargin">
|
||||
|
@ -401,8 +401,8 @@
|
|||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources>
|
||||
<include location="images.qrc"/>
|
||||
<include location="icons.qrc"/>
|
||||
<include location="images.qrc"/>
|
||||
</resources>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
|
|
@ -382,6 +382,13 @@ void HomePage::openWebHelp()
|
|||
QDesktopServices::openUrl(QUrl(QString("https://retrosharedocs.readthedocs.io/en/latest/")));
|
||||
}
|
||||
|
||||
void HomePage::showEvent(QShowEvent *event)
|
||||
{
|
||||
if (!event->spontaneous()) {
|
||||
updateHomeLogo();
|
||||
}
|
||||
}
|
||||
|
||||
void HomePage::updateHomeLogo()
|
||||
{
|
||||
if (Settings->getSheetName() == ":Standard_Dark")
|
||||
|
|
|
@ -51,6 +51,8 @@ public:
|
|||
void getOwnCert(QString& invite,QString& description) const;
|
||||
RetroshareInviteFlags currentInviteFlags() const ;
|
||||
|
||||
virtual void showEvent(QShowEvent *) override;
|
||||
|
||||
private slots:
|
||||
#ifdef DEAD_CODE
|
||||
void certContextMenu(QPoint);
|
||||
|
|
|
@ -44,10 +44,10 @@
|
|||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::Box</enum>
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="feedFrame_GL">
|
||||
<property name="leftMargin">
|
||||
|
@ -725,17 +725,17 @@
|
|||
</layout>
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
<class>GxsIdLabel</class>
|
||||
<extends>QLabel</extends>
|
||||
<header>gui/gxs/GxsIdLabel.h</header>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>ElidedLabel</class>
|
||||
<extends>QLabel</extends>
|
||||
<header>gui/common/ElidedLabel.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>GxsIdLabel</class>
|
||||
<extends>QLabel</extends>
|
||||
<header>gui/gxs/GxsIdLabel.h</header>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>ZoomableLabel</class>
|
||||
<extends>QLabel</extends>
|
||||
|
@ -743,9 +743,9 @@
|
|||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources>
|
||||
<include location="../icons.qrc"/>
|
||||
<include location="Posted_images.qrc"/>
|
||||
<include location="../images.qrc"/>
|
||||
<include location="Posted_images.qrc"/>
|
||||
<include location="../icons.qrc"/>
|
||||
</resources>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
|
|
@ -346,7 +346,7 @@ The current identities/locations will not be affected.</string>
|
|||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Sans'; font-size:13pt; 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;"><a href="Create new Profile..."><span style=" font-family:'MS Shell Dlg 2'; font-size:14pt; text-decoration: underline; color:#0000ff;">New Profile/Node</span></a></p></body></html></string>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="Create new Profile..."><span style=" font-family:'MS Shell Dlg 2'; font-size:14pt; text-decoration: underline; color:#366fe0;">New Profile/Node</span></a></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
|
@ -80,10 +80,10 @@
|
|||
<item>
|
||||
<widget class="QFrame" name="toolBarFrame">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::Box</enum>
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="toolBarFrame_HL">
|
||||
<property name="leftMargin">
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>755</width>
|
||||
<height>157</height>
|
||||
<width>836</width>
|
||||
<height>160</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="ChannelsCommentsItem_GL">
|
||||
|
@ -35,10 +35,10 @@
|
|||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::Box</enum>
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="feedFrame_GL">
|
||||
<property name="topMargin">
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>618</width>
|
||||
<height>176</height>
|
||||
<height>189</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="font">
|
||||
|
@ -134,10 +134,10 @@
|
|||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::Box</enum>
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="feedFrame_GL">
|
||||
<item row="0" column="0">
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>1092</width>
|
||||
<height>231</height>
|
||||
<height>255</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="GxsChannelPostItem_GL">
|
||||
|
@ -41,10 +41,10 @@
|
|||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::Box</enum>
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="feedFrame_VL">
|
||||
<item>
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>618</width>
|
||||
<height>108</height>
|
||||
<height>128</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="GxsCircleItem_GL">
|
||||
|
@ -126,10 +126,10 @@
|
|||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::Box</enum>
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="feedFrame_HL">
|
||||
<item>
|
||||
|
@ -317,7 +317,7 @@
|
|||
<string>Revoke</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../images.qrc">
|
||||
<iconset>
|
||||
<normaloff>:/images/cancel.png</normaloff>:/images/cancel.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
|
|
|
@ -126,10 +126,10 @@
|
|||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::Box</enum>
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="feedFrame_VL">
|
||||
<item>
|
||||
|
|
|
@ -99,10 +99,10 @@
|
|||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::Box</enum>
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="feedFrame_GL">
|
||||
<item row="0" column="0" rowspan="2">
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>707</width>
|
||||
<height>180</height>
|
||||
<width>777</width>
|
||||
<height>234</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="MsgItem_GL">
|
||||
|
@ -35,10 +35,10 @@
|
|||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::Box</enum>
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="feedFrame_GL">
|
||||
<item row="0" column="0">
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>476</width>
|
||||
<height>283</height>
|
||||
<height>328</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="autoFillBackground">
|
||||
|
@ -38,10 +38,10 @@
|
|||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::Box</enum>
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="feedFrame_gL">
|
||||
<property name="verticalSpacing">
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>618</width>
|
||||
<height>161</height>
|
||||
<height>195</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="PostedGroupItem_GL">
|
||||
|
@ -126,10 +126,10 @@
|
|||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::Box</enum>
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="feedFrame_GL">
|
||||
<item row="0" column="0">
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>763</width>
|
||||
<height>185</height>
|
||||
<height>205</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="SecurityIpItem_GL">
|
||||
|
@ -38,10 +38,10 @@
|
|||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::Box</enum>
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="feedFrame_GL">
|
||||
<property name="verticalSpacing">
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>1015</width>
|
||||
<height>246</height>
|
||||
<height>326</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="SecurityItem_GL">
|
||||
|
@ -35,10 +35,10 @@
|
|||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::Box</enum>
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="feedFrame_GL">
|
||||
<property name="verticalSpacing">
|
||||
|
|
|
@ -29,10 +29,10 @@
|
|||
<item row="0" column="0">
|
||||
<widget class="QFrame" name="gradFrame">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::Box</enum>
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gradFrame_GL">
|
||||
<item row="1" column="0">
|
||||
|
|
|
@ -34,7 +34,14 @@
|
|||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="HeaderFrame" name="headerFrame"/>
|
||||
<widget class="HeaderFrame" name="headerFrame">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QFrame" name="gradFrame">
|
||||
|
@ -150,10 +157,10 @@ p, li { white-space: pre-wrap; }
|
|||
</size>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::Box</enum>
|
||||
<enum>QFrame::StyledPanel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
<enum>QFrame::Raised</enum>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="toolBarFrame_HL">
|
||||
<property name="spacing">
|
||||
|
|
|
@ -231,7 +231,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qgroupbox
|
|||
--------------------------------------------------------------------------- */
|
||||
QGroupBox {
|
||||
font-weight: bold;
|
||||
border: 1px solid #C9CDD0;
|
||||
border: 1px solid #C0C4C8;
|
||||
border-radius: 4px;
|
||||
padding: 2px;
|
||||
margin-top: 6px;
|
||||
|
@ -1234,7 +1234,7 @@ https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qcombobox
|
|||
|
||||
--------------------------------------------------------------------------- */
|
||||
QComboBox {
|
||||
border: 1px solid #C9CDD0;
|
||||
border: 1px solid #C0C4C8;
|
||||
border-radius: 4px;
|
||||
selection-background-color: #9FCBFF;
|
||||
padding-left: 4px;
|
||||
|
@ -1250,7 +1250,7 @@ QComboBox {
|
|||
}
|
||||
|
||||
QComboBox QAbstractItemView {
|
||||
border: 1px solid #C9CDD0;
|
||||
border: 1px solid #C0C4C8;
|
||||
border-radius: 0;
|
||||
background-color: #FAFAFA;
|
||||
selection-background-color: #9FCBFF;
|
||||
|
@ -1263,7 +1263,7 @@ QComboBox QAbstractItemView:hover {
|
|||
|
||||
QComboBox QAbstractItemView:selected {
|
||||
background: #9FCBFF;
|
||||
color: #C9CDD0;
|
||||
color: #C0C4C8;
|
||||
}
|
||||
|
||||
QComboBox QAbstractItemView:alternate {
|
||||
|
@ -1301,6 +1301,18 @@ QComboBox::indicator:alternate {
|
|||
background: #FAFAFA;
|
||||
}
|
||||
|
||||
QComboBox::item {
|
||||
/* Remove to fix #282, #285 and MR #288*/
|
||||
/*&:checked {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
&:selected {
|
||||
border: 0px solid transparent;
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
QComboBox::item:alternate {
|
||||
background: #FAFAFA;
|
||||
}
|
||||
|
@ -1433,14 +1445,14 @@ QLineEdit {
|
|||
padding-left: 4px;
|
||||
padding-right: 4px;
|
||||
border-style: solid;
|
||||
border: 1px solid #C9CDD0;
|
||||
border: 1px solid #C0C4C8;
|
||||
border-radius: 4px;
|
||||
color: #19232D;
|
||||
}
|
||||
|
||||
QLineEdit:disabled {
|
||||
background-color: #FAFAFA;
|
||||
color: #788D9C;
|
||||
color: #9DA9B5;
|
||||
}
|
||||
|
||||
QLineEdit:hover {
|
||||
|
@ -2151,12 +2163,12 @@ QSplitter::handle:hover {
|
|||
}
|
||||
|
||||
QSplitter::handle:horizontal {
|
||||
width: 5px;
|
||||
width: 2px;
|
||||
image: url(":/standard_light/rc/line_vertical.png");
|
||||
}
|
||||
|
||||
QSplitter::handle:vertical {
|
||||
height: 5px;
|
||||
height: 2px;
|
||||
image: url(":/standard_light/rc/line_horizontal.png");
|
||||
}
|
||||
|
||||
|
@ -2350,51 +2362,6 @@ QFrame#titleBarFrame QTextEdit {
|
|||
background: white;
|
||||
}
|
||||
|
||||
/**** Special Page tweak ****/
|
||||
|
||||
|
||||
/* ConnectFriendWizard */
|
||||
|
||||
ConnectFriendWizard QPlainTextEdit#friendCertEdit {
|
||||
border: none;
|
||||
background: white;
|
||||
color: black;
|
||||
}
|
||||
|
||||
ConnectFriendWizard QFrame#friendFrame {
|
||||
border: 2px solid #0099cc;
|
||||
border-radius: 6px;
|
||||
background: white;
|
||||
}
|
||||
|
||||
ConnectFriendWizard QWizardPage#ConclusionPage > QGroupBox#peerDetailsFrame {
|
||||
border: 2px solid #039bd5;
|
||||
border-radius:6px;
|
||||
background: white;
|
||||
color: black;
|
||||
padding: 12 12px;
|
||||
}
|
||||
|
||||
ConnectFriendWizard QGroupBox::title#peerDetailsFrame
|
||||
{
|
||||
padding: 4 12px;
|
||||
background: transparent;
|
||||
padding: 4 12px;
|
||||
background: #039bd5;
|
||||
color: white;
|
||||
}
|
||||
|
||||
|
||||
/* GetStartedDialog */
|
||||
|
||||
GetStartedDialog QTextEdit {
|
||||
border: 1px solid #B8B6B1;
|
||||
border-radius: 6px;
|
||||
background: white;
|
||||
color: black;
|
||||
}
|
||||
|
||||
|
||||
/* HomePage */
|
||||
|
||||
HomePage QLabel#userCertLabel {
|
||||
|
@ -2509,7 +2476,7 @@ GxsGroupDialog QLabel#groupLogo{
|
|||
|
||||
/* Settings */
|
||||
|
||||
PluginItem > QFrame#pluginFrame {
|
||||
PluginItem QFrame#pluginFrame {
|
||||
border: 2px solid #A8B8D1;
|
||||
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FCFDFE, stop: 1 #E2E8EF);
|
||||
border-radius: 0px
|
||||
|
@ -2521,7 +2488,7 @@ PluginItem QLabel#infoLabel {
|
|||
|
||||
/* Feeds */
|
||||
|
||||
AttachFileItem > QFrame#frame {
|
||||
AttachFileItem QFrame#frame {
|
||||
border: 2px solid black;
|
||||
background: white;
|
||||
}
|
||||
|
@ -2627,88 +2594,78 @@ BoardPostDisplayWidget_card QLabel#siteBoldLabel {
|
|||
color: #787c7e;
|
||||
}
|
||||
|
||||
/* GenCertDialog
|
||||
Change colors here because GUI is not started yet so no user StyleSheet loads */
|
||||
|
||||
/* MessengerWindow */
|
||||
|
||||
MessengerWindow QFrame#messengerframetop{
|
||||
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #9BDBF9, stop:1 #1592CD);
|
||||
border: 0px;
|
||||
GenCertDialog QFrame#profileframe{
|
||||
border-image: url(:/images/logo/background.png) 0 0 0 0 stretch stretch;
|
||||
border-width: 0px;
|
||||
}
|
||||
|
||||
|
||||
/*************** Optional ***************/
|
||||
|
||||
/**** WikiPoos ****/
|
||||
WikiEditDialog QPushButton#pushButton_History {
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
/**** The Wire ****/
|
||||
|
||||
WireGroupItem QFrame#wire_frame:hover {
|
||||
background-color: #7ecbfb;
|
||||
}
|
||||
WireGroupItem QFrame#wire_frame > QLabel {
|
||||
GenCertDialog QFrame#profileframe QCheckBox,
|
||||
GenCertDialog QFrame#profileframe QLabel {
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
PulseTopLevel QFrame#plainFrame,
|
||||
PulseViewGroup QFrame#plainFrame,
|
||||
PulseReply QFrame#plainFrame {
|
||||
border: 2px solid #c4cfd6;
|
||||
background: white;
|
||||
GenCertDialog QLabel#info_Label:enabled {
|
||||
color: black;
|
||||
border: 1px solid #DCDC41;
|
||||
border-radius: 6px;
|
||||
background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);
|
||||
}
|
||||
|
||||
PulseAddDialog QTextEdit#textEdit_Pulse {
|
||||
border: 2px solid #c4cfd6;
|
||||
GenCertDialog QGroupBox#groupBox,
|
||||
GenCertDialog QGroupBox#profile_groupBox {
|
||||
background: rgba(0,0,0,10%);
|
||||
}
|
||||
GenCertDialog QGroupBox#profile_groupBox QComboBox,
|
||||
GenCertDialog QGroupBox#profile_groupBox QSpinBox,
|
||||
GenCertDialog QGroupBox#profile_groupBox QLineEdit,
|
||||
GenCertDialog QComboBox#genPGPuser {
|
||||
border: 2px solid #0099cc;
|
||||
border-radius: 6px;
|
||||
background: white;
|
||||
color: black;
|
||||
}
|
||||
|
||||
PulseReply #line_replyLine,
|
||||
PulseMessage #line{
|
||||
color: #c4cfd6;
|
||||
GenCertDialog QPushButton#genButton {
|
||||
border-image: url(:/images/btn_blue.png) 4;
|
||||
border-width: 4;
|
||||
color: white;
|
||||
}
|
||||
GenCertDialog QPushButton#genButton:hover {
|
||||
border-image: url(:/images/btn_blue_hover.png) 4;
|
||||
}
|
||||
GenCertDialog QPushButton#genButton:disabled {
|
||||
border-image: url(:/images/btn_27.png) 4;
|
||||
color: black;
|
||||
}
|
||||
|
||||
PulseReply QLabel#label_groupName{
|
||||
color: #5b7083;
|
||||
/* StartDialog
|
||||
To get the same style for all user and not use last connected one. */
|
||||
|
||||
StartDialog QFrame#loginframe{
|
||||
border-image: url(:/images/logo/background_lessblue.png) 0 0 0 0 stretch stretch;
|
||||
border-width: 0px;
|
||||
}
|
||||
|
||||
PulseReplySeperator QFrame#frame {
|
||||
border: 2px solid #CCCCCC;
|
||||
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #EEEEEE, stop: 1 #CCCCCC);
|
||||
border-radius: 10px}
|
||||
StartDialog QFrame#loginframe QCheckBox,
|
||||
StartDialog QFrame#loginframe QLabel {
|
||||
background: transparent;
|
||||
}
|
||||
StartDialog QGroupBox#profilGBox {
|
||||
background: rgba(0,0,0,10%);
|
||||
border-radius: 3px;
|
||||
border-width: 0px;
|
||||
}
|
||||
|
||||
QLabel#label_masthead{
|
||||
border: 2px solid #CCCCCC;
|
||||
border-radius: 4px;
|
||||
StartDialog QPushButton#loadButton {
|
||||
background: transparent;
|
||||
border-image: url(:/images/btn_blue.png) 4;
|
||||
border-width: 4;
|
||||
color: white;
|
||||
}
|
||||
|
||||
/**** PhotoShare ****/
|
||||
AlbumItem QFrame#albumFrame {
|
||||
border: 2px solid #CCCCCC;
|
||||
border-radius: 10px
|
||||
}
|
||||
|
||||
PhotoItem QFrame#photoFrame {
|
||||
border: 2px solid #CCCCCC;
|
||||
border-radius: 10px
|
||||
}
|
||||
|
||||
PhotoItem QWidget:hover {
|
||||
background-color: #7ecbfb;
|
||||
StartDialog QPushButton#loadButton:hover {
|
||||
background: transparent;
|
||||
border-image: url(:/images/btn_blue_hover.png) 4;
|
||||
}
|
||||
|
|
|
@ -141,88 +141,6 @@ QLabel#newLabel:enabled {
|
|||
}
|
||||
|
||||
|
||||
/* StartDialog
|
||||
To get the same style for all user and not use last connected one. */
|
||||
|
||||
StartDialog QFrame#loginframe{
|
||||
border-image: url(:/images/logo/background_lessblue.png) 0 0 0 0 stretch stretch;
|
||||
border-width: 0px;
|
||||
}
|
||||
StartDialog QFrame#loginframe QCheckBox,
|
||||
StartDialog QFrame#loginframe QLabel {
|
||||
background: transparent;
|
||||
}
|
||||
StartDialog QGroupBox#profilGBox {
|
||||
background: rgba(0,0,0,10%);
|
||||
border-radius: 3px;
|
||||
border-width: 0px;
|
||||
}
|
||||
|
||||
StartDialog QGroupBox#profilGBox * {
|
||||
background-color: white;
|
||||
color: black;
|
||||
}
|
||||
|
||||
StartDialog QPushButton#loadButton {
|
||||
background: transparent;
|
||||
border-image: url(:/images/btn_blue.png) 4;
|
||||
border-width: 4;
|
||||
color: white;
|
||||
}
|
||||
StartDialog QPushButton#loadButton:hover {
|
||||
background: transparent;
|
||||
border-image: url(:/images/btn_blue_hover.png) 4;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* GenCertDialog
|
||||
Change colors here because GUI is not started yet so no user StyleSheet loads */
|
||||
|
||||
GenCertDialog QFrame#profileframe{
|
||||
border-image: url(:/images/logo/background.png) 0 0 0 0 stretch stretch;
|
||||
border-width: 0px;
|
||||
}
|
||||
GenCertDialog QFrame#profileframe QCheckBox,
|
||||
GenCertDialog QFrame#profileframe QLabel {
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
GenCertDialog QLabel#info_Label:enabled {
|
||||
color: black;
|
||||
border: 1px solid #DCDC41;
|
||||
border-radius: 6px;
|
||||
background: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);
|
||||
}
|
||||
|
||||
GenCertDialog QGroupBox#groupBox,
|
||||
GenCertDialog QGroupBox#profile_groupBox {
|
||||
background: rgba(0,0,0,10%);
|
||||
}
|
||||
GenCertDialog QGroupBox#profile_groupBox QComboBox,
|
||||
GenCertDialog QGroupBox#profile_groupBox QSpinBox,
|
||||
GenCertDialog QGroupBox#profile_groupBox QLineEdit,
|
||||
GenCertDialog QComboBox#genPGPuser {
|
||||
border: 2px solid #0099cc;
|
||||
border-radius: 6px;
|
||||
background: white;
|
||||
color: black;
|
||||
}
|
||||
|
||||
GenCertDialog QPushButton#genButton {
|
||||
border-image: url(:/images/btn_blue.png) 4;
|
||||
border-width: 4;
|
||||
color: white;
|
||||
}
|
||||
GenCertDialog QPushButton#genButton:hover {
|
||||
border-image: url(:/images/btn_blue_hover.png) 4;
|
||||
}
|
||||
GenCertDialog QPushButton#genButton:disabled {
|
||||
border-image: url(:/images/btn_27.png) 4;
|
||||
color: black;
|
||||
}
|
||||
|
||||
|
||||
/* AvatarWidget */
|
||||
|
||||
AvatarWidget{border-width: 10px;}
|
||||
|
@ -418,3 +336,27 @@ OpModeStatus[opMode="Minimal"] {
|
|||
[WrongValue="true"] {
|
||||
background-color: #FF8080;
|
||||
}
|
||||
|
||||
GenCertDialog QPushButton#genButton {
|
||||
border-image: url(:/images/btn_blue.png) 4;
|
||||
border-width: 4;
|
||||
color: white;
|
||||
}
|
||||
GenCertDialog QPushButton#genButton:hover {
|
||||
border-image: url(:/images/btn_blue_hover.png) 4;
|
||||
}
|
||||
GenCertDialog QPushButton#genButton:disabled {
|
||||
border-image: url(:/images/btn_27.png) 4;
|
||||
color: black;
|
||||
}
|
||||
|
||||
StartDialog QPushButton#loadButton {
|
||||
background: transparent;
|
||||
border-image: url(:/images/btn_blue.png) 4;
|
||||
border-width: 4;
|
||||
color: white;
|
||||
}
|
||||
StartDialog QPushButton#loadButton:hover {
|
||||
background: transparent;
|
||||
border-image: url(:/images/btn_blue_hover.png) 4;
|
||||
}
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 8b99a9699172cc718e164964f48a1ba27551c86d
|
||||
Subproject commit 6001a322809b5005b8bcccdf593fdda6f0173691
|
Loading…
Add table
Add a link
Reference in a new issue