Browse Source

... and also kmprefs in components folder.

master
roytam1 5 years ago
parent
commit
a6049a3bd6
  1. 12
      k-meleon/components/kmprefs/firefox/downloadactions.js
  2. 1
      k-meleon/components/kmprefs/kmprefs/ovrl-cache.xul
  3. 8
      k-meleon/components/kmprefs/kplugins/gestures.xml
  4. 16
      k-meleon/components/kmprefs/pref-appearance.xul
  5. 42
      k-meleon/components/kmprefs/pref-kgestures.xul
  6. 1
      k-meleon/components/kmprefs/pref-privacy.xul

12
k-meleon/components/kmprefs/firefox/downloadactions.js

@ -6,6 +6,10 @@ const kShowPluginsInList = "browser.download.show_plugins_in_list";
const kHideTypesWithoutExtensions = "browser.download.hide_plugins_without_extensions";
const kRootTypePrefix = "urn:mimetype:";
const Cu = Components.utils;
Cu.import('resource://gre/modules/XPCOMUtils.jsm');
Cu.import('resource://gre/modules/Services.jsm');
///////////////////////////////////////////////////////////////////////////////
// MIME Types Datasource RDF Utils
function NC_URI(aProperty)
@ -231,8 +235,12 @@ var gDownloadActionsWindow = {
_getLiteralValue: function (aResource, aProperty)
{
var property = this._rdf.GetResource(NC_URI(aProperty));
var value = this._mimeDS.GetTarget(aResource, property, true);
var value;
try {
var property = this._rdf.GetResource(NC_URI(aProperty));
value = this._mimeDS.GetTarget(aResource, property, true);
} catch (e) {
}
if (value)
return value.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
return "";

1
k-meleon/components/kmprefs/kmprefs/ovrl-cache.xul

@ -113,6 +113,5 @@ var DiskCache = {
<description style="margin-left:2.5em">&cache.dsk.note;</description>
<separator class="thin"/>
<checkbox oncommand="toggleCheckbox(this.id)" id="kmeleon.favicons.cached" label="&cache.ico.enable;"/>
<description style="margin-left:2.5em">&cache.ico.note;</description>
</groupbox>
</overlay>

8
k-meleon/components/kmprefs/kplugins/gestures.xml

@ -11,6 +11,8 @@
command="ID_NAV_RELOAD"/>
<action caption="&ID_NAV_FORCE_RELOAD;"
command="ID_NAV_FORCE_RELOAD"/>
<action caption="&ID_NAV_SEARCH;"
command="ID_NAV_SEARCH"/>
<action caption="&ID_NEW_BROWSER;"
command="ID_NEW_BROWSER"/>
<action caption="&ID_NEW_TAB;"
@ -83,4 +85,10 @@
command="favorites(Add)"/>
<action caption="&hotlistAdd;"
command="hotlist(Add)"/>
<action caption="&viewImage;"
command="viewImage"/>
<action caption="&ID_OPEN_LINK_IN_BACKGROUNDTAB;"
command="openLinkInBackgroundTab"/>
<action caption="&ID_NAV_SEARCH;"
command="navSearch"/>
</actions>

16
k-meleon/components/kmprefs/pref-appearance.xul

@ -19,12 +19,13 @@ function init() {
initCheckbox("kmeleon.display.accelInMenus");
initCheckbox("kmeleon.favicons.show");
initCheckbox("kmeleon.favicons.titleBar");
initCheckbox("kmeleon.display.hideTitleBar");
document.getElementById("kmeleon.favicons.titleBar").disabled = !pref.getBoolPref("kmeleon.favicons.show");
initTextbox("kmeleon.display.title", false);
initTextbox("kmeleon.display.toolbars_size", false);
Skin = new kmSkin;
Throbber = new kmThrobber;
kBMPMenu.init();
kFullscreen.init();
Language.init();
main();
@ -105,16 +106,7 @@ var Language = {
setTimeout("top.location.reload()", 100);
}
};
var kBMPMenu = {
name : "bmpmenu",
pref : "kmeleon.plugins.bmpmenu.load",
init : function () {
if (kPlugin.absent(this.name))
document.getElementById(this.pref).setAttribute("hidden", true);
else
initCheckbox(this.pref);
}
};
var Skin;
function kmSkin() {
this.elem = document.getElementById(this.pref);
@ -366,7 +358,7 @@ var Window = {
</caption>
<menulist id="kmeleon.general.skinsCurrent" oncommand="setCharPref(this.id,this.value)"/>
<separator class="thin"/>
<checkbox oncommand="toggleCheckbox(this.id)" id="kmeleon.plugins.bmpmenu.load" label="&appearance.menuIcons;"/>
<checkbox oncommand="toggleCheckbox(this.id)" id="kmeleon.display.bitmapInMenus" label="&appearance.menuIcons;"/>
<checkbox oncommand="toggleCheckbox(this.id)" id="kmeleon.display.backgroundImageEnabled" label="&appearance.backBMP;"/>
<checkbox oncommand="Throbber.toggle()" id="kmeleon.toolband.Throbber.visibility" label="&appearance.throbber;"/>
<hbox align="center">

42
k-meleon/components/kmprefs/pref-kgestures.xul

@ -233,6 +233,7 @@ var Database = {
<tabs>
<tab label="&gestures.label;"/>
<tab label="&actions.label;" oncommand="Database.init()" onfocus="Database.init()"/>
<tab label="&super-drags.label;"/>
</tabs>
<tabpanels flex="1">
<tabpanel flex="1" orient="vertical" style="overflow:auto">
@ -383,6 +384,47 @@ var Database = {
</hbox>
<!-- Database -->
</tabpanel>
<tabpanel flex="1" orient="vertical" style="overflow:auto">
<!-- Super Drags -->
<separator class="thin"/>
<description>&super-drags.descr;</description>
<separator class="thin"/>
<grid>
<columns>
<column/>
<column/>
<column flex="1"/>
</columns>
<rows>
<row align="center">
<label value="&gestures.gesture;"/>
<label value="&gestures.action;"/>
</row>
<row>
<separator class="thin"/>
</row>
<row align="center">
<hbox align="center">
<label value="&super-drag.image;"/>
</hbox>
<menulist id="SDImage" oncommand="kGestures.setAction(this)" flex="1"/>
</row>
<row align="center">
<hbox align="center">
<label value="&super-drag.link;"/>
</hbox>
<menulist id="SDLink" oncommand="kGestures.setAction(this)" flex="1"/>
</row>
<row align="center">
<hbox align="center">
<label value="&super-drag.text;"/>
</hbox>
<menulist id="SDText" oncommand="kGestures.setAction(this)" flex="1"/>
</row>
</rows>
</grid>
<!-- Super Drags -->
</tabpanel>
</tabpanels>
</tabbox>
</tabcontrol>

1
k-meleon/components/kmprefs/pref-privacy.xul

@ -167,6 +167,7 @@ var UserAgent = {
<radio value="2" label="&cookies.accept.never;"/>
<radio value="0" label="&cookies.accept.always;"/>
<radio value="1" label="&cookies.accept.noForeign;"/>
<radio value="3" label="&cookies.accept.visited;"/>
<vbox id="p3p" hidden="true">
<radio value="3" label="&cookies.accept.p3p;"/>
<hbox>

Loading…
Cancel
Save