Merge pull request #89 from RetroShare/master

update to master
2024-10-01 02:35:48 -04:00 · 2020-03-05 21:22:24 +01:00 · 2020-03-05 21:22:24 +01:00 · e11c83f833
commit e11c83f833
parent a0f151b252 4bacdb8de4
16 changed files with 497 additions and 299 deletions
--- a/libretroshare/src/rsitems/rsserviceids.h
+++ b/libretroshare/src/rsitems/rsserviceids.h
@ -64,6 +64,7 @@ enum class RsServiceType : uint16_t
 	GXS_TRANS                  = 0x0230,
 	JSONAPI                    = 0x0240,
 	FORUMS_CONFIG              = 0x0315,
+	POSTED_CONFIG              = 0x0316,
 	CHANNELS_CONFIG            = 0x0317,
 	RTT                        = 0x1011, /// Round Trip Time

@ -123,7 +124,9 @@ RS_DEPRECATED_FOR(RsServiceType) const uint16_t RS_SERVICE_GXS_TYPE_REPUTATION
 RS_DEPRECATED_FOR(RsServiceType) const uint16_t RS_SERVICE_TYPE_GXS_RECOGN      = 0x0220;
 RS_DEPRECATED_FOR(RsServiceType) const uint16_t RS_SERVICE_TYPE_GXS_TRANS       = 0x0230;
 RS_DEPRECATED_FOR(RsServiceType) const uint16_t RS_SERVICE_TYPE_JSONAPI         = 0x0240;
+/// used to save notification records in GXS and possible other service-based configuration
 RS_DEPRECATED_FOR(RsServiceType) const uint16_t RS_SERVICE_GXS_TYPE_FORUMS_CONFIG   = 0x0315;
+RS_DEPRECATED_FOR(RsServiceType) const uint16_t RS_SERVICE_GXS_TYPE_POSTED_CONFIG   = 0x0316;
 RS_DEPRECATED_FOR(RsServiceType) const uint16_t RS_SERVICE_GXS_TYPE_CHANNELS_CONFIG = 0x0317;

 // Experimental Services.
--- a/libretroshare/src/rsserver/rsinit.cc
+++ b/libretroshare/src/rsserver/rsinit.cc
@ -1632,6 +1632,7 @@ int RsServer::StartupRetroShare()
 	mConfigMgr->addConfiguration("gxschannels_srv.cfg", mGxsChannels);
 	mConfigMgr->addConfiguration("gxscircles.cfg"  , gxscircles_ns);
 	mConfigMgr->addConfiguration("posted.cfg"      , posted_ns);
+	mConfigMgr->addConfiguration("gxsposted_srv.cfg", mPosted);
 #ifdef RS_USE_WIKI
 	mConfigMgr->addConfiguration("wiki.cfg", wiki_ns);
 #endif
--- a/libretroshare/src/services/p3gxschannels.cc
+++ b/libretroshare/src/services/p3gxschannels.cc
@ -136,14 +136,14 @@ uint32_t p3GxsChannels::channelsAuthenPolicy()
 static const uint32_t GXS_CHANNELS_CONFIG_MAX_TIME_NOTIFY_STORAGE = 86400*30*2 ; // ignore notifications for 2 months
 static const uint8_t  GXS_CHANNELS_CONFIG_SUBTYPE_NOTIFY_RECORD   = 0x01 ;

-struct RsGxsGroupNotifyRecordsItem: public RsItem
+struct RsGxsChannelNotifyRecordsItem: public RsItem
 {

-	RsGxsGroupNotifyRecordsItem()
+	RsGxsChannelNotifyRecordsItem()
 	    : RsItem(RS_PKT_VERSION_SERVICE,RS_SERVICE_GXS_TYPE_CHANNELS_CONFIG,GXS_CHANNELS_CONFIG_SUBTYPE_NOTIFY_RECORD)
 	{}

-    virtual ~RsGxsGroupNotifyRecordsItem() {}
+    virtual ~RsGxsChannelNotifyRecordsItem() {}

 	void serial_process( RsGenericSerializer::SerializeJob j,
 	                     RsGenericSerializer::SerializeContext& ctx )
@ -167,7 +167,7 @@ public:

 		switch(item_sub_id)
 		{
-		case GXS_CHANNELS_CONFIG_SUBTYPE_NOTIFY_RECORD: return new RsGxsGroupNotifyRecordsItem();
+		case GXS_CHANNELS_CONFIG_SUBTYPE_NOTIFY_RECORD: return new RsGxsChannelNotifyRecordsItem();
 		default:
 			return NULL;
 		}
@ -178,7 +178,7 @@ bool p3GxsChannels::saveList(bool &cleanup, std::list<RsItem *>&saveList)
 {
 	cleanup = true ;

-	RsGxsGroupNotifyRecordsItem *item = new RsGxsGroupNotifyRecordsItem ;
+	RsGxsChannelNotifyRecordsItem *item = new RsGxsChannelNotifyRecordsItem ;

 	{
 		RS_STACK_MUTEX(mKnownChannelsMutex);
@ -198,7 +198,7 @@ bool p3GxsChannels::loadList(std::list<RsItem *>& loadList)

 		rstime_t now = time(NULL);

-		RsGxsGroupNotifyRecordsItem *fnr = dynamic_cast<RsGxsGroupNotifyRecordsItem*>(item) ;
+		RsGxsChannelNotifyRecordsItem *fnr = dynamic_cast<RsGxsChannelNotifyRecordsItem*>(item) ;

 		if(fnr)
 		{
@ -206,7 +206,7 @@ bool p3GxsChannels::loadList(std::list<RsItem *>& loadList)
 			mKnownChannels.clear();

 			for(auto it(fnr->records.begin());it!=fnr->records.end();++it)
-				if( it->second + GXS_CHANNELS_CONFIG_MAX_TIME_NOTIFY_STORAGE < now)
+				if( now < it->second + GXS_CHANNELS_CONFIG_MAX_TIME_NOTIFY_STORAGE)
 					mKnownChannels.insert(*it) ;
 		}

--- a/libretroshare/src/services/p3gxsforums.cc
+++ b/libretroshare/src/services/p3gxsforums.cc
@ -96,14 +96,14 @@ uint32_t p3GxsForums::forumsAuthenPolicy()
 static const uint32_t GXS_FORUMS_CONFIG_MAX_TIME_NOTIFY_STORAGE = 86400*30*2 ; // ignore notifications for 2 months
 static const uint8_t  GXS_FORUMS_CONFIG_SUBTYPE_NOTIFY_RECORD   = 0x01 ;

-struct RsGxsGroupNotifyRecordsItem: public RsItem
+struct RsGxsForumNotifyRecordsItem: public RsItem
 {

-	RsGxsGroupNotifyRecordsItem()
+	RsGxsForumNotifyRecordsItem()
 	    : RsItem(RS_PKT_VERSION_SERVICE,RS_SERVICE_GXS_TYPE_FORUMS_CONFIG,GXS_FORUMS_CONFIG_SUBTYPE_NOTIFY_RECORD)
 	{}

-    virtual ~RsGxsGroupNotifyRecordsItem() {}
+    virtual ~RsGxsForumNotifyRecordsItem() {}

 	void serial_process( RsGenericSerializer::SerializeJob j,
 	                     RsGenericSerializer::SerializeContext& ctx )
@ -127,7 +127,7 @@ public:

 		switch(item_sub_id)
 		{
-		case GXS_FORUMS_CONFIG_SUBTYPE_NOTIFY_RECORD: return new RsGxsGroupNotifyRecordsItem();
+		case GXS_FORUMS_CONFIG_SUBTYPE_NOTIFY_RECORD: return new RsGxsForumNotifyRecordsItem();
 		default:
 			return NULL;
 		}
@ -138,7 +138,7 @@ bool p3GxsForums::saveList(bool &cleanup, std::list<RsItem *>&saveList)
 {
 	cleanup = true ;

-	RsGxsGroupNotifyRecordsItem *item = new RsGxsGroupNotifyRecordsItem ;
+	RsGxsForumNotifyRecordsItem *item = new RsGxsForumNotifyRecordsItem ;

 	item->records = mKnownForums ;

@ -155,14 +155,14 @@ bool p3GxsForums::loadList(std::list<RsItem *>& loadList)

 		rstime_t now = time(NULL);

-		RsGxsGroupNotifyRecordsItem *fnr = dynamic_cast<RsGxsGroupNotifyRecordsItem*>(item) ;
+		RsGxsForumNotifyRecordsItem *fnr = dynamic_cast<RsGxsForumNotifyRecordsItem*>(item) ;

 		if(fnr != NULL)
 		{
 			mKnownForums.clear();

 			for(auto it(fnr->records.begin());it!=fnr->records.end();++it)
-				if( it->second + GXS_FORUMS_CONFIG_MAX_TIME_NOTIFY_STORAGE < now)
+				if( now < it->second + GXS_FORUMS_CONFIG_MAX_TIME_NOTIFY_STORAGE)
 					mKnownForums.insert(*it) ;
 		}

--- a/libretroshare/src/services/p3postbase.cc
+++ b/libretroshare/src/services/p3postbase.cc
@ -157,15 +157,26 @@ void p3PostBase::notifyChanges(std::vector<RsGxsNotify *> &changes)
                const std::list<RsGxsGroupId>& grpList = grpChange->mGrpIdList;

                for (auto git = grpList.begin(); git != grpList.end(); ++git)
-                {
+				{
+					if(mKnownPosted.find(*git) == mKnownPosted.end())
+					{
+						mKnownPosted.insert(std::make_pair(*git, time(nullptr)));
+						IndicateConfigChanged();
+
+						auto ev = std::make_shared<RsGxsPostedEvent>();
+						ev->mPostedGroupId = *git;
+						ev->mPostedEventCode = RsPostedEventCode::NEW_POSTED_GROUP;
+						rsEvents->postEvent(ev);
+
 #ifdef POSTBASE_DEBUG
-					std::cerr << "p3PostBase::notifyChanges() Incoming Group: " << *git;
-					std::cerr << std::endl;
+						std::cerr << "p3PostBase::notifyChanges() Incoming Group: " << *git;
+						std::cerr << std::endl;
 #endif
-					auto ev = std::make_shared<RsGxsPostedEvent>();
-					ev->mPostedGroupId = *git;
-					ev->mPostedEventCode = RsPostedEventCode::NEW_POSTED_GROUP;
-					rsEvents->postEvent(ev);
+					}
+					else
+						RsInfo() << __PRETTY_FUNCTION__
+						         << " Not notifying already known forum "
+						         << *git << std::endl;
 				}
            }
 				break;
@ -828,3 +839,89 @@ void p3PostBase::handleResponse(uint32_t token, uint32_t req_type)
 	}
 }

+static const uint32_t GXS_POSTED_CONFIG_MAX_TIME_NOTIFY_STORAGE = 86400*30*2 ; // ignore notifications for 2 months
+static const uint8_t  GXS_POSTED_CONFIG_SUBTYPE_NOTIFY_RECORD   = 0x01 ;
+
+struct RsGxsPostedNotifyRecordsItem: public RsItem
+{
+
+	RsGxsPostedNotifyRecordsItem()
+	    : RsItem(RS_PKT_VERSION_SERVICE,RS_SERVICE_GXS_TYPE_POSTED_CONFIG,GXS_POSTED_CONFIG_SUBTYPE_NOTIFY_RECORD)
+	{}
+
+    virtual ~RsGxsPostedNotifyRecordsItem() {}
+
+	void serial_process( RsGenericSerializer::SerializeJob j,
+	                     RsGenericSerializer::SerializeContext& ctx )
+	{ RS_SERIAL_PROCESS(records); }
+
+	void clear() {}
+
+	std::map<RsGxsGroupId,rstime_t> records;
+};
+
+class GxsPostedConfigSerializer : public RsServiceSerializer
+{
+public:
+	GxsPostedConfigSerializer() : RsServiceSerializer(RS_SERVICE_GXS_TYPE_POSTED_CONFIG) {}
+	virtual ~GxsPostedConfigSerializer() {}
+
+	RsItem* create_item(uint16_t service_id, uint8_t item_sub_id) const
+	{
+		if(service_id != RS_SERVICE_GXS_TYPE_POSTED_CONFIG)
+			return NULL;
+
+		switch(item_sub_id)
+		{
+		case GXS_POSTED_CONFIG_SUBTYPE_NOTIFY_RECORD: return new RsGxsPostedNotifyRecordsItem();
+		default:
+			return NULL;
+		}
+	}
+};
+
+bool p3PostBase::saveList(bool &cleanup, std::list<RsItem *>&saveList)
+{
+	cleanup = true ;
+
+	RsGxsPostedNotifyRecordsItem *item = new RsGxsPostedNotifyRecordsItem ;
+
+	item->records = mKnownPosted ;
+
+	saveList.push_back(item) ;
+	return true;
+}
+
+bool p3PostBase::loadList(std::list<RsItem *>& loadList)
+{
+	while(!loadList.empty())
+	{
+		RsItem *item = loadList.front();
+		loadList.pop_front();
+
+		rstime_t now = time(NULL);
+
+		RsGxsPostedNotifyRecordsItem *fnr = dynamic_cast<RsGxsPostedNotifyRecordsItem*>(item) ;
+
+		if(fnr != NULL)
+		{
+			mKnownPosted.clear();
+
+			for(auto it(fnr->records.begin());it!=fnr->records.end();++it)
+				if( now < it->second + GXS_POSTED_CONFIG_MAX_TIME_NOTIFY_STORAGE)
+					mKnownPosted.insert(*it) ;
+		}
+
+		delete item ;
+	}
+	return true;
+}
+
+RsSerialiser* p3PostBase::setupSerialiser()
+{
+	RsSerialiser* rss = new RsSerialiser;
+	rss->addSerialType(new GxsPostedConfigSerializer());
+
+	return rss;
+}
+
--- a/libretroshare/src/services/p3postbase.h
+++ b/libretroshare/src/services/p3postbase.h
@ -63,39 +63,44 @@ bool encodePostCache(std::string &str, const PostStats &s);
 bool extractPostCache(const std::string &str, PostStats &s);


-class p3PostBase: public RsGenExchange, public GxsTokenQueue, public RsTickEvent
+class p3PostBase: public RsGenExchange, public GxsTokenQueue, public RsTickEvent, public p3Config
 {
-	public:
+public:

 	p3PostBase(RsGeneralDataService *gds, RsNetworkExchangeService *nes, RsGixs* gixs,
-	RsSerialType* serviceSerialiser, uint16_t serviceType);
+	           RsSerialType* serviceSerialiser, uint16_t serviceType);

-virtual void service_tick();
+	virtual void service_tick();

-	protected:
+protected:

-virtual void notifyChanges(std::vector<RsGxsNotify*>& changes);
+	virtual void notifyChanges(std::vector<RsGxsNotify*>& changes);

-        // Overloaded from GxsTokenQueue for Request callbacks.
-virtual void handleResponse(uint32_t token, uint32_t req_type);
+	// Overloaded from GxsTokenQueue for Request callbacks.
+	virtual void handleResponse(uint32_t token, uint32_t req_type);

-        // Overloaded from RsTickEvent.
-virtual void handle_event(uint32_t event_type, const std::string &elabel);
+	// Overloaded from RsTickEvent.
+	virtual void handle_event(uint32_t event_type, const std::string &elabel);

-	public:
+	// overloads p3Config
+	virtual RsSerialiser* setupSerialiser() override;                            // @see p3Config::setupSerialiser()
+	virtual bool saveList(bool &cleanup, std::list<RsItem *>&saveList) override; // @see p3Config::saveList(bool &cleanup, std::list<RsItem *>&)
+	virtual bool loadList(std::list<RsItem *>& loadList) override;               // @see p3Config::loadList(std::list<RsItem *>&)

-        //////////////////////////////////////////////////////////////////////////////
+public:

-virtual void setMessageReadStatus(uint32_t& token, const RsGxsGrpMsgIdPair& msgId, bool read);
+	//////////////////////////////////////////////////////////////////////////////
+
+	virtual void setMessageReadStatus(uint32_t& token, const RsGxsGrpMsgIdPair& msgId, bool read);


-	protected:
+protected:

-	p3GxsCommentService *mCommentService;	
+	p3GxsCommentService *mCommentService;

-	private:
+private:

-static uint32_t postBaseAuthenPolicy();
+	static uint32_t postBaseAuthenPolicy();

 	// Background processing.
 	void background_tick();
@ -116,13 +121,14 @@ static uint32_t postBaseAuthenPolicy();
 	bool background_cleanup();


-	RsMutex mPostBaseMtx; 
+	RsMutex mPostBaseMtx;

 	bool mBgProcessing;
 	bool mBgIncremental;
-        std::list<RsGxsGroupId> mBgGroupList;
-        std::map<RsGxsMessageId, PostStats> mBgStatsMap; 
+	std::list<RsGxsGroupId> mBgGroupList;
+	std::map<RsGxsMessageId, PostStats> mBgStatsMap;

+	std::map<RsGxsGroupId,rstime_t> mKnownPosted;
 };

 #endif 
--- a/retroshare-gui/src/gui/PhotoShare/AlbumDialog.ui
+++ b/retroshare-gui/src/gui/PhotoShare/AlbumDialog.ui
@ -16,262 +16,259 @@
  <property name="sizeGripEnabled">
   <bool>true</bool>
  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_4">
-   <item>
+  <layout class="QGridLayout" name="gridLayout_5">
+   <item row="0" column="0" colspan="2">
    <widget class="HeaderFrame" name="headerFrame">
     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
+      <enum>QFrame::NoFrame</enum>
     </property>
     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
+      <enum>QFrame::Plain</enum>
     </property>
    </widget>
   </item>
-   <item>
+   <item row="1" column="0">
+    <layout class="QGridLayout" name="gridLayout_3">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_thumbNail">
+       <property name="minimumSize">
+        <size>
+         <width>64</width>
+         <height>64</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>TextLabel</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <spacer name="verticalSpacer">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>12</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="1">
+    <layout class="QGridLayout" name="gridLayout_4">
+     <property name="topMargin">
+      <number>6</number>
+     </property>
+     <item row="1" column="1">
+      <widget class="QLineEdit" name="lineEdit_Category">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="lineEdit_Caption">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_7">
+       <property name="text">
+        <string>Category:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_8">
+       <property name="text">
+        <string>Caption</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_9">
+       <property name="text">
+        <string>Album Title:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="lineEdit_Title">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <spacer name="verticalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>568</width>
+         <height>6</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="0" colspan="2">
    <widget class="QFrame" name="frame">
     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
+       <verstretch>1</verstretch>
      </sizepolicy>
     </property>
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_3" stretch="0,10,0">
-      <item>
-       <widget class="QFrame" name="frame_2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-          <horstretch>10</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <layout class="QGridLayout" name="gridLayout">
-         <property name="horizontalSpacing">
-          <number>6</number>
-         </property>
-         <property name="verticalSpacing">
-          <number>2</number>
-         </property>
-         <item row="0" column="2">
-          <widget class="QLineEdit" name="lineEdit_Title">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QLabel" name="label_7">
-           <property name="text">
-            <string>Category:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="2">
-          <widget class="QLineEdit" name="lineEdit_Category">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="0" rowspan="3">
-          <widget class="QFrame" name="albumGroup">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-             <horstretch>0</horstretch>
-             <verstretch>1</verstretch>
-            </sizepolicy>
-           </property>
-           <layout class="QVBoxLayout" name="verticalLayout_2">
-            <item>
-             <widget class="QLabel" name="label_thumbNail">
-              <property name="minimumSize">
-               <size>
-                <width>64</width>
-                <height>64</height>
-               </size>
-              </property>
-              <property name="text">
-               <string>TextLabel</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="verticalSpacer">
-              <property name="orientation">
-               <enum>Qt::Vertical</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>20</width>
-                <height>40</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item row="2" column="2">
-          <widget class="QLineEdit" name="lineEdit_Caption">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1">
-          <widget class="QLabel" name="label_8">
-           <property name="text">
-            <string>Caption</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QLabel" name="label_9">
-           <property name="text">
-            <string>Album Title:</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <widget class="QWidget" name="widget" native="true">
-        <layout class="QVBoxLayout" name="verticalLayout">
-         <item>
-          <widget class="QLabel" name="label_10">
-           <property name="text">
-            <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_10">
+        <property name="text">
+         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:600;&quot;&gt; Drag &amp;amp; Drop to insert pictures. Click on a picture to edit details below.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QScrollArea" name="scrollAreaPhotos">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-             <horstretch>0</horstretch>
-             <verstretch>10</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="acceptDrops">
-            <bool>true</bool>
-           </property>
-           <property name="horizontalScrollBarPolicy">
-            <enum>Qt::ScrollBarAsNeeded</enum>
-           </property>
-           <property name="widgetResizable">
-            <bool>true</bool>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-           </property>
-           <widget class="PhotoDrop" name="scrollAreaWidgetContents">
-            <property name="geometry">
-             <rect>
-              <x>0</x>
-              <y>0</y>
-              <width>737</width>
-              <height>315</height>
-             </rect>
-            </property>
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-              <horstretch>0</horstretch>
-              <verstretch>10</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="styleSheet">
-             <string notr="true">QWidget#scrollAreaWidgetContents{border: none;}</string>
-            </property>
-            <layout class="QGridLayout" name="gridLayout_2"/>
-           </widget>
-          </widget>
-         </item>
-        </layout>
+        </property>
       </widget>
      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QPushButton" name="pushButton_AddPhoto">
-          <property name="text">
-           <string>Add Photo</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pushButton_EditPhoto">
-          <property name="text">
-           <string>Edit Photo</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="pushButton_DeletePhoto">
-          <property name="text">
-           <string>Delete Photo</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>68</width>
-            <height>17</height>
-           </size>
-          </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">
-           <string>Publish Photos</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
+      <item row="1" column="0">
+       <widget class="QScrollArea" name="scrollAreaPhotos">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>10</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="acceptDrops">
+         <bool>true</bool>
+        </property>
+        <property name="horizontalScrollBarPolicy">
+         <enum>Qt::ScrollBarAsNeeded</enum>
+        </property>
+        <property name="widgetResizable">
+         <bool>true</bool>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+        </property>
+        <widget class="PhotoDrop" name="scrollAreaWidgetContents">
+         <property name="geometry">
+          <rect>
+           <x>0</x>
+           <y>0</y>
+           <width>757</width>
+           <height>395</height>
+          </rect>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>10</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="styleSheet">
+          <string notr="true">QWidget#scrollAreaWidgetContents{border: none;}</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_2"/>
+        </widget>
+       </widget>
      </item>
     </layout>
    </widget>
   </item>
+   <item row="3" column="0" colspan="2">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="leftMargin">
+      <number>6</number>
+     </property>
+     <property name="topMargin">
+      <number>6</number>
+     </property>
+     <property name="rightMargin">
+      <number>6</number>
+     </property>
+     <property name="bottomMargin">
+      <number>6</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="pushButton_AddPhoto">
+       <property name="text">
+        <string>Add Photo</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_EditPhoto">
+       <property name="text">
+        <string>Edit Photo</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton_DeletePhoto">
+       <property name="text">
+        <string>Delete Photo</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>68</width>
+         <height>17</height>
+        </size>
+       </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">
+        <string>Publish Photos</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
  </layout>
 </widget>
 <customwidgets>
--- a/retroshare-gui/src/gui/PhotoShare/AlbumItem.ui
+++ b/retroshare-gui/src/gui/PhotoShare/AlbumItem.ui
@ -6,8 +6,8 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>229</width>
-    <height>234</height>
+    <width>230</width>
+    <height>217</height>
   </rect>
  </property>
  <property name="windowTitle">
@ -28,15 +28,51 @@ border-radius: 10px}</string>
     <property name="frameShadow">
      <enum>QFrame::Raised</enum>
     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
-      <item>
-       <widget class="QLabel" name="label_Thumbnail">
-        <property name="text">
-         <string>TextLabel</string>
-        </property>
-       </widget>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Preferred</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>18</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QLabel" name="label_Thumbnail">
+          <property name="text">
+           <string>TextLabel</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Preferred</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>18</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
      </item>
-      <item>
+      <item row="1" column="0">
       <layout class="QHBoxLayout" name="horizontalLayout_2">
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout">
@ -91,7 +127,7 @@ p, li { white-space: pre-wrap; }
        </item>
       </layout>
      </item>
-      <item>
+      <item row="2" column="0">
       <spacer name="verticalSpacer">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
--- 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));
  }
 }
--- 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>
--- a/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui
+++ b/retroshare-gui/src/gui/PhotoShare/PhotoShare.ui
@ -38,8 +38,8 @@
         <string>Create Album</string>
        </property>
        <property name="icon">
-         <iconset resource="../images.qrc">
-          <normaloff>:/images/add_image24.png</normaloff>:/images/add_image24.png</iconset>
+         <iconset resource="Photo_images.qrc">
+          <normaloff>:/images/album_create_64.png</normaloff>:/images/album_create_64.png</iconset>
        </property>
        <property name="iconSize">
         <size>
@ -62,7 +62,7 @@
        </property>
        <property name="icon">
         <iconset resource="../images.qrc">
-          <normaloff>:/images/add_image24.png</normaloff>:/images/add_image24.png</iconset>
+          <normaloff>:/images/edit_16.png</normaloff>:/images/edit_16.png</iconset>
        </property>
        <property name="iconSize">
         <size>
@ -73,6 +73,9 @@
        <property name="toolButtonStyle">
         <enum>Qt::ToolButtonTextBesideIcon</enum>
        </property>
+        <property name="autoRaise">
+         <bool>true</bool>
+        </property>
       </widget>
      </item>
      <item>
@ -283,7 +286,7 @@
         <x>0</x>
         <y>0</y>
         <width>804</width>
-         <height>197</height>
+         <height>208</height>
        </rect>
       </property>
       <property name="styleSheet">
@ -319,7 +322,7 @@
         <x>0</x>
         <y>0</y>
         <width>804</width>
-         <height>196</height>
+         <height>208</height>
        </rect>
       </property>
       <property name="styleSheet">
--- 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));
  }
 }

--- 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>
--- 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>
--- a/retroshare-gui/src/gui/icons/fullscreen-exit.png
+++ b/retroshare-gui/src/gui/icons/fullscreen-exit.png
--- a/retroshare-gui/src/gui/icons/fullscreen.png
+++ b/retroshare-gui/src/gui/icons/fullscreen.png