[Pkg-mozext-commits] [automatic-save-folder] 70/133: Add : - New Option tab Layout (with sub-tabs) - New options available for Graphical interface configuration. - DownThemAll integration to ASF ! After many users requests, it's finally here! Tested only on WinXP+Firefox3.6
David Prévot
taffit at moszumanska.debian.org
Mon Apr 27 20:33:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch wip
in repository automatic-save-folder.
commit 0c30d9708058ae9a39142fef7b6041fba41c3c8e
Author: Cyan <Cyan at d0063192-6b2e-11de-89a9-0b20f3e2dceb>
Date: Sun Jun 6 16:00:22 2010 +0000
Add :
- New Option tab Layout (with sub-tabs)
- New options available for Graphical interface configuration.
- DownThemAll integration to ASF ! After many users requests, it's finally here!
Tested only on WinXP+Firefox3.6
It's not a real DownThemAll integration, It's only a data modification
before DTA read Them. I hope DTA authors are ok with this sort of mod. Else
I'll revert.
So it's certainly full of bugs, so please report what you think after using it
for a while. (please report even if it's working ! I need to know)
Fix : Few fixes (mainly with regular expression and dynamic filtering)
git-svn-id: http://automatic-save-folder.googlecode.com/svn/trunk@76 d0063192-6b2e-11de-89a9-0b20f3e2dceb
---
content/about.xul | 7 +-
content/asf.js | 27 +++++---
content/asf_addedit.js | 4 +-
content/asf_download.js | 148 +++++++++++++++++++++++++++++++++++++----
content/common.dtd | 2 +
content/help/about.xhtml | 6 +-
content/options.xul | 158 ++++++++++++++++++++++++++++++--------------
defaults/preferences/asf.js | 5 ++
locale/en-US/about.dtd | 10 +--
locale/en-US/asf.dtd | 33 +++++++--
locale/fr/about.dtd | 10 +--
locale/fr/asf.dtd | 33 +++++++--
locale/it/about.dtd | 10 +--
locale/it/asf.dtd | 33 +++++++--
locale/ru/about.dtd | 10 +--
locale/ru/asf.dtd | 33 +++++++--
16 files changed, 411 insertions(+), 118 deletions(-)
diff --git a/content/about.xul b/content/about.xul
index 2d1889e..daa3983 100644
--- a/content/about.xul
+++ b/content/about.xul
@@ -7,7 +7,12 @@
***** END LICENSE BLOCK ***** -->
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<!DOCTYPE dialog SYSTEM "chrome://asf/locale/about.dtd">
+<!DOCTYPE dialog [
+ <!ENTITY % aboutDTD SYSTEM "chrome://asf/locale/about.dtd">
+ %aboutDTD;
+ <!ENTITY % commonDTD SYSTEM "chrome://asf/content/common.dtd">
+ %commonDTD;
+]>
<dialog title="&about;"
orient="vertical"
autostretch="always"
diff --git a/content/asf.js b/content/asf.js
index 7430d83..7ecd09a 100644
--- a/content/asf.js
+++ b/content/asf.js
@@ -46,7 +46,7 @@ var automatic_save_folder = {
// init the preference for firefox 3
if (this.firefoxversion == "3")
- {
+ {
// set lastdir to "enable" if the user just updated from previous version and had it disabled
var lastdir = document.getElementById("asf-lasdir");
lastdir.checked = true;
@@ -320,7 +320,10 @@ var automatic_save_folder = {
}
// initialize the regular expression search
- var test_regexp = new RegExp(filters, "i"); // put the slash back and the gi option (g = global seach, i = case insensitive)
+ var param = "";
+ var regexp_caseinsensitive = this.readHiddenPref("extensions.asf.regexp_caseinsensitive", "bool", true); // let the user choose in next release.
+ if (regexp_caseinsensitive) param = "i";
+ var test_regexp = new RegExp(filters, param); // put the slash back and the gi option (g = global seach, i = case insensitive)
if (string.match(test_regexp)) // if something match
{
@@ -414,13 +417,12 @@ var automatic_save_folder = {
// and fill the forceRadioTo menuItems
var forceRadioTo = this.prefManager.getCharPref("extensions.asf.dialogForceRadioTo");
- var DownThemAll = this.DownThemAll();
- if (DownThemAll)
+ if (this.DownThemAll_isEnabled())
{
document.getElementById("asf-dialogForceRadioToDownthemall").style.display = "block";
document.getElementById("asf-dialogForceRadioToTurbodta").style.display = "block";
}
- if (!this.DownThemAll && (forceRadioTo == "downthemall" || forceRadioTo == "turbodta")) this.prefManager.setCharPref("extensions.asf.dialogForceRadioTo","save"); // default to "Save File" if DTA is uninstalled.
+ if (!this.DownThemAll_isEnabled() && (forceRadioTo == "downthemall" || forceRadioTo == "turbodta")) this.prefManager.setCharPref("extensions.asf.dialogForceRadioTo","save"); // default to "Save File" if DTA is uninstalled.
// if the option window is opened from the saving window, disable the autosave feature (Not working when set from here.)
@@ -458,7 +460,6 @@ var automatic_save_folder = {
// hide all the descriptions box, and unhide the needed one
document.getElementById("asf-rightclickdesc-ff2").hidden = true; // Firefox 2, Right-click disabled message
document.getElementById("asf-rightclickdesc-DSort").hidden = true; // Download sort conflit alert
- var Dsort_installed = this.DownloadSort();
if (this.firefoxversion == 2)
{
@@ -468,13 +469,18 @@ var automatic_save_folder = {
}
if (this.firefoxversion == 3)
{
- if (Dsort_installed) // if Download sort is installed, display a message "right click disabled"
+ if (this.DownloadSort_isEnabled()) // if Download sort is installed, display a message "right click disabled"
{
asf_userightclick.disabled = true;
asf_rightclicktimeout.disabled = true;
document.getElementById("asf-rightclickdesc-DSort").hidden = false;
}
+
+ if (this.DownThemAll_isEnabled()) // if DownThemall is installed, show the DTA sub-tab in the option's tab
+ {
+ document.getElementById("asf-optionssubtab-dta").hidden = false;
+ }
}
if (instantApply) // bug with sub-options status set by javascript
@@ -828,7 +834,7 @@ var automatic_save_folder = {
},
- DownloadSort: function() {
+ DownloadSort_isEnabled: function() {
// Check for Download sort add-on, if enabled return true. (works only on 3.x)
if (this.firefoxversion == 3)
{
@@ -842,7 +848,7 @@ var automatic_save_folder = {
},
- DownThemAll: function() {
+ DownThemAll_isEnabled: function() {
// Check for DTA add-on, if enabled return true. (works only on 3.x)
if (this.firefoxversion == 3)
{
@@ -911,8 +917,7 @@ var automatic_save_folder = {
//save the rightclick (set timeout for header(Content-Disposition:) true = 0, false = 1000)
// Only if DownloadSort is not enabled (prevent conflict)
- var Dsort_installed = this.DownloadSort();
- if ((Dsort_installed == false) && this.firefoxversion == 3) // only for firefox 3, Firefox2 doesn't use timeout option
+ if ( !this.DownloadSort_isEnabled() && this.firefoxversion == 3) // only for firefox 3, Firefox2 doesn't use timeout option
{
var asf_rightclicktimeout = document.getElementById("asf-rightclicktimeout").checked;
this.prefManager.setIntPref("browser.download.saveLinkAsFilenameTimeout", asf_rightclicktimeout == true ? 0 : 1000);
diff --git a/content/asf_addedit.js b/content/asf_addedit.js
index bd2f7fe..75996bf 100644
--- a/content/asf_addedit.js
+++ b/content/asf_addedit.js
@@ -539,7 +539,7 @@ Copyright (C) 2007-2010 Éric Cassar (Cyan).
// Write each path to the menupopup
var pathlist = new Array();
- var pathlist_defaultforceontop = this.readHiddenPref("extensions.asf.pathlist_defaultforceontop", "bool", false); // let the user choose in next release.
+ var pathlist_defaultforceontop = window.opener.document.getElementById("asf-pathlist_defaultforceontop").checked;
var defaultfolder = window.opener.document.getElementById("asf-default-folder").value;
var j = 0;
if (pathlist_defaultforceontop)
@@ -567,7 +567,7 @@ Copyright (C) 2007-2010 Éric Cassar (Cyan).
}
}
- var pathlist_sort_alpha = this.readHiddenPref("extensions.asf.pathlist_alphasort", "bool", true); // let the user choose in next release.
+ var pathlist_sort_alpha = window.opener.document.getElementById("asf-pathlist_alphasort").checked;
if (pathlist_sort_alpha) pathlist.sort();
diff --git a/content/asf_download.js b/content/asf_download.js
index dfc347c..409d8c5 100644
--- a/content/asf_download.js
+++ b/content/asf_download.js
@@ -28,6 +28,7 @@ Copyright (C) 2007-2010 Éric Cassar (Cyan).
.getService(Components.interfaces.nsIVersionComparator),
firefoxversion : "",
+ systemslash: "",
main: function () {
@@ -233,12 +234,23 @@ Copyright (C) 2007-2010 Éric Cassar (Cyan).
{
var radioSavemode = document.getElementById("mode");
var forceRadioTo = this.prefManager.getCharPref("extensions.asf.dialogForceRadioTo");
- if (!this.DownThemAll && (forceRadioTo == "downthemall" || forceRadioTo == "turbodta")) forceRadioTo = "save"; // default to "Save File" if DTA is uninstalled.
+ var dta_ASFtoDTA_isActive = this.prefManager.getBoolPref("extensions.asf.dta_ASFtoDTA_isActive");
+ if (!this.DownThemAll_isEnabled() && (forceRadioTo == "downthemall" || forceRadioTo == "turbodta")) forceRadioTo = "save"; // default to "Save File" if DTA is uninstalled.
+ if (this.DownThemAll_isEnabled() && (!dta_ASFtoDTA_isActive) && (forceRadioTo == "turbodta")) forceRadioTo = "downthemall"; // default to "DownThemAll" if DTA is installed but extension.dta.directory is empty.
+ //if (this.DownThemAll_isEnabled() && (dta_ASFtoDTA_isActive) && document.getElementById("tdta").hidden == true) forceRadioTo = "downthemall"; // default to "downthemall" if DTA is installed, extension.dta.directory is empty, but ASF just set data.
radioSavemode.selectedItem = document.getElementById(forceRadioTo);
- //alert(document.getElementById("save").selected);
+ //alert(document.getElementById("turbodta").selected);
+ }
+
+ if (this.DownThemAll_isEnabled() && (document.getElementById("downthemall").selected || document.getElementById("turbodta").selected))
+ {
+ DTA_SaveAs.dialogAccepted();
+ }
+ else
+ {
+ window.close();
+ return dialog.onOK();
}
- window.close();
- return dialog.onOK();
}
else
{
@@ -253,12 +265,8 @@ Copyright (C) 2007-2010 Éric Cassar (Cyan).
set_savepath: function(path) {
var folderList = this.prefManager.getIntPref("browser.download.folderList");
- var lastdir = this.prefManager.getBoolPref("extensions.asf.lastdir"); // for Firefox2 : set save as Ctrl+S too
- var useDownloadDir = this.prefManager.getBoolPref("browser.download.useDownloadDir");
- var folderList = this.prefManager.getIntPref("browser.download.folderList");
-
- var directory = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
-
+ var lastdir = this.prefManager.getBoolPref("extensions.asf.lastdir"); // for Firefox2 : set save as Ctrl+S too
+ var directory = Components.classes["@mozilla.org/file/local;1"].createInstance(Components.interfaces.nsILocalFile);
// Check if the user use the "do not show file explorer" to automatically save to "desktop" or "downloads" and force the suggested path to those folders instead of filtered path
if ( (folderList == 0) || (folderList == 1) )
@@ -266,7 +274,7 @@ Copyright (C) 2007-2010 Éric Cassar (Cyan).
var desk = Components.classes["@mozilla.org/file/directory_service;1"]
.getService(Components.interfaces.nsIProperties)
.get("Desk", Components.interfaces.nsILocalFile);
-
+ directory = desk;
if (this.firefoxversion == 3)
{
var dnldMgr = Components.classes["@mozilla.org/download-manager;1"]
@@ -323,6 +331,15 @@ Copyright (C) 2007-2010 Éric Cassar (Cyan).
this.saveUnicodeString("browser.download.lastDir", directory.path);
if (folderList == 2)
this.saveUnicodeString("browser.download.dir", directory.path);
+
+
+ // and process DTA if enabled
+ if (this.DownThemAll_isEnabled() && this.prefManager.getBoolPref("extensions.asf.dta_ASFtoDTA_isActive"))
+ {
+ this.DTA_replaceDirectory(directory.path);
+ // If process turbo dta too
+ this.DTA_setTurboDtaList();
+ }
}
}
@@ -826,6 +843,7 @@ Copyright (C) 2007-2010 Éric Cassar (Cyan).
var j = 0;
if (pathlist_defaultforceontop)
{
+ if (variable_mode == true) defaultfolder = this.createfolder(defaultfolder);
var menuitem = document.createElementNS('http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul', 'menuitem');
menuitem.setAttribute('label', defaultfolder);
menuitem.setAttribute('crop', 'center');
@@ -1002,7 +1020,7 @@ Copyright (C) 2007-2010 Éric Cassar (Cyan).
},
- DownThemAll: function() {
+ DownThemAll_isEnabled: function() {
// Check for DTA add-on, if enabled return true. (works only on 3.x)
if (this.firefoxversion == 3)
{
@@ -1015,7 +1033,111 @@ Copyright (C) 2007-2010 Éric Cassar (Cyan).
return false;
},
-
+
+ DTA_replaceDirectory: function(folder) {
+ var dta_pathArray = this.DTA_readDirectory();
+ var asf_saveFolder = this.DTA_preparePath(folder); // filtered ASF folder
+ var dta_sendMethod = this.prefManager.getCharPref("extensions.asf.dta_sendMethod");
+
+ if (dta_sendMethod == "replace")
+ {
+ dta_pathArray.splice(0, 1, asf_saveFolder );
+ }
+ if (dta_sendMethod == "add")
+ {
+ if(dta_pathArray.length >0)
+ {
+ dta_pathArray.unshift(asf_saveFolder);
+ }
+ else
+ {
+ dta_pathArray.splice(0, 1, asf_saveFolder );
+ }
+ }
+ this.DTA_saveDirectory(dta_pathArray);
+ },
+
+
+ DTA_readDirectory: function() {
+ var string = this.loadUnicodeString("extensions.dta.directory");
+ // readHiddenPref("extensions.dta.directory", "complex", "[]");
+
+ string = string.substring(1, string.length);
+ string = string.substring(0, string.length -1);
+ var directories = string.split(", ");
+ for (var i=0; i < directories.length; i++)
+ {
+ directories[i] = directories[i].substring(1, directories[i].length);
+ directories[i] = directories[i].substring(0, directories[i].length -1);
+ }
+ return directories;
+ },
+
+
+ DTA_saveDirectory: function(data) {
+ var history = this.prefManager.getIntPref("extensions.dta.history");
+ var dta_directory = data.slice(0,history)
+
+ dta_directory = dta_directory.join("\", \"");
+ dta_directory = "[\"" + dta_directory + "\"]";
+
+ return this.saveUnicodeString("extensions.dta.directory", dta_directory);
+ },
+
+
+ DTA_setTurboDtaList: function () {
+ var dta_pathArray = this.DTA_readDirectory();
+ var processTurboDTA = !document.getElementById("tdta").hidden;
+ var tdtalist = document.getElementById("tdtalist");
+ var dta_sendMethod = this.prefManager.getCharPref("extensions.asf.dta_sendMethod");
+ //alert(tdtalist._list.menupopup.children[0].boxObject.element.attributes[0].value);
+
+ // rename menuitems labels
+ if (processTurboDTA)
+ {
+ if (dta_sendMethod == "replace")
+ {
+ if (this.systemslash == "\\") dta_pathArray[0] = dta_pathArray[0].replace(/\\\\/g, "\\");
+ tdtalist._list.menupopup.children[0].boxObject.element.attributes[0].value = dta_pathArray[0];
+ }
+
+ if (dta_sendMethod == "add")
+ {
+ for (var i = 0 ; i < tdtalist._list.menupopup.children.length ; i++)
+ {
+ if (this.systemslash == "\\") dta_pathArray[i] = dta_pathArray[i].replace(/\\\\/g, "\\");
+ tdtalist._list.menupopup.children[i].boxObject.element.attributes[0].value = dta_pathArray[i];
+ }
+ }
+ }
+ },
+
+
+ DTA_preparePath: function(path) {
+ var _profile = Components.classes["@mozilla.org/file/directory_service;1"]
+ .getService(Components.interfaces.nsIProperties)
+ .get("ProfD", Components.interfaces.nsIFile);
+ this.systemslash = (_profile.path.indexOf('/') != -1) ? '/' : '\\';
+
+ var formated_path = this.addFinalSlash(path);
+ if (this.systemslash == "\\") formated_path = formated_path.replace(/\\/g, "\\\\");
+ return formated_path;
+ },
+
+
+ // Inspired from DTA
+ addFinalSlash: function(string) {
+ if (string.length == 0)
+ {
+ return this.systemslash;
+ }
+
+ if (string[string.length - 1] != this.systemslash)
+ {
+ return string + this.systemslash;
+ }
+ return string;
+ },
};
addEventListener( // Autoload
diff --git a/content/common.dtd b/content/common.dtd
new file mode 100644
index 0000000..7d9811b
--- /dev/null
+++ b/content/common.dtd
@@ -0,0 +1,2 @@
+<!-- Current version -->
+<!ENTITY asf.version "1.0.2b Rev76">
\ No newline at end of file
diff --git a/content/help/about.xhtml b/content/help/about.xhtml
index 96f7b81..7646f6e 100644
--- a/content/help/about.xhtml
+++ b/content/help/about.xhtml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" [
-<!ENTITY % aboutDTD SYSTEM "chrome://asf/locale/about.dtd" >
-%aboutDTD;
+ <!ENTITY % aboutDTD SYSTEM "chrome://asf/locale/about.dtd">
+ %aboutDTD;
+ <!ENTITY % commonDTD SYSTEM "chrome://asf/content/common.dtd">
+ %commonDTD;
]>
<html xmlns="http://www.w3.org/1999/xhtml">
<!-- ***** BEGIN LICENSE BLOCK *****
diff --git a/content/options.xul b/content/options.xul
index 3a81098..d6f7f3d 100644
--- a/content/options.xul
+++ b/content/options.xul
@@ -8,7 +8,12 @@
***** END LICENSE BLOCK ***** -->
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://asf/skin/style.css" type="text/css"?>
-<!DOCTYPE dialog SYSTEM "chrome://asf/locale/asf.dtd">
+<!DOCTYPE dialog [
+ <!ENTITY % asfDTD SYSTEM "chrome://asf/locale/asf.dtd">
+ %asfDTD;
+ <!ENTITY % commonDTD SYSTEM "chrome://asf/content/common.dtd">
+ %commonDTD;
+]>
<prefwindow
id="asf_pref"
@@ -40,6 +45,12 @@
<preference id="asf_usecurrenturl" name="extensions.asf.usecurrenturl" type="bool"/>
<preference id="asf_useDownloadDir" name="browser.download.useDownloadDir" type="bool"/>
<preference id="asf_folderList" name="browser.download.folderList" type="int"/>
+ <preference id="asf_regexp_caseinsensitive" name="extensions.asf.regexp_caseinsensitive" type="bool"/>
+ <preference id="asf_pathlist_defaultforceontop" name="extensions.asf.pathlist_defaultforceontop" type="bool"/>
+ <preference id="asf_pathlist_alphasort" name="extensions.asf.pathlist_alphasort" type="bool"/>
+ <preference id="asf_rowmatchinghighlight" name="extensions.asf.rowmatchinghighlight" type="string"/>
+ <preference id="asf_dta_ASFtoDTA_isActive" name="extensions.asf.dta_ASFtoDTA_isActive" type="bool"/>
+ <preference id="asf_dta_sendMethod" name="extensions.asf.dta_sendMethod" type="string"/>
</preferences>
<menupopup id="contextpopup">
<menuitem label="&asf.top.popup;" oncommand="automatic_save_folder.move('top');"/>
@@ -142,54 +153,103 @@
</groupbox>
</vbox>
<vbox id="asf-tab-options" hidden="true" flex="1000">
- <groupbox id="asf-options" flex="1">
- <caption label="&asf.options.label;"/>
- <separator class="thin"/>
- <hbox>
- <checkbox id="asf-useDownloadDir" preference="asf_useDownloadDir" label="&asf.useDownloadDir.bool;" oncommand="automatic_save_folder.toggle_options();"/>
- <menulist id="asf-folderList" preference="asf_folderList" tooltip="tooltip_folderList">
- <menupopup>
- <menuitem value="0" label="&asf.desktop.label;"></menuitem>
- <menuitem value="1" label="&asf.systemdownload.label;"></menuitem>
- <menuitem value="2" label="&asf.filteredfolder.label;"></menuitem>
- </menupopup>
- </menulist>
- </hbox>
- <checkbox id="asf-dialogaccept" preference="asf_dialogaccept" label="&asf.dialogaccept.bool;" oncommand="automatic_save_folder.toggle_options();"/>
- <checkbox id="asf-dialogacceptFiltered" preference="asf_dialogacceptFiltered" label="&asf.dialogacceptFiltered.bool;" tooltip="tooltip_dialogacceptFiltered" style="margin-left:25px;"/>
- <hbox>
- <checkbox id="asf-dialogForceRadio_Start" preference="asf_dialogForceRadio" label="&asf.dialogForceRadio_Start.bool;" style="margin-left:25px;"/>
- <menulist id="asf-dialogForceRadioTo" preference="asf_dialogForceRadioTo" >
- <menupopup>
- <menuitem value="open" label="&asf.dialogForceRadioTo.label1;"></menuitem>
- <menuitem value="downthemall" label="&asf.dialogForceRadioTo.label2;" id="asf-dialogForceRadioToDownthemall" style="display:none;"></menuitem>
- <menuitem value="turbodta" label="&asf.dialogForceRadioTo.label3;" id="asf-dialogForceRadioToTurbodta" style="display:none;"></menuitem>
- <menuitem value="save" label="&asf.dialogForceRadioTo.label4;"></menuitem>
- </menupopup>
- </menulist>
- <label id="asf-dialogForceRadio_End">&asf.dialogForceRadio_End.bool;</label>
- </hbox>
- <hbox>
- <checkbox id="asf-viewdloption" preference="asf_viewdloption" label="&asf.viewdloption.bool;" tooltip="tooltip_viewdloption" oncommand="automatic_save_folder.toggle_options();"/>
- <menulist id="asf-viewdloptionType" preference="asf_viewdloptionType">
- <menupopup>
- <menuitem value="0" label="&asf.viewdloptionType0.label;"></menuitem>
- <menuitem value="1" label="&asf.viewdloptionType1.label;"></menuitem>
- <menuitem value="2" label="&asf.viewdloptionType2.label;"></menuitem>
- <menuitem value="3" label="&asf.viewdloptionType3.label;"></menuitem>
- </menupopup>
- </menulist>
- </hbox>
- <checkbox id="asf-viewpathselect" preference="asf_viewpathselect" label="&asf.viewpathselect.bool;" tooltip="tooltip_viewpathselect" style="margin-left:25px;white-space:pre-wrap"/>
- <separator class="thin"/>
- <checkbox id="asf-usecurrenturl" preference="asf_usecurrenturl" label="&asf.usecurrenturl.bool;"/>
- <checkbox id="asf-lasdir" preference="asf_lastdir" label="&asf.lastdir.bool;"/>
- <separator class="thin"/>
- <checkbox id="asf-userightclick" preference="asf_userightclick" label="&asf.userightclick.bool;" tooltip="tooltip_userightclick" oncommand="automatic_save_folder.toggle_userightclick();"/>
- <checkbox id="asf-rightclicktimeout" preference="asf_rightclicktimeout" label="&asf.rightclicktimeout.bool;" tooltip="tooltip_rightclicktimeout" style="margin-left:25px;" oncommand="automatic_save_folder.toggle_rightclicktimeout();"/>
- <description id="asf-rightclickdesc-DSort" style="margin-left:25px;white-space:pre-wrap;color:red;">&asf.rightclick.DSort.label;</description>
- <description id="asf-rightclickdesc-ff2" style="margin-left:25px;white-space:pre-wrap;color:red;">&asf.rightclick.ff2.label;</description>
- </groupbox>
+ <separator class="thin"/>
+ <tabbox>
+ <tabs>
+ <tab id="asf-optionssubtab-options" label="&asf.options.tab1.label;" />
+ <tab id="asf-optionssubtab-options" label="&asf.options.tab2.label;" />
+ <tab id="asf-optionssubtab-dta" label="&asf.options.tabdta.label;" hidden="true" />
+ </tabs>
+ <tabpanels>
+ <tabpanel flex="1">
+ <vbox id="asf-options-tab1" flex="1">
+ <groupbox><caption label="&asf.options.groupbox1.label;" />
+ <hbox>
+ <checkbox id="asf-useDownloadDir" preference="asf_useDownloadDir" label="&asf.useDownloadDir.bool;" oncommand="automatic_save_folder.toggle_options();"/>
+ <menulist id="asf-folderList" preference="asf_folderList" tooltip="tooltip_folderList">
+ <menupopup>
+ <menuitem value="0" label="&asf.desktop.label;"></menuitem>
+ <menuitem value="1" label="&asf.systemdownload.label;"></menuitem>
+ <menuitem value="2" label="&asf.filteredfolder.label;"></menuitem>
+ </menupopup>
+ </menulist>
+ </hbox>
+ </groupbox>
+ <groupbox><caption label="&asf.options.groupbox2.label;" />
+ <checkbox id="asf-dialogaccept" preference="asf_dialogaccept" label="&asf.dialogaccept.bool;" oncommand="automatic_save_folder.toggle_options();"/>
+ <checkbox id="asf-dialogacceptFiltered" preference="asf_dialogacceptFiltered" label="&asf.dialogacceptFiltered.bool;" tooltip="tooltip_dialogacceptFiltered" style="margin-left:25px;"/>
+ <hbox flex="1">
+ <checkbox id="asf-dialogForceRadio_Start" preference="asf_dialogForceRadio" label="&asf.dialogForceRadio_Start.bool;" style="margin-left:25px;"/>
+ <menulist id="asf-dialogForceRadioTo" preference="asf_dialogForceRadioTo" >
+ <menupopup>
+ <menuitem value="open" label="&asf.dialogForceRadioTo.label1;"></menuitem>
+ <menuitem value="downthemall" label="&asf.dialogForceRadioTo.label2;" id="asf-dialogForceRadioToDownthemall" style="display:none;"></menuitem>
+ <menuitem value="turbodta" label="&asf.dialogForceRadioTo.label3;" id="asf-dialogForceRadioToTurbodta" style="display:none;"></menuitem>
+ <menuitem value="save" label="&asf.dialogForceRadioTo.label4;"></menuitem>
+ </menupopup>
+ </menulist>
+ <label id="asf-dialogForceRadio_End" flex="1">&asf.dialogForceRadio_End.bool;</label>
+ </hbox>
+ <hbox>
+ <checkbox id="asf-viewdloption" preference="asf_viewdloption" label="&asf.viewdloption.bool;" tooltip="tooltip_viewdloption" oncommand="automatic_save_folder.toggle_options();"/>
+ <menulist id="asf-viewdloptionType" preference="asf_viewdloptionType">
+ <menupopup>
+ <menuitem value="0" label="&asf.viewdloptionType0.label;"></menuitem>
+ <menuitem value="1" label="&asf.viewdloptionType1.label;"></menuitem>
+ <menuitem value="2" label="&asf.viewdloptionType2.label;"></menuitem>
+ <menuitem value="3" label="&asf.viewdloptionType3.label;"></menuitem>
+ </menupopup>
+ </menulist>
+ </hbox>
+ <checkbox id="asf-viewpathselect" preference="asf_viewpathselect" label="&asf.viewpathselect.bool;" tooltip="tooltip_viewpathselect" style="margin-left:25px;white-space:pre-wrap"/>
+ </groupbox>
+ </vbox>
+ </tabpanel>
+ <tabpanel>
+ <vbox id="asf-options-tab2" flex="1">
+ <groupbox><caption label="&asf.options.groupbox3.label;" />
+ <checkbox id="asf-lasdir" preference="asf_lastdir" label="&asf.lastdir.bool;"/>
+ <checkbox id="asf-usecurrenturl" preference="asf_usecurrenturl" label="&asf.usecurrenturl.bool;"/>
+ <checkbox id="asf-regexp_caseinsensitive" preference="asf_regexp_caseinsensitive" label="&asf.regexp_caseinsensitive.bool;"/>
+ </groupbox>
+ <groupbox><caption label="&asf.options.groupbox4.label;" />
+ <checkbox id="asf-userightclick" preference="asf_userightclick" label="&asf.userightclick.bool;" tooltip="tooltip_userightclick" oncommand="automatic_save_folder.toggle_userightclick();"/>
+ <checkbox id="asf-rightclicktimeout" preference="asf_rightclicktimeout" label="&asf.rightclicktimeout.bool;" tooltip="tooltip_rightclicktimeout" style="margin-left:25px;" oncommand="automatic_save_folder.toggle_rightclicktimeout();"/>
+ <description id="asf-rightclickdesc-DSort" style="margin-left:25px;white-space:pre-wrap;color:red;">&asf.rightclick.DSort.label;</description>
+ <description id="asf-rightclickdesc-ff2" style="margin-left:25px;white-space:pre-wrap;color:red;">&asf.rightclick.ff2.label;</description>
+ </groupbox>
+ <groupbox><caption label="&asf.options.groupbox5.label;" />
+ <checkbox id="asf-pathlist_defaultforceontop" preference="asf_pathlist_defaultforceontop" label="&asf.pathlist_defaultforceontop.bool;"/>
+ <checkbox id="asf-pathlist_alphasort" preference="asf_pathlist_alphasort" label="&asf.pathlist_alphasort.bool;"/>
+ <separator class="thin"/>
+ <label>&asf.rowmatchinghighlight.label;</label>
+ <radiogroup id="asf-rowmatchinghighlight" preference="asf_rowmatchinghighlight">
+ <hbox>
+ <radio value="color" label="&asf.rowmatchinghighlight.color;"/>
+ <radio value="system" label="&asf.rowmatchinghighlight.system;"/>
+ </hbox>
+ </radiogroup>
+ </groupbox>
+ </vbox>
+ </tabpanel>
+ <tabpanel>
+ <vbox id="asf-options-tab3" flex="1">
+ <groupbox><caption label="&asf.options.groupbox6.label;" />
+ <description>&asf.options.dtaDetected.label;</description>
+ <checkbox id="asf-dta_ASFtoDTA_isActive" preference="asf_dta_ASFtoDTA_isActive" label="&asf.dta_ASFtoDTA_isActive.bool;"/>
+ <separator />
+ <description style="vertical-align:top;white-space:pre-wrap">&asf.dta_chooseSendingMethod.label;</description>
+ <radiogroup id="asf-dta_sendMethod" preference="asf_dta_sendMethod">
+ <hbox >
+ <radio value="replace" label="&asf.dta_methodReplace.label;"/>
+ <radio value="add" label="&asf.dta_methodAdd.label;"/>
+ </hbox>
+ </radiogroup>
+ </groupbox>
+ </vbox>
+ </tabpanel>
+ </tabpanels>
+ </tabbox>
</vbox>
<vbox id="asf-tab-dynamics" hidden="true" flex="1000">
<groupbox id="asf-dynamics" flex="1">
diff --git a/defaults/preferences/asf.js b/defaults/preferences/asf.js
index 20d7040..cfaee34 100644
--- a/defaults/preferences/asf.js
+++ b/defaults/preferences/asf.js
@@ -23,3 +23,8 @@ pref("extensions.asf at mangaheart.org.description", "chrome://asf/locale/asf.prope
pref("extensions.asf.rightclicktimeout", true);
pref("browser.download.saveLinkAsFilenameTimeout", 0); // set the default value to userpref.js to prevent main pref.js modification and restore default value on ASF uninstall.
pref("extensions.asf.usecurrenturl", false);
+ pref("extensions.asf.regexp_caseinsensitive", true);
+ pref("extensions.asf.pathlist_defaultforceontop", false);
+ pref("extensions.asf.pathlist_alphasort", true);
+ pref("extensions.asf.dta_ASFtoDTA_isActive", false);
+ pref("extensions.asf.dta_sendMethod", "replace");
diff --git a/locale/en-US/about.dtd b/locale/en-US/about.dtd
index 3211416..9670378 100644
--- a/locale/en-US/about.dtd
+++ b/locale/en-US/about.dtd
@@ -1,7 +1,4 @@
-<!-- ASF -->
-<!ENTITY asf.version "1.0.2b Rev75">
-
-<!-- Mini about box from addon manager -->
+<!-- Mini about box from addon manager -->
<!ENTITY about "About Automatic Save Folder">
<!ENTITY version "Version: ">
<!ENTITY createdBy "Created By:">
@@ -26,7 +23,10 @@
<!ENTITY about.version.title "Version">
<!-- Keep the newline intact as it uses the < pre > tag, keep the 2 begining spaces to create indentation -->
-<!ENTITY about.version.102 "+ Added an option to force the radio choice to "Save file" when using the automatic download option.
+<!ENTITY about.version.102 "+ Added an option to force the action choice when using the automatic download option.
++ If DownThemAll add-on is installed, a new option's tab is available to send ASF target path to DTA.
++ Added an option to select if the filters are case sensitive or insensitive.
++ New options related to Graphical User Interface.
! Fixed a bug where checking the Regexp option when a filter ended by a slash didn't add a second slash.
! Fixed a bug where no data were returned if a download was initiated from the URL bar or from an external software which resulted in no filters in the filter's list if the preferences window was opened from the saving dialog "+ Add or edit a filter". (Thanks to MrCOLOMBO)
! ASF now uses the full URL instead of the domain when falling back to current website URL if no filter is found, when using single click (Right-click already used full URL).">
diff --git a/locale/en-US/asf.dtd b/locale/en-US/asf.dtd
index 2f3bf36..96af109 100644
--- a/locale/en-US/asf.dtd
+++ b/locale/en-US/asf.dtd
@@ -1,7 +1,4 @@
-<!-- ASF -->
-<!ENTITY asf.version "1.0.2b Rev75">
-
-<!-- browser and save dialog-->
+<!-- browser and save dialog-->
<!ENTITY prefwindow.title "Automatic Save Folder Preferences">
<!ENTITY asf.label "Automatic Save Folder...">
<!ENTITY asf.addedit.label "Add or edit a filter">
@@ -35,11 +32,18 @@
<!-- Options tab -->
<!ENTITY asf.options.label "Options">
+<!ENTITY asf.options.tab1.label "Page 1">
+<!ENTITY asf.options.tab2.label "Page 2">
+<!ENTITY asf.options.tabdta.label "DownThemAll">
+
+<!ENTITY asf.options.groupbox1.label "File Explorer">
<!ENTITY asf.useDownloadDir.bool "Do not show the file explorer, and automatically save to:">
<!ENTITY asf.desktop.label "Desktop">
<!ENTITY asf.systemdownload.label "Downloads">
<!ENTITY asf.filteredfolder.label "Set by the filters">
<!ENTITY asf.folderList.tooltip "If the "Downloads" folder doesn't exist, the file explorer will be shown.">
+
+<!ENTITY asf.options.groupbox2.label "Save dialog">
<!ENTITY asf.dialogaccept.bool "Automatically accept the "What should Firefox do with this file" dialog windows.">
<!ENTITY asf.dialogacceptFiltered.bool "Only if a filter is found">
<!ENTITY asf.dialogacceptFiltered.tooltip "Will not automatically accept the "What should Firefox do with this file" dialog windows if no filter matches.">
@@ -57,8 +61,13 @@
<!ENTITY asf.viewdloptionType3.label "Hide if disabled">
<!ENTITY asf.viewpathselect.bool "View the list of folders">
<!ENTITY asf.viewpathselect.tooltip "Activate a drop-down menu with all the filter's path.">
-<!ENTITY asf.usecurrenturl.bool "Use the current website URL to verify the filter's domain if the hosted domain doesn't match.">
+
+<!ENTITY asf.options.groupbox3.label "Filtering options">
<!ENTITY asf.lastdir.bool "Affect the folder for the 'save as...' command when a filter matches">
+<!ENTITY asf.usecurrenturl.bool "Use the current website URL to verify the filter's domain if the hosted domain doesn't match.">
+<!ENTITY asf.regexp_caseinsensitive.bool "Filters are case insensitive.">
+
+<!ENTITY asf.options.groupbox4.label "Right-click">
<!ENTITY asf.userightclick.bool "Use the filters on the menus">
<!ENTITY asf.userightclick.tooltip "Enable the filters on the menus "Save link as...", "Save image as..." and "Save as... (Ctrl+S)"">
<!ENTITY asf.rightclicktimeout.bool "Remove the timing delay and activate the filtering on the right-click menu "Save link as..."">
@@ -69,6 +78,20 @@
<!ENTITY asf.rightclick.ff2.label "The Automatic Save Folder's right-click feature is not available on Firefox 2. If you want to use the filters on your downloads using the right-click menu "Save link as", you should update your Firefox version to 3.0 minimum (recommended version 3.5 or more).">
<!ENTITY asf.rightclick.DSort.label "Download sort extension has been detected. 
Automatic Save Folder's right-click feature will not work until you disable Download Sort in your Extension manager.">
+<!ENTITY asf.options.groupbox5.label "Graphical inerface">
+<!ENTITY asf.pathlist_defaultforceontop.bool "On drop-down menus, shows the default save path first.">
+<!ENTITY asf.pathlist_alphasort.bool "Sort save paths list alphabetically.">
+<!ENTITY asf.rowmatchinghighlight.label "Highlight color when selecting a matching filter:">
+<!ENTITY asf.rowmatchinghighlight.color "ASF color">
+<!ENTITY asf.rowmatchinghighlight.system "System color">
+
+<!ENTITY asf.options.groupbox6.label "DownThemAll!">
+<!ENTITY asf.options.dtaDetected.label "Automatic Save Folder has detected that you are using DownThemAll! add-on. Automatic Save Folder can send the filtered destination path to DownThemAll when using the "What should firefox do with this file" saving window. This option is disabled when using the Private Browsing mode.">
+<!ENTITY asf.dta_ASFtoDTA_isActive.bool "Enable Automatic Save Folder to send the filtered path to DownThemAll.">
+<!ENTITY asf.dta_chooseSendingMethod.label "Choose the sending method for DTA OneClic!:">
+<!ENTITY asf.dta_methodReplace.label "Replace first folder in list">
+<!ENTITY asf.dta_methodAdd.label "Add to list">
+
<!-- Dynamics tab-->
<!ENTITY asf.dynamics.label "Dynamic folders">
<!ENTITY asf.variablemode.bool "Enable">
diff --git a/locale/fr/about.dtd b/locale/fr/about.dtd
index 6beef9d..afdf625 100644
--- a/locale/fr/about.dtd
+++ b/locale/fr/about.dtd
@@ -1,7 +1,4 @@
-<!-- ASF -->
-<!ENTITY asf.version "1.0.2b Rev75">
-
-<!-- Mini about box from addon manager -->
+<!-- Mini about box from addon manager -->
<!ENTITY about "À Propos d'Automatic save folder">
<!ENTITY version "Version : ">
<!ENTITY createdBy "Extension créée par :">
@@ -26,7 +23,10 @@
<!ENTITY about.version.title "Version">
<!-- Conserver les retour à la ligne car le tag < pre > est utilisé, gardez les deux espaces en début de ligne pour l'indentation -->
-<!ENTITY about.version.102 "+ Ajout d'une option permettant de forcer le choix sur "Enregistrer le fichier" lorsque l'enregistrement automatique est sélectionné.
+<!ENTITY about.version.102 "+ Ajout d'une option permettant de forcer le choix de l'action a effectuer lorsque l'enregistrement automatique est sélectionné.
++ Si l'extension DownThemAll est installée, un nouvel onglet d'option est disponible permetant d'envoyer le dossier de destination d'ASF à DTA.
++ Ajout d'une option permettant de choisir si les filtres sont sensibles ou insensibles à la casse.
++ Nouvelles options concernant l'interface graphique.
! Correction du script permettant de rajouter les slashs aux expressions régulières si le filtre contient déjà un slash aux extrémités.
! Correction d'un bug où les données d'un lien direct entré dans la barre d'adresse ou initialisé par un autre programme n'étaient pas lu correctement, empêchant d'afficher la liste des filtres lorsque la fenêtre de préférences était ouverte à partir du lien "+ Ajouter ou éditer un filtre" de la fenêtre d'enregistrement. (Merci à MrCOLOMBO)
! ASF utilise maintenant l'URL complète du site courant au lieu de son domaine lorsque qu'aucun filtre n'est trouvé. (Le clic-droit utilisait déjà l'URL complète).">
diff --git a/locale/fr/asf.dtd b/locale/fr/asf.dtd
index eae354c..ab48174 100644
--- a/locale/fr/asf.dtd
+++ b/locale/fr/asf.dtd
@@ -1,7 +1,4 @@
-<!-- ASF -->
-<!ENTITY asf.version "1.0.2b Rev75">
-
-<!-- browser and save dialog-->
+<!-- browser and save dialog-->
<!ENTITY prefwindow.title "Préférences pour Automatic Save Folder">
<!ENTITY asf.label "Automatic Save Folder...">
<!ENTITY asf.addedit.label "Ajouter ou éditer un filtre">
@@ -35,11 +32,18 @@
<!-- Options tab -->
<!ENTITY asf.options.label "Options">
+<!ENTITY asf.options.tab1.label "Page 1">
+<!ENTITY asf.options.tab2.label "Page 2">
+<!ENTITY asf.options.tabdta.label "DownThemAll">
+
+<!ENTITY asf.options.groupbox1.label "Explorateur de fichiers">
<!ENTITY asf.useDownloadDir.bool "Ne pas afficher l'explorateur de fichiers, et enregistrer directement dans le dossier :">
<!ENTITY asf.desktop.label "Bureau">
<!ENTITY asf.systemdownload.label "Téléchargements">
<!ENTITY asf.filteredfolder.label "Défini par les filtres">
<!ENTITY asf.folderList.tooltip "Si le dossier "Téléchargements" n'existe pas, l'explorateur de fichier s'affichera.">
+
+<!ENTITY asf.options.groupbox2.label "Fenêtre de sauvegarde">
<!ENTITY asf.dialogaccept.bool "Valider automatiquement la fenêtre "Que doit faire Firefox avec ce fichier ?".">
<!ENTITY asf.dialogacceptFiltered.bool "Seulement si un filtre est trouvé">
<!ENTITY asf.dialogacceptFiltered.tooltip "Ne valide pas automatiquement la fenêtre "Que doit faire Firefox avec ce fichier ?" si aucun filtre ne correspond.">
@@ -57,8 +61,13 @@
<!ENTITY asf.viewdloptionType3.label "Masquer si désactivé">
<!ENTITY asf.viewpathselect.bool "Afficher la liste des filtres">
<!ENTITY asf.viewpathselect.tooltip "Active le menu déroulant contenant le chemin de chaque filtre.">
-<!ENTITY asf.usecurrenturl.bool "Utiliser l'adresse du site courant pour comparer le domaine du filtre si le domaine d'hébergement ne correspond pas.">
+
+<!ENTITY asf.options.groupbox3.label "Pendant le filtrage">
<!ENTITY asf.lastdir.bool "Modifier aussi le dossier d'enregistrement utilisé par le menu 'Enregistrer sous... (Ctrl+S)'">
+<!ENTITY asf.usecurrenturl.bool "Utiliser l'adresse du site courant pour comparer le domaine du filtre si le domaine d'hébergement ne correspond pas.">
+<!ENTITY asf.regexp_caseinsensitive.bool "Les filtres sont insensibles à la casse.">
+
+<!ENTITY asf.options.groupbox4.label "Clic droit">
<!ENTITY asf.userightclick.bool "Activer les filtres sur les menus">
<!ENTITY asf.userightclick.tooltip "Active le filtrage sur les menus "Enregistrer la cible du lien sous...", "Enregistrer l'image sous..." et "Enregistrer sous... (Ctrl+S)"">
<!ENTITY asf.rightclicktimeout.bool "Supprimer la temporisation et activer les filtres sur le menu clic-droit "Enregistrer la cible du lien sous...".">
@@ -69,6 +78,20 @@
<!ENTITY asf.rightclick.ff2.label "La fonction clic-droit d'automatic save folder n'est pas compatible avec Firefox 2. Si vous souhaitez utiliser les filtres sur les téléchargements en utilisant le menu clic-droit "Enregistrer la cible du lien sous...", vous devrez utiliser au minimum Firefox version 3.0 (Version 3.5 ou plus conseillée).">
<!ENTITY asf.rightclick.DSort.label "L'extension Download Sort à été détectée. 
La fonction clic-droit d'Automatic Save Folder est temporairement indisponible. Désactivez l'extension Download Sort dans le menu "Outils/Modules complémentaires..." afin de pouvoir utiliser le clic-droit avec Automatic Save Folder.">
+<!ENTITY asf.options.groupbox5.label "Interface graphique">
+<!ENTITY asf.pathlist_defaultforceontop.bool "Dans les menus déroulants, afficher en premier le chemin d'enregistrement par défaut.">
+<!ENTITY asf.pathlist_alphasort.bool "Trier la liste des chemin d'enregistrement par ordre alphabétique.">
+<!ENTITY asf.rowmatchinghighlight.label "Couleur de surbrillance lors de la séléction d'un filtre valide :">
+<!ENTITY asf.rowmatchinghighlight.color "Couleur d'ASF">
+<!ENTITY asf.rowmatchinghighlight.system "Couleur système">
+
+<!ENTITY asf.options.groupbox6.label "DownThemAll!">
+<!ENTITY asf.options.dtaDetected.label "Automatic Save Folder a détecté que vous utilisez l'extension DownThemAll!. Automatic Save Folder peut envoyer le dossier de destination filtré à DownThemAll lorsque vous utilisez la fenêtre de sauvegarde "Que doit faire Firefox avec ce fichier ?". Cette option est désactivée lorsque vous utilisez le mode Navigation Privée.">
+<!ENTITY asf.dta_ASFtoDTA_isActive.bool "Activer l'envoi du dossier filtré par Automatic Save Folder à DownThemAll!.">
+<!ENTITY asf.dta_chooseSendingMethod.label "Choix de la méthode d'envoi pour DTA OneClic!:">
+<!ENTITY asf.dta_methodReplace.label "Remplacer le premier dossier de la liste">
+<!ENTITY asf.dta_methodAdd.label "Ajouter à la liste">
+
<!-- Dynamics tab-->
<!ENTITY asf.dynamics.label "Dossiers dynamiques">
<!ENTITY asf.variablemode.bool "Activer">
diff --git a/locale/it/about.dtd b/locale/it/about.dtd
index 71283bb..b2c9c03 100644
--- a/locale/it/about.dtd
+++ b/locale/it/about.dtd
@@ -1,7 +1,4 @@
-<!-- ASF -->
-<!ENTITY asf.version "1.0.2b Rev75">
-
-<!-- Mini about box from addon manager -->
+<!-- Mini about box from addon manager -->
<!ENTITY about "Informazioni su Automatic Save Folder">
<!ENTITY version "Versione: ">
<!ENTITY createdBy "Creato da:">
@@ -26,7 +23,10 @@
<!ENTITY about.version.title "Versione">
<!-- Keep the newline intact as it uses the < pre > tag, keep the 2 begining spaces to create indentation -->
-<!ENTITY about.version.102 "+ Added an option to force the radio choice to "Save file" when using the automatic download option.
+<!ENTITY about.version.102 "+ Added an option to force the action choice when using the automatic download option.
++ If DownThemAll add-on is installed, a new option's tab is available to send ASF target path to DTA.
++ Added an option to select if the filters are case sensitive or insensitive.
++ New options related to Graphical User Interface.
! Fixed a bug where checking the Regexp option when a filter ended by a slash didn't add a second slash.
! Fixed a bug where no data were returned if a download was initiated from the URL bar or from an external software which resulted in no filters in the filter's list if the preferences window was opened from the saving dialog "+ Add or edit a filter". (Thanks to MrCOLOMBO)
! ASF now uses the full URL instead of the domain when falling back to current website URL if no filter is found, when using single click (Right-click already used full URL).">
diff --git a/locale/it/asf.dtd b/locale/it/asf.dtd
index e7a41b6..f000cb1 100644
--- a/locale/it/asf.dtd
+++ b/locale/it/asf.dtd
@@ -1,7 +1,4 @@
-<!-- ASF -->
-<!ENTITY asf.version "1.0.2b Rev75">
-
-<!-- browser and save dialog-->
+<!-- browser and save dialog-->
<!ENTITY prefwindow.title "Preferenze di Automatic Save Folder">
<!ENTITY asf.label "Automatic Save Folder...">
<!ENTITY asf.addedit.label "Aggiungi o modifica filtro">
@@ -35,11 +32,18 @@
<!-- Options tab -->
<!ENTITY asf.options.label "Opzioni">
+<!ENTITY asf.options.tab1.label "Page 1">
+<!ENTITY asf.options.tab2.label "Page 2">
+<!ENTITY asf.options.tabdta.label "DownThemAll">
+
+<!ENTITY asf.options.groupbox1.label "File Explorer">
<!ENTITY asf.useDownloadDir.bool "Do not show the file explorer, and automatically save to:">
<!ENTITY asf.desktop.label "Desktop">
<!ENTITY asf.systemdownload.label "Downloads">
<!ENTITY asf.filteredfolder.label "Set by the filters">
<!ENTITY asf.folderList.tooltip "If the "Downloads" folder doesn't exist, the file explorer will be shown.">
+
+<!ENTITY asf.options.groupbox2.label "Save dialog">
<!ENTITY asf.dialogaccept.bool "Automatically accept the "What should Firefox do with this file" dialog windows.">
<!ENTITY asf.dialogacceptFiltered.bool "Only if a filter is found">
<!ENTITY asf.dialogacceptFiltered.tooltip "Will not automatically accept the "What should Firefox do with this file" dialog windows if no filter matches.">
@@ -57,8 +61,13 @@
<!ENTITY asf.viewdloptionType3.label "Hide if disabled">
<!ENTITY asf.viewpathselect.bool "Vedi la lista dei filtri">
<!ENTITY asf.viewpathselect.tooltip "Visualizza un menu con la lista di tutti i percorsi dei filtri.">
-<!ENTITY asf.usecurrenturl.bool "Use the current website URL to verify the filter's domain if the hosted domain doesn't match.">
+
+<!ENTITY asf.options.groupbox3.label "Filtering options">
<!ENTITY asf.lastdir.bool "Ha effetto sulla cartella per il comando 'Salva come...' quando un filtro corrisponde">
+<!ENTITY asf.usecurrenturl.bool "Use the current website URL to verify the filter's domain if the hosted domain doesn't match.">
+<!ENTITY asf.regexp_caseinsensitive.bool "Filters are case insensitive.">
+
+<!ENTITY asf.options.groupbox4.label "Right-click">
<!ENTITY asf.userightclick.bool "Use the filters on the menus">
<!ENTITY asf.userightclick.tooltip "Enable the filters on the menus "Save link as...", "Save image as..." and "Save as... (Ctrl+S)"">
<!ENTITY asf.rightclicktimeout.bool "Remove the timing delay and activate the filtering on the right-click menu "Save link as..."">
@@ -69,6 +78,20 @@
<!ENTITY asf.rightclick.ff2.label "The Automatic Save Folder's right-click feature is not available on Firefox 2. If you want to use the filters on your downloads using the right-click menu "Save link as", you should update your Firefox version to 3.0 minimum (recommended version 3.5 or more).">
<!ENTITY asf.rightclick.DSort.label "Download sort extension has been detected. 
Automatic Save Folder's right-click feature will not work until you disable Download Sort in your Extension manager.">
+<!ENTITY asf.options.groupbox5.label "Graphical inerface">
+<!ENTITY asf.pathlist_defaultforceontop.bool "On drop-down menus, shows the default save path first.">
+<!ENTITY asf.pathlist_alphasort.bool "Sort save paths list alphabetically.">
+<!ENTITY asf.rowmatchinghighlight.label "Highlight color when selecting a matching filter:">
+<!ENTITY asf.rowmatchinghighlight.color "ASF color">
+<!ENTITY asf.rowmatchinghighlight.system "System color">
+
+<!ENTITY asf.options.groupbox6.label "DownThemAll!">
+<!ENTITY asf.options.dtaDetected.label "Automatic Save Folder has detected that you are using DownThemAll! add-on. Automatic Save Folder can send the filtered destination path to DownThemAll when using the "What should firefox do with this file" saving window. This option is disabled when using the Private Browsing mode.">
+<!ENTITY asf.dta_ASFtoDTA_isActive.bool "Enable Automatic Save Folder to send the filtered path to DownThemAll.">
+<!ENTITY asf.dta_chooseSendingMethod.label "Choose the sending method for DTA OneClic!:">
+<!ENTITY asf.dta_methodReplace.label "Replace first folder in list">
+<!ENTITY asf.dta_methodAdd.label "Add to list">
+
<!-- Dynamics tab-->
<!ENTITY asf.dynamics.label "Dynamic folders">
<!ENTITY asf.variablemode.bool "Enable">
diff --git a/locale/ru/about.dtd b/locale/ru/about.dtd
index 69e2232..6afb0bc 100644
--- a/locale/ru/about.dtd
+++ b/locale/ru/about.dtd
@@ -1,7 +1,4 @@
-<!-- ASF -->
-<!ENTITY asf.version "1.0.2b Rev75">
-
-<!-- Mini about box from addon manager -->
+<!-- Mini about box from addon manager -->
<!ENTITY about "О Automatic Save Folder">
<!ENTITY version "Версия:">
<!ENTITY createdBy "Создан:">
@@ -26,7 +23,10 @@
<!ENTITY about.version.title "Версия">
<!-- Keep the newline intact as it uses the < pre > tag, keep the 2 begining spaces to create indentation -->
-<!ENTITY about.version.102 "+ Added an option to force the radio choice to "Save file" when using the automatic download option.
+<!ENTITY about.version.102 "+ Added an option to force the action choice when using the automatic download option.
++ If DownThemAll add-on is installed, a new option's tab is available to send ASF target path to DTA.
++ Added an option to select if the filters are case sensitive or insensitive.
++ New options related to Graphical User Interface.
! Fixed a bug where checking the Regexp option when a filter ended by a slash didn't add a second slash.
! Fixed a bug where no data were returned if a download was initiated from the URL bar or from an external software which resulted in no filters in the filter's list if the preferences window was opened from the saving dialog "+ Add or edit a filter". (Thanks to MrCOLOMBO)
! ASF now uses the full URL instead of the domain when falling back to current website URL if no filter is found, when using single click (Right-click already used full URL).">
diff --git a/locale/ru/asf.dtd b/locale/ru/asf.dtd
index 6562402..69ce3d7 100644
--- a/locale/ru/asf.dtd
+++ b/locale/ru/asf.dtd
@@ -1,7 +1,4 @@
-<!-- ASF -->
-<!ENTITY asf.version "1.0.2b Rev75">
-
-<!-- browser and save dialog-->
+<!-- browser and save dialog-->
<!ENTITY prefwindow.title "Настройки Automatic Save Folder">
<!ENTITY asf.label "Automatic Save Folder...">
<!ENTITY asf.addedit.label "Добавить или изменить фильтр">
@@ -35,11 +32,18 @@
<!-- Options tab -->
<!ENTITY asf.options.label "Опции">
+<!ENTITY asf.options.tab1.label "Page 1">
+<!ENTITY asf.options.tab2.label "Page 2">
+<!ENTITY asf.options.tabdta.label "DownThemAll">
+
+<!ENTITY asf.options.groupbox1.label "File Explorer">
<!ENTITY asf.useDownloadDir.bool "Не предлагать выбор папки и автоматически сохранить в:">
<!ENTITY asf.desktop.label "Рабочий стол">
<!ENTITY asf.systemdownload.label "Загрузки">
<!ENTITY asf.filteredfolder.label "Использовать фильтры">
<!ENTITY asf.folderList.tooltip "Если папка "Загрузки" не существует, будет предложено выбрать папку.">
+
+<!ENTITY asf.options.groupbox2.label "Save dialog">
<!ENTITY asf.dialogaccept.bool "Автоматически использовать настройку "Как FireFox следует обработать это файл".">
<!ENTITY asf.dialogacceptFiltered.bool "Только если найден фильтр">
<!ENTITY asf.dialogacceptFiltered.tooltip "Не будет автоматически использовать настройку "Как FireFox следует обработать это файл" если не найдено подходящего фильтра.">
@@ -57,8 +61,13 @@
<!ENTITY asf.viewdloptionType3.label "Скрыть если отключено">
<!ENTITY asf.viewpathselect.bool "Показывать список папок">
<!ENTITY asf.viewpathselect.tooltip "Активировать меню перетаскивания мышкой для всех папок фильтров.">
-<!ENTITY asf.usecurrenturl.bool "Использовать пусть из строки адреса если не найден фильтр для домена загружаемого файла.">
+
+<!ENTITY asf.options.groupbox3.label "Filtering options">
<!ENTITY asf.lastdir.bool "Изменять папку для команды 'сохранить как...' когда есть подходящий фильтр">
+<!ENTITY asf.usecurrenturl.bool "Использовать пусть из строки адреса если не найден фильтр для домена загружаемого файла.">
+<!ENTITY asf.regexp_caseinsensitive.bool "Filters are case insensitive.">
+
+<!ENTITY asf.options.groupbox4.label "Right-click">
<!ENTITY asf.userightclick.bool "Использовать фильтры в меню">
<!ENTITY asf.userightclick.tooltip "Использовать фильтры для меню "Сохранить ссылку как...", "Сохранить картинку как..." и "Сохранить как... (Ctrl+S)"">
<!ENTITY asf.rightclicktimeout.bool "Убрать задержку по времени и активировать фильтры для меню правой кнопки мыши "Сохранить ссылку как..."">
@@ -69,6 +78,20 @@
<!ENTITY asf.rightclick.ff2.label "Меню Automatic Save Folder по правой кнопке мыши не доступно для Firefox 2. Если вы хотите иметь возможность использовать фильтры для меню правой кнопки мыши "Сохранить ссылку как...", вы должны обновить Firefox до версии 3.0 (рекомендуемая версия 3.5 или выше).">
<!ENTITY asf.rightclick.DSort.label "Обнаружено дополнение 'Download sort'. Меню Automatic Save Folder по правой кнопке мыши не будет доступно пока вы не отключите 'Download Sort' в списке дополнений.">
+<!ENTITY asf.options.groupbox5.label "Graphical inerface">
+<!ENTITY asf.pathlist_defaultforceontop.bool "On drop-down menus, shows the default save path first.">
+<!ENTITY asf.pathlist_alphasort.bool "Sort save paths list alphabetically.">
+<!ENTITY asf.rowmatchinghighlight.label "Highlight color when selecting a matching filter:">
+<!ENTITY asf.rowmatchinghighlight.color "ASF color">
+<!ENTITY asf.rowmatchinghighlight.system "System color">
+
+<!ENTITY asf.options.groupbox6.label "DownThemAll!">
+<!ENTITY asf.options.dtaDetected.label "Automatic Save Folder has detected that you are using DownThemAll! add-on. Automatic Save Folder can send the filtered destination path to DownThemAll when using the "What should firefox do with this file" saving window. This option is disabled when using the Private Browsing mode.">
+<!ENTITY asf.dta_ASFtoDTA_isActive.bool "Enable Automatic Save Folder to send the filtered path to DownThemAll.">
+<!ENTITY asf.dta_chooseSendingMethod.label "Choose the sending method for DTA OneClic!:">
+<!ENTITY asf.dta_methodReplace.label "Replace first folder in list">
+<!ENTITY asf.dta_methodAdd.label "Add to list">
+
<!-- Dynamics tab-->
<!ENTITY asf.dynamics.label "Динамические папки">
<!ENTITY asf.variablemode.bool "Включить">
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/automatic-save-folder.git
More information about the Pkg-mozext-commits
mailing list