restored MessagesDialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1851 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2009-11-28 14:34:15 +00:00
parent 87344de7d4
commit 83778b39ad
2 changed files with 721 additions and 739 deletions

View File

@ -19,23 +19,23 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
****************************************************************/ ****************************************************************/
#include "MessagesDialog.h" #include "MessagesDialog.h"
#include "msgs/ChanMsgDialog.h" #include "msgs/ChanMsgDialog.h"
#include "gui/toaster/MessageToaster.h" #include "gui/toaster/MessageToaster.h"
#include "util/printpreview.h" #include "util/printpreview.h"
#include "util/misc.h" #include "util/misc.h"
#include "gui/calendar/src/views/mainview.h"
#include "rsiface/rsiface.h" #include "rsiface/rsiface.h"
#include "rsiface/rspeers.h" #include "rsiface/rspeers.h"
#include "rsiface/rsmsgs.h" #include "rsiface/rsmsgs.h"
#include "rsiface/rsfiles.h" #include "rsiface/rsfiles.h"
#include <sstream> #include <sstream>
#include <list> #include <list>
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <QContextMenuEvent> #include <QContextMenuEvent>
#include <QMenu> #include <QMenu>
#include <QCursor> #include <QCursor>
@ -82,7 +82,6 @@ MessagesDialog::MessagesDialog(QWidget *parent)
connect(ui.expandFilesButton, SIGNAL(clicked()), this, SLOT(togglefileview())); connect(ui.expandFilesButton, SIGNAL(clicked()), this, SLOT(togglefileview()));
connect(ui.downloadButton, SIGNAL(clicked()), this, SLOT(getcurrentrecommended())); connect(ui.downloadButton, SIGNAL(clicked()), this, SLOT(getcurrentrecommended()));
ui.messagestabWidget->addTab(new MainView(),QString(tr("Calendar")));
mCurrCertId = ""; mCurrCertId = "";
mCurrMsgId = ""; mCurrMsgId = "";

View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>801</width> <width>760</width>
<height>560</height> <height>579</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -505,21 +505,8 @@
<property name="contextMenuPolicy"> <property name="contextMenuPolicy">
<enum>Qt::DefaultContextMenu</enum> <enum>Qt::DefaultContextMenu</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QTabWidget" name="messagestabWidget">
<property name="tabPosition">
<enum>QTabWidget::South</enum>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Messages</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="margin"> <property name="verticalSpacing">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
@ -1298,10 +1285,6 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</item> </item>
</layout> </layout>
</widget>
</widget>
</item>
</layout>
<action name="actionPrint"> <action name="actionPrint">
<property name="text"> <property name="text">
<string>Print</string> <string>Print</string>