mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-01-18 19:31:37 -05:00
* 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
This commit is contained in:
parent
6c00b15f03
commit
6f869022da
@ -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));
|
||||
|
@ -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;
|
||||
|
||||
|
@ -1147,6 +1147,12 @@ p, li { white-space: pre-wrap; }
|
||||
<property name="text" >
|
||||
<string/>
|
||||
</property>
|
||||
<property name="iconSize" >
|
||||
<size>
|
||||
<width>24</width>
|
||||
<height>24</height>
|
||||
</size>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="4" >
|
||||
|
Loading…
Reference in New Issue
Block a user