From 5c80c31a702365b3f763ba451cc5dcaea3e3a706 Mon Sep 17 00:00:00 2001
From: thez3ro <io@thezero.org>
Date: Sat, 11 Feb 2017 23:56:26 +0100
Subject: [PATCH] hide recent database; fix wording

---
 src/gui/WelcomeWidget.cpp |  7 ++--
 src/gui/WelcomeWidget.ui  | 71 +++++++++------------------------------
 2 files changed, 19 insertions(+), 59 deletions(-)

diff --git a/src/gui/WelcomeWidget.cpp b/src/gui/WelcomeWidget.cpp
index 12a1b6db0..cb7a1de2e 100644
--- a/src/gui/WelcomeWidget.cpp
+++ b/src/gui/WelcomeWidget.cpp
@@ -36,9 +36,6 @@ WelcomeWidget::WelcomeWidget(QWidget* parent)
 
     m_ui->iconLabel->setPixmap(filePath()->applicationIcon().pixmap(64));
 
-    // waiting for CSV PR
-    m_ui->buttonImportCSV->hide();
-
     m_ui->recentListWidget->clear();
     const QStringList lastDatabases = config()->get("LastDatabases", QVariant()).toStringList();
     for (const QString& database : lastDatabases) {
@@ -46,6 +43,10 @@ WelcomeWidget::WelcomeWidget(QWidget* parent)
         itm->setText(database);
         m_ui->recentListWidget->addItem(itm);
     }
+    bool recent_visibility = (m_ui->recentListWidget->count() > 0);
+    m_ui->startLabel->setVisible(!recent_visibility);
+    m_ui->recentListWidget->setVisible(recent_visibility);
+    m_ui->recentLabel->setVisible(recent_visibility);
 
     connect(m_ui->buttonNewDatabase, SIGNAL(clicked()), SIGNAL(newDatabase()));
     connect(m_ui->buttonOpenDatabase, SIGNAL(clicked()), SIGNAL(openDatabase()));
diff --git a/src/gui/WelcomeWidget.ui b/src/gui/WelcomeWidget.ui
index 7591a6038..8d6a7c49a 100644
--- a/src/gui/WelcomeWidget.ui
+++ b/src/gui/WelcomeWidget.ui
@@ -80,6 +80,16 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QLabel" name="startLabel">
+     <property name="text">
+      <string>Start storing your passwords securely in a KeePassXC database</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
@@ -98,43 +108,6 @@
    </item>
    <item>
     <widget class="QPushButton" name="buttonNewDatabase">
-     <property name="palette">
-      <palette>
-       <active>
-        <colorrole role="Button">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>0</red>
-           <green>255</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </active>
-       <inactive>
-        <colorrole role="Button">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>0</red>
-           <green>255</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </inactive>
-       <disabled>
-        <colorrole role="Button">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>0</red>
-           <green>255</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </disabled>
-      </palette>
-     </property>
      <property name="text">
       <string>Create new database</string>
      </property>
@@ -148,25 +121,11 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QPushButton" name="buttonImportKeePass1">
-       <property name="text">
-        <string>Import from KeePass1</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="buttonImportCSV">
-       <property name="enabled">
-        <bool>true</bool>
-       </property>
-       <property name="text">
-        <string>Import from CSV</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QPushButton" name="buttonImportKeePass1">
+     <property name="text">
+      <string>Import from KeePass 1</string>
+     </property>
+    </widget>
    </item>
    <item>
     <spacer name="verticalSpacer_2">