From 4ec9477c7450c140c5d0cc6f6bebfcc32ed28638 Mon Sep 17 00:00:00 2001 From: Doug Kearns Date: Sat, 22 Sep 2007 14:29:56 +0000 Subject: [PATCH] merge the existing status bar with the standard FF status bar --- NEWS | 2 + chrome/content/vimperator/default.css | 24 +++-- chrome/content/vimperator/options.js | 4 +- chrome/content/vimperator/ui.js | 11 +-- chrome/content/vimperator/vimperator.xul | 115 ++++++++++++----------- 5 files changed, 83 insertions(+), 73 deletions(-) diff --git a/NEWS b/NEWS index 3b5908c4..290ee2de 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ 
 2007-XX-XX:
 	* version 0.5.2
+	* merge the existing status bar with the standard FF status bar so that
+	  security information and extension buttons are included
 	* added new :sidebar and :sbclose commands
 	* added 'more' and standard more-prompt key mappings to control
 	  behaviour of the message list pager 
diff --git a/chrome/content/vimperator/default.css b/chrome/content/vimperator/default.css
index 6e370cc0..35b9a5dc 100644
--- a/chrome/content/vimperator/default.css
+++ b/chrome/content/vimperator/default.css
@@ -124,7 +124,7 @@ fieldset.paypal {
  * TODO: move to the standard location: chrome/skin/vimperator.css...if I can
  * ever convince MS ;-) -- djk
  */
-#vimperator-toolbar  {
+#vimperator-container  {
     font-family: monospace;
 }
 
@@ -142,21 +142,30 @@ fieldset.paypal {
    color: HighlightText !important;
 }
 
+statusbarpanel {
+    -moz-appearance: none !important;
+    border: none !important;
+}
+#vimperator-statusline {
+    font-family: monospace;
+    margin: 0
+}
 #vimperator-statusline > label {
     padding: 0px 0px 0px 8px;
 }
 #vimperator-statusline > label:first-child {
     padding: 0px;
 }
-
-#vimperator-commandline {
-    background-color: white;
+#vimperator-statusline-field-url {
+    background-color: transparent;
     color: black;
 }
-#vimperator-commandline-prompt {
-    /* FIXME: black on white or default skin colours? */
+
+#vimperator-commandline {
+    /* FIXME: black on white or default skin colors? */
     background-color: white;
     color: black;
+    padding: 1px;
 }
 
 #vimperator-multiline-output {
@@ -167,9 +176,10 @@ fieldset.paypal {
     background-color: black;
 }
 
+/*
 .status_insecure, .status_insecure * {
-    background-color: transparent;
 }
+*/
 .status_secure, .status_secure * {
     background-color: #B0FF00; /* light green */
     color: black;
diff --git a/chrome/content/vimperator/options.js b/chrome/content/vimperator/options.js
index f3d92470..5737a05e 100644
--- a/chrome/content/vimperator/options.js
+++ b/chrome/content/vimperator/options.js
@@ -407,9 +407,9 @@ function Options() //{{{
                   "
  • m: menubar
    • " +
                   "
  • T: toolbar
    • " +
                   "
  • b: bookmark bar
    • " +
-                  "
  • s: original Firefox statusbar
    • ",
+                  "
  • s: statusbar
    • ",
             setter: function(value) { Options.setPref("guioptions", value); setGuiOptions(value); },
-            default_value: "",
+            default_value: "s",
             validator: function (value) { if (/[^mTbs]/.test(value)) return false; else return true; }
         }
     ));
diff --git a/chrome/content/vimperator/ui.js b/chrome/content/vimperator/ui.js
index 3cb01d15..56c87195 100644
--- a/chrome/content/vimperator/ui.js
+++ b/chrome/content/vimperator/ui.js
@@ -1004,6 +1004,8 @@ function StatusLine() //{{{
     ////////////////////// PRIVATE SECTION /////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
+    var status_bar = document.getElementById("status-bar");
+
     // our status bar fields
     var statusline_widget     = document.getElementById("vimperator-statusline");
     var url_widget            = document.getElementById("vimperator-statusline-field-url");
@@ -1016,16 +1018,9 @@ function StatusLine() //{{{
     ////////////////////// PUBLIC SECTION //////////////////////////////////////////
     /////////////////////////////////////////////////////////////////////////////{{{
 
-    // use names for the color or "transparent" to remove color information
-    this.setColor = function(color)
-    {
-        if (!color)
-            color = "transparent";
-        statusline_widget.setAttribute("style", "background-color: " + color);
-    };
     this.setClass = function(type)
     {
-        statusline_widget.setAttribute("class", "status_" + type);
+        status_bar.setAttribute("class", "chromeclass-status status_" + type);
     };
 
     this.updateUrl = function(url)
diff --git a/chrome/content/vimperator/vimperator.xul b/chrome/content/vimperator/vimperator.xul
index 183f434e..7c57f892 100644
--- a/chrome/content/vimperator/vimperator.xul
+++ b/chrome/content/vimperator/vimperator.xul
@@ -56,62 +56,6 @@ the terms of any one of the MPL, the GPL or the LGPL.
 
     
 
-