Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

merging the ui changes

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7079 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2014-02-01 15:18:33 +00:00
parent c0738eec7f
commit d706a98dd6
1 changed files with 206 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

408
retroshare-gui/src/gui/GenCertDialog.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>618</width> <width>677</width>
<height>641</height> <height>564</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -32,11 +32,28 @@
<height>30</height> <height>30</height>
</size> </size>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QGridLayout" name="gridLayout_2">
<item> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="header_label">
<property name="font"> <property name="font">
<font> <font>
<family>Tahoma</family>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
<string>RetroShare uses PGP keys for identity management.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="genprofileinfo_label">
<property name="font">
<font>
<family>Tahoma</family>
<pointsize>11</pointsize> <pointsize>11</pointsize>
</font> </font>
</property> </property>
@ -48,7 +65,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="2" column="0">
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="4"> <item row="0" column="0" colspan="4">
@ -130,119 +147,135 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="0"> <item row="2" column="0" colspan="4">
<widget class="QLabel" name="genPGPuserlabel"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="text"> <item>
<string>Use identity</string> <layout class="QVBoxLayout" name="verticalLayout">
</property> <item>
</widget> <widget class="QLabel" name="genPGPuserlabel">
</item> <property name="text">
<item row="2" column="1" colspan="3"> <string>Use identity</string>
<widget class="QComboBox" name="genPGPuser"> </property>
<property name="toolTip"> </widget>
<string>Your profile is associated with a PGP key. RetroShare currently ignores DSA keys.</string> </item>
</property> <item>
</widget> <widget class="QLabel" name="name_label">
</item> <property name="text">
<item row="3" column="0"> <string>Name</string>
<widget class="QLabel" name="name_label"> </property>
<property name="text"> </widget>
<string>Name</string> </item>
</property> <item>
</widget> <widget class="QLabel" name="email_label">
</item> <property name="text">
<item row="3" column="1" colspan="3"> <string>Email</string>
<widget class="QLineEdit" name="name_input"> </property>
<property name="toolTip"> </widget>
<string>Enter your nickname here</string> </item>
</property> <item>
<property name="maxLength"> <widget class="QLabel" name="password_label">
<number>64</number> <property name="toolTip">
</property> <string>This Password is for PGP</string>
</widget> </property>
</item> <property name="text">
<item row="4" column="0"> <string>Password</string>
<widget class="QLabel" name="email_label"> </property>
<property name="text"> </widget>
<string>Email</string> </item>
</property> <item>
</widget> <widget class="QLabel" name="password_label_2">
</item> <property name="toolTip">
<item row="4" column="1" colspan="3"> <string>This Password is for PGP</string>
<widget class="QLineEdit" name="email_input"> </property>
<property name="toolTip"> <property name="text">
<string>Be careful: this email will be visible to your friends and friends <string>Password (check)</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="location_label">
<property name="text">
<string>Location</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QComboBox" name="genPGPuser">
<property name="toolTip">
<string>Your profile is associated with a PGP key. RetroShare currently ignores DSA keys.</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="name_input">
<property name="toolTip">
<string>Enter your nickname here</string>
</property>
<property name="maxLength">
<number>64</number>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="email_input">
<property name="toolTip">
<string>Be careful: this email will be visible to your friends and friends
of your friends. This information is required by PGP, but to stay of your friends. This information is required by PGP, but to stay
anonymous, you can use a fake email.</string> anonymous, you can use a fake email.</string>
</property> </property>
<property name="maxLength"> <property name="maxLength">
<number>64</number> <number>64</number>
</property> </property>
</widget> </widget>
</item>
<item>
<widget class="QLineEdit" name="password_input">
<property name="toolTip">
<string>Put a strong password here. This password protects your PGP key.</string>
</property>
<property name="inputMask">
<string/>
</property>
<property name="maxLength">
<number>1024</number>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="password_input_2">
<property name="toolTip">
<string>Put a strong password here. This password protects your PGP key.</string>
</property>
<property name="inputMask">
<string/>
</property>
<property name="maxLength">
<number>1024</number>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="location_input">
<property name="maxLength">
<number>64</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item> </item>
<item row="5" column="0"> <item row="3" column="0" colspan="4">
<widget class="QLabel" name="password_label">
<property name="toolTip">
<string>This Password is for PGP</string>
</property>
<property name="text">
<string>Password</string>
</property>
</widget>
</item>
<item row="5" column="1" colspan="3">
<widget class="QLineEdit" name="password_input">
<property name="toolTip">
<string>Put a strong password here. This password protects your PGP key.</string>
</property>
<property name="inputMask">
<string/>
</property>
<property name="maxLength">
<number>1024</number>
</property>
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="location_label">
<property name="text">
<string>Location</string>
</property>
</widget>
</item>
<item row="6" column="1" colspan="3">
<widget class="QLineEdit" name="location_input">
<property name="maxLength">
<number>64</number>
</property>
</widget>
</item>
<item row="7" column="1" colspan="3">
<widget class="QLabel" name="label_location2">
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="lineWidth">
<number>1</number>
</property>
<property name="text">
<string>Put a meaningful location. ex : home, laptop, etc. This field will be used to differentiate different installations with the same identity (PGP key).</string>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="8" column="0" colspan="4">
<widget class="QCheckBox" name="hidden_checkbox"> <widget class="QCheckBox" name="hidden_checkbox">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
@ -271,28 +304,28 @@ anonymous, you can use a fake email.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="0"> <item row="4" column="0">
<widget class="QLabel" name="hiddenaddr_label"> <widget class="QLabel" name="hiddenaddr_label">
<property name="text"> <property name="text">
<string>Tor Address</string> <string>Tor Address</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="1"> <item row="4" column="1">
<widget class="QLineEdit" name="hiddenaddr_input"> <widget class="QLineEdit" name="hiddenaddr_input">
<property name="maxLength"> <property name="maxLength">
<number>64</number> <number>64</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="2"> <item row="4" column="2">
<widget class="QLabel" name="hiddenport_label"> <widget class="QLabel" name="hiddenport_label">
<property name="text"> <property name="text">
<string>Port</string> <string>Port</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="3"> <item row="4" column="3">
<widget class="QSpinBox" name="hiddenport_spinBox"> <widget class="QSpinBox" name="hiddenport_spinBox">
<property name="minimum"> <property name="minimum">
<number>1</number> <number>1</number>
@ -305,7 +338,7 @@ anonymous, you can use a fake email.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="1" colspan="3"> <item row="5" column="0" colspan="4">
<widget class="QLabel" name="label_hiddenaddr2"> <widget class="QLabel" name="label_hiddenaddr2">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -327,7 +360,24 @@ anonymous, you can use a fake email.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="1" colspan="3"> <item row="6" column="0" colspan="4">
<widget class="QLabel" name="entropy_label">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;justify&quot;&gt;Before proceeding, move your mouse around to help Retroshare collect as much randomness as possible. Filling the progressbar to 20% is needed, 100% is advised.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="7" column="0" colspan="4">
<widget class="QProgressBar" name="entropy_bar">
<property name="value">
<number>24</number>
</property>
</widget>
</item>
<item row="8" column="0" colspan="4">
<widget class="QPushButton" name="genButton"> <widget class="QPushButton" name="genButton">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
@ -335,41 +385,44 @@ anonymous, you can use a fake email.</string>
<height>26</height> <height>26</height>
</size> </size>
</property> </property>
<property name="font">
<font>
<family>Arial</family>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="text"> <property name="text">
<string>Create new identity</string> <string>Create new identity</string>
</property> </property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/contact_new.png</normaloff>:/images/contact_new.png</iconset>
</property>
</widget> </widget>
</item> </item>
<item row="12" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>1</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="3" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QFrame" name="headerFrame"> <widget class="HeaderFrame" name="headerFrame">
<property name="maximumSize"> <property name="styleSheet">
<size> <string notr="true"/>
<width>16777215</width>
<height>140</height>
</size>
</property> </property>
<property name="frameShape"> <property name="frameShape">
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
@ -377,71 +430,22 @@ anonymous, you can use a fake email.</string>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Plain</enum> <enum>QFrame::Plain</enum>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="topMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item>
<widget class="QLabel" name="headerImage">
<property name="minimumSize">
<size>
<width>128</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>128</width>
<height>128</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="images.qrc">:/images/contact_new128.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="headerLayout">
<item>
<widget class="QLabel" name="headerLabel">
<property name="font">
<font>
<pointsize>16</pointsize>
</font>
</property>
<property name="text">
<string>Create a new Identity</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="headerLabel2">
<property name="text">
<string>RetroShare uses PGP keys for identity management.</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<customwidgets>
<customwidget>
<class>HeaderFrame</class>
<extends>QFrame</extends>
<header>gui/common/HeaderFrame.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops> <tabstops>
<tabstop>genPGPuser</tabstop> <tabstop>genPGPuser</tabstop>
<tabstop>name_input</tabstop> <tabstop>name_input</tabstop>
<tabstop>email_input</tabstop> <tabstop>email_input</tabstop>
<tabstop>password_input</tabstop>
<tabstop>location_input</tabstop> <tabstop>location_input</tabstop>
</tabstops> </tabstops>
<resources> <resources>