fixed auto-layout of thumbnails

retroshare-gui/src/gui/common/RSTreeView.cpp

@@ -19,12 +19,18 @@
  *******************************************************************************/
 
 #include <QPainter>
+#include <QResizeEvent>
 #include "RSTreeView.h"
 
 RSTreeView::RSTreeView(QWidget *parent) : QTreeView(parent)
 {
 }
 
+void RSTreeView::resizeEvent(QResizeEvent *e)
+{
+    emit sizeChanged(e->size());
+}
+
 void RSTreeView::setPlaceholderText(const QString &text)
 {
 	placeholderText = text;

retroshare-gui/src/gui/common/RSTreeView.h

@@ -33,8 +33,12 @@ public:
 
 	void setPlaceholderText(const QString &text);
 
+signals:
+    void sizeChanged(QSize);
+
 protected:
-	void paintEvent(QPaintEvent *event);
+    virtual void resizeEvent(QResizeEvent *e) override;
+	virtual void paintEvent(QPaintEvent *event) override;
 
 	QString placeholderText;
 };

retroshare-gui/src/gui/gxschannels/GxsChannelFilesStatusWidget.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>367</width>
+    <width>421</width>
-    <height>27</height>
+    <height>29</height>
    </rect>
   </property>
   <property name="windowTitle">

retroshare-gui/src/gui/gxschannels/GxsChannelPostFilesModel.cpp

@@ -33,7 +33,7 @@
 
 #include "GxsChannelPostFilesModel.h"
 
-#define DEBUG_CHANNEL_MODEL
+//#define DEBUG_CHANNEL_MODEL
 
 Q_DECLARE_METATYPE(RsGxsFile)
 

retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.cpp

@@ -32,7 +32,7 @@
 #include "retroshare/rsgxschannels.h"
 #include "retroshare/rsexpr.h"
 
-#define DEBUG_CHANNEL_MODEL
+//#define DEBUG_CHANNEL_MODEL
 
 Q_DECLARE_METATYPE(RsMsgMetaData)
 
@@ -221,6 +221,21 @@ Qt::ItemFlags RsGxsChannelPostsModel::flags(const QModelIndex& index) const
     return QAbstractItemModel::flags(index);
 }
 
+void RsGxsChannelPostsModel::setNumColumns(int n)
+{
+     preMods();
+
+	beginRemoveRows(QModelIndex(),0,rowCount()-1);
+    endRemoveRows();
+
+    mColumns = n;
+
+	beginInsertRows(QModelIndex(),0,rowCount()-1);
+    endInsertRows();
+
+	postMods();
+}
+
 quintptr RsGxsChannelPostsModel::getChildRef(quintptr ref,int index) const
 {
 	if (index < 0)
@@ -675,7 +690,7 @@ void RsGxsChannelPostsModel::setPosts(const RsGxsChannelGroup& group, std::vecto
 {
     preMods();
 
-	beginRemoveRows(QModelIndex(),0,mPosts.size()-1);
+	beginRemoveRows(QModelIndex(),0,rowCount()-1);
     endRemoveRows();
 
     mPosts.clear();
@@ -692,7 +707,7 @@ void RsGxsChannelPostsModel::setPosts(const RsGxsChannelGroup& group, std::vecto
    // debug_dump();
 #endif
 
-	beginInsertRows(QModelIndex(),0,mPosts.size()-1);
+	beginInsertRows(QModelIndex(),0,rowCount()-1);
     endInsertRows();
 
 	postMods();

retroshare-gui/src/gui/gxschannels/GxsChannelPostsModel.h

@@ -110,6 +110,7 @@ public:
     const RsGxsGroupId& currentGroupId() const;
 
     void setTreeMode(TreeMode mode) ;
+    void setNumColumns(int n);
 #ifdef TODO
     void setSortMode(SortMode mode) ;
 

retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.cpp

@@ -61,8 +61,21 @@ static const int CHANNEL_TABS_POSTS  = 1;
 /* View mode */
 #define VIEW_MODE_FEEDS  1
 #define VIEW_MODE_FILES  2
+
+// Size of thumbnails as a function of the height of the font. An aspect ratio of 3/4 is good.
+
+#define THUMBNAIL_W  4
+#define THUMBNAIL_H  6
+
+// Determine the Shape and size of cells as a factor of the font height. An aspect ratio of 3/4 is what's needed
+// for the image, so it's important that the height is a bit larger so as to leave some room for the text.
+//
+//
 #define COLUMN_SIZE_FONT_FACTOR_W  6
-#define COLUMN_SIZE_FONT_FACTOR_H 12
+#define COLUMN_SIZE_FONT_FACTOR_H  10
+
+// This variable determines the zoom factor on the text below thumbnails. 2.0 is mostly correct for all screen.
+#define THUMBNAIL_OVERSAMPLE_FACTOR 2.0
 
 Q_DECLARE_METATYPE(RsGxsFile)
 
@@ -95,8 +108,8 @@ public:
         lb->setPixmap(thumbnail);
 
 		QFontMetricsF fm(font());
-		int W = 8  * fm.height() ;
+		int W = THUMBNAIL_OVERSAMPLE_FACTOR * THUMBNAIL_W * fm.height() ;
-		int H = 12 * fm.height() ;
+		int H = THUMBNAIL_OVERSAMPLE_FACTOR * THUMBNAIL_H * fm.height() ;
 
         lb->setFixedSize(W,H);
 
@@ -183,18 +196,19 @@ void ChannelPostDelegate::paint(QPainter * painter, const QStyleOptionViewItem &
 	//w.setFixedWidth(option.rect.width());
 
 	QPixmap pixmap(w.size());
-	pixmap.fill(option.palette.color(QPalette::Background));	// choose the background
+	pixmap.fill(QRgb(0x00ffffff));	// choose a fully transparent background
 	w.render(&pixmap,QPoint(),QRegion(),QWidget::DrawChildren );// draw the widgets, not the background
 
     // debug
-    if(index.row()==0 && index.column()==0)
+ 	// if(index.row()==0 && index.column()==0)
-	{
+	// {
-		QFile file("yourFile.png");
+	// 	QFile file("yourFile.png");
-		file.open(QIODevice::WriteOnly);
+	// 	file.open(QIODevice::WriteOnly);
-		pixmap.save(&file, "PNG");
+	// 	pixmap.save(&file, "PNG");
-        std::cerr << "Saved pxmap to png" << std::endl;
+ 	//  std::cerr << "Saved pxmap to png" << std::endl;
-	}
+	// }
-    std::cerr << "option.rect = " << option.rect.width() << "x" << option.rect.height() << ". fm.height()=" << QFontMetricsF(option.font).height() << std::endl;
+    //std::cerr << "option.rect = " << option.rect.width() << "x" << option.rect.height() << ". fm.height()=" << QFontMetricsF(option.font).height() << std::endl;
+
 	painter->drawPixmap(option.rect.topLeft(),
                         pixmap.scaled(option.rect.width(),option.rect.width()*w.height()/(float)w.width(),Qt::IgnoreAspectRatio,Qt::SmoothTransformation));
 }
@@ -297,7 +311,7 @@ void ChannelPostFilesDelegate::paint(QPainter * painter, const QStyleOptionViewI
         w.setFixedWidth(option.rect.width());
 
 		QPixmap pixmap(w.size());
-    	pixmap.fill(option.palette.color(QPalette::Background));	// choose the background
+		pixmap.fill(QRgb(0x00ffffff));	// choose a fully transparent background
 		w.render(&pixmap,QPoint(),QRegion(),QWidget::DrawChildren );// draw the widgets, not the background
 
         painter->drawPixmap(option.rect.topLeft(),pixmap);
@@ -344,6 +358,7 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
 
     ui->channelPostFiles_TV->setModel(mChannelPostFilesModel = new RsGxsChannelPostFilesModel());
     ui->channelPostFiles_TV->setItemDelegate(new ChannelPostFilesDelegate());
+    ui->channelPostFiles_TV->setPlaceholderText(tr("Post files"));
 
     connect(ui->postsTree->selectionModel(),SIGNAL(selectionChanged(const QItemSelection&,const QItemSelection&)),this,SLOT(showPostDetails()));
 
@@ -386,6 +401,8 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
 
 	ui->loadingLabel->hide();
 	ui->progressBar->hide();
+    ui->postsTree->setPlaceholderText(tr("Thumbnails"));
+    ui->postsTree->setMinimumWidth(COLUMN_SIZE_FONT_FACTOR_W*QFontMetricsF(font()).height()+1);
 
 	//ui->nameLabel->setMinimumWidth(20);
 
@@ -414,10 +431,23 @@ GxsChannelPostsWidgetWithModel::GxsChannelPostsWidgetWithModel(const RsGxsGroupI
 
 	mEventHandlerId = 0;
 	// Needs to be asynced because this function is called by another thread!
-	rsEvents->registerEventsHandler(
+	rsEvents->registerEventsHandler( [this](std::shared_ptr<const RsEvent> event)
-	            [this](std::shared_ptr<const RsEvent> event)
+    {
-	{ RsQThreadUtils::postToObject([=](){ handleEvent_main_thread(event); }, this ); },
+        RsQThreadUtils::postToObject([=](){ handleEvent_main_thread(event); }, this );
-	            mEventHandlerId, RsEventType::GXS_CHANNELS );
+    }, mEventHandlerId, RsEventType::GXS_CHANNELS );
+
+    connect(ui->postsTree,SIGNAL(sizeChanged(QSize)),this,SLOT(handlePostsTreeSizeChange(QSize)));
+}
+
+void GxsChannelPostsWidgetWithModel::handlePostsTreeSizeChange(QSize s)
+{
+//    adjustSize();
+//
+    int n_columns = std::max(1,(int)floor(s.width() / (COLUMN_SIZE_FONT_FACTOR_W*QFontMetricsF(font()).height())));
+    std::cerr << "nb columns: " << n_columns << std::endl;
+
+    if(n_columns != mChannelPostsModel->columnCount())
+		mChannelPostsModel->setNumColumns(n_columns);
 }
 
 void GxsChannelPostsWidgetWithModel::handleEvent_main_thread(std::shared_ptr<const RsEvent> event)

retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.h

@@ -108,6 +108,7 @@ public:
 protected:
 	/* GxsMessageFramePostWidget */
 	virtual void groupNameChanged(const QString &name);
+
 #ifdef TODO
 	virtual bool insertGroupData(const RsGxsGenericGroupData *data) override;
 #endif
@@ -134,6 +135,7 @@ private slots:
 	void filterChanged(int filter);
 	void setViewMode(int viewMode);
 	void settingsChanged();
+	void handlePostsTreeSizeChange(QSize s);
 
 private:
 	void processSettings(bool load);

retroshare-gui/src/gui/gxschannels/GxsChannelPostsWidgetWithModel.ui

@@ -412,7 +412,7 @@ p, li { white-space: pre-wrap; }
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <widget class="QTreeView" name="postsTree">
+         <widget class="RSTreeView" name="postsTree">
           <property name="sizeAdjustPolicy">
            <enum>QAbstractScrollArea::AdjustToContents</enum>
           </property>
@@ -509,7 +509,7 @@ p, li { white-space: pre-wrap; }
            </attribute>
            <layout class="QVBoxLayout" name="verticalLayout_4">
             <item>
-             <widget class="QTreeView" name="channelPostFiles_TV">
+             <widget class="RSTreeView" name="channelPostFiles_TV">
               <property name="editTriggers">
                <set>QAbstractItemView::CurrentChanged|QAbstractItemView::SelectedClicked</set>
               </property>
@@ -566,6 +566,11 @@ p, li { white-space: pre-wrap; }
    <extends>QLineEdit</extends>
    <header location="global">gui/common/LineEditClear.h</header>
   </customwidget>
+  <customwidget>
+   <class>RSTreeView</class>
+   <extends>QTreeView</extends>
+   <header>gui/common/RSTreeView.h</header>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>