From da07d21bfd76f0692fb516a00a59ab721df85845 Mon Sep 17 00:00:00 2001 From: "sgehani%netscape.com" Date: Wed, 24 Apr 2002 02:20:40 +0000 Subject: [PATCH] Improve sidebar discoverability. b=134345; r=morse; sr=jag git-svn-id: svn://10.0.0.236/trunk@119667 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/libpref/src/init/all.js | 1 + .../communicator/sidebar/sb-closed.gif | Bin 0 -> 1094 bytes .../classic/communicator/sidebar/sb-open.gif | Bin 0 -> 1096 bytes .../classic/communicator/sidebar/sidebar.css | 12 +++++ mozilla/themes/classic/jar.mn | 2 + .../modern/communicator/sidebar/sb-closed.gif | Bin 0 -> 1094 bytes .../modern/communicator/sidebar/sb-open.gif | Bin 0 -> 1096 bytes .../modern/communicator/sidebar/sidebar.css | 12 +++++ mozilla/themes/modern/jar.mn | 2 + .../resources/locale/en-US/sidebarOverlay.dtd | 1 + .../sidebar/resources/sidebarOverlay.js | 43 ++++++++++++++++-- .../sidebar/resources/sidebarOverlay.xul | 38 +++++++++++++++- 12 files changed, 107 insertions(+), 4 deletions(-) create mode 100644 mozilla/themes/classic/communicator/sidebar/sb-closed.gif create mode 100644 mozilla/themes/classic/communicator/sidebar/sb-open.gif create mode 100644 mozilla/themes/modern/communicator/sidebar/sb-closed.gif create mode 100644 mozilla/themes/modern/communicator/sidebar/sb-open.gif diff --git a/mozilla/modules/libpref/src/init/all.js b/mozilla/modules/libpref/src/init/all.js index 83016612b3c..7c04d25f72e 100644 --- a/mozilla/modules/libpref/src/init/all.js +++ b/mozilla/modules/libpref/src/init/all.js @@ -115,6 +115,7 @@ pref("browser.chrome.toolbar_style", 2); pref("browser.toolbars.showbutton.bookmarks", true); pref("browser.toolbars.showbutton.go", false); pref("browser.toolbars.showbutton.home", true); +pref("browser.toolbars.showbutton.sidebar", true); pref("browser.toolbars.showbutton.mynetscape", true); pref("browser.toolbars.showbutton.net2phone", true); pref("browser.toolbars.showbutton.print", true); diff --git a/mozilla/themes/classic/communicator/sidebar/sb-closed.gif b/mozilla/themes/classic/communicator/sidebar/sb-closed.gif new file mode 100644 index 0000000000000000000000000000000000000000..68a2241828fe7ef55e3d0cbdf411bd34bf8e8529 GIT binary patch literal 1094 zcmeH_Ye-XJ7{}kSnUZC;ILsUkk*emv}uYK&{$M5|=@O*loCnGbRn{pu- z1cSC!unG%o&M7Pf04Nj+==F;H!D0Zw0`Y6@+AN=$aAL&04^NHiM!stlycXh6RbUO+W-&ntgd;h%SXBADYuV;!Qms_KGNkQose15 z;j=jBEYOZQi+zr8KxPRT?9ej=JxkEjX8Vkpo;B0ZUK2fIg0^{a+KWTmrg57Gw@w>v z5RVZCs|SNn5En*zP|AZslWvrBp`;VFxKWF13PM1f2EwT)T>3RT^k#?7?9{E&;?ckN@@GB&pMUfN>vt|(zw=!n4DbV10W%<^pj9BK_7ALy>`3MLvtKXeX@y5Ed-$TptxFA|w_~ozBSd@# H1Mq$W{Wq(S literal 0 HcmV?d00001 diff --git a/mozilla/themes/classic/communicator/sidebar/sb-open.gif b/mozilla/themes/classic/communicator/sidebar/sb-open.gif new file mode 100644 index 0000000000000000000000000000000000000000..8cefb27471a6a3dfc6e32f4c29956d6fbf3bb23c GIT binary patch literal 1096 zcmeH_TS!xJ9LJAt>O!0o#O5N=mXVo74}#MK?-wFd(&*wtWe6K#krJZ_R;HGDNlHzU z5;dENWp2*Y9i6*x=j?KJ&UUt)ZMut4;6uGcJ=FS-z4YE|e?ENp{{Q@+e&1hpZB+s9 z3JYRElVKx3MEyjLxmD5kP%#o*f$YEVI(#T___{*b(maZ zSyh`>ROpHl`J_Z;3d0htmBKnHtdYQa39OaKHH&iX!kT7bRsCT_HNUK!U*4RT0Tgpf z8}F7jW~J-1Qg~)z4HN`Q_`98GNB{lr6Nv8lKy=SJ&|av75r$}t)bkS}(SwA8HoV*<}waS^ML~o7~tzP9M8c+|W`@AI)t^yUcFrGrcTmPh)Wp zPuFCW$IQ#i%r6USho|Bn ziJEfj-nTQ;<0+TKTq?XbV&*$$bd|GN@zzNV63|HbcXL=hgMta!jkg_ZLvwa{RTtC# zV?;>4T6~sxoFi=AUC7usdQENHVUFaVyLGTXbLAfQXNC`bS1(I0wF#y~{pBZp RZC;ILsUkk*emv}uYK&{$M5|=@O*loCnGbRn{pu- z1cSC!unG%o&M7Pf04Nj+==F;H!D0Zw0`Y6@+AN=$aAL&04^NHiM!stlycXh6RbUO+W-&ntgd;h%SXBADYuV;!Qms_KGNkQose15 z;j=jBEYOZQi+zr8KxPRT?9ej=JxkEjX8Vkpo;B0ZUK2fIg0^{a+KWTmrg57Gw@w>v z5RVZCs|SNn5En*zP|AZslWvrBp`;VFxKWF13PM1f2EwT)T>3RT^k#?7?9{E&;?ckN@@GB&pMUfN>vt|(zw=!n4DbV10W%<^pj9BK_7ALy>`3MLvtKXeX@y5Ed-$TptxFA|w_~ozBSd@# H1Mq$W{Wq(S literal 0 HcmV?d00001 diff --git a/mozilla/themes/modern/communicator/sidebar/sb-open.gif b/mozilla/themes/modern/communicator/sidebar/sb-open.gif new file mode 100644 index 0000000000000000000000000000000000000000..8cefb27471a6a3dfc6e32f4c29956d6fbf3bb23c GIT binary patch literal 1096 zcmeH_TS!xJ9LJAt>O!0o#O5N=mXVo74}#MK?-wFd(&*wtWe6K#krJZ_R;HGDNlHzU z5;dENWp2*Y9i6*x=j?KJ&UUt)ZMut4;6uGcJ=FS-z4YE|e?ENp{{Q@+e&1hpZB+s9 z3JYRElVKx3MEyjLxmD5kP%#o*f$YEVI(#T___{*b(maZ zSyh`>ROpHl`J_Z;3d0htmBKnHtdYQa39OaKHH&iX!kT7bRsCT_HNUK!U*4RT0Tgpf z8}F7jW~J-1Qg~)z4HN`Q_`98GNB{lr6Nv8lKy=SJ&|av75r$}t)bkS}(SwA8HoV*<}waS^ML~o7~tzP9M8c+|W`@AI)t^yUcFrGrcTmPh)Wp zPuFCW$IQ#i%r6USho|Bn ziJEfj-nTQ;<0+TKTq?XbV&*$$bd|GN@zzNV63|HbcXL=hgMta!jkg_ZLvwa{RTtC# zV?;>4T6~sxoFi=AUC7usdQENHVUFaVyLGTXbLAfQXNC`bS1(I0wF#y~{pBZp R + diff --git a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.js b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.js index ce8a8f8271e..a770fc104aa 100644 --- a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.js +++ b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.js @@ -704,9 +704,15 @@ function refresh_all_sidebars() { // Sidebar Init ////////////////////////////////////////////////////////////// function sidebar_overlay_init() { + + // do we have a sidebar? + if (!document.getElementById("sidebar-panels-splitter-box")) + return; + if (sidebar_is_collapsed() && !gAboutToUncollapse) return; gMustInit = false; + sidebarObj.panels = new sbPanelList('sidebar-panels'); sidebarObj.datasource_uri = get_sidebar_datasource_uri(); sidebarObj.resource = 'urn:sidebar:current-panel-list'; @@ -733,6 +739,9 @@ function sidebar_overlay_init() { if (sidebarObj.never_built) { sidebarObj.never_built = false; + // set personal toolbar sidebar icon to correct state + SidebarToggleIcon(); + debug("sidebar = " + sidebarObj); debug("sidebarObj.resource = " + sidebarObj.resource); debug("sidebarObj.datasource_uri = " + sidebarObj.datasource_uri); @@ -780,9 +789,14 @@ function sidebar_overlay_init() { } function sidebar_overlay_destruct() { - var panels = document.getElementById('sidebar-panels'); - debug("Removing observer from database."); - panels.database.RemoveObserver(panel_observer); + + // do we have a sidebar? + if (!document.getElementById("sidebar-panels-splitter-box")) + return; + + var panels = document.getElementById('sidebar-panels'); + debug("Removing observer from database."); + panels.database.RemoveObserver(panel_observer); } function sidebar_open_default_panel(wait, tries) { @@ -1091,6 +1105,7 @@ function sidebar_is_collapsed() { } function SidebarExpandCollapse() { + SidebarToggleIcon(); var sidebar_splitter = document.getElementById('sidebar-splitter'); var sidebar_box = document.getElementById('sidebar-box'); if (sidebar_splitter.getAttribute('state') == 'collapsed') { @@ -1117,6 +1132,7 @@ function sidebar_is_hidden() { // Show/Hide the entire sidebar. // Invoked by the "View / Sidebar" menu option. function SidebarShowHide() { + SidebarToggleIcon(); var sidebar_box = document.getElementById('sidebar-box'); var title_box = document.getElementById('sidebar-title-box'); var sidebar_panels_splitter = document.getElementById('sidebar-panels-splitter'); @@ -1299,6 +1315,27 @@ function SidebarTogglePanel(panel_menuitem) { sidebarObj.datasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource).Flush(); } +function SidebarToggleIcon() +{ + var sidebarButton = document.getElementById("sidebar-button"); + if (sidebarButton) + { + var newValue = false; + if (sidebarButton.getAttribute("sbopen") == "false") + newValue = true; + + sidebarButton.setAttribute("sbopen", newValue); + + var tooltipText; + if (newValue) // it's open so show action ``<== Close Sidebar'' + tooltipText = sidebarButton.getAttribute("sbclosetooltip"); + else // it's closed so show action ``==> Open Sidebar'' + tooltipText = sidebarButton.getAttribute("sbopentooltip"); + + sidebarButton.setAttribute("tooltiptext", tooltipText); + } +} + function SidebarNavigate(aDirection) { debug("SidebarNavigate " + aDirection); diff --git a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul index 3bb805ad90b..f9bc1fa3069 100644 --- a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul +++ b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul @@ -21,7 +21,7 @@ - + @@ -54,6 +54,42 @@ oncommand="SidebarCustomize();"/> + + + + + + + + + + + + +