From 83778b39ad79c2a3a65ffdbbc4dbed5bcd64fb96 Mon Sep 17 00:00:00 2001 From: defnax Date: Sat, 28 Nov 2009 14:34:15 +0000 Subject: [PATCH] restored MessagesDialog git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1851 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/MessagesDialog.cpp | 5 +- retroshare-gui/src/gui/MessagesDialog.ui | 1455 ++++++++++----------- 2 files changed, 721 insertions(+), 739 deletions(-) diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 4a8310d42..aa90af976 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -19,23 +19,23 @@ * Boston, MA 02110-1301, USA. ****************************************************************/ + #include "MessagesDialog.h" #include "msgs/ChanMsgDialog.h" #include "gui/toaster/MessageToaster.h" #include "util/printpreview.h" #include "util/misc.h" -#include "gui/calendar/src/views/mainview.h" #include "rsiface/rsiface.h" #include "rsiface/rspeers.h" #include "rsiface/rsmsgs.h" #include "rsiface/rsfiles.h" - #include #include #include #include + #include #include #include @@ -82,7 +82,6 @@ MessagesDialog::MessagesDialog(QWidget *parent) connect(ui.expandFilesButton, SIGNAL(clicked()), this, SLOT(togglefileview())); connect(ui.downloadButton, SIGNAL(clicked()), this, SLOT(getcurrentrecommended())); - ui.messagestabWidget->addTab(new MainView(),QString(tr("Calendar"))); mCurrCertId = ""; mCurrMsgId = ""; diff --git a/retroshare-gui/src/gui/MessagesDialog.ui b/retroshare-gui/src/gui/MessagesDialog.ui index 99e958d92..845bc6588 100644 --- a/retroshare-gui/src/gui/MessagesDialog.ui +++ b/retroshare-gui/src/gui/MessagesDialog.ui @@ -6,8 +6,8 @@ 0 0 - 801 - 560 + 760 + 579 @@ -505,27 +505,14 @@ Qt::DefaultContextMenu - + + + 0 + - - - QTabWidget::South - - - 0 - - - - Messages - - - - 0 - - - - - #frame { + + + #frame { border: none; background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #a6a6a6, stop: 0.08 #7f7f7f, @@ -553,751 +540,747 @@ background: qradialgradient(cx: 0.4, cy: -0.1, fx: 0.4, fy: -0.1, radius: 1.35, stop: 0 #fff, stop: 1 #ddd); } - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 2 - - - - - - 44 - 28 - - - - - 28 - 28 - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 2 + + + + + + 44 + 28 + + + + + 28 + 28 + + + + <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> - - - - - - - - - - 24 - 24 - - - - false - - - - - - - - 44 - 28 - - - - - 28 - 28 - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + + + + + + + + 24 + 24 + + + + false + + + + + + + + 44 + 28 + + + + + 28 + 28 + + + + <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> - - - - - - - - - - 24 - 24 - - - - - - - - - 44 - 28 - - - - - 28 - 28 - - - - - - - - 24 - 24 - - - - - - - - - 44 - 28 - - - - - 28 - 28 - - - - - - - - 24 - 24 - - - - - - - - - 44 - 28 - - - - - 28 - 28 - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + + + + + + + + 24 + 24 + + + + + + + + + 44 + 28 + + + + + 28 + 28 + + + + + + + + 24 + 24 + + + + + + + + + 44 + 28 + + + + + 28 + 28 + + + + + + + + 24 + 24 + + + + + + + + + 44 + 28 + + + + + 28 + 28 + + + + <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> - - - - - - - - - - 24 - 24 - - - + + + + + + + + + + 24 + 24 + + + + + + + + + 0 + 0 + + + + + 44 + 28 + + + + + 28 + 28 + + + + + + + + 24 + 24 + + + + + + + + Qt::Horizontal + + + + 529 + 20 + + + + + + + + + + + Qt::Horizontal + + + + + 120 + 16777215 + + + + + 9 + + + + 1 + + + 0 + + + QListView::Fixed + + + 0 + + + + 100 + 16 + + + + 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 + + + + + + Qt::Vertical + + + + + 0 + 5 + + + + + 9 + + + + Qt::CustomContextMenu + + + 16 + + + true + + + 4 + + + + + + + + :/images/attachment.png:/images/attachment.png + + + + + From + + + + + Subject + + + + + Date + + + + + + + + + 6 + + + 0 + + + 0 + + + 0 + + + + + + + Qt::Vertical + + + QSizePolicy::Preferred + + + + 20 + 40 + + + + + - - - - - 0 - 0 - + + + + 0 - - - 44 - 28 - + + 3 - - - 28 - 28 - - - - - - - - 24 - 24 - - - + + + + + 0 + 0 + + + + + 60 + 12 + + + + + 16777215 + 10 + + + + + 10 + 75 + true + + + + Subject: + + + + + + + + 2 + 0 + + + + + 0 + 12 + + + + + 16777215 + 10 + + + + + + + + + + + + 0 + 0 + + + + + 60 + 12 + + + + + 16777215 + 10 + + + + + 10 + 75 + true + + + + From: + + + + + + + + 2 + 0 + + + + + 0 + 12 + + + + + 16777215 + 10 + + + + + + + + + + + + 0 + 0 + + + + + 60 + 12 + + + + + 16777215 + 10 + + + + + 10 + 75 + true + + + + Date: + + + + + + + + 2 + 0 + + + + + 0 + 12 + + + + + 16777215 + 10 + + + + + + + + + + + + 0 + 0 + + + + + 60 + 12 + + + + + 16777215 + 10 + + + + + 10 + 75 + true + + + + To: + + + + + + + + 16777215 + 22 + + + + + - + + + + + + + 0 + 10 + + + + + + + + + + 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 + + + + + + Qt::Horizontal - 529 + 351 20 - - - - - - - Qt::Horizontal - - - - - 120 - 16777215 - - - - - 9 - - - - 1 - - - 0 - - - QListView::Fixed - - - 0 - - - - 100 - 16 - - - - 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 - - - - - - Qt::Vertical - - - - - 0 - 5 - - - - - 9 - - - - Qt::CustomContextMenu - - - 16 - - - true - - - 4 - - + + + <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/attachment.png:/images/attachment.png + :/images/down.png:/images/down.png - - - - From - - - - - Subject - - - - - Date - - - - - - - - - 6 - - - 0 - - - 0 - - - 0 - - - - - - - Qt::Vertical - - - QSizePolicy::Preferred - - - - 20 - 40 - - - - - - - - - - 0 - - - 3 - - - - - - 0 - 0 - - - - - 60 - 12 - - - - - 16777215 - 10 - - - - - 10 - 75 - true - - - - Subject: - - - - - - - - 2 - 0 - - - - - 0 - 12 - - - - - 16777215 - 10 - - - - - - - - - - - - 0 - 0 - - - - - 60 - 12 - - - - - 16777215 - 10 - - - - - 10 - 75 - true - - - - From: - - - - - - - - 2 - 0 - - - - - 0 - 12 - - - - - 16777215 - 10 - - - - - - - - - - - - 0 - 0 - - - - - 60 - 12 - - - - - 16777215 - 10 - - - - - 10 - 75 - true - - - - Date: - - - - - - - - 2 - 0 - - - - - 0 - 12 - - - - - 16777215 - 10 - - - - - - - - - - - - 0 - 0 - - - - - 60 - 12 - - - - - 16777215 - 10 - - - - - 10 - 75 - true - - - - To: - - - - - - - - 16777215 - 22 - - - - - - - - - - - - - 0 - 10 - - - - - - - - - - 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 - - - - - - - - - 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 - - - - - - - - - - - 9 - - - - Qt::CustomContextMenu - - - true - - - - File Name - - - - - Size - - - - - Sources - - - - - Hash - - - - - - - + + + + + + + + + + 9 + + + + Qt::CustomContextMenu + + + true + + + + File Name + + + + + Size + + + + + Sources + + + + + Hash + + +