Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-19 11:54:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Moved Plugins to MainWindow

Browse source 
* 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:
defnax 2009-02-11 22:50:12 +00:00
parent 6c00b15f03
commit 6f869022da
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -167,8 +167,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
/* Create the Main pages and actions */ /* Create the Main pages and actions */
QActionGroup *grp = new QActionGroup(this); QActionGroup *grp = new QActionGroup(this);
//ui.stackPages->add(pluginsPage = new PluginsPage(ui.stackPages),
// createPageAction(QIcon(IMAGE_PLUGINS), tr("Plugins"), grp));
NewsFeed *newsFeed = NULL; NewsFeed *newsFeed = NULL;
ui.stackPages->add(newsFeed = new NewsFeed(ui.stackPages), 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), ui.stackPages->add(networkDialog = new NetworkDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_NETWORK), tr("Network"), grp)); 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), //ui.stackPages->add(groupsDialog = new GroupsDialog(ui.stackPages),
// createPageAction(QIcon(), tr("Groups"), grp)); // createPageAction(QIcon(), tr("Groups"), grp));

4
retroshare-gui/src/gui/MainWindow.h
View file

@ -38,7 +38,7 @@
#include "StatisticDialog.h" #include "StatisticDialog.h"
#include "MessengerWindow.h" #include "MessengerWindow.h"
#include "ApplicationWindow.h" #include "ApplicationWindow.h"
//#include "PluginsPage.h" #include "PluginsPage.h"
#include "Preferences/PreferencesWindow.h" #include "Preferences/PreferencesWindow.h"
#include "Settings/gsettingswin.h" #include "Settings/gsettingswin.h"
@ -104,7 +104,7 @@ public:
//StatisticDialog *statisticDialog; //StatisticDialog *statisticDialog;
MessengerWindow *messengerWindow; MessengerWindow *messengerWindow;
ApplicationWindow *applicationWindow; ApplicationWindow *applicationWindow;
//PluginsPage* pluginsPage ; PluginsPage* pluginsPage ;
SMPlayer * mSMPlayer; SMPlayer * mSMPlayer;

6
retroshare-gui/src/gui/MessagesDialog.ui
View file

@ -1147,6 +1147,12 @@ p, li { white-space: pre-wrap; }
<property name="text" > <property name="text" >
<string/> <string/>
</property> </property>
<property name="iconSize" >
<size>
<width>24</width>
<height>24</height>
</size>
</property>
</widget> </widget>
</item> </item>
<item row="1" column="4" > <item row="1" column="4" >