Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 16:39:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added Header Images and Text for Albums Dialogs

Browse Source 
Enabled always "Create Album" functionality, not only when own Album is selected.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5866 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2012-11-21 15:46:08 +00:00
parent b18a95ac9b
commit 9e30148c63
7 changed files with 82 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
retroshare-gui/src/gui/PhotoShare/AlbumCreateDialog.ui
View File

@ -350,5 +350,22 @@ border-radius: 10px;
<resources>
<include location="../images.qrc"/>
</resources>
<connections/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>AlbumCreateDialog</receiver>
<slot>close()</slot>
<hints>
<hint type="sourcelabel">
<x>398</x>
<y>466</y>
</hint>
<hint type="destinationlabel">
<x>264</x>
<y>243</y>
</hint>
</hints>
</connection>
</connections>
</ui>

3
retroshare-gui/src/gui/PhotoShare/AlbumDialog.cpp
View File

@ -9,6 +9,9 @@ AlbumDialog::AlbumDialog(const RsPhotoAlbum& album, TokenQueue* photoQueue, RsPh
ui(new Ui::AlbumDialog), mRsPhoto(rs_Photo), mPhotoQueue(photoQueue), mAlbum(album), mPhotoSelected(NULL)
{
ui->setupUi(this);
ui->headerFrame->setHeaderImage(QPixmap(":/images/kview_64.png"));
ui->headerFrame->setHeaderText(tr("Album"));
connect(ui->pushButton_PublishPhotos, SIGNAL(clicked()), this, SLOT(updateAlbumPhotos()));
connect(ui->pushButton_DeletePhoto, SIGNAL(clicked()), this, SLOT(deletePhoto()));

56
retroshare-gui/src/gui/PhotoShare/AlbumDialog.ui
View File

@ -27,16 +27,6 @@
<property name="spacing">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QFrame" 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">
@ -310,7 +300,7 @@ p, li { white-space: pre-wrap; }
<x>0</x>
<y>0</y>
<width>625</width>
<height>103</height>
<height>112</height>
</rect>
</property>
<property name="styleSheet">
@ -360,6 +350,13 @@ p, li { white-space: pre-wrap; }
</property>
</spacer>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel</set>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_PublishPhotos">
<property name="text">
@ -372,9 +369,17 @@ p, li { white-space: pre-wrap; }
</layout>
</widget>
</item>
<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>
</layout>
<zorder>frame</zorder>
<zorder>headerFrame</zorder>
</widget>
<customwidgets>
<customwidget>
@ -383,9 +388,32 @@ p, li { white-space: pre-wrap; }
<header>gui/PhotoShare/PhotoDrop.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="../images.qrc"/>
</resources>
<connections/>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>AlbumDialog</receiver>
<slot>close()</slot>
<hints>
<hint type="sourcelabel">
<x>481</x>
<y>413</y>
</hint>
<hint type="destinationlabel">
<x>324</x>
<y>217</y>
</hint>
</hints>
</connection>
</connections>
</ui>

4
retroshare-gui/src/gui/PhotoShare/PhotoShare.cpp
View File

@ -331,7 +331,7 @@ void PhotoShare::updateAlbums()
ui.toolButton_subscribe->setEnabled(true);
ui.toolButton_subscribe->setText("Unsubscribe From Album");
ui.toolButton_subscribe->setIcon(QIcon(":/images/album_unsubscribe.png"));
ui.toolButton_NewAlbum->setEnabled(false);
//ui.toolButton_NewAlbum->setEnabled(false);
ui.toolButton_SlideShow->setEnabled(true);
while(sit.hasNext()){
@ -349,7 +349,7 @@ void PhotoShare::updateAlbums()
ui.toolButton_subscribe->setEnabled(true);
ui.toolButton_subscribe->setText("Subscribe To Album");
ui.toolButton_subscribe->setIcon(QIcon(":/images/album_subscribe.png"));
ui.toolButton_NewAlbum->setEnabled(false);
//ui.toolButton_NewAlbum->setEnabled(false);
ui.toolButton_SlideShow->setEnabled(false);
while(sit.hasNext()){

24
retroshare-gui/src/gui/PhotoShare/PhotoShare.ui
View File

@ -206,20 +206,13 @@
<x>0</x>
<y>0</y>
<width>804</width>
<height>230</height>
<height>225</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">QWidget#scrollAreaWidgetContents{border: none;}</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label_5">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
@ -249,7 +242,7 @@
<x>0</x>
<y>0</y>
<width>804</width>
<height>230</height>
<height>224</height>
</rect>
</property>
<property name="styleSheet">
@ -287,6 +280,19 @@
<property name="text">
<string>View Photo</string>
</property>
<property name="icon">
<iconset resource="Photo_images.qrc">
<normaloff>:/images/kview_24.png</normaloff>:/images/kview_24.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
</layout>

2
retroshare-gui/src/gui/PhotoShare/Photo_images.qrc
View File

@ -2,6 +2,8 @@
<qresource prefix="/" >
<file>images/kuickshow.png</file>
<file>images/kview_24.png</file>
<file>images/kview_64.png</file>
<file>images/album_64.png</file>
<file>images/album_subscribe.png</file>
<file>images/album_unsubscribe.png</file>
<file>images/album_create_64.png</file>

BIN
retroshare-gui/src/gui/PhotoShare/images/album_64.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB