initial commit

cexif.cpp

@@ -1,6 +1,8 @@
 #include "cexif.h"
 
 #include <QDebug>
+#include <QImage>
+#include <QPicture>
 
 #include <exiv2/exiv2.hpp>
 
@@ -15,7 +17,12 @@ cEXIF::cEXIF(cEXIFTagList* lpEXIFTagList) :
 
 bool cEXIF::fromFile(const QString& szFileName)
 {
+	if(!QFile::exists(szFileName))
+		return(false);
+
 	m_exifValueList.clear();
+	m_previewList.clear();
+
 	m_szFileName	= "";
 
 	Exiv2::Image::AutoPtr			image		= Exiv2::ImageFactory::open(szFileName.toStdString());
@@ -45,6 +52,24 @@ bool cEXIF::fromFile(const QString& szFileName)
 	m_iHeight		= image->pixelHeight();
 	m_szFileName	= szFileName;
 
+	Exiv2::PreviewManager			previewManager(*image);
+	Exiv2::PreviewPropertiesList	previewPropertiesList	= previewManager.getPreviewProperties();
+
+	for(Exiv2::PreviewPropertiesList::const_iterator i = previewPropertiesList.begin();i != previewPropertiesList.end();i++)
+	{
+		Exiv2::PreviewImage				previewImage			= previewManager.getPreviewImage(*i);
+
+		QImage							image;
+		image.loadFromData(static_cast<const uchar*>(previewImage.pData()), static_cast<qint32>(previewImage.size()));
+		m_previewList.append(image);
+	}
+
+	if(!m_previewList.count())
+	{
+		QImage	image;
+		if(image.load(szFileName))
+			m_previewList.append(image.scaled(160, 120, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation));
+	}
 	return(true);
 }
 
@@ -115,7 +140,7 @@ QString cEXIF::exposureTime()
 {
 	qreal	value	= getTag(0x829a, 5).value<qreal>();
 
-	if(value == 0)
+	if(value == 0.0)
 		return("error");
 
 	if(value >= 1.0)
@@ -173,6 +198,11 @@ QString cEXIF::fileName()
 	return(m_szFileName);
 }
 
+QList<QImage> cEXIF::previewList()
+{
+	return(m_previewList);
+}
+
 QVariant cEXIF::getTag(qint32 iTAGID, qint32 iIFDID)
 {
 	cEXIFTag*	lpTag	= m_lpEXIFTagList->find(iTAGID, iIFDID);

cexif.h

@@ -4,6 +4,7 @@
 #include <QString>
 #include <QVariant>
 #include <QDateTime>
+#include <QImage>
 
 #include <QMetaType>
 #include <QList>
@@ -420,13 +421,20 @@ public:
 	 * @return QString
 	 */
 	QString			fileName();
+	/**
+	 * @brief
+	 *
+	 * @return QList<QImage>
+	 */
+	QList<QImage>	previewList();
 
 private:
-	cEXIFTagList*	m_lpEXIFTagList; /**< TODO: describe */
-	cEXIFValueList	m_exifValueList; /**< TODO: describe */
-	qint32			m_iWidth; /**< TODO: describe */
-	qint32			m_iHeight; /**< TODO: describe */
-	QString			m_szFileName; /**< TODO: describe */
+	cEXIFTagList*	m_lpEXIFTagList;	/**< TODO: describe */
+	cEXIFValueList	m_exifValueList;	/**< TODO: describe */
+	qint32			m_iWidth;			/**< TODO: describe */
+	qint32			m_iHeight;			/**< TODO: describe */
+	QString			m_szFileName;		/**< TODO: describe */
+	QList<QImage>	m_previewList;		/**< TODO: describe */
 
 	/**
 	 * @brief

cmainwindow.cpp

@@ -6,164 +6,90 @@
 #include <QStringList>
 #include <QFile>
 #include <QTextStream>
+#include <QSettings>
+#include <QLabel>
 
 
-cMainWindow::cMainWindow(QWidget *parent) :
+cMainWindow::cMainWindow(cSplashScreen* lpSplashScreen, QWidget *parent) :
 	QMainWindow(parent),
-	ui(new Ui::cMainWindow)
+	ui(new Ui::cMainWindow),
+	m_lpSplashScreen(lpSplashScreen)
 {
-	ui->setupUi(this);
+	initUI();
+	createActions();
 
 	cEXIF	exif(&m_exifTagList);
+//	exif.fromFile(QDir::homePath() + "\\OneDrive - WINDESIGN\\exif-samples-master\\20181123_125857.jpg");
+//	exif.fromFile(QDir::homePath() + "\\OneDrive - WINDESIGN\\exif-samples-master\\IMG_1371.CR2");
+//	exif.fromFile(QDir::homePath() + "\\OneDrive - WINDESIGN\\exif-samples-master\\tiff\\BSG1.tiff");
+//	exif.fromFile(QDir::homePath() + "\\OneDrive - WINDESIGN\\exif-samples-master\\IMG_3444.CR2");
+//	exif.fromFile(QDir::homePath() + "\\OneDrive - WINDESIGN\\exif-samples-master\\IMG_0248_49_50_easyHDR-dramatic-strong.jpg");
+//	exif.fromFile(QDir::homePath() + "\\OneDrive - WINDESIGN\\exif-samples-master\\IMG_3466_7_8_easyHDR-dramatic-dark.tif");
+	exif.fromFile(QDir::homePath() + "\\OneDrive - WINDESIGN\\exif-samples-master\\IMG_0248_49_50_easyHDR-dramatic-strong.jpg");
 
-	exif.fromFile("C:\\Users\\VET0572\\Pictures\\IMG_1371.CR2");
-	qDebug() << "===========================================================================";
-	qDebug() << exif.fileName();
-	qDebug() << "---------------------------------------------------------------------------";
-	qDebug() << "ImageWidth: " << exif.imageWidth();
-	qDebug() << "ImageHeight: " << exif.imageHeight();
-	qDebug() << "Make: " << exif.cameraMake();
-	qDebug() << "Model: " << exif.cameraModel();
-	qDebug() << "DateTime: " << exif.dateTime();
-	qDebug() << "FNumber: " << exif.fNumber();
-	qDebug() << "ISOSpeedRatings: " << exif.iso();
-	qDebug() << "Flash: " << exif.flash();
-	qDebug() << "FocalLength: " << exif.focalLength();
-	qDebug() << "LensMake: " << exif.lensMake();
-	qDebug() << "LensModel: " << exif.lensModel();
-	qDebug() << "ExposureTime: " << exif.exposureTime();
-	qDebug() << "ExposureBias: " << exif.exposureBias();
-	qDebug() << "ExifVersion: " << exif.exifVersion();
-	qDebug() << "DateTimeOriginal: " << exif.dateTimeOriginal();
-	qDebug() << "DateTimeDigitized: " << exif.dateTimeDigitized();
-	qDebug() << "WhiteBalance: " << exif.whiteBalance();
-	qDebug() << "FocalLengthIn35mmFilm: " << exif.focalLength35();
-	qDebug() << "GPS: " << exif.gps();
-
-	exif.fromFile("C:\\Users\\VET0572\\Pictures\\IMG_1372.CR2");
-	qDebug() << "===========================================================================";
-	qDebug() << exif.fileName();
-	qDebug() << "---------------------------------------------------------------------------";
-	qDebug() << "ImageWidth: " << exif.imageWidth();
-	qDebug() << "ImageHeight: " << exif.imageHeight();
-	qDebug() << "Make: " << exif.cameraMake();
-	qDebug() << "Model: " << exif.cameraModel();
-	qDebug() << "DateTime: " << exif.dateTime();
-	qDebug() << "FNumber: " << exif.fNumber();
-	qDebug() << "ISOSpeedRatings: " << exif.iso();
-	qDebug() << "Flash: " << exif.flash();
-	qDebug() << "FocalLength: " << exif.focalLength();
-	qDebug() << "LensMake: " << exif.lensMake();
-	qDebug() << "LensModel: " << exif.lensModel();
-	qDebug() << "ExposureTime: " << exif.exposureTime();
-	qDebug() << "ExposureBias: " << exif.exposureBias();
-	qDebug() << "ExifVersion: " << exif.exifVersion();
-	qDebug() << "DateTimeOriginal: " << exif.dateTimeOriginal();
-	qDebug() << "DateTimeDigitized: " << exif.dateTimeDigitized();
-	qDebug() << "WhiteBalance: " << exif.whiteBalance();
-	qDebug() << "FocalLengthIn35mmFilm: " << exif.focalLength35();
-	qDebug() << "GPS: " << exif.gps();
-
-	exif.fromFile("C:\\Users\\VET0572\\Pictures\\IMG_1373.CR2");
-	qDebug() << "===========================================================================";
-	qDebug() << exif.fileName();
-	qDebug() << "---------------------------------------------------------------------------";
-	qDebug() << "ImageWidth: " << exif.imageWidth();
-	qDebug() << "ImageHeight: " << exif.imageHeight();
-	qDebug() << "Make: " << exif.cameraMake();
-	qDebug() << "Model: " << exif.cameraModel();
-	qDebug() << "DateTime: " << exif.dateTime();
-	qDebug() << "FNumber: " << exif.fNumber();
-	qDebug() << "ISOSpeedRatings: " << exif.iso();
-	qDebug() << "Flash: " << exif.flash();
-	qDebug() << "FocalLength: " << exif.focalLength();
-	qDebug() << "LensMake: " << exif.lensMake();
-	qDebug() << "LensModel: " << exif.lensModel();
-	qDebug() << "ExposureTime: " << exif.exposureTime();
-	qDebug() << "ExposureBias: " << exif.exposureBias();
-	qDebug() << "ExifVersion: " << exif.exifVersion();
-	qDebug() << "DateTimeOriginal: " << exif.dateTimeOriginal();
-	qDebug() << "DateTimeDigitized: " << exif.dateTimeDigitized();
-	qDebug() << "WhiteBalance: " << exif.whiteBalance();
-	qDebug() << "FocalLengthIn35mmFilm: " << exif.focalLength35();
-	qDebug() << "GPS: " << exif.gps();
-
-	exif.fromFile("C:\\Users\\VET0572\\Pictures\\IMG_3444.CR2");
-	qDebug() << "===========================================================================";
-	qDebug() << exif.fileName();
-	qDebug() << "---------------------------------------------------------------------------";
-	qDebug() << "ImageWidth: " << exif.imageWidth();
-	qDebug() << "ImageHeight: " << exif.imageHeight();
-	qDebug() << "Make: " << exif.cameraMake();
-	qDebug() << "Model: " << exif.cameraModel();
-	qDebug() << "DateTime: " << exif.dateTime();
-	qDebug() << "FNumber: " << exif.fNumber();
-	qDebug() << "ISOSpeedRatings: " << exif.iso();
-	qDebug() << "Flash: " << exif.flash();
-	qDebug() << "FocalLength: " << exif.focalLength();
-	qDebug() << "LensMake: " << exif.lensMake();
-	qDebug() << "LensModel: " << exif.lensModel();
-	qDebug() << "ExposureTime: " << exif.exposureTime();
-	qDebug() << "ExposureBias: " << exif.exposureBias();
-	qDebug() << "ExifVersion: " << exif.exifVersion();
-	qDebug() << "DateTimeOriginal: " << exif.dateTimeOriginal();
-	qDebug() << "DateTimeDigitized: " << exif.dateTimeDigitized();
-	qDebug() << "WhiteBalance: " << exif.whiteBalance();
-	qDebug() << "FocalLengthIn35mmFilm: " << exif.focalLength35();
-	qDebug() << "GPS: " << exif.gps();
-
-	exif.fromFile("C:\\Users\\VET0572\\OneDrive - WINDESIGN\\exif-samples-master\\jpg\\Fujifilm_FinePix6900ZOOM.jpg");
-	qDebug() << "===========================================================================";
-	qDebug() << exif.fileName();
-	qDebug() << "---------------------------------------------------------------------------";
-	qDebug() << "ImageWidth: " << exif.imageWidth();
-	qDebug() << "ImageHeight: " << exif.imageHeight();
-	qDebug() << "Make: " << exif.cameraMake();
-	qDebug() << "Model: " << exif.cameraModel();
-	qDebug() << "DateTime: " << exif.dateTime();
-	qDebug() << "FNumber: " << exif.fNumber();
-	qDebug() << "ISOSpeedRatings: " << exif.iso();
-	qDebug() << "Flash: " << exif.flash();
-	qDebug() << "FocalLength: " << exif.focalLength();
-	qDebug() << "LensMake: " << exif.lensMake();
-	qDebug() << "LensModel: " << exif.lensModel();
-	qDebug() << "ExposureTime: " << exif.exposureTime();
-	qDebug() << "ExposureBias: " << exif.exposureBias();
-	qDebug() << "ExifVersion: " << exif.exifVersion();
-	qDebug() << "DateTimeOriginal: " << exif.dateTimeOriginal();
-	qDebug() << "DateTimeDigitized: " << exif.dateTimeDigitized();
-	qDebug() << "WhiteBalance: " << exif.whiteBalance();
-	qDebug() << "FocalLengthIn35mmFilm: " << exif.focalLength35();
-	qDebug() << "GPS: " << exif.gps();
-
-	exif.fromFile("C:\\Users\\VET0572\\OneDrive - WINDESIGN\\20181123_125857.jpg");
-	qDebug() << "===========================================================================";
-	qDebug() << exif.fileName();
-	qDebug() << "---------------------------------------------------------------------------";
-	qDebug() << "ImageWidth: " << exif.imageWidth();
-	qDebug() << "ImageHeight: " << exif.imageHeight();
-	qDebug() << "Make: " << exif.cameraMake();
-	qDebug() << "Model: " << exif.cameraModel();
-	qDebug() << "DateTime: " << exif.dateTime();
-	qDebug() << "FNumber: " << exif.fNumber();
-	qDebug() << "ISOSpeedRatings: " << exif.iso();
-	qDebug() << "Flash: " << exif.flash();
-	qDebug() << "FocalLength: " << exif.focalLength();
-	qDebug() << "LensMake: " << exif.lensMake();
-	qDebug() << "LensModel: " << exif.lensModel();
-	qDebug() << "ExposureTime: " << exif.exposureTime();
-	qDebug() << "ExposureBias: " << exif.exposureBias();
-	qDebug() << "ExifVersion: " << exif.exifVersion();
-	qDebug() << "DateTimeOriginal: " << exif.dateTimeOriginal();
-	qDebug() << "DateTimeDigitized: " << exif.dateTimeDigitized();
-	qDebug() << "WhiteBalance: " << exif.whiteBalance();
-	qDebug() << "FocalLengthIn35mmFilm: " << exif.focalLength35();
-	qDebug() << "GPS: " << exif.gps();
-
-	qDebug() << "done";
+	QList<QImage>	previewList	= exif.previewList();
+	for(int i = 0;i < previewList.count();i++)
+	{
+		QLabel*	lpLabel	= new QLabel;
+		lpLabel->setPixmap(QPixmap::fromImage(previewList[i]));
+		ui->m_lpMainLayout->addWidget(lpLabel);
+	}
 }
 
 cMainWindow::~cMainWindow()
 {
 	delete ui;
 }
+
+void cMainWindow::initUI()
+{
+	ui->setupUi(this);
+
+	QIcon::setThemeName("TangoMFK");
+}
+
+void cMainWindow::createActions()
+{
+//	setToolButtonStyle(Qt::ToolButtonFollowStyle);
+//	createFileActions();
+//	createEditActions();
+//	createTextActions();
+//	createToolsActions();
+//	createWindowActions();
+//	createHelpActions();
+
+//	createContextActions();
+
+//	connect(ui->m_lpMainTab,		&QTabWidget::currentChanged,			this,	&cMainWindow::onMainTabCurrentChanged);
+//	connect(ui->m_lpMainTab,		&QTabWidget::tabCloseRequested,			this,	&cMainWindow::onMainTabTabCloseRequested);
+//	connect(ui->m_lpMdiArea,		&QMdiArea::subWindowActivated,			this,	&cMainWindow::onMdiAreaSubWindowActivated);
+
+//	connect(ui->m_lpOutlineList,	&QTreeView::doubleClicked,				this,	&cMainWindow::onOutlineDoubleClicked);
+//	connect(ui->m_lpCharacterList,	&QTreeView::doubleClicked,				this,	&cMainWindow::onCharacterDoubleClicked);
+//	connect(ui->m_lpPlaceList,		&QTreeView::doubleClicked,				this,	&cMainWindow::onPlaceDoubleClicked);
+//	connect(ui->m_lpObjectList,		&QTreeView::doubleClicked,				this,	&cMainWindow::onObjectDoubleClicked);
+//	connect(ui->m_lpRechercheList,	&QTreeView::doubleClicked,				this,	&cMainWindow::onRechercheDoubleClicked);
+
+//	connect(ui->m_lpOutlineList,	&QTreeView::customContextMenuRequested,	this,	&cMainWindow::onOutlineContextMenu);
+//	connect(ui->m_lpCharacterList,	&QTreeView::customContextMenuRequested,	this,	&cMainWindow::onCharacterContextMenu);
+//	connect(ui->m_lpPlaceList,		&QTreeView::customContextMenuRequested,	this,	&cMainWindow::onPlaceContextMenu);
+//	connect(ui->m_lpObjectList,		&QTreeView::customContextMenuRequested,	this,	&cMainWindow::onObjectContextMenu);
+//	connect(ui->m_lpRechercheList,	&QTreeView::customContextMenuRequested,	this,	&cMainWindow::onRechercheContextMenu);
+
+//	connect(ui->m_lpOutlineList,	&cTreeView::dropped,					this,	&cMainWindow::onOutlineDropped);
+}
+
+void cMainWindow::closeEvent(QCloseEvent *event)
+{
+	QSettings	settings;
+	settings.setValue("main/width", QVariant::fromValue(size().width()));
+	settings.setValue("main/height", QVariant::fromValue(size().height()));
+	settings.setValue("main/x", QVariant::fromValue(x()));
+	settings.setValue("main/y", QVariant::fromValue(y()));
+	if(this->isMaximized())
+		settings.setValue("main/maximized", QVariant::fromValue(true));
+	else
+		settings.setValue("main/maximized", QVariant::fromValue(false));
+
+	event->accept();
+}

cmainwindow.h

@@ -2,9 +2,13 @@
 #define CMAINWINDOW_H
 
 
+#include "cpicturelibrary.h"
+
 #include "cexif.h"
+#include "csplashscreen.h"
 
 #include <QMainWindow>
+#include <QCloseEvent>
 
 
 namespace Ui {
@@ -23,9 +27,10 @@ public:
 	/**
 	 * @brief
 	 *
+	 * @param lpSplashScreen
 	 * @param parent
 	 */
-	explicit cMainWindow(QWidget *parent = nullptr);
+	explicit cMainWindow(cSplashScreen* lpSplashScreen, QWidget *parent = nullptr);
 	/**
 	 * @brief
 	 *
@@ -33,8 +38,32 @@ public:
 	~cMainWindow();
 
 private:
-	Ui::cMainWindow*	ui; /**< TODO: describe */
-	cEXIFTagList		m_exifTagList; /**< TODO: describe */
+	Ui::cMainWindow*	ui;										/**< TODO: describe */
+	cSplashScreen*		m_lpSplashScreen;						/*!< Splash Screen */
+	cEXIFTagList		m_exifTagList;							/**< TODO: describe */
+	cPictureLibrary		m_pictureLibrary;						/**< TODO: describe */
+
+	/*!
+	 \brief
+
+	 \fn initUI
+	*/
+	void				initUI();
+	/*!
+	 \brief
+
+	 \fn createActions
+	*/
+	void				createActions();
+
+protected:
+	/*!
+	 \brief
+
+	 \fn closeEvent
+	 \param event
+	*/
+	void				closeEvent(QCloseEvent* event);
 };
 
 #endif // CMAINWINDOW_H

cmainwindow.ui

@@ -11,10 +11,35 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>cMainWindow</string>
+   <string/>
   </property>
-  <widget class="QWidget" name="centralWidget"/>
-  <widget class="QMenuBar" name="menuBar">
+  <widget class="QWidget" name="centralWidget">
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="0" column="0">
+     <widget class="QScrollArea" name="m_lpMainScrollArea">
+      <property name="widgetResizable">
+       <bool>true</bool>
+      </property>
+      <widget class="QWidget" name="scrollAreaWidgetContents">
+       <property name="geometry">
+        <rect>
+         <x>0</x>
+         <y>0</y>
+         <width>380</width>
+         <height>227</height>
+        </rect>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="0" column="0">
+         <layout class="QVBoxLayout" name="m_lpMainLayout"/>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="m_lpMenuBar">
    <property name="geometry">
     <rect>
      <x>0</x>
@@ -23,15 +48,8 @@
      <height>21</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menu_File">
-    <property name="title">
-     <string>&amp;File</string>
-    </property>
-    <addaction name="actionE_xit"/>
-   </widget>
-   <addaction name="menu_File"/>
   </widget>
-  <widget class="QToolBar" name="mainToolBar">
+  <widget class="QToolBar" name="m_lpMainToolBar">
    <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
    </attribute>
@@ -39,7 +57,7 @@
     <bool>false</bool>
    </attribute>
   </widget>
-  <widget class="QStatusBar" name="statusBar"/>
+  <widget class="QStatusBar" name="m_lpStatusBar"/>
   <action name="actionE_xit">
    <property name="text">
     <string>E&amp;xit</string>

common.cpp

@@ -0,0 +1,7 @@
+/*!
+ \file common.cpp
+
+*/
+
+#include "common.h"
+

common.h

@@ -0,0 +1,22 @@
+/*!
+ \file common.h
+
+*/
+
+#ifndef COMMON_H
+#define COMMON_H
+
+
+#include <QDebug>
+
+
+#ifdef __GNUC__
+	#define myDebug qDebug() << __FILE__ << "(" << __LINE__ << ") - " << __PRETTY_FUNCTION__ << ":"
+#elif __MINGW32__
+	#define myDebug qDebug() << __FILE__ << "(" << __LINE__ << ") - " << __PRETTY_FUNCTION__ << ":"
+#else
+	#define myDebug qDebug() << __FILE__ << "(" << __LINE__ << ") - " << __FUNCTION__ << ":"
+#endif
+
+
+#endif // COMMON_H

cpicturelibrary.cpp

@@ -0,0 +1,114 @@
+#include "cpicturelibrary.h"
+#include "common.h"
+
+#include <QSqlQuery>
+#include <QSqlError>
+
+#include <QSettings>
+
+
+cPictureLibrary::cPictureLibrary(QObject *parent) : QObject(parent)
+{
+	if(!openDatabase())
+		return;
+}
+
+bool cPictureLibrary::openDatabase()
+{
+	QSettings	settings;
+	QString		szDB	= settings.value("database/path").toString();
+
+	m_db	= QSqlDatabase::addDatabase("QSQLITE");
+	m_db.setHostName("localhost");
+	m_db.setDatabaseName(szDB);
+
+	if(!m_db.open())
+	{
+		myDebug << m_db.lastError().text();
+		return(false);
+	}
+
+	if(!m_db.tables().contains("config"))
+		createDatabase();
+	else
+	{
+		QSqlQuery	query;
+
+		query.prepare("SELECT version FROM config;");
+		if(!query.exec())
+		{
+			myDebug << query.lastError().text();
+			m_db.close();
+			return(false);
+		}
+
+		query.next();
+		if(query.value("version").toInt() < 2)
+			updateDatabase(query.value("version").toInt());
+		query.finish();
+	}
+
+	return(true);
+}
+
+bool cPictureLibrary::createTable(const QString& szSQL)
+{
+	QSqlQuery	query;
+
+	query.prepare(szSQL);
+
+	if(!query.exec())
+	{
+		myDebug << szSQL << "\n" << query.lastError().text();
+		return(false);
+	}
+
+	return(true);
+}
+
+bool cPictureLibrary::createDatabase()
+{
+	QSqlQuery	query;
+
+	if(!createTable("CREATE TABLE config ( "
+					"    version                  INTEGER"
+					"); "))
+		return(false);
+
+	query.prepare("INSERT INTO config (version) VALUES (:version);");
+	query.bindValue(":version", 1);
+	if(!query.exec())
+	{
+		myDebug << query.lastError().text();
+		return(false);
+	}
+
+	return(true);
+}
+
+bool cPictureLibrary::updateDatabase(qint32 version)
+{
+	if(version < 2)
+		updateDatabase2(version);
+
+	return(true);
+}
+
+bool cPictureLibrary::updateDatabase2(qint32 /*version*/)
+{
+	QSqlQuery	query;
+
+	if(!query.exec("ALTER TABLE config ADD rootPath TEXT;"))
+	{
+		myDebug << query.lastError().text();
+		return(false);
+	}
+
+	if(!query.exec("UPDATE config SET version=2;"))
+	{
+		myDebug << query.lastError().text();
+		return(false);
+	}
+
+	return(true);
+}

cpicturelibrary.h

@@ -0,0 +1,63 @@
+#ifndef CPICTURELIBRARY_H
+#define CPICTURELIBRARY_H
+
+
+#include <QObject>
+
+#include <QSqlDatabase>
+
+
+class cPictureLibrary : public QObject
+{
+	Q_OBJECT
+public:
+	explicit cPictureLibrary(QObject *parent = nullptr);
+
+	/*!
+	 \brief
+
+	 \fn openDatabase
+	 \return bool
+	*/
+	bool						openDatabase();
+
+signals:
+
+public slots:
+
+private:
+	QSqlDatabase				m_db;						/*!< TODO: describe */
+
+	/*!
+	 \brief
+
+	 \fn createDatabase
+	 \return bool
+	*/
+	bool			createDatabase();
+	/*!
+	 \brief
+
+	 \fn updateDatabase
+	 \param version
+	 \return bool
+	*/
+	bool			updateDatabase(qint32 version);
+	/*!
+	 \brief
+
+	 \fn updateDatabase1
+	 \return bool
+	*/
+	bool			updateDatabase2(qint32 version);
+	/*!
+	 \brief
+
+	 \fn createTable
+	 \param szSQL
+	 \return bool
+	*/
+	bool			createTable(const QString& szSQL);
+};
+
+#endif // CPICTURELIBRARY_H

csplashscreen.cpp

@@ -0,0 +1,35 @@
+#include "csplashscreen.h"
+#include "common.h"
+
+
+cSplashScreen::cSplashScreen(const QPixmap& pixmap, QFont& font) :
+	QSplashScreen(pixmap)
+{
+	setFont(font);
+	m_textDocument.setDefaultFont(font);
+}
+
+void cSplashScreen::drawContents(QPainter *painter)
+{
+	painter->translate(m_rect.topLeft());
+	m_textDocument.setHtml(m_szMessage);
+	m_textDocument.drawContents(painter);
+}
+
+void cSplashScreen::showStatusMessage(const QString& message)
+{
+	m_szMessage	= message;
+	showMessage(m_szMessage);
+}
+
+void cSplashScreen::addStatusMessage(const QString& message)
+{
+	m_szMessage.append(message);
+	showMessage(m_szMessage);
+}
+
+void cSplashScreen::setMessageRect(QRect rect)
+{
+	m_rect			= rect;
+	m_textDocument.setTextWidth(rect.width());
+}

csplashscreen.h

@@ -0,0 +1,26 @@
+#ifndef CSPLASHSCREEN_H
+#define CSPLASHSCREEN_H
+
+
+#include <QSplashScreen>
+#include <QPainter>
+#include <QTextDocument>
+
+
+class cSplashScreen : public QSplashScreen
+{
+public:
+	cSplashScreen(const QPixmap& pixmap, QFont &font);
+
+	virtual void	drawContents(QPainter *painter);
+	void			showStatusMessage(const QString &message);
+	void			addStatusMessage(const QString &message);
+	void			setMessageRect(QRect rect);
+
+private:
+	QTextDocument	m_textDocument;
+	QString			m_szMessage;
+	QRect			m_rect;
+};
+
+#endif // CSPLASHSCREEN_H