mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-12 11:02:30 -04:00
moved SMPlayer,Messenger, About/Help to the left SideBar
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@446 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
f92d88d18d
commit
dbae307810
6 changed files with 48 additions and 16 deletions
|
@ -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>);}";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue