Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XUL Cleanup, feedback incorporation, and shakeout

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@187234 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dougt%meer.net 2006-01-10 06:49:17 +00:00
parent f89fbadc41
commit 6edfbc5614
9 changed files with 343 additions and 481 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

247
mozilla/minimo/chrome/content/minimo.js
View File

@ -53,7 +53,8 @@ var gFullScreen=false;
var gRSSTag="minimo";
var gGlobalHistory = null;
var gURIFixup = null;
var gShowingMenuPopup=null;
var gShowingMenuPopup=false;
var gShowingNavMenuPopup=false;
var gFocusedElementHREFContextMenu=null;
var gDeckMode=0; // 0 = site, 1 = sb, 2= rss. Used for the URLBAR selector, DeckMode impl.
var gDeckMenuChecked=null; // to keep the state of the checked URLBAR selector mode.
@ -62,8 +63,6 @@ var gPref = null; // so far snav toggles on / off via direct
// See bugzilla.mozilla.org/show_bug.cgi?id=311287#c1
var gPrefAdded=false; // shall be used to flush the pref.
var gSNAV=-1;
function nsBrowserStatusHandler()
{
}
@ -85,14 +84,12 @@ nsBrowserStatusHandler.prototype =
init : function()
{
this.urlBar = document.getElementById("urlbar");
this.stopreloadButton = document.getElementById("reload-stop-button");
this.progressBGPosition = 0; /* To be removed, fix in onProgressChange ... */
},
destroy : function()
{
this.urlBar = null;
this.stopreloadButton = null;
this.progressBGPosition = null; /* To be removed, fix in onProgressChange ... */
},
@ -111,9 +108,6 @@ nsBrowserStatusHandler.prototype =
if(aRequest && aWebProgress.DOMWindow == content) {
this.startDocumentLoad(aRequest);
}
this.stopreloadButton.className = "stop-button";
this.stopreloadButton.setAttribute("command","cmd_BrowserStop");
return;
}
@ -124,9 +118,6 @@ nsBrowserStatusHandler.prototype =
/* To be fixed. We dont want to directly access sytle from here */
document.styleSheets[1].cssRules[0].style.backgroundPosition="1000px 100%";
this.stopreloadButton.className = "reload-button";
this.stopreloadButton.setAttribute("command","cmd_BrowserReload");
return;
}
return;
@ -333,25 +324,8 @@ nsBrowserStatusHandler.prototype =
document.__defineSetter__("title",function(x){}); // Stays with the titled defined by the XUL element.
/*
* We add event handler to catch the right and left keys on the main_MenuPopup
*/
document.addEventListener("keypress",eventHandlerMenu,true);
/*
* Sync UI zoom level
*/
syncUIZoom();
/*
* Add event clicks to Minimo toolbars and also to the mStrip BOX in the tabbrowser
*/
gBrowser.mStrip.addEventListener("click",BrowserWithoutSNAV,false);
document.getElementById("mini-toolbars").addEventListener("click",BrowserWithoutSNAV,false);
gBrowser.addEventListener("DOMLinkAdded", BrowserLinkAdded, false);
gBrowser.addEventListener("DOMLinkAdded", BrowserLinkAdded, false);
}
@ -439,19 +413,6 @@ function BrowserUpdateFeeds() {
* For now, this updates via DOM the top menu. Context menu should be here as well.
*/
function BrowserUpdateBackForwardState() {
if(gBrowser.webNavigation.canGoBack) {
document.getElementById("back-button").setAttribute("disabled","false");
} else {
document.getElementById("back-button").setAttribute("disabled","true");
}
if(gBrowser.webNavigation.canGoForward) {
document.getElementById("forward-button").setAttribute("disabled","false");
} else {
document.getElementById("forward-button").setAttribute("disabled","true");
}
}
@ -473,103 +434,6 @@ function findChildShell(aDocument, aDocShell, aSoughtURI) {
}
function BrowserWithoutSNAV(e) {
if(gSNAV==1||gSNAV==-1) {
gSNAV=0;
document.addEventListener("keypress",eventHandlerMenu,true);
gPref.setBoolPref("snav.enabled", false);
}
}
function BrowserWithSNAV(e) {
if(gSNAV==0||gSNAV==-1) {
gSNAV=1;
document.removeEventListener("keypress",eventHandlerMenu,true);
gPref.setBoolPref("snav.enabled", true);
}
}
function enableMenuAccess() {
if(document.commandDispatcher&&document.commandDispatcher.focusedElement) {
if (document.commandDispatcher.focusedElement.getAttribute("id")=="menu-button") {
BrowserWithSNAV();
gBrowser.focus();
gBrowser.contentWindow.focus();
return;
}
}
// In case focus is somewhere else..
document.getElementById("menu-button").focus();
BrowserWithoutSNAV();
}
/*
* Focus Shortcut Action. This is just a focus action dispatcher based on certain conditions
* defined in the XUL elements. Ideally would be interesting to have this as part of some new
* XUL elements that are based on existing XUL elements, or to incorporate, import, this behavior
* in the XUL declaration.
*/
function eventHandlerMenu(e) {
if( (e.keyCode==e.DOM_VK_LEFT || e.keyCode==e.DOM_VK_RIGHT) && (gShowingMenuPopup) ) {
BrowserMenuPopupFalse();
document.getElementById("menu-button").focus(); // forcing state back to the menu.
}
if(document.commandDispatcher&&document.commandDispatcher.focusedElement) {
var outnavTarget=document.commandDispatcher.focusedElement.getAttribute("accessrule");
if(outnavTarget && (e.keyCode==e.DOM_VK_DOWN||e.keyCode==e.DOM_VK_UP) && !gShowingMenuPopup) {
e.preventBubble();
if(e.keyCode==e.DOM_VK_DOWN) {
ruleElement=findRuleById(document.getElementById(outnavTarget).getAttribute("accessnextrule"),"accessnextrule");
}
if(e.keyCode==e.DOM_VK_UP) {
ruleElement=findRuleById(document.getElementById(outnavTarget).getAttribute("accessprevrule"),"accessprevrule");
}
var tempElement=ruleElement.getAttribute("accessfocus");
if(tempElement.indexOf("#")>-1) {
if(tempElement=="#tabContainer") {
if(gBrowser.tabContainer) {
gBrowser.selectedTab.focus();
if(gBrowser.mStrip.collapsed) {
gBrowser.contentWindow.focus();
}
}
}
if(tempElement=="#tabContent") {
gBrowser.focus();
gBrowser.contentWindow.focus();
}
} else {
document.getElementById(tempElement).focus();
}
}
}
}
function findRuleById(outnavTarget,ruleattribute) {
var ruleElement=document.getElementById(outnavTarget);
if(document.getElementById(ruleElement.getAttribute("target")).collapsed) {
return findRuleById(ruleElement.getAttribute(ruleattribute), ruleattribute);
} else {
return ruleElement;
}
}
/**
* Init stuff
*
@ -587,11 +451,6 @@ function browserInit(refTab)
*/
var refBrowser=gBrowser.getBrowserForTab(refTab);
/* New Browser OnFocus SNAV Toggle */
refBrowser.addEventListener("focus", BrowserWithSNAV , true);
try {
refBrowser.markupDocumentViewer.textZoom = .90;
} catch (e) {
@ -767,38 +626,6 @@ function BrowserResetZoomMinus() {
}
/* Reset the UI text size */
function BrowserUIResetZoomPlus() {
var currentUILevel=gPref.getIntPref("browser.display.zoomui");
currentUILevel+=3;
gPref.setIntPref("browser.display.zoomui", currentUILevel);
syncUIZoom();
/*
* YES I know.
* I do this because somehow the grid does not expand
* when the style CSS syncUIzoom kicks in
*/
document.getElementById("uizoomminusitem").focus();
document.getElementById("uizoomplusitem").focus();
}
function BrowserUIResetZoomMinus() {
var currentUILevel=gPref.getIntPref("browser.display.zoomui");
currentUILevel-=3;
gPref.setIntPref("browser.display.zoomui", currentUILevel);
syncUIZoom();
/*
* YES I know.
* I do this because somehow the grid does not expand
* when the style CSS syncUIzoom kicks in
*/
document.getElementById("uizoomplusitem").focus();
document.getElementById("uizoomminusitem").focus();
}
/*
We want to intercept before it shows,
to evaluate when the selected content area is a phone number,
@ -991,7 +818,6 @@ function DoBrowserFindNext() {
function DoPanelPreferences() {
window.openDialog("chrome://minimo/content/preferences/preferences.xul","preferences","modal,centerscreeen,chrome,resizable=no");
// BrowserReload();
syncUIZoom();
}
/*
@ -1002,6 +828,30 @@ function DoTestSendCall(toCall) {
phoneInterface.makeCall(toCall,"");
}
function DoSSRToggle()
{
try {
var pref = Components.classes["@mozilla.org/preferences-service;1"].getService(nsCI.nsIPrefBranch);
pref.setBoolPref("ssr.enabled", !pref.getBoolPref("ssr.enabled"));
gBrowser.webNavigation.reload(nsIWebNavigation.LOAD_FLAGS_CHARSET_CHANGE);
}
catch(ex) { alert(ex); }
}
function DoSNavToggle()
{
try {
var pref = Components.classes["@mozilla.org/preferences-service;1"].getService(nsCI.nsIPrefBranch);
pref.setBoolPref("snav.enabled", !pref.getBoolPref("snav.enabled"));
content.focus();
}
catch(ex) { alert(ex); }
}
function DoFullScreen()
{
gFullScreen = !gFullScreen;
@ -1161,52 +1011,35 @@ function URLBarClickHandler(aEvent, aElt)
aElt.select();
}
var gRotationDirection = true;
function BrowserScreenRotate()
{
try {
var deviceSupport = Components.classes["@mozilla.org/device/support;1"].getService(nsCI.nsIDeviceSupport);
deviceSupport.rotateScreen(gRotationDirection);
gRotationDirection != gRotationDirection;
}
catch (ex)
{
alert(ex);
}
}
/*
* Main Menu
*/
function BrowserNavMenuPopup() {
if (!gShowingNavMenuPopup){
document.getElementById("menu_NavPopup").showPopup(document.getElementById("nav-menu-button"),-1,-1,"popup","bottomright", "topright");
}
else {
document.getElementById("menu_NavPopup").hidePopup();
}
gShowingNavMenuPopup != gShowingNavMenuPopup;
}
function BrowserMenuPopup() {
if(!gShowingMenuPopup) {
document.getElementById("menu_MainPopup").showPopup(document.getElementById("menu-button"),-1,-1,"popup","bottomleft", "topleft");
} else {
document.getElementById("menu_MainPopup").hidePopup();
}
gShowingMenuPopup != gShowingMenuPopup;
}
function BrowserMenuPopupFalse() {
document.getElementById("menu_MainPopup").hidePopup();
}
function BrowserMenuPopupContextualMenu() {
document.getElementById("contentAreaContextMenu").hidePopup();
DoFullScreen();
BrowserMenuPopup();
}
function MenuPopupShowing() {
gShowingMenuPopup=true;
document.getElementById("menu-button").focus();
}
function MenuPopupHidden() {
gShowingMenuPopup=false;
}
/* The URLBAR Deck mode selector
*/

489
mozilla/minimo/chrome/content/minimo.xul
View File

@ -1,42 +1,41 @@
<?xml version="1.0"?> <!-- -*- Mode: HTML -*- -->
<!-- ***** BEGIN LICENSE BLOCK *****
Version: MPL 1.1/GPL 2.0/LGPL 2.1
Version: MPL 1.1/GPL 2.0/LGPL 2.1
The contents of this file are subject to the Mozilla Public License Version
1.1 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.mozilla.org/MPL/
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the specific language governing rights and limitations under the
License.
The Original Code is Minimo.
The Initial Developer of the Original Code is
Doug Turner <dougt@meer.net>.
Portions created by the Initial Developer are Copyright (C) 2005
the Initial Developer. All Rights Reserved.
Contributor(s):
Marcio S. Galli, mgalli@geckonnection.com
Alternatively, the contents of this file may be used under the terms of
either the GNU General Public License Version 2 or later (the "GPL"), or
the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
in which case the provisions of the GPL or the LGPL are applicable instead
of those above. If you wish to allow use of your version of this file only
under the terms of either the GPL or the LGPL, and not to allow others to
use your version of this file under the terms of the MPL, indicate your
decision by deleting the provisions above and replace them with the notice
and other provisions required by the GPL or the LGPL. If you do not delete
the provisions above, a recipient may use your version of this file under
the terms of any one of the MPL, the GPL or the LGPL.
The contents of this file are subject to the Mozilla Public License Version
1.1 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.mozilla.org/MPL/
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the specific language governing rights and limitations under the
License.
The Original Code is Mozilla Communicator client code, released
March 31, 1998.
The Initial Developer of the Original Code is
Netscape Communications Corporation.
Portions created by the Initial Developer are Copyright (C) 1998-2000
the Initial Developer. All Rights Reserved.
Contributor(s):
Marcio S. Galli, mgalli@geckonnection.com
Alternatively, the contents of this file may be used under the terms of
either the GNU General Public License Version 2 or later (the "GPL"), or
the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
in which case the provisions of the GPL or the LGPL are applicable instead
of those above. If you wish to allow use of your version of this file only
under the terms of either the GPL or the LGPL, and not to allow others to
use your version of this file under the terms of the MPL, indicate your
decision by deleting the provisions above and replace them with the notice
and other provisions required by the GPL or the LGPL. If you do not delete
the provisions above, a recipient may use your version of this file under
the terms of any one of the MPL, the GPL or the LGPL.
***** END LICENSE BLOCK ***** -->
***** END LICENSE BLOCK ***** -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
@ -48,131 +47,42 @@
<?xul-overlay href="chrome://minimo/content/toolbars/toolbar-find.xul"?>
<!DOCTYPE window [
<!ENTITY % minimoDTD SYSTEM "chrome://minimo/locale/minimo.dtd" >
%minimoDTD;
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
%brandDTD;
]>
<!ENTITY % minimoDTD SYSTEM "chrome://minimo/locale/minimo.dtd" >
%minimoDTD;
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
%brandDTD;
]>
<window id="main-window"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
orient="vertical"
contenttitlesetting="false"
title="Minimo"
titlemodifier="Minimo"
titlemenuseparator=" - "
onload="MiniNavStartup()"
onunload="MiniNavShutdown()"
windowtype="navigator:browser">
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
orient="vertical"
contenttitlesetting="false"
title="Minimo"
titlemodifier="Minimo"
titlemenuseparator=" - "
onload="MiniNavStartup()"
onunload="MiniNavShutdown()"
windowtype="navigator:browser">
<script type="application/x-javascript" src="chrome://minimo/content/minimo.js"/>
<script type="application/x-javascript" src="chrome://minimo/content/common.js"/>
<script type="application/x-javascript" src="chrome://minimo/content/rssview/rssload.js"/>
<popupset id="mainPopupSet">
<popup type="autocomplete" id="PopupAutoComplete"/>
</popupset>
<keyset>
<key id="minimo-key" keycode="VK_F23" oncommand="enableMenuAccess()"/>
<key id="minimo-key2" keycode="VK_F12" oncommand="enableMenuAccess()"/>
<key id="minimo-key" keycode="VK_F23" oncommand="BrowserMenuPopup()"/>
<key id="minimo-key2" keycode="VK_F11" oncommand="BrowserMenuPopup()"/>
<key id="minimo-key3" keycode="VK_F24" oncommand="BrowserNavMenuPopup()"/>
<key id="minimo-key4" keycode="VK_F12" oncommand="BrowserNavMenuPopup()"/>
</keyset>
<toolbox id="mini-toolbars">
<command id="cmd_BrowserOpenTab" oncommand="BrowserOpenTab()"/>
<command id="cmd_BrowserScreenRotate" oncommand="BrowserScreenRotate()"/>
<command id="cmd_BrowserOpenInfo" oncommand="BrowserOpenInfo()"/>
<command id="cmd_BrowserTestDialogs" oncommand="BrowserTestDialogs()"/>
<command id="cmd_BrowserTestSendSMS" oncommand="BrowserTestSendSMS()"/>
<command id="cmd_ViewOptions" oncommand="BrowserViewOptions()"/>
<!--
<command id="cmd_ViewRSS" oncommand="BrowserViewRSS()"/>
<command id="cmd_ViewSearch" oncommand="BrowserViewSearch()"/>
-->
<command id="cmd_ViewDeckSB" oncommand="BrowserViewDeckSB()"/>
<command id="cmd_ViewDeckSearch" oncommand="BrowserViewDeckSearch()"/>
<command id="cmd_ViewDeckDefault" oncommand="BrowserViewDeckDefault()"/>
<command id="cmd_ViewFind" oncommand="BrowserViewFind()"/>
<command id="cmd_BrowserOpenLinkAsNewTab" oncommand="BrowserOpenLinkAsTab()" />
<command id="cmd_BrowserBack" oncommand="BrowserBack()" />
<command id="cmd_BrowserForward" oncommand="BrowserForward()" />
<command id="cmd_BrowserReload" oncommand="BrowserReload()" />
<command id="cmd_BrowserStop" oncommand="BrowserStop()" />
<command id="cmd_BrowserZoomPlus" oncommand="BrowserResetZoomPlus()" />
<command id="cmd_BrowserZoomMinus" oncommand="BrowserResetZoomMinus()" />
<command id="cmd_UIZoomPlus" oncommand="BrowserUIResetZoomPlus()" />
<command id="cmd_UIZoomMinus" oncommand="BrowserUIResetZoomMinus()" />
<command id="cmd_DoPanelPreferences" oncommand="DoPanelPreferences()" />
<command id="cmd_DoBrowserRSS" oncommand="DoBrowserRSS()" />
<command id="cmd_BrowserMenu" oncommand="BrowserMenuPopup()" />
<command id="cmd_BrowserMenuContextual" oncommand="BrowserMenuPopupContextualMenu()" />
<command id="cmd_Quit" oncommand="window.close();" />
<command id="cmd_BrowserBookmark" oncommand="BrowserBookmark()" />
<command id="cmd_BrowserBookmarkThis" oncommand="BrowserBookmarkThis()" />
<!-- Keyboard Focus Handler Controls -->
<!-- This entire focusnavigation set is not XBLized yet,
Minimo JS code will look into it anyways. -->
<!-- focushandler should have only accessfocus and target and the memory cookie maybe -->
<focusnavigation>
<focushandler id="focus_tabcontent" target="content" accessfocus="#tabContent" />
<focushandler id="focus_nav-bar" target="nav-bar" accessfocus="menu-button" accessnextrule="focus_toolbar-view" accessprevrule="focus_tabcontent" />
<focushandler id="focus_toolbar-view" target="toolbar-view" accessfocus="zoomplusitem" accessnextrule="focus_toolbar-rss" accessprevrule="focus_nav-bar" />
<focushandler id="focus_toolbar-rss" target="toolbar-rss" accessfocus="rss-close" accessnextrule="focus_toolbar-search" accessprevrule="focus_toolbar-view" />
<focushandler id="focus_toolbar-search" target="toolbar-search" accessfocus="search-close" accessnextrule="focus_toolbar-find" accessprevrule="focus_toolbar-rss" />
<focushandler id="focus_toolbar-find" target="toolbar-find" accessfocus="find-close" accessnextrule="focus_content" accessprevrule="focus_toolbar-search" />
<focushandler id="focus_content" target="content" accessfocus="#tabContainer" accessnextrule="focus_tabcontent" accessprevrule="focus_toolbar-find" />
</focusnavigation>
<toolbar id="nav-bar" >
<toolbarbutton tabindex="1" accessrule="focus_nav-bar" class="menu-button" id="menu-button" command="cmd_BrowserMenu" />
<toolbarbutton tabindex="2" accessrule="focus_nav-bar" class="back-button" id="back-button" command="cmd_BrowserBack" />
<toolbarbutton tabindex="3" accessrule="focus_nav-bar" class="forward-button" id="forward-button" command="cmd_BrowserForward" />
<toolbarbutton tabindex="4" accessrule="focus_nav-bar" class="stop-button" id="reload-stop-button" command="cmd_BrowserReload"/>
<!-- WARNING: don't add tabindex to the following element. Somehow it conflicts with the popup history open -->
<textbox
id="urlbar"
flex="1"
type="autocomplete"
enablehistory="true"
autocompletesearch="history"
completeselectedindex="true"
autocompletepopup="PopupAutoComplete"
ontextentered="return URLBarEntered();"
onfocus="URLBarFocusHandler(event, this);"
onmousedown="URLBarMouseDownHandler(event, this);"
onclick="URLBarClickHandler(event, this);">
<deck onclick="PageProxyClickHandler(event)" id='proxy-deck' >
<image id="urlbar-deck" />
</deck>
<hbox>
<button type="menu" style="-moz-user-focus: none" class="plain" id="feed-button">
<menupopup id='feed-button-menu' position="after_end" />
</button>
<image id="lock-icon" class="security-na" />
</hbox>
</textbox>
</toolbar>
<!-- the toolbars shall be added here, check the overlay settings -->
</toolbox>
<hbox flex="1" >
<hbox id="appcontent" flex="100%">
<hbox id="browser" context="context" flex="1">
@ -184,86 +94,239 @@
flex="1"
autocompletepopup="PopupAutoComplete"
onnewtab="BrowserOpenTab()"/>
</hbox>
</hbox>
</hbox>
</hbox>
<statusbar id="statusbar" hidden="false">
<statusbarpanel id="statusbar-text" label="Minimo" flex="1"/>
</statusbar>
<toolbox id="mini-toolbars">
<command id="cmd_BrowserOpenTab" oncommand="BrowserOpenTab()"/>
<command id="cmd_BrowserScreenRotate" oncommand="BrowserScreenRotate()"/>
<command id="cmd_BrowserOpenInfo" oncommand="BrowserOpenInfo()"/>
<command id="cmd_BrowserTestDialogs" oncommand="BrowserTestDialogs()"/>
<command id="cmd_BrowserTestSendSMS" oncommand="BrowserTestSendSMS()"/>
<!--
<command id="cmd_ViewRSS" oncommand="BrowserViewRSS()"/>
<command id="cmd_ViewSearch" oncommand="BrowserViewSearch()"/>
-->
<command id="cmd_ViewDeckSB" oncommand="BrowserViewDeckSB()"/>
<command id="cmd_ViewDeckSearch" oncommand="BrowserViewDeckSearch()"/>
<command id="cmd_ViewDeckDefault" oncommand="BrowserViewDeckDefault()"/>
<command id="cmd_ViewFind" oncommand="BrowserViewFind()"/>
<command id="cmd_BrowserOpenLinkAsNewTab" oncommand="BrowserOpenLinkAsTab()" />
<command id="cmd_BrowserBack" oncommand="BrowserBack()" />
<command id="cmd_BrowserForward" oncommand="BrowserForward()" />
<command id="cmd_BrowserReload" oncommand="BrowserReload()" />
<command id="cmd_BrowserStop" oncommand="BrowserStop()" />
<command id="cmd_DoPanelPreferences" oncommand="DoPanelPreferences()" />
<command id="cmd_DoBrowserRSS" oncommand="DoBrowserRSS()" />
<command id="cmd_BrowserMenu" oncommand="BrowserMenuPopup()" />
<command id="cmd_BrowserNavMenu" oncommand="BrowserNavMenuPopup()" />
<command id="cmd_Quit" oncommand="window.close();" />
<command id="cmd_Go" oncommand="URLBarEntered()" />
<command id="cmd_BrowserBookmark" oncommand="BrowserBookmark()" />
<command id="cmd_BrowserBookmarkThis" oncommand="BrowserBookmarkThis()" />
<!-- Keyboard Focus Handler Controls -->
<!-- This entire focusnavigation set is not XBLized yet,
Minimo JS code will look into it anyways. -->
<!-- focushandler should have only accessfocus and target and the memory cookie maybe -->
<focusnavigation>
<focushandler id="focus_tabcontent" target="content" accessfocus="#tabContent" />
<focushandler id="focus_nav-bar" target="nav-bar" accessfocus="menu-button" accessnextrule="focus_toolbar-view" accessprevrule="focus_tabcontent" />
<focushandler id="focus_toolbar-view" target="toolbar-view" accessfocus="zoomplusitem" accessnextrule="focus_toolbar-rss" accessprevrule="focus_nav-bar" />
<focushandler id="focus_toolbar-rss" target="toolbar-rss" accessfocus="rss-close" accessnextrule="focus_toolbar-search" accessprevrule="focus_toolbar-view" />
<focushandler id="focus_toolbar-search" target="toolbar-search" accessfocus="search-close" accessnextrule="focus_toolbar-find" accessprevrule="focus_toolbar-rss" />
<focushandler id="focus_toolbar-find" target="toolbar-find" accessfocus="find-close" accessnextrule="focus_content" accessprevrule="focus_toolbar-search" />
<focushandler id="focus_content" target="content" accessfocus="#tabContainer" accessnextrule="focus_tabcontent" accessprevrule="focus_toolbar-find" />
</focusnavigation>
<toolbar id="nav-bar" >
<toolbarbutton tabindex="1" accessrule="focus_nav-bar" class="menu-button" id="menu-button" command="cmd_BrowserMenu" />
<!-- WARNING: don't add tabindex to the following element. Somehow it conflicts with the popup history open -->
<textbox id="urlbar"
flex="1"
type="autocomplete"
enablehistory="true"
autocompletesearch="history"
completeselectedindex="true"
autocompletepopup="PopupAutoComplete"
ontextentered="return URLBarEntered();"
onfocus="URLBarFocusHandler(event, this);"
onmousedown="URLBarMouseDownHandler(event, this);"
onclick="URLBarClickHandler(event, this);">
<deck onclick="PageProxyClickHandler(event)" id='proxy-deck' >
<image id="urlbar-deck" />
</deck>
<hbox>
<button type="menu" style="-moz-user-focus: none" class="plain" id="feed-button">
<menupopup id='feed-button-menu' position="after_end" />
</button>
<image id="lock-icon" class="security-na" />
</hbox>
</textbox>
<toolbarbutton tabindex="2" accessrule="focus_nav-bar" class="menu-button" id="nav-menu-button" command="cmd_BrowserNavMenu" />
</toolbar>
<!-- the toolbars shall be added here, check the overlay settings -->
</toolbox>
<!-- place holder for our app popups and hook to the overlay -->
<popupset>
<popup id="contentAreaContextMenu" onpopupshowing="BrowserPopupShowing()">
<!-- This toolbar menu works only with Mouse so far and shows
when gFullScreen mode is true -->
<!--
<toolbar id="nav-bar-contextual" hidden="true">
<toolbarbutton class="menu-button" command="cmd_BrowserMenuContextual" />
<toolbarbutton class="back-button" command="cmd_BrowserBack" />
<toolbarbutton class="forward-button" command="cmd_BrowserForward" />
<toolbarbutton class="reload-button" command="cmd_BrowserReload"/>
</toolbar>
-->
<menuitem id="link_as_new_tab" label="&linknewtab.label;" command="cmd_BrowserOpenLinkAsNewTab" hidden="true"/>
<menuitem id="item-backbutton" label="&backButton.label;" command="cmd_BrowserBack" hidden="true"/>
<menuitem id="item-forwardbutton" label="&forwardButton.label;" command="cmd_BrowserForward" hidden="true"/>
<menuitem id="item-reloadbutton" label="&reloadButton.label;" command="cmd_BrowserReload" hidden="true"/>
<menuitem id="item-bookmark-page" label="&bookmarkthispage.label;" insertbefore="context-sep-view" command="cmd_BrowserBookmarkThis" hidden="false"/>
<menuitem id="item-bookmark" label="&bookmarks.label;" command="cmd_BrowserBookmark" hidden="true"/>
<menuitem id="item-call" label="" insertbefore="context-sep-view" oncommand="" hidden="true"/>
<menuitem id="full_screen" label="Toggle FullScreen" oncommand="DoFullScreen()"/>
<menuitem id="item-copy" label="Copy" oncommand="DoClipCopy()" />
<menuitem id="item-paste" label="Paste" oncommand="DoClipPaste()"/>
<menuitem id="full_screen"
label="&toggleFullScreen.label;"
oncommand="DoFullScreen()"/>
<!--
<menuitem id="link_as_new_tab" label="&linknewtab.label;" command="cmd_BrowserOpenLinkAsNewTab" hidden="true"/>
<menuitem id="item-bookmark-page" label="&bookmarkthispage.label;" insertbefore="context-sep-view" command="cmd_BrowserBookmarkThis" hidden="false"/>
<menuitem id="item-bookmark" label="&bookmarks.label;" command="cmd_BrowserBookmark" hidden="true"/>
-->
<menuitem id="item-call" label="" insertbefore="context-sep-view" oncommand="" hidden="true"/>
<menuitem id="item-copy" label="Copy" oncommand="DoClipCopy()" />
<menuitem id="item-paste" label="Paste" oncommand="DoClipPaste()"/>
</popup>
<popup id="urlbarModeSelector" onpopuphidden="PageProxyHidden()">
<menuitem image="chrome://minimo/skin/extensions/icon-google.png" class="menuitem-iconic" id="command_ViewDeckSearch" label="&decksearch.label;" command="cmd_ViewDeckSearch"/>
<!-- <menuitem image="chrome://minimo/skin/extensions/icon-delicious.png" class="menuitem-iconic" id="command_ViewDeckSB" label="&decksb.label;" command="cmd_ViewDeckSB" />-->
<menuitem image="chrome://minimo/skin/extensions/icon-urlbar.png" class="menuitem-iconic" id="command_ViewDeckDefault" label="&deckdefault.label;" command="cmd_ViewDeckDefault" />
</popup>
<popup id="urlbarModeSelector" onpopuphidden="PageProxyHidden()">
<menuitem id="command_ViewDeckSearch"
image="chrome://minimo/skin/extensions/icon-google.png"
class="menuitem-iconic"
label="&decksearch.label;"
command="cmd_ViewDeckSearch"/>
<!--
<menuitem id="command_ViewDeckSB"
image="chrome://minimo/skin/extensions/icon-delicious.png"
class="menuitem-iconic"
label="&decksb.label;"
command="cmd_ViewDeckSB" />
-->
<menuitem id="command_ViewDeckDefault"
image="chrome://minimo/skin/extensions/icon-urlbar.png"
class="menuitem-iconic"
label="&deckdefault.label;"
command="cmd_ViewDeckDefault" />
</popup>
<!-- somehow tabbedbrowser needs this. Have to check its implementation and eliminate -->
<popup id="menu_FilePopup">
<menuitem id="menu_close"/>
<menuitem id="menu_closeWindow" command="cmd_closeWindow" key="key_closeWindow" label="" />
<!-- somehow tabbedbrowser needs this. Have to check its implementation and eliminate -->
<popup id="menu_FilePopup">
<menuitem id="menu_close"/>
<menuitem id="menu_closeWindow" command="cmd_closeWindow" key="key_closeWindow" label="" />
</popup>
<menupopup id="menu_MainPopup" onpopupshowing="MenuPopupShowing()" onpopuphidden="MenuPopupHidden()">
<menuitem id="command_BrowserOpenTab" command="cmd_BrowserOpenTab" label="&newtab.label;" />
<menuitem id="command_BrowserBookmark" command="cmd_BrowserBookmark" label="&bookmarks.label;" />
<!-- not working just yet.
<menuitem id="command_BrowserScreenRotate" command="cmd_BrowserScreenRotate" label="Rotate Screen" />
-->
<menuitem id="command_DoPanelPreferences" command="cmd_DoPanelPreferences" label="&prefs.label;" />
<!-- separator for now in CSS - need to redesign -->
<menuitem id="command_ViewOptions" type="checkbox" command="cmd_ViewOptions" label="&zoom.label;" />
<menuitem id="command_ViewFind" type="checkbox" command="cmd_ViewFind" label="&findToolbar.label;" />
<!--
<menuitem id="command_ViewRSS" type="checkbox" command="cmd_ViewRSS" label="&rssBMtitle.label;" />
<menuitem id="command_ViewSearch" type="checkbox" command="cmd_ViewSearch" label="&searchToolbar.label;" />
-->
<!-- separator for now in CSS - need to redesign -->
<menuitem id="command_Quit" class="separator-menu" command="cmd_Quit" label="&quit.label;" />
<menuitem id="command_BrowserOpenTab"
command="cmd_BrowserOpenTab"
label="&newtab.label;" />
<menuseparator/>
<menuitem id="full_screen"
label="&toggleFullScreen.label;"
oncommand="DoFullScreen()"/>
<!-- this shouldn't be an option on smartphones -->
<menuitem id="snav_toggle"
label="&toggleSNav.label;"
oncommand="DoSNavToggle()"/>
<menuitem id="ssr_toggle"
label="&toggleSSR.label;"
oncommand="DoSSRToggle()"/>
<menuseparator/>
<menuitem id="textplus"
label="&textSizePlus.label;"
oncommand="BrowserResetZoomPlus()"/>
<menuitem id="testminus"
label="&textSizeMinus.label;"
oncommand="BrowserResetZoomMinus()"/>
<menuseparator/>
<menuitem id="command_DoPanelPreferences"
command="cmd_DoPanelPreferences"
label="&prefs.label;" />
<menuitem id="command_ViewFind"
command="cmd_ViewFind"
label="&findToolbar.label;" />
<menuseparator/>
<menuitem id="command_Quit"
class="separator-menu"
command="cmd_Quit"
label="&quit.label;" />
</menupopup>
<menupopup id="menu_NavPopup" onpopupshowing="MenuPopupShowing()" onpopuphidden="MenuPopupHidden()">
<menuitem id="command_BrowserBookmark"
command="cmd_BrowserBookmark"
label="&bookmarks.label;" />
<menuitem id="item-bookmark-page"
label="&bookmarkthispage.label;"
command="cmd_BrowserBookmarkThis"/>
<menuseparator/>
<!-- class="menuitem-iconic" image="chrome://minimo/skin/back-color.png" -->
<menuitem id="command_back"
command="cmd_BrowserBack"
label="&backCmd.label;" />
<!-- class="menuitem-iconic" image="chrome://minimo/skin/forward-color.png" -->
<menuitem id="command_forward"
command="cmd_BrowserForward"
label="&forwardCmd.label;" />
<!-- class="menuitem-iconic" image="chrome://minimo/skin/reload-color.png" -->
<menuitem id="command_reload"
command="cmd_BrowserReload"
label="&reloadCmd.label;" />
<!-- class="menuitem-iconic" image="chrome://minimo/skin/go-color.png" -->
<menuitem id="command_go"
command="cmd_BrowserGo"
label="&goCmd.label;" />
</menupopup>
</popupset>
</window>

36
mozilla/minimo/chrome/content/preferences/pane-general.xul
View File

@ -101,42 +101,6 @@
/>
</vbox>
</groupbox>
<groupbox class='box-prefgroupitem' id='zoom-box' >
<caption label="&zoom.label;"/>
<grid class="box-prefpadding" >
<columns>
<column flex="1"/>
<column />
</columns>
<rows>
<row>
<label value="&zoomui.label;" />
<textbox id="browserDisplayZoomUI" size="5" tabindex="14"
onfocus="prefFocus('zoom-box')" onblur="prefBlur('zoom-box')"
style="margin:3px ! important;"
preference="browser.display.zoomui" preftype="int"
onchange="syncPref(this)"
/>
</row>
<row>
<label value="&zoomcontent.label;" />
<textbox id="browserDisplayZoomContent" size="5" tabindex="15" accessrule="general-pane"
onfocus="prefFocus('zoom-box')" onblur="prefBlur('zoom-box')"
style="margin:3px ! important;"
onchange="syncPref(this)"
preference="browser.display.zoomcontent"
preftype="int"
/>
</row>
</rows>
</grid>
</groupbox>
</vbox>
</hbox>
</groupbox>

2
mozilla/minimo/chrome/content/preferences/preferences.xul
View File

@ -81,8 +81,6 @@
<preferenceitem preftype="int" id="network.proxy.type" name="UseProxy" />
<preferenceitem preftype="string" id="network.proxy.http" name="networkProxyHTTP" />
<preferenceitem preftype="int" id="network.proxy.http_port" name="networkProxyHTTP_Port" />
<preferenceitem preftype="int" id="browser.display.zoomui" name="browserDisplayZoomUI"/>
<preferenceitem preftype="int" id="browser.display.zoomcontent" name="browserDisplayZoomContent"/>
<preferenceitem preftype="bool" id="browser.cache.disk.enable" name="useDiskCache" />
<!--
<preferenceitem preftype="string" id="browser.cache.disk.parent_directory" name="storeCacheStorageCard" />

27
mozilla/minimo/chrome/content/toolbars/toolbar-find.xul
View File

@ -46,27 +46,16 @@
]>
<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<toolbox id="mini-toolbars">
<toolbar id="toolbar-find" flex="1" collapsed="true" >
<groupbox flex="1" class="box-floatoptions">
<caption label="&findToolbar.label;"/>
<hbox flex="1" >
<vbox flex="1" style="padding:4px ! important">
<hbox flex="1" style="margin-top:4px ! important">
<label value="&findText.label;" />
<textbox tabindex="17" accessrule="focus_toolbar-find" id="toolbar-find-tag" flex="1" onchange="return DoBrowserFind();"/>
<toolbarbutton tabindex="18" accessrule="focus_toolbar-find" id="find-button-next" align="top" flex="0" label='&nextText.label;' oncommand="DoBrowserFindNext()"/>
</hbox>
</vbox>
<vbox>
<toolbarbutton tabindex="19" accessrule="focus_toolbar-find" id="find-close" class="button-close" width="10" height="10" align="top" flex="0" command="cmd_ViewFind"/>
</vbox>
</hbox>
</groupbox>
<hbox flex="1" style="margin-top:4px ! important">
<label value="&findText.label;" />
<textbox tabindex="17" accessrule="focus_toolbar-find" id="toolbar-find-tag" flex="1" onchange="return DoBrowserFind();"/>
<toolbarbutton tabindex="18" accessrule="focus_toolbar-find" id="find-button-next" align="top" flex="0" label='&nextText.label;' oncommand="DoBrowserFindNext()"/>
<toolbarbutton tabindex="19" accessrule="focus_toolbar-find" id="find-close" class="button-close" width="10" height="10" align="top" flex="0" command="cmd_ViewFind"/>
</hbox>
</toolbar>
</toolbox>
</overlay>

1
mozilla/minimo/chrome/jar.mn
View File

@ -46,6 +46,7 @@ minimo.jar:
skin/classic/minimo/forward-gray.png (skin/forward-gray.png)
skin/classic/minimo/reload-color.png (skin/reload-color.png)
skin/classic/minimo/stop-color.png (skin/stop-color.png)
skin/classic/minimo/go-color.png (skin/go-color.png)
skin/classic/minimo/close.png (skin/close.png)
skin/classic/minimo/close-11px.png (skin/close-11px.png)
skin/classic/minimo/up.png (skin/up.png)

16
mozilla/minimo/chrome/locale/en-US/minimo.dtd
View File

@ -3,7 +3,6 @@
<!ENTITY prefs.label "Preferences...">
<!ENTITY quit.label "Quit">
<!ENTITY newtab.label "New Tab">
<!ENTITY bookmarks.label "Bookmarks">
<!-- Toolbar -->
@ -18,15 +17,24 @@
<!ENTITY searchButton.label "Search">
<!ENTITY searchButton.tooltip "Type a word in the field to the left, then click Search">
<!ENTITY toggleSNav.label "Toggle Spatial Navigation">
<!ENTITY toggleFullScreen.label "Toggle Full Screen">
<!ENTITY toggleSSR.label "Toggle Single Column Mode">
<!ENTITY textSizePlus.label "Text Size +">
<!ENTITY textSizeMinus.label "Text Size -">
<!-- Context menu -->
<!ENTITY backCmd.label "Back">
<!ENTITY forwardCmd.label "Forward">
<!ENTITY stopCmd.label "Stop">
<!ENTITY goCmd.label "Go">
<!ENTITY reloadCmd.label "Reload">
<!ENTITY linknewtab.label "Open link in New Tab">
<!ENTITY bookmarks.label "Bookmarks">
<!ENTITY bookmarks.label "Bookmarks...">
<!ENTITY bookmarkthispage.label "Bookmark This Page">
<!-- menu urlabr view options -->
@ -54,5 +62,5 @@
<!-- toolbar find -->
<!ENTITY findText.label "Find string: " >
<!ENTITY findToolbar.label "Find" >
<!ENTITY nextText.label "Next" >
<!ENTITY findToolbar.label "Find..." >
<!ENTITY nextText.label "Next" >

BIN
mozilla/minimo/chrome/skin/go-color.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 747 B

6
mozilla/minimo/chrome/skin/minimo.css
View File

@ -151,6 +151,11 @@ caption {
list-style-image : url("chrome://minimo/skin/stop-color.png");
}
.go-button
{
list-style-image : url("chrome://minimo/skin/go-color.png");
}
.reload-button
{
list-style-image : url("chrome://minimo/skin/reload-color.png");
@ -255,3 +260,4 @@ caption {
window { width: 240px ; height: 320px; }