mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2025-12-21 22:07:59 +01:00
replace readonly textboxes in the commandline and statusbar with labels and
simplify the skin styling
This commit is contained in:
Doug Kearns
@@ -8,8 +8,8 @@
|
||||
mappings go{a-z}, gn{a-z} and M{a-z}
|
||||
* Multiline echo support
|
||||
* Command line is now cleared on most redraws like in vim
|
||||
* The RSS feed button in the address bar works again
|
||||
* reload/stop buttons update enabled state again
|
||||
* The RSS feed button in the address bar works again
|
||||
* reload/stop buttons update enabled state again
|
||||
* added local/url marks support (thanks Viktor Kojouharov)
|
||||
* temporary shortcut Y to yank current selection (for non UNIX-users)
|
||||
* Flashing frame with ]f now works as expected
|
||||
|
||||
1
TODO
1
TODO
@@ -13,6 +13,7 @@ BUGS:
|
||||
dpb| 09:11:50 dpb :: and this happens only when saving the complete
|
||||
webpage, saving only the html works just fine..
|
||||
- add window resize support to hints
|
||||
- can't reverse tab through the vimperator toolbar
|
||||
|
||||
FEATURES:
|
||||
9 :map commands to keys
|
||||
|
||||
@@ -531,10 +531,11 @@ function Marks() //{{{
|
||||
// NS_ERROR_NOT_AVAILABLE" exception when used here?
|
||||
umarks.sort(function(a, b) {
|
||||
if (a[0] < b[0])
|
||||
return -1
|
||||
return -1;
|
||||
else if (a[0] > b[0])
|
||||
return 1;
|
||||
return 0
|
||||
else
|
||||
return 0;
|
||||
});
|
||||
|
||||
return lmarks.concat(umarks);
|
||||
|
||||
@@ -88,10 +88,29 @@ fieldset.paypal {
|
||||
border: none;
|
||||
}
|
||||
|
||||
.command { font-weight: bold; color: #632610; }
|
||||
.mapping { font-weight: bold; color: #102663; }
|
||||
.option { font-weight: bold; color: #106326; }
|
||||
.argument { color: #6A97D4; }
|
||||
.argument {
|
||||
color: #6A97D4;
|
||||
}
|
||||
|
||||
.command {
|
||||
font-weight: bold;
|
||||
color: #632610;
|
||||
}
|
||||
|
||||
.mapping {
|
||||
font-weight: bold;
|
||||
color: #102663;
|
||||
}
|
||||
|
||||
.option {
|
||||
font-weight: bold;
|
||||
color: #106326;
|
||||
}
|
||||
|
||||
.shorthelp {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.version {
|
||||
position: absolute;
|
||||
top: 10px;
|
||||
@@ -99,11 +118,11 @@ fieldset.paypal {
|
||||
color: #C0C0C0;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.warning {
|
||||
font-weight: bold;
|
||||
color: red;
|
||||
}
|
||||
.shorthelp { font-weight: bold; }
|
||||
|
||||
/*
|
||||
* XUL
|
||||
@@ -111,42 +130,27 @@ fieldset.paypal {
|
||||
* TODO: move to the standard location: chrome/skin/vimperator.css...if I can
|
||||
* ever convince MS ;-) -- djk
|
||||
*/
|
||||
#vimperator-bufferwindow {
|
||||
#vimperator-toolbar {
|
||||
font-family: monospace;
|
||||
overflow:-moz-scrollbars-none;
|
||||
}
|
||||
#vimperator-previewwindow {
|
||||
font-family: monospace;
|
||||
overflow:-moz-scrollbars-none;
|
||||
}
|
||||
#vimperator-statusline {
|
||||
-moz-user-focus:ignore;
|
||||
}
|
||||
#vimperator-statusline-field-url {
|
||||
font-family: monospace;
|
||||
background-color: transparent;
|
||||
-moz-user-focus:ignore;
|
||||
|
||||
#vimperator-bufferwindow, #vimperator-completion, #vimperator-previewwindow {
|
||||
-moz-user-focus: ignore;
|
||||
overflow: -moz-scrollbars-none;
|
||||
}
|
||||
|
||||
#vimperator-statusline > label {
|
||||
font-family: monospace;
|
||||
padding: 0px 0px 0px 8px;
|
||||
}
|
||||
#vimperator-completion {
|
||||
font-family: monospace;
|
||||
-moz-user-focus:ignore;
|
||||
overflow:-moz-scrollbars-none;
|
||||
}
|
||||
|
||||
#vimperator-commandline {
|
||||
-moz-user-focus:ignore;
|
||||
background-color: white;
|
||||
color: black;
|
||||
}
|
||||
#vimperator-commandline-prompt {
|
||||
font-family: monospace;
|
||||
background-color:white;
|
||||
-moz-user-focus:ignore;
|
||||
}
|
||||
#vimperator-commandline-command {
|
||||
font-family: monospace;
|
||||
-moz-user-focus:ignore;
|
||||
/* FIXME: black on white or default skin colours? */
|
||||
background-color: white;
|
||||
color: black;
|
||||
}
|
||||
|
||||
.status_insecure, .status_insecure * {
|
||||
|
||||
@@ -291,7 +291,7 @@ function Vimperator() //{{{
|
||||
|
||||
showMode();
|
||||
}
|
||||
|
||||
|
||||
// always show the new mode in the statusline
|
||||
this.removeMode = function(main, extended)
|
||||
{
|
||||
|
||||
@@ -34,83 +34,82 @@ the terms of any one of the MPL, the GPL or the LGPL.
|
||||
<?xml-stylesheet href="chrome://vimperator/content/default.css" type="text/css"?>
|
||||
|
||||
<overlay id="vimperator"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:nc="http://home.netscape.com/NC-rdf#"
|
||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:nc="http://home.netscape.com/NC-rdf#"
|
||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<script type="application/x-javascript;version=1.7" src="vimperator.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="events.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="tabs.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="help.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="commands.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="ui.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="options.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="completion.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="bookmarks.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="hints.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="file.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="find.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="mappings.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="vimperator.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="events.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="tabs.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="help.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="commands.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="ui.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="options.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="completion.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="bookmarks.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="hints.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="file.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="find.js"/>
|
||||
<script type="application/x-javascript;version=1.7" src="mappings.js"/>
|
||||
|
||||
<window id="main-window">
|
||||
<toolbar id="vimperator-toolbar" hidden="false" align="center" fullscreentoolbar="true">
|
||||
<vbox id="vimperator-container" flex="1" hidden="false">
|
||||
<listbox id="vimperator-bufferwindow" class="plain" rows="10" flex="1" hidden="true"
|
||||
<window id="main-window">
|
||||
<toolbar id="vimperator-toolbar" hidden="false" align="center" fullscreentoolbar="true">
|
||||
<vbox id="vimperator-container" flex="1" hidden="false">
|
||||
<listbox id="vimperator-bufferwindow" class="plain" rows="10" flex="1" hidden="true"
|
||||
onclick= "vimperator.bufferwindow.onEvent(event);"
|
||||
ondblclick="vimperator.bufferwindow.onEvent(event);"
|
||||
onkeydown= "vimperator.bufferwindow.onEvent(event);">
|
||||
<listcols>
|
||||
<listcol flex="1" width="50%"/>
|
||||
<listcol flex="1" width="50%"/>
|
||||
</listcols>
|
||||
</listbox>
|
||||
<listcols>
|
||||
<listcol flex="1" width="50%"/>
|
||||
<listcol flex="1" width="50%"/>
|
||||
</listcols>
|
||||
</listbox>
|
||||
|
||||
<listbox id="vimperator-previewwindow" class="plain" rows="10" flex="1" hidden="true"
|
||||
<listbox id="vimperator-previewwindow" class="plain" rows="10" flex="1" hidden="true"
|
||||
onclick= "vimperator.previewwindow.onEvent(event);"
|
||||
ondblclick="vimperator.previewwindow.onEvent(event);"
|
||||
onkeydown= "vimperator.previewwindow.onEvent(event);">
|
||||
<listcols>
|
||||
<listcol flex="1" width="50%"/>
|
||||
<listcol flex="1" width="50%"/>
|
||||
</listcols>
|
||||
</listbox>
|
||||
<listcols>
|
||||
<listcol flex="1" width="50%"/>
|
||||
<listcol flex="1" width="50%"/>
|
||||
</listcols>
|
||||
</listbox>
|
||||
|
||||
<hbox id="vimperator-statusline" flex="1" height="10" hidden="false">
|
||||
<textbox class="plain" id="vimperator-statusline-field-url" flex="1" readonly="true"/>
|
||||
<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>
|
||||
<hbox id="vimperator-statusline" flex="1" height="10" hidden="false">
|
||||
<label class="plain" id="vimperator-statusline-field-url" flex="1"/>
|
||||
<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%"/>
|
||||
<listcol flex="1" width="50%"/>
|
||||
</listcols>
|
||||
</listbox>
|
||||
<listcols>
|
||||
<listcol flex="1" width="50%"/>
|
||||
<listcol flex="1" width="50%"/>
|
||||
</listcols>
|
||||
</listbox>
|
||||
|
||||
<hbox id="vimperator-commandline" flex="1" hidden="false">
|
||||
<textbox class="plain" id="vimperator-commandline-prompt" flex="0" crop="right" value="" collapsed="true"
|
||||
readonly="true"/>
|
||||
<label class="plain" id="vimperator-commandline-prompt" flex="0" crop="right" value="" collapsed="true"/>
|
||||
<textbox class="plain" id="vimperator-commandline-command" flex="1" hidden="false" type="timed" timeout="100"
|
||||
onkeypress="vimperator.commandline.onEvent(event);"
|
||||
oninput="vimperator.commandline.onEvent(event);"
|
||||
onfocus="vimperator.commandline.onEvent(event);"
|
||||
onkeypress="vimperator.commandline.onEvent(event);"
|
||||
oninput="vimperator.commandline.onEvent(event);"
|
||||
onfocus="vimperator.commandline.onEvent(event);"
|
||||
onblur="vimperator.commandline.onEvent(event);"/>
|
||||
</hbox>
|
||||
<iframe id="vimperator-multiline" src="about:blank" flex="1" hidden="false" collapsed="true"/>
|
||||
</vbox>
|
||||
</toolbar>
|
||||
</vbox>
|
||||
</toolbar>
|
||||
|
||||
<keyset id="mainKeyset">
|
||||
<keyset id="mainKeyset">
|
||||
<key id="key_open_vimbar" key=":" oncommand="vimperator.commandline.open(':', '', MODE_EX);" modifiers=""/>
|
||||
<key id="key_stop" keycode="VK_ESCAPE" oncommand="vimperator.events.onEscape();"/>
|
||||
<!--key id="key_a" key="a" oncommand="alert('a'); scrollBufferRelative(0, 1);"!/-->
|
||||
<!-- other keys are handled inside vimperator.js event loop -->
|
||||
</keyset>
|
||||
</window>
|
||||
</keyset>
|
||||
</window>
|
||||
</overlay>
|
||||
|
||||
<!-- vim: set fdm=marker sw=4 ts=4 et: -->
|
||||
|
||||
Reference in New Issue
Block a user