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

Fixed resizing of the MainWindow when hashing files with long names.

Browse Source 
Moved the hash strings of notifyHashingInfo from the librs to the GUI for translating.
Fixed german translation.

Recompile of GUI needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3659 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-10-09 18:35:34 +00:00
parent 4a286f751b
commit 0be24268f7
18 changed files with 188 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libretroshare/src/dbase/fimonitor.cc
View File

@ -318,7 +318,7 @@ void FileIndexMonitor::updateCycle()
mInCheck = true;
}
cb->notifyHashingInfo("Examining shared files...") ;
cb->notifyHashingInfo(NOTIFY_HASHTYPE_EXAMINING_FILES, "") ;
std::vector<DirContentToHash> to_hash ;
@ -543,7 +543,7 @@ void FileIndexMonitor::updateCycle()
if(!to_hash.empty())
hashFiles(to_hash) ;
cb->notifyHashingInfo("") ;
cb->notifyHashingInfo(NOTIFY_HASHTYPE_FINISH, "") ;
{ /* LOCKED DIRS */
RsStackMutex stack(fiMutex); /**** LOCKED DIRS ****/
@ -634,8 +634,8 @@ void FileIndexMonitor::hashFiles(const std::vector<DirContentToHash>& to_hash)
//
std::ostringstream tmpout;
tmpout << cnt+1 << "/" << n_files << " (" << friendlyUnit(size) << " - " << int(size/double(total_size)*100.0) << "%) : " << to_hash[i].fentries[j].name ;
cb->notifyHashingInfo("Hashing file " + tmpout.str()) ;
cb->notifyHashingInfo(NOTIFY_HASHTYPE_HASH_FILE, tmpout.str()) ;
FileEntry fe(to_hash[i].fentries[j]) ; // copied, because hashFile updates the hash member
@ -666,7 +666,7 @@ void FileIndexMonitor::hashFiles(const std::vector<DirContentToHash>& to_hash)
std::cerr << "size - last_save_size = " << size - last_save_size << ", max=" << MAX_SIZE_WITHOUT_SAVING << std::endl ;
if(size > last_save_size + MAX_SIZE_WITHOUT_SAVING)
{
cb->notifyHashingInfo("Saving file index...") ;
cb->notifyHashingInfo(NOTIFY_HASHTYPE_SAVE_FILE_INDEX, "") ;
#ifdef WINDOWS_SYS
Sleep(1000) ;
#else

7
libretroshare/src/retroshare/rsiface.h
View File

@ -188,7 +188,7 @@ class NotifyBase
virtual void notifyChat() { return; }
virtual void notifyChatStatus(const std::string& /* peer_id */, const std::string& /* status_string */ ,bool /* is_private */) {}
virtual void notifyCustomState(const std::string& /* peer_id */, const std::string& /* status_string */) {}
virtual void notifyHashingInfo(std::string fileinfo) { (void)fileinfo; return ; }
virtual void notifyHashingInfo(uint32_t type, const std::string& fileinfo) { (void) type; (void)fileinfo; }
virtual void notifyTurtleSearchResult(uint32_t /* search_id */ ,const std::list<TurtleFileInfo>& files) { (void)files; }
virtual void notifyPeerHasNewAvatar(std::string peer_id) { (void)peer_id; }
virtual void notifyOwnAvatarChanged() {}
@ -225,6 +225,9 @@ const int NOTIFY_TYPE_MOD = 0x02; /* general purpose, check all */
const int NOTIFY_TYPE_ADD = 0x04; /* flagged additions */
const int NOTIFY_TYPE_DEL = 0x08; /* flagged deletions */
const uint32_t NOTIFY_HASHTYPE_EXAMINING_FILES = 1; /* Examining shared files */
const uint32_t NOTIFY_HASHTYPE_FINISH = 2; /* Finish */
const uint32_t NOTIFY_HASHTYPE_HASH_FILE = 3; /* Hashing file */
const uint32_t NOTIFY_HASHTYPE_SAVE_FILE_INDEX = 4; /* Hashing file */
#endif

8
retroshare-gui/src/RetroShare.pro
View File

@ -290,7 +290,8 @@ HEADERS += rshare.h \
gui/help/browser/helptextbrowser.h \
gui/statusbar/peerstatus.h \
gui/statusbar/natstatus.h \
gui/statusbar/ratesstatus.h \
gui/statusbar/ratesstatus.h \
gui/statusbar/hashingstatus.h \
gui/advsearch/advancedsearchdialog.h \
gui/advsearch/expressionwidget.h \
gui/advsearch/guiexprelement.h \
@ -503,9 +504,10 @@ SOURCES += main.cpp \
gui/settings/TransferPage.cpp \
gui/settings/ChatPage.cpp \
gui/settings/AddFileAssociationDialog.cpp \
gui/statusbar/peerstatus.cpp \
gui/statusbar/peerstatus.cpp \
gui/statusbar/natstatus.cpp \
gui/statusbar/ratesstatus.cpp \
gui/statusbar/ratesstatus.cpp \
gui/statusbar/hashingstatus.cpp \
gui/toaster/ChatToaster.cpp \
gui/toaster/MessageToaster.cpp \
gui/toaster/CallToaster.cpp \

32
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -62,6 +62,7 @@
#include "statusbar/peerstatus.h"
#include "statusbar/natstatus.h"
#include "statusbar/ratesstatus.h"
#include "statusbar/hashingstatus.h"
#include <retroshare/rsstatus.h>
#include <retroshare/rsiface.h>
@ -273,24 +274,8 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
natstatus = new NATStatus();
statusBar()->addWidget(natstatus);
widget = new QWidget();
QSizePolicy sizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
sizePolicy.setHeightForWidth(widget->sizePolicy().hasHeightForWidth());
widget->setSizePolicy(sizePolicy);
QHBoxLayout *horizontalLayout = new QHBoxLayout(widget);
horizontalLayout->setContentsMargins(0, 0, 0, 0);
horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
_hashing_info_label = new QLabel(widget) ;
_hashing_info_label->setObjectName(QString::fromUtf8("label"));
horizontalLayout->addWidget(_hashing_info_label);
QSpacerItem *horizontalSpacer = new QSpacerItem(1000, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
horizontalLayout->addItem(horizontalSpacer);
statusBar()->addPermanentWidget(widget);
_hashing_info_label->hide() ;
hashingstatus = new HashingStatus();
statusBar()->addPermanentWidget(hashingstatus);
ratesstatus = new RatesStatus();
statusBar()->addPermanentWidget(ratesstatus);
@ -560,17 +545,6 @@ void MainWindow::privateChatChanged(int list, int type)
}
}
void MainWindow::updateHashingInfo(const QString& s)
{
if(s == "")
_hashing_info_label->hide() ;
else
{
_hashing_info_label->setText(s) ;
_hashing_info_label->show() ;
}
}
void MainWindow::postModDirectories(bool update_local)
{
RSettingsWin::postModDirectories(update_local);

5
retroshare-gui/src/gui/MainWindow.h
View File

@ -34,6 +34,7 @@ class Idle;
class PeerStatus;
class NATStatus;
class RatesStatus;
class HashingStatus;
class ForumsDialog;
class PeersDialog;
class ChatDialog;
@ -134,7 +135,6 @@ public:
void setStatus(QObject *pObject, int nStatus);
public slots:
void updateHashingInfo(const QString&) ;
void displayErrorMessage(int,int,const QString&) ;
void postModDirectories(bool update_local);
void displayDiskSpaceWarning(int loc,int size_limit_mb) ;
@ -235,10 +235,9 @@ private:
PeerStatus *peerstatus;
NATStatus *natstatus;
RatesStatus *ratesstatus;
HashingStatus *hashingstatus;
QComboBox *statusComboBox;
QLabel *_hashing_info_label ;
QAction *messageAction;
QAction *forumAction;
QAction *channelAction;

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

@ -155,9 +155,25 @@ void NotifyQt::notifyTurtleSearchResult(uint32_t search_id,const std::list<Turtl
}
}
void NotifyQt::notifyHashingInfo(std::string fileinfo)
void NotifyQt::notifyHashingInfo(uint32_t type, const std::string& fileinfo)
{
emit hashingInfoChanged(QString::fromUtf8(fileinfo.c_str())) ;
QString info;
switch (type) {
case NOTIFY_HASHTYPE_EXAMINING_FILES:
info = tr("Examining shared files...");
break;
case NOTIFY_HASHTYPE_FINISH:
break;
case NOTIFY_HASHTYPE_HASH_FILE:
info = tr("Hashing file") + " " + QString::fromUtf8(fileinfo.c_str());
break;
case NOTIFY_HASHTYPE_SAVE_FILE_INDEX:
info = tr("Saving file index...");
break;
}
emit hashingInfoChanged(info);
}
//void NotifyQt::notifyChat()

2
retroshare-gui/src/gui/notifyqt.h
View File

@ -34,7 +34,7 @@ class NotifyQt: public QObject, public NotifyBase
virtual void notifyErrorMsg(int list, int sev, std::string msg);
virtual void notifyChatStatus(const std::string& peer_id,const std::string& status_string,bool is_private);
virtual void notifyCustomState(const std::string& peer_id, const std::string& status_string);
virtual void notifyHashingInfo(std::string fileinfo);
virtual void notifyHashingInfo(uint32_t type, const std::string& fileinfo);
virtual void notifyTurtleSearchResult(uint32_t search_id,const std::list<TurtleFileInfo>& found_files);
virtual void notifyPeerHasNewAvatar(std::string peer_id) ;
virtual void notifyOwnAvatarChanged() ;

69
retroshare-gui/src/gui/statusbar/hashingstatus.cpp
View File

@ -18,61 +18,60 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
****************************************************************/
#include "hashingstatus.h"
#include <QtGui>
#include <QString>
#include <QLayout>
#include <QLabel>
#include <QIcon>
#include <QPainter>
#include <QPixmap>
#include <retroshare/rsiface.h>
#include <retroshare/rspeers.h>
#include <retroshare/notifyqt.h>
#include "hashingstatus.h"
#include <sstream>
#include <iomanip>
#include "gui/notifyqt.h"
class QStatusLabel : public QLabel
{
public:
QStatusLabel(QLayout *layout, QWidget *parent = NULL, Qt::WindowFlags f = 0) : QLabel(parent, f)
{
m_layout = layout;
}
virtual QSize minimumSizeHint() const
{
const QSize sizeHint = QLabel::minimumSizeHint();
// do not resize the layout
return QSize(qMin(sizeHint.width(), m_layout->geometry().width()), sizeHint.height());
}
private:
QLayout *m_layout;
};
HashingStatus::HashingStatus(QWidget *parent)
: QWidget(parent)
{
QHBoxLayout *hbox = new QHBoxLayout();
QHBoxLayout *hbox = new QHBoxLayout(this);
hbox->setMargin(0);
hbox->setSpacing(6);
//iconLabel = new QLabel( this );
//iconLabel->setPixmap(QPixmap::QPixmap(":/images/user/identitygray16.png"));
// iconLabel doesn't change over time, so we didn't need a minimum size
//hbox->addWidget(iconLabel);
statusHashing = new QLabel( tr(""), this );
//statusHashing->setMinimumSize( statusHashing->frameSize().width() + 0, 0 );
statusHashing = new QStatusLabel(hbox, this);
hbox->addWidget(statusHashing);
QSpacerItem *horizontalSpacer = new QSpacerItem(1000, 0, QSizePolicy::Expanding, QSizePolicy::Minimum);
hbox->addItem(horizontalSpacer);
setLayout( hbox );
setLayout(hbox);
}
statusHashing->hide();
HashingStatus::~HashingStatus()
{
connect(NotifyQt::getInstance(), SIGNAL(hashingInfoChanged(const QString&)), SLOT(updateHashingInfo(const QString&)));
}
void HashingStatus::updateHashingInfo(const QString& s)
{
if(s == "")
statusHashing->hide() ;
else
{
statusHashing->setText("Hashing file " + s) ;
statusHashing->show() ;
}
if(s.isEmpty()) {
statusHashing->hide() ;
} else {
statusHashing->setText(s);
statusHashing->show();
}
}

14
retroshare-gui/src/gui/statusbar/hashingstatus.h
View File

@ -20,27 +20,23 @@
****************************************************************/
#ifndef HASHINGSTATUS_H
#define HASHINGSTATUS_H
#include "gui/MainWindow.h"
#include <QWidget>
class QLabel;
class HashingStatus : public QWidget
{
Q_OBJECT
Q_OBJECT
public:
HashingStatus(QWidget *parent = 0);
~HashingStatus();
public slots:
void updateHashingInfo(const QString&) ;
void updateHashingInfo(const QString&) ;
private:
class QLabel *iconLabel, *statusHashing;
QLabel *statusHashing;
};
#endif

36
retroshare-gui/src/gui/statusbar/natstatus.cpp
View File

@ -19,6 +19,7 @@
* Boston, MA 02110-1301, USA.
****************************************************************/
#include <QHBoxLayout>
#include <QLabel>
#include "natstatus.h"
@ -28,33 +29,24 @@
NATStatus::NATStatus(QWidget *parent)
: QWidget(parent)
{
QHBoxLayout *hbox = new QHBoxLayout();
QHBoxLayout *hbox = new QHBoxLayout(this);
hbox->setMargin(0);
hbox->setSpacing(6);
statusNAT = new QLabel( tr("<strong>NAT:</strong>"), this );
//statusDHT->setMinimumSize( statusPeers->frameSize().width() + 0, 0 );
// statusDHT->setMinimumSize( statusPeers->frameSize().width() + 0, 0 );
hbox->addWidget(statusNAT);
iconLabel = new QLabel( this );
iconLabel = new QLabel(this);
iconLabel->setPixmap(QPixmap(":/images/grayled.png"));
// iconLabel doesn't change over time, so we didn't need a minimum size
hbox->addWidget(iconLabel);
setLayout( hbox );
}
NATStatus::~NATStatus()
{
setLayout(hbox);
}
void NATStatus::getNATStatus()
{
rsiface->lockData(); /* Lock Interface */
/* now the extra bit .... switch on check boxes */
@ -95,25 +87,25 @@ void NATStatus::getNATStatus()
if (config.netUpnpOk)
{
iconLabel->setPixmap(QPixmap(":/images/greenled.png"));
iconLabel->setToolTip(tr("OK | RetroShare Server"));
iconLabel->setPixmap(QPixmap(":/images/greenled.png"));
iconLabel->setToolTip(tr("OK | RetroShare Server"));
}
else if (config.netStunOk || config.netExtraAddressOk)
{
iconLabel->setPixmap(QPixmap(":/images/greenled.png"));
iconLabel->setToolTip(tr("Internet connection"));
iconLabel->setPixmap(QPixmap(":/images/greenled.png"));
iconLabel->setToolTip(tr("Internet connection"));
}
else if (config.netLocalOk)
{
iconLabel->setPixmap(QPixmap(":/images/grayled.png"));
iconLabel->setToolTip(tr("No internet connection"));
iconLabel->setPixmap(QPixmap(":/images/grayled.png"));
iconLabel->setToolTip(tr("No internet connection"));
}
else
{
iconLabel->setPixmap(QPixmap(":/images/redled.png"));
iconLabel->setToolTip(tr("No local network"));
iconLabel->setPixmap(QPixmap(":/images/redled.png"));
iconLabel->setToolTip(tr("No local network"));
}
rsiface->unlockData(); /* UnLock Interface */
}

12
retroshare-gui/src/gui/statusbar/natstatus.h
View File

@ -20,26 +20,22 @@
****************************************************************/
#ifndef NATSTATUS_H
#define NATSTATUS_H
#include "gui/MainWindow.h"
#include <QWidget>
class QLabel;
class NATStatus : public QWidget
{
Q_OBJECT
Q_OBJECT
public:
NATStatus(QWidget *parent = 0);
~NATStatus();
void getNATStatus( );
private:
class QLabel *iconLabel, *statusNAT;
QLabel *iconLabel, *statusNAT;
};
#endif

10
retroshare-gui/src/gui/statusbar/peerstatus.cpp
View File

@ -29,7 +29,7 @@
PeerStatus::PeerStatus(QWidget *parent)
: QWidget(parent)
{
QHBoxLayout *hbox = new QHBoxLayout();
QHBoxLayout *hbox = new QHBoxLayout(this);
hbox->setMargin(0);
hbox->setSpacing(6);
@ -39,17 +39,13 @@ PeerStatus::PeerStatus(QWidget *parent)
hbox->addWidget(iconLabel);
statusPeers = new QLabel( tr("Online: 0 | Friends: 0 | Network: 0 "), this );
//statusPeers->setMinimumSize( statusPeers->frameSize().width() + 0, 0 );
// statusPeers->setMinimumSize( statusPeers->frameSize().width() + 0, 0 );
hbox->addWidget(statusPeers);
setLayout( hbox );
setLayout(hbox);
}
PeerStatus::~PeerStatus()
{
}
void PeerStatus::getPeerStatus(unsigned int nFriendCount, unsigned int nOnlineCount)
{
/* set users/friends/network */

11
retroshare-gui/src/gui/statusbar/peerstatus.h
View File

@ -23,20 +23,19 @@
#include <QWidget>
class QLabel;
class PeerStatus : public QWidget
{
Q_OBJECT
Q_OBJECT
public:
PeerStatus(QWidget *parent = 0);
~PeerStatus();
void getPeerStatus(unsigned int nFriendCount, unsigned int nOnlineCount);
private:
class QLabel *iconLabel, *statusPeers;
QLabel *iconLabel, *statusPeers;
};
#endif

14
retroshare-gui/src/gui/statusbar/ratesstatus.cpp
View File

@ -19,6 +19,7 @@
* Boston, MA 02110-1301, USA.
****************************************************************/
#include <QHBoxLayout>
#include <QLabel>
#include "ratesstatus.h"
@ -30,7 +31,7 @@
RatesStatus::RatesStatus(QWidget *parent)
: QWidget(parent)
{
QHBoxLayout *hbox = new QHBoxLayout();
QHBoxLayout *hbox = new QHBoxLayout(this);
hbox->setMargin(0);
hbox->setSpacing(6);
@ -40,15 +41,10 @@ RatesStatus::RatesStatus(QWidget *parent)
hbox->addWidget(iconLabel);
statusRates = new QLabel( tr("<strong>Down:</strong> 0.00 (kB/s) | <strong>Up:</strong> 0.00 (kB/s) "), this );
//statusPeers->setMinimumSize( statusPeers->frameSize().width() + 0, 0 );
// statusPeers->setMinimumSize( statusPeers->frameSize().width() + 0, 0 );
hbox->addWidget(statusRates);
setLayout( hbox );
}
RatesStatus::~RatesStatus()
{
setLayout(hbox);
}
void RatesStatus::getRatesStatus()
@ -87,6 +83,4 @@ void RatesStatus::getRatesStatus()
{
iconLabel->setPixmap(QPixmap(":/images/up0down0.png"));
}
}

12
retroshare-gui/src/gui/statusbar/ratesstatus.h
View File

@ -20,26 +20,22 @@
****************************************************************/
#ifndef RATESSTATUS_H
#define RATESSTATUS_H
#include "gui/MainWindow.h"
#include <QWidget>
class QLabel;
class RatesStatus : public QWidget
{
Q_OBJECT
Q_OBJECT
public:
RatesStatus(QWidget *parent = 0);
~RatesStatus();
void getRatesStatus( );
private:
class QLabel *iconLabel, *statusRates;
QLabel *iconLabel, *statusRates;
};
#endif

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

Binary file not shown.

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

@ -203,12 +203,12 @@ p, li { white-space: pre-wrap; }
<context>
<name>AppearancePage</name>
<message>
<location filename="../gui/settings/AppearancePage.ui" line="+526"/>
<location filename="../gui/settings/AppearancePage.ui" line="+515"/>
<source>Language</source>
<translation>Sprache</translation>
</message>
<message>
<location line="+55"/>
<location line="+25"/>
<source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Arial&apos;; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
@ -219,17 +219,17 @@ p, li { white-space: pre-wrap; }
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Wähle die Sprache für RetroShare aus&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location line="+31"/>
<location line="-16"/>
<source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;/head&gt;&lt;body style=&quot; white-space: pre-wrap; font-family:Arial; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Changes to language will only take effect after restarting RetroShare!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;/head&gt;&lt;body style=&quot; white-space: pre-wrap; font-family:Arial; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Änderungen in der Sprachwahl wirken sich erst nach einem Neustart von Retroshare aus!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location line="+20"/>
<location line="+63"/>
<source>Style</source>
<translation>Stil</translation>
</message>
<message>
<location line="+42"/>
<location line="+15"/>
<source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Arial&apos;; font-size:10pt; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
@ -240,7 +240,7 @@ p, li { white-space: pre-wrap; }
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Wähle die Oberfläche für RetroShare aus&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<location line="+36"/>
<location line="+35"/>
<source>Style Sheet</source>
<translation></translation>
</message>
@ -856,33 +856,33 @@ p, li { white-space: pre-wrap; }
<context>
<name>ChanMsgItem</name>
<message>
<location filename="../gui/feeds/ChanMsgItem.ui" line="+214"/>
<location filename="../gui/feeds/ChanMsgItem.ui" line="+229"/>
<source>Remove Item</source>
<translation>Eintrag entfernen</translation>
</message>
<message>
<location line="+20"/>
<location filename="../gui/feeds/ChanMsgItem.cpp" line="+285"/>
<location line="+26"/>
<location filename="../gui/feeds/ChanMsgItem.cpp" line="+290"/>
<source>Expand</source>
<translation>Erweitern</translation>
</message>
<message>
<location line="+24"/>
<source>Download</source>
<translation type="unfinished">Herunterladen</translation>
<translation>Herunterladen</translation>
</message>
<message>
<location line="+11"/>
<source>Play</source>
<translation type="unfinished">Abspielen</translation>
<translation>Abspielen</translation>
</message>
<message>
<location line="+56"/>
<location line="+62"/>
<source>New</source>
<translation type="unfinished">Neu</translation>
<translation>Neu</translation>
</message>
<message>
<location line="-131"/>
<location line="-149"/>
<source>Unsubscribe From Channel</source>
<translation>Kanal abbestellen</translation>
</message>
@ -1100,12 +1100,12 @@ Abgeholt: %2
Verfügbar: %3</translation>
</message>
<message>
<location line="+125"/>
<location line="+134"/>
<source>No Channel Selected</source>
<translation>Keinen Kanal gewählt</translation>
</message>
<message>
<location line="-367"/>
<location line="-376"/>
<source>Restore Publish Rights for Channel</source>
<translation>Stelle Veröffentlichungsrechte für Kanal wieder her</translation>
</message>
@ -4917,7 +4917,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>MainWindow</name>
<message>
<location filename="../gui/MainWindow.cpp" line="+199"/>
<location filename="../gui/MainWindow.cpp" line="+200"/>
<source>Network</source>
<translation>Netzwerk</translation>
</message>
@ -4947,7 +4947,7 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished">Blogs</translation>
</message>
<message>
<location line="+577"/>
<location line="+562"/>
<source>Internal Error</source>
<translation>Interener Fehler</translation>
</message>
@ -4968,12 +4968,12 @@ p, li { white-space: pre-wrap; }
<translation>Zeigen</translation>
</message>
<message>
<location line="-445"/>
<location line="+61"/>
<location line="-426"/>
<location line="+60"/>
<location line="+2"/>
<location line="+24"/>
<location line="+22"/>
<location line="+2"/>
<location line="+24"/>
<location line="+22"/>
<location line="+2"/>
<source>RetroShare</source>
<translation></translation>
@ -5005,7 +5005,7 @@ p, li { white-space: pre-wrap; }
<translation>Schnellstart Assistent</translation>
</message>
<message>
<location filename="../gui/MainWindow.cpp" line="-299"/>
<location filename="../gui/MainWindow.cpp" line="-298"/>
<source>Search</source>
<translation>Suchen</translation>
</message>
@ -5020,7 +5020,7 @@ p, li { white-space: pre-wrap; }
<translation>Messenger</translation>
</message>
<message>
<location filename="../gui/MainWindow.cpp" line="+152"/>
<location filename="../gui/MainWindow.cpp" line="+156"/>
<source>Show/Hide</source>
<translation>Anzeigen/Verbergen</translation>
</message>
@ -5030,21 +5030,21 @@ p, li { white-space: pre-wrap; }
<translation>&amp;Schliessen</translation>
</message>
<message>
<location line="+66"/>
<location line="+26"/>
<location line="+26"/>
<location line="+65"/>
<location line="+24"/>
<location line="+24"/>
<source>You have %1 new messages</source>
<translation>Du hast %1 neue Beiträge</translation>
</message>
<message>
<location line="-50"/>
<location line="+26"/>
<location line="+26"/>
<location line="-46"/>
<location line="+24"/>
<location line="+24"/>
<source>You have %1 new message</source>
<translation>Du hast %1 neuen Beitrag</translation>
</message>
<message>
<location line="+257"/>
<location line="+243"/>
<source>Bandwidth Graph</source>
<translation>Bandbreiten-Graph</translation>
</message>
@ -5059,7 +5059,7 @@ p, li { white-space: pre-wrap; }
<translation>Schliessen</translation>
</message>
<message>
<location filename="../gui/MainWindow.cpp" line="-383"/>
<location filename="../gui/MainWindow.cpp" line="-364"/>
<source>Minimize</source>
<translation>Minimieren</translation>
</message>
@ -5069,7 +5069,7 @@ p, li { white-space: pre-wrap; }
<translation>Maximieren</translation>
</message>
<message>
<location line="-150"/>
<location line="-154"/>
<source>Links Cloud</source>
<translation>Verknüpfungs-Wolke</translation>
</message>
@ -5084,7 +5084,7 @@ p, li { white-space: pre-wrap; }
<translation></translation>
</message>
<message>
<location filename="../gui/MainWindow.cpp" line="+524"/>
<location filename="../gui/MainWindow.cpp" line="+509"/>
<source>Help</source>
<translation>Hilfe</translation>
</message>
@ -5094,7 +5094,7 @@ p, li { white-space: pre-wrap; }
<translation>Über</translation>
</message>
<message>
<location filename="../gui/MainWindow.cpp" line="-545"/>
<location filename="../gui/MainWindow.cpp" line="-530"/>
<source>Forums</source>
<translation>Foren</translation>
</message>
@ -5104,7 +5104,7 @@ p, li { white-space: pre-wrap; }
<translation>RetroShare %1 eine sichere und dezentralisierte Kommunikationsplattform</translation>
</message>
<message>
<location line="+608"/>
<location line="+593"/>
<source>Open Messages</source>
<translation>Öffne Nachrichten</translation>
</message>
@ -5114,12 +5114,12 @@ p, li { white-space: pre-wrap; }
<translation>Anwendungen</translation>
</message>
<message>
<location line="-532"/>
<location line="-517"/>
<source>Plugins</source>
<translation></translation>
</message>
<message>
<location line="+548"/>
<location line="+533"/>
<source>Do you really want to exit RetroShare ?</source>
<translation>Wollen Sie RetroShare wirklich beenden?</translation>
</message>
@ -5129,7 +5129,7 @@ p, li { white-space: pre-wrap; }
<translation>Wirklich beenden?</translation>
</message>
<message>
<location line="-434"/>
<location line="-415"/>
<source>Low disk space warning</source>
<translation>Wenig Festplatenspeicher</translation>
</message>
@ -6290,12 +6290,12 @@ p, li { white-space: pre-wrap; }
<context>
<name>NATStatus</name>
<message>
<location filename="../gui/statusbar/natstatus.cpp" line="+35"/>
<location filename="../gui/statusbar/natstatus.cpp" line="+36"/>
<source>&lt;strong&gt;NAT:&lt;/strong&gt;</source>
<translation></translation>
</message>
<message>
<location line="+69"/>
<location line="+60"/>
<source>Internet connection</source>
<translation>Internetverbindung</translation>
</message>
@ -6917,6 +6917,21 @@ p, li { white-space: pre-wrap; }
<source>Please enter the password to unlock the following GPG key:</source>
<translation>Bitte geben Sie das Passwort ein um folgenden GPG Schlüssel freizuschalten:</translation>
</message>
<message>
<location line="+97"/>
<source>Examining shared files...</source>
<translation>Prüfe freigegebene Dateien...</translation>
</message>
<message>
<location line="+5"/>
<source>Hashing file</source>
<translation>Erstelle Prüfsumme</translation>
</message>
<message>
<location line="+3"/>
<source>Saving file index...</source>
<translation>Speichere Dateiindex...</translation>
</message>
</context>
<context>
<name>OnlineToaster</name>
@ -7070,7 +7085,7 @@ p, li { white-space: pre-wrap; }
<translation>Online: 0 | Freunde: 0 | Netzwerk: 0 </translation>
</message>
<message>
<location line="+24"/>
<location line="+20"/>
<source>&lt;strong&gt;Friends:&lt;/strong&gt;</source>
<translation type="unfinished"></translation>
</message>
@ -7083,7 +7098,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>PeersDialog</name>
<message>
<location filename="../gui/PeersDialog.cpp" line="+430"/>
<location filename="../gui/PeersDialog.cpp" line="+425"/>
<source>Chat</source>
<translation>Chat</translation>
</message>
@ -7108,7 +7123,7 @@ p, li { white-space: pre-wrap; }
<translation>Verbinde zum Freund</translation>
</message>
<message>
<location line="-300"/>
<location line="-295"/>
<source>Profile</source>
<translation>Profil</translation>
</message>
@ -7118,12 +7133,12 @@ p, li { white-space: pre-wrap; }
<translation>RetroShare Link einfügen</translation>
</message>
<message>
<location line="+25"/>
<location line="+22"/>
<source>Welcome to RetroShare&apos;s group chat.</source>
<translation>Willkommen bei RetroShare&apos;s Gruppenchat.</translation>
</message>
<message>
<location line="+59"/>
<location line="+57"/>
<source>me</source>
<translation>ich</translation>
</message>
@ -7208,7 +7223,7 @@ p, li { white-space: pre-wrap; }
<translation>Verfügbar</translation>
</message>
<message>
<location line="+771"/>
<location line="+784"/>
<source>Add Extra File</source>
<translation>Zusätzliche Datei hinzufügen</translation>
</message>
@ -7326,7 +7341,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="-107"/>
<location filename="../gui/PeersDialog.cpp" line="-1479"/>
<location filename="../gui/PeersDialog.cpp" line="-1492"/>
<source>Add Friend</source>
<translation>Freund hinzufügen</translation>
</message>
@ -7401,7 +7416,7 @@ p, li { white-space: pre-wrap; }
<translation>Willst du diesen Freund entfernen?</translation>
</message>
<message>
<location line="+731"/>
<location line="+744"/>
<source>Save as...</source>
<translation>Speichern unter...</translation>
</message>
@ -7434,12 +7449,12 @@ p, li { white-space: pre-wrap; }
<translation>Status Spalte ausblenden</translation>
</message>
<message>
<location filename="../gui/PeersDialog.cpp" line="-1810"/>
<location filename="../gui/PeersDialog.cpp" line="-1818"/>
<source>Friends Storm</source>
<translation>Aktivitäten</translation>
</message>
<message>
<location line="+1163"/>
<location line="+1158"/>
<source>is typing...</source>
<translation>tippt...</translation>
</message>
@ -7762,7 +7777,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>PopupChatDialog</name>
<message>
<location filename="../gui/chat/PopupChatDialog.cpp" line="+777"/>
<location filename="../gui/chat/PopupChatDialog.cpp" line="+781"/>
<source>Hide Avatar</source>
<translation>Avatar verstecken</translation>
</message>
@ -7782,7 +7797,7 @@ p, li { white-space: pre-wrap; }
<translation>Nachrichten, die Du versendest gehen bei diesem Freund erst wieder ein wenn er Online ist</translation>
</message>
<message>
<location filename="../gui/chat/PopupChatDialog.ui" line="+571"/>
<location filename="../gui/chat/PopupChatDialog.ui" line="+566"/>
<location line="+293"/>
<source>Bold</source>
<translation>Fett</translation>
@ -7840,7 +7855,7 @@ p, li { white-space: pre-wrap; }
<translation>Deaktiviere Emoticons</translation>
</message>
<message>
<location filename="../gui/chat/PopupChatDialog.cpp" line="-1034"/>
<location filename="../gui/chat/PopupChatDialog.cpp" line="-1038"/>
<source>Paste retroshare Link</source>
<translation>RetroShare Link einfügen</translation>
</message>
@ -7860,7 +7875,7 @@ p, li { white-space: pre-wrap; }
<translation>Wähle dein Avatar Bild aus</translation>
</message>
<message>
<location filename="../gui/chat/PopupChatDialog.cpp" line="+770"/>
<location filename="../gui/chat/PopupChatDialog.cpp" line="+774"/>
<source>Add Extra File</source>
<translation>Zusätzlich eine Datei hinzufügen</translation>
</message>
@ -7897,7 +7912,7 @@ p, li { white-space: pre-wrap; }
<translation>Text Datei (*.txt );;Alle Dateien (*)</translation>
</message>
<message>
<location line="-749"/>
<location line="-753"/>
<source>Your Friend is offline
Do you want to send them a Message instead</source>
<translation>Dein Freund ist Offline willst du ihm stattdessen eine Nachricht senden</translation>
@ -7908,13 +7923,13 @@ Do you want to send them a Message instead</source>
<translation>Bild anhängen</translation>
</message>
<message>
<location line="-197"/>
<location line="-194"/>
<location line="+13"/>
<source>TextLabel</source>
<translation></translation>
</message>
<message>
<location filename="../gui/chat/PopupChatDialog.cpp" line="+790"/>
<location filename="../gui/chat/PopupChatDialog.cpp" line="+794"/>
<source>is Idle and may not reply</source>
<translation>antwortet möglicherweise nicht, da der Status auf &quot;Untätig&quot; gesetzt wurde</translation>
</message>
@ -7934,7 +7949,7 @@ Do you want to send them a Message instead</source>
<translation>ist Offline.</translation>
</message>
<message>
<location line="-735"/>
<location line="-739"/>
<source>is typing...</source>
<translation>tippt...</translation>
</message>
@ -8784,12 +8799,12 @@ p, li { white-space: pre-wrap; }
<context>
<name>RatesStatus</name>
<message>
<location filename="../gui/statusbar/ratesstatus.cpp" line="+42"/>
<location filename="../gui/statusbar/ratesstatus.cpp" line="+43"/>
<source>&lt;strong&gt;Down:&lt;/strong&gt; 0.00 (kB/s) | &lt;strong&gt;Up:&lt;/strong&gt; 0.00 (kB/s) </source>
<translation></translation>
</message>
<message>
<location line="+27"/>
<location line="+22"/>
<source>&lt;strong&gt;Down:&lt;/strong&gt;</source>
<translation>&lt;strong&gt;Runter:&lt;/strong&gt;</translation>
</message>

1
retroshare-gui/src/main.cpp
View File

@ -181,7 +181,6 @@ int main(int argc, char *argv[])
std::cerr << "connecting signals and slots" << std::endl ;
QObject::connect(notify,SIGNAL(gotTurtleSearchResult(qulonglong,FileDetail)),w->searchDialog ,SLOT(updateFiles(qulonglong,FileDetail))) ;
QObject::connect(notify,SIGNAL(hashingInfoChanged(const QString&)),w ,SLOT(updateHashingInfo(const QString&))) ;
QObject::connect(notify,SIGNAL(diskFull(int,int)) ,w ,SLOT(displayDiskSpaceWarning(int,int))) ;
QObject::connect(notify,SIGNAL(filesPreModChanged(bool)) ,w->sharedfilesDialog ,SLOT(preModDirectories(bool) )) ;
QObject::connect(notify,SIGNAL(filesPostModChanged(bool)) ,w->sharedfilesDialog ,SLOT(postModDirectories(bool) )) ;