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

Various Gui improvements:

Browse source 
* Added fallback to only <id> if peer is unknown in LinkCloud.
 * Added CheckFiles, and display status icon to SharedFiles.
 * Fixed SMPlayer startup and added play slot in Main Window.
 * Added Play Files to Local Shared Files. (context menu)
 * Added Play File to completed File Transfers. (context menu)
 * Ensured that selected Transfer stays selected.
 * Corrected Download State enumeration
 * Renamed Peer Details/ Authenticate to Make Friend / Peer Details
 * Removed Network View from Application Window.
 * Mods to RemoteDirModel to get Paths from files.
 * updated Rs Interface files.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@450 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-03-31 18:37:50 +00:00
parent 29a74b9898
commit e07783ac2b
14 changed files with 323 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -101,6 +101,8 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
ui.setupUi(this);
setWindowTitle(tr("RetroShare %1").arg(retroshareVersion()));
mSMPlayer = NULL;
/* Hide Console frame */
//showConsoleFrame(false);
@ -197,7 +199,9 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
connect(grp, SIGNAL(triggered(QAction *)), ui.stackPages, SLOT(showPage(QAction *)));
// Allow to play files from SharedFilesDialog.
connect(sharedfilesDialog, SIGNAL(playFiles( QStringList )), this, SLOT(playFiles( QStringList )));
connect(transfersDialog, SIGNAL(playFiles( QStringList )), this, SLOT(playFiles( QStringList )));
#ifdef RS_RELEASE_VERSION
addAction(new QAction(QIcon(IMAGE_BLOCK), tr("Unfinished"), ui.toolBar), SLOT(showApplWindow()));
@ -280,7 +284,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
menu->addAction(_bandwidthAct);
#endif
menu->addAction(_prefsAct);
//menu->addAction(_smplayerAct);
menu->addAction(_smplayerAct);
menu->addSeparator();
menu->addAction(tr("Minimize"), this, SLOT(showMinimized()));
menu->addAction(tr("Maximize"), this, SLOT(showMaximized()));
@ -461,7 +465,7 @@ MainWindow::~MainWindow()
delete _prefsAct;
delete _bandwidthGraph;
delete _messengerwindowAct;
//delete _smplayerAct;
delete _smplayerAct;
}
/** Create and bind actions to events. Setup for initial
@ -479,8 +483,8 @@ void MainWindow::createActions()
_messengerwindowAct = new QAction(QIcon(IMAGE_RSM16), tr("Open Messenger"), this);
connect(_messengerwindowAct, SIGNAL(triggered()),this, SLOT(showMessengerWindow()));
//_smplayerAct = new QAction(QIcon(IMAGE_SMPLAYER), tr("SMPlayer"), this);
//connect(_smplayerAct, SIGNAL(triggered()),this, SLOT(showsmplayer()));
_smplayerAct = new QAction(QIcon(IMAGE_SMPLAYER), tr("SMPlayer"), this);
connect(_smplayerAct, SIGNAL(triggered()),this, SLOT(showsmplayer()));
//connect(ui.btntoggletoolbox, SIGNAL(toggled(bool)), this, SLOT(showToolboxFrame(bool)));
@ -640,20 +644,26 @@ void MainWindow::startqcheckers()
}
/** Shows smplayer */
void MainWindow::showsmplayer()
/** Shows smplayer */
void MainWindow::showsmplayer()
{
static SMPlayer * smplayer = 0;
if (smplayer == 0) {
smplayer = new SMPlayer(QString::null, this);
/*connect(smplayer->gui(), SIGNAL(quitSolicited()),
smplayer->gui(), SLOT(hide()));*/
}
smplayer->gui()->show();
if (mSMPlayer == 0)
{
mSMPlayer = new SMPlayer(QString::null, this);
}
mSMPlayer->gui()->show();
}
void MainWindow::playFiles(QStringList files)
{
showsmplayer();
mSMPlayer->gui()->openFiles(files);
}
void MainWindow::showabout()
{
static HelpDialog *helpdlg = new HelpDialog(this);