From f4276f72416ab0eb8171b843d475d31f13533a44 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 1 Aug 2022 23:20:27 +0300
Subject: made quick settings into their own component, added quick view
 settings, added both to conversation view

---
 .../quick_view_settings/quick_view_settings.vue    | 96 ++++++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 src/components/quick_view_settings/quick_view_settings.vue

(limited to 'src/components/quick_view_settings/quick_view_settings.vue')

diff --git a/src/components/quick_view_settings/quick_view_settings.vue b/src/components/quick_view_settings/quick_view_settings.vue
new file mode 100644
index 00000000..78f315f3
--- /dev/null
+++ b/src/components/quick_view_settings/quick_view_settings.vue
@@ -0,0 +1,96 @@
+<template>
+  <Popover
+    trigger="click"
+    class="QuickViewSettings"
+    :bound-to="{ x: 'container' }"
+  >
+    <template #content>
+      <div class="dropdown-menu">
+        <div v-if="loggedIn">
+          <button
+            class="button-default dropdown-item"
+            @click="conversationDisplay = 'tree'"
+          >
+            <span
+              class="menu-checkbox -radio"
+              :class="{ 'menu-checkbox-checked': conversationDisplay === 'tree' }"
+            /><FAIcon icon="folder-tree"/> {{ $t('settings.conversation_display_tree_quick') }}
+          </button>
+          <button
+            class="button-default dropdown-item"
+            @click="conversationDisplay = 'linear'"
+          >
+            <span
+              class="menu-checkbox -radio"
+              :class="{ 'menu-checkbox-checked': conversationDisplay === 'linear' }"
+            /><FAIcon icon="bars"/> {{ $t('settings.conversation_display_linear_quick') }}
+          </button>
+          <div
+            role="separator"
+            class="dropdown-divider"
+          />
+        </div>
+        <button
+          class="button-default dropdown-item"
+          @click="showUserAvatars = !showUserAvatars"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-checked': showUserAvatars }"
+          />{{ $t('settings.mention_link_show_avatar_quick') }}
+        </button>
+        <button
+          v-if="!conversation"
+          class="button-default dropdown-item"
+          @click="autoUpdate = !autoUpdate"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-checked': autoUpdate }"
+          />{{ $t('settings.auto_update') }}
+        </button>
+        <button
+          v-if="!conversation"
+          class="button-default dropdown-item"
+          @click="collapseWithSubjects = !collapseWithSubjects"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-checked': collapseWithSubjects }"
+          />{{ $t('settings.collapse_subject') }}
+        </button>
+        <button
+          class="button-default dropdown-item dropdown-item-icon"
+          @click="openTab('general')"
+        >
+          <FAIcon icon="wrench" />{{ $t('settings.more_settings') }}
+        </button>
+      </div>
+    </template>
+    <template #trigger>
+      <button class="button-unstyled">
+        <FAIcon icon="table-list" />
+      </button>
+    </template>
+  </Popover>
+</template>
+
+<script src="./quick_view_settings.js"></script>
+
+<style lang="scss">
+
+.QuickViewSettings {
+
+  > button {
+    line-height: 100%;
+    height: 100%;
+    width: var(--__panel-heading-height-inner);
+    text-align: center;
+
+    svg {
+      font-size: 1.2em;
+    }
+  }
+}
+
+</style>
-- 
cgit v1.2.3-70-g09d2


From 4903069481508221ed047761be20a558799e712d Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 2 Aug 2022 23:54:06 +0300
Subject: change icons

---
 src/components/quick_view_settings/quick_view_settings.js  | 6 +++---
 src/components/quick_view_settings/quick_view_settings.vue | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/components/quick_view_settings/quick_view_settings.vue')

diff --git a/src/components/quick_view_settings/quick_view_settings.js b/src/components/quick_view_settings/quick_view_settings.js
index bb39eb13..ad9e166c 100644
--- a/src/components/quick_view_settings/quick_view_settings.js
+++ b/src/components/quick_view_settings/quick_view_settings.js
@@ -1,12 +1,12 @@
 import Popover from '../popover/popover.vue'
 import { mapGetters } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { faTableList, faFolderTree, faBars, faWrench } from '@fortawesome/free-solid-svg-icons'
+import { faList, faFolderTree, faBarsStaggered, faWrench } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
-  faTableList,
+  faList,
   faFolderTree,
-  faBars,
+  faBarsStaggered,
   faWrench
 )
 
diff --git a/src/components/quick_view_settings/quick_view_settings.vue b/src/components/quick_view_settings/quick_view_settings.vue
index 78f315f3..31ff3c6b 100644
--- a/src/components/quick_view_settings/quick_view_settings.vue
+++ b/src/components/quick_view_settings/quick_view_settings.vue
@@ -23,7 +23,7 @@
             <span
               class="menu-checkbox -radio"
               :class="{ 'menu-checkbox-checked': conversationDisplay === 'linear' }"
-            /><FAIcon icon="bars"/> {{ $t('settings.conversation_display_linear_quick') }}
+            /><FAIcon icon="list"/> {{ $t('settings.conversation_display_linear_quick') }}
           </button>
           <div
             role="separator"
@@ -69,7 +69,7 @@
     </template>
     <template #trigger>
       <button class="button-unstyled">
-        <FAIcon icon="table-list" />
+        <FAIcon icon="bars-staggered" />
       </button>
     </template>
   </Popover>
-- 
cgit v1.2.3-70-g09d2


From 44d6d36ed19f58800800cd9c394464658b688889 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 4 Aug 2022 23:32:06 +0300
Subject: fix bugs

---
 .../quick_view_settings/quick_view_settings.js     |  7 ++--
 .../quick_view_settings/quick_view_settings.vue    | 48 +++++++++++-----------
 2 files changed, 27 insertions(+), 28 deletions(-)

(limited to 'src/components/quick_view_settings/quick_view_settings.vue')

diff --git a/src/components/quick_view_settings/quick_view_settings.js b/src/components/quick_view_settings/quick_view_settings.js
index d1135f01..2798f37a 100644
--- a/src/components/quick_view_settings/quick_view_settings.js
+++ b/src/components/quick_view_settings/quick_view_settings.js
@@ -1,12 +1,12 @@
 import Popover from '../popover/popover.vue'
 import { mapGetters } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
-import { faList, faFolderTree, faBarsStaggered, faWrench } from '@fortawesome/free-solid-svg-icons'
+import { faList, faFolderTree, faBars, faWrench } from '@fortawesome/free-solid-svg-icons'
 
 library.add(
   faList,
   faFolderTree,
-  faBarsStaggered,
+  faBars,
   faWrench
 )
 
@@ -51,7 +51,8 @@ const QuickViewSettings = {
     showUserAvatars: {
       get () { return this.mergedConfig.mentionLinkShowAvatar },
       set () {
-        const value = !this.mentionLinkShowAvatar
+        const value = !this.showUserAvatars
+        console.log(value)
         this.$store.dispatch('setOption', { name: 'mentionLinkShowAvatar', value })
       }
     },
diff --git a/src/components/quick_view_settings/quick_view_settings.vue b/src/components/quick_view_settings/quick_view_settings.vue
index 31ff3c6b..4dc8a060 100644
--- a/src/components/quick_view_settings/quick_view_settings.vue
+++ b/src/components/quick_view_settings/quick_view_settings.vue
@@ -6,30 +6,28 @@
   >
     <template #content>
       <div class="dropdown-menu">
-        <div v-if="loggedIn">
-          <button
-            class="button-default dropdown-item"
-            @click="conversationDisplay = 'tree'"
-          >
-            <span
-              class="menu-checkbox -radio"
-              :class="{ 'menu-checkbox-checked': conversationDisplay === 'tree' }"
-            /><FAIcon icon="folder-tree"/> {{ $t('settings.conversation_display_tree_quick') }}
-          </button>
-          <button
-            class="button-default dropdown-item"
-            @click="conversationDisplay = 'linear'"
-          >
-            <span
-              class="menu-checkbox -radio"
-              :class="{ 'menu-checkbox-checked': conversationDisplay === 'linear' }"
-            /><FAIcon icon="list"/> {{ $t('settings.conversation_display_linear_quick') }}
-          </button>
-          <div
-            role="separator"
-            class="dropdown-divider"
-          />
-        </div>
+        <button
+          class="button-default dropdown-item"
+          @click="conversationDisplay = 'tree'"
+        >
+          <span
+            class="menu-checkbox -radio"
+            :class="{ 'menu-checkbox-checked': conversationDisplay === 'tree' }"
+          /><FAIcon icon="folder-tree"/> {{ $t('settings.conversation_display_tree_quick') }}
+        </button>
+        <button
+          class="button-default dropdown-item"
+          @click="conversationDisplay = 'linear'"
+        >
+          <span
+            class="menu-checkbox -radio"
+            :class="{ 'menu-checkbox-checked': conversationDisplay === 'linear' }"
+          /><FAIcon icon="list"/> {{ $t('settings.conversation_display_linear_quick') }}
+        </button>
+        <div
+          role="separator"
+          class="dropdown-divider"
+        />
         <button
           class="button-default dropdown-item"
           @click="showUserAvatars = !showUserAvatars"
@@ -69,7 +67,7 @@
     </template>
     <template #trigger>
       <button class="button-unstyled">
-        <FAIcon icon="bars-staggered" />
+        <FAIcon icon="bars" />
       </button>
     </template>
   </Popover>
-- 
cgit v1.2.3-70-g09d2


From 09f3783647ff9e0c194e0e0c71b78e98109635b6 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 4 Aug 2022 23:44:56 +0300
Subject: lint

---
 src/components/conversation/conversation.vue               | 4 ++--
 src/components/quick_view_settings/quick_view_settings.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/components/quick_view_settings/quick_view_settings.vue')

diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index c7dacdf9..61832566 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -20,11 +20,11 @@
       <QuickFilterSettings
         v-if="!collapsable"
         :conversation="true"
-        />
+      />
       <QuickViewSettings
         v-if="!collapsable"
         :conversation="true"
-        />
+      />
     </div>
     <div class="conversation-body panel-body">
       <div
diff --git a/src/components/quick_view_settings/quick_view_settings.vue b/src/components/quick_view_settings/quick_view_settings.vue
index 4dc8a060..99b14a66 100644
--- a/src/components/quick_view_settings/quick_view_settings.vue
+++ b/src/components/quick_view_settings/quick_view_settings.vue
@@ -13,7 +13,7 @@
           <span
             class="menu-checkbox -radio"
             :class="{ 'menu-checkbox-checked': conversationDisplay === 'tree' }"
-          /><FAIcon icon="folder-tree"/> {{ $t('settings.conversation_display_tree_quick') }}
+          /><FAIcon icon="folder-tree" /> {{ $t('settings.conversation_display_tree_quick') }}
         </button>
         <button
           class="button-default dropdown-item"
@@ -22,7 +22,7 @@
           <span
             class="menu-checkbox -radio"
             :class="{ 'menu-checkbox-checked': conversationDisplay === 'linear' }"
-          /><FAIcon icon="list"/> {{ $t('settings.conversation_display_linear_quick') }}
+          /><FAIcon icon="list" /> {{ $t('settings.conversation_display_linear_quick') }}
         </button>
         <div
           role="separator"
-- 
cgit v1.2.3-70-g09d2

