From cff157face6e7cf465b5b686ef7dd4e09796d582 Mon Sep 17 00:00:00 2001 From: Thorvald Natvig Date: Wed, 29 Apr 2009 20:28:05 +0200 Subject: [PATCH] Add tooltips and whatsthis to cert dialog, and add some icons --- celt | 2 +- icons/tango/README | 1 + icons/tango/document-new.svg | 448 +++++++++++++++++++++ icons/tango/document-open.svg | 535 +++++++++++++++++++++++++ icons/tango/document-save-as.svg | 663 +++++++++++++++++++++++++++++++ src/mumble/Cert.ui | 294 ++++++++++---- src/mumble/MainWindow.cpp | 2 +- src/mumble/mumble.pro | 4 + src/mumble/mumble_tango.qrc | 7 + 9 files changed, 1876 insertions(+), 80 deletions(-) create mode 100644 icons/tango/README create mode 100644 icons/tango/document-new.svg create mode 100644 icons/tango/document-open.svg create mode 100644 icons/tango/document-save-as.svg create mode 100644 src/mumble/mumble_tango.qrc diff --git a/celt b/celt index 05ed03e6e..eafbdd553 160000 --- a/celt +++ b/celt @@ -1 +1 @@ -Subproject commit 05ed03e6e3b8938a94c36415cfc8ac30e34c4e60 +Subproject commit eafbdd55312151ae8ad142e2a0be099787765b22 diff --git a/icons/tango/README b/icons/tango/README new file mode 100644 index 000000000..2c4df9fcf --- /dev/null +++ b/icons/tango/README @@ -0,0 +1 @@ +These icons are copied from the Tango Icon Theme http://tango.freedesktop.org/Tango_Desktop_Project diff --git a/icons/tango/document-new.svg b/icons/tango/document-new.svg new file mode 100644 index 000000000..1bfdb1640 --- /dev/null +++ b/icons/tango/document-new.svg @@ -0,0 +1,448 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + New Document + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/tango/document-open.svg b/icons/tango/document-open.svg new file mode 100644 index 000000000..55e6177d2 --- /dev/null +++ b/icons/tango/document-open.svg @@ -0,0 +1,535 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Folder Icon Accept + 2005-01-31 + + + Jakub Steiner + + + + http://jimmac.musichall.cz + Active state - when files are being dragged to. + + + Novell, Inc. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/tango/document-save-as.svg b/icons/tango/document-save-as.svg new file mode 100644 index 000000000..01e2fb7a5 --- /dev/null +++ b/icons/tango/document-save-as.svg @@ -0,0 +1,663 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Save As + + + Jakub Steiner + + + + + hdd + hard drive + save as + io + store + + + + + http://jimmac.musichall.cz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mumble/Cert.ui b/src/mumble/Cert.ui index cadbfde5c..fb34d4820 100644 --- a/src/mumble/Cert.ui +++ b/src/mumble/Cert.ui @@ -13,6 +13,12 @@ Certificate Management + + Select file to export to + + + This opens a file selection dialog to choose a file to export the certificate to. + Certificate Authentication @@ -25,19 +31,9 @@ - + - Mumble can use certificates to autenticate with servers. Using certificates avoids passwords, meaning you don't need to disclose any password to the remote site. It also enables very easy user registration. - - - true - - - - - - - While Mumble can work without certificates, the majority of servers will expect you to have one. + <p>Mumble can use certificates to autenticate with servers. Using certificates avoids passwords, meaning you don't need to disclose any password to the remote site. It also enables very easy user registration.</p><p>While Mumble can work without certificates, the majority of servers will expect you to have one.</p> true @@ -46,6 +42,12 @@ + + Current certificate + + + This is the certificate Mumble currently uses. + Current Certificate @@ -53,9 +55,25 @@ + + Create a new certificate + + + This will create a new certificate. + Create a new certificate + + + :actions/document-new.svg:actions/document-new.svg + + + + 32 + 32 + + true @@ -63,9 +81,25 @@ + + Import certificate from file + + + This will import a certificate from file. + Import a certificate + + + :actions/document-open.svg:actions/document-open.svg + + + + 32 + 32 + + @@ -73,9 +107,25 @@ false + + Export Certificate + + + This will export a certificate to file. + Export current certificate + + + :actions/document-save-as.svg:actions/document-save-as.svg + + + + 32 + 32 + + @@ -92,47 +142,83 @@ - + - Mumble can import certicates stored in PKCS #12 format. This is the format used when exporting a key from Mumble, and also when exporting keys from FireFox, Internet Explorer, Opera etc. + <p>Mumble can import certicates stored in PKCS #12 format. This is the format used when exporting a key from Mumble, and also when exporting keys from FireFox, Internet Explorer, Opera etc.</p><p>If the file is password protected, you will need the password to import the certificate.</p> true - - + + Import from - - - - - - - - - ... - - - - - - - Certificate Details + + qleImportFile - + + + Filename to import from + + + This is the filename you wish to import a certificate from. + + - + + + + Select file to import from + + + This opens a file selection dialog to choose a file to import a certificate from. + + + Open... + + + + :actions/document-open.svg:actions/document-open.svg + + + + Password + + qlePassword + + + + + + + Password for PKCS#12 file + + + This is the password for the PKCS#12 file containing your certificate. + + + + + + + Certificate to import + + + This is the certificate you are importing. + + + Certificate Details + @@ -149,12 +235,20 @@ - + true - You already have a certificate stored in Mumble, and you are about to replace it. Are you sure you wish to do this? + <p>You already have a certificate stored in Mumble, and you are about to replace it.</p> +<p>If you are upgrading to a certificate issued to you by a trusted CA and the email addresses match your current certificate, this is completely safe, and servers you connect to will automatically recognize the strong certificate for your email address. +</p> +<p>If this is not the case, you will no longer be recognized by any server you previously have authenticated with. If you haven't been registered on any server yet, this is nothing to worry about. +</p> +<p> +Are you sure you wish to replace your certificate? +</p> + true @@ -169,6 +263,12 @@ 0 + + Current certificate + + + This is the certificate Mumble currently uses. It will be replaced. + Current Certificate @@ -182,6 +282,12 @@ 0 + + New certificate + + + This is the new certificate that will replace the old one. + New Certificate @@ -201,48 +307,55 @@ - + - <!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:'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;">If you ever loose your current certificate, which will happen if your computer suffers a hardware failure or you reinstall your machine, you will no longer be able to authenticate to any server you are registered on. It is therefore <span style=" font-weight:600;">mandatory </span>that you make a backup of your certificate. We strongly recommend you store this backup on removable storage, such as an USB memory stick.</p></body></html> + <p>If you ever loose your current certificate, which will happen if your computer suffers a hardware failure or you reinstall your machine, you will no longer be able to authenticate to any server you are registered on. It is therefore <b>mandatory</b> that you make a backup of your certificate. We strongly recommend you store this backup on removable storage, such as an USB memory stick.</p> +<p>Note that this file will not be encrypted, and if anyone gains access to it, they will be able to impersonate you, so take good care of it.</p> true - - - - Note that this file will not be encrypted, and if anyone gains access to it, they will be able to impersonate you, so take good care of it. - - - true - - - - - + + Export to + + qleExportFile + - + + + Filename to export to + + + This is the filename you wish to export a certificate to. + + - + - ... + Save As... + + + + :actions/document-save-as.svg:actions/document-save-as.svg + + Current certificate + + + This is the certificate Mumble currently uses. It will be exported. + Certificate Details @@ -262,52 +375,62 @@ p, li { white-space: pre-wrap; } - + - Mumble will now generate a strong certificate for authentication to servers. + <p>Mumble will now generate a strong certificate for authentication to servers.</p><p>If you wish, you may provide some additional information to be stored in the certificate, which will be presented to servers when you connect. If you provide a valid email address, you can upgrade to a CA issued email certificate later on, which provides strong identification.</p> true - - + + - If you wish, you may provide some additional information to be stored in the certificate, which will be presented to servers when you connect. If you provide a valid email address, you can upgrade to a CA issued email certificate later on, which provides strong identification. + Name - - true + + qleName - + - Name + Email + + + qleEmail - - - - - - E-Mail + + + Your email address (e.g. johndoe@mumble.info) + + + This is your email address. It is strongly recommended to provide a valid email address, as this will allow you to upgrade to a strong certificate without authentication problems. - - - + + + + Your name (e.g. John Doe) + + + This is your name, and will be filled out in the certificate. This field is entirely optional. + + + @@ -315,14 +438,14 @@ p, li { white-space: pre-wrap; } Finish - Certificate Authentication ready for use + Certificate-based authentication is ready for use 5 - + Enjoy using Mumble with strong authentication. @@ -348,6 +471,21 @@ p, li { white-space: pre-wrap; } 1 - + + qleName + qleEmail + qlePassword + qrbExport + qpbImportFile + qrbCreate + qrbImport + qleImportFile + qleExportFile + qpbExportFile + + + + + diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp index 384f8a383..5d8d1ac32 100644 --- a/src/mumble/MainWindow.cpp +++ b/src/mumble/MainWindow.cpp @@ -757,7 +757,7 @@ void MainWindow::on_qaPlayerRegister_triggered() { unsigned int session = p->uiSession; - if (QMessageBox::question(this, tr("Register player %1").arg(p->qsName), tr("You are about to register %1 on the server. This action cannot be undone, the username cannot be changed, and as a registered user, %1 will have access to the server even if you change the server password.
Are you sure you want to register %1?").arg(p->qsName), QMessageBox::Yes|QMessageBox::No) == QMessageBox::Yes) { + if (QMessageBox::question(this, tr("Register player %1").arg(p->qsName), tr("

You are about to register %1 on the server. This action cannot be undone, the username cannot be changed, and as a registered user, %1 will have access to the server even if you change the server password.

From this point on, %1 will be authenticated with the certificate currently in use.

Are you sure you want to register %1?

").arg(p->qsName), QMessageBox::Yes|QMessageBox::No) == QMessageBox::Yes) { MumbleProto::UserState mpus; mpus.set_session(p->uiSession); mpus.set_user_id(0); diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro index a168c61b1..34312ef05 100644 --- a/src/mumble/mumble.pro +++ b/src/mumble/mumble.pro @@ -240,6 +240,10 @@ CONFIG(no-update) { RESOURCES *= mumble_qt.qrc } +!CONFIG(no-embed-tango-icons) { + RESOURCES *= mumble_tango.qrc +} + lrel.output = ${QMAKE_FILE_BASE}.qm lrel.commands = $${QMAKE_LRELEASE} ${QMAKE_FILE_NAME} lrel.input = TRANSLATIONS diff --git a/src/mumble/mumble_tango.qrc b/src/mumble/mumble_tango.qrc new file mode 100644 index 000000000..887abf58d --- /dev/null +++ b/src/mumble/mumble_tango.qrc @@ -0,0 +1,7 @@ + + + ../../icons/tango/document-new.svg + ../../icons/tango/document-open.svg + ../../icons/tango/document-save-as.svg + +