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

fix #457, styles in mainContent for qtextedit, qspinbox and more

Browse Source
This commit is contained in:
agilob 2014-10-18 19:56:09 +01:00
parent 03aec6d4e5
commit 41327910a4
No known key found for this signature in database
GPG Key ID: 2CACF3EEF598C663
4 changed files with 66 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mainwindow.ui
View File

@ -20,7 +20,7 @@
<string>qTox</string>
</property>
<property name="windowIcon">
<iconset resource="res.qrc">
<iconset resource="../res.qrc">
<normaloff>:/img/icon.png</normaloff>:/img/icon.png</iconset>
</property>
<widget class="QWidget" name="centralwidget">
@ -1033,8 +1033,8 @@ QSplitter:handle{
<rect>
<x>0</x>
<y>0</y>
<width>288</width>
<height>400</height>
<width>260</width>
<height>399</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5"/>
@ -1092,7 +1092,7 @@ QSplitter:handle{
<string/>
</property>
<property name="icon">
<iconset resource="res.qrc">
<iconset resource="../res.qrc">
<normaloff>:/img/add.png</normaloff>:/img/add.png</iconset>
</property>
<property name="flat">
@ -1118,7 +1118,7 @@ QSplitter:handle{
<string/>
</property>
<property name="icon">
<iconset resource="res.qrc">
<iconset resource="../res.qrc">
<normaloff>:/img/group_2x.png</normaloff>:/img/group_2x.png</iconset>
</property>
<property name="flat">
@ -1150,7 +1150,7 @@ QSplitter:handle{
<string/>
</property>
<property name="icon">
<iconset resource="res.qrc">
<iconset resource="../res.qrc">
<normaloff>:/img/transfer.png</normaloff>:/img/transfer.png</iconset>
</property>
<property name="flat">
@ -1182,7 +1182,7 @@ QSplitter:handle{
<string/>
</property>
<property name="icon">
<iconset resource="res.qrc">
<iconset resource="../res.qrc">
<normaloff>:/img/settings.png</normaloff>:/img/settings.png</iconset>
</property>
<property name="flat">
@ -1751,7 +1751,7 @@ QSplitter:handle{
<x>0</x>
<y>0</y>
<width>710</width>
<height>25</height>
<height>21</height>
</rect>
</property>
</widget>
@ -1779,7 +1779,7 @@ QSplitter:handle{
</customwidget>
</customwidgets>
<resources>
<include location="res.qrc"/>
<include location="../res.qrc"/>
</resources>
<connections/>
</ui>

8
ui/chatArea/chatArea.css
View File

@ -1,3 +1,9 @@
QTextEdit
{
background: white;
color: back;
}
QScrollArea {
background: white;
border: 0 0 0 0 ;
@ -108,4 +114,4 @@ QScrollBar:QScrollBar::up-arrow:horizontal {
QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
background: none;
}
}

3
ui/msgEdit/msgEdit.css
View File

@ -2,6 +2,7 @@ QTextEdit {
border-color: @lightGrey;
border-style: solid;
border-width: 1px 0 1px 1px;
background: white;
}
QTextEdit:hover {
@ -23,4 +24,4 @@ QTextEdit#group:hover {
QTextEdit#group:pressed {
border-color: #4ea6ea;
}
}

54
ui/settings/mainContent.css
View File

@ -4,14 +4,51 @@ QWidget
font: @big;
}
QCheckBox
QTextEdit
{
color: black;
border-color: @lightGrey;
border-style: solid;
border-width: 1px 0 1px 1px;
background: white;
border: 1px solid #c4c1bd;
}
QGroupBox
QMessageBox
{
background-color: white;
background: white;
}
QCheckBox
{
background: white;
color: black;
}
QSpinBox
{
background: white;
}
QSlider::groove:horizontal
{
border: 1px solid #999999;
height: 8px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
background: white;
margin: 2px 0;
}
QSlider::handle:horizontal
{
background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #b4b4b4, stop:1 #8f8f8f);
border: 1px solid #5c5c5c;
width: 18px;
margin: -2px 0; /* handle is placed by default on the contents rect of the groove. Expand outside the groove */
border-radius: 3px;
}
QPushButton
{
background: white;
}
QGroupBox
@ -23,7 +60,12 @@ QGroupBox
QComboBox
{
background-color: white;
color: black;
background: white;
}
QComboBox QAbstractItemView {
background: white;
}
QLineEdit
@ -44,4 +86,4 @@ QTabBar
QScrollArea
{
background-color: white;
}
}