Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 07:29:33 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

moved SMPlayer,Messenger, About/Help to the left SideBar

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@446 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2008-03-31 13:00:00 +00:00
parent f92d88d18d
commit dbae307810
6 changed files with 48 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-gui/src/gui/HelpDialog.cpp
View File

@ -41,7 +41,7 @@
/** Constructor */
HelpDialog::HelpDialog(QWidget *parent)
: MainPage(parent)
:QDialog(parent)
{
/* Invoke the Qt Designer generated object setup routine */
ui.setupUi(this);
@ -62,6 +62,8 @@ HelpDialog::HelpDialog(QWidget *parent)
QTextStream in(&thanksFile);
ui.thanks->setText(in.readAll());
}
ui.label_4->setMinimumWidth(20);
/* Hide platform specific features */

4
retroshare-gui/src/gui/HelpDialog.h
View File

@ -25,12 +25,12 @@
#include <QFileDialog>
#include "mainpage.h"
//#include "mainpage.h"
#include "ui_HelpDialog.h"
#include "rsiface/rstypes.h"
class HelpDialog : public MainPage
class HelpDialog : public QDialog
{
Q_OBJECT

2
retroshare-gui/src/gui/HelpDialog.ui
View File

@ -1,6 +1,6 @@
<ui version="4.0" >
<class>HelpDialog</class>
<widget class="QWidget" name="HelpDialog" >
<widget class="QDialog" name="HelpDialog" >
<property name="geometry" >
<rect>
<x>0</x>

25
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -118,11 +118,14 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
applicationWindow = new ApplicationWindow();
applicationWindow->hide();
/** General ToolBox**/
/** Left Side ToolBar**/
connect(ui.actionAdd_Friend, SIGNAL(triggered() ), this , SLOT( addFriend() ) );
connect(ui.actionInvite_Friend, SIGNAL(triggered() ), this , SLOT( inviteFriend() ) );
connect(ui.actionAdd_Share, SIGNAL(triggered() ), this , SLOT( addSharedDirectory() ) );
connect(ui.actionOptions, SIGNAL(triggered()), this, SLOT( showPreferencesWindow()) );
connect(ui.actionMessenger, SIGNAL(triggered()), this, SLOT( showMessengerWindow()) );
connect(ui.actionSMPlayer, SIGNAL(triggered()), this, SLOT( showsmplayer()) );
connect(ui.actionAbout, SIGNAL(triggered()), this, SLOT( showabout()) );
connect(ui.actionColor, SIGNAL(triggered()), this, SLOT( setStyle()) );
@ -133,7 +136,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
/** adjusted quit behaviour: trigger a warning that can be switched off in the saved
config file RetroShare.conf */
//ui.actionQuit->setToolTip(tr("Quit"));
connect(ui.actionQuit, SIGNAL(triggered()), this, SLOT(doQuit()));
/* load the StyleSheet*/
@ -176,8 +178,8 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
// createPageAction(QIcon(IMAGE_CHANNELS), tr("Channels"), grp));
#endif
ui.stackPages->add(new HelpDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_ABOUT), tr("About/Help"), grp));
//ui.stackPages->add(new HelpDialog(ui.stackPages),
// createPageAction(QIcon(IMAGE_ABOUT), tr("About/Help"), grp));
//ui.stackPages->add(groupsDialog = new GroupsDialog(ui.stackPages),
// createPageAction(QIcon(), tr("Groups"), grp));
@ -193,14 +195,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
ui.toolBar->addActions(grp->actions());
ui.toolBar->addSeparator();
connect(grp, SIGNAL(triggered(QAction *)), ui.stackPages, SLOT(showPage(QAction *)));
/* Create and bind the messenger button */
addAction(new QAction(QIcon(IMAGE_RSM32), tr("Messenger"), ui.toolBar), SLOT(showMessengerWindow()));
//addAction(new QAction(QIcon(IMAGE_SMPLAYER), tr("SMPlayer"), ui.toolBar), SLOT(showsmplayer()));
@ -659,6 +654,12 @@ void MainWindow::showsmplayer()
}
void MainWindow::showabout()
{
static HelpDialog *helpdlg = new HelpDialog(this);
helpdlg->show();
}
void MainWindow::setStyle()
{
QString standardSheet = "{background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,stop:0 <color1>, stop:1 <color2>);}";

2
retroshare-gui/src/gui/MainWindow.h
View File

@ -124,6 +124,8 @@ private slots:
void showMessengerWindow();
void showApplWindow();
void showsmplayer();
void showabout();
void showSettings();
void setStyle();

27
retroshare-gui/src/gui/MainWindow.ui
View File

@ -1080,8 +1080,11 @@
<addaction name="actionAdd_Friend" />
<addaction name="actionInvite_Friend" />
<addaction name="actionAdd_Share" />
<addaction name="actionMessenger" />
<addaction name="actionSMPlayer" />
<addaction name="actionOptions" />
<addaction name="actionColor" />
<addaction name="actionAbout" />
<addaction name="separator" />
<addaction name="actionQuit" />
</widget>
@ -1133,6 +1136,30 @@
<string>Color</string>
</property>
</action>
<action name="actionSMPlayer" >
<property name="icon" >
<iconset resource="images.qrc" >:/images/smplayer_icon32.png</iconset>
</property>
<property name="text" >
<string>SMPlayer</string>
</property>
</action>
<action name="actionMessenger" >
<property name="icon" >
<iconset resource="images.qrc" >:/images/kdmconfig.png</iconset>
</property>
<property name="text" >
<string>Messenger</string>
</property>
</action>
<action name="actionAbout" >
<property name="icon" >
<iconset resource="images.qrc" >:/images/informations_24x24.png</iconset>
</property>
<property name="text" >
<string>About</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>