mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2025-12-22 11:47:58 +01:00
merge the existing status bar with the standard FF status bar
This commit is contained in:
Doug Kearns
2
NEWS
2
NEWS
@@ -2,6 +2,8 @@
|
||||
2007-xx-xx:
|
||||
* version 0.6
|
||||
* THIS VERSION ONLY WORKS WITH FIREFOX 3.0
|
||||
* merge the existing status bar with the standard FF status bar so that
|
||||
security information and extension buttons are included
|
||||
* added full zoom, and changed keybindings slightly for text zoom
|
||||
* :buffer partial_string works now as in vim, and with ! even better
|
||||
* new :time command for profiling
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -144,21 +144,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 {
|
||||
|
||||
#vimperator-commandline {
|
||||
/* FIXME: black on white or default skin colors? */
|
||||
background-color: white;
|
||||
color: black;
|
||||
padding: 1px;
|
||||
}
|
||||
|
||||
#vimperator-multiline-output {
|
||||
@@ -170,9 +179,10 @@ fieldset.paypal {
|
||||
background-color: black;
|
||||
}
|
||||
|
||||
/*
|
||||
.status_insecure, .status_insecure * {
|
||||
background-color: transparent;
|
||||
}
|
||||
*/
|
||||
.status_secure, .status_secure * {
|
||||
background-color: #B0FF00; /* light green */
|
||||
color: black;
|
||||
|
||||
@@ -407,9 +407,9 @@ function Options() //{{{
|
||||
"<li><b>m</b>: menubar</li>" +
|
||||
"<li><b>T</b>: toolbar</li>" +
|
||||
"<li><b>b</b>: bookmark bar</li>" +
|
||||
"<li><b>s</b>: original Firefox statusbar</li></ul>",
|
||||
"<li><b>s</b>: statusbar</li></ul>",
|
||||
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; }
|
||||
}
|
||||
));
|
||||
|
||||
@@ -1005,6 +1005,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");
|
||||
@@ -1017,16 +1019,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)
|
||||
|
||||
@@ -58,8 +58,39 @@ the terms of any one of the MPL, the GPL or the LGPL.
|
||||
|
||||
<window id="main-window">
|
||||
|
||||
<toolbar id="vimperator-toolbar" hidden="false" align="center" fullscreentoolbar="true">
|
||||
<vbox id="vimperator-container" flex="1" hidden="false">
|
||||
<keyset id="mainKeyset">
|
||||
<key id="key_open_vimbar" key=":" oncommand="vimperator.commandline.open(':', '', vimperator.modes.EX);" modifiers=""/>
|
||||
<key id="key_stop" keycode="VK_ESCAPE" oncommand="vimperator.events.onEscape();"/>
|
||||
<!-- other keys are handled inside vimperator.js event loop -->
|
||||
</keyset>
|
||||
|
||||
<panel id="vimperator-visualbell"/>
|
||||
|
||||
<!--this notifies us also of focus events in the XUL
|
||||
from: http://developer.mozilla.org/en/docs/XUL_Tutorial:Updating_Commands !-->
|
||||
<commandset id="onVimperatorFocus"
|
||||
commandupdater="true"
|
||||
events="focus"
|
||||
oncommandupdate="vimperator.events.onFocusChange(event);"/>
|
||||
<commandset id="onVimperatorSelect"
|
||||
commandupdater="true"
|
||||
events="select"
|
||||
oncommandupdate="vimperator.events.onSelectionChange(event);"/>
|
||||
|
||||
<statusbar id="status-bar">
|
||||
<hbox insertbefore="statusbar-display" id="vimperator-statusline" flex="1" height="10" hidden="false" align="center">
|
||||
<textbox class="plain" id="vimperator-statusline-field-url" readonly="false" flex="1" crop="end"/>
|
||||
<label class="plain" id="vimperator-statusline-field-inputbuffer" flex="0"/>
|
||||
<label class="plain" id="vimperator-statusline-field-progress" flex="0"/>
|
||||
<label class="plain" id="vimperator-statusline-field-tabcount" flex="0"/>
|
||||
<label class="plain" id="vimperator-statusline-field-bufferposition" flex="0"/>
|
||||
</hbox>
|
||||
<!-- just hide them so other elements since other elements expect them -->
|
||||
<statusbarpanel id="statusbar-display" hidden="true"/>
|
||||
<statusbarpanel id="statusbar-progresspanel" hidden="true"/>
|
||||
</statusbar>
|
||||
|
||||
<vbox id="vimperator-container" hidden="false">
|
||||
<listbox id="vimperator-bufferwindow" class="plain" rows="10" flex="1" hidden="true"
|
||||
onclick= "vimperator.bufferwindow.onEvent(event);"
|
||||
ondblclick="vimperator.bufferwindow.onEvent(event);"
|
||||
@@ -80,14 +111,6 @@ the terms of any one of the MPL, the GPL or the LGPL.
|
||||
</listcols>
|
||||
</listbox>
|
||||
|
||||
<hbox id="vimperator-statusline" flex="1" height="10" hidden="false">
|
||||
<textbox class="plain" id="vimperator-statusline-field-url" readonly="true" flex="1" crop="end"/>
|
||||
<label class="plain" id="vimperator-statusline-field-inputbuffer" flex="0"/>
|
||||
<label class="plain" id="vimperator-statusline-field-progress" flex="0"/>
|
||||
<label class="plain" id="vimperator-statusline-field-tabcount" flex="0"/>
|
||||
<label class="plain" id="vimperator-statusline-field-bufferposition" flex="0"/>
|
||||
</hbox>
|
||||
|
||||
<listbox id="vimperator-completion" class="plain" rows="1" flex="1" hidden="true">
|
||||
<listcols>
|
||||
<listcol flex="1" width="50%"/>
|
||||
@@ -98,7 +121,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
|
||||
<iframe id="vimperator-multiline-output" src="about:blank" flex="1" height="10px" hidden="false" collapsed="true"
|
||||
onclick="vimperator.commandline.onMultilineOutputEvent(event)"/>
|
||||
|
||||
<hbox id="vimperator-commandline" flex="1" hidden="false">
|
||||
<hbox id="vimperator-commandline" hidden="false">
|
||||
<label class="plain" id="vimperator-commandline-prompt" flex="0" crop="end" value="" collapsed="true"/>
|
||||
<textbox class="plain" id="vimperator-commandline-command" flex="1" hidden="false" type="timed" timeout="100"
|
||||
onkeypress="vimperator.commandline.onEvent(event);"
|
||||
@@ -107,31 +130,11 @@ the terms of any one of the MPL, the GPL or the LGPL.
|
||||
onblur="vimperator.commandline.onEvent(event);"/>
|
||||
</hbox>
|
||||
|
||||
<textbox id="vimperator-multiline-input" class="plain" flex="1" rows="10" hidden="false" collapsed="true" multiline="true"
|
||||
<textbox id="vimperator-multiline-input" class="plain" flex="1" rows="1" hidden="false" collapsed="true" multiline="true"
|
||||
onkeypress="vimperator.commandline.onMultilineInputEvent(event);"
|
||||
oninput="vimperator.commandline.onMultilineInputEvent(event);"
|
||||
onblur="vimperator.commandline.onMultilineInputEvent(event);"/>
|
||||
</vbox>
|
||||
</toolbar>
|
||||
|
||||
<panel id="vimperator-visualbell"/>
|
||||
|
||||
<keyset id="mainKeyset">
|
||||
<key id="key_open_vimbar" key=":" oncommand="vimperator.commandline.open(':', '', vimperator.modes.EX);" modifiers=""/>
|
||||
<key id="key_stop" keycode="VK_ESCAPE" oncommand="vimperator.events.onEscape();"/>
|
||||
<!-- other keys are handled inside vimperator.js event loop -->
|
||||
</keyset>
|
||||
|
||||
<!--this notifies us also of focus events in the XUL
|
||||
from: http://developer.mozilla.org/en/docs/XUL_Tutorial:Updating_Commands !-->
|
||||
<commandset id="onVimperatorFocus"
|
||||
commandupdater="true"
|
||||
events="focus"
|
||||
oncommandupdate="vimperator.events.onFocusChange(event);"/>
|
||||
<commandset id="onVimperatorSelect"
|
||||
commandupdater="true"
|
||||
events="select"
|
||||
oncommandupdate="vimperator.events.onSelectionChange(event);"/>
|
||||
|
||||
</window>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user