From 3f9296e38c86e2758ba8cd52d9a2f1aeb1d0ae43 Mon Sep 17 00:00:00 2001
From: antelle <dmitryvit@gmail.com>
Date: Sun, 15 Mar 2020 17:22:25 +0100
Subject: [PATCH] #411: option to automatically use group icon for new entries

---
 app/scripts/locales/base.json                       |  1 +
 app/scripts/models/app-settings-model.js            |  1 +
 app/scripts/models/entry-model.js                   |  4 ++++
 app/scripts/views/settings/settings-general-view.js |  8 ++++++++
 app/templates/settings/settings-general.hbs         | 13 +++++++++----
 release-notes.md                                    |  1 +
 6 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/app/scripts/locales/base.json b/app/scripts/locales/base.json
index 6b690fb6..ae44e82b 100644
--- a/app/scripts/locales/base.json
+++ b/app/scripts/locales/base.json
@@ -405,6 +405,7 @@
     "setGenTableView": "Entries list table view",
     "setGenColorfulIcons": "Colorful custom icons in the list",
     "setGenUseMarkdown": "Markdown in notes",
+    "setGenUseGroupIconForEntries": "Automatically use group icon for new entries",
     "setGenDirectAutotype": "If only one matching entry is found, select that one automatically for Autotype",
     "setGenFunction": "Function",
     "setGenAutoSyncOnClose": "Automatically save and sync on close",
diff --git a/app/scripts/models/app-settings-model.js b/app/scripts/models/app-settings-model.js
index 717cad52..60e5b2f8 100644
--- a/app/scripts/models/app-settings-model.js
+++ b/app/scripts/models/app-settings-model.js
@@ -63,6 +63,7 @@ AppSettingsModel.defineModelProperties(
         generatorHidePassword: false,
         cacheConfigSettings: false,
         allowIframes: false,
+        useGroupIconForEntries: false,
 
         canOpen: true,
         canOpenDemo: true,
diff --git a/app/scripts/models/entry-model.js b/app/scripts/models/entry-model.js
index 2fe2a7da..734de367 100644
--- a/app/scripts/models/entry-model.js
+++ b/app/scripts/models/entry-model.js
@@ -1,5 +1,6 @@
 import kdbxweb from 'kdbxweb';
 import { Model } from 'framework/model';
+import { AppSettingsModel } from 'models/app-settings-model';
 import { KdbxToHtml } from 'comp/format/kdbx-to-html';
 import { IconMap } from 'const/icon-map';
 import { AttachmentModel } from 'models/attachment-model';
@@ -786,6 +787,9 @@ class EntryModel extends Model {
     static newEntry(group, file) {
         const model = new EntryModel();
         const entry = file.db.createEntry(group.group);
+        if (AppSettingsModel.useGroupIconForEntries && group.icon && group.iconId) {
+            entry.icon = group.iconId;
+        }
         model.setEntry(entry, group, file);
         model.entry.times.update();
         model.unsaved = true;
diff --git a/app/scripts/views/settings/settings-general-view.js b/app/scripts/views/settings/settings-general-view.js
index c5667af0..88997159 100644
--- a/app/scripts/views/settings/settings-general-view.js
+++ b/app/scripts/views/settings/settings-general-view.js
@@ -41,6 +41,7 @@ class SettingsGeneralView extends View {
         'change .settings__general-table-view': 'changeTableView',
         'change .settings__general-colorful-icons': 'changeColorfulIcons',
         'change .settings__general-use-markdown': 'changeUseMarkdown',
+        'change .settings__general-use-group-icon-for-entries': 'changeUseGroupIconForEntries',
         'change .settings__general-direct-autotype': 'changeDirectAutotype',
         'change .settings__general-titlebar-style': 'changeTitlebarStyle',
         'click .settings__general-update-btn': 'checkUpdate',
@@ -106,6 +107,7 @@ class SettingsGeneralView extends View {
             releaseNotesLink: Links.ReleaseNotes,
             colorfulIcons: AppSettingsModel.colorfulIcons,
             useMarkdown: AppSettingsModel.useMarkdown,
+            useGroupIconForEntries: AppSettingsModel.useGroupIconForEntries,
             directAutotype: AppSettingsModel.directAutotype,
             supportsTitleBarStyles: Launcher && Features.supportsTitleBarStyles(),
             titlebarStyle: AppSettingsModel.titlebarStyle,
@@ -305,6 +307,12 @@ class SettingsGeneralView extends View {
         Events.emit('refresh');
     }
 
+    changeUseGroupIconForEntries(e) {
+        const useGroupIconForEntries = e.target.checked || false;
+        AppSettingsModel.useGroupIconForEntries = useGroupIconForEntries;
+        Events.emit('refresh');
+    }
+
     changeDirectAutotype(e) {
         const directAutotype = e.target.checked || false;
         AppSettingsModel.directAutotype = directAutotype;
diff --git a/app/templates/settings/settings-general.hbs b/app/templates/settings/settings-general.hbs
index 83507cc2..0f73dc48 100644
--- a/app/templates/settings/settings-general.hbs
+++ b/app/templates/settings/settings-general.hbs
@@ -88,10 +88,6 @@
         <input type="checkbox" class="settings__input input-base settings__general-colorful-icons" id="settings__general-colorful-icons" {{#if colorfulIcons}}checked{{/if}} />
         <label for="settings__general-colorful-icons">{{res 'setGenColorfulIcons'}}</label>
     </div>
-    <div>
-        <input type="checkbox" class="settings__input input-base settings__general-use-markdown" id="settings__general-use-markdown" {{#if useMarkdown}}checked{{/if}} />
-        <label for="settings__general-use-markdown">{{res 'setGenUseMarkdown'}}</label>
-    </div>
 
     <h2>{{res 'setGenFunction'}}</h2>
     {{#if canAutoSaveOnClose}}
@@ -152,6 +148,15 @@
         <label for="settings__general-direct-autotype">{{res 'setGenDirectAutotype'}}</label>
     </div>
     {{/if}}
+    <div>
+        <input type="checkbox" class="settings__input input-base settings__general-use-markdown" id="settings__general-use-markdown" {{#if useMarkdown}}checked{{/if}} />
+        <label for="settings__general-use-markdown">{{res 'setGenUseMarkdown'}}</label>
+    </div>
+    <div>
+        <input type="checkbox" class="settings__input input-base settings__general-use-group-icon-for-entries"
+               id="settings__general-use-group-icon-for-entries" {{#if useGroupIconForEntries}}checked{{/if}} />
+        <label for="settings__general-use-group-icon-for-entries">{{res 'setGenUseGroupIconForEntries'}}</label>
+    </div>
 
     <h2>{{res 'setGenLock'}}</h2>
     <div>
diff --git a/release-notes.md b/release-notes.md
index 6960b734..724ad221 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -9,6 +9,7 @@ Release notes
 `+` #1309: back button in attachment preview  
 `+` #1142: submit button on mobile password input  
 `+` #766: setting for no/unlimited history  
+`+` #411: option to automatically use group icon for new entries  
 `-` fix #1396: fixed hyperlinks in notes  
 `-` fix #1323: version in the About dialog  
 `-` fix #734: OTP secrets with spaces