diff --git a/..TODO/TODO.txt b/..TODO/TODO.txt index e62b767..b29d007 100644 --- a/..TODO/TODO.txt +++ b/..TODO/TODO.txt @@ -20,7 +20,6 @@ menu: move to group menu: Unload other -click on active to return to previous tab sort tabs/tree maybe filter tabs on search diff --git a/..Themes/Firefox Quantum by FaffyBucket.tt_theme b/..Themes/Firefox Quantum by FaffyBucket.tt_theme new file mode 100644 index 0000000..60bc3ac --- /dev/null +++ b/..Themes/Firefox Quantum by FaffyBucket.tt_theme @@ -0,0 +1 @@ +{"ToolbarShow":true,"ColorsSet":{"pin_list_background":"#4b4e65","attention_background":"#202340","tab_background":"#202340","tab_title_font_color":"#ffffff","tab_active_background":"#f2f2f2","tab_active_border":"#0a84ff","tab_discarded_background":"#202340","tab_discarded_border":"#202340","tab_border":"#202340","group_list_background":"#4b4e65","tab_list_background":"#4b4e65","children_padding_left":"13px","group_list_default_font_color":"#f2f2f2","tab_active_selected_border":"#0a84ff","close_x":"#b8b9c2","tab_hover_background":"#373954","tab_hover_title_font_color":"#f2f2f2","tab_hover_border":"#5f6176","tab_active_hover_background":"#f2f2f2","tabs_menu_hover_background":"#90c8f6","close_hover_background":"#4a4c64","close_hover_border":"#4a4c64","filter_box_font":"#808080","button_icons":"#4a4a4b","button_icons_hover":"#404040","button_hover_background":"#d5d5d6","button_hover_border":"#d5d5d6","filter_box_border":"#bebebf","attention_border":"#00feff","tab_discarded_hover_background":"#373954","tab_discarded_hover_border":"#5f6176","expand_closed_background":"#0a84ff","expand_hover_background":"#0a84ff","expand_open_background":"#0a84ff","tab_selected_background":"#202340","tab_selected_title_font_color":"#ffffff","tab_selected_border":"#0a84ff","tab_selected_hover_background":"#373954","tab_selected_hover_title_font_color":"#0a84ff","tab_selected_hover_border":"#0a84ff","tab_active_selected_background":"#f2f2f2","tab_selected_active_hover_background":"#f2f2f2","tab_selected_discarded_background":"#202340","tab_selected_discarded_hover_background":"#373954","tab_selected_discarded_hover_border":"#0a84ff","tab_selected_discarded_border":"#0a84ff","tab_active_selected_title_font_color":"#0a84ff","tab_selected_active_hover_title_font_color":"#0a84ff"},"TabsSizeSetNumber":4,"theme_name":"Firefox Quantum","theme_version":2,"toolbar":"
","unused_buttons":"
"} \ No newline at end of file diff --git a/..Themes/blue-submarine (fits with MATE theme, by muesli4).tt_theme b/..Themes/blue-submarine (fits with MATE theme, by muesli4).tt_theme new file mode 100644 index 0000000..5ced352 --- /dev/null +++ b/..Themes/blue-submarine (fits with MATE theme, by muesli4).tt_theme @@ -0,0 +1 @@ +{"ToolbarShow":true,"ColorsSet":{"tab_background":"#1f2427","children_padding_left":"11px","tab_header_border_radius":"4px","pin_list_background":"#1f2427","tab_title_font_color":"#c5c5c7","group_list_button_hover_background":"#1f2427","close_hover_background":"#2e3a45","expand_closed_background":"#c5c5c7","tab_discarded_background":"#1f2427","tab_list_background":"#1f2427","group_list_background":"#1f2427","tab_border":"#1f2427","tab_active_background":"#1f2427","tab_active_title_font_color":"#c5c5c7","tab_discarded_border":"#1f2427","tab_hover_background":"#2e3a45","tab_hover_title_font_color":"#1791c2","tab_hover_border":"#568aab","tab_selected_background":"#1f2427","tab_selected_title_font_weight":"normal","tab_selected_title_font_color":"#c5c5c7","tab_selected_hover_title_font_color":"#1791c2","tab_selected_hover_background":"#2e3a45","tab_active_hover_background":"#2e3a45","tab_active_selected_background":"#1f2427","tab_selected_active_hover_background":"#2e3a45","group_list_default_font_color":"#c5c5c7","group_list_borders":"#414c54","tab_active_hover_title_font_color":"#1791c2","tab_active_selected_title_font_color":"#c5c5c7","tab_selected_active_hover_title_font_color":"#1791c2","tab_discarded_hover_background":"#2e3a45","tab_selected_discarded_background":"#1f2427","tab_selected_discarded_hover_background":"#2e3a45","tab_discarded_hover_border":"#568aab","tab_selected_discarded_border":"#568aab","tab_active_title_font_weight":"bold","tab_discarded_hover_title_font_color":"#1791c2","tab_active_border":"#1f2427","tab_selected_border":"#568aab","tab_active_selected_border":"#568aab","tab_selected_discarded_hover_border":"#568aab","tab_selected_hover_border":"#568aab","pin_list_border_bottom":"#414c54","filter_box_border":"#a1a5a8","toolbar_border_bottom":"#414c54","close_hover_border":"#2e3a45","close_x":"#c5c5c7","button_hover_background":"#2e3a45","button_background":"#1f2427","toolbar_background":"#1f2427","button_border":"#1f2427","button_hover_border":"#568aab","tab_active_hover_border":"#568aab","button_icons":"#c5c5c7","button_icons_hover":"#1791c2","expand_hover_background":"#1791c2","tab_discarded_title_font_color":"#7e7e7e","expand_open_background":"#7e7e7e","tabs_menu_hover_background":"#1f2427","tab_selected_active_hover_border":"#568aab","attention_background":"#70486c","attention_border":"#e126bb","tab_filtered_hover_background":"#45432e","tab_filtered_hover_title_font_color":"#c2b917","tab_filtered_hover_border":"#aba656","tab_filtered_active_background":"#1f2427","tab_filtered_active_title_font_color":"#c2b917","tab_filtered_active_border":"#1f2427","tab_filtered_active_hover_title_font_color":"#c2b917","tab_filtered_active_hover_border":"#aba656","tab_filtered_active_hover_background":"#45432e","tab_filtered_background":"#1f2427","tab_filtered_border":"#1f2427","tab_filtered_title_font_color":"#c2b917","tab_filtered_selected_border":"#aba656","tab_filtered_selected_active_border":"#aba656","tab_filtered_selected_background":"#1f2427","tab_filtered_selected_title_font_color":"#c2b917","tab_filtered_selected_hover_title_font_color":"#c2b917","tab_filtered_selected_active_title_font_color":"#c2b917","tab_filtered_selected_active_hover_title_font_color":"#c2b917","tab_filtered_selected_active_background":"#1f2427","tab_filtered_selected_hover_background":"#45432e","tab_filtered_selected_active_hover_background":"#45432e","tab_filtered_selected_hover_border":"#aba656","tab_filtered_selected_active_hover_border":"#aba656","tab_filtered_highlighted_search_background":"#1f2427","tab_filtered_highlighted_search_title_font_color":"#c11815","tab_filtered_highlighted_search_border":"#1f2427","tab_filtered_highlighted_search_hover_title_font_color":"#c11815","tab_filtered_highlighted_search_hover_background":"#452e32","tab_filtered_highlighted_search_hover_border":"#aa5656","tab_filtered_active_highlighted_search_background":"#1f2427","tab_filtered_active_highlighted_search_hover_background":"#452e32","tab_filtered_selected_highlighted_search_background":"#1f2427","tab_filtered_selected_highlighted_search_hover_background":"#452e32","tab_filtered_selected_active_highlighted_search_background":"#1f2427","tab_filtered_selected_active_highlighted_search_hover_background":"#452e32","tab_filtered_selected_highlighted_search_border":"#ab5668","tab_filtered_selected_active_highlighted_search_border":"#ab5668","tab_filtered_active_highlighted_search_border":"#1f2427","tab_filtered_active_highlighted_search_hover_border":"#ab5668","tab_filtered_selected_highlighted_search_hover_border":"#ab5668","tab_filtered_selected_active_highlighted_search_hover_border":"#ab5668","tab_filtered_active_highlighted_search_title_font_color":"#c2173c","tab_filtered_active_highlighted_search_hover_title_font_color":"#c2173c","tab_filtered_selected_highlighted_search_title_font_color":"#c2173c","tab_filtered_selected_highlighted_search_hover_title_font_color":"#c2173c","tab_filtered_selected_active_highlighted_search_title_font_color":"#c2173c","tab_filtered_selected_active_highlighted_search_hover_title_font_color":"#c2173c","tab_selected_title_font_style":"normal","tab_selected_hover_title_font_style":"normal","tab_active_selected_title_font_style":"normal","tab_selected_active_hover_title_font_style":"normal","tab_selected_discarded_title_font_style":"normal","tab_selected_discarded_hover_title_font_style":"normal","tab_filtered_selected_title_font_style":"normal","tab_filtered_selected_hover_title_font_style":"normal","tab_filtered_selected_active_title_font_style":"normal","tab_filtered_selected_active_hover_title_font_style":"normal","tab_filtered_selected_highlighted_search_title_font_style":"normal","tab_filtered_selected_highlighted_search_hover_title_font_style":"normal","tab_filtered_selected_active_highlighted_search_title_font_style":"normal","tab_filtered_selected_active_highlighted_search_hover_title_font_style":"normal","tab_selected_discarded_hover_title_font_color":"#1791c2","tabs_menu_background":"#1f2427","tabs_menu_font":"#c5c5c7","tabs_menu_hover_border":"#568aab","tabs_menu_separator":"#1f2427","tabs_menu_border":"#414c54","filter_clear_icon":"#000000","filter_box_background":"#fafafa","filter_box_font":"#000000"},"TabsSizeSetNumber":4,"theme_name":"neon","theme_version":2,"toolbar":"
","unused_buttons":""} \ No newline at end of file diff --git a/..Themes/legacy by luetage.tt_theme b/..Themes/legacy by luetage.tt_theme index 3f1a91c..8dc8298 100644 --- a/..Themes/legacy by luetage.tt_theme +++ b/..Themes/legacy by luetage.tt_theme @@ -1 +1 @@ -{"ToolbarShow":true,"ColorsSet":{"scrollbar_thumb":"#c4c4c4","scrollbar_thumb_hover":"#787878","scrollbar_track":"#ffffff","toolbar_background":"#f6f6f6","toolbar_border_bottom":"#cccccc","button_border":"#f6f6f6","button_background":"#f6f6f6","button_hover_border":"#ecebee","button_hover_background":"#ecebee","button_icons":"#000000","filter_box_background":"#fafafa","filter_box_border":"#cccccc","filter_box_font":"#333333","filter_clear_icon":"#000000","pin_list_border_bottom":"#cccccc","pin_list_background":"#ffffff","tab_list_background":"#ffffff","tab_background":"#f6f6f6","tab_border":"#d2d2d2","tab_hover_background":"#d6d5d8","tab_hover_border":"#878787","tab_selected_background":"#c7f4e2","tab_selected_border":"#00caa7","tab_selected_hover_border":"#00caa7","tab_selected_hover_background":"#1de6b4","tab_filtered":"#ffa53b","tab_filtered_highlighted":"#ff8628","tab_filtered_selected":"#fff422","tab_filtered_selected_active":"#fff422","active_font_weight":"bold","tab_title":"#000000","tab_title_active":"#000000","tab_title_discarded":"#7e7e7e","drag_indicator":"#00caa7","close_x":"#3b3b3d","close_hover_x":"#000000","close_hover_border":"#939394","close_hover_background":"#b0adbd","expand_open_border":"#129071","expand_open_background":"#00caa7","expand_closed_border":"#969696","expand_closed_background":"#eaeaea","expand_lines":"#129071","tabs_menu_font":"#333333","tabs_menu_background":"#fafafa","tabs_menu_border":"#bebebe","tabs_menu_hover_background":"#efefef","tabs_menu_hover_border":"#bebebe","tabs_menu_separator":"#efefef"},"TabsSizeSetNumber":2,"TabsSizeSet":{"pin_width":"26px","pin_height":"24px","tab_height":"19px","tab_height_line":"22px","expand_box_size":"5px","expand_box_top":"6px","expand_box_left":"3px","expand_line_h_top":"9px","expand_line_h_width":"12px","expand_line_h_oc_width":"3px","expand_line_v_top":"-9px","expand_line_v_left":"0px","expand_line_v_last_height":"19px","title_padding_with_close":"24px","title_font_size":"12px","title_padding_left":"25px","drag_area_top":"7px","drag_area_bottom":"5px","close_top":"2px","close_right":"2px","close_size":"13px","favicon_size":"16px 16px","favicon_pos":"4px center"},"ScrollbarPinList":"4","ScrollbarTabList":"8","theme_name":"legacy by luetage","theme_version":1,"toolbar":"\n\t\t\t\t\t
\n\t\t\t\t\t\t\n\t\t\t\t\t\t
\n\t\t\t\t\t\t
\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t
\n\t\t\t\t\t\t\t\n\t\t\t\t\t\t\t
\n\t\t\t\t\t\t
\n\t\t\t\t\t\t
\n\t\t\t\t\t\t\t
\n\t\t\t\t\t\t\t
\n\t\t\t\t\t\t\t
\n\t\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t\t\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t
\n\t\t\t\t\t
\t\t\t\t\n\t\t\t\t"} \ No newline at end of file +{"ColorsSet":{"active_font_weight":"bold","button_background":"#f6f6f6","button_border":"#f6f6f6","button_hover_background":"#ecebee","button_hover_border":"#ecebee","button_icons":"#000000","children_padding_left":"8px","close_hover_background":"#b0adbd","close_hover_border":"#939394","close_hover_x":"#000000","close_x":"#3b3b3d","drag_indicator":"#00caa7","expand_closed_background":"#020202","expand_closed_border":"#969696","expand_lines":"#129071","expand_open_background":"#00caa7","expand_open_border":"#129071","filter_box_background":"#fafafa","filter_box_border":"#cccccc","filter_box_font":"#333333","filter_clear_icon":"#000000","pin_list_background":"#ffffff","pin_list_border_bottom":"#cccccc","scrollbar_height":"4px","scrollbar_thumb":"#c4c4c4","scrollbar_thumb_hover":"#787878","scrollbar_track":"#ffffff","scrollbar_width":"8px","tab_active_background":"#c7f4e2","tab_active_border":"#bebebe","tab_active_hover_background":"#1de6b4","tab_active_hover_border":"#bebebe","tab_active_selected_background":"#c7f4e2","tab_active_selected_border":"#00caa7","tab_background":"#f6f6f6","tab_border":"#d2d2d2","tab_discarded_background":"#f6f6f6","tab_filtered":"#ffa53b","tab_filtered_highlighted":"#ff8628","tab_filtered_selected":"#fff422","tab_filtered_selected_active":"#fff422","tab_filtered_selected_active_background":"#e8e000","tab_filtered_selected_active_border":"#00caa7","tab_filtered_selected_active_highlighted_search_border":"#00caa7","tab_filtered_selected_active_highlighted_search_hover_border":"#00caa7","tab_filtered_selected_active_hover_background":"#d2cb00","tab_filtered_selected_active_hover_border":"#00caa7","tab_filtered_selected_background":"#e8e000","tab_filtered_selected_border":"#00caa7","tab_filtered_selected_highlighted_search_border":"#00caa7","tab_filtered_selected_highlighted_search_hover_border":"#00caa7","tab_filtered_selected_hover_background":"#d2cb00","tab_filtered_selected_hover_border":"#00caa7","tab_hover_background":"#d6d5d8","tab_hover_border":"#878787","tab_list_background":"#ffffff","tab_selected_active_hover_background":"#1de6b4","tab_selected_active_hover_border":"#00caa7","tab_selected_background":"#f6f6f6","tab_selected_border":"#00caa7","tab_selected_discarded_background":"#f6f6f6","tab_selected_discarded_border":"#00caa7","tab_selected_discarded_hover_background":"#d7d7d7","tab_selected_discarded_hover_border":"#00caa7","tab_selected_hover_background":"#d6d5d8","tab_selected_hover_border":"#00caa7","tab_title":"#000000","tab_title_active":"#000000","tab_title_discarded":"#7e7e7e","tabs_menu_background":"#fafafa","tabs_menu_border":"#bebebe","tabs_menu_font":"#333333","tabs_menu_hover_background":"#efefef","tabs_menu_hover_border":"#bebebe","tabs_menu_separator":"#efefef","toolbar_background":"#f6f6f6","toolbar_border_bottom":"#cccccc"},"TabsMargins":"2","TabsSizeSetNumber":2,"ToolbarShow":true,"theme_name":"legacy by luetage","theme_version":3,"toolbar":"
","unused_buttons":""} \ No newline at end of file diff --git a/..files_firefox/manifest.json b/..files_firefox/manifest.json index 0b90591..5cb5b19 100644 --- a/..files_firefox/manifest.json +++ b/..files_firefox/manifest.json @@ -44,5 +44,5 @@ "page": "options.html", "open_in_tab": true }, - "version": "1.5" + "version": "1.5.1" } \ No newline at end of file diff --git a/..files_vivaldi/background.html b/..files_vivaldi/background.html index c97bdfc..0a8ace6 100644 --- a/..files_vivaldi/background.html +++ b/..files_vivaldi/background.html @@ -3,6 +3,5 @@ - \ No newline at end of file diff --git a/..files_vivaldi/manifest.json b/..files_vivaldi/manifest.json index 47600e2..9cf5c9f 100644 --- a/..files_vivaldi/manifest.json +++ b/..files_vivaldi/manifest.json @@ -19,5 +19,5 @@ "page": "options.html", "open_in_tab": false }, - "version": "1.0" + "version": "1.5" } diff --git a/..legacy when needed/legacy.js b/..legacy when needed/legacy.js index b781c36..ae4358b 100644 --- a/..legacy when needed/legacy.js +++ b/..legacy when needed/legacy.js @@ -4,7 +4,7 @@ function OldHashTab(tab){ if (tabs[tab.id] == undefined){ - tabs[tab.id] = {ttid: "", hash: 0, h: 0, parent: tab.pinned ? "pin_list" : "tab_list", index: tab.index, expand: "n"}; + tabs[tab.id] = {ttid: "", hash: 0, h: 0, parent: tab.pinned ? "pin_list" : "tab_list", index: tab.index, expand: ""}; } var hash = 0; if (tab.url.length === 0){ @@ -153,9 +153,9 @@ function FirefoxLoadV100(retry) { let tab = Promise.resolve(browser.sessions.getTabValue(tabId, "TTId")).then(function(TTId) { // LOAD TTID FROM FIREFOX GET TAB VALUE if (TTId != undefined) { - tabs[tabId] = {ttid: TTId, parent_ttid: "", parent: tabPinned ? "pin_list" : "tab_list", index: tabIndex, expand: "n"}; + tabs[tabId] = {ttid: TTId, parent_ttid: "", parent: tabPinned ? "pin_list" : "tab_list", index: tabIndex, expand: ""}; } else { - tabs[tabId] = {ttid: "", parent_ttid: "", parent: tabPinned ? "pin_list" : "tab_list", index: tabIndex, expand: "n"}; + tabs[tabId] = {ttid: "", parent_ttid: "", parent: tabPinned ? "pin_list" : "tab_list", index: tabIndex, expand: ""}; } // IF ON LAST TAB AND LAST WINDOW, START MATCHING LOADED DATA if (tabId == lastTabId && winId == lastWinId) { diff --git a/background.html b/background.html index f1c0516..a6cc030 100644 --- a/background.html +++ b/background.html @@ -3,5 +3,7 @@ + + \ No newline at end of file diff --git a/manifest.json b/manifest.json index 0b90591..925573d 100644 --- a/manifest.json +++ b/manifest.json @@ -15,6 +15,7 @@ "16": "icons/16.png" }, "permissions": [ "tabs", "sessions", "", "storage", "bookmarks" ], + "sidebar_action": { "default_icon": { "16": "icons/16.png", @@ -28,12 +29,6 @@ "browser_action": { "default_icon": "icons/24.png" }, - "commands": { - "_execute_browser_action": { - "suggested_key": { "default": "F2" }, - "description": "toggle Tree Tabs" - } - }, "applications": { "gecko": { "id": "TreeTabs@jagiello.it", @@ -44,5 +39,5 @@ "page": "options.html", "open_in_tab": true }, - "version": "1.5" + "version": "100" } \ No newline at end of file diff --git a/scripts/events.js b/scripts/events.js index 9bbdc11..e3d898d 100644 --- a/scripts/events.js +++ b/scripts/events.js @@ -109,11 +109,20 @@ function SetEvents() { } PinList.onmousedown = function(event) { - if (event.which == 1 && event.target == this) { - DeselectFolders(); - DeselectTabs(); - HideMenus(); + if (opt.pin_list_multi_row) { + if (event.which == 1 && event.target == this) { + DeselectFolders(); + DeselectTabs(); + HideMenus(); + } + } else { + if (event.which == 1 && event.target == this && event.clientY < (this.childNodes[0].getBoundingClientRect().height + this.getBoundingClientRect().top)) { + DeselectFolders(); + DeselectTabs(); + HideMenus(); + } } + if (event.which == 2 && event.target == this) { ActionClickGroup(this, opt.midclick_group); } diff --git a/scripts/groups.js b/scripts/groups.js index ba26f21..e1484d9 100644 --- a/scripts/groups.js +++ b/scripts/groups.js @@ -70,7 +70,7 @@ function AppendGroupToList(groupId, group_name, font_color, SetEvents) { if (SetEvents) { grp.onmousedown = function(event) { event.stopImmediatePropagation(); - if (event.which == 1 && event.target == this) { + if (event.which == 1 && event.target == this && event.clientX < (this.childNodes[0].getBoundingClientRect().width + this.getBoundingClientRect().left)) { DeselectFolders(); DeselectTabs(); HideMenus();