Integrated URL Fixer into Adblock Plus

chrome/content/ui/filters.xul

 <?xml version="1.0"?>
 
 <!-- This Source Code is subject to the terms of the Mozilla Public License
    - version 2.0 (the "License"). You can obtain a copy of the License at
    - http://mozilla.org/MPL/2.0/. -->
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://adblockplus/skin/filters.css" type="text/css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://adblockplus/locale/filters.dtd">
@@ skipping 10 matching lines @@
   windowtype="abp:filters">
 
 <script type="application/x-javascript;version=1.7" src="utils.js"/>
 <script type="application/x-javascript;version=1.7" src="filters.js"/>
 <script type="application/x-javascript;version=1.7" src="filters-subscriptionview.js"/>
 <script type="application/x-javascript;version=1.7" src="filters-subscriptionactions.js"/>
 <script type="application/x-javascript;version=1.7" src="filters-filterview.js"/>
 <script type="application/x-javascript;version=1.7" src="filters-filteractions.js"/>
 <script type="application/x-javascript;version=1.7" src="filters-backup.js"/>
 <script type="application/x-javascript;version=1.7" src="filters-search.js"/>
-<script type="application/x-javascript;version=1.7" src="typo.js"/>
+<script type="application/x-javascript;version=1.7" src="typoSettings.js"/>
 
 <keyset id="filtersKeyset">
   <key id="subscription-update-key" key="T" modifiers="accel" command="subscription-update-command"/>
   <key id="subscription-update-all-key" key="T" modifiers="accel,shift" command="subscription-update-all-command"/>
   <key id="edit-key" keycode="VK_F2" oncommand="E(FilterActions.focused ? 'filters-edit-command' : 'subscription-editTitle-command').doCommand();"/>
   <key id="delete-key" keycode="VK_DELETE" oncommand="E(FilterActions.focused ? 'filters-delete-command' : 'subscription-delete-command').doCommand();"/>
   <key id="subscription-showHideFilters-key" key="R" modifiers="accel" command="subscription-showHideFilters-command"/>
   <key id="moveUp-key" keycode="VK_UP" modifiers="accel"/>
   <key id="moveDown-key" keycode="VK_DOWN" modifiers="accel"/>
   <key id="filters-add-key" keycode="VK_INSERT" oncommand="E('filters-add-command').doCommand();"/>
@@ skipping 127 matching lines @@
             oncontextmenu="SubscriptionActions.openMenu(event, this);">
           <vbox class="{subscription.disabled ? 'disabled' : ''}">
             <hbox align="center">
               <checkbox label="&subscription.enabled.label;" class="enabledCheckbox tabable" tabindex="-1"
                 checked="{subscription.disabled ? 'false' : 'true'}" oncommand="SubscriptionActions.setDisabled(this, !this.checked);"/>
 
               <vbox flex="1">
                 <hbox align="center">
                   <deck class="titleBox" flex="1" selectedIndex="0" onselect="event.stopPropagation();">
                     <description ondblclick="if (event.button == 0) TitleEditor.start(this, true);">
-                      <description>
-                        <description class="title" value="{subscription.title}" flex="1" crop="end"/>
-                        (<if condition="{isExternal}">
-                          <description value="&subscription.external.label;"/>
-                        <else/>
-                          <if condition="{subscription.homepage}">
-                            <description class="link" value="&subscription.homepage.label;"
-                              _url="{subscription.homepage}" tooltiptext="{subscription.homepage}"
-                              onclick="if (event.button == 0) { event.stopPropagation();UI.loadInBrowser(this.getAttribute('_url')); }"/>,&#160;
-                          </if>
-                          <description class="link" value="&subscription.source.label;"
-                            _url="{subscription.url}" tooltiptext="{subscription.url}"
-                            onclick="if (event.button == 0) { event.stopPropagation();UI.loadInBrowser(this.getAttribute('_url')); }"/>
-                        </if>)
-                      </description>
+                      <description class="title" value="{subscription.title}" flex="1" crop="end"/>
+                      (<if condition="{isExternal}">
+                        <description value="&subscription.external.label;"/>
+                      <else/>
+                        <if condition="{subscription.homepage}">
+                          <description class="link" value="&subscription.homepage.label;"
+                            _url="{subscription.homepage}" tooltiptext="{subscription.homepage}"
+                            onclick="if (event.button == 0) { event.stopPropagation();UI.loadInBrowser(this.getAttribute('_url')); }"/>,&#160;
+                        </if>
+                        <description class="link" value="&subscription.source.label;"
+                          _url="{subscription.url}" tooltiptext="{subscription.url}"
+                          onclick="if (event.button == 0) { event.stopPropagation();UI.loadInBrowser(this.getAttribute('_url')); }"/>
+                      </if>)
                     </description>
                     <textbox oncontextmenu="event.stopPropagation();" class="titleEditor" onkeypress="TitleEditor.keyPress(event);" onblur="TitleEditor.end(true);"/>
                   </deck>
                 </hbox>
                 <hbox align="center">
                   <description flex="1" class="status">
                     <description value="&subscription.lastDownload.label;"/>&#160;
                     <if condition="{downloading}">
                       <description value="&subscription.lastDownload.inProgress;"/>
                     <elif condition="{!subscription.lastDownload}"/>
@@ skipping 95 matching lines @@
           <description flex="1">&noFilters.text;</description>
           <richlistbox id="groups" class="initialFocus" flex="1"
               onselect="onSelectionChange(this);"
               ondragover="SubscriptionActions.dragOver(event);"
               ondrop="SubscriptionActions.drop(event, null);"
               onkeypress="SubscriptionActions.keyPress(event);">
           </richlistbox>
         </deck>
       </tabpanel>
       <tabpanel id="typoCorrectionsTab" orient="vertical" flex="1">
-        <checkbox id="typo_enable" label="&typoCorrections.enableLabel;" oncommand="TypoActions.toggleEnable(this.checked)"/>

[Wladimir Palant, 2012/11/06 15:48:03]

This isn't a "toggle" action if you pass in the value explicitly ;)
How about TypoActions.setEnabled()?

+        <checkbox id="typo_enable" label="&typoCorrections.enableLabel;" oncommand="TypoActions.setEnabled(this.checked)"/>
         <groupbox id="typo_whitelist_container" flex="1">
           <listbox id="typo_whitelist" class="initialFocus" flex="1" seltype="multiple" onselect="TypoActions.onItemSelected(this);" _removeButton="typo_whitelist_remove-button" _emptyLabel="&typoCorrections.whitelistEmptyLabel;">
             <listhead>
               <listheader label="&typoCorrections.whitelistLabel;"/>
             </listhead>
             <listcols>
               <listcol flex="1" />
             </listcols>
           </listbox>
-          <hbox>
-            <button flex="1" label="&typoCorrections.removeButtonLabel;" onclick="TypoActions.removeRule(this,'whitelist');" disabled="true" id="typo_whitelist_remove-button" _list="typo_whitelist" />

[Wladimir Palant, 2012/11/06 15:48:03]

There should be a space after the comma here.

Please use <hbox pack="right"> and remove the flex attribute - this will
position the button on the right side which is more in line with how the Adblock
Plus preferences look like.

+          <hbox align="right">
+            <button label="&typoCorrections.removeButtonLabel;" onclick="TypoActions.removeRule(this, 'whitelist');" disabled="true" id="typo_whitelist_remove-button" _list="typo_whitelist" />
           </hbox>
         </groupbox>
       </tabpanel>
     </tabpanels>
   </tabbox>
 
   <splitter id="filtersSplitter" persist="state" orient="horizontal" collapse="after" state="collapsed" oncommand="FilterView.refresh();onSplitterStateChange(this);">
     <grippy id="filtersGrippy"/>
   </splitter>
 
@@ skipping 67 matching lines @@
       <menuitem id="restoreOwnBackup" key="restore-key" label="&restore.own.label;…" oncommand="Backup.restoreFromFile();"/>
     </menupopup>
   </button>
 
   <spacer flex="1"/>
 
   <button id="close" dlgtype="accept" label="&close.label;"/>
 </hbox>
 
 </dialog>