From c4c5eb53995ea7e4b1433f5153c84bcfac55ab51 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Sun, 4 Aug 2013 23:53:29 +0000 Subject: [PATCH] - Fixed crash when closing the main window without the setting "Minimize to Tray Icon" - Renamed the setting "Do not Minimize to Tray Icon" to "Minimize to Tray Icon" and fixed wrong usage Please check your setting! - Updated english translation git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6557 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/MainWindow.cpp | 38 +++---- retroshare-gui/src/gui/MainWindow.ui | 2 +- .../src/gui/settings/GeneralPage.cpp | 4 +- .../src/gui/settings/GeneralPage.ui | 10 +- .../src/gui/settings/rsharesettings.cpp | 4 +- retroshare-gui/src/lang/retroshare_en.ts | 103 ++++++++---------- 6 files changed, 70 insertions(+), 91 deletions(-) diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index bc937e240..45a30a82e 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -1012,30 +1012,26 @@ void MainWindow::displayErrorMessage(int /*a*/,int /*b*/,const QString& error_ms void MainWindow::closeEvent(QCloseEvent *e) { - static bool firstTime = true; + e->ignore(); - if(!Settings->getCloseToTray()) - { - if (trayIcon->isVisible()) { - if (firstTime) - { + if (Settings->getCloseToTray()) + { + if (trayIcon->isVisible()) { /***** - QMessageBox::information(this, tr("RetroShare System tray"), - tr("Application will continue running. Quit using context menu in the system tray")); -*****/ - firstTime = false; - } - hide(); - e->ignore(); - } - } - else - { - rsicontrol->rsGlobalShutDown(); - rApp->quit(); - } - + static bool firstTime = true; + if (firstTime) + { + QMessageBox::information(this, tr("RetroShare System tray"), tr("Application will continue running. Quit using context menu in the system tray")); + firstTime = false; + } +*****/ + hide(); + } + return; + } + + doQuit(); } void MainWindow::updateMenu() diff --git a/retroshare-gui/src/gui/MainWindow.ui b/retroshare-gui/src/gui/MainWindow.ui index 2c1a60984..ec1062a0b 100644 --- a/retroshare-gui/src/gui/MainWindow.ui +++ b/retroshare-gui/src/gui/MainWindow.ui @@ -11,7 +11,7 @@ - MainWindow + MainWindow diff --git a/retroshare-gui/src/gui/settings/GeneralPage.cpp b/retroshare-gui/src/gui/settings/GeneralPage.cpp index 19d7741bb..d598980af 100755 --- a/retroshare-gui/src/gui/settings/GeneralPage.cpp +++ b/retroshare-gui/src/gui/settings/GeneralPage.cpp @@ -69,7 +69,7 @@ bool GeneralPage::save(QString &/*errmsg*/) { Settings->setStartMinimized(ui.checkStartMinimized->isChecked()); Settings->setValue("doQuit", ui.checkQuit->isChecked()); - Settings->setCloseToTray(ui.checkClosetoTray->isChecked()); + Settings->setCloseToTray(ui.checkCloseToTray->isChecked()); #ifdef Q_WS_WIN Settings->setRunRetroshareOnBoot(ui.chkRunRetroshareAtSystemStartup->isChecked(), ui.chkRunRetroshareAtSystemStartupMinimized->isChecked()); @@ -117,7 +117,7 @@ void GeneralPage::load() ui.checkStartMinimized->setChecked(Settings->getStartMinimized()); ui.checkQuit->setChecked(Settings->value("doQuit", false).toBool()); - ui.checkClosetoTray->setChecked(Settings->getCloseToTray()); + ui.checkCloseToTray->setChecked(Settings->getCloseToTray()); ui.spinBox->setValue(Settings->getMaxTimeBeforeIdle()); diff --git a/retroshare-gui/src/gui/settings/GeneralPage.ui b/retroshare-gui/src/gui/settings/GeneralPage.ui index bb4b903b9..11ce75905 100755 --- a/retroshare-gui/src/gui/settings/GeneralPage.ui +++ b/retroshare-gui/src/gui/settings/GeneralPage.ui @@ -32,9 +32,6 @@ Start minimized - - true - @@ -100,12 +97,9 @@ - + - Do not Minimize to Tray Icon - - - true + Minimize to Tray Icon diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp index bb3970673..c596ec2af 100644 --- a/retroshare-gui/src/gui/settings/rsharesettings.cpp +++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp @@ -266,12 +266,12 @@ void RshareSettings::setStartMinimized(bool startMinimized) bool RshareSettings::getCloseToTray() { - return value("ClosetoTray", false).toBool(); + return value("CloseToTray", true).toBool(); } void RshareSettings::setCloseToTray(bool closeToTray) { - setValue("ClosetoTray", closeToTray); + setValue("CloseToTray", closeToTray); } /** Setting for Notify / Chat and NewsFeeds **/ diff --git a/retroshare-gui/src/lang/retroshare_en.ts b/retroshare-gui/src/lang/retroshare_en.ts index 3116a3113..eb45e6626 100644 --- a/retroshare-gui/src/lang/retroshare_en.ts +++ b/retroshare-gui/src/lang/retroshare_en.ts @@ -5359,10 +5359,6 @@ p, li { white-space: pre-wrap; } Local network - - Welcome to RetroShare's group chat. - - Paste RetroShare Link @@ -5399,6 +5395,10 @@ p, li { white-space: pre-wrap; } <h1><img width="32" src=":/images/64px_help.png">&nbsp;&nbsp;Friends</h1> <p>The Friends tab shows...your friends: the list of persons you have accepted to connect to. </p> <p>You can group friends together to allow a finer level of information access, for instance to only allow some friends to see some files.</p> <p>On the right, you will find 3 useful tabs: <ul> <li>Broadcast sends messages to all connected friends at once</li> <li>Local Network shows the network around you, including friends of your friends</li> <li>Keyring contains keys you collected, mostly forwarded to you by your friends</li> </ul> </p> + + Retroshare broadcast chat: messages are sent to all connected friends. + + GamesDialog @@ -5771,10 +5771,6 @@ Fill in your PGP password when asked, to sign your new key. Do not show the Quit RetroShare MessageBox - - Do not Minimize to Tray Icon - - Auto Login @@ -5819,6 +5815,10 @@ Fill in your PGP password when asked, to sign your new key. General + + Minimize to Tray Icon + + GetStartedDialog @@ -5994,49 +5994,6 @@ p, li { white-space: pre-wrap; } RetroShare Support - - Add ChatServer to access Forums - - - - Add ChatServer - - - - <!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 style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">No friends? Add ChatServer to access the forum and chat with new people. Click on the Button to start the process.</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:'MS Shell Dlg 2'; font-size:12pt;">Just paste your certificat on the RetroShare key Text area. (Your key was already copied) </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:'MS Shell Dlg 2'; font-size:12pt;">After enter Captcha code and validate, copy the ChatServer key.</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:'MS Shell Dlg 2'; font-size:12pt;">Then continue the process.</span></p></body></html> - - - - RetroShare - - - - Sorry, create certificate failed - - - - Your Cert is copied to Clipboard, paste it to next opened web page. - - - - Copy the returned key after validating the captcha code. - - - - Next click continue button. - - - - Is ChatServer key copied. - - GraphFrame @@ -7566,10 +7523,6 @@ p, li { white-space: pre-wrap; } MainWindow - - MainWindow - - Add Friend @@ -8212,7 +8165,11 @@ Do you want to save message ? - Distant peer (PGP key: %1) + <html><head/><body><p>Cryptographically sign message to distant peers. This is prevents intermediate peers to spoof your identity.</p></body></html> + + + + Distant peer (name: %2, PGP key: %1) @@ -8270,6 +8227,18 @@ Do you want to save message ? Message + + Distant messages: + + + + <html><head/><body><p align="justify">The link below allows people in the network to send encrypted messages to you, using tunnels. To do that, they need your public PGP key, which they will get using the Retroshare discovery system. </p></body></html> + + + + Accept encrypted distant messages from everyone + + MessageToaster @@ -8798,7 +8767,27 @@ Do you want to save message ? - <h1><img width="32" src=":/images/64px_help.png">&nbsp;&nbsp;Messages</h1> <p>Messages are like e-mail: you send/receive them from your friends when both of you are connected.</p> <p>Some additional features allow to exchange data in messages: you can recommend files to your friends, or recommend friends to be for other friends to streathen your network.</p> + Click to sort by signature + + + + <h1><img width="32" src=":/images/64px_help.png">&nbsp;&nbsp;Messages</h1> <p>Messages are like <b>e-mail</b>: you send/receive them from your friends when both of you are connected.</p> <p>It is also possible to send messages to non friends, using tunnels. Such messages are always encrypted. It is recommended to cryptographically sign distant messages, as a proof of your identity, using the <img width="16" src=":/images/stock_signature_ok.png"/> button in the message composer window. Distant messages are not guarrantied to arrive, since this requires the distant peer to accept them (You need yourself to switch this on in Config-Messages).</p> <p>Some additional features allow you to exchange data in messages: you may recommend files to your friends by pasting file links, or recommend friends-to-be to other friends, in order to streathen your network.</p> + + + + This message is encrypted. Right click to decrypt it. + + + + This message was signed and the signature checks + + + + This message was signed but the signature doesn't check + + + + This message is not encrypted. Cannot decrypt!