Add Download All files in Channel post

2024-12-26 16:09:35 -05:00 · 2020-11-06 18:05:39 +01:00 · 2020-11-06 18:05:39 +01:00 · c5a80cce36
commit c5a80cce36
parent e0ce5632ef
5 changed files with 109 additions and 47 deletions
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.cpp
@ -284,6 +284,7 @@ void GxsChannelFilesStatusWidget::download()

 	rsFiles->FileRequest(mFile.mName, mFile.mHash, mFile.mSize, destination, RS_FILE_REQ_ANONYMOUS_ROUTING, sources);

+	emit onButtonClick();// Signals the parent widget to e.g. update the downloadable file count
 	check();
 }

@ -291,6 +292,7 @@ void GxsChannelFilesStatusWidget::pause()
 {
 	rsFiles->FileControl(mFile.mHash, RS_FILE_CTRL_PAUSE);

+	emit onButtonClick();// Signals the parent widget to e.g. update the downloadable file count
 	check();
 }

@ -298,6 +300,7 @@ void GxsChannelFilesStatusWidget::resume()
 {
 	rsFiles->FileControl(mFile.mHash, RS_FILE_CTRL_START);

+	emit onButtonClick();// Signals the parent widget to e.g. update the downloadable file count
 	check();
 }

@ -309,6 +312,7 @@ void GxsChannelFilesStatusWidget::cancel()

 	rsFiles->FileCancel(mFile.mHash);

+	emit onButtonClick();// Signals the parent widget to e.g. update the downloadable file count
 	check();
 }

--- a/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.h
@ -37,6 +37,10 @@ public:
 	explicit GxsChannelFilesStatusWidget(const RsGxsFile &file, QWidget *parent = 0);
 	~GxsChannelFilesStatusWidget();

+signals:
+
+	void onButtonClick();
+
 private slots:
 	void check();
 	void download();
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp
@ -56,7 +56,7 @@
 * #define DEBUG_CHANNEL
 ***/

-static const int mTokenTypeGroupData = 1;
+//static const int mTokenTypeGroupData = 1;

 static const int CHANNEL_TABS_DETAILS= 0;
 static const int CHANNEL_TABS_POSTS  = 1;
@ -268,12 +268,16 @@ void ChannelPostDelegate::setWidgetGrid(bool use_grid)
 //===                                                  ChannelPostFilesDelegate                                                               ===//
 //===============================================================================================================================================//

-QWidget *ChannelPostFilesDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex& index) const
+QWidget *ChannelPostFilesDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &/*option*/, const QModelIndex& index) const
 {
 	ChannelPostFileInfo file = index.data(Qt::UserRole).value<ChannelPostFileInfo>() ;

 	if(index.column() == RsGxsChannelPostFilesModel::COLUMN_FILES_FILE)
-		return new GxsChannelFilesStatusWidget(file,parent);
+	{
+		GxsChannelFilesStatusWidget* w = new GxsChannelFilesStatusWidget(file,parent);
+		connect(w,SIGNAL(onButtonClick()),this->parent(),SLOT(updateDAll_PB()));
+		return w;
+	}
 	else
 		return NULL;
 }
@ -381,7 +385,7 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
    connect(ui->commentsDialog,SIGNAL(commentsLoaded(int)),this,SLOT(updateCommentsCount(int)));

    ui->channelPostFiles_TV->setModel(mChannelPostFilesModel = new RsGxsChannelPostFilesModel(this));
-    ui->channelPostFiles_TV->setItemDelegate(new ChannelPostFilesDelegate());
+    ui->channelPostFiles_TV->setItemDelegate(new ChannelPostFilesDelegate(this));
    ui->channelPostFiles_TV->setPlaceholderText(tr("No files in this post, or no post selected"));
    ui->channelPostFiles_TV->setSortingEnabled(true);
    ui->channelPostFiles_TV->sortByColumn(3, Qt::AscendingOrder);	// sort by time
@ -391,7 +395,7 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
    connect(ui->channelFiles_TV->header(),SIGNAL(sortIndicatorChanged(int,Qt::SortOrder)), this, SLOT(sortColumnFiles(int,Qt::SortOrder)));

    ui->channelFiles_TV->setModel(mChannelFilesModel = new RsGxsChannelPostFilesModel());
-    ui->channelFiles_TV->setItemDelegate(mFilesDelegate = new ChannelPostFilesDelegate());
+    ui->channelFiles_TV->setItemDelegate(mFilesDelegate = new ChannelPostFilesDelegate(this));
    ui->channelFiles_TV->setPlaceholderText(tr("No files in the channel, or no channel selected"));
    ui->channelFiles_TV->setSortingEnabled(true);
    ui->channelFiles_TV->sortByColumn(3, Qt::AscendingOrder);	// sort by time
@ -404,6 +408,9 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
    ui->postName_LB->hide();
    ui->postTime_LB->hide();
    ui->postLogo_LB->hide();
+    ui->postDAll_PB->hide();
+
+    connect(ui->postDAll_PB,SIGNAL(clicked()),this,SLOT(download()));

    ui->postDetails_TE->setPlaceholderText(tr("No text to display"));

@ -659,6 +666,34 @@ void GxsChannelPostsWidgetWithModel::download()

        rsFiles->FileRequest(file.mName, file.mHash, file.mSize, destination, RS_FILE_REQ_ANONYMOUS_ROUTING, sources);
    }
+
+	ui->postDAll_PB->hide();
+}
+
+void GxsChannelPostsWidgetWithModel::updateDAll_PB()
+{
+	QModelIndex index = ui->postsTree->selectionModel()->currentIndex();
+	RsGxsChannelPost post = index.data(Qt::UserRole).value<RsGxsChannelPost>() ;
+
+	size_t newFileToDl = 0;
+	uint64_t newFileTotalSize = 0;
+	QString newFilesDetails;
+
+	for(auto& file:post.mFiles)
+	{
+		FileInfo fileInfo;
+		if (!rsFiles->FileDetails(file.mHash, RS_FILE_HINTS_DOWNLOAD | RS_FILE_HINTS_SPEC_ONLY, fileInfo)) {
+			++newFileToDl;
+			newFileTotalSize += file.mSize;
+			newFilesDetails += QString::fromUtf8(file.mName.c_str()) + " " + misc::friendlyUnit(file.mSize) + "\n";
+		}
+	}
+
+	ui->postDAll_PB->setHidden(newFileToDl == 0);
+	ui->postDAll_PB->setToolTip((newFileToDl == 1 ? tr("Download this file:") : tr("Download All these %1 files:").arg(newFileToDl) ) + "\n"
+	                            + newFilesDetails
+	                            + tr("Totaling: %1").arg(misc::friendlyUnit(newFileTotalSize)));
+
 }

 void GxsChannelPostsWidgetWithModel::editPost()
@ -793,6 +828,8 @@ void GxsChannelPostsWidgetWithModel::showPostDetails()

 		RsThread::async([postId]() { rsGxsChannels->markRead(postId, true) ; } );
 	}
+
+	updateDAll_PB();
 }

 void GxsChannelPostsWidgetWithModel::updateCommentsCount(int n)
@ -891,6 +928,8 @@ void GxsChannelPostsWidgetWithModel::postChannelPostLoad()

 void GxsChannelPostsWidgetWithModel::updateDisplay(bool complete)
 {
+	// First, clear all widget
+	blank();
 #ifdef DEBUG_CHANNEL
    std::cerr << "udateDisplay: groupId()=" << groupId()<< std::endl;
 #endif
@ -911,7 +950,7 @@ void GxsChannelPostsWidgetWithModel::updateDisplay(bool complete)
    }
 	if(complete) 	// need to update the group data, reload the messages etc.
 	{
-#warning todo
+#warning csoler 2020-06-02 : todo
 		//saveExpandedItems(mSavedExpandedMessages);

        //if(mGroupId != mChannelPostsModel->currentGroupId())
@ -972,7 +1011,7 @@ QString GxsChannelPostsWidgetWithModel::groupName(bool)
    return QString::fromUtf8(mGroup.mMeta.mGroupName.c_str());
 }

-void GxsChannelPostsWidgetWithModel::groupNameChanged(const QString &name)
+void GxsChannelPostsWidgetWithModel::groupNameChanged(const QString &/*name*/)
 {
 //	if (groupId().isNull()) {
 //		ui->nameLabel->setText(tr("No Channel Selected"));
@ -1233,6 +1272,7 @@ void GxsChannelPostsWidgetWithModel::blank()
 	ui->postLogo_LB->hide();
 	ui->postName_LB->hide();
 	ui->postTime_LB->hide();
+	ui->postDAll_PB->hide();
 	groupNameChanged(QString());

 }
@ -1323,7 +1363,7 @@ void GxsChannelPostsWidgetWithModel::setAllMessagesReadDo(bool read, uint32_t& /
 	if (groupId().isNull() || !IS_GROUP_SUBSCRIBED(mGroup.mMeta.mSubscribeFlags))
 		return;

-    QModelIndex src_index;
+	//QModelIndex src_index;

 	mChannelPostsModel->setAllMsgReadStatus(read);
 }
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h
@ -143,6 +143,7 @@ private slots:
 	void showPostDetails();
 	void updateGroupData();
 	void download();
+	void updateDAll_PB();
 	void createMsg();
 //	void toggleAutoDownload();
 	void subscribeGroup(bool subscribe);
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui
@ -380,7 +380,7 @@
          <string notr="true">&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:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Noto Sans'; font-size:10pt; 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-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Description&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="textInteractionFlags">
@ -496,6 +496,17 @@ p, li { white-space: pre-wrap; }
                </property>
               </spacer>
              </item>
+              <item>
+               <widget class="QPushButton" name="postDAll_PB">
+                <property name="text">
+                 <string/>
+                </property>
+                <property name="icon">
+                 <iconset resource="../icons.qrc">
+                  <normaloff>:/icons/png/download.png</normaloff>:/icons/png/download.png</iconset>
+                </property>
+               </widget>
+              </item>
             </layout>
            </item>
            <item>
@ -506,6 +517,7 @@ p, li { white-space: pre-wrap; }
                 <font>
                  <weight>75</weight>
                  <bold>true</bold>
+                  <kerning>true</kerning>
                 </font>
                </property>
                <property name="text">
@ -613,24 +625,25 @@ p, li { white-space: pre-wrap; }
 </widget>
 <customwidgets>
  <customwidget>
-   <class>GxsIdLabel</class>
-   <extends>QLabel</extends>
-   <header>gui/gxs/GxsIdLabel.h</header>
+   <class>LineEditClear</class>
+   <extends>QLineEdit</extends>
+   <header>gui/common/LineEditClear.h</header>
  </customwidget>
  <customwidget>
   <class>SubscribeToolButton</class>
   <extends>QToolButton</extends>
   <header>gui/common/SubscribeToolButton.h</header>
  </customwidget>
+  <customwidget>
+   <class>GxsIdLabel</class>
+   <extends>QLabel</extends>
+   <header>gui/gxs/GxsIdLabel.h</header>
+  </customwidget>
  <customwidget>
   <class>RSTreeView</class>
   <extends>QTreeView</extends>
   <header>gui/common/RSTreeView.h</header>
-  </customwidget>
-  <customwidget>
-   <class>LineEditClear</class>
-   <extends>QLineEdit</extends>
-   <header>gui/common/LineEditClear.h</header>
+   <container>1</container>
  </customwidget>
  <customwidget>
   <class>GxsCommentDialog</class>