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

fixed Chatdialog windowtitle

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@401 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2008-03-22 15:01:51 +00:00
parent 246bd80190
commit 562aa4f34d
2 changed files with 77 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-gui/src/gui/chat/PopupChatDialog.cpp
View file

@ -71,13 +71,13 @@ PopupChatDialog::PopupChatDialog(std::string id, std::string name,
statusBar()->showMessage(QString::fromStdString(statusstr.str())); statusBar()->showMessage(QString::fromStdString(statusstr.str()));
ui.textBrowser->setOpenExternalLinks ( false ); ui.textBrowser->setOpenExternalLinks ( false );
QString title = "RS:" + tr("Chatting with") + " " + QString::fromStdString(name); QString title = QString::fromStdString(name) + " :" + tr(" RetroShare - Chat") ;
setWindowTitle(title); setWindowTitle(title);
//set the default avatar //set the default avatar
ui.avatarlabel->setPixmap(QPixmap(":/images/retrosharelogo1.png")); ui.avatarlabel->setPixmap(QPixmap(":/images/retrosharelogo1.png"));
setWindowIcon(QIcon(QString(":/images/chat.png"))); setWindowIcon(QIcon(QString(":/images/rstray3.png")));
ui.textboldButton->setIcon(QIcon(QString(":/images/edit-bold.png"))); ui.textboldButton->setIcon(QIcon(QString(":/images/edit-bold.png")));
ui.textunderlineButton->setIcon(QIcon(QString(":/images/edit-underline.png"))); ui.textunderlineButton->setIcon(QIcon(QString(":/images/edit-underline.png")));
ui.textitalicButton->setIcon(QIcon(QString(":/images/edit-italic.png"))); ui.textitalicButton->setIcon(QIcon(QString(":/images/edit-italic.png")));
@ -100,7 +100,7 @@ void PopupChatDialog::show()
if(!this->isVisible()) { if(!this->isVisible()) {
QMainWindow::show(); QMainWindow::show();
} else { } else {
QMainWindow::activateWindow(); //QMainWindow::activateWindow();
setWindowState(windowState() & ~Qt::WindowMinimized | Qt::WindowActive); setWindowState(windowState() & ~Qt::WindowMinimized | Qt::WindowActive);
QMainWindow::raise(); QMainWindow::raise();
} }

124
retroshare-gui/src/gui/chat/PopupChatDialog.ui
View file

@ -31,6 +31,69 @@
</widget> </widget>
</item> </item>
<item rowspan="3" row="0" column="5" > <item rowspan="3" row="0" column="5" >
<widget class="QFrame" name="avatarframe" >
<property name="frameShape" >
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="avatarlabel" >
<property name="minimumSize" >
<size>
<width>64</width>
<height>64</height>
</size>
</property>
<property name="styleSheet" >
<string>QLabel{
border-image: url(:/images/avatar_background.png);
}</string>
</property>
<property name="text" >
<string/>
</property>
</widget>
</item>
<item row="1" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>121</width>
<height>121</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label" >
<property name="text" >
<string/>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item rowspan="3" row="0" column="6" >
<layout class="QGridLayout" > <layout class="QGridLayout" >
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QPushButton" name="avatarFrameButton" > <widget class="QPushButton" name="avatarFrameButton" >
@ -69,56 +132,6 @@
</item> </item>
</layout> </layout>
</item> </item>
<item rowspan="3" row="0" column="6" >
<widget class="QFrame" name="avatarframe" >
<property name="frameShape" >
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow" >
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" >
<property name="leftMargin" >
<number>0</number>
</property>
<property name="topMargin" >
<number>0</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>0</number>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="avatarlabel" >
<property name="minimumSize" >
<size>
<width>64</width>
<height>64</height>
</size>
</property>
<property name="text" >
<string/>
</property>
</widget>
</item>
<item row="1" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>121</width>
<height>131</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" > <item row="1" column="0" >
<spacer> <spacer>
<property name="orientation" > <property name="orientation" >
@ -243,6 +256,17 @@
</layout> </layout>
</widget> </widget>
<widget class="QStatusBar" name="statusbar" /> <widget class="QStatusBar" name="statusbar" />
<widget class="QToolBar" name="toolBar" >
<property name="windowTitle" >
<string>toolBar</string>
</property>
<attribute name="toolBarArea" >
<enum>TopToolBarArea</enum>
</attribute>
<attribute name="toolBarBreak" >
<bool>false</bool>
</attribute>
</widget>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>