From 5e2921ae98e81d2dfe00bf63bdac3bf31785bc38 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Sun, 12 Sep 2010 22:17:17 +0000 Subject: [PATCH] Cleaned ForumsDialog and MessagesDialog and updated german translation. New class for working with tag translation - TagDefs. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3476 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/RetroShare.pro | 2 + retroshare-gui/src/gui/ForumsDialog.cpp | 12 +- retroshare-gui/src/gui/ForumsDialog.ui | 2520 ++++++------ retroshare-gui/src/gui/MessagesDialog.cpp | 35 +- retroshare-gui/src/gui/MessagesDialog.ui | 3513 +++++++++-------- retroshare-gui/src/gui/common/TagDefs.cpp | 49 + retroshare-gui/src/gui/common/TagDefs.h | 33 + .../src/gui/settings/MessagePage.cpp | 20 +- .../src/gui/toaster/MessageToaster.ui | 9 +- retroshare-gui/src/lang/retroshare_de.qm | Bin 200336 -> 200661 bytes retroshare-gui/src/lang/retroshare_de.ts | 317 +- 11 files changed, 3287 insertions(+), 3223 deletions(-) create mode 100644 retroshare-gui/src/gui/common/TagDefs.cpp create mode 100644 retroshare-gui/src/gui/common/TagDefs.h diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro index c3f76c150..d17635f54 100644 --- a/retroshare-gui/src/RetroShare.pro +++ b/retroshare-gui/src/RetroShare.pro @@ -279,6 +279,7 @@ HEADERS += rshare.h \ gui/common/rwindow.h \ gui/common/html.h \ gui/common/StatusDefs.h \ + gui/common/TagDefs.h \ gui/MessagesDialog.h \ gui/help/browser/helpbrowser.h \ gui/help/browser/helptextbrowser.h \ @@ -469,6 +470,7 @@ SOURCES += main.cpp \ gui/common/rwindow.cpp \ gui/common/html.cpp \ gui/common/StatusDefs.cpp \ + gui/common/TagDefs.cpp \ gui/settings/rsharesettings.cpp \ gui/settings/RsharePeerSettings.cpp \ gui/settings/rsettings.cpp \ diff --git a/retroshare-gui/src/gui/ForumsDialog.cpp b/retroshare-gui/src/gui/ForumsDialog.cpp index a1d1493f8..8a5011a9a 100644 --- a/retroshare-gui/src/gui/ForumsDialog.cpp +++ b/retroshare-gui/src/gui/ForumsDialog.cpp @@ -393,7 +393,7 @@ void ForumsDialog::threadListCustomPopupMenu( QPoint point ) QAction *markMsgAsRead = new QAction(QIcon(":/images/message-mail-read.png"), tr("Mark as read"), &contextMnu); connect(markMsgAsRead , SIGNAL(triggered()), this, SLOT(markMsgAsRead())); - QAction *markMsgAsReadAll = new QAction(QIcon(":/images/message-mail-read.png"), tr("Mark as read") + " (" + tr ("with children)") + ")", &contextMnu); + QAction *markMsgAsReadAll = new QAction(QIcon(":/images/message-mail-read.png"), tr("Mark as read") + " (" + tr ("with children") + ")", &contextMnu); connect(markMsgAsReadAll, SIGNAL(triggered()), this, SLOT(markMsgAsReadAll())); QAction *markMsgAsUnread = new QAction(QIcon(":/images/message-mail.png"), tr("Mark as unread"), &contextMnu); @@ -563,7 +563,7 @@ void ForumsDialog::insertForums() { std::ostringstream out; out << it->pop; - item -> setToolTip(COLUMN_FORUM_TITLE, tr("Popularity: ") + QString::fromStdString(out.str())); + item -> setToolTip(COLUMN_FORUM_TITLE, tr("Popularity:") + " " + QString::fromStdString(out.str())); } // Date @@ -608,7 +608,7 @@ void ForumsDialog::insertForums() { std::ostringstream out; out << it->pop; - item -> setToolTip(COLUMN_FORUM_TITLE, tr("Popularity: ") + QString::fromStdString(out.str())); + item -> setToolTip(COLUMN_FORUM_TITLE, tr("Popularity:") + " " + QString::fromStdString(out.str())); } // Date @@ -690,7 +690,7 @@ void ForumsDialog::insertForums() { std::ostringstream out; out << it->pop; - item -> setToolTip(COLUMN_FORUM_TITLE, tr("Popularity: ") + QString::fromStdString(out.str())); + item -> setToolTip(COLUMN_FORUM_TITLE, tr("Popularity:") + " " + QString::fromStdString(out.str())); } // Date @@ -1756,8 +1756,8 @@ void ForumsDialog::replytomessage() { MessageComposer *nMsgDialog = new MessageComposer(); nMsgDialog->newMsg(); - nMsgDialog->insertTitleText( (QString("Re: ") + QString::fromStdWString(msgInfo.title)).toStdString()) ; - nMsgDialog->setWindowTitle(tr("Re: ") + QString::fromStdWString(msgInfo.title) ) ; + nMsgDialog->insertTitleText( (QString("Re:") + " " + QString::fromStdWString(msgInfo.title)).toStdString()) ; + nMsgDialog->setWindowTitle(tr("Re:") + " " + QString::fromStdWString(msgInfo.title) ) ; QTextDocument doc ; doc.setHtml(QString::fromStdWString(msgInfo.msg)) ; diff --git a/retroshare-gui/src/gui/ForumsDialog.ui b/retroshare-gui/src/gui/ForumsDialog.ui index b46651f01..e6f14483f 100644 --- a/retroshare-gui/src/gui/ForumsDialog.ui +++ b/retroshare-gui/src/gui/ForumsDialog.ui @@ -1,1264 +1,1256 @@ - - - ForumsDialog - - - - 0 - 0 - 732 - 420 - - - - - 0 - 2 - - - - - 60 - 0 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 128 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 192 - 192 - 192 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - 104 - 104 - 104 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 104 - 104 - 104 - - - - - - - 255 - 255 - 255 - - - - - - - 104 - 104 - 104 - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 128 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - Arial - 8 - 50 - false - false - false - false - - - - Qt::DefaultContextMenu - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - - 300 - 16777215 - - - - - 220 - 0 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - 0 - 0 - - - - QFrame#chheaderframe{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - - - 0 - - - - - - 24 - 24 - - - - - - - :/images/konversation.png - - - true - - - - - - - - Arial - 10 - - - - <!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:'MS Shell Dlg 2'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-weight:600;">Forums</span></p></body></html> - - - - - - - - - Qt::Horizontal - - - - 123 - 13 - - - - - - - - Add - - - QPushButton::menu-indicator { - subcontrol-origin: padding; - subcontrol-position: bottom right; - } - - QPushButton::menu-indicator:pressed, QPushButton::menu-indicator:open { - position: relative; - top: 2px; left: 2px; /* shift the arrow by 2 px */ - } - - QPushButton:hover { - border: 1px solid #CCCCCC; - } - - - - - - - :/images/edit_add24.png:/images/edit_add24.png - - - - 16 - 16 - - - - false - - - true - - - - - - - - 24 - 24 - - - - <!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:8pt; 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;">Start new Thread for Selected Forum</p></body></html> - - - - - - - :/images/mail_new.png:/images/mail_new.png - - - true - - - - - - - - - - true - - - - 0 - 0 - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 300 - 0 - - - - - 9 - - - - Qt::CustomContextMenu - - - true - - - - RetroShare Forums - - - - 9 - 75 - true - - - - - - - - - - Qt::Vertical - - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - 10 - 75 - true - - - - <!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:10pt; font-weight:600; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Forum:</p></body></html> - - - - - - - - 2 - 0 - - - - - 0 - 0 - - - - - 16777215 - 1677215 - - - - QLabel{border: 2px solid #CCCCCC; -border-radius: 10px; -background: white;} - - - - - - - - - - - Last Post - - - - - Threaded View - - - - - Flat View - - - - - - - - - - - 9 - - - - Qt::CustomContextMenu - - - true - - - - Title - - - - - - - - - :/images/message-state-header.png:/images/message-state-header.png - - - - - Date - - - - - Author - - - - - Signed - - - - - - - - - - - 0 - 0 - - - - <!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:8pt; 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:10pt; font-weight:600;">Thread:</span></p></body></html> - - - - - - - - 0 - 0 - - - - QLabel{border: 2px solid #CCCCCC; -border-radius: 10px; -background: white;} - - - - - - - - - - false - - - - 0 - 0 - - - - - 24 - 24 - - - - - 24 - 24 - - - - Previous - - - - - - - :/images/back.png:/images/back.png - - - - - - - false - - - - 0 - 0 - - - - - 24 - 24 - - - - - 24 - 24 - - - - Next - - - - - - - :/images/forward.png:/images/forward.png - - - - - - - - 24 - 24 - - - - - - - - :/images/edit_remove24.png:/images/edit_remove24.png - - - true - - - true - - - - - - - - - - 0 - 32 - - - - QFrame#frame_2{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, - stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - - - 2 - - - - - - - - :/images/find-16.png - - - - - - - <!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:'MS Shell Dlg 2'; font-size:8.25pt; 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:8pt;">Search forums</span></p></body></html> - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - - MS Shell Dlg 2 - - - - Reset - - - QPushButton -{ - border-image: url(:/images/closenormal.png) -} - -QPushButton:hover -{ -border-image: url(:/images/closehover.png) -} - -QPushButton:pressed { -border-image: url(:/images/closepressed.png) -} - - - - - - - - - - - - - 0 - 0 - - - - - MS Shell Dlg 2 - - - - 1 - - - - Date - - - - - Title - - - - - Author - - - - - Content - - - - - - - - - 24 - 24 - - - - <!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:8pt; 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;">Reply Message</p></body></html> - - - - - - - :/images/mail_reply.png:/images/mail_reply.png - - - true - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 40 - 20 - - - - - - - - - - - - - 0 - 10 - - - - - 9 - - - - false - - - - - - - - - Print - - - - - PrintPreview - - - - - - :/images/new_forum16.png:/images/new_forum16.png - - - Create Forum - - - - - - - - + + + ForumsDialog + + + + 0 + 0 + 732 + 420 + + + + + 0 + 2 + + + + + 60 + 0 + + + + + + + + + 0 + 0 + 0 + + + + + + + 208 + 208 + 208 + + + + + + + 255 + 255 + 255 + + + + + + + 247 + 247 + 247 + + + + + + + 104 + 104 + 104 + + + + + + + 139 + 139 + 139 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 240 + 240 + 240 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 128 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 255 + + + + + + + 255 + 0 + 255 + + + + + + + 231 + 231 + 231 + + + + + + + + + 0 + 0 + 0 + + + + + + + 208 + 208 + 208 + + + + + + + 255 + 255 + 255 + + + + + + + 247 + 247 + 247 + + + + + + + 104 + 104 + 104 + + + + + + + 139 + 139 + 139 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 240 + 240 + 240 + + + + + + + 0 + 0 + 0 + + + + + + + 192 + 192 + 192 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 255 + + + + + + + 255 + 0 + 255 + + + + + + + 231 + 231 + 231 + + + + + + + + + 104 + 104 + 104 + + + + + + + 208 + 208 + 208 + + + + + + + 255 + 255 + 255 + + + + + + + 247 + 247 + 247 + + + + + + + 104 + 104 + 104 + + + + + + + 139 + 139 + 139 + + + + + + + 104 + 104 + 104 + + + + + + + 255 + 255 + 255 + + + + + + + 104 + 104 + 104 + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 128 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 255 + + + + + + + 255 + 0 + 255 + + + + + + + 231 + 231 + 231 + + + + + + + + + Arial + 8 + 50 + false + false + false + false + + + + Qt::DefaultContextMenu + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + + 300 + 16777215 + + + + + 220 + 0 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + 0 + 0 + + + + QFrame#chheaderframe{ +background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, + stop:0 #FEFEFE, stop:1 #E8E8E8); + +border: 1px solid #CCCCCC;} + + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + + + 0 + + + + + + 24 + 24 + + + + + + + :/images/konversation.png + + + true + + + + + + + + Arial + 10 + + + + <!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:'MS Shell Dlg 2'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-weight:600;">Forums</span></p></body></html> + + + + + + + + + Qt::Horizontal + + + + 123 + 13 + + + + + + + + Add + + + QPushButton::menu-indicator { + subcontrol-origin: padding; + subcontrol-position: bottom right; + } + + QPushButton::menu-indicator:pressed, QPushButton::menu-indicator:open { + position: relative; + top: 2px; left: 2px; /* shift the arrow by 2 px */ + } + + QPushButton:hover { + border: 1px solid #CCCCCC; + } + + + + + + + :/images/edit_add24.png:/images/edit_add24.png + + + + 16 + 16 + + + + false + + + true + + + + + + + + 24 + 24 + + + + Start new Thread for Selected Forum + + + + + + + :/images/mail_new.png:/images/mail_new.png + + + true + + + + + + + + + + true + + + + 0 + 0 + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 300 + 0 + + + + + 9 + + + + Qt::CustomContextMenu + + + true + + + + RetroShare Forums + + + + 9 + 75 + true + + + + + + + + + + Qt::Vertical + + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + 10 + 75 + true + + + + <!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:10pt; font-weight:600; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Forum:</p></body></html> + + + + + + + + 2 + 0 + + + + + 0 + 0 + + + + + 16777215 + 1677215 + + + + QLabel{border: 2px solid #CCCCCC; +border-radius: 10px; +background: white;} + + + + + + + + + + + Last Post + + + + + Threaded View + + + + + Flat View + + + + + + + + + + + 9 + + + + Qt::CustomContextMenu + + + true + + + + Title + + + + + + + + + :/images/message-state-header.png:/images/message-state-header.png + + + + + Date + + + + + Author + + + + + Signed + + + + + + + + + + + 0 + 0 + + + + <!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:8pt; 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:10pt; font-weight:600;">Thread:</span></p></body></html> + + + + + + + + 0 + 0 + + + + QLabel{border: 2px solid #CCCCCC; +border-radius: 10px; +background: white;} + + + + + + + + + + false + + + + 0 + 0 + + + + + 24 + 24 + + + + + 24 + 24 + + + + Previous Thread + + + + + + + :/images/back.png:/images/back.png + + + + + + + false + + + + 0 + 0 + + + + + 24 + 24 + + + + + 24 + 24 + + + + Next Thread + + + + + + + :/images/forward.png:/images/forward.png + + + + + + + + 24 + 24 + + + + + + + + :/images/edit_remove24.png:/images/edit_remove24.png + + + true + + + true + + + + + + + + + + 0 + 32 + + + + QFrame#frame_2{ +background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, + stop:0 #FEFEFE, stop:1 #E8E8E8); + +border: 1px solid #CCCCCC;} + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + + + 2 + + + + + + + + :/images/find-16.png + + + + + + + <!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:'MS Shell Dlg 2'; font-size:8.25pt; 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:8pt;">Search forums</span></p></body></html> + + + + + + + + 16 + 16 + + + + + 16 + 16 + + + + + MS Shell Dlg 2 + + + + Reset + + + QPushButton +{ + border-image: url(:/images/closenormal.png) +} + +QPushButton:hover +{ +border-image: url(:/images/closehover.png) +} + +QPushButton:pressed { +border-image: url(:/images/closepressed.png) +} + + + + + + + + + + + + + 0 + 0 + + + + + MS Shell Dlg 2 + + + + 1 + + + + Date + + + + + Title + + + + + Author + + + + + Content + + + + + + + + + 24 + 24 + + + + Reply Message + + + + + + + :/images/mail_reply.png:/images/mail_reply.png + + + true + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 20 + + + + + + + + + + + + + 0 + 10 + + + + + 9 + + + + false + + + + + + + + + Print + + + + + PrintPreview + + + + + + :/images/new_forum16.png:/images/new_forum16.png + + + Create Forum + + + + + + + + diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 44de4d564..1d3bef6a1 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -37,6 +37,7 @@ #include "util/printpreview.h" #include "settings/rsharesettings.h" #include "util/misc.h" +#include "common/TagDefs.h" #include #include @@ -458,7 +459,7 @@ void MessagesDialog::fillTags() std::map >::iterator Tag; // create tag menu - QMenu *pMenu = new MessagesMenu (tr("Tag"), this); + QMenu *pMenu = new MessagesMenu (tr("Tags"), this); connect(pMenu, SIGNAL(triggered (QAction*)), this, SLOT(tagTriggered(QAction*))); connect(pMenu, SIGNAL(aboutToShow()), this, SLOT(tagAboutToShow())); @@ -479,11 +480,8 @@ void MessagesDialog::fillTags() pMenu->addSeparator(); for (Tag = Tags.types.begin(); Tag != Tags.types.end(); Tag++) { - if (Tag->first < RS_MSGTAGTYPE_USER) { - text = tr(Tag->second.first.c_str()); - } else { - text = QString::fromStdString(Tag->second.first); - } + text = TagDefs::name(Tag->first, Tag->second.first); + pAction = new QAction(text, pMenu); Values [ACTION_TAGSINDEX_TYPE] = ACTION_TAGS_TAG; Values [ACTION_TAGSINDEX_ID] = Tag->first; @@ -525,11 +523,8 @@ void MessagesDialog::fillTags() ui.tagWidget->clear(); for (Tag = Tags.types.begin(); Tag != Tags.types.end(); Tag++) { - if (Tag->first < RS_MSGTAGTYPE_USER) { - text = tr(Tag->second.first.c_str()); - } else { - text = QString::fromStdString(Tag->second.first); - } + text = TagDefs::name(Tag->first, Tag->second.first); + pItem = new QListWidgetItem (text, ui.tagWidget); pItem->setForeground(QBrush(QColor(Tag->second.second))); pItem->setIcon(QIcon(":/images/foldermail.png")); @@ -783,10 +778,10 @@ void MessagesDialog::replytomessage() } else { - nMsgDialog->insertTitleText( (QString("Re: ") + QString::fromStdWString(msgInfo.title)).toStdString()) ; + nMsgDialog->insertTitleText( (QString("Re:") + " " + QString::fromStdWString(msgInfo.title)).toStdString()) ; } - nMsgDialog->setWindowTitle( tr ("Compose: ") + tr("Re: ") + QString::fromStdWString(msgInfo.title) ) ; + nMsgDialog->setWindowTitle( tr ("Compose: ") + tr("Re:") + " " + QString::fromStdWString(msgInfo.title) ) ; QTextDocument doc ; @@ -831,9 +826,9 @@ void MessagesDialog::replyallmessage() } else { - nMsgDialog->insertTitleText( (QString("Re: ") + QString::fromStdWString(msgInfo.title)).toStdString()) ; + nMsgDialog->insertTitleText( (QString("Re:") + " " + QString::fromStdWString(msgInfo.title)).toStdString()) ; } - nMsgDialog->setWindowTitle( tr ("Compose: ") + tr("Re: ") + QString::fromStdWString(msgInfo.title) ) ; + nMsgDialog->setWindowTitle( tr ("Compose: ") + tr("Re:") + " " + QString::fromStdWString(msgInfo.title) ) ; QTextDocument doc ; @@ -886,10 +881,10 @@ void MessagesDialog::forwardmessage() } else { - nMsgDialog->insertTitleText( (QString("Fwd: ") + QString::fromStdWString(msgInfo.title)).toStdString()) ; + nMsgDialog->insertTitleText( (QString("Fwd:") + " " + QString::fromStdWString(msgInfo.title)).toStdString()) ; } - nMsgDialog->setWindowTitle( tr ("Compose: ") + tr("Fwd: ") + QString::fromStdWString(msgInfo.title) ) ; + nMsgDialog->setWindowTitle( tr ("Compose:") + " " + tr("Fwd:") + " " + QString::fromStdWString(msgInfo.title) ) ; QTextDocument doc ; @@ -1403,11 +1398,7 @@ void MessagesDialog::insertMessages() } Tag = Tags.types.find(*tagId); if (Tag != Tags.types.end()) { - if (Tag->first < RS_MSGTAGTYPE_USER) { - text += tr(Tag->second.first.c_str()); - } else { - text += QString::fromStdString(Tag->second.first); - } + text += TagDefs::name(Tag->first, Tag->second.first); } else { // clean tagId rsMsgs->setMessageTag(it->msgId, *tagId, false); diff --git a/retroshare-gui/src/gui/MessagesDialog.ui b/retroshare-gui/src/gui/MessagesDialog.ui index 297e161cb..57d82488e 100644 --- a/retroshare-gui/src/gui/MessagesDialog.ui +++ b/retroshare-gui/src/gui/MessagesDialog.ui @@ -1,1755 +1,1758 @@ - - - MessagesDialog - - - - 0 - 0 - 775 - 511 - - - - - 0 - 0 - - - - - 60 - 0 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 128 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - 0 - 0 - 0 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 255 - 255 - 255 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 192 - 192 - 192 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - 104 - 104 - 104 - - - - - - - 208 - 208 - 208 - - - - - - - 255 - 255 - 255 - - - - - - - 247 - 247 - 247 - - - - - - - 104 - 104 - 104 - - - - - - - 139 - 139 - 139 - - - - - - - 104 - 104 - 104 - - - - - - - 255 - 255 - 255 - - - - - - - 104 - 104 - 104 - - - - - - - 240 - 240 - 240 - - - - - - - 240 - 240 - 240 - - - - - - - 0 - 0 - 0 - - - - - - - 0 - 0 - 128 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 255 - - - - - - - 255 - 0 - 255 - - - - - - - 231 - 231 - 231 - - - - - - - - - Arial - 8 - 50 - false - false - false - false - - - - Qt::DefaultContextMenu - - - - 1 - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 36 - - - - - 0 - 68 - - - - QFrame#frame{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - 6 - - - - - - 0 - 0 - - - - - 167777 - 167777 - - - - <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:8pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">New Message</p></body></html> - - - - - - Compose - - - - :/images/folder-draft24.png:/images/folder-draft24.png - - - - 24 - 24 - - - - Qt::ToolButtonIconOnly - - - true - - - - - - - Qt::Vertical - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777 - 16777 - - - - <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:8pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">reply to selected message</p></body></html> - - - - - - Reply - - - - :/images/replymail-pressed.png:/images/replymail-pressed.png - - - - 24 - 24 - - - - Qt::ToolButtonIconOnly - - - true - - - - - - - - 0 - 0 - - - - - 16777 - 16777 - - - - Reply all - - - - :/images/replymailall24-hover.png:/images/replymailall24-hover.png - - - - 24 - 24 - - - - Qt::ToolButtonIconOnly - - - true - - - - - - - - 0 - 0 - - - - - 16777 - 16777 - - - - Foward - - - - :/images/mailforward24-hover.png:/images/mailforward24-hover.png - - - - 24 - 24 - - - - Qt::ToolButtonIconOnly - - - true - - - - - - - Qt::Vertical - - - - - - - - 0 - 0 - - - - - 16777 - 16777 - - - - <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:8pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">remove selected message</p></body></html> - - - - - - Delete - - - - :/images/deletemail24.png:/images/deletemail24.png - - - - 24 - 24 - - - - Qt::ToolButtonIconOnly - - - true - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777 - 16777 - - - - Print - - - - :/images/print24.png:/images/print24.png - - - - 24 - 24 - - - - QToolButton::MenuButtonPopup - - - Qt::ToolButtonIconOnly - - - true - - - - - - - - 0 - 0 - - - - Display - - - - :/images/looknfeel.png:/images/looknfeel.png - - - - 24 - 24 - - - - QToolButton::MenuButtonPopup - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 1 - - - - - - - - :/images/find-16.png - - - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - Reset - - - QPushButton -{ - border-image: url(:/images/closenormal.png) -} - -QPushButton:hover -{ -border-image: url(:/images/closehover.png) -} - -QPushButton:pressed { -border-image: url(:/images/closepressed.png) -} - - - - - - - - - - - - 0 - - - - Attachments - - - - - Subject - - - - - From - - - - - Date - - - - - Content - - - - - Tags - - - - - - - - Tag - - - - :/images/tag24.png:/images/tag24.png - - - - 24 - 24 - - - - QToolButton::MenuButtonPopup - - - true - - - - - - - - - - Qt::LeftToRight - - - QTabBar::tab { -} - - - - 0 - - - - Main Tab - - - - 0 - - - 0 - - - - - Qt::Horizontal - - - - - 140 - 16777215 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 6 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 140 - 16777215 - - - - - 0 - 0 - - - - - 9 - - - - - - - 1 - - - 0 - - - false - - - QListView::Fixed - - - 0 - - - - 100 - 18 - - - - 0 - - - false - - - false - - - - Inbox - - - - :/images/folder-inbox.png:/images/folder-inbox.png - - - - - Outbox - - - - :/images/folder-outbox.png:/images/folder-outbox.png - - - - - Draft - - - - :/images/folder-draft.png:/images/folder-draft.png - - - - - Sent - - - - :/images/folder-sent.png:/images/folder-sent.png - - - - - Trash - - - - :/images/folder-trash.png:/images/folder-trash.png - - - - - - - - - 140 - 16777215 - - - - - 0 - 0 - - - - - - - - - 0 - 22 - - - - - 140 - 16777215 - - - - QToolButton#Tags_Button{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); - -border: 1px solid #CCCCCC;} - - - Favorite Tags - - - - :/images/tag24.png:/images/tag24.png - - - true - - - true - - - Qt::ToolButtonTextBesideIcon - - - Qt::NoArrow - - - - - - - - 0 - 18 - - - - - 9 - - - - Total Inbox: - - - - - - - - 0 - 22 - - - - - 140 - 22 - - - - Qt::LeftToRight - - - QPushButton#Folders_Button{ -background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, -stop:0 #FEFEFE, stop:1 #E8E8E8); -border: 1px solid #CCCCCC; -text-align: left; -padding: 4px; -} - - - - - Folders - - - false - - - false - - - - - - - - Qt::Vertical - - - - Qt::Vertical - - - - - 9 - - - - Qt::CustomContextMenu - - - QAbstractItemView::ExtendedSelection - - - true - - - - - - - - - 0 - 0 - - - - true - - - - - - - - - 0 - - - 6 - - - - - - - - :/images/attachment.png - - - - - - - <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:8pt; font-weight:400; font-style:normal; text-decoration:none;"> -<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:10pt; font-weight:600;">Recommended Files</span></p></body></html> - - - - - - - - 10 - true - - - - - - - - - - - - - - - :/images/edit_remove24.png:/images/edit_remove24.png - - - true - - - true - - - - - - - - - Qt::Horizontal - - - - 351 - 20 - - - - - - - - <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:8pt; 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;">Download all Recommended Files</p></body></html> - - - - - - - :/images/down.png:/images/down.png - - - - - - - - - 6 - - - 6 - - - 0 - - - 6 - - - 0 - - - - - 6 - - - 3 - - - - - - 0 - 0 - - - - - 0 - 12 - - - - - 16777215 - 10 - - - - - 10 - 75 - true - - - - Subject: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - 9 - - - - - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - - 0 - 0 - - - - - 0 - 12 - - - - - 16777215 - 10 - - - - - 10 - 75 - true - - - - From: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 2 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - 9 - - - - - - - true - - - - - - - - 0 - 0 - - - - - 0 - 12 - - - - - 16777215 - 10 - - - - - 10 - 75 - true - - - - To: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 9 - - - - Qt::LeftToRight - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - - - - - - - - - - - - - - - - - - 9 - - - - Qt::CustomContextMenu - - - - - - true - - - - File Name - - - - - Size - - - - - Sources - - - - - Hash - - - - - - - - - - - - - - Print... - - - Print... - - - - - Print Preview - - - - - Buttons Icon Only - - - Buttons Icon Only - - - - - Buttons Text Beside Icon - - - Buttons with Text - - - - - Buttons Text Under Icon - - - Set Text Under Icon - - - - - Save As... - - - - - newmessageButton - replymessageButton - listWidget - msgText - msgList - - - - - - - expandFilesButton - clicked(bool) - msgList - setVisible(bool) - - - 184 - 348 - - - 399 - 397 - - - - - Tags_Button - toggled(bool) - tagWidget - setVisible(bool) - - - 78 - 287 - - - 78 - 399 - - - - - + + + MessagesDialog + + + + 0 + 0 + 775 + 511 + + + + + 0 + 0 + + + + + 60 + 0 + + + + + + + + + 0 + 0 + 0 + + + + + + + 208 + 208 + 208 + + + + + + + 255 + 255 + 255 + + + + + + + 247 + 247 + 247 + + + + + + + 104 + 104 + 104 + + + + + + + 139 + 139 + 139 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 240 + 240 + 240 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 128 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 255 + + + + + + + 255 + 0 + 255 + + + + + + + 231 + 231 + 231 + + + + + + + + + 0 + 0 + 0 + + + + + + + 208 + 208 + 208 + + + + + + + 255 + 255 + 255 + + + + + + + 247 + 247 + 247 + + + + + + + 104 + 104 + 104 + + + + + + + 139 + 139 + 139 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 240 + 240 + 240 + + + + + + + 0 + 0 + 0 + + + + + + + 192 + 192 + 192 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 255 + + + + + + + 255 + 0 + 255 + + + + + + + 231 + 231 + 231 + + + + + + + + + 104 + 104 + 104 + + + + + + + 208 + 208 + 208 + + + + + + + 255 + 255 + 255 + + + + + + + 247 + 247 + 247 + + + + + + + 104 + 104 + 104 + + + + + + + 139 + 139 + 139 + + + + + + + 104 + 104 + 104 + + + + + + + 255 + 255 + 255 + + + + + + + 104 + 104 + 104 + + + + + + + 240 + 240 + 240 + + + + + + + 240 + 240 + 240 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 128 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 255 + + + + + + + 255 + 0 + 255 + + + + + + + 231 + 231 + 231 + + + + + + + + + Arial + 8 + 50 + false + false + false + false + + + + Qt::DefaultContextMenu + + + + 1 + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 36 + + + + + 0 + 68 + + + + QFrame#frame{ +background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, +stop:0 #FEFEFE, stop:1 #E8E8E8); + +border: 1px solid #CCCCCC;} + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + 6 + + + + + + 0 + 0 + + + + + 167777 + 167777 + + + + New Message + + + + + + Compose + + + + :/images/folder-draft24.png:/images/folder-draft24.png + + + + 24 + 24 + + + + Qt::ToolButtonIconOnly + + + true + + + + + + + Qt::Vertical + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777 + 16777 + + + + Reply to selected message + + + + + + Reply + + + + :/images/replymail-pressed.png:/images/replymail-pressed.png + + + + 24 + 24 + + + + Qt::ToolButtonIconOnly + + + true + + + + + + + + 0 + 0 + + + + + 16777 + 16777 + + + + Reply all to selected message + + + Reply all + + + + :/images/replymailall24-hover.png:/images/replymailall24-hover.png + + + + 24 + 24 + + + + Qt::ToolButtonIconOnly + + + true + + + + + + + + 0 + 0 + + + + + 16777 + 16777 + + + + Forward selected message + + + Foward + + + + :/images/mailforward24-hover.png:/images/mailforward24-hover.png + + + + 24 + 24 + + + + Qt::ToolButtonIconOnly + + + true + + + + + + + Qt::Vertical + + + + + + + + 0 + 0 + + + + + 16777 + 16777 + + + + Remove selected message + + + + + + Delete + + + + :/images/deletemail24.png:/images/deletemail24.png + + + + 24 + 24 + + + + Qt::ToolButtonIconOnly + + + true + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777 + 16777 + + + + Print selected message + + + Print + + + + :/images/print24.png:/images/print24.png + + + + 24 + 24 + + + + QToolButton::MenuButtonPopup + + + Qt::ToolButtonIconOnly + + + true + + + + + + + + 0 + 0 + + + + Display + + + + :/images/looknfeel.png:/images/looknfeel.png + + + + 24 + 24 + + + + QToolButton::MenuButtonPopup + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + 1 + + + + + + + + :/images/find-16.png + + + + + + + + + + + 16 + 16 + + + + + 16 + 16 + + + + Reset + + + QPushButton +{ + border-image: url(:/images/closenormal.png) +} + +QPushButton:hover +{ +border-image: url(:/images/closehover.png) +} + +QPushButton:pressed { +border-image: url(:/images/closepressed.png) +} + + + + + + + + + + + + 0 + + + + Attachments + + + + + Subject + + + + + From + + + + + Date + + + + + Content + + + + + Tags + + + + + + + + Tags + + + Tag + + + + :/images/tag24.png:/images/tag24.png + + + + 24 + 24 + + + + QToolButton::MenuButtonPopup + + + true + + + + + + + + + + Qt::LeftToRight + + + QTabBar::tab { +} + + + + 0 + + + + Main Tab + + + + 0 + + + 0 + + + + + Qt::Horizontal + + + + + 140 + 16777215 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 6 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 140 + 16777215 + + + + + 0 + 0 + + + + + 9 + + + + + + + 1 + + + 0 + + + false + + + QListView::Fixed + + + 0 + + + + 100 + 18 + + + + 0 + + + false + + + false + + + + Inbox + + + + :/images/folder-inbox.png:/images/folder-inbox.png + + + + + Outbox + + + + :/images/folder-outbox.png:/images/folder-outbox.png + + + + + Draft + + + + :/images/folder-draft.png:/images/folder-draft.png + + + + + Sent + + + + :/images/folder-sent.png:/images/folder-sent.png + + + + + Trash + + + + :/images/folder-trash.png:/images/folder-trash.png + + + + + + + + + 140 + 16777215 + + + + + 0 + 0 + + + + + + + + + 0 + 22 + + + + + 140 + 16777215 + + + + QToolButton#Tags_Button{ +background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, +stop:0 #FEFEFE, stop:1 #E8E8E8); + +border: 1px solid #CCCCCC;} + + + Favorite Tags + + + + :/images/tag24.png:/images/tag24.png + + + true + + + true + + + Qt::ToolButtonTextBesideIcon + + + Qt::NoArrow + + + + + + + + 0 + 18 + + + + + 9 + + + + Total Inbox: + + + + + + + + 0 + 22 + + + + + 140 + 22 + + + + Qt::LeftToRight + + + QPushButton#Folders_Button{ +background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, +stop:0 #FEFEFE, stop:1 #E8E8E8); +border: 1px solid #CCCCCC; +text-align: left; +padding: 4px; +} + + + + + Folders + + + false + + + false + + + + + + + + Qt::Vertical + + + + Qt::Vertical + + + + + 9 + + + + Qt::CustomContextMenu + + + QAbstractItemView::ExtendedSelection + + + true + + + + + + + + + 0 + 0 + + + + true + + + + + + + + + 0 + + + 6 + + + + + + + + :/images/attachment.png + + + + + + + <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:8pt; font-weight:400; font-style:normal; text-decoration:none;"> +<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:10pt; font-weight:600;">Recommended Files</span></p></body></html> + + + + + + + + 10 + true + + + + + + + + + + + + + + + :/images/edit_remove24.png:/images/edit_remove24.png + + + true + + + true + + + + + + + + + Qt::Horizontal + + + + 351 + 20 + + + + + + + + <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:8pt; 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;">Download all Recommended Files</p></body></html> + + + + + + + :/images/down.png:/images/down.png + + + + + + + + + 6 + + + 6 + + + 0 + + + 6 + + + 0 + + + + + 6 + + + 3 + + + + + + 0 + 0 + + + + + 0 + 12 + + + + + 16777215 + 10 + + + + + 10 + 75 + true + + + + Subject: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + 9 + + + + + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + + 0 + 0 + + + + + 0 + 12 + + + + + 16777215 + 10 + + + + + 10 + 75 + true + + + + From: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 2 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + 9 + + + + + + + true + + + + + + + + 0 + 0 + + + + + 0 + 12 + + + + + 16777215 + 10 + + + + + 10 + 75 + true + + + + To: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 9 + + + + Qt::LeftToRight + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + + + + + + + + + + + + + + + + + + + 9 + + + + Qt::CustomContextMenu + + + + + + true + + + + File Name + + + + + Size + + + + + Sources + + + + + Hash + + + + + + + + + + + + + + Print... + + + Print... + + + + + Print Preview + + + + + Buttons Icon Only + + + Buttons Icon Only + + + + + Buttons Text Beside Icon + + + Buttons with Text + + + + + Buttons Text Under Icon + + + Set Text Under Icon + + + + + Save As... + + + + + newmessageButton + replymessageButton + listWidget + msgText + msgList + + + + + + + expandFilesButton + clicked(bool) + msgList + setVisible(bool) + + + 184 + 348 + + + 399 + 397 + + + + + Tags_Button + toggled(bool) + tagWidget + setVisible(bool) + + + 78 + 287 + + + 78 + 399 + + + + + diff --git a/retroshare-gui/src/gui/common/TagDefs.cpp b/retroshare-gui/src/gui/common/TagDefs.cpp new file mode 100644 index 000000000..f083fdb5b --- /dev/null +++ b/retroshare-gui/src/gui/common/TagDefs.cpp @@ -0,0 +1,49 @@ +/**************************************************************** + * This file is distributed under the following license: + * + * Copyright (c) 2010, RetroShare Team + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + ****************************************************************/ + +#include +#include + +#include "TagDefs.h" + +const QString TagDefs::name(const unsigned int tagId, const std::string &text) +{ + if (tagId >= RS_MSGTAGTYPE_USER) { + /* no need to be translated */ + return QString::fromStdString(text); + } + + switch (tagId) { + case RS_MSGTAGTYPE_IMPORTANT: + return qApp->translate("TagDefs", "Important"); + case RS_MSGTAGTYPE_WORK: + return qApp->translate("TagDefs", "Work"); + case RS_MSGTAGTYPE_PERSONAL: + return qApp->translate("TagDefs", "Personal"); + case RS_MSGTAGTYPE_TODO: + return qApp->translate("TagDefs", "Todo"); + case RS_MSGTAGTYPE_LATER: + return qApp->translate("TagDefs", "Later"); + } + + std::cerr << "TagDefs::name: Unknown tag id requested " << tagId; + return ""; +} diff --git a/retroshare-gui/src/gui/common/TagDefs.h b/retroshare-gui/src/gui/common/TagDefs.h new file mode 100644 index 000000000..f5639acff --- /dev/null +++ b/retroshare-gui/src/gui/common/TagDefs.h @@ -0,0 +1,33 @@ +/**************************************************************** + * This file is distributed under the following license: + * + * Copyright (c) 2010, RetroShare Team + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + ****************************************************************/ + + +#ifndef _TAGDEFS_H +#define _TAGDEFS_H + +class TagDefs +{ +public: + static const QString name(const unsigned int tagId, const std::string &text); +}; + +#endif + diff --git a/retroshare-gui/src/gui/settings/MessagePage.cpp b/retroshare-gui/src/gui/settings/MessagePage.cpp index bbaf7b398..1f6a5e7b1 100644 --- a/retroshare-gui/src/gui/settings/MessagePage.cpp +++ b/retroshare-gui/src/gui/settings/MessagePage.cpp @@ -19,11 +19,13 @@ * Boston, MA 02110-1301, USA. ****************************************************************/ -#include "MessagePage.h" #include "rshare.h" #include "rsharesettings.h" #include "retroshare/rsmsgs.h" +#include "MessagePage.h" +#include "gui/common/TagDefs.h" + #include #include "../MainWindow.h" @@ -104,12 +106,8 @@ void MessagePage::fillTags() std::map >::iterator Tag; for (Tag = m_pTags->types.begin(); Tag != m_pTags->types.end(); Tag++) { - QString text; - if (Tag->first < RS_MSGTAGTYPE_USER) { - text = tr(Tag->second.first.c_str()); - } else { - text = QString::fromStdString(Tag->second.first); - } + QString text = TagDefs::name(Tag->first, Tag->second.first); + QListWidgetItem *pItemWidget = new QListWidgetItem(text, ui.tags_listWidget); pItemWidget->setTextColor(QColor(Tag->second.second)); pItemWidget->setData(Qt::UserRole, Tag->first); @@ -123,12 +121,8 @@ void MessagePage::addTag() std::map >::iterator Tag; Tag = m_pTags->types.find(TagDlg.m_nId); if (Tag != m_pTags->types.end()) { - QString text; - if (Tag->first < RS_MSGTAGTYPE_USER) { - text = tr(Tag->second.first.c_str()); - } else { - text = QString::fromStdString(Tag->second.first); - } + QString text = TagDefs::name(Tag->first, Tag->second.first); + QListWidgetItem *pItemWidget = new QListWidgetItem(text, ui.tags_listWidget); pItemWidget->setTextColor(QColor(Tag->second.second)); pItemWidget->setData(Qt::UserRole, TagDlg.m_nId); diff --git a/retroshare-gui/src/gui/toaster/MessageToaster.ui b/retroshare-gui/src/gui/toaster/MessageToaster.ui index 93c1ba95f..5873ac5bc 100644 --- a/retroshare-gui/src/gui/toaster/MessageToaster.ui +++ b/retroshare-gui/src/gui/toaster/MessageToaster.ui @@ -129,7 +129,7 @@ border: none; Qt::ScrollBarAlwaysOff - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!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:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> @@ -228,10 +228,10 @@ p, li { white-space: pre-wrap; } Close - Close button + Close button - Close the information dialog + Close the information dialog @@ -269,9 +269,6 @@ p, li { white-space: pre-wrap; } - - - diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm index c1604ce44d12035bb5dda7959746865629b077eb..9636510f8d894497cecda3eec6a1599069f76f94 100644 GIT binary patch delta 14090 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%0AyTDE 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 delta 13492 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 diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts index c435cf529..6cd04ab30 100644 --- a/retroshare-gui/src/lang/retroshare_de.ts +++ b/retroshare-gui/src/lang/retroshare_de.ts @@ -3338,14 +3338,14 @@ p, li { white-space: pre-wrap; } Collapse all - Alle zusammenfassen + Alle reduzieren - Popularity: - Beliebtheit: + Popularity: + Beliebtheit: @@ -3378,8 +3378,8 @@ p, li { white-space: pre-wrap; } - Re: - Re: + Re: + @@ -3389,7 +3389,7 @@ p, li { white-space: pre-wrap; } Your Forums - Ihre Foren + Deine Foren @@ -3413,7 +3413,11 @@ p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-weight:600;">Forums</span></p></body></html> - + <!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:'MS Shell Dlg 2'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-weight:600;">Foren</span></p></body></html> @@ -3421,36 +3425,23 @@ p, li { white-space: pre-wrap; } Hinzufügen - - <!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:8pt; 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;">Start new Thread for Selected Forum</p></body></html> - - - - - <!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:8pt; 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;">Reply Message</p></body></html> - - - - + RetroShare Forums RetroShare Foren - + + Start new Thread for Selected Forum + Starte einen neuen Thread im ausgewählten Forum + + + <!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:10pt; font-weight:600; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Forum:</p></body></html> - + @@ -3497,20 +3488,30 @@ p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Arial'; font-size:8pt; 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:10pt; font-weight:600;">Thread:</span></p></body></html> - + - + + Previous Thread + Vorheriger Thread + + + + Next Thread + Nächster Thread + + + + Reply Message + Auf Nachricht antworten + + + Create Forum Erstelle Forum - - Next - Nächst. - - - + Print Drucken @@ -3526,12 +3527,7 @@ p, li { white-space: pre-wrap; } Erstelle neues Thema - - Previous - Vorig. - - - + <!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; } @@ -3557,23 +3553,19 @@ p, li { white-space: pre-wrap; } Mark as read - Markiere als gelesen - - - - with children) - + Als gelesen markieren Mark as unread - Markiere als ungelesen + Als ungelesen markieren - + + with children - + mit Kindern @@ -5341,7 +5333,7 @@ Wollen Sie sie speichern? No Title - + Kein Titel @@ -5392,7 +5384,7 @@ Wollen Sie sie speichern? Standard - + Edit Tag Schlagwort bearbeiten @@ -5425,39 +5417,21 @@ Wollen Sie sie speichern? Schliessen - - Close button - Schließen Knopf - - - - Close the information dialog - Schließe den Informationsdialog - - - + Subject - Betreff - - - - <!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:'MS Shell Dlg 2'; font-size:8.25pt; 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:8pt;">Message</span></p></body></html> - + Betreff MessagesDialog - + + New Message Neue Nachricht - + Reply to Message Antworten nur an Absender @@ -5467,20 +5441,20 @@ p, li { white-space: pre-wrap; } Nachricht entfernen - - + + Date Datum - + From Von - + Size Grösse @@ -5493,30 +5467,22 @@ p, li { white-space: pre-wrap; } <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:8pt; font-weight:400; font-style:normal; text-decoration:none;"><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:10pt; font-weight:600;">Empfohlene Dateien</span></p></body></html> - + Reply Antworten - + Reply all Allen antworten - + Foward Weiterleiten - - <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:8pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">remove selected message</p></body></html> - <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:8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Ausgewählte Nachricht entfernen</p></body></html> - - - + Delete Löschen @@ -5526,7 +5492,32 @@ p, li { white-space: pre-wrap; } Verfassen - + + Reply to selected message + Auf gewählte Nachricht antworten + + + + Reply all to selected message + Auf gewählte Nachricht an alle Empfänger antworten + + + + Forward selected message + Gewählte Nachricht weiterleiten + + + + Remove selected message + Gewählte Nachricht entfernen + + + + Print selected message + Gewählte Nachricht drucken + + + Display Anzeige @@ -5541,17 +5532,17 @@ p, li { white-space: pre-wrap; } Anhänge - + - + Inbox Posteingang - - + + Outbox Postausgang @@ -5563,7 +5554,7 @@ p, li { white-space: pre-wrap; } - + Sent Gesendet @@ -5576,7 +5567,7 @@ p, li { white-space: pre-wrap; } Print Preview - Druck Vorschau + Druckvorschau @@ -5610,34 +5601,18 @@ p, li { white-space: pre-wrap; } Speichern als... - - <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:8pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">reply to selected message</p></body></html> - <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:8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Auf die ausgewählte Email antworten</p></body></html> - - - - <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:8pt; font-weight:400; font-style:normal; text-decoration:none;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">New Message</p></body></html> - <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:8pt; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Eine Neue Nachricht schreiben</p></body></html> - - - + Print Document Dokument drucken - - + + Subject Betreff - + Subject: Betreff: @@ -5667,7 +5642,7 @@ p, li { white-space: pre-wrap; } Prüfsumme - + Print Drucken @@ -5677,7 +5652,7 @@ p, li { white-space: pre-wrap; } Gewählte Nachricht weiterleiten - + Remove Messages Löschen @@ -5694,23 +5669,17 @@ p, li { white-space: pre-wrap; } - Re: - - - - - - Compose: Verfassen: - - Fwd: + + + Re: - + Hide Empfohlene Dateien ausblenden @@ -5721,7 +5690,7 @@ p, li { white-space: pre-wrap; } - + Anonymous @@ -5738,13 +5707,13 @@ p, li { white-space: pre-wrap; } HTML-Dateien (*.htm *.html);;Alle Dateien (*) - - + + Reply to All Allen antworten - + <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:8pt; font-weight:400; font-style:normal;"> @@ -5754,35 +5723,31 @@ p, li { white-space: pre-wrap; } Total Inbox: - + Posteingang gesamt: - - + + Content Inhalt + + Tags Schlagwörter - - + Tag Schlagwort - - Main Tab - - - - - - + + + Trash Papierkorb @@ -5798,24 +5763,24 @@ p, li { white-space: pre-wrap; } Ordner - + Remove All Tags Alle Schlagwörter entfernen - + New tag ... Neues Schlagwort... - + Mark as read - Markiere als gelesen + Als gelesen markieren Mark as unread - Markiere als ungelesen + Als ungelesen markieren @@ -5823,14 +5788,24 @@ p, li { white-space: pre-wrap; } Wiederherstellen - - + + Compose: + Verfassen: + + + + Fwd: + + + + + Drafts Entwürfe - + To An @@ -5840,7 +5815,7 @@ p, li { white-space: pre-wrap; } Editieren... - + @@ -10192,6 +10167,34 @@ p, li { white-space: pre-wrap; } Pause + + TagDefs + + + Important + Wichtig + + + + Work + Dienstlich + + + + Personal + Persönlich + + + + Todo + Zu erledigen + + + + Later + Später + + TextPage