Added scrollbars in tabs and some home page clean up.

Author: ponchio

relightlab/helpbutton.cpp

@@ -41,8 +41,13 @@ HelpedButton::HelpedButton(QString id, QIcon icon, QString text, QWidget *parent
 
 void HelpedButton::init(QString id) {
 	QHBoxLayout *layout = new QHBoxLayout(this);
+	layout->setSizeConstraint(QHBoxLayout::SetMinimumSize);
+
+
 	button = new QPushButton;
-	button->setProperty("class", "large");
+	//button->setProperty("class", "large");
+	button->setMinimumSize(200, 40);
+	button->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
 	help = new HelpButton(id);
 

relightlab/homeframe.cpp

@@ -26,6 +26,7 @@ HomeFrame::HomeFrame() {
 
 	// Left column
 	QVBoxLayout *leftColumnLayout = new QVBoxLayout();
+	leftColumnLayout->setSizeConstraint(QVBoxLayout::SetMinimumSize);
 
 	// Title label
 	QLabel *titleLabel = new QLabel("<h1>RelightLab</h1>");
@@ -44,8 +45,12 @@ HomeFrame::HomeFrame() {
 	leftColumnLayout->addWidget(recentLabel);
 
 
-	for(QString filename: recentProjects()) {
-		QLabel *label = new QLabel("<a href='" + filename + "'>" + filename + "</a>");
+	for(QString path: recentProjects()) {
+		QFileInfo fileInfo(path);
+		QString filename = fileInfo.fileName();
+		QString directory = fileInfo.absolutePath();
+
+		QLabel *label = new QLabel("<p style='line-height:150%'><a href='" + path + "'>" + filename + "</a><br/><span style='color:grey; font-size:80%;'>" + directory + "</span></p>");
 		label->setProperty("class", "recent");
 		label->setWordWrap(true);
 		leftColumnLayout->addWidget(label);

relightlab/normalsframe.cpp

@@ -28,6 +28,17 @@ NormalsFrame::NormalsFrame(QWidget *parent): QFrame(parent) {
 	group->addButton(png);
 	jpg->setChecked(true);
 
+	content->addWidget(new QLabel("<h2>Flatten normals</h2>"));
+	content->addWidget(radial = new QCheckBox("Radial"));
+	content->addWidget(fourier = new QCheckBox("Fourier"));
+	QHBoxLayout *fourier_layout = new QHBoxLayout;
+	content->addLayout(fourier_layout);
+
+	fourier_layout->addWidget(new HelpLabel("Fourier image percent: ", "normals/flatten"));
+	fourier_layout->addWidget(fourier_radius = new QSpinBox);
+	fourier_radius->setRange(0, 100);
+
+
 	content->addSpacing(30);
 	content->addWidget(new QLabel("<h2>Export 3D surface</h2>"));
 
@@ -43,15 +54,6 @@ NormalsFrame::NormalsFrame(QWidget *parent): QFrame(parent) {
 	content->addWidget(tif = new QCheckBox("TIF: depthmap"));
 	content->addWidget(ply = new QCheckBox("PLY: mesh"));
 
-	content->addWidget(new QLabel("<h2>Flatten normals</h2>"));
-	content->addWidget(radial = new QCheckBox("Radial"));
-	content->addWidget(fourier = new QCheckBox("Fourier"));
-	QHBoxLayout *fourier_layout = new QHBoxLayout;
-	content->addLayout(fourier_layout);
-
-	fourier_layout->addWidget(new HelpLabel("Fourier image percent: ", "normals/flatten"));
-	fourier_layout->addWidget(fourier_radius = new QSpinBox);
-	fourier_radius->setRange(0, 100);
 
 
 	QPushButton *save = new QPushButton("Export");

relightlab/rtiframe.cpp

@@ -40,11 +40,6 @@ RtiFrame::RtiFrame(QWidget *parent): QFrame(parent) {
 	connect(rti_plan, SIGNAL(exportRti()), this, SLOT(exportRti()));
 	return;
 
-/*	content->addWidget(new PtmRow());
-	content->addWidget(new HshRow()); 
-	content->addWidget(new RbfRow()); */
-
-
 	QScrollArea *area = new QScrollArea;
 	area->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
 	area->setWidgetResizable(true);

relightlab/tabwidget.cpp

@@ -1,4 +1,5 @@
 #include "tabwidget.h"
+#include <QScrollArea>
 
 QSize TabBar::tabSizeHint(int index) const{
 	QSize s = QTabBar::tabSizeHint(index);
@@ -34,3 +35,11 @@ TabWidget::TabWidget(QWidget *parent):QTabWidget(parent) {
 	setTabBar(new TabBar);
 	setTabPosition(QTabWidget::West);
 }
+
+
+void TabWidget::addTab(QWidget *widget, QString label) {
+	QScrollArea *scrollArea = new QScrollArea();
+	scrollArea->setWidget(widget);
+	scrollArea->setWidgetResizable(true);
+	QTabWidget::addTab(scrollArea, label);
+}

relightlab/tabwidget.h

@@ -17,6 +17,7 @@ class TabBar: public QTabBar {
 class TabWidget: public QTabWidget {
 public:
 	TabWidget(QWidget *parent = nullptr);
+	void addTab(QWidget *widget, QString label);
 };