Removed duplicate labels in ui files and some other compiler warnings.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4565 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-08-13 22:26:51 +00:00
parent 53a7c77ae4
commit cd0854c4e8
16 changed files with 66 additions and 79 deletions

View file

@ -37,9 +37,9 @@ border-radius: 10px;}</string>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<layout class="QGridLayout">
<item row="0" column="0" rowspan="2">
<layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout">
<item row="0" column="0" rowspan="2">
<widget class="QLabel" name="logo_label">
<property name="minimumSize">
@ -218,7 +218,7 @@ border-radius: 2px;}</string>
<property name="title">
<string>Channel Decscription</string>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QLabel" name="iconLabel">
<property name="text">

View file

@ -37,9 +37,9 @@ border-radius: 10px}</string>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_6">
<layout class="QGridLayout">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="minimumSize">
@ -101,7 +101,7 @@ border-radius: 10px}</string>
</layout>
</item>
<item row="0" column="1">
<layout class="QGridLayout" name="gridLayout_2">
<layout class="QGridLayout">
<item row="0" column="0">
<spacer name="horizontalSpacer">
<property name="orientation">
@ -288,7 +288,7 @@ border-radius: 10px}</string>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<layout class="QGridLayout">
<item row="0" column="0" rowspan="2">
<widget class="QLabel" name="avatarlabel">
<property name="minimumSize">
@ -455,7 +455,7 @@ border-radius: 10px}</string>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<layout class="QGridLayout">
<item row="0" column="0" rowspan="3">
<widget class="QLabel" name="nextavatarlabel">
<property name="minimumSize">
@ -589,7 +589,7 @@ border-radius: 10px}</string>
</widget>
</item>
<item row="5" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout_3">
<layout class="QGridLayout">
<item row="0" column="0">
<spacer name="horizontalSpacer_3">
<property name="orientation">

View file

@ -37,7 +37,7 @@ border-radius: 10px}</string>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<layout class="QGridLayout">
<property name="verticalSpacing">
<number>0</number>
</property>
@ -67,7 +67,7 @@ stop: 0 #2291E0, stop: 1 #3EB3FF);
</widget>
</item>
<item row="0" column="1" colspan="4">
<layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QLabel" name="titleLabel">
<property name="sizePolicy">

View file

@ -37,7 +37,7 @@ border-radius: 10px}</string>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<layout class="QGridLayout">
<property name="verticalSpacing">
<number>0</number>
</property>
@ -52,7 +52,7 @@ border-radius: 10px}</string>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<layout class="QGridLayout">
<property name="leftMargin">
<number>0</number>
</property>
@ -94,7 +94,7 @@ border-radius: 10px}</string>
</widget>
</item>
<item row="0" column="1">
<layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QLabel" name="peernameLabel">
<property name="styleSheet">
@ -279,11 +279,6 @@ border-radius: 10px}</string>
</layout>
</item>
</layout>
<zorder></zorder>
<zorder>avatar_label</zorder>
<zorder></zorder>
<zorder></zorder>
<zorder></zorder>
</widget>
</item>
<item row="1" column="0">
@ -300,7 +295,7 @@ border-radius: 10px}</string>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<layout class="QGridLayout">
<property name="verticalSpacing">
<number>2</number>
</property>
@ -354,7 +349,7 @@ border-radius: 10px}</string>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<layout class="QGridLayout">
<item row="1" column="0">
<spacer name="verticalSpacer">
<property name="orientation">

View file

@ -37,7 +37,7 @@ border-radius: 10px}</string>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<layout class="QGridLayout">
<property name="verticalSpacing">
<number>0</number>
</property>
@ -52,7 +52,7 @@ border-radius: 10px}</string>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<layout class="QGridLayout">
<property name="leftMargin">
<number>0</number>
</property>
@ -94,7 +94,7 @@ border-radius: 10px}</string>
</widget>
</item>
<item row="0" column="1">
<layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QLabel" name="peernameLabel">
<property name="styleSheet">
@ -279,11 +279,6 @@ border-radius: 10px}</string>
</layout>
</item>
</layout>
<zorder></zorder>
<zorder>avatar_label</zorder>
<zorder></zorder>
<zorder></zorder>
<zorder></zorder>
</widget>
</item>
<item row="1" column="0">
@ -300,7 +295,7 @@ border-radius: 10px}</string>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<layout class="QGridLayout">
<property name="verticalSpacing">
<number>2</number>
</property>
@ -354,7 +349,7 @@ border-radius: 10px}</string>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<layout class="QGridLayout">
<item row="1" column="0">
<spacer name="verticalSpacer">
<property name="orientation">