- removed play adn d/l button (channels is now geared toward auto d/l of files)

- enabled unsubscribe on item

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2827 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/feeds/ChanMsgItem.cpp

@@ -47,14 +47,10 @@ ChanMsgItem::ChanMsgItem(FeedHolder *parent, uint32_t feedId, std::string chanId
   /* general ones */
   connect( expandButton, SIGNAL( clicked( void ) ), this, SLOT( toggle ( void ) ) );
   connect( clearButton, SIGNAL( clicked( void ) ), this, SLOT( removeItem ( void ) ) );
-  //connect( gotoButton, SIGNAL( clicked( void ) ), this, SLOT( gotoHome ( void ) ) );
 
-  /* specific ones */
+  /* specific */
-  connect( playButton, SIGNAL( clicked( void ) ), this, SLOT( playMedia ( void ) ) );
   connect( unsubscribeButton, SIGNAL( clicked( void ) ), this, SLOT( unsubscribeChannel ( void ) ) );
-  connect( downloadButton, SIGNAL( clicked( ) ), this, SLOT( downloadMedia () ) );
 
-  
 
   small();
   updateItemStatic();
@@ -123,21 +119,15 @@ void ChanMsgItem::updateItemStatic()
 		layout->addWidget(fi);
 	}
 
-	playButton->setEnabled(false);
 	
 	if (mIsHome)
 	{
-		/* disable buttons */
+		/* disable buttons: deletion facility not enabled with cache services yet */
 		clearButton->setEnabled(false);
-		//gotoButton->setEnabled(false);
-		unsubscribeButton->setEnabled(false);
-
 		clearButton->hide();
 	}
 
-	/* don't really want this at all! */
+
-	unsubscribeButton->hide();
-	//playButton->hide();
 }
 
 
@@ -162,15 +152,7 @@ void ChanMsgItem::updateItem()
 		}
 	}
 
-	/***
-	 * At this point cannot create a playlist....
-	 * so can't enable play for all.
 
-	if (mFileItems.size() > 0)
-	{
-		playButton->setEnabled(true);
-	}
-	***/
 }
 
 
@@ -218,32 +200,20 @@ void ChanMsgItem::gotoHome()
 #endif
 }
 
-/*********** SPECIFIC FUNCTIOSN ***********************/
+/*********** SPECIFIC FUNCTIONS ***********************/
 
 
 void ChanMsgItem::unsubscribeChannel()
 {
-#ifdef DEBUG_ITEM
+ #ifdef DEBUG_ITEM
-	std::cerr << "ChanMsgItem::unsubscribeChannel()";
+ 	std::cerr << "ChanMsgItem::unsubscribeChannel()";
-	std::cerr << std::endl;
+ 	std::cerr << std::endl;
-#endif
+ #endif
+
+	if (rsChannels)
+	{
+		rsChannels->channelSubscribe(mChanId, false);
+	}
+	updateItemStatic();
 }
 
-
-void ChanMsgItem::playMedia()
-{
-#ifdef DEBUG_ITEM
-	std::cerr << "ChanMsgItem::playMedia()";
-	std::cerr << std::endl;
-#endif
-}
-
-void ChanMsgItem::downloadMedia()
-{
-#ifdef DEBUG_ITEM
-	std::cerr << "ChanMsgItem::downloadMedia()";
-	std::cerr << std::endl;
-#endif
-}
-
-

retroshare-gui/src/gui/feeds/ChanMsgItem.h

@@ -49,9 +49,6 @@ private slots:
   	void removeItem();
 	void toggle();
 
-	void playMedia();
-	void downloadMedia();
-
 	void unsubscribeChannel();
 
 	void updateItem();

retroshare-gui/src/gui/feeds/ChanMsgItem.ui

@@ -78,7 +78,7 @@ border-radius: 10px;}</string>
            <string/>
           </property>
           <property name="pixmap">
-           <pixmap resource="../images.qrc">:/images/thumb-default-video.png</pixmap>
+           <pixmap resource="../../../../../retroshare-v0.5.0/retroshare-gui/src/gui/images.qrc">:/images/thumb-default-video.png</pixmap>
           </property>
           <property name="scaledContents">
            <bool>true</bool>
@@ -130,7 +130,7 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
-        <item row="0" column="4" colspan="4">
+        <item row="0" column="4" colspan="3">
          <widget class="QLabel" name="datetimelabel">
           <property name="font">
            <font>
@@ -147,7 +147,7 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
-        <item row="1" column="0" colspan="8">
+        <item row="1" column="0" colspan="7">
          <widget class="QLabel" name="subjectLabel">
           <property name="sizePolicy">
            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
@@ -164,17 +164,6 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
-        <item row="2" column="0">
-         <widget class="QPushButton" name="downloadButton">
-          <property name="text">
-           <string>Download</string>
-          </property>
-          <property name="icon">
-           <iconset resource="../images.qrc">
-            <normaloff>:/images/download16.png</normaloff>:/images/download16.png</iconset>
-          </property>
-         </widget>
-        </item>
         <item row="2" column="2">
          <spacer>
           <property name="orientation">
@@ -206,7 +195,7 @@ p, li { white-space: pre-wrap; }
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../images.qrc">
+           <iconset resource="../../../../../retroshare-v0.5.0/retroshare-gui/src/gui/images.qrc">
             <normaloff>:/images/mail_delete.png</normaloff>:/images/mail_delete.png</iconset>
           </property>
          </widget>
@@ -226,32 +215,12 @@ p, li { white-space: pre-wrap; }
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../images.qrc">
+           <iconset resource="../../../../../retroshare-v0.5.0/retroshare-gui/src/gui/images.qrc">
             <normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
           </property>
          </widget>
         </item>
         <item row="2" column="6">
-         <widget class="QPushButton" name="playButton">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="toolTip">
-           <string>Play Media</string>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="icon">
-           <iconset resource="../images.qrc">
-            <normaloff>:/images/player_play.png</normaloff>:/images/player_play.png</iconset>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="7">
          <widget class="QPushButton" name="expandButton">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -269,7 +238,7 @@ p, li { white-space: pre-wrap; }
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../images.qrc">
+           <iconset resource="../../../../../retroshare-v0.5.0/retroshare-gui/src/gui/images.qrc">
             <normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
           </property>
          </widget>
@@ -337,8 +306,8 @@ border-radius: 10px;}</string>
   </layout>
  </widget>
  <resources>
-  <include location="../images.qrc"/>
+  <include location="../../../../../retroshare-v0.5.0/retroshare-gui/src/gui/images.qrc"/>
-  <include location="../images.qrc"/>
+  <include location="../../../../../retroshare-v0.5.0/retroshare-gui/src/gui/images.qrc"/>
  </resources>
  <connections/>
 </ui>