Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-10 23:30:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #10 from felisucoibi/0.6-buttons

Browse source 
0.6 buttons
This commit is contained in:
felisucoibi 2017-01-17 16:38:18 +01:00 • committed by GitHub
commit afd5e55c03
5 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/FileTransfer/TransfersDialog.h
View file

@ -60,7 +60,7 @@ public:
~TransfersDialog(); ~TransfersDialog();
virtual QIcon iconPixmap() const { return QIcon(IMAGE_TRANSFERS) ; } //MainPage virtual QIcon iconPixmap() const { return QIcon(IMAGE_TRANSFERS) ; } //MainPage
virtual QString pageName() const { return tr("File sharing") ; } //MainPage virtual QString pageName() const { return tr("Files") ; } //MainPage
virtual QString helpText() const { return ""; } //MainPage virtual QString helpText() const { return ""; } //MainPage
virtual UserNotify *getUserNotify(QObject *parent); virtual UserNotify *getUserNotify(QObject *parent);

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

@ -344,14 +344,6 @@ void MainWindow::initStackedPage()
addPage(homePage = new HomePage(ui->stackPages), grp, NULL); addPage(homePage = new HomePage(ui->stackPages), grp, NULL);
addPage(newsFeed = new NewsFeed(ui->stackPages), grp, &notify);
addPage(friendsDialog = new FriendsDialog(ui->stackPages), grp, &notify);
#ifdef RS_USE_NEW_PEOPLE_DIALOG
PeopleDialog *peopleDialog = NULL;
addPage(peopleDialog = new PeopleDialog(ui->stackPages), grp, &notify);
#endif
addPage(idDialog = new IdDialog(ui->stackPages), grp, &notify); addPage(idDialog = new IdDialog(ui->stackPages), grp, &notify);
//#ifdef RS_USE_CIRCLES //#ifdef RS_USE_CIRCLES
@ -359,13 +351,18 @@ void MainWindow::initStackedPage()
// addPage(circlesDialog = new CirclesDialog(ui->stackPages), grp, &notify); // addPage(circlesDialog = new CirclesDialog(ui->stackPages), grp, &notify);
//#endif //#endif
addPage(transfersDialog = new TransfersDialog(ui->stackPages), grp, &notify);
addPage(chatLobbyDialog = new ChatLobbyWidget(ui->stackPages), grp, &notify); addPage(chatLobbyDialog = new ChatLobbyWidget(ui->stackPages), grp, &notify);
addPage(messagesDialog = new MessagesDialog(ui->stackPages), grp, &notify); addPage(transfersDialog = new TransfersDialog(ui->stackPages), grp, &notify);
addPage(gxschannelDialog = new GxsChannelDialog(ui->stackPages), grp, &notify); addPage(gxschannelDialog = new GxsChannelDialog(ui->stackPages), grp, &notify);
addPage(gxsforumDialog = new GxsForumsDialog(ui->stackPages), grp, &notify); addPage(gxsforumDialog = new GxsForumsDialog(ui->stackPages), grp, &notify);
addPage(messagesDialog = new MessagesDialog(ui->stackPages), grp, &notify);
addPage(postedDialog = new PostedDialog(ui->stackPages), grp, &notify); addPage(postedDialog = new PostedDialog(ui->stackPages), grp, &notify);
addPage(friendsDialog = new FriendsDialog(ui->stackPages), grp, &notify);
#ifdef RS_USE_NEW_PEOPLE_DIALOG
PeopleDialog *peopleDialog = NULL;
addPage(peopleDialog = new PeopleDialog(ui->stackPages), grp, &notify);
#endif
addPage(newsFeed = new NewsFeed(ui->stackPages), grp, &notify);
#ifdef RS_USE_WIKI #ifdef RS_USE_WIKI
WikiDialog *wikiDialog = NULL; WikiDialog *wikiDialog = NULL;
addPage(wikiDialog = new WikiDialog(ui->stackPages), grp, &notify); addPage(wikiDialog = new WikiDialog(ui->stackPages), grp, &notify);
@ -430,7 +427,8 @@ void MainWindow::initStackedPage()
#endif #endif
/** Add icon on Action bar */ /** Add icon on Action bar */
addAction(new QAction(QIcon(IMAGE_ADDFRIEND), tr("Add"), ui->toolBarAction), &MainWindow::addFriend, SLOT(addFriend())); // I remove add a friend because it's in HOME ghibli
//addAction(new QAction(QIcon(IMAGE_ADDFRIEND), tr("Add"), ui->toolBarAction), &MainWindow::addFriend, SLOT(addFriend()));
//addAction(new QAction(QIcon(IMAGE_NEWRSCOLLECTION), tr("New"), ui->toolBarAction), &MainWindow::newRsCollection, SLOT(newRsCollection())); //addAction(new QAction(QIcon(IMAGE_NEWRSCOLLECTION), tr("New"), ui->toolBarAction), &MainWindow::newRsCollection, SLOT(newRsCollection()));
addAction(new QAction(QIcon(IMAGE_PREFERENCES), tr("Options"), ui->toolBarAction), &MainWindow::showSettings, SLOT(showSettings())); addAction(new QAction(QIcon(IMAGE_PREFERENCES), tr("Options"), ui->toolBarAction), &MainWindow::showSettings, SLOT(showSettings()));
addAction(new QAction(QIcon(IMAGE_ABOUT), tr("About"), ui->toolBarAction), &MainWindow::showabout, SLOT(showabout())); addAction(new QAction(QIcon(IMAGE_ABOUT), tr("About"), ui->toolBarAction), &MainWindow::showabout, SLOT(showabout()));

2
retroshare-gui/src/gui/MessagesDialog.h
View file

@ -45,7 +45,7 @@ public:
~MessagesDialog(); ~MessagesDialog();
virtual QIcon iconPixmap() const { return QIcon(IMAGE_MESSAGES) ; } //MainPage virtual QIcon iconPixmap() const { return QIcon(IMAGE_MESSAGES) ; } //MainPage
virtual QString pageName() const { return tr("Messages") ; } //MainPage virtual QString pageName() const { return tr("Mail") ; } //MainPage
virtual QString helpText() const { return ""; } //MainPage virtual QString helpText() const { return ""; } //MainPage
virtual UserNotify *getUserNotify(QObject *parent); virtual UserNotify *getUserNotify(QObject *parent);

2
retroshare-gui/src/gui/NewsFeed.h
View file

@ -49,7 +49,7 @@ public:
virtual ~NewsFeed(); virtual ~NewsFeed();
virtual QIcon iconPixmap() const { return QIcon(IMAGE_NEWSFEED) ; } //MainPage virtual QIcon iconPixmap() const { return QIcon(IMAGE_NEWSFEED) ; } //MainPage
virtual QString pageName() const { return tr("News feed") ; } //MainPage virtual QString pageName() const { return tr("Log") ; } //MainPage
virtual QString helpText() const { return ""; } //MainPage virtual QString helpText() const { return ""; } //MainPage
virtual UserNotify *getUserNotify(QObject *parent); virtual UserNotify *getUserNotify(QObject *parent);

2
retroshare-gui/src/gui/Posted/PostedDialog.h
View file

@ -39,7 +39,7 @@ public:
~PostedDialog(); ~PostedDialog();
virtual QIcon iconPixmap() const { return QIcon(IMAGE_POSTED) ; } //MainPage virtual QIcon iconPixmap() const { return QIcon(IMAGE_POSTED) ; } //MainPage
virtual QString pageName() const { return tr("Posted") ; } //MainPage virtual QString pageName() const { return tr("Links") ; } //MainPage
virtual QString helpText() const { return ""; } //MainPage virtual QString helpText() const { return ""; } //MainPage
virtual UserNotify *getUserNotify(QObject *parent); virtual UserNotify *getUserNotify(QObject *parent);