Improve UI

protz · Nov 12, 2022 · d4d356b · d4d356b
1 parent 56d2776
commit d4d356b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/content/folderPane.js b/content/folderPane.js
@@ -198,7 +198,7 @@
         if (firstRun && inRestoreTab) {
           const folder = MailUtils.getExistingFolder(startup_folder);
           if (folder)
-            oldSelectFolder.call(this, folder);
+            oldSelectFolder.call(this, folder, true);
           else
             oldSelectFolder.call(this, x, y);
           firstRun = false;
@@ -213,7 +213,7 @@
       */
       const folder = MailUtils.getExistingFolder(startup_folder);
       if (folder) {
-        if (!gFolderTreeView.selectFolder(folder)) {
+        if (!gFolderTreeView.selectFolder(folder, true)) {
           tblog.debug("selectFolder failed");
         }
       } else {

diff --git a/content/tbsortfolders.css b/content/tbsortfolders.css
@@ -8,11 +8,14 @@ tabbox tabs tab[visuallyselected="true"]:not(:-moz-window-inactive) { color: uns
 
 groupbox {
     margin: 5px;
-    border: 2px solid #f0f0f0;
+    border: 2px solid var(--color-gray-20);
     padding: 0 0 5px 0;
 }
 groupbox caption {
-    background: #f0f0f0;
+    background: var(--color-gray-20);
     padding: 0.3em;
     margin: 0 0 5px 0;
 }
+treechildren::-moz-tree-image {
+  -moz-context-properties: fill, fill-opacity, stroke;
+}
diff --git a/content/tbsortfolders_91.xhtml b/content/tbsortfolders_91.xhtml
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/msgSelectOffline.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/mailWindow1.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/icons.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/folderPane.css" type="text/css"?>
 <?xml-stylesheet href="tbsortfolders.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://tbsortfolders/locale/ui.dtd">

diff --git a/content/ui.js b/content/ui.js
@@ -781,7 +781,7 @@ function on_pick_folder(aEvent) {
   let folder = aEvent.target._folder;
   let picker = document.getElementById("startupFolder");
   picker.folder = folder;
-  picker.setAttribute("label", folder.prettyName+' ('+folder.URI+')');
+  picker.setAttribute("label", folder.prettyName+'  ('+folder.URI+')');
   tbsf_prefs.setStringPref("startup_folder", folder.URI);
 }
 
@@ -793,11 +793,12 @@ function extra_on_load() {
     folder = MailUtils.getExistingFolder(startup_folder);
   if (folder) {
     picker.folder = folder;
-    picker.setAttribute("label", folder.prettyName+' ('+folder.URI+')');
+    picker.setAttribute("label", folder.prettyName+'  ('+folder.URI+')');
   } else {
     let menu = document.getElementById("startup_folder_method");
     menu.value = "0";
     picker.disabled = true;
+    picker.style.display = "none";
   }
   on_startup_folder_method_changed();
 }
@@ -807,11 +808,13 @@ function on_startup_folder_method_changed() {
   const picker = document.getElementById("startupFolder");
   let notice = false;
   if (method == "1") {
+    picker.style.display = "";
     picker.disabled = false;
     if (picker.folder)
       tbsf_prefs.setStringPref("startup_folder", picker.folder.URI);
     notice = (g_ThunderbirdMajorVersion < 98);
   } else {
+    picker.style.display = "none";
     picker.disabled = true;
     tbsf_prefs.setStringPref("startup_folder", "");
   }

diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Manually sort folders",
   "description": "An extension that allows you to change the way Thunderbird sorts folders in the folder pane.",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "author": "Jonathan Protzenko and Itagaki Fumihiko",
   "homepage_url": "https://github.com/protz/Manually-Sort-Folders/wiki",
   "applications": {