StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

implemented krepas suggestions about style

Browse Source
This commit is contained in:
agilob 2014-10-22 16:27:15 +01:00
parent 9bc1568c0d
commit 28d1287b18
No known key found for this signature in database
GPG Key ID: 2CACF3EEF598C663
5 changed files with 117 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/widget/form/settings/avform.cpp
View File

@ -23,15 +23,6 @@ AVForm::AVForm() :
{
bodyUI = new Ui::AVSettings;
bodyUI->setupUi(this);
// this QWidget style definition is a walk-around for bug in Qt 5.x
// the bug causes "Win-98 style" rendering if background color is defined for QWidget,
// so I avoided global definition for QWidget.
// but if this style is not defined you got: https://github.com/tux3/qTox/pull/475#issuecomment-59627952
// this single line can be remove if bug in Qt is fixed. some day.
// more reference:
// https://github.com/tux3/qTox/issues/406
// https://bugreports.qt-project.org/browse/QTBUG-33537?attachmentOrder=desc
this->setStyleSheet("QWidget { background: white; }");
}
AVForm::~AVForm()

2
src/widget/form/settings/generalsettings.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>527</width>
<height>525</height>
<height>553</height>
</rect>
</property>
<property name="windowTitle">

2
src/widget/widget.cpp
View File

@ -69,8 +69,6 @@ void Widget::init()
icon = new QSystemTrayIcon(this);
icon->setIcon(this->windowIcon());
trayMenu = new QMenu;
trayMenu->setStyleSheet("QMenu {background: white; color: black; border: 1px solid black;}"
"QMenu::item:selected { background: #414141}");
statusOnline = new QAction(tr("online"), this);
statusOnline->setIcon(QIcon(":ui/statusButton/dot_online.png"));

112
ui/chatArea/chatArea.css
View File

@ -3,115 +3,3 @@ QTextEdit
background: white;
color: back;
}
QScrollArea {
background: white;
border: 0 0 0 0 ;
}
QScrollArea > QWidget > QWidget {
background: white;
}
QScrollBar:vertical {
background: transparent;
width: 12px;
margin-top: 2px;
margin-bottom: 2px;
}
QScrollBar::handle:vertical {
background: #d1d1d1;
min-height: 20px;
border-radius: 3px;
margin-left: 2px;
}
QScrollBar::handle:vertical:hover {
background: #e3e3e3;
}
QScrollBar::handle:vertical:pressed {
background: #b1b1b1;
}
QScrollBar::add-line:vertical {
background: url(":ui/chatArea/scrollBarDownArrow.png") center;
height: 0px;
subcontrol-position: bottom;
subcontrol-origin: margin;
}
QScrollBar::sub-line:vertical {
background: url(":ui/chatArea/scrollBarUpArrow.png") center;
height: 0px;
subcontrol-position: top;
subcontrol-origin: margin;
}
QScrollBar:QScrollBar::down-arrow:vertical {
width: 10;
height: 10px;
background: white;
}
QScrollBar:QScrollBar::up-arrow:vertical {
width: 10px;
height: 10px;
background: white;
}
QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
background: none;
}
QScrollBar:horizontal {
background: white;
height: 10px;
margin: 0 2px 0 2px;
}
QScrollBar::handle:horizontal {
background: #d1d1d1;
min-width: 20px;
border-radius: 2px;
}
QScrollBar::handle:horizontal:hover {
background: #e3e3e3;
}
QScrollBar::handle:horizontal:pressed {
background: #b1b1b1;
}
QScrollBar::add-line:horizontal {
background: url(":ui/chatArea/scrollBarRightArrow.png") center;
width: 0px;
subcontrol-position: right;
subcontrol-origin: margin;
}
QScrollBar::sub-line:horizontal {
background: url(":ui/chatArea/scrollBarLeftArrow.png") center;
width: 0px;
subcontrol-position: left;
subcontrol-origin: margin;
}
QScrollBar:QScrollBar::down-arrow:horizontal {
width: 10;
height: 10px;
background: white;
}
QScrollBar:QScrollBar::up-arrow:horizontal {
width: 10px;
height: 10px;
background: white;
}
QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
background: none;
}

119
ui/settings/mainContent.css
View File

@ -6,9 +6,9 @@ QWidget
QTextEdit
{
border-color: @lightGrey;
border-style: solid;
border-width: 1px 0 1px 1px;
border-color: @lightGrey;
border-style: solid;
border-width: 1px 0 1px 1px;
background: white;
border: 1px solid #c4c1bd;
}
@ -102,3 +102,116 @@ QScrollArea
{
background-color: white;
}
QScrollArea
{
background: transparent;
}
QScrollArea > QWidget > QWidget
{
background: transparent;
}
QScrollBar:vertical {
background: transparent;
width: 12px;
margin-top: 2px;
margin-bottom: 2px;
}
QScrollBar::handle:vertical {
background: #d1d1d1;
min-height: 20px;
border-radius: 3px;
margin-left: 2px;
}
QScrollBar::handle:vertical:hover {
background: #e3e3e3;
}
QScrollBar::handle:vertical:pressed {
background: #b1b1b1;
}
QScrollBar::add-line:vertical {
background: url(":ui/chatArea/scrollBarDownArrow.png") center;
height: 0px;
subcontrol-position: bottom;
subcontrol-origin: margin;
}
QScrollBar::sub-line:vertical {
background: url(":ui/chatArea/scrollBarUpArrow.png") center;
height: 0px;
subcontrol-position: top;
subcontrol-origin: margin;
}
QScrollBar:QScrollBar::down-arrow:vertical {
width: 10;
height: 10px;
background: white;
}
QScrollBar:QScrollBar::up-arrow:vertical {
width: 10px;
height: 10px;
background: white;
}
QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
background: none;
}
QScrollBar:horizontal {
background: white;
height: 10px;
margin: 0 2px 0 2px;
}
QScrollBar::handle:horizontal {
background: #d1d1d1;
min-width: 20px;
border-radius: 2px;
}
QScrollBar::handle:horizontal:hover {
background: #e3e3e3;
}
QScrollBar::handle:horizontal:pressed {
background: #b1b1b1;
}
QScrollBar::add-line:horizontal {
background: url(":ui/chatArea/scrollBarRightArrow.png") center;
width: 0px;
subcontrol-position: right;
subcontrol-origin: margin;
}
QScrollBar::sub-line:horizontal {
background: url(":ui/chatArea/scrollBarLeftArrow.png") center;
width: 0px;
subcontrol-position: left;
subcontrol-origin: margin;
}
QScrollBar:QScrollBar::down-arrow:horizontal {
width: 10;
height: 10px;
background: white;
}
QScrollBar:QScrollBar::up-arrow:horizontal {
width: 10px;
height: 10px;
background: white;
}
QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
background: none;
}