Improve clean database start.

Database.cpp

@@ -194,7 +194,7 @@ bool Database::create()
         if (!sqlQuery.exec(tableQuery)) {
             qWarning() << tableQuery;
             qWarning() << tr("Unable to create '%1' table:").arg(name);
-            qWarning() << sqlQuery.lastError();
+            qWarning() << sqlQuery.lastError().text();
             return false;
         }
     }

MainWindow.cpp

@@ -39,6 +39,7 @@ MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow),
     database(0),
+    preferences(new PreferencesDialog()),
     eventsFilterModel(0),
     conversationsTreeModel(0)
 {
@@ -64,8 +65,6 @@ MainWindow::MainWindow(QWidget *parent) :
         ui->splitter->setSizes(splitterSizes);
     }
 
-    PreferencesDialog *preferences = new PreferencesDialog(this);
-
     connect(ui->actionNew, SIGNAL(triggered()), this, SLOT(newFile()));
     connect(ui->actionOpen, SIGNAL(triggered()), this, SLOT(openFile()));
     connect(ui->actionAdd_Event, SIGNAL(triggered()), this, SLOT(addEvent()));
@@ -140,6 +139,8 @@ void MainWindow::openFile(QString fileName)
         reloadEvents();
         setWindowTitle(QString("%1 - Fabula").arg(fileName));
         ui->centralWidget->setEnabled(true);
+        if (!preferences->haveWriter())
+            preferences->open();
     }
     else {
         if (!database) {
@@ -247,11 +248,13 @@ void MainWindow::addOrEditTreeItem(DialogMode mode, TreeItem treeItem, const QMo
     QModelIndexList itemIndexes =
             tableModel->match(firstItem, Qt::DisplayRole, conversation);
 
-    Q_ASSERT(!itemIndexes.isEmpty());
-    if (itemIndexes.isEmpty())
-        return;
+    //Q_ASSERT(!itemIndexes.isEmpty());
+    //if (itemIndexes.isEmpty())
+    //    return;
 
-    QModelIndex itemIndex = itemIndexes.first();
+    QModelIndex itemIndex;
+    if (!itemIndexes.isEmpty())
+        itemIndex = itemIndexes.first();
 
     editViewItem(itemIndex, tableDialog, mode);
 }
@@ -283,10 +286,12 @@ void MainWindow::deleteCharacter()
 void MainWindow::editViewItem(const QModelIndex &index, SqlRelationalTableDialog *dialog,
                               DialogMode mode)
 {
-    const QModelIndex &rootIndex = rootModelIndex(index);
-    Q_ASSERT(rootIndex.isValid());
+    int row = 0;
 
-    const int row = rootIndex.row();
+    const QModelIndex &rootIndex = rootModelIndex(index);
+    //Q_ASSERT(rootIndex.isValid());
+    if (rootIndex.isValid())
+        row = rootIndex.row();
 
     Q_ASSERT(dialog);
     if (!dialog)
@@ -371,6 +376,7 @@ MainWindow::~MainWindow()
 {
     settings.setValue("treeSize", ui->splitter->sizes().first());
     settings.setValue("tableSize", ui->splitter->sizes().last());
+    delete preferences;
     delete ui;
     delete database;
 }

MainWindow.h

@@ -31,6 +31,7 @@ namespace Ui {
 }
 
 class Database;
+class PreferencesDialog;
 class QAbstractItemView;
 class QSqlRelationalTableModel;
 class QSortFilterProxyModel;
@@ -82,6 +83,8 @@ public slots:
 private:
     Ui::MainWindow *ui;
     Database *database;
+    PreferencesDialog *preferences;
+
     QSettings settings;
     QDesktopServices desktopServices;
     QSortFilterProxyModel *eventsFilterModel;

PreferencesDialog.cpp

@@ -14,18 +14,21 @@ PreferencesDialog::PreferencesDialog(QWidget *parent) :
     ui->setupUi(this);
     QSqlTableModel *writersModel = new QSqlTableModel(this);
     writersModel->setTable(Database::tableName(Database::Writer));
-    writersModel->setEditStrategy(QSqlTableModel::OnManualSubmit);
+    //writersModel->setEditStrategy(QSqlTableModel::OnManualSubmit);
     writersModel->select();
     ui->writerComboBox->setModel(writersModel);
     ui->writerComboBox->setModelColumn(1);
 
+    setWindowModality(Qt::WindowModal);
+
     load();
 
     connect(this, SIGNAL(accepted()), this, SLOT(save()));
 }
 
 PreferencesDialog::~PreferencesDialog()
 {
+    save();
     delete ui;
 }
 
@@ -35,10 +38,19 @@ void PreferencesDialog::open()
     QDialog::open();
 }
 
+void PreferencesDialog::close()
+{
+    save();
+    QDialog::close();
+}
+
 void PreferencesDialog::load()
 {
-    QSettings settings;
-    QString writer = settings.value("writer").toString();
+    const QVariant writerVariant = QSettings().value("writer");
+    ui->writerNameLabel->setVisible(!writerVariant.isValid());
+    if (!writerVariant.isValid())
+        return;
+    const QString& writer = writerVariant.toString();
     int writerIndex = ui->writerComboBox->findText(writer);
     ui->writerComboBox->setCurrentIndex(writerIndex);
 }
@@ -52,8 +64,15 @@ void PreferencesDialog::save()
         return;
 
     const QString &writer = ui->writerComboBox->currentText();
+    if (writer.isEmpty())
+        return;
+
     writersModel->submitAll();
+    QSettings().setValue("writer", writer);
+}
 
-    QSettings settings;
-    settings.setValue("writer", writer);
+bool PreferencesDialog::haveWriter()
+{
+    return true;
+    //return QSettings().value("writer").isValid();
 }

PreferencesDialog.h

@@ -17,8 +17,10 @@ class PreferencesDialog : public QDialog
 
 public slots:
     void open();
+    void close();
     void load();
     void save();
+    bool haveWriter();
 
 private:
     Ui::PreferencesDialog *ui;

PreferencesDialog.ui

@@ -6,14 +6,21 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>187</width>
+    <height>110</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="writerNameLabel">
+     <property name="text">
+      <string>Please enter your name:</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <layout class="QFormLayout" name="formLayout">
      <property name="fieldGrowthPolicy">