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

Merge branch 'pr1663'

Browse Source
This commit is contained in:
tux3 2015-05-16 22:31:57 +02:00
commit e25baaa90e
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
3 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mainwindow.ui
View File

@ -363,7 +363,7 @@ QSplitter:handle{
</property>
<widget class="QFrame" name="statusPanel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -1023,7 +1023,7 @@ QSplitter:handle{
<widget class="QLineEdit" name="searchContactText">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>1</horstretch>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
@ -1032,7 +1032,7 @@ QSplitter:handle{
<item>
<widget class="QComboBox" name="searchContactFilterCBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -1047,7 +1047,7 @@ QSplitter:handle{
<item>
<widget class="AdjustingScrollArea" name="friendList">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -1072,8 +1072,8 @@ QSplitter:handle{
<rect>
<x>0</x>
<y>0</y>
<width>284</width>
<height>348</height>
<width>292</width>
<height>359</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5"/>
@ -1838,7 +1838,7 @@ QSplitter:handle{
<x>0</x>
<y>0</y>
<width>775</width>
<height>25</height>
<height>19</height>
</rect>
</property>
</widget>

1
src/widget/friendlistwidget.cpp
View File

@ -65,7 +65,6 @@ QVBoxLayout* FriendListWidget::getFriendLayout(Status s)
if (res != layouts.end())
return res.value();
//qDebug() << "Friend Status: " << static_cast<int>(s) << " not found!";
return layouts[static_cast<int>(Status::Online)];
}

34
ui/window/statusPanel.css
View File

@ -4,7 +4,39 @@ QLineEdit
background-color: @themeMedium;
color: white;
border: 0px;
border-radius: 6px;
border-radius: 4px;
}
QComboBox {
background: none;
background-color: @themeMedium;
color: white;
border-style: none;
border-radius: 4px;
}
QComboBox:on {
background-color: @themeDark;
border-radius: 4px;
}
QComboBox:drop-down {
border-style: none;
border-radius: 4px;
}
/**
Uncomment this after https://github.com/tux3/qTox/pull/1640
is merged!
QComboBox:down-arrow {
image: url(ui/css/down_arrow.png);
}
**/
QListView {
background-color: @themeLight;
border-style: none;
border-radius: 4px;
}
#statusPanel