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

Small Tweaks.

Browse Source 
* Removed services toolbar - until it is needed.
 * Removed background on MessengerWindow - it breaks on linux.
 * fixed Messages Html problem.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@518 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-04-24 12:58:27 +00:00
parent 4e03fa5d06
commit 98eabbabe0
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,6 +115,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
_bandwidthGraph = new BandwidthGraph();
messengerWindow = new MessengerWindow();
messengerWindow->hide();
//messengerWindow->show();
applicationWindow = new ApplicationWindow();
applicationWindow->hide();
@ -196,6 +197,8 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
ui.toolBar->addSeparator();
connect(grp, SIGNAL(triggered(QAction *)), ui.stackPages, SLOT(showPage(QAction *)));
/* Select the first action */
grp->actions()[0]->setChecked(true);
// Allow to play files from SharedFilesDialog.
connect(sharedfilesDialog, SIGNAL(playFiles( QStringList )), this, SLOT(playFiles( QStringList )));
@ -211,16 +214,13 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
toolAct->setText("Service");
toolAct->setShortcut(tr("Ctrl+T"));
toolAct->setIcon(QIcon(":/images/blockdevice2.png"));
ui.toolBar->addAction(toolAct);
//ui.toolBar->addAction(toolAct);
/* Select the first action */
grp->actions()[0]->setChecked(true);
/* Select the first action */
/* Create the Service pages and actions */
QActionGroup *servicegrp = new QActionGroup(this);
#if 0
LinksDialog *linksDialog = NULL;
ui.stackPages->add(linksDialog = new LinksDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_LINKS), tr("Links Cloud"), servicegrp));
@ -237,6 +237,7 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
ui.stackPages->add(photoDialog = new PhotoDialog(ui.stackPages),
createPageAction(QIcon(IMAGE_PHOTO), tr("Photo View"), servicegrp));
#endif
/* Create the toolbarservice */

3
retroshare-gui/src/gui/MessagesDialog.cpp
View File

@ -465,7 +465,6 @@ void MessagesDialog::insertMsgTxtAndFiles()
ui.filesText->setText("");
ui.subjectText->setText("");
//ui.msgText->setText("");
ui.msgList->clear();
return;
@ -574,7 +573,7 @@ void MessagesDialog::insertMsgTxtAndFiles()
ui.fromText->setText(QString::fromStdString(rsPeers->getPeerName(msgInfo.srcId)));
ui.subjectText->setText(QString::fromStdWString(msgInfo.title));
ui.msgText->setText(QString::fromStdWString(msgInfo.msg));
ui.msgText->setHtml(QString::fromStdWString(msgInfo.msg));
{
std::ostringstream out;

13
retroshare-gui/src/gui/MessengerWindow.cpp
View File

@ -105,17 +105,20 @@ MessengerWindow::MessengerWindow(QWidget * parent)
ui.messagecomboBox->setMinimumWidth(20);
ui.searchlineEdit->setMinimumWidth(20);
QPixmap Backpixmap((QString)":/images/backgroundimage.png");
//QPixmap pixmap5((QString)REC_PATH+(QString)"back2765.png");
/* The background palette breaks MessengerWindow in Linux...
* so it is disabled until a solution is found.
*/
QBrush BackBrush(Backpixmap);
#if 0
QPixmap Backpixmap((QString)":/images/backgroundimage.png");
//QBrush BackBrush(Backpixmap);
QPalette BackPalette(BackBrush, BackBrush, BackBrush, BackBrush, BackBrush, BackBrush, BackBrush, BackBrush, BackBrush);
this->setPalette(BackPalette); //Set Background
#endif
/* Hide platform specific features */
#ifdef Q_WS_WIN
#endif
}