From 0529c5d1aacf214d3ee4db4eec085a1d6fcc955f Mon Sep 17 00:00:00 2001
From: defnax <defnax@users.noreply.github.com>
Date: Mon, 2 Mar 2020 21:47:18 +0100
Subject: [PATCH] added some icons for photos

---
 .../src/gui/PhotoShare/PhotoDialog.cpp        |   9 ++++
 .../src/gui/PhotoShare/PhotoDialog.ui         |  50 +++++++++++++++---
 .../src/gui/PhotoShare/PhotoSlideShow.cpp     |   5 ++
 .../src/gui/PhotoShare/PhotoSlideShow.ui      |   5 +-
 retroshare-gui/src/gui/icons.qrc              |   2 +
 .../src/gui/icons/fullscreen-exit.png         | Bin 0 -> 1336 bytes
 retroshare-gui/src/gui/icons/fullscreen.png   | Bin 0 -> 1331 bytes
 7 files changed, 63 insertions(+), 8 deletions(-)
 create mode 100644 retroshare-gui/src/gui/icons/fullscreen-exit.png
 create mode 100644 retroshare-gui/src/gui/icons/fullscreen.png

diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp
index 6251dc38f..004c5d4cf 100644
--- a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp
+++ b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.cpp
@@ -25,6 +25,11 @@
 #include "retroshare/rsidentity.h"
 #include "gui/gxs/GxsCommentDialog.h"
 
+#define IMAGE_FULLSCREEN          ":/icons/fullscreen.png"
+#define IMAGE_FULLSCREENEXIT      ":/icons/fullscreen-exit.png"
+#define IMAGE_SHOW                ":/icons/png/down-arrow.png"
+#define IMAGE_HIDE                ":/icons/png/up-arrow.png"
+
 PhotoDialog::PhotoDialog(RsPhoto *rs_photo, const RsPhotoPhoto &photo, QWidget *parent) :
 	QDialog(parent, Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint),
 	ui(new Ui::PhotoDialog), mRsPhoto(rs_photo), mPhotoQueue(new TokenQueue(mRsPhoto->getTokenService(), this)),
@@ -76,8 +81,10 @@ void PhotoDialog::toggleDetails()
 {
 	if (ui->frame_details->isVisible()) {
 		ui->frame_details->setVisible(false);
+		ui->detailsButton->setIcon(QIcon(IMAGE_SHOW));
 	} else {
 		ui->frame_details->setVisible(true);
+		ui->detailsButton->setIcon(QIcon(IMAGE_HIDE));
 	}
 }
 
@@ -182,9 +189,11 @@ void PhotoDialog::setFullScreen()
 	show();
 	raise();
 #endif
+	ui->fullscreenButton->setIcon(QIcon(IMAGE_FULLSCREENEXIT));
   } else {
 
 	setWindowState( windowState() ^ Qt::WindowFullScreen );
 	show();
+	ui->fullscreenButton->setIcon(QIcon(IMAGE_FULLSCREEN));
   }
 }
diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.ui b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.ui
index b8ab9d67b..8a0adf7c9 100644
--- a/retroshare-gui/src/gui/PhotoShare/PhotoDialog.ui
+++ b/retroshare-gui/src/gui/PhotoShare/PhotoDialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>790</width>
-    <height>824</height>
+    <height>509</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -52,11 +52,24 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>558</width>
-               <height>551</height>
+               <width>540</width>
+               <height>318</height>
               </rect>
              </property>
              <layout class="QHBoxLayout" name="horizontalLayout_2">
+              <item>
+               <spacer name="horizontalSpacer">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
               <item>
                <widget class="QLabel" name="label_Photo">
                 <property name="sizePolicy">
@@ -74,8 +87,24 @@
                 <property name="text">
                  <string>TextLabel</string>
                 </property>
+                <property name="alignment">
+                 <set>Qt::AlignCenter</set>
+                </property>
                </widget>
               </item>
+              <item>
+               <spacer name="horizontalSpacer_2">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
              </layout>
             </widget>
            </widget>
@@ -92,8 +121,8 @@
              <string>...</string>
             </property>
             <property name="icon">
-             <iconset resource="../images.qrc">
-              <normaloff>:/images/window_fullscreen.png</normaloff>:/images/window_fullscreen.png</iconset>
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/fullscreen.png</normaloff>:/icons/fullscreen.png</iconset>
             </property>
             <property name="autoRaise">
              <bool>true</bool>
@@ -103,7 +132,11 @@
           <item>
            <widget class="QPushButton" name="detailsButton">
             <property name="text">
-             <string>Details \/</string>
+             <string>Details</string>
+            </property>
+            <property name="icon">
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/png/down-arrow.png</normaloff>:/icons/png/down-arrow.png</iconset>
             </property>
            </widget>
           </item>
@@ -136,6 +169,10 @@
             <property name="text">
              <string>&lt;N&gt; Comments &gt;&gt;</string>
             </property>
+            <property name="icon">
+             <iconset resource="../icons.qrc">
+              <normaloff>:/icons/png/comment.png</normaloff>:/icons/png/comment.png</iconset>
+            </property>
            </widget>
           </item>
          </layout>
@@ -255,6 +292,7 @@
  </widget>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.cpp b/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.cpp
index 7e5fb6d00..3965bb79a 100644
--- a/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.cpp
+++ b/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.cpp
@@ -22,6 +22,9 @@
 #include "gui/PhotoShare/PhotoDrop.h"
 #include "gui/gxs/GxsIdDetails.h"
 
+#define IMAGE_FULLSCREEN          ":/icons/fullscreen.png"
+#define IMAGE_FULLSCREENEXIT      ":/icons/fullscreen-exit.png"
+
 #include <iostream>
 
 /** Constructor */
@@ -300,10 +303,12 @@ void PhotoSlideShow::setFullScreen()
     show();
     raise();
 #endif
+	ui.fullscreenButton->setIcon(QIcon(IMAGE_FULLSCREENEXIT));
   } else {
 
     setWindowState( windowState() ^ Qt::WindowFullScreen );
     show();
+	ui.fullscreenButton->setIcon(QIcon(IMAGE_FULLSCREEN));
   }
 }
 
diff --git a/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.ui b/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.ui
index bc771eec0..50d031e4e 100644
--- a/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.ui
+++ b/retroshare-gui/src/gui/PhotoShare/PhotoSlideShow.ui
@@ -98,8 +98,8 @@
         <string/>
        </property>
        <property name="icon">
-        <iconset resource="../images.qrc">
-         <normaloff>:/images/window_fullscreen.png</normaloff>:/images/window_fullscreen.png</iconset>
+        <iconset resource="../icons.qrc">
+         <normaloff>:/icons/fullscreen.png</normaloff>:/icons/fullscreen.png</iconset>
        </property>
        <property name="autoRaise">
         <bool>false</bool>
@@ -157,6 +157,7 @@
  <resources>
   <include location="Photo_images.qrc"/>
   <include location="../images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index 94a8129ef..53b572552 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -316,5 +316,7 @@
         <file>icons/textedit/smile.png</file>
         <file>icons/textedit/font-increase.png</file>
         <file>icons/textedit/code.png</file>
+        <file>icons/fullscreen.png</file>
+        <file>icons/fullscreen-exit.png</file>
     </qresource>
 </RCC>
diff --git a/retroshare-gui/src/gui/icons/fullscreen-exit.png b/retroshare-gui/src/gui/icons/fullscreen-exit.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb0d29385c10343d4f8eedd1ef6dc1875d800cec
GIT binary patch
literal 1336
zcmZ`(Yfuwc6u!GjBnc2A$fMHAb}EQfObGajmL!@;K;#jjK1Y|Q;)84<HlP!;#1?gY
z5Gz^~95O{^Y#oGJE25ClqQw>j6_5%FB6R=>sSrStY|;(WKmE~}d(L;xcfRkQA9v;+
zkB^OXXU=5;0NkUbVi}3JGw2jDoBPg8lR(`i+8_d;y3o~@Oe1?FRVv#6z`-C=_Z0vZ
zr+yHC16%-xQ2_YG0Qh31wF#@qK}LK`qJ%_nxtnsagIdx7zIzPHS}7$R<e`>!f(y+g
z50iW;$#hbkxdUA40_U6sIhs*+k{Q0(PRb}V0_w%5Gdy|WQ|g5o3jhJHCj-evh(Z>-
z5wOnUuIz>f$C&kxJnw58-Q9jEuG7C#s(-!BA2SPA)1w=YkXk5ZeWVy1qkSYL8wMub
zk^=y%(HYRWMJ#`kbWucYkhly`U@wHWDd^;004SMJVo_r5b7S{gSvQwmki1sL+@D$c
z^Kr>R;gtH^dv?Hl;~u@FB>8GN;Udlph+!=&4{zZqr<A8w-0k-dZ?W6Grj0I+EptZh
zDO?@FFZzd0I4q||4kc8L^MsyeRUG|6{ro{IKsbKZYkkjKT?-=MCPpQ(xyqcQsrG<!
z8=iR3N+LML7C+o;pJkh<ZOVRO&UPz;`%sA__C#hwPb5@?47X}7$1%=FxJhYIYEL$i
zST*^Da4}*j@4H*^rj4hf8C-7s{#!uW;I47=30p(X`l+S3F|@0!srm1sPdr*aXPcAo
zB!js^a0{VZ`G&<!lQdELCO9a+t(Dnd@57}x9$u$4cK`?7Y+dk>l2@K%30aEQdIbm`
z|Cx$HC@bq8+q(-qiCD~q;#G+#q_gS_z%UUiT8W$1YEp!ih4g4>`Y>n33m<Ivl~rA3
zSq!a}_+f1NOME<Gw8Er5A1S<-?QOkM2qhpB>!ELiBfgX|_|8sN69cb@a9>2_3Krm&
zAg~pm*bj=ph(9EQp5KNW;TriYIxV-CRplLQDZrC-L)+kt{O{$=Vrp%D2+9t&J^%x5
zS7I;m4-B_o+gR~$G2R<DRqfDWd-6jJLxuSZ4Rx<?pbX5E_n{x$Qycwp6{W_=+m6n{
zUhy}hH0<4)M3jmRMaQEQtX&p^!kBrh6os&!6fp`g+a6&&3%m2zk2=4;v9}V@LPL}i
zVKAYTopXvH+<sJ^a>uxAUZ(%q9*)XQ3RmxBvZ>j6Kdm<)vW4q#vpcvBhPMGfsB<}_
zg{$Nggu1(zuBD&m476m`+_DDdCS@FUtSzYzy9S-^?s*BT`s)&0G25iwXRrbeG^E2f
zk?uGuAO9nWe6m8?r-p3%nc2q(sSeurNS)j8wN3PXe(1E$ixBI>^$xmTt#HGH3VY<d
zBYMZ&Xzi$a)Qk_<&a&N9YlKGq=ue>EwtRLBAr_h(qY5x)TjkkINDW4TDIC193E0;O
zp~0j!Vc-x^J$s+kUzFug9ff(%1SgOYj>cwpuqbIa^p%<#wYRiPFv!L+Vmb4PJy<Jn
zv^@mxEH{1QiK}^a;M>za0S>{A9nUx~L35US%l*PI=N}ZPkZe|@B`ebTsoCiy03Mge
z4dI4`aCwQLEBRqOK6mLNE|<^c61}%S`;TG2JS{UL@Ba-aH6Hn-;REM}jq(hIGC4aP
jD3!`3nOS>tQj@XtCGzZDC8Mk7k|Gc#i4|9_K{fvXL2fpI

literal 0
HcmV?d00001

diff --git a/retroshare-gui/src/gui/icons/fullscreen.png b/retroshare-gui/src/gui/icons/fullscreen.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b14cbe356d7591c2eefde5ad36311e9c71dde8b
GIT binary patch
literal 1331
zcmZ`&eN>Wn6#l^rs0gCDP@yKdla{2uprvV{6c()1{K))hCVpgAOQw`$E-|d5$CXyP
zA()USw{mG_W|m8^>}#3JN|&*YUo71!1?}U-O!jh4XXosXopbN+x%auxbMIfjl1<_3
z$wV3v06-S-c~K}zEolv*@0+3HCKPZP+%PTx7t3sCg?O}Qr1GP}0LXJkbwvQoSoGrn
z?1cgNI~jmLIRH+g>T8j!(7{)mHpYaah*kDs6;B{#AE@kul>Ok;Q&8J$DbDCn@>3}K
zKvg$d<32I{P_<=*t45<AQlR`}T(xD%zkzPfOWQb#!a{LWcr+-;9VXo(+iL8zUAH@k
zozfc>H?Nl$w}b>;c{4STX-Ytan3N6cd7v1-kdHPtB7S@h0CruL#8fiv=qPC=7KDXb
z=^?D+BHMF^%e?@AL;@Z+M)K^nayV88lh&<Wg6lu(!fx*Mnlvkzbzut=TRS3%8Dp>F
zH1xp@{M{>0v{#iX!%J!wH0k6KbP*P)maB0LPNvpcn%^U}mzpXt-XR7TC{8-!NH`1b
z-64ly6cl<gmcZEwY~+X<<Cd&XB}k=J6qj+V9VbOiY(u1l?nC;Qgy$a9n`PIuuX}u&
z+TZ?B*nYsLKw?-8B|%3oXz(1UlF|)*4xK9NF4_l4DGm5osHm*rNN$<xw$(JIw9|m6
z(YlKzP&s9+=sf1vA8`6}IT5Q%-XHkJUO2vW=tqMgfAIu&cye%Xj2Z1N+G;+M6)tnz
z7DtaRd_40(?|aseBMTo2BG=D$t4|`{&|wu#>^3Nb^S2-++-3G7h5LRR3Gq>AOC<x-
zo|lQuAt%fw??D^%sDN>bmnUG{55_~IzU2`q-+D9jnyNyhSGjvHXTJUPWS2I8a`&V}
zLtUabGojIq0aWU74t2>yup2a*08^bV&UtPcFfSvJg4xc@(j5g3XD2j0garjG=buX@
z=0)mP=9+`fNQNv@;5L(s*=yeKH)QgVMLth>m*XToofH;t9DS)aTWhcE=&cPcrFtc_
zd@ANX$ls_)!3FW_4hDhEH4h)ucN$>x3g=%wVmxbxKYme}BJx~hB&_d9$|1X|{;DU8
z&7<xTjqD-}Pn~W~X{vY_AoJDiv2RrEEG0zRl(FKF<udz%^WM(qzbtO!cKOhY-j3z<
zGL{N!3Cx4{hN4>IiPS^f*fqCE^E!4nRUB<xtQ7p2N^sf6Zu`EWwzluglmk?#qVv)(
zWe@DBt_#?KwK6t4EY&qka8DOCIvH)9Zog-|@Tk+>dtgP1oo$h<zG|xPRH!N^J^Z(^
z_{e_frvAkia#Y8|8?39Q`LgfI{4b8bRRs`zSWmj#tbXUoS|f+C%Uu1nI0<Jru!%zw
zS6muEbeE^&O^M6>o|$wl;yfhL@A3>X*P7%rsCzm)nb=-<{SsC9&Ke<q)-gv7Ap3D(
zN*gJL!*&cLi8(D)IT>(TX*9AuM^2HG7#xLz3kl{_J3b;XT!RgKnmT{vu17kUu3CGc
z2-EY^v5z+hI8_irqQUu7<Nj$O#(|rYQp}wUycjwWY{vJdXvM1gMjrYd7mGvV#A!lt
zdSGgHItqXdvtcjT*9&IHuvP~8`UbLCOc)M?VNV1(_8-I7S!tQu_y4~ku`Yy-8eA+F
rqO-P(bA{RIAU8MHJ9E#joK&GG-8(BgLpiaEhKhh7G@RGCCi&1m$?PgJ

literal 0
HcmV?d00001