mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
improvements with user friendly words for Profile Generation labels.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3074 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax
parent
7331d17b16
commit
619a2d7491
@ -6,8 +6,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>592</width>
|
<width>600</width>
|
||||||
<height>496</height>
|
<height>480</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
@ -593,115 +593,49 @@ border: 1px solid #CCCCCC;}</string>
|
|||||||
<property name="title">
|
<property name="title">
|
||||||
<string/>
|
<string/>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QGridLayout" name="gridLayout_2">
|
<layout class="QGridLayout" name="gridLayout_5">
|
||||||
<item row="0" column="0">
|
<item row="0" column="0" colspan="2">
|
||||||
<widget class="QLabel" name="no_gpg_key_label">
|
<widget class="QLabel" name="no_gpg_key_label">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>It looks like you don't own any GPG keys. Please fill in the form below to generate one, or use your favorite gnupg key manager.</string>
|
<string>It looks like you don't own any Profile (GPG keys). Please fill in the form below to generate one, or use your favorite gnupg key manager.</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap">
|
<property name="wordWrap">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="4" column="0">
|
<item row="1" column="0" colspan="2">
|
||||||
<layout class="QFormLayout" name="formLayout">
|
<widget class="QCheckBox" name="new_gpg_key_checkbox">
|
||||||
<property name="fieldGrowthPolicy">
|
<property name="maximumSize">
|
||||||
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
|
<size>
|
||||||
|
<width>16777215</width>
|
||||||
|
<height>32</height>
|
||||||
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<item row="1" column="0">
|
<property name="toolTip">
|
||||||
<widget class="QLabel" name="genPGPuserlabel">
|
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||||
<property name="text">
|
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||||
<string>Use GPG key</string>
|
p, li { white-space: pre-wrap; }
|
||||||
</property>
|
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
||||||
</widget>
|
<pre style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier';">Your profile is associated to a GPG key</span></pre></body></html></string>
|
||||||
</item>
|
</property>
|
||||||
<item row="1" column="1">
|
<property name="text">
|
||||||
<widget class="QComboBox" name="genPGPuser"/>
|
<string>Generate a new Profile</string>
|
||||||
</item>
|
</property>
|
||||||
<item row="2" column="0">
|
<property name="icon">
|
||||||
<widget class="QLabel" name="name_label">
|
<iconset resource="images.qrc">
|
||||||
<property name="text">
|
<normaloff>:/images/contact_new128.png</normaloff>:/images/contact_new128.png</iconset>
|
||||||
<string>Name</string>
|
</property>
|
||||||
</property>
|
<property name="iconSize">
|
||||||
</widget>
|
<size>
|
||||||
</item>
|
<width>32</width>
|
||||||
<item row="2" column="1">
|
<height>32</height>
|
||||||
<widget class="QLineEdit" name="name_input">
|
</size>
|
||||||
<property name="toolTip">
|
</property>
|
||||||
<string>Enter here your nickname</string>
|
<property name="tristate">
|
||||||
</property>
|
<bool>false</bool>
|
||||||
</widget>
|
</property>
|
||||||
</item>
|
</widget>
|
||||||
<item row="3" column="0">
|
|
||||||
<widget class="QLabel" name="email_label">
|
|
||||||
<property name="text">
|
|
||||||
<string>Email</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="1">
|
|
||||||
<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 GPG, but to stay
|
|
||||||
anonymous, you can use a fake email.</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="0">
|
|
||||||
<widget class="QLabel" name="password_label">
|
|
||||||
<property name="text">
|
|
||||||
<string>GPG Password</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="4" column="1">
|
|
||||||
<widget class="QLineEdit" name="password_input">
|
|
||||||
<property name="toolTip">
|
|
||||||
<string>Put a strong password here. This password protects your GPG key.</string>
|
|
||||||
</property>
|
|
||||||
<property name="inputMask">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
<property name="echoMode">
|
|
||||||
<enum>QLineEdit::Password</enum>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="0">
|
|
||||||
<widget class="QLabel" name="location_label">
|
|
||||||
<property name="text">
|
|
||||||
<string>Location:</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="5" column="1">
|
|
||||||
<widget class="QLineEdit" name="location_input"/>
|
|
||||||
</item>
|
|
||||||
<item row="6" column="1">
|
|
||||||
<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 meaningfull location. ex : home, laptop, etc. This field will be used to differentiate different installations with the same gpg key.</string>
|
|
||||||
</property>
|
|
||||||
<property name="scaledContents">
|
|
||||||
<bool>false</bool>
|
|
||||||
</property>
|
|
||||||
<property name="wordWrap">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="0">
|
<item row="2" column="0">
|
||||||
<widget class="QLabel" name="progress_label">
|
<widget class="QLabel" name="progress_label">
|
||||||
@ -716,33 +650,113 @@ anonymous, you can use a fake email.</string>
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="0">
|
<item row="3" column="0" colspan="2">
|
||||||
<widget class="QCheckBox" name="new_gpg_key_checkbox">
|
<layout class="QGridLayout" name="gridLayout_2">
|
||||||
<property name="maximumSize">
|
<item row="0" column="0">
|
||||||
<size>
|
<widget class="QLabel" name="genPGPuserlabel">
|
||||||
<width>16777215</width>
|
<property name="toolTip">
|
||||||
<height>32</height>
|
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||||
</size>
|
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||||
</property>
|
p, li { white-space: pre-wrap; }
|
||||||
<property name="text">
|
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
||||||
<string>Generate a new gpg key</string>
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Courier New,courier'; font-size:8pt;">Your profile is associated to a GPG key</span></p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon">
|
<property name="text">
|
||||||
<iconset resource="images.qrc">
|
<string>Use Profile</string>
|
||||||
<normaloff>:/images/gpgp_key_generate.png</normaloff>:/images/gpgp_key_generate.png</iconset>
|
</property>
|
||||||
</property>
|
</widget>
|
||||||
<property name="iconSize">
|
</item>
|
||||||
<size>
|
<item row="0" column="1">
|
||||||
<width>32</width>
|
<widget class="QComboBox" name="genPGPuser"/>
|
||||||
<height>32</height>
|
</item>
|
||||||
</size>
|
<item row="1" column="0">
|
||||||
</property>
|
<widget class="QLabel" name="name_label">
|
||||||
<property name="tristate">
|
<property name="text">
|
||||||
<bool>false</bool>
|
<string>Name</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="1" column="1">
|
||||||
|
<widget class="QLineEdit" name="name_input">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Enter here your nickname</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="0">
|
||||||
|
<widget class="QLabel" name="email_label">
|
||||||
|
<property name="text">
|
||||||
|
<string>Email</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="1">
|
||||||
|
<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 GPG, but to stay
|
||||||
|
anonymous, you can use a fake email.</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="0">
|
||||||
|
<widget class="QLabel" name="password_label">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>This Password is for GPG</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>Password</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="1">
|
||||||
|
<widget class="QLineEdit" name="password_input">
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>Put a strong password here. This password protects your GPG key.</string>
|
||||||
|
</property>
|
||||||
|
<property name="inputMask">
|
||||||
|
<string/>
|
||||||
|
</property>
|
||||||
|
<property name="echoMode">
|
||||||
|
<enum>QLineEdit::Password</enum>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="4" column="0">
|
||||||
|
<widget class="QLabel" name="location_label">
|
||||||
|
<property name="text">
|
||||||
|
<string>Location:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="4" column="1">
|
||||||
|
<widget class="QLineEdit" name="location_input"/>
|
||||||
|
</item>
|
||||||
|
<item row="5" column="1">
|
||||||
|
<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 meaningfull location. ex : home, laptop, etc. This field will be used to differentiate different installations with the same profile (gpg key).</string>
|
||||||
|
</property>
|
||||||
|
<property name="scaledContents">
|
||||||
|
<bool>false</bool>
|
||||||
|
</property>
|
||||||
|
<property name="wordWrap">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item row="5" column="0">
|
<item row="5" column="0" colspan="2">
|
||||||
<spacer name="verticalSpacer">
|
<spacer name="verticalSpacer">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Vertical</enum>
|
<enum>Qt::Vertical</enum>
|
||||||
@ -870,8 +884,8 @@ p, li { white-space: pre-wrap; }
|
|||||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:8pt; font-weight:600;">RetroShare uses gpg keys for identity management. </span></p>
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:8pt; font-weight:600;">RetroShare uses gpg keys for identity management. </span></p>
|
||||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:8pt; font-weight:600;"></p>
|
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:8pt; font-weight:600;"></p>
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:8pt; font-weight:600;">You can use an existing gpg key, or create a new one with this form.</span></p>
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:8pt; font-weight:600;">You can use an existing profile (gpg key), or create a new one with this form.</span></p>
|
||||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:8pt; font-weight:600;">You can install retroshare on different locations using the same gpg key.</span></p></body></html></string>
|
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:8pt; font-weight:600;">You can install retroshare on different locations using the same profile (gpg key).</span></p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user