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

5
retroshare-gui/src/gui/common/RsCollectionDialog.cpp
View file

@ -140,15 +140,20 @@ RsCollectionDialog::RsCollectionDialog(const QString& collectionFileName
setWindowFlags(windowFlags() & ~Qt::WindowMinimizeButtonHint);
setWindowTitle(QString("%1 - %2").arg(windowTitle()).arg(QFileInfo(_fileName).completeBaseName()));
ui.headerFrame->setHeaderImage(QPixmap(":/images/library64.png"));
if(creation)
{
ui.headerFrame->setHeaderText(tr("Collection Editor"));
ui.downloadFolder_LE->hide();
ui.downloadFolder_LB->hide();
ui.destinationDir_TB->hide();
}
else
{
ui.headerFrame->setHeaderText(tr("Download files"));
ui.downloadFolder_LE->show();
ui.downloadFolder_LB->show();
ui.label_filename->hide();

20
retroshare-gui/src/gui/common/RsCollectionDialog.ui
View file

@ -40,6 +40,16 @@
<number>0</number>
</property>
<item row="0" column="0">
<widget class="HeaderFrame" name="headerFrame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
@ -488,6 +498,8 @@
</widget>
</item>
</layout>
<zorder>frame</zorder>
<zorder>headerFrame</zorder>
</widget>
<customwidgets>
<customwidget>
@ -496,10 +508,16 @@
<header location="global">gui/common/HashBox.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>HeaderFrame</class>
<extends>QFrame</extends>
<header>gui/common/HeaderFrame.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../../../../plugins/FeedReader/gui/FeedReader_images.qrc"/>
<include location="../images.qrc"/>
<include location="../../../../plugins/FeedReader/gui/FeedReader_images.qrc"/>
</resources>
<connections/>
</ui>