Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-12 16:09:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added a confirm to the delete history action.

Browse Source 
Added the RetroShare icon to the password input window.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4066 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-02-27 21:47:49 +00:00
parent 01f4244f24
commit 28ebbf0b2e
5 changed files with 62 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
retroshare-gui/src/gui/PeersDialog.cpp
View File

@ -399,7 +399,7 @@ void PeersDialog::peertreeWidgetCostumPopupMenu( QPoint point )
iconLabel->setMaximumSize( iconLabel->frameSize().height() + 24, 24 ); iconLabel->setMaximumSize( iconLabel->frameSize().height() + 24, 24 );
hbox->addWidget(iconLabel); hbox->addWidget(iconLabel);
textLabel = new QLabel("<strong>" + tr("RetroShare") + "</strong>", widget ); textLabel = new QLabel("<strong>RetroShare</strong>", widget );
hbox->addWidget(textLabel); hbox->addWidget(textLabel);
@ -1275,7 +1275,7 @@ void PeersDialog::removefriend()
if (rsPeers) if (rsPeers)
{ {
if ((QMessageBox::question(this, tr("RetroShare"),tr("Do you want to remove this Friend?"),QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes))== QMessageBox::Yes) if ((QMessageBox::question(this, "RetroShare",tr("Do you want to remove this Friend?"),QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes))== QMessageBox::Yes)
{ {
rsPeers->removeFriend(getPeerRsCertId(c)); rsPeers->removeFriend(getPeerRsCertId(c));
emit friendsUpdated() ; emit friendsUpdated() ;
@ -1726,8 +1726,10 @@ void PeersDialog::on_actionClear_Chat_History_triggered()
void PeersDialog::on_actionDelete_Chat_History_triggered() void PeersDialog::on_actionDelete_Chat_History_triggered()
{ {
on_actionClear_Chat_History_triggered(); if ((QMessageBox::question(this, "RetroShare", tr("Do you really want to physically delete the history?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)) == QMessageBox::Yes) {
historyKeeper.clear(); on_actionClear_Chat_History_triggered();
historyKeeper.clear();
}
} }
void PeersDialog::smileyWidgetgroupchat() void PeersDialog::smileyWidgetgroupchat()

6
retroshare-gui/src/gui/chat/PopupChatDialog.cpp
View File

@ -833,8 +833,10 @@ void PopupChatDialog::on_actionClear_Chat_History_triggered()
void PopupChatDialog::on_actionDelete_Chat_History_triggered() void PopupChatDialog::on_actionDelete_Chat_History_triggered()
{ {
on_actionClear_Chat_History_triggered(); if ((QMessageBox::question(this, "RetroShare", tr("Do you really want to physically delete the history?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes)) == QMessageBox::Yes) {
historyKeeper.clear(); on_actionClear_Chat_History_triggered();
historyKeeper.clear();
}
} }
void PopupChatDialog::updatePeerAvatar(const std::string& peer_id) void PopupChatDialog::updatePeerAvatar(const std::string& peer_id)

18
retroshare-gui/src/gui/notifyqt.cpp
View File

@ -126,16 +126,24 @@ void NotifyQt::notifyOwnAvatarChanged()
std::string NotifyQt::askForPassword(const std::string& key_details,bool prev_is_bad) std::string NotifyQt::askForPassword(const std::string& key_details,bool prev_is_bad)
{ {
RsAutoUpdatePage::lockAllEvents() ; RsAutoUpdatePage::lockAllEvents() ;
std::string res = QInputDialog::getText(NULL, tr("GPG key passphrase"), QInputDialog dialog;
(prev_is_bad?tr("Wrong password !") + "\n\n" : QString()) + dialog.setWindowTitle(tr("GPG key passphrase"));
tr("Please enter the password to unlock the following GPG key:") + "\n" + QString::fromStdString(key_details), QLineEdit::Password, NULL, NULL).toStdString(); dialog.setLabelText((prev_is_bad?tr("Wrong password !") + "\n\n" : QString()) +
tr("Please enter the password to unlock the following GPG key:") + "\n" + QString::fromStdString(key_details));
dialog.setTextEchoMode(QLineEdit::Password);
dialog.setWindowIcon(QIcon(":/images/rstray3.png"));
int ret = dialog.exec();
RsAutoUpdatePage::unlockAllEvents() ; RsAutoUpdatePage::unlockAllEvents() ;
return res ; if (ret) {
return dialog.textValue().toStdString();
}
return "";
} }
void NotifyQt::notifyDiscInfoChanged() void NotifyQt::notifyDiscInfoChanged()

BIN
retroshare-gui/src/lang/retroshare_de.qm
View File

Binary file not shown.

74
retroshare-gui/src/lang/retroshare_de.ts
View File

@ -1521,7 +1521,7 @@ p, li { white-space: pre-wrap; }
<translation>Übernehmen und Schliessen</translation> <translation>Übernehmen und Schliessen</translation>
</message> </message>
<message> <message>
<location filename="../gui/connect/ConfCertDialog.cpp" line="+128"/> <location filename="../gui/connect/ConfCertDialog.cpp" line="+133"/>
<location line="+201"/> <location line="+201"/>
<source>RetroShare</source> <source>RetroShare</source>
<translation></translation> <translation></translation>
@ -7183,7 +7183,7 @@ p, li { white-space: pre-wrap; }
<translation>Bitte geben Sie das Passwort ein um folgenden GPG Schlüssel freizuschalten:</translation> <translation>Bitte geben Sie das Passwort ein um folgenden GPG Schlüssel freizuschalten:</translation>
</message> </message>
<message> <message>
<location line="+122"/> <location line="+130"/>
<source>Examining shared files...</source> <source>Examining shared files...</source>
<translation>Prüfe freigegebene Dateien...</translation> <translation>Prüfe freigegebene Dateien...</translation>
</message> </message>
@ -7504,7 +7504,12 @@ p, li { white-space: pre-wrap; }
<translation>Neuer Gruppenchat</translation> <translation>Neuer Gruppenchat</translation>
</message> </message>
<message> <message>
<location line="+291"/> <location line="+229"/>
<source>Do you really want to physically delete the history?</source>
<translation>Willst Du wirklich den Nachrichtenverlauf physisch löschen?</translation>
</message>
<message>
<location line="+64"/>
<source>Load File</source> <source>Load File</source>
<translation>Lade Datei</translation> <translation>Lade Datei</translation>
</message> </message>
@ -7674,7 +7679,7 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="-162"/> <location line="-162"/>
<location filename="../gui/PeersDialog.cpp" line="-1511"/> <location filename="../gui/PeersDialog.cpp" line="-1513"/>
<source>Add Friend</source> <source>Add Friend</source>
<translation>Freund hinzufügen</translation> <translation>Freund hinzufügen</translation>
</message> </message>
@ -7728,13 +7733,7 @@ p, li { white-space: pre-wrap; }
<translation>Nachrichtenverlauf speichern</translation> <translation>Nachrichtenverlauf speichern</translation>
</message> </message>
<message> <message>
<location filename="../gui/PeersDialog.cpp" line="-40"/> <location filename="../gui/PeersDialog.cpp" line="-1"/>
<location line="+876"/>
<source>RetroShare</source>
<translation></translation>
</message>
<message>
<location line="-837"/>
<source>Message Group</source> <source>Message Group</source>
<translation>Gruppe anschreiben</translation> <translation>Gruppe anschreiben</translation>
</message> </message>
@ -7754,7 +7753,7 @@ p, li { white-space: pre-wrap; }
<translation>Willst du diesen Freund entfernen?</translation> <translation>Willst du diesen Freund entfernen?</translation>
</message> </message>
<message> <message>
<location line="+732"/> <location line="+734"/>
<source>Save as...</source> <source>Save as...</source>
<translation>Speichern unter...</translation> <translation>Speichern unter...</translation>
</message> </message>
@ -7790,7 +7789,7 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">Aktivitäten</translation> <translation type="obsolete">Aktivitäten</translation>
</message> </message>
<message> <message>
<location filename="../gui/PeersDialog.cpp" line="-647"/> <location filename="../gui/PeersDialog.cpp" line="-649"/>
<source>is typing...</source> <source>is typing...</source>
<translation>tippt...</translation> <translation>tippt...</translation>
</message> </message>
@ -8131,7 +8130,12 @@ p, li { white-space: pre-wrap; }
<translation>Avatar zeigen</translation> <translation>Avatar zeigen</translation>
</message> </message>
<message> <message>
<location line="+159"/> <location line="+86"/>
<source>Do you really want to physically delete the history?</source>
<translation>Willst Du wirklich den Nachrichtenverlauf physisch löschen?</translation>
</message>
<message>
<location line="+75"/>
<source>Load Picture File</source> <source>Load Picture File</source>
<translation>Lade Bilddatei</translation> <translation>Lade Bilddatei</translation>
</message> </message>
@ -8260,7 +8264,7 @@ p, li { white-space: pre-wrap; }
<translation>Text Datei (*.txt );;Alle Dateien (*)</translation> <translation>Text Datei (*.txt );;Alle Dateien (*)</translation>
</message> </message>
<message> <message>
<location line="-718"/> <location line="-720"/>
<source>Your Friend is offline <source>Your Friend is offline
Do you want to send them a Message instead</source> Do you want to send them a Message instead</source>
<translation>Dein Freund ist Offline willst du ihm stattdessen eine Nachricht senden</translation> <translation>Dein Freund ist Offline willst du ihm stattdessen eine Nachricht senden</translation>
@ -8271,7 +8275,7 @@ Do you want to send them a Message instead</source>
<translation>Bild anhängen</translation> <translation>Bild anhängen</translation>
</message> </message>
<message> <message>
<location filename="../gui/chat/PopupChatDialog.cpp" line="+761"/> <location filename="../gui/chat/PopupChatDialog.cpp" line="+763"/>
<source>is Idle and may not reply</source> <source>is Idle and may not reply</source>
<translation>antwortet möglicherweise nicht, da der Status auf &quot;Untätig&quot; gesetzt wurde</translation> <translation>antwortet möglicherweise nicht, da der Status auf &quot;Untätig&quot; gesetzt wurde</translation>
</message> </message>
@ -8291,7 +8295,7 @@ Do you want to send them a Message instead</source>
<translation>ist Offline.</translation> <translation>ist Offline.</translation>
</message> </message>
<message> <message>
<location line="-719"/> <location line="-721"/>
<source>Paste RetroShare Link</source> <source>Paste RetroShare Link</source>
<translation>RetroShare Link einfügen</translation> <translation>RetroShare Link einfügen</translation>
</message> </message>
@ -9449,17 +9453,17 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location line="+316"/> <location line="+316"/>
<location filename="../gui/SearchDialog.cpp" line="+238"/> <location filename="../gui/SearchDialog.cpp" line="+280"/>
<source>Download</source> <source>Download</source>
<translation>Herunterladen</translation> <translation>Herunterladen</translation>
</message> </message>
<message> <message>
<location filename="../gui/SearchDialog.cpp" line="-138"/> <location filename="../gui/SearchDialog.cpp" line="-178"/>
<source>Enter a keyword here (at least 3 char long)</source> <source>Enter a keyword here (at least 3 char long)</source>
<translation>Gib einen Suchbegriff ein (min. 3 Zeichen)</translation> <translation>Gib einen Suchbegriff ein (min. 3 Zeichen)</translation>
</message> </message>
<message> <message>
<location line="+141"/> <location line="+181"/>
<source>Copy retroshare Link</source> <source>Copy retroshare Link</source>
<translation>Kopiere RetroShare Link</translation> <translation>Kopiere RetroShare Link</translation>
</message> </message>
@ -9479,7 +9483,7 @@ p, li { white-space: pre-wrap; }
<translation>Freunden empfehlen</translation> <translation>Freunden empfehlen</translation>
</message> </message>
<message> <message>
<location line="+139"/> <location line="+142"/>
<source>Remove</source> <source>Remove</source>
<translation>Entfernen</translation> <translation>Entfernen</translation>
</message> </message>
@ -9550,7 +9554,7 @@ p, li { white-space: pre-wrap; }
<translation>Such ID</translation> <translation>Such ID</translation>
</message> </message>
<message> <message>
<location filename="../gui/SearchDialog.cpp" line="-953"/> <location filename="../gui/SearchDialog.cpp" line="-955"/>
<source>Download Notice</source> <source>Download Notice</source>
<translation>Download</translation> <translation>Download</translation>
</message> </message>
@ -9560,7 +9564,7 @@ p, li { white-space: pre-wrap; }
<translation>Überspringe lokale Dateien</translation> <translation>Überspringe lokale Dateien</translation>
</message> </message>
<message> <message>
<location line="+56"/> <location line="+58"/>
<location line="+6"/> <location line="+6"/>
<source>Sorry</source> <source>Sorry</source>
<translation>Entschuldigung</translation> <translation>Entschuldigung</translation>
@ -11446,7 +11450,7 @@ p, li { white-space: pre-wrap; }
<translation>Übertrage</translation> <translation>Übertrage</translation>
</message> </message>
<message> <message>
<location line="+361"/> <location line="+365"/>
<source>RetroShare</source> <source>RetroShare</source>
<translation></translation> <translation></translation>
</message> </message>
@ -11471,7 +11475,7 @@ p, li { white-space: pre-wrap; }
<translation>Soll dieser Download wirklich abgebrochen und gelöscht werden?</translation> <translation>Soll dieser Download wirklich abgebrochen und gelöscht werden?</translation>
</message> </message>
<message> <message>
<location line="-910"/> <location line="-914"/>
<source>Speed / Queue position</source> <source>Speed / Queue position</source>
<translation>Geschwindigkeits- / Warteschlangenposition</translation> <translation>Geschwindigkeits- / Warteschlangenposition</translation>
</message> </message>
@ -11534,38 +11538,38 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location line="+262"/> <location line="+262"/>
<location line="+144"/> <location line="+144"/>
<location line="+133"/> <location line="+135"/>
<source>Failed</source> <source>Failed</source>
<translation>Gescheitert</translation> <translation>Gescheitert</translation>
</message> </message>
<message> <message>
<location line="-273"/> <location line="-275"/>
<location line="+141"/> <location line="+141"/>
<location line="+133"/> <location line="+135"/>
<source>Okay</source> <source>Okay</source>
<translation>OK</translation> <translation>OK</translation>
</message> </message>
<message> <message>
<location line="-132"/> <location line="-134"/>
<location line="+133"/> <location line="+135"/>
<source>Waiting</source> <source>Waiting</source>
<translation>Warte</translation> <translation>Warte</translation>
</message> </message>
<message> <message>
<location line="-132"/> <location line="-134"/>
<source>Downloading</source> <source>Downloading</source>
<translation>Ladend</translation> <translation>Ladend</translation>
</message> </message>
<message> <message>
<location line="-131"/> <location line="-131"/>
<location line="+132"/> <location line="+132"/>
<location line="+133"/> <location line="+135"/>
<location line="+1"/> <location line="+1"/>
<source>Complete</source> <source>Complete</source>
<translation>Vollständig</translation> <translation>Vollständig</translation>
</message> </message>
<message> <message>
<location line="-130"/> <location line="-132"/>
<source>Unknown</source> <source>Unknown</source>
<translation>Unbekannt</translation> <translation>Unbekannt</translation>
</message> </message>
@ -11575,12 +11579,12 @@ p, li { white-space: pre-wrap; }
<translation>Version: </translation> <translation>Version: </translation>
</message> </message>
<message> <message>
<location line="+80"/> <location line="+82"/>
<source>Uploading</source> <source>Uploading</source>
<translation>Hochladend</translation> <translation>Hochladend</translation>
</message> </message>
<message> <message>
<location line="-129"/> <location line="-131"/>
<source>Checking...</source> <source>Checking...</source>
<translation>Überprüfe...</translation> <translation>Überprüfe...</translation>
</message> </message>