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

Added a Button for display own nick and set a menu for the status, removed nick label and status Combobox

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3409 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-08-30 19:10:07 +00:00
parent 77418bd4b6
commit 005cf957f8
2 changed files with 128 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

15
retroshare-gui/src/gui/MessengerWindow.cpp
View file

@ -200,7 +200,6 @@ MessengerWindow::MessengerWindow(QWidget* parent, Qt::WFlags flags)
_rsLogoBarmessenger = new LogoBar(ui.logoframe);
Widget::createLayout(ui.logoframe)->addWidget(_rsLogoBarmessenger);
ui.statuscomboBox->setMinimumWidth(20);
ui.messagelineEdit->setMinimumWidth(20);
itemFont = QFont("ARIAL", 10);
@ -214,14 +213,14 @@ MessengerWindow::MessengerWindow(QWidget* parent, Qt::WFlags flags)
// add self nick
RsPeerDetails pd;
if (rsPeers->getPeerDetails(rsPeers->getOwnId(),pd)) {
QString titleStr("<span style=\"font-size:14pt; font-weight:500;"
"color:#FFFFFF;\">%1</span>");
ui.nicklabel->setText(titleStr.arg(QString::fromStdString(pd.name) + tr(" - ") + QString::fromStdString(pd.location)));
ui.statusButton->setText(QString::fromStdString(pd.name) + tr(" - ") + QString::fromStdString(pd.location));
}
MainWindow *pMainWindow = MainWindow::getInstance();
if (pMainWindow) {
pMainWindow->initializeStatusObject(ui.statuscomboBox, true);
QMenu *pStatusMenu = new QMenu();
pMainWindow->initializeStatusObject(pStatusMenu, true);
ui.statusButton->setMenu(pStatusMenu);
}
insertPeers();
updateAvatar();
@ -243,7 +242,7 @@ MessengerWindow::~MessengerWindow ()
MainWindow *pMainWindow = MainWindow::getInstance();
if (pMainWindow) {
pMainWindow->removeStatusObject(ui.statuscomboBox);
pMainWindow->removeStatusObject(ui.statusButton);
}
_instance = NULL;
@ -500,7 +499,7 @@ void MessengerWindow::insertPeers()
gpg_item -> setTextAlignment(COLUMN_NAME, Qt::AlignLeft | Qt::AlignVCenter );
gpg_item -> setSizeHint(COLUMN_NAME, QSize( 27,27 ) );
gpg_item -> setSizeHint(COLUMN_NAME, QSize( 34,34 ) );
/* not displayed, used to find back the item */
gpg_item -> setData(COLUMN_DATA, ROLE_ID, QString::fromStdString(detail.id));
@ -653,7 +652,7 @@ void MessengerWindow::insertPeers()
QPixmap avatar ;
avatar.loadFromData(data,size,"PNG") ;
QIcon avatar_icon(avatar);
QSize av_icon_size(100, 100);
QSize av_icon_size(32, 32);
gpg_item-> setIcon(1, avatar_icon);
delete[] data;