From 4377ad935c1bed24ec8b0b845f9e768ef6cd7c76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?=
 <luisangelsm@gmail.com>
Date: Thu, 19 Sep 2019 22:54:08 +0200
Subject: [PATCH] Fixed more merge problems

---
 YACReaderLibrary/options_dialog.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/YACReaderLibrary/options_dialog.cpp b/YACReaderLibrary/options_dialog.cpp
index c5a46960..4ec85b8c 100644
--- a/YACReaderLibrary/options_dialog.cpp
+++ b/YACReaderLibrary/options_dialog.cpp
@@ -47,6 +47,24 @@ OptionsDialog::OptionsDialog(QWidget *parent)
     QGroupBox *trayIconBox = new QGroupBox(tr("Tray icon settings"));
     QVBoxLayout *trayLayout = new QVBoxLayout();
 
+    trayIconCheckbox = new QCheckBox(tr("Minimize to tray"));
+    startToTrayCheckbox = new QCheckBox(tr("Start minimized"));
+
+    connect(trayIconCheckbox, &QCheckBox::clicked,
+            [=](bool checked) {
+                settings->setValue(MINIMIZE_TO_TRAY, checked);
+                startToTrayCheckbox->setEnabled(checked);
+                emit optionsChanged();
+            });
+    connect(startToTrayCheckbox, &QCheckBox::clicked,
+            [=](bool checked) {
+                settings->setValue(START_TO_TRAY, checked);
+            });
+
+    trayLayout->addWidget(trayIconCheckbox);
+    trayLayout->addWidget(startToTrayCheckbox);
+    trayIconBox->setLayout(trayLayout);
+
     auto apiKeyLayout = new QVBoxLayout();
     auto apiKeyButton = new QPushButton(tr("Edit Comic Vine API key"));
     apiKeyLayout->addWidget(apiKeyButton);