fixed merge

This commit is contained in:
csoler 2016-01-13 23:08:14 -05:00
parent ed12b7a243
commit 36241eed8c

View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>745</width> <width>1484</width>
<height>500</height> <height>791</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -35,18 +35,6 @@
<enum>QFrame::Sunken</enum> <enum>QFrame::Sunken</enum>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>2</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item> <item>
<widget class="QLabel" name="titleBarPixmap"> <widget class="QLabel" name="titleBarPixmap">
<property name="minimumSize"> <property name="minimumSize">
@ -119,7 +107,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item>
<widget class="QSplitter" name="splitter"> <widget class="QSplitter" name="splitter">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -238,39 +226,21 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="layoutWidget"> <widget class="QTabWidget" name="tabWidget1">
<layout class="QVBoxLayout" name="verticalLayout_4"> <property name="currentIndex">
<item> <number>0</number>
<widget class="QFrame" name="headerFrame"> </property>
<property name="frameShape"> <widget class="QWidget" name="tab_2">
<enum>QFrame::StyledPanel</enum> <attribute name="title">
</property> <string>Person</string>
<property name="frameShadow"> </attribute>
<enum>QFrame::Raised</enum> <layout class="QVBoxLayout" name="verticalLayout">
</property> <item>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
<property name="horizontalSpacing"> <item>
<number>12</number> <widget class="QFrame" name="headerFrame">
</property> <property name="frameShape">
<item row="0" column="0" rowspan="2"> <enum>QFrame::StyledPanel</enum>
<widget class="QLabel" name="avlabel">
<property name="minimumSize">
<size>
<width>64</width>
<height>64</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>64</width>
<height>64</height>
</size>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text">
<string/>
</property> </property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>