From: Daniel Albers <daniel@lbe.rs>
Date: Fri, 2 Aug 2019 10:48:39 +0000 (+0200)
Subject: Merge branch 'simplify-time-formatting' of https://github.com/justjanne/quassel
X-Git-Tag: test-travis-01~47
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=13425536062e5cf1b2d9f0ef258f3eb9dab1923c;hp=f661cc01b740b69c881010fecc847db8d479a263

Merge branch 'simplify-time-formatting' of https://github.com/justjanne/quassel

Closes #504.
---

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index 09d8037f..0c6b8630 100644
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -336,6 +336,7 @@ void Quassel::setupCliParser()
             {"icontheme", tr("Override the system icon theme ('breeze' is recommended)."), tr("theme")},
             {"qss", tr("Load a custom application stylesheet."), tr("file.qss")},
             {"hidewindow", tr("Start the client minimized to the system tray.")},
+            {"account", tr("Account id to connect to on startup."), tr("account"), "0"},
         };
     }
 
diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 2b43a7e1..5b0118a2 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -1195,7 +1195,8 @@ void MainWin::saveMainToolBarStatus(bool enabled)
 
 void MainWin::doAutoConnect()
 {
-    if (!Client::coreConnection()->connectToCore()) {
+    int accountId = Quassel::optionValue("account").toInt();
+    if (!Client::coreConnection()->connectToCore(accountId)) {
         // No autoconnect selected (or no accounts)
         showCoreConnectionDlg();
     }
diff --git a/tests/common/utiltest.cpp b/tests/common/utiltest.cpp
index 55f5329e..47db2776 100644
--- a/tests/common/utiltest.cpp
+++ b/tests/common/utiltest.cpp
@@ -35,4 +35,4 @@ TEST(UtilTest, formatDateTimeToOffsetISO) {
     EXPECT_EQ(formatDateTimeToOffsetISO(dateTime.toOffsetFromUtc(0)), QString("2006-01-02 14:04:05Z"));
     EXPECT_EQ(formatDateTimeToOffsetISO(dateTime.toOffsetFromUtc(7200)), QString("2006-01-02 16:04:05+02:00"));
     EXPECT_EQ(formatDateTimeToOffsetISO(dateTime.toTimeZone(QTimeZone{"UTC"})), QString("2006-01-02 14:04:05Z"));
-}
\ No newline at end of file
+}