* Corrected the layout of the Connect Progress Dialog

* Added few more file type icons for "cpp", "h" nd "c"
* Corrected some strings
* Moved Uploads to Downloads Tab. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6986 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2014-01-04 19:54:07 +00:00
parent 4ce8ea73d2
commit 50ebd781e5
7 changed files with 318 additions and 239 deletions

View file

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>553</width>
<height>530</height>
<height>489</height>
</rect>
</property>
<property name="windowTitle">
@ -42,8 +42,8 @@
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0" rowspan="2">
<widget class="QFrame" name="progressFrame">
<property name="enabled">
<bool>true</bool>
@ -54,215 +54,230 @@
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Connecting to:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="connectId">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>13</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Network </string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="NetResult">
<property name="text">
<string>Net Result</string>
</property>
</widget>
</item>
<item row="1" column="0">
<item row="2" column="0">
<widget class="QLabel" name="label_4">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Connect Status</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="ContactResult">
<property name="text">
<string>Contact Result</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>13</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<item row="4" column="0">
<widget class="QLabel" name="label_2">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>DHT Startup</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QProgressBar" name="DhtProgressBar">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="0" column="2">
<item row="4" column="2">
<widget class="QLabel" name="DhtResult">
<property name="text">
<string>DHT Result</string>
</property>
</widget>
</item>
<item row="1" column="0">
<item row="5" column="0">
<widget class="QLabel" name="label_6">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Peer Lookup</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QProgressBar" name="LookupProgressBar">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="1" column="2">
<item row="5" column="2">
<widget class="QLabel" name="LookupResult">
<property name="text">
<string>Peer Result</string>
</property>
</widget>
</item>
<item row="2" column="0">
<item row="6" column="0">
<widget class="QLabel" name="label_7">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>UDP Setup</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QProgressBar" name="UdpProgressBar">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="2" column="2">
<item row="6" column="2">
<widget class="QLabel" name="UdpResult">
<property name="text">
<string>UDP Result</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QProgressBar" name="DhtProgressBar">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QProgressBar" name="LookupProgressBar">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QProgressBar" name="UdpProgressBar">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="connectId">
<property name="palette">
<palette>
<active>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>127</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>0</red>
<green>0</green>
<blue>127</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="WindowText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>118</red>
<green>116</green>
<blue>108</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="font">
<font>
<pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="NetResult">
<property name="text">
<string>Net Result</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="ContactResult">
<property name="text">
<string>Contact Result</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="statusIcon">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="QLabel" name="statusTitle">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="statusIcon">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeIncrement">
<size>
<width>1</width>
<height>0</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="statusTitle">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Ignored">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeIncrement">
<size>
<width>5</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<item row="2" column="0">
<widget class="QTextBrowser" name="textBrowser">
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
@ -277,7 +292,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item>
<item row="3" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">