diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp index 113b5d412..46fb4f948 100644 --- a/retroshare-gui/src/gui/FriendsDialog.cpp +++ b/retroshare-gui/src/gui/FriendsDialog.cpp @@ -1810,39 +1810,17 @@ void FriendsDialog::updateAvatar() void FriendsDialog::getAvatar() { - QString fileName; - if (misc::getOpenFileName(this, RshareSettings::LASTDIR_IMAGES, tr("Load File"), tr("Pictures (*.png *.xpm *.jpg *.tiff *.gif)"), fileName)) + QByteArray ba; + if (misc::getOpenAvatarPicture(this, ba)) { - QPixmap picture; - picture = QPixmap(fileName).scaled(96,96, Qt::IgnoreAspectRatio,Qt::SmoothTransformation); - #ifdef FRIENDS_DEBUG - std::cerr << "Sending avatar image down the pipe" << std::endl ; + std::cerr << "Avatar image size = " << ba.size() << std::endl ; #endif - // send avatar down the pipe for other peers to get it. - QByteArray ba; - QBuffer buffer(&ba); - buffer.open(QIODevice::WriteOnly); - picture.save(&buffer, "PNG"); // writes image into ba in PNG format - -#ifdef FRIENDS_DEBUG - std::cerr << "Image size = " << ba.size() << std::endl ; -#endif - - rsMsgs->setOwnAvatarData((unsigned char *)(ba.data()),ba.size()) ; // last char 0 included. - - // I suppressed this because it gets called already by rsMsgs->setOwnAvatarData() through a Qt notification signal - //updateAvatar() ; + rsMsgs->setOwnAvatarData((unsigned char *)(ba.data()), ba.size()) ; // last char 0 included. } } -void FriendsDialog::changeAvatarClicked() -{ - - updateAvatar(); -} - void FriendsDialog::on_actionCreate_New_Forum_activated() { MainWindow::activatePage (MainWindow::Forums); diff --git a/retroshare-gui/src/gui/FriendsDialog.h b/retroshare-gui/src/gui/FriendsDialog.h index 21fd42b44..e6d96e1a6 100644 --- a/retroshare-gui/src/gui/FriendsDialog.h +++ b/retroshare-gui/src/gui/FriendsDialog.h @@ -145,7 +145,6 @@ private slots: void setFont(); void getFont(); - void changeAvatarClicked(); void getAvatar(); void updateOwnStatus(const QString &peer_id, int status); @@ -222,4 +221,4 @@ private: #endif // MINIMAL_RSGUI -#endif +#endif \ No newline at end of file diff --git a/retroshare-gui/src/gui/MessengerWindow.cpp b/retroshare-gui/src/gui/MessengerWindow.cpp index e16959700..d412fbb6c 100644 --- a/retroshare-gui/src/gui/MessengerWindow.cpp +++ b/retroshare-gui/src/gui/MessengerWindow.cpp @@ -23,7 +23,6 @@ #include #include #include -#include #include "common/vmessagebox.h" #include "common/StatusDefs.h" @@ -51,6 +50,7 @@ #include "util/PixmapMerging.h" #include "LogoBar.h" #include "util/Widget.h" +#include "util/misc.h" #include "settings/rsharesettings.h" #include "common/RSTreeWidgetItem.h" @@ -1085,11 +1085,6 @@ void MessengerWindow::sendMessage() MessageComposer::msgFriend(id, false); } -void MessengerWindow::changeAvatarClicked() -{ - updateAvatar(); -} - void MessengerWindow::updateAvatar() { unsigned char *data = NULL; @@ -1112,24 +1107,13 @@ void MessengerWindow::updateAvatar() void MessengerWindow::getAvatar() { - QString fileName = QFileDialog::getOpenFileName(this, "Load File", QDir::homePath(), "Pictures (*.png *.xpm *.jpg)"); - if(!fileName.isEmpty()) + QByteArray ba; + if (misc::getOpenAvatarPicture(this, ba)) { - picture = QPixmap(fileName).scaled(96,96, Qt::IgnoreAspectRatio,Qt::SmoothTransformation); - - std::cerr << "Sending avatar image down the pipe" << std::endl ; - - // send avatar down the pipe for other peers to get it. - QByteArray ba; - QBuffer buffer(&ba); - buffer.open(QIODevice::WriteOnly); - picture.save(&buffer, "PNG"); // writes image into ba in PNG format - - std::cerr << "Image size = " << ba.size() << std::endl ; - - rsMsgs->setOwnAvatarData((unsigned char *)(ba.data()),ba.size()) ; // last char 0 included. - - updateAvatar() ; +#ifdef MSG_DEBUG + std::cerr << "Avatar image size = " << ba.size() << std::endl ; +#endif + rsMsgs->setOwnAvatarData((unsigned char *)(ba.data()), ba.size()) ; // last char 0 included. } } diff --git a/retroshare-gui/src/gui/MessengerWindow.h b/retroshare-gui/src/gui/MessengerWindow.h index b75f1042f..56de22122 100644 --- a/retroshare-gui/src/gui/MessengerWindow.h +++ b/retroshare-gui/src/gui/MessengerWindow.h @@ -91,7 +91,6 @@ private slots: /** get own last stored Avatar**/ void getAvatar(); - void changeAvatarClicked(); void updateOwnStatus(const QString &peer_id, int status); void savestatusmessage(); @@ -138,4 +137,4 @@ private: Ui::MessengerWindow ui; }; -#endif +#endif \ No newline at end of file diff --git a/retroshare-gui/src/gui/channels/CreateChannel.cpp b/retroshare-gui/src/gui/channels/CreateChannel.cpp index b68e58036..b20cbb825 100644 --- a/retroshare-gui/src/gui/channels/CreateChannel.cpp +++ b/retroshare-gui/src/gui/channels/CreateChannel.cpp @@ -241,14 +241,15 @@ void CreateChannel::cancelChannel() return; } -void CreateChannel::addChannelLogo() +void CreateChannel::addChannelLogo() // the same function as in EditChanDetails { - QString fileName; - if (misc::getOpenFileName(this, RshareSettings::LASTDIR_IMAGES, tr("Load File"), tr("Pictures (*.png *.xpm *.jpg)"), fileName)) - { - picture = QPixmap(fileName).scaled(64,64, Qt::IgnoreAspectRatio,Qt::SmoothTransformation); + QPixmap img = misc::getOpenThumbnailedPicture(this, tr("Load channel logo"), 64, 64); - // to show the selected - ui.ChannelLogoButton->setIcon(picture); - } + if (img.isNull()) + return; + + picture = img; + + // to show the selected + ui.ChannelLogoButton->setIcon(picture); } diff --git a/retroshare-gui/src/gui/channels/CreateChannelMsg.cpp b/retroshare-gui/src/gui/channels/CreateChannelMsg.cpp index d7f4013c2..e4d8c2482 100644 --- a/retroshare-gui/src/gui/channels/CreateChannelMsg.cpp +++ b/retroshare-gui/src/gui/channels/CreateChannelMsg.cpp @@ -571,24 +571,13 @@ void CreateChannelMsg::sendMessage(std::wstring subject, std::wstring msg, std:: void CreateChannelMsg::addThumbnail() { - QString fileName; - if (misc::getOpenFileName(this, RshareSettings::LASTDIR_IMAGES, tr("Load File"), tr("Pictures (*.png *.xpm *.jpg)"), fileName)) - { - picture = QPixmap(fileName).scaled(156,107, Qt::IgnoreAspectRatio,Qt::SmoothTransformation); - - // to show the selected - thumbnail_label->setPixmap(picture); + QPixmap img = misc::getOpenThumbnailedPicture(this, tr("Load thumbnail picture"), 156, 107); - std::cerr << "Sending Thumbnail image down the pipe" << std::endl ; + if (img.isNull()) + return; - // send Thumbnail down the pipe for other peers to get it. - QByteArray ba; - QBuffer buffer(&ba); - buffer.open(QIODevice::WriteOnly); - picture.save(&buffer, "PNG"); // writes image into ba in PNG format + picture = img; - std::cerr << "Image size = " << ba.size() << std::endl ; - - //updateThumbnail() ; - } + // to show the selected + thumbnail_label->setPixmap(picture); } diff --git a/retroshare-gui/src/gui/channels/EditChanDetails.cpp b/retroshare-gui/src/gui/channels/EditChanDetails.cpp index ae4cfc375..2a655ceef 100644 --- a/retroshare-gui/src/gui/channels/EditChanDetails.cpp +++ b/retroshare-gui/src/gui/channels/EditChanDetails.cpp @@ -135,15 +135,16 @@ void EditChanDetails::applyDialog() } -void EditChanDetails::addChannelLogo() +void EditChanDetails::addChannelLogo() // the same function as in CreateChannel { - QString fileName = QFileDialog::getOpenFileName(this, tr("Load File"), QDir::homePath(), tr("Pictures (*.png *.xpm *.jpg)")); - if(!fileName.isEmpty()) - { - picture = QPixmap(fileName).scaled(64,64, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); + QPixmap img = misc::getOpenThumbnailedPicture(this, tr("Load channel logo"), 64, 64); - // to show the selected - ui.ChannelLogoButton->setIcon(picture); - } + if (img.isNull()) + return; + + picture = img; + + // to show the selected + ui.ChannelLogoButton->setIcon(picture); } diff --git a/retroshare-gui/src/gui/chat/PopupChatWindow.cpp b/retroshare-gui/src/gui/chat/PopupChatWindow.cpp index a3f525624..d02735b44 100644 --- a/retroshare-gui/src/gui/chat/PopupChatWindow.cpp +++ b/retroshare-gui/src/gui/chat/PopupChatWindow.cpp @@ -21,7 +21,6 @@ ****************************************************************/ #include -#include #include "PopupChatWindow.h" #include "PopupChatDialog.h" @@ -291,20 +290,10 @@ void PopupChatWindow::calculateTitle(PopupChatDialog *dialog) void PopupChatWindow::getAvatar() { - QString fileName; - if (misc::getOpenFileName(this, RshareSettings::LASTDIR_IMAGES, tr("Load File"), tr("Pictures (*.png *.xpm *.jpg *.tiff *.gif)"), fileName)) + QByteArray ba; + if (misc::getOpenAvatarPicture(this, ba)) { - QPixmap picture = QPixmap(fileName).scaled(96,96, Qt::IgnoreAspectRatio,Qt::SmoothTransformation); - - std::cerr << "Sending avatar image down the pipe" << std::endl; - - // send avatar down the pipe for other peers to get it. - QByteArray ba; - QBuffer buffer(&ba); - buffer.open(QIODevice::WriteOnly); - picture.save(&buffer, "PNG"); // writes image into ba in PNG format - - std::cerr << "Image size = " << ba.size() << std::endl; + std::cerr << "Avatar image size = " << ba.size() << std::endl ; rsMsgs->setOwnAvatarData((unsigned char *)(ba.data()), ba.size()); // last char 0 included. } diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm index dcfa6fde8..cdf9b675f 100644 Binary files a/retroshare-gui/src/lang/retroshare_de.qm and b/retroshare-gui/src/lang/retroshare_de.qm differ diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts index 20d2673c0..80082826b 100644 --- a/retroshare-gui/src/lang/retroshare_de.ts +++ b/retroshare-gui/src/lang/retroshare_de.ts @@ -745,7 +745,7 @@ p, li { white-space: pre-wrap; } CertificatePage - + Certificate files Zertifikat-Dateien @@ -1643,7 +1643,7 @@ und meinen GPG Schlüssel unterzeichnet und meinen GPG Schlüssel nicht unterzeichnet - + Signature Failure Signatur Fehler @@ -1685,7 +1685,7 @@ und meinen GPG Schlüssel nicht unterzeichnet ConnectFriendWizard - + Connect Friend Wizard Assistent um sich zu einem Freund zu verbinden @@ -2223,14 +2223,17 @@ Möchten Sie die Änderungen speichern? Bitte einen Name hinzufügen - - Load File - Lade Datei + + Load channel logo + Lade Kanal Logo + + + Load File + Lade Datei - Pictures (*.png *.xpm *.jpg) - Bilder (*.png *.xpm *.jpg) + Bilder (*.png *.xpm *.jpg) @@ -2327,17 +2330,17 @@ p, li { white-space: pre-wrap; } Drop file error. - Dateifehler bei Drag'n'Drop. + Dateifehler bei Drag'n'Drop. Directory can't be dropped, only files are accepted. - Ordner können nicht für Drag'n'Drop genutzt werden. Nur Dateien werden akzeptiert. + Ordner können nicht für Drag'n'Drop genutzt werden. Nur Dateien werden akzeptiert. File not found or file name not accepted. - Datei nicht gefunden oder Dateiname nicht akzeptiert. + Datei nicht gefunden oder Dateiname nicht akzeptiert. @@ -2361,14 +2364,17 @@ p, li { white-space: pre-wrap; } Bitte Subjekt nicht vergessen - - Load File - Lade Datei + + Load thumbnail picture + Lade Miniaturbild + + + Load File + Lade Datei - Pictures (*.png *.xpm *.jpg) - Bilder (*.png *.xpm *.jpg) + Bilder (*.png *.xpm *.jpg) @@ -2666,20 +2672,35 @@ p, li { white-space: pre-wrap; } DHT - DHT On - DHT An + DHT An - + DHT Off DHT aus - + + DHT Searching for Retroshare Peers + + + + + RetroShare users in DHT (Total DHT users) RetroShare Nutzer in DHT (Totale DHT Nutzer) + + + DHT Good + + + + + DHT Error + + DLListDelegate @@ -2850,12 +2871,12 @@ p, li { white-space: pre-wrap; } DhtWindow - + Dht Details - + Peer Details Peer-Details @@ -2900,7 +2921,12 @@ p, li { white-space: pre-wrap; } - + + Name + Name + + + PeerId PeerId @@ -2935,7 +2961,12 @@ p, li { white-space: pre-wrap; } - + + RsId + + + + Bucket @@ -2961,17 +2992,17 @@ p, li { white-space: pre-wrap; } - + Last Sent - + Last Recv - + Relay Mode @@ -3163,14 +3194,17 @@ Das ist nützlich, wenn Du eine externe Festplatte freigibst und die Datei nicht Kanal Logo hinzufügen - Load File - Lade Datei + Lade Datei - Pictures (*.png *.xpm *.jpg) - Bilder (*.png *.xpm *.jpg) + Bilder (*.png *.xpm *.jpg) + + + + Load channel logo + Lade Kanal Logo @@ -3214,7 +3248,7 @@ Das ist nützlich, wenn Du eine externe Festplatte freigibst und die Datei nicht EmailPage - + Invite Friends by Email Lade Freunde per Email ein @@ -4139,19 +4173,19 @@ p, li { white-space: pre-wrap; } Anonymous - Anonym + Anonym signed - unterzeichnet + unterzeichnet none - keine + keine @@ -4550,17 +4584,15 @@ p, li { white-space: pre-wrap; } Willst Du wirklich den Nachrichtenverlauf physisch löschen? - Load File - Lade Datei + Lade Datei - Pictures (*.png *.xpm *.jpg *.tiff *.gif) - Bilder (*.png *.xpm *.jpg *.tiff *.gif) + Bilder (*.png *.xpm *.jpg *.tiff *.gif) - + Add Extra File Zusätzliche Datei hinzufügen @@ -4971,27 +5003,37 @@ Gib Dein GPG Passwort wenn Du gefragt wirst ein, um Deinen neuen Schlüssel zu u GeneralPage - + Auto Login Automatische Anmeldung - + Startup Programmstart - + Start minimized on system start Minimieren beim Starten mit dem System + For Advanced Users + + + + + Enable Advanced Mode (Restart Required) + + + + Misc Verschiedenes - + Do not show the Quit RetroShare MessageBox MessageBox beim Schliessen nicht anzeigen @@ -5001,12 +5043,12 @@ Gib Dein GPG Passwort wenn Du gefragt wirst ein, um Deinen neuen Schlüssel zu u Nicht in den Systemabschnitt minimieren - + seconds Sekunden - + Start minimized Minimiert starten @@ -5016,12 +5058,12 @@ Gib Dein GPG Passwort wenn Du gefragt wirst ein, um Deinen neuen Schlüssel zu u Starte RetroShare mit dem System - + Register retroshare:// as url protocol (Restart required) Registriere retroshare:// als Protokoll (Neustart erforderlich) - + Idle Untätig @@ -5031,6 +5073,205 @@ Gib Dein GPG Passwort wenn Du gefragt wirst ein, um Deinen neuen Schlüssel zu u Zeit bis zur Untätigkeit + + GetStartedDialog + + + Getting Started + + + + + + Invite Friends + + + + + <!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:'Arial'; font-size:14pt; 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-size:12pt;">Retroshare is nothing without your Friends. Click on the Button to start the process.</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-size:12pt;"></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-size:12pt;">Email an Invitation with your &quot;ID Certificate&quot; to your friends.</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-size:12pt;"></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-size:12pt;">Be sure to get their invitation back as well... </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-size:12pt;">You can only connect with friends if you have both added each other.</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-size:12pt;"></p></body></html> + + + + + Add Your Friends to Retroshare + + + + + Add Friends + + + + + <!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:'Arial'; font-size:14pt; 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-size:12pt;">When your friends send you a their invitations, Click to open the Add Friends window.</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-size:12pt;"></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-size:12pt;">Cut and Paste your Friend's &quot;ID Certificates&quot; into the window and add them as friends.</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-size:12pt;"></p></body></html> + + + + + Connect To Friends + + + + + <!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:'Arial'; font-size:14pt; 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-size:12pt;">Be Online at the same time, and Retroshare will automatically connect you!</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-size:12pt;"></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-size:12pt;">Your client needs to find the Retroshare Network before it can make connections.</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-size:12pt;">This takes 5-30 minutes the first time you startup Retroshare</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-size:12pt;"></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-size:12pt;">The DHT indicator (in the Status Bar) turnsGreen when it can make connections.</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-size:12pt;"></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-size:12pt;">After a couple of minutes, the NAT indicator (also in the Status Bar) switch to Yellow or Green.</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-size:12pt;">If it remains Red, then you have a Nasty Firewall, that Retroshare struggles to connect through.</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-size:12pt;"></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-size:12pt;">Look in the Further Help section for more advice about connecting.</span></p></body></html> + + + + + Advanced: Open Firewall Port + + + + + <!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:'Arial'; font-size:14pt; 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-size:12pt;">You can improve your Retroshare performance by opening an External Port. </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-size:12pt;">This will speed up connections and allow more people to connect with you </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-size:12pt;"></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-size:12pt;">The easiest way to do this is by enabling UPnP on your Wireless Box or Router.</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-size:12pt;">As each router is different, you need to find out your Router Model and Google for instructions.</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-size:12pt;"></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-size:12pt;">If none of this makes sense, don't worry about it Retroshare will still work.</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-size:12pt;"></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-size:8pt;"></p></body></html> + + + + + Further Help and Support + + + + + <!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:'Arial'; font-size:14pt; 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-size:12pt;">Having trouble getting started with Retroshare?</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-size:12pt;"></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-size:12pt;">1) look at the FAQ Wiki. This is a bit old, we trying to bring it up to date.</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-size:12pt;"></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-size:12pt;">2) check out the Online Forums. Ask questions and discuss features.</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-size:12pt;"></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-size:12pt;">3) try the Internal Retroshare Forums </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-size:12pt;"> - These come online once you are connected to friends.</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-size:12pt;"></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-size:12pt;">4) If you are still stuck. Email us.</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-size:12pt;"></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-size:12pt;">Enjoy Retrosharing</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-size:12pt;"></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-size:12pt;"></p></body></html> + + + + + Open RS Website + + + + + Open FAQ Wiki + + + + + Open Online Forums + + + + + Email Support + + + + + Email Feedback + + + + + You are cordially invited to join the Retroshare Network, + + + + + Retroshare is a Secure P2P Sharing Network + + + + + We use direct connections between you and your friends to maintain your Privacy + + + + + Install the client to chat, share data and converse in the forums + + + + + Get Retroshare here: http://retroshare.sourceforge.net/download + + + + + Below is your friends ID Certificate. Cut and paste this into your Retroshare client + + + + + and send them your ID Certificate to enable the secure connection + + + + + Retroshare Invitation + + + + + RetroShare Feedback + + + + + RetroShare Support + + + GraphFrame @@ -5652,7 +5893,7 @@ p, li { white-space: pre-wrap; } IntroPage - + &Make friend with selected friends of my friends &Füge ausgewählte Freunde Deiner Freunde hinzu @@ -5883,7 +6124,7 @@ p, li { white-space: pre-wrap; } MainWindow - + Network Netzwerk @@ -5913,7 +6154,12 @@ p, li { white-space: pre-wrap; } Blogs - + + Getting Started + + + + Notify Meldungen @@ -6047,7 +6293,7 @@ p, li { white-space: pre-wrap; } Schnellstart Assistent - + Search Suchen @@ -6062,7 +6308,7 @@ p, li { white-space: pre-wrap; } Messenger - + Show/Hide Anzeigen/Verbergen @@ -6137,17 +6383,17 @@ p, li { white-space: pre-wrap; } Über - + Forums Foren - + RetroShare %1 a secure decentralised communication platform RetroShare %1 eine sichere und dezentralisierte Kommunikationsplattform - + Open Messages Öffne Nachrichten @@ -6157,12 +6403,12 @@ p, li { white-space: pre-wrap; } Anwendungen - + Plugins - + Do you really want to exit RetroShare ? Willst Du RetroShare wirklich beenden? @@ -7118,7 +7364,7 @@ p, li { white-space: pre-wrap; } - + From Von @@ -7201,15 +7447,15 @@ p, li { white-space: pre-wrap; } - + Inbox Posteingang - - + + Outbox Postausgang @@ -7221,7 +7467,7 @@ p, li { white-space: pre-wrap; } - + Sent Gesendet @@ -7294,7 +7540,7 @@ p, li { white-space: pre-wrap; } - + Subject Betreff @@ -7370,12 +7616,12 @@ p, li { white-space: pre-wrap; } - + Click to sort by from Klicken, um nach Von zu sortieren - + Click to sort by date Klicken, um nach Datum zu sortieren @@ -7401,7 +7647,7 @@ p, li { white-space: pre-wrap; } Empfohlene Dateien einblenden - + Click to sort by to Klicken, um nach Empfänger zu sortieren @@ -7423,7 +7669,7 @@ p, li { white-space: pre-wrap; } - + Reply to All Allen antworten @@ -7460,8 +7706,8 @@ p, li { white-space: pre-wrap; } - - + + Trash Papierkorb @@ -7484,7 +7730,7 @@ p, li { white-space: pre-wrap; } Neues Schlagwort... - + Mark as read Als gelesen markieren @@ -7509,14 +7755,14 @@ p, li { white-space: pre-wrap; } Papierkorb leeren - - + + Drafts Entwürfe - + To An @@ -7525,17 +7771,17 @@ p, li { white-space: pre-wrap; } Editieren... - + Click to sort by star Klicken, um nach Kennzeichnung zu sortieren - + No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light grey star beside any message. Es sind keine gekennzeichneten Nachrichten vorhanden. Durch die Kennzeichnung kannst du Nachrichten mit einem speziellen Status versehen, sodass sie leichter zu finden sind. Klicke zum Kennzeichnen einer Nachricht auf den hellgrauen Stern neben der jeweiligen Nachricht. - + @@ -7754,12 +8000,57 @@ p, li { white-space: pre-wrap; } NATStatus - + <strong>NAT:</strong> - + + Network Status Unknown + + + + + Offline + + + + + Nasty Firewall + + + + + DHT Disabled and Firewalled + + + + + Network Restarting + + + + + Behind Firewall + + + + + DHT Disabled + + + + + RetroShare Server + + + + + Forwarded Port + + + + Internet connection Internetverbindung @@ -8292,7 +8583,7 @@ p, li { white-space: pre-wrap; } Bitte geben Sie das Passwort ein um folgenden GPG Schlüssel freizuschalten: - + Examining shared files... Prüfe freigegebene Dateien... @@ -9441,19 +9732,17 @@ Do you want to send them a Message instead Immer im Vordergrund - + RetroShare RetroShare - Load File - Lade Datei + Lade Datei - Pictures (*.png *.xpm *.jpg *.tiff *.gif) - Bilder (*.png *.xpm *.jpg *.tiff *.gif) + Bilder (*.png *.xpm *.jpg *.tiff *.gif) @@ -10143,6 +10432,28 @@ Lockdatei: Tunnel requests repartition: + + + + + secs + + + + + Old + + + + + Now + Jetzt + + + + Round Trip Time: + + QuickStartWizard @@ -10665,7 +10976,7 @@ p, li { white-space: pre-wrap; } RsidPage - + RetroShare ID RetroShare ID @@ -10994,16 +11305,139 @@ p, li { white-space: pre-wrap; } Schließe alle Suchergebnisse + + SecurityItem + + + + Expand + + + + + Remove Item + + + + + Write a quick Message + Schnelle Nachricht schreiben + + + + Chat + + + + + Start Chat + Chat starten + + + + Cancel + Abbrechen + + + + Send + Senden + + + + Name: + Name: + + + + Peer ID: + Peer ID: + + + + Trust: + Vertrauen: + + + + Location + + + + + IP Address + IP-Adresse + + + + Connection Method + Verbindungsmethode + + + + Status: + Status: + + + + Write Message + Nachricht schreiben + + + + Connect Attempt + Verbindungsversuch + + + + Not Yet Friends + + + + + Unknown (Incoming) Connect Attempt + + + + + Unknown (Outgoing) Connect Attempt + + + + + Unknown Security Issue + + + + + + + + + Unknown Peer + Unbekannter Nachbar + + + + Hide + + + + + Quick Message + Schnelle Nachrricht + + ServerPage - + Port: Port: - + Local Address Lokale Adresse @@ -11049,12 +11483,12 @@ p, li { white-space: pre-wrap; } - + Show Discovery information in statusbar Zeige Discovery-Informationen in der Statuszeile - + Network Configuration Netzwerkkonfiguration @@ -11103,7 +11537,13 @@ peers still need to trust each other to allow connection. Erlaube Tunnelverbindungen - + + + Acceptable ports range from 1024 to 65535. Ports below 1024 are reserved by your system. + + + + IP Service IP Dienst @@ -11124,7 +11564,7 @@ Es hilft auch, wenn Sie sich hinter einer Firewall/VPN befinden. Erlaube RetroShare folgende Webseiten nach Ihrer IP zu fragen: - + Dynamic DNS Dynamisches DNS @@ -11874,12 +12314,13 @@ lock file: + Warning Warnung - + The passwd to your SSL certificate (your location) will be stored encrypted in your Gnome Keyring. Your PGP passwd will not be stored. @@ -11891,6 +12332,15 @@ Dein PGP wird nicht gespeichert. Du kannst die Auswahl in den Optionen zurücksetzen. + + + The passwd to your SSL certificate (your location) will be stored encrypted in your Keychain. + + Your PGP passwd will not be stored. + +This choice can be reverted in settings. + + The passwd to your SSL certificate (your location) will be stored encrypted in the keys/help.dta file. This is not secure. @@ -12483,7 +12933,7 @@ p, li { white-space: pre-wrap; } TextPage - + Use text representation of the PGP certificates. Verwende diesen Text als PGP Zertifikat. @@ -12513,7 +12963,7 @@ p, li { white-space: pre-wrap; } Bereinige Zertifikat - + Save as... Speichern unter... @@ -12533,7 +12983,7 @@ p, li { white-space: pre-wrap; } - + Text certificate Text-Zertifikat @@ -12548,7 +12998,7 @@ p, li { white-space: pre-wrap; } Starte das Standard-Emailprogramm - + Connect Friend Help Verbindungshilfe @@ -12622,7 +13072,7 @@ p, li { white-space: pre-wrap; } TransfersDialog - + Cancel Abbrechen @@ -12632,7 +13082,7 @@ p, li { white-space: pre-wrap; } Fertige ausblenden - + Status Status @@ -12740,7 +13190,7 @@ p, li { white-space: pre-wrap; } Übertragen - + Play Abspielen @@ -12795,12 +13245,12 @@ p, li { white-space: pre-wrap; } Ende - + Priority (Speed)... Prioritä t(Geschwindigkeit)... - + Streaming Streaming @@ -12810,7 +13260,7 @@ p, li { white-space: pre-wrap; } Zufall - + Chunk strategy Blockstrategie @@ -12865,7 +13315,7 @@ p, li { white-space: pre-wrap; } Soll dieser Download wirklich abgebrochen und gelöscht werden? - + Speed / Queue position Geschwindigkeits- / Warteschlangenposition @@ -12902,7 +13352,12 @@ p, li { white-space: pre-wrap; } - + + RTT Statistics + + + + Copy RetroShare Link Kopiere RetroShare Link @@ -12913,20 +13368,20 @@ p, li { white-space: pre-wrap; } - + Slower Langsamer - - + + Average Durchschnitt - - + + Faster Schneller @@ -12989,7 +13444,7 @@ p, li { white-space: pre-wrap; } Überprüfe... - + Force Check Erzwinge Überprüfung @@ -13284,10 +13739,18 @@ p, li { white-space: pre-wrap; } Durchsuchen + + VoipStatistics + + + VoipTest Statistics + + + misc - + Unknown Unknown (size) Unbekannt @@ -13381,5 +13844,15 @@ p, li { white-space: pre-wrap; } e.g: 3.1 T T + + + Load avatar image + Lade Avatar Bild + + + + Pictures (*.png *.xpm *.jpg *.tiff *.gif) + Bilder (*.png *.xpm *.jpg *.tiff *.gif) + diff --git a/retroshare-gui/src/util/misc.cpp b/retroshare-gui/src/util/misc.cpp index cebdd56cb..46197de49 100644 --- a/retroshare-gui/src/util/misc.cpp +++ b/retroshare-gui/src/util/misc.cpp @@ -23,6 +23,8 @@ #include #include #include +#include +#include #include "misc.h" @@ -243,6 +245,43 @@ QString misc::removeNewLine(const std::wstring &text) return QString::fromStdWString(text).replace("\n", " "); } +/*! +* Let's the user choose an avatar picture file, which is returned as a PNG thumbnail +* in a byte array +* +* return false, if the user canceled the dialog, otherwise true +*/ +bool misc::getOpenAvatarPicture(QWidget *parent, QByteArray &image_data) +{ + QPixmap picture = getOpenThumbnailedPicture(parent, tr("Load avatar image"), 96, 96); + + if (picture.isNull()) + return false; + + // save image in QByteArray + QBuffer buffer(&image_data); + buffer.open(QIODevice::WriteOnly); + picture.save(&buffer, "PNG"); // writes image into ba in PNG format + + return true; +} + +/*! + * Open a QFileDialog to let the user choose a picture file. + * This picture is converted to a thumbnail and returned as a QPixmap. + * + * \return a null pixmap, if the user canceled the dialog, otherwise the chosen picture + */ +QPixmap misc::getOpenThumbnailedPicture(QWidget *parent, const QString &caption, int width, int height) +{ + // Let the user choose an picture file + QString fileName; + if (!getOpenFileName(parent, RshareSettings::LASTDIR_IMAGES, caption, tr("Pictures (*.png *.xpm *.jpg *.tiff *.gif)"), fileName)) + return QPixmap(); + + return QPixmap(fileName).scaled(width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); +} + bool misc::getOpenFileName(QWidget *parent, RshareSettings::enumLastDir type, const QString &caption, const QString &filter, QString &file) { QString lastDir = Settings->getLastDir(type); diff --git a/retroshare-gui/src/util/misc.h b/retroshare-gui/src/util/misc.h index 16707e5d6..950681b52 100644 --- a/retroshare-gui/src/util/misc.h +++ b/retroshare-gui/src/util/misc.h @@ -156,6 +156,8 @@ class misc : public QObject static QString removeNewLine(const std::string &text); static QString removeNewLine(const std::wstring &text); + static bool getOpenAvatarPicture(QWidget *parent, QByteArray &image_data); + static QPixmap getOpenThumbnailedPicture(QWidget *parent, const QString &caption, int width, int height); static bool getOpenFileName(QWidget *parent, RshareSettings::enumLastDir type, const QString &caption, const QString &filter, QString &file); static bool getOpenFileNames(QWidget *parent, RshareSettings::enumLastDir type, const QString &caption, const QString &filter, QStringList &files);