Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-03-06 13:46:11 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed RetroShare links with " characters in the name.

Browse Source 
Removed not used plugins from the .pro file.
Removed some warnings from lupdate.
Fixed german translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4903 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-02-08 12:11:15 +00:00
parent 5340e44981
commit d5479940d1
12 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/AboutDialog.cpp
View File

@ -727,7 +727,7 @@ TPiece TPiece::rotatedRight() const {
return result; return result;
} }
NextPieceLabel::NextPieceLabel( QWidget* parent /*= 0*/ ) : QLabel(parent) NextPieceLabel::NextPieceLabel( QWidget* parent /* = 0*/ ) : QLabel(parent)
{ {
QPalette p = palette(); QPalette p = palette();
p.setColor(QPalette::Background, Qt::white); p.setColor(QPalette::Background, Qt::white);

2
retroshare-gui/src/gui/ForumsDialog.cpp
View File

@ -696,7 +696,7 @@ void ForumsDialog::CalculateIconsAndFonts(QTreeWidgetItem *pItem, bool &bHasRead
bHasUnreadChilddren = bHasUnreadChilddren || bMyUnreadChilddren || bUnread; bHasUnreadChilddren = bHasUnreadChilddren || bMyUnreadChilddren || bUnread;
} }
void ForumsDialog::CalculateIconsAndFonts(QTreeWidgetItem *pItem /*= NULL*/) void ForumsDialog::CalculateIconsAndFonts(QTreeWidgetItem *pItem /* = NULL*/)
{ {
bool bDummy1 = false; bool bDummy1 = false;
bool bDummy2 = false; bool bDummy2 = false;

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

@ -519,7 +519,7 @@ QString RetroShareLink::title() const
static QString encodeItem(QString item) static QString encodeItem(QString item)
{ {
return item.replace(" ", "%20").replace("&", "%26").replace("#", "%23"); return item.replace(" ", "%20").replace("&", "%26").replace("#", "%23").replace("\"", "%22");
} }
QString RetroShareLink::toString() const QString RetroShareLink::toString() const
@ -727,7 +727,7 @@ static void processList(QStringList &list, const QString &textSingular, const QS
result += "</p>"; result += "</p>";
} }
/*static*/ int RetroShareLink::process(QList<RetroShareLink> &linksIn, uint flag /*= RSLINK_PROCESS_NOTIFY_ALL*/) /*static*/ int RetroShareLink::process(QList<RetroShareLink> &linksIn, uint flag /* = RSLINK_PROCESS_NOTIFY_ALL*/)
{ {
QList<RetroShareLink>::iterator linkIt; QList<RetroShareLink>::iterator linkIt;
@ -1200,7 +1200,7 @@ static void processList(QStringList &list, const QString &textSingular, const QS
return 0; return 0;
} }
/*static*/ int RetroShareLink::process(QStringList &urls, RetroShareLink::enumType type /*= RetroShareLink::TYPE_UNKNOWN*/, uint flag /*= RSLINK_PROCESS_NOTIFY_ALL*/) /*static*/ int RetroShareLink::process(QStringList &urls, RetroShareLink::enumType type /* = RetroShareLink::TYPE_UNKNOWN*/, uint flag /* = RSLINK_PROCESS_NOTIFY_ALL*/)
{ {
QList<RetroShareLink> links; QList<RetroShareLink> links;
@ -1310,7 +1310,7 @@ QString RSLinkClipboard::toHtmlFull()
return res ; return res ;
} }
bool RSLinkClipboard::empty(RetroShareLink::enumType type /*= RetroShareLink::TYPE_UNKNOWN*/) bool RSLinkClipboard::empty(RetroShareLink::enumType type /* = RetroShareLink::TYPE_UNKNOWN*/)
{ {
QList<RetroShareLink> links; QList<RetroShareLink> links;
parseClipboard(links); parseClipboard(links);
@ -1328,7 +1328,7 @@ bool RSLinkClipboard::empty(RetroShareLink::enumType type /*= RetroShareLink::TY
return true; return true;
} }
/*static*/ int RSLinkClipboard::process(RetroShareLink::enumType type /*= RetroShareLink::TYPE_UNKNOWN*/, uint flag /*= RSLINK_PROCESS_NOTIFY_ALL*/) /*static*/ int RSLinkClipboard::process(RetroShareLink::enumType type /* = RetroShareLink::TYPE_UNKNOWN*/, uint flag /* = RSLINK_PROCESS_NOTIFY_ALL*/)
{ {
QList<RetroShareLink> links; QList<RetroShareLink> links;
pasteLinks(links); pasteLinks(links);

2
retroshare-gui/src/gui/common/PeerDefs.cpp
View File

@ -48,7 +48,7 @@ const QString PeerDefs::rsid(const RsPeerDetails &details)
return rsid(details.name, details.id); return rsid(details.name, details.id);
} }
const QString PeerDefs::rsidFromId(const std::string &id, QString *name /*= NULL*/) const QString PeerDefs::rsidFromId(const std::string &id, QString *name /* = NULL*/)
{ {
QString rsid; QString rsid;

2
retroshare-gui/src/gui/common/RsCollectionFile.cpp
View File

@ -139,7 +139,7 @@ static void showErrorBox(const QString& filename, const QString& error)
mb.exec(); mb.exec();
} }
bool RsCollectionFile::load(const QString& filename, bool showError /*= true*/) bool RsCollectionFile::load(const QString& filename, bool showError /* = true*/)
{ {
QFile file(filename); QFile file(filename);

2
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View File

@ -763,7 +763,7 @@ static void calculateGroupsOfSslIds(std::list<RsGroupInfo> &existingGroupInfos,
} }
} }
MessageComposer *MessageComposer::newMsg(const std::string &msgId /*= ""*/) MessageComposer *MessageComposer::newMsg(const std::string &msgId /* = ""*/)
{ {
MessageComposer *msgComposer = new MessageComposer(); MessageComposer *msgComposer = new MessageComposer();

2
retroshare-gui/src/gui/settings/NewTag.cpp
View File

@ -25,7 +25,7 @@
#include <QColorDialog> #include <QColorDialog>
/** Default constructor */ /** Default constructor */
NewTag::NewTag(MsgTagType &Tags, uint32_t nId /*= 0*/, QWidget *parent, Qt::WFlags flags) NewTag::NewTag(MsgTagType &Tags, uint32_t nId /* = 0*/, QWidget *parent, Qt::WFlags flags)
: QDialog(parent, flags), m_Tags(Tags) : QDialog(parent, flags), m_Tags(Tags)
{ {
/* Invoke Qt Designer generated QObject setup routine */ /* Invoke Qt Designer generated QObject setup routine */

2
retroshare-gui/src/gui/settings/rsettingswin.cpp
View File

@ -64,7 +64,7 @@ RSettingsWin::~RSettingsWin()
_instance = NULL; _instance = NULL;
} }
/*static*/ void RSettingsWin::showYourself(QWidget *parent, PageType page /*= LastPage*/) /*static*/ void RSettingsWin::showYourself(QWidget *parent, PageType page /* = LastPage*/)
{ {
if(_instance == NULL) { if(_instance == NULL) {
_instance = new RSettingsWin(parent); _instance = new RSettingsWin(parent);

2
retroshare-gui/src/gui/unfinished/profile/ProfileEdit.cpp
View File

@ -19,7 +19,7 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include "gui/profile/ProfileEdit.h" #include "ProfileEdit.h"
#include <retroshare/rspeers.h> #include <retroshare/rspeers.h>

4
retroshare-gui/src/gui/unfinished/profile/ProfileView.cpp
View File

@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include "gui/profile/ProfileView.h" #include "ProfileView.h"
#include "gui/profile/ProfileEdit.h" #include "ProfileEdit.h"
#include "gui/common/AvatarDefs.h" #include "gui/common/AvatarDefs.h"
#include <retroshare/rspeers.h> #include <retroshare/rspeers.h>

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

Binary file not shown.

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

@ -4059,7 +4059,7 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Size</source> <source>Size</source>
<translation>Grösse</translation> <translation>Größe</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
@ -6360,7 +6360,7 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location line="+1"/> <location line="+1"/>
<source>Size</source> <source>Size</source>
<translation>Grösse</translation> <translation>Größe</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+1"/>
@ -6400,12 +6400,12 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location line="+1"/> <location line="+1"/>
<source>greater than or equal</source> <source>greater than or equal</source>
<translation>grösser als oder gleich</translation> <translation>größer als oder gleich</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+1"/>
<source>greater than</source> <source>greater than</source>
<translation>grösser als</translation> <translation>größer als</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+1"/>
@ -7414,7 +7414,7 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
<message> <message>
<location line="+5"/> <location line="+5"/>
<source>Size</source> <source>Size</source>
<translation>Grösse</translation> <translation>Größe</translation>
</message> </message>
<message> <message>
<location line="+5"/> <location line="+5"/>
@ -7886,7 +7886,7 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location line="+5"/> <location line="+5"/>
<source>Size</source> <source>Size</source>
<translation>Grösse</translation> <translation>Größe</translation>
</message> </message>
<message> <message>
<location line="+5"/> <location line="+5"/>
@ -9480,7 +9480,7 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location line="-103"/> <location line="-103"/>
<source>Size</source> <source>Size</source>
<translation>Grösse</translation> <translation>Größe</translation>
</message> </message>
<message> <message>
<location line="+5"/> <location line="+5"/>
@ -9547,7 +9547,7 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location line="+26"/> <location line="+26"/>
<source>Display Size:</source> <source>Display Size:</source>
<translation>Anzeige-Grösse:</translation> <translation>Anzeige-Größe:</translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+8"/>
@ -9562,7 +9562,7 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location line="+5"/> <location line="+5"/>
<source>Full Size</source> <source>Full Size</source>
<translation>Volle Grösse</translation> <translation>Volle Größe</translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+8"/>
@ -10192,7 +10192,7 @@ Do you want to send them a Message instead</source>
<message> <message>
<location line="+16"/> <location line="+16"/>
<source>Size</source> <source>Size</source>
<translation>Grösse</translation> <translation>Größe</translation>
</message> </message>
<message> <message>
<location line="+5"/> <location line="+5"/>
@ -11326,7 +11326,7 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location line="+1"/> <location line="+1"/>
<source>Size</source> <source>Size</source>
<translation>Grösse</translation> <translation>Größe</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+1"/>
@ -11657,7 +11657,7 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location filename="../gui/SearchDialog.ui" line="+160"/> <location filename="../gui/SearchDialog.ui" line="+160"/>
<source>Size</source> <source>Size</source>
<translation>Grösse</translation> <translation>Größe</translation>
</message> </message>
<message> <message>
<location line="+10"/> <location line="+10"/>
@ -13771,7 +13771,7 @@ p, li { white-space: pre-wrap; }
<location line="+60"/> <location line="+60"/>
<source>Size</source> <source>Size</source>
<comment>i.e: file size</comment> <comment>i.e: file size</comment>
<translation>Grösse</translation> <translation>Größe</translation>
</message> </message>
<message> <message>
<location line="-58"/> <location line="-58"/>
@ -14115,7 +14115,7 @@ p, li { white-space: pre-wrap; }
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Size</source> <source>Size</source>
<translation>Grösse</translation> <translation>Größe</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>