diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp index c488870ea..190b40855 100644 --- a/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp +++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.cpp @@ -190,7 +190,7 @@ void PGPKeyDialog::load() ui.trustlevel_CB->hide(); ui.is_signing_me->hide(); - ui.signersBox->setTitle(tr("This is your own PGP key, and it is signed by :")+" "); + ui.signersLabel->setText(tr("This is your own PGP key, and it is signed by :")+" "); } else @@ -198,7 +198,7 @@ void PGPKeyDialog::load() ui.web_of_trust_label->show(); ui.trustlevel_CB->show(); ui.is_signing_me->show(); - ui.signersBox->setTitle(tr("This key is signed by :")+" "); + ui.signersLabel->setText(tr("This key is signed by :")+" "); if (detail.accept_connection) { diff --git a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui index 53c59b1ae..754a3a6d2 100644 --- a/retroshare-gui/src/gui/connect/PGPKeyDialog.ui +++ b/retroshare-gui/src/gui/connect/PGPKeyDialog.ui @@ -7,14 +7,515 @@ 0 0 600 - 500 + 401 - Dialog + Retroshare profile - - + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 3 + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + 0 + + + + Profile info + + + + 0 + + + 6 + + + + + + + + + true + + + + + + + <html><head/><body><p>The PGP key fingerprint is a---supposedly unforgeable---characteristics of the PGP key. In order to make sure that you're dealing with the right key, compare the fingerprints.</p></body></html> + + + true + + + + + + + Fingerprint : + + + + + + + Name : + + + + + + + <html><head/><body><p>The trust level is an optional and local parameter that you can set in order to remember your option about a given PGP key. It is not used whatsoever to authorize connections. </p></body></html> + + + + Unset + + + + :/images/security-low-off-48.png:/images/security-low-off-48.png + + + + + Unknown + + + + :/images/security-low-off-48.png:/images/security-low-off-48.png + + + + + No trust + + + + :/images/security-low-48.png:/images/security-low-48.png + + + + + Marginal + + + + :/images/security-medium-48.png:/images/security-medium-48.png + + + + + Full + + + + :/images/security-high-48.png:/images/security-high-48.png + + + + + Ultimate + + + + :/images/security-high-48.png:/images/security-high-48.png + + + + + + + + Trust level: + + + true + + + + + + + Keysigning: + + + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Signing a friend's key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.</span></p></body></html> + + + Sign this key + + + + 48 + 48 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + <html><head/><body><p><span style=" font-size:10pt;">Signing a friend's key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.</span></p></body></html> + + + Sign PGP key + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + 6 + + + 0 + + + 0 + + + 6 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + <html><head/><body><p>Click here if you want to refuse connections to nodes authenticated by this key.</p></body></html> + + + Deny connections + + + + :/images/user/deny_user48.png:/images/user/deny_user48.png + + + + 48 + 48 + + + + Qt::ToolButtonTextUnderIcon + + + + + + + <html><head/><body><p>Click this if you want your node to accept connecting to Retroshare nodes authenticated by this PGP key. This is done automatically when exchanging your Retroshare certificate with someone. In order to make friends, it is better to exchange certificates than accept connections from a given key, since the certificate also contain useful connection information (IP, DNS, SSL ids, etc).</p></body></html> + + + Accept connections + + + + :/images/user/add_user48.png:/images/user/add_user48.png + + + + 48 + 48 + + + + false + + + false + + + Qt::ToolButtonTextUnderIcon + + + false + + + Qt::NoArrow + + + + + + + + + + + + + + + + + + + 0 + 0 + + + + <html><head/><body><p><span style=" font-size:10pt;">Signing a friend's key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.</span></p></body></html> + + + + + + + + + + 75 + true + + + + This profile has signed your own profile key + + + + + + + + PGP key + + + + + + Below is the node's profile key in PGP ASCII format. It identifies all nodes of the same profile. A "Retroshare certificate" that you can exchange in order to make friends, is in the the "details" of each separate node. + + + true + + + + + + + + 0 + 0 + + + + + + + + + + <html><head/><body><p>This button will toggle the inclusion of signatures in the ascii display of the PGP key. See the comments about signatures in the other tab. </p></body></html> + + + Include signatures + + + + + + + + + + Options + + + + + + These options apply to all nodes of the profile: + + + + + + + <html><head/><body><p align="justify">Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you're downloading the file.</p><p align="justify">To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend's file list. This setting is applied to all locations of the same node.</p></body></html> + + + Use as direct source, when available + + + + + + + <html><head/><body><p>This option allows you to automatically download a file that is recommended in an message coming from this profile (e.g. when the message author is a signed identity that belongs to this profile). This can be used for instance to send files between your own nodes.</p></body></html> + + + Auto-download recommended files from this node + + + + + + + <html><head/><body><p>Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &quot;security feed items&quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.</p></body></html> + + + Require white list clearance + + + + + + + + + + + Max upload speed (0=unlimited) + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Max download speed (0=unlimited) + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + kB/s + + + 10000 + + + + + + + kB/s + + + 10000 + + + + + + + + + + + Qt::Vertical + + + + 20 + 274 + + + + + + + + + + + + QFrame::NoFrame @@ -24,463 +525,6 @@ - - - - 2 - - - - Profile info - - - - - - - - - - true - - - - - - - <html><head/><body><p>The PGP key fingerprint is a---supposedly unforgeable---characteristics of the PGP key. In order to make sure that you're dealing with the right key, compare the fingerprints.</p></body></html> - - - true - - - - - - - Fingerprint : - - - - - - - Name : - - - - - - - <html><head/><body><p>The trust level is an optional and local parameter that you can set in order to remember your option about a given PGP key. It is not used whatsoever to authorize connections. </p></body></html> - - - - Unset - - - - :/images/security-low-off-48.png:/images/security-low-off-48.png - - - - - Unknown - - - - :/images/security-low-off-48.png:/images/security-low-off-48.png - - - - - No trust - - - - :/images/security-low-48.png:/images/security-low-48.png - - - - - Marginal - - - - :/images/security-medium-48.png:/images/security-medium-48.png - - - - - Full - - - - :/images/security-high-48.png:/images/security-high-48.png - - - - - Ultimate - - - - :/images/security-high-48.png:/images/security-high-48.png - - - - - - - - Trust level: - - - true - - - - - - - Keysigning: - - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Signing a friend's key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.</span></p></body></html> - - - Sign this key - - - - 48 - 48 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - <html><head/><body><p><span style=" font-size:10pt;">Signing a friend's key is a way to express your trust into this friend, to your other friends. It helps them to decide whether to allow connections from that key based on your own trust. Signing a key is absolutely optional and cannot be undone, so do it wisely.</span></p></body></html> - - - Sign PGP key - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - 75 - true - - - - This profile has signed your own profile key - - - - - - - Key signatures : - - - - - - <html><head/><body><p><span style=" font-size:10pt;">Signing a friend's key is a way to express your trust into this friend, to your other friends. The signatures below cryptographically attest that owners of the listed keys recognise the current PGP key as authentic.</span></p></body></html> - - - - - - - - - - 6 - - - 6 - - - 6 - - - 6 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - <html><head/><body><p>Click here if you want to refuse connections to nodes authenticated by this key.</p></body></html> - - - Deny connections - - - - :/images/user/deny_user48.png:/images/user/deny_user48.png - - - - 48 - 48 - - - - Qt::ToolButtonTextUnderIcon - - - - - - - <html><head/><body><p>Click this if you want your node to accept connecting to Retroshare nodes authenticated by this PGP key. This is done automatically when exchanging your Retroshare certificate with someone. In order to make friends, it is better to exchange certificates than accept connections from a given key, since the certificate also contain useful connection information (IP, DNS, SSL ids, etc).</p></body></html> - - - Accept connections - - - - :/images/user/add_user48.png:/images/user/add_user48.png - - - - 48 - 48 - - - - false - - - false - - - Qt::ToolButtonTextUnderIcon - - - false - - - Qt::NoArrow - - - - - - - - - - PGP key - - - - - - Below is the node's profile key in PGP ASCII format. It identifies all nodes of the same profile. A "Retroshare certificate" that you can exchange in order to make friends, is in the the "details" of each separate node. - - - true - - - - - - - - 0 - 0 - - - - - - - - - - <html><head/><body><p>This button will toggle the inclusion of signatures in the ascii display of the PGP key. See the comments about signatures in the other tab. </p></body></html> - - - Include signatures - - - - - - - - - - Options - - - - - - These options apply to all nodes of the profile: - - - - - - - <html><head/><body><p align="justify">Retroshare periodically checks your friend lists for browsable files matching your transfers, to establish a direct transfer. In this case, your friend knows you're downloading the file.</p><p align="justify">To prevent this behavior for this friend only, uncheck this box. You can still perform a direct transfer if you explicitly ask for it, by e.g. downloading from your friend's file list. This setting is applied to all locations of the same node.</p></body></html> - - - Use as direct source, when available - - - - - - - <html><head/><body><p>This option allows you to automatically download a file that is recommended in an message coming from this profile (e.g. when the message author is a signed identity that belongs to this profile). This can be used for instance to send files between your own nodes.</p></body></html> - - - Auto-download recommended files from this node - - - - - - - <html><head/><body><p>Peers that have this option cannot connect if their connection address is not in the whitelist. This protects you from traffic forwarding attacks. When used, rejected peers will be reported by &quot;security feed items&quot; in the News Feed section. From there, you can whitelist/blacklist their IP. Applies to all locations of the same node.</p></body></html> - - - Require white list clearance - - - - - - - - - - - Max upload speed (0=unlimited) - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Max download speed (0=unlimited) - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - kB/s - - - 10000 - - - - - - - kB/s - - - 10000 - - - - - - - - - - - Qt::Vertical - - - - 20 - 274 - - - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - -