add "ssl" statusfield

 * default off (because the navigation toolbar is showed by default)

Author: teramako

common/content/buffer.js

@@ -244,6 +244,7 @@ const Buffer = Module("buffer", {
         // for notifying the user about secure web pages
         onSecurityChange: function onSecurityChange(webProgress, request, state) {
             onSecurityChange.superapply(this, arguments);
+            statusline.updateField("ssl", state);
         },
         onStatusChange: function onStatusChange(webProgress, request, status, message) {
             onStatusChange.superapply(this, arguments);

common/content/liberator.xul

@@ -90,6 +90,8 @@
                     <toolbaritem id="liberator-status" flex="10000000" liberator:highlight="StatusLine">
                         <spacer liberatorPosition="-1" flex="10000000"/>
                         <label id="liberator-status-input"/>
+                        <toolbarbutton id="liberator-status-ssl"
+                                       oncommand="liberator.modules.statusline.ssl.openPopup(this);"/>
                         <label id="liberator-status-location" flex="1" crop="center"/>
                         <label id="liberator-status-history"/>
                         <label id="liberator-status-bookmark"/>

common/content/statusline.js

@@ -153,6 +153,37 @@ const StatusLine = Module("statusline", {
 
                 node.value = buffer;
             });
+        statusline.addField("ssl", "The currently SSL status", "liberator-status-ssl",
+            function updateSSLState (node, state) {
+                var className = "";
+                if (!state) {
+                    let securityUI = config.tabbrowser.securityUI;
+                    if (securityUI)
+                        state = securityUI.state || 0;
+                }
+                const WPL = Components.interfaces.nsIWebProgressListener;
+                if (state & WPL.STATE_IDENTITY_EV_TOPLEVEL)
+                    className = "verifiedIdentity";
+                else if (state & WPL.STATE_IS_SECURE)
+                    className = "verifiedDomain";
+                else if (state & WPL.STATE_IS_BROKEN) {
+                    if ((state & WPL.STATE_LOADED_MIXED_ACTIVE_CONTENT) &&
+                        options.getPref("security.mixed_content.block_active_content", false))
+                        className = "mixedActiveContent";
+                }
+
+                node.className = className;
+            }, {
+                openPopup: function (anchor) {
+                    var handler = window.gIdentityHandler;
+                    if (typeof handler === "undefiend") // Thunderbird has none
+                        return;
+
+                    handler._identityPopup.hidden = false;
+                    handler.setPopupMessages(handler._identityBox.className);
+                    handler._identityPopup.openPopup(anchor);
+                },
+            });
         statusline.addField("location", "The currently loaded URL", "liberator-status-location",
             /**
              * Update the URL displayed in the status line

common/locale/en-US/options.xml

@@ -752,6 +752,7 @@
             <dt>tabcount</dt>   <dd>[N/M]: N is the index of the currently selected tab and M is
                                     the total number of tabs in the current window.</dd>
             <dt>position</dt>   <dd>The vertical scroll position</dd>
+            <dt>ssl</dt>        <dd>Show an icon when the current buffer is connecting with SSL.</dd>
         </dl>
     </description>
 </item>

common/locale/ja/options.xml

@@ -722,28 +722,28 @@
     </description>
 </item>
 
-
 <item>
-    <tags>'ls' 'laststatus'</tags>
-    <spec>'laststatus' 'ls'</spec>
-    <type>number</type>
-    <default>2</default>
+    <tags>'status'</tags>
+    <spec>'status'</spec>
+    <type>stringlist</type>
+    <default>input,location,bookmark,history,tabcount,position</default>
     <description>
-        <p>ステータスラインを表示するタイミングを決定します。</p>
+        <p>ステータスラインに表示する要素を示します。</p>
 
-        <p>以下の値が使用できます:</p>
+        <p>指定可能な値</p>
 
         <dl>
-            <dt>0</dt>      <dd>常に表示しません</dd>
-            <dt>1</dt>      <dd>複数のウィンドウがあるときのみ表示します</dd>
-            <dt>2</dt>      <dd>常に表示します</dd>
+            <dt>input</dt>      <dd>'gg' と入力する場合、'g' の様に入力キーの一部を表示します</dd>
+            <dt>location</dt>   <dd>現在表示しているページのURLを表示します</dd>
+            <dt>bookmark</dt>   <dd>現在のURLがブックマーク済みである場合に &#x2764; を表示します</dd>
+            <dt>history</dt>    <dd>履歴の戻る/進むを &lt;&gt; で示します</dd>
+            <dt>tabcount</dt>   <dd>現Windowのタブ数と現タブの位置を [タブ位置/タブ数] で示します</dd>
+            <dt>position</dt>   <dd>スクロール位置を示します</dd>
+            <dt>ssl</dt>        <dd>SSL接続している場合にアイコンを表示します</dd>
         </dl>
-
-        <note>laststatus=1 はまだ実装されていません。</note>
     </description>
 </item>
 
-
 <item>
     <tags>'nolks' 'nolinksearch'</tags>
     <tags>'lks' 'linksearch'</tags>

common/skin/liberator.css

@@ -117,7 +117,7 @@
     border: none !important;
     padding: 0 0px !important;
     background: transparent !important;
-    height: 18px !important;
+    height: 16px !important;
 }
 #liberator-statusline > *,
 #liberator-commandline > * {
@@ -142,6 +142,25 @@
     padding: 0 1px;
     margin: 0;
 }
+#liberator-status-ssl {
+    -moz-appearance: none;
+    width: 16px;
+    height: 16px;
+    visibility: collapse;
+    -moz-image-region: rect(0, 16px, 16px, 0);
+}
+#liberator-status-ssl.verifiedIdentity {
+    visibility: visible;
+    list-style-image: url(chrome://browser/skin/identity-icons-https-ev.png);
+}
+#liberator-status-ssl.verifiedDomain {
+    visibility: visible;
+    list-style-image: url(chrome://browser/skin/identity-icons-https.png);
+}
+#liberator-status-ssl.mixedActiveContent {
+    visibility: visible;
+    list-style-image: url(chrome://browser/skin/identity-icons-https-mixed-active.png);
+}
 
 #liberator-commandline-prompt {
     background-color: inherit;

vimperator/NEWS

@@ -1,4 +1,6 @@
 2013-XX-XX:
+    * version 3.8
+    * Add "ssl" field shows SSL connection icon to "status" option (default: off)
 
 2013-05-22:
     * version 3.7.1