From 6f869022da5b4f329c7822d944fa9f182df4e303 Mon Sep 17 00:00:00 2001 From: defnax Date: Wed, 11 Feb 2009 22:50:12 +0000 Subject: [PATCH] * Moved Plugins to MainWindow * Fixed icon size for Reply to all Button to 24x24 git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1034 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/MainWindow.cpp | 5 +++-- retroshare-gui/src/gui/MainWindow.h | 4 ++-- retroshare-gui/src/gui/MessagesDialog.ui | 6 ++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index ebc5ad54c..6c12694dd 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -167,8 +167,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) /* Create the Main pages and actions */ QActionGroup *grp = new QActionGroup(this); - //ui.stackPages->add(pluginsPage = new PluginsPage(ui.stackPages), - // createPageAction(QIcon(IMAGE_PLUGINS), tr("Plugins"), grp)); NewsFeed *newsFeed = NULL; ui.stackPages->add(newsFeed = new NewsFeed(ui.stackPages), @@ -238,6 +236,9 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) ui.stackPages->add(networkDialog = new NetworkDialog(ui.stackPages), createPageAction(QIcon(IMAGE_NETWORK), tr("Network"), grp)); + ui.stackPages->add(pluginsPage = new PluginsPage(ui.stackPages), + createPageAction(QIcon(IMAGE_PLUGINS), tr("Plugins"), grp)); + //ui.stackPages->add(groupsDialog = new GroupsDialog(ui.stackPages), // createPageAction(QIcon(), tr("Groups"), grp)); diff --git a/retroshare-gui/src/gui/MainWindow.h b/retroshare-gui/src/gui/MainWindow.h index 9c24ba520..4fdc2901e 100644 --- a/retroshare-gui/src/gui/MainWindow.h +++ b/retroshare-gui/src/gui/MainWindow.h @@ -38,7 +38,7 @@ #include "StatisticDialog.h" #include "MessengerWindow.h" #include "ApplicationWindow.h" -//#include "PluginsPage.h" +#include "PluginsPage.h" #include "Preferences/PreferencesWindow.h" #include "Settings/gsettingswin.h" @@ -104,7 +104,7 @@ public: //StatisticDialog *statisticDialog; MessengerWindow *messengerWindow; ApplicationWindow *applicationWindow; - //PluginsPage* pluginsPage ; + PluginsPage* pluginsPage ; SMPlayer * mSMPlayer; diff --git a/retroshare-gui/src/gui/MessagesDialog.ui b/retroshare-gui/src/gui/MessagesDialog.ui index b0ce02a14..0678935c2 100644 --- a/retroshare-gui/src/gui/MessagesDialog.ui +++ b/retroshare-gui/src/gui/MessagesDialog.ui @@ -1147,6 +1147,12 @@ p, li { white-space: pre-wrap; } + + + 24 + 24 + +