Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-21 05:39:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

clean up source structure

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1154 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2009-05-02 00:12:29 +00:00
parent 72f7fd0be4
commit 130143192f
3 changed files with 12 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -189,7 +189,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
ui.stackPages->add(sharedfilesDialog = new SharedFilesDialog(ui.stackPages), ui.stackPages->add(sharedfilesDialog = new SharedFilesDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_FILES), tr("Files"), grp)); createPageAction(QIcon(IMAGE_FILES), tr("Files"), grp));
//MsgFeed *msgFeed = NULL; //MsgFeed *msgFeed = NULL;
//ui.stackPages->add(msgFeed = new MsgFeed(ui.stackPages), //ui.stackPages->add(msgFeed = new MsgFeed(ui.stackPages),
// createPageAction(QIcon(IMAGE_MESSAGES), tr("Messages"), grp)); // createPageAction(QIcon(IMAGE_MESSAGES), tr("Messages"), grp));
@ -223,8 +222,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
ui.stackPages->add(forumsDialog = new ForumsDialog(ui.stackPages), ui.stackPages->add(forumsDialog = new ForumsDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_FORUMS), tr("Forums"), grp)); createPageAction(QIcon(IMAGE_FORUMS), tr("Forums"), grp));
addAction(new QAction(QIcon(IMAGE_UNFINISHED), tr("Unfinished"), ui.toolBar), SLOT(showApplWindow()));
#endif #endif
NewsFeed *newsFeed = NULL; NewsFeed *newsFeed = NULL;
ui.stackPages->add(newsFeed = new NewsFeed(ui.stackPages), ui.stackPages->add(newsFeed = new NewsFeed(ui.stackPages),
@ -233,18 +230,22 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
ui.stackPages->add(pluginsPage = new PluginsPage(ui.stackPages), ui.stackPages->add(pluginsPage = new PluginsPage(ui.stackPages),
createPageAction(QIcon(IMAGE_PLUGINS), tr("Plugins"), grp)); createPageAction(QIcon(IMAGE_PLUGINS), tr("Plugins"), grp));
/* also an empty list of chat windows */
messengerWindow->setChatDialog(peersDialog);
/* Create the toolbar */ /* Create the toolbar */
ui.toolBar->addActions(grp->actions()); ui.toolBar->addActions(grp->actions());
ui.toolBar->addSeparator(); ui.toolBar->addSeparator();
connect(grp, SIGNAL(triggered(QAction *)), ui.stackPages, SLOT(showPage(QAction *))); connect(grp, SIGNAL(triggered(QAction *)), ui.stackPages, SLOT(showPage(QAction *)));
#ifdef RS_RELEASE_VERSION
#else
addAction(new QAction(QIcon(IMAGE_UNFINISHED), tr("Unfinished"), ui.toolBar), SLOT(showApplWindow()));
#endif
/* Select the first action */ /* Select the first action */
grp->actions()[0]->setChecked(true); grp->actions()[0]->setChecked(true);
/* also an empty list of chat windows */
messengerWindow->setChatDialog(peersDialog);
// Allow to play files from SharedFilesDialog. // Allow to play files from SharedFilesDialog.
connect(sharedfilesDialog, SIGNAL(playFiles( QStringList )), this, SLOT(playFiles( QStringList ))); connect(sharedfilesDialog, SIGNAL(playFiles( QStringList )), this, SLOT(playFiles( QStringList )));
connect(transfersDialog, SIGNAL(playFiles( QStringList )), this, SLOT(playFiles( QStringList ))); connect(transfersDialog, SIGNAL(playFiles( QStringList )), this, SLOT(playFiles( QStringList )));
@ -379,16 +380,6 @@ QAction* MainWindow::createPageAction(QIcon img, QString text, QActionGroup *gro
return action; return action;
} }
/** Creates a new action associated with a config page. */
QAction* MainWindow::createPageActionservice(QIcon img, QString text, QActionGroup *groupservice)
{
QAction *actionservice = new QAction(img, text, groupservice);
actionservice->setCheckable(true);
actionservice->setFont(FONT);
return actionservice;
}
/** Adds the given action to the toolbar and hooks its triggered() signal to /** Adds the given action to the toolbar and hooks its triggered() signal to
* the specified slot (if given). */ * the specified slot (if given). */
void MainWindow::addAction(QAction *action, const char *slot) void MainWindow::addAction(QAction *action, const char *slot)

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

@ -151,7 +151,6 @@ private slots:
void showPreferencesWindow(PreferencesWindow::Page page = PreferencesWindow::General); void showPreferencesWindow(PreferencesWindow::Page page = PreferencesWindow::General);
void showMess(MainWindow::Page page = MainWindow::Messages); void showMess(MainWindow::Page page = MainWindow::Messages);
void showSettings(); void showSettings();
void setStyle(); void setStyle();
@ -196,10 +195,6 @@ private:
/** Adds a new action to the toolbar. */ /** Adds a new action to the toolbar. */
void addAction(QAction *action, const char *slot = 0); void addAction(QAction *action, const char *slot = 0);
/** Creates a new action for a Service pages. */
QAction* createPageActionservice(QIcon img, QString text, QActionGroup *groupservice);
/** Adds a new action to the toolbar. */
void addActionservice(QAction *actionservice, const char *slot = 0);
void loadStyleSheet(const QString &sheetName); void loadStyleSheet(const QString &sheetName);

2
retroshare-gui/src/gui/statusbar/peerstatus.cpp
View file

@ -76,7 +76,7 @@ void PeerStatus::setPeerStatus()
int others = 1 + ids.size(); int others = 1 + ids.size();
std::ostringstream out2; std::ostringstream out2;
out2 << "<span style=\"color:#008000\"><strong>Online: </strong></span>" << online << " | <span style=\"color:#0000FF\"><strong>Friends: </strong></span>" << friends << " | <span style=\"color:#FF0033\"><strong>Network: </strong></span>" << others << " "; out2 << "<span style=\"color:#008000\"><strong>Online: </strong></span>" << online << " | <span style=\"color:#0000FF\"><strong>Friends: </strong></span>" << friends << " | <strong>Network: </strong>" << others << " ";
if (statusPeers) if (statusPeers)