diff options
| -rw-r--r-- | shemov.cpp | 17 | ||||
| -rw-r--r-- | smmodelsingleton.cpp | 15 |
2 files changed, 12 insertions, 20 deletions
@@ -44,22 +44,9 @@ #include "filestreewidget.h" SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, flags), mOpenWithGroupFS(0), mOpenWithGroupAV(0) { + //application icon qApp->setWindowIcon(QIcon(":/shemov.png")); - QSettings s; - QString dbhost = s.value("database/hostname").toString(); - QString dbname = s.value("database/dbname").toString(); - QString dbuser = s.value("database/dbuser").toString(); - QString dbpass = s.value("database/dbpass").toString(); - QSqlDatabase db = QSqlDatabase::addDatabase("QPSQL"); - db.setHostName(dbhost); - db.setDatabaseName(dbname); - db.setUserName(dbuser); - db.setPassword(dbpass); - if(!db.open()){ - QMessageBox::critical(this, tr("Error"), tr("Could not open database. Please configure the database and restart the program")); - } - //FileSystemWidget + TabWidget mFSWidget = new FilesystemWidget; setWindowTitle(mFSWidget->windowTitle()); @@ -68,7 +55,7 @@ SheMov::SheMov(QWidget *parent, Qt::WindowFlags flags) : QMainWindow(parent, fla //ArchiveTreeView mATree = new ArchiveTreeView; - mTab->addTab(mATree, "Tree"); + mTab->addTab(mATree, "Archive"); connect(mATree->filesWidget(), SIGNAL(statusMessage(QString)), this, SLOT(statusbarMessage(QString))); connect(mATree->filesWidget(), SIGNAL(sizeChanged(qint64)), this, SLOT(setSize(qint64))); connect(mATree, SIGNAL(needWindowTitleChange(QString)), this, SLOT(setWindowTitle(QString))); diff --git a/smmodelsingleton.cpp b/smmodelsingleton.cpp index 7425aeb..41959a5 100644 --- a/smmodelsingleton.cpp +++ b/smmodelsingleton.cpp @@ -8,6 +8,8 @@ #include <QSqlDatabase> #include <QAbstractItemModel> #include <QStringList> +#include <QMessageBox> +#include <QSettings> #include "smmodelsingleton.h" #include "seriestreemodel.h" @@ -27,12 +29,15 @@ SmModelSingleton *SmModelSingleton::instance(){ if(!mInstance){ mInstance = new SmModelSingleton; if(!QSqlDatabase::contains("treedb")){ + QSettings s; QSqlDatabase db = QSqlDatabase::addDatabase("QPSQL", "treedb"); - db.setHostName("hadante"); - db.setUserName("shemov"); - db.setPassword("shemov"); - db.setDatabaseName("shemov2"); - db.open(); + db.setHostName(s.value("database/hostname").toString()); + db.setUserName(s.value("database/dbuser").toString()); + db.setPassword(s.value("database/dbpass").toString()); + db.setDatabaseName(s.value("database/dbname").toString()); + if(!db.open()){ + QMessageBox::critical(0, tr("Error"), tr("Could not open database. Please configure it and restart program.")); + } } } return mInstance; |