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 'pr611'

Browse Source
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-11-03 23:15:31 +01:00
commit 9c8e41196b
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mainwindow.ui
View File

@ -397,7 +397,7 @@ QSplitter:handle{
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0"> <item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_3"> <layout class="QHBoxLayout" name="myProfile">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
@ -1034,7 +1034,7 @@ QSplitter:handle{
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>284</width> <width>284</width>
<height>401</height> <height>399</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_5"/> <layout class="QVBoxLayout" name="verticalLayout_5"/>
@ -1757,7 +1757,7 @@ QSplitter:handle{
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>775</width> <width>775</width>
<height>19</height> <height>21</height>
</rect> </rect>
</property> </property>
</widget> </widget>

6
src/widget/widget.cpp
View File

@ -121,8 +121,8 @@ void Widget::init()
profilePicture = new MaskablePixmapWidget(this, QSize(40, 40), ":/img/avatar_mask.png"); profilePicture = new MaskablePixmapWidget(this, QSize(40, 40), ":/img/avatar_mask.png");
profilePicture->setPixmap(QPixmap(":/img/contact_dark.png")); profilePicture->setPixmap(QPixmap(":/img/contact_dark.png"));
profilePicture->setClickable(true); profilePicture->setClickable(true);
ui->horizontalLayout_3->insertWidget(0, profilePicture); ui->myProfile->insertWidget(0, profilePicture);
ui->horizontalLayout_3->insertSpacing(1, 7); ui->myProfile->insertSpacing(1, 7);
ui->mainContent->setLayout(new QVBoxLayout()); ui->mainContent->setLayout(new QVBoxLayout());
ui->mainHead->setLayout(new QVBoxLayout()); ui->mainHead->setLayout(new QVBoxLayout());
@ -139,6 +139,8 @@ void Widget::init()
ui->mainHead->setStyleSheet(Style::getStylesheet(":ui/settings/mainHead.css")); ui->mainHead->setStyleSheet(Style::getStylesheet(":ui/settings/mainHead.css"));
ui->mainContent->setStyleSheet(Style::getStylesheet(":ui/settings/mainContent.css")); ui->mainContent->setStyleSheet(Style::getStylesheet(":ui/settings/mainContent.css"));
ui->statusHead->setStyleSheet(Style::getStylesheet(":/ui/window/statusPanel.css"));
contactListWidget = new FriendListWidget(); contactListWidget = new FriendListWidget();
ui->friendList->setWidget(contactListWidget); ui->friendList->setWidget(contactListWidget);

11
ui/window/statusPanel.css
View File

@ -1,4 +1,13 @@
#statusPanel QLineEdit
{
background: none;
background-color: @mediumGrey;
color: white;
border: 0px;
border-radius: 6px;
}
#statusPanel
{ {
background-color: @darkGrey; background-color: @darkGrey;
} }