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

Merge pull request #5 from RetroShare/master

Browse source 
update to latest master
This commit is contained in:
defnax 2019-01-23 15:28:26 +01:00 • committed by GitHub
commit ef451b9b92
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 425 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
View file

@ -53,8 +53,12 @@ CreateGxsChannelMsg::CreateGxsChannelMsg(const RsGxsGroupId &cId, RsGxsMessageId
Settings->loadWidgetInformation(this);
mChannelQueue = new TokenQueue(rsGxsChannels->getTokenService(), this);
headerFrame->setHeaderImage(QPixmap(":/images/channels.png"));
if(!existing_post.isNull())
setWindowTitle(tr("Edit Channel Post"));
headerFrame->setHeaderText(tr("Edit Channel Post"));
else
headerFrame->setHeaderText(tr("New Channel Post"));
setAttribute ( Qt::WA_DeleteOnClose, true );

13
retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.ui
View file

@ -37,6 +37,9 @@
<number>0</number>
</property>
<item row="0" column="0">
<widget class="HeaderFrame" name="headerFrame"/>
</item>
<item row="1" column="0">
<widget class="QFrame" name="mainFrame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
@ -299,8 +302,8 @@ p, li { white-space: pre-wrap; }
<rect>
<x>0</x>
<y>0</y>
<width>812</width>
<height>24</height>
<width>767</width>
<height>42</height>
</rect>
</property>
<property name="sizePolicy">
@ -387,6 +390,12 @@ p, li { white-space: pre-wrap; }
</layout>
</widget>
<customwidgets>
<customwidget>
<class>HeaderFrame</class>
<extends>QFrame</extends>
<header>gui/common/HeaderFrame.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>MimeTextEdit</class>
<extends>QTextEdit</extends>