Skip to content

Commit b1d3a8c

Browse files
itagagakiitagagaki
committed
Add the ability to hide folder icons
The minimum width of the add-on window has also been increased slightly.
1 parent 382cf55 commit b1d3a8c

File tree

25 files changed

+78
-6
lines changed

25 files changed

+78
-6
lines changed

‎content/scripts/messenger.js‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ const g_ThunderbirdMajorVersion = Services.appinfo.version.split(".")[0];
66
Services.scriptloader.loadSubScript("chrome://tbsortfolders/content/folderPane.js", window, "UTF-8");
77

88
function onLoad(activatedWhileWindowOpen) {
9+
const tbsf_prefs = Services.prefs.getBranch("[email protected].");
910
let xulname = 'tbsortfolders';
1011
if (g_ThunderbirdMajorVersion >= 91) {
1112
xulname += '_91';
1213
}
13-
WL.injectElements(`
14+
let additionalElements = `
1415
<menupopup id="taskPopup">
1516
<menuitem insertafter="activityManager" id="tbsf_menu_item"
1617
oncommand="window.openDialog('chrome://tbsortfolders/content/${xulname}.xhtml', 'ManuallySortFolders',
@@ -23,8 +24,20 @@ function onLoad(activatedWhileWindowOpen) {
2324
oncommand="window.openDialog('chrome://tbsortfolders/content/${xulname}.xhtml', 'ManuallySortFolders',
2425
'chrome,titlebar,toolbar,centerscreen,resizable');"
2526
label="&tbsf.menuentry.label;" />
26-
</panelview>`,
27-
["chrome://tbsortfolders/locale/main.dtd"]);
27+
</panelview>`;
28+
if (tbsf_prefs.getStringPref("hide_folder_icons")) {
29+
additionalElements += `
30+
<vbox id="folderPaneBox">
31+
<html:style insertafter="folderPaneHeader">
32+
#folderTree > treechildren::-moz-tree-image {
33+
list-style-image: none;
34+
width: 0;
35+
height: 0;
36+
}
37+
</html:style>
38+
</vbox>`;
39+
}
40+
WL.injectElements(additionalElements, ["chrome://tbsortfolders/locale/main.dtd"]);
2841
}
2942

3043
function onUnload(deactivatedWhileWindowOpen) {

‎content/tbsortfolders.xhtml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,13 @@
183183
</hbox>
184184
<description id="startup_folder_notice">&extra.startupfolder.notice;</description>
185185
</groupbox>
186+
<groupbox>
187+
<caption>&extra.misc;</caption>
188+
<vbox>
189+
<checkbox id="hideFolderIcons" label="&extra.hide_folder_icons;"
190+
oncommand="on_hide_folder_icons_changed();" />
191+
</vbox>
192+
</groupbox>
186193
<spacer flex="1" />
187194
<hbox>
188195
<spacer flex="1" />

‎content/tbsortfolders_91.xhtml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,13 @@
173173
</hbox>
174174
<description id="startup_folder_notice">&extra.startupfolder.notice;</description>
175175
</groupbox>
176+
<groupbox>
177+
<caption>&extra.misc;</caption>
178+
<vbox>
179+
<checkbox id="hideFolderIcons" label="&extra.hide_folder_icons;"
180+
oncommand="on_hide_folder_icons_changed();" />
181+
</vbox>
182+
</groupbox>
176183
<spacer flex="1" />
177184
<hbox>
178185
<spacer flex="1" />

‎content/ui.js‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,8 @@ function on_load() {
273273

274274
let width = tbsf_prefs.getStringPref("width");
275275
let height = tbsf_prefs.getStringPref("height");
276-
if (width < 500) {
277-
width = 500;
276+
if (width < 600) {
277+
width = 600;
278278
}
279279
if (height < 400) {
280280
height = 400;
@@ -801,6 +801,8 @@ function extra_on_load() {
801801
picker.style.display = "none";
802802
}
803803
on_startup_folder_method_changed();
804+
805+
document.getElementById("hideFolderIcons").checked = Boolean(tbsf_prefs.getStringPref("hide_folder_icons"));
804806
}
805807

806808
function on_startup_folder_method_changed() {
@@ -821,3 +823,7 @@ function on_startup_folder_method_changed() {
821823
document.getElementById("startup_folder_notice").style.display = notice ? "" : "none";
822824

823825
}
826+
827+
function on_hide_folder_icons_changed() {
828+
tbsf_prefs.setStringPref("hide_folder_icons", document.getElementById("hideFolderIcons").checked ? "True" : "");
829+
}

‎defaults/preferences/prefs.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ pref("[email protected]_folder", "");
33
pref("[email protected]", "");
44
pref("[email protected]", "0");
55
pref("[email protected]", "0");
6+
pref("[email protected]_folder_icons", "");

‎locale/da/ui.dtd‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,5 @@
4141
<!ENTITY extra.usecustom "Anvend brugervalgt mappe">
4242
<!ENTITY extra.usethisfolder "Anvend denne mappe">
4343
<!ENTITY extra.startupfolder.notice "* Denne funktion fungerer muligvis ikke pålideligt i Thunderbird 97 og tidligere versioner.">
44+
<!ENTITY extra.misc "Div.">
45+
<!ENTITY extra.hide_folder_icons "Skjul mappeikoner (Skal genstarte denne tilføjelse)">

‎locale/de/ui.dtd‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,5 @@
4141
<!ENTITY extra.usecustom "Benutzerdefinierten Ordner verwenden">
4242
<!ENTITY extra.usethisfolder "Diesen Ordner verwenden">
4343
<!ENTITY extra.startupfolder.notice "* Diese Funktion funktioniert möglicherweise nicht zuverlässig in Thunderbird 97 und früheren Versionen.">
44+
<!ENTITY extra.misc "Sonstiges">
45+
<!ENTITY extra.hide_folder_icons "Ordnersymbole ausblenden (Dieses Add-on muss neu gestartet werden)">

‎locale/en-US/ui.dtd‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,5 @@
4141
<!ENTITY extra.usecustom "Use a custom folder">
4242
<!ENTITY extra.usethisfolder "Use this folder">
4343
<!ENTITY extra.startupfolder.notice "* This feature may not work reliably on Thunderbird 97 and earlier versions.">
44+
<!ENTITY extra.misc "Misc.">
45+
<!ENTITY extra.hide_folder_icons "Hide folder icons (Need to restart this add-on)">

‎locale/es-ES/ui.dtd‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,5 @@
4141
<!ENTITY extra.usecustom "Usar una carpeta personalizada">
4242
<!ENTITY extra.usethisfolder "Usar esta carpeta">
4343
<!ENTITY extra.startupfolder.notice "* Es posible que esta función no funcione de forma fiable en Thunderbird 97 y versiones anteriores.">
44+
<!ENTITY extra.misc "Varios">
45+
<!ENTITY extra.hide_folder_icons "Ocultar iconos de carpetas (Es necesario reiniciar este complemento)">

‎locale/fr/ui.dtd‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,5 @@
4141
<!ENTITY extra.usecustom "Choisir un dossier particulier">
4242
<!ENTITY extra.usethisfolder "Utiliser ce dossier">
4343
<!ENTITY extra.startupfolder.notice "* Cette fonction peut ne pas fonctionner de manière fiable dans Thunderbird 97 et les versions antérieures.">
44+
<!ENTITY extra.misc "Divers.">
45+
<!ENTITY extra.hide_folder_icons "Masquer les icônes des dossiers (Il faut redémarrer cet add-on)">

0 commit comments

Comments
 (0)