Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: chrome/content/ui/filters.xul

Issue 8559070: Integrated URL Fixer into Adblock Plus (Closed)
Left Patch Set: Added ability to opt-in and opt-out Created Oct. 19, 2012, 9:14 a.m.
Right Patch Set: Created Nov. 9, 2012, 3:21 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « chrome/content/ui/filters.js ('k') | chrome/content/ui/typoSettings.js » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 <?xml version="1.0"?> 1 <?xml version="1.0"?>
2 2
3 <!-- This Source Code is subject to the terms of the Mozilla Public License 3 <!-- This Source Code is subject to the terms of the Mozilla Public License
4 - version 2.0 (the "License"). You can obtain a copy of the License at 4 - version 2.0 (the "License"). You can obtain a copy of the License at
5 - http://mozilla.org/MPL/2.0/. --> 5 - http://mozilla.org/MPL/2.0/. -->
6 6
7 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 7 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
8 <?xml-stylesheet href="chrome://adblockplus/skin/filters.css" type="text/css"?> 8 <?xml-stylesheet href="chrome://adblockplus/skin/filters.css" type="text/css"?>
9 9
10 <!DOCTYPE dialog SYSTEM "chrome://adblockplus/locale/filters.dtd"> 10 <!DOCTYPE dialog SYSTEM "chrome://adblockplus/locale/filters.dtd">
(...skipping 10 matching lines...) Expand all
21 windowtype="abp:filters"> 21 windowtype="abp:filters">
22 22
23 <script type="application/x-javascript;version=1.7" src="utils.js"/> 23 <script type="application/x-javascript;version=1.7" src="utils.js"/>
24 <script type="application/x-javascript;version=1.7" src="filters.js"/> 24 <script type="application/x-javascript;version=1.7" src="filters.js"/>
25 <script type="application/x-javascript;version=1.7" src="filters-subscriptionvie w.js"/> 25 <script type="application/x-javascript;version=1.7" src="filters-subscriptionvie w.js"/>
26 <script type="application/x-javascript;version=1.7" src="filters-subscriptionact ions.js"/> 26 <script type="application/x-javascript;version=1.7" src="filters-subscriptionact ions.js"/>
27 <script type="application/x-javascript;version=1.7" src="filters-filterview.js"/ > 27 <script type="application/x-javascript;version=1.7" src="filters-filterview.js"/ >
28 <script type="application/x-javascript;version=1.7" src="filters-filteractions.j s"/> 28 <script type="application/x-javascript;version=1.7" src="filters-filteractions.j s"/>
29 <script type="application/x-javascript;version=1.7" src="filters-backup.js"/> 29 <script type="application/x-javascript;version=1.7" src="filters-backup.js"/>
30 <script type="application/x-javascript;version=1.7" src="filters-search.js"/> 30 <script type="application/x-javascript;version=1.7" src="filters-search.js"/>
31 <script type="application/x-javascript;version=1.7" src="typo.js"/> 31 <script type="application/x-javascript;version=1.7" src="typoSettings.js"/>
32 32
33 <keyset id="filtersKeyset"> 33 <keyset id="filtersKeyset">
34 <key id="subscription-update-key" key="T" modifiers="accel" command="subscript ion-update-command"/> 34 <key id="subscription-update-key" key="T" modifiers="accel" command="subscript ion-update-command"/>
35 <key id="subscription-update-all-key" key="T" modifiers="accel,shift" command= "subscription-update-all-command"/> 35 <key id="subscription-update-all-key" key="T" modifiers="accel,shift" command= "subscription-update-all-command"/>
36 <key id="edit-key" keycode="VK_F2" oncommand="E(FilterActions.focused ? 'filte rs-edit-command' : 'subscription-editTitle-command').doCommand();"/> 36 <key id="edit-key" keycode="VK_F2" oncommand="E(FilterActions.focused ? 'filte rs-edit-command' : 'subscription-editTitle-command').doCommand();"/>
37 <key id="delete-key" keycode="VK_DELETE" oncommand="E(FilterActions.focused ? 'filters-delete-command' : 'subscription-delete-command').doCommand();"/> 37 <key id="delete-key" keycode="VK_DELETE" oncommand="E(FilterActions.focused ? 'filters-delete-command' : 'subscription-delete-command').doCommand();"/>
38 <key id="subscription-showHideFilters-key" key="R" modifiers="accel" command=" subscription-showHideFilters-command"/> 38 <key id="subscription-showHideFilters-key" key="R" modifiers="accel" command=" subscription-showHideFilters-command"/>
39 <key id="moveUp-key" keycode="VK_UP" modifiers="accel"/> 39 <key id="moveUp-key" keycode="VK_UP" modifiers="accel"/>
40 <key id="moveDown-key" keycode="VK_DOWN" modifiers="accel"/> 40 <key id="moveDown-key" keycode="VK_DOWN" modifiers="accel"/>
41 <key id="filters-add-key" keycode="VK_INSERT" oncommand="E('filters-add-comman d').doCommand();"/> 41 <key id="filters-add-key" keycode="VK_INSERT" oncommand="E('filters-add-comman d').doCommand();"/>
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 oncontextmenu="SubscriptionActions.openMenu(event, this);"> 169 oncontextmenu="SubscriptionActions.openMenu(event, this);">
170 <vbox class="{subscription.disabled ? 'disabled' : ''}"> 170 <vbox class="{subscription.disabled ? 'disabled' : ''}">
171 <hbox align="center"> 171 <hbox align="center">
172 <checkbox label="&subscription.enabled.label;" class="enabledCheck box tabable" tabindex="-1" 172 <checkbox label="&subscription.enabled.label;" class="enabledCheck box tabable" tabindex="-1"
173 checked="{subscription.disabled ? 'false' : 'true'}" oncommand=" SubscriptionActions.setDisabled(this, !this.checked);"/> 173 checked="{subscription.disabled ? 'false' : 'true'}" oncommand=" SubscriptionActions.setDisabled(this, !this.checked);"/>
174 174
175 <vbox flex="1"> 175 <vbox flex="1">
176 <hbox align="center"> 176 <hbox align="center">
177 <deck class="titleBox" flex="1" selectedIndex="0" onselect="ev ent.stopPropagation();"> 177 <deck class="titleBox" flex="1" selectedIndex="0" onselect="ev ent.stopPropagation();">
178 <description ondblclick="if (event.button == 0) TitleEditor. start(this, true);"> 178 <description ondblclick="if (event.button == 0) TitleEditor. start(this, true);">
179 <description> 179 <description class="title" value="{subscription.title}" fl ex="1" crop="end"/>
180 <description class="title" value="{subscription.title}" flex="1" crop="end"/> 180 (<if condition="{isExternal}">
181 (<if condition="{isExternal}"> 181 <description value="&subscription.external.label;"/>
182 <description value="&subscription.external.label;"/> 182 <else/>
183 <else/> 183 <if condition="{subscription.homepage}">
184 <if condition="{subscription.homepage}"> 184 <description class="link" value="&subscription.homepag e.label;"
185 <description class="link" value="&subscription.homep age.label;" 185 _url="{subscription.homepage}" tooltiptext="{subscri ption.homepage}"
186 _url="{subscription.homepage}" tooltiptext="{subsc ription.homepage}" 186 onclick="if (event.button == 0) { event.stopPropagat ion();UI.loadInBrowser(this.getAttribute('_url')); }"/>,&#160;
187 onclick="if (event.button == 0) { event.stopPropag ation();UI.loadInBrowser(this.getAttribute('_url')); }"/>,&#160; 187 </if>
188 </if> 188 <description class="link" value="&subscription.source.la bel;"
189 <description class="link" value="&subscription.source. label;" 189 _url="{subscription.url}" tooltiptext="{subscription.u rl}"
190 _url="{subscription.url}" tooltiptext="{subscription .url}" 190 onclick="if (event.button == 0) { event.stopPropagatio n();UI.loadInBrowser(this.getAttribute('_url')); }"/>
191 onclick="if (event.button == 0) { event.stopPropagat ion();UI.loadInBrowser(this.getAttribute('_url')); }"/> 191 </if>)
192 </if>)
193 </description>
194 </description> 192 </description>
195 <textbox oncontextmenu="event.stopPropagation();" class="tit leEditor" onkeypress="TitleEditor.keyPress(event);" onblur="TitleEditor.end(true );"/> 193 <textbox oncontextmenu="event.stopPropagation();" class="tit leEditor" onkeypress="TitleEditor.keyPress(event);" onblur="TitleEditor.end(true );"/>
196 </deck> 194 </deck>
197 </hbox> 195 </hbox>
198 <hbox align="center"> 196 <hbox align="center">
199 <description flex="1" class="status"> 197 <description flex="1" class="status">
200 <description value="&subscription.lastDownload.label;"/>&#16 0; 198 <description value="&subscription.lastDownload.label;"/>&#16 0;
201 <if condition="{downloading}"> 199 <if condition="{downloading}">
202 <description value="&subscription.lastDownload.inProgress; "/> 200 <description value="&subscription.lastDownload.inProgress; "/>
203 <elif condition="{!subscription.lastDownload}"/> 201 <elif condition="{!subscription.lastDownload}"/>
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 <description flex="1">&noFilters.text;</description> 297 <description flex="1">&noFilters.text;</description>
300 <richlistbox id="groups" class="initialFocus" flex="1" 298 <richlistbox id="groups" class="initialFocus" flex="1"
301 onselect="onSelectionChange(this);" 299 onselect="onSelectionChange(this);"
302 ondragover="SubscriptionActions.dragOver(event);" 300 ondragover="SubscriptionActions.dragOver(event);"
303 ondrop="SubscriptionActions.drop(event, null);" 301 ondrop="SubscriptionActions.drop(event, null);"
304 onkeypress="SubscriptionActions.keyPress(event);"> 302 onkeypress="SubscriptionActions.keyPress(event);">
305 </richlistbox> 303 </richlistbox>
306 </deck> 304 </deck>
307 </tabpanel> 305 </tabpanel>
308 <tabpanel id="typoCorrectionsTab" orient="vertical" flex="1"> 306 <tabpanel id="typoCorrectionsTab" orient="vertical" flex="1">
309 <checkbox id="typo_enable" label="&typoCorrections.enableLabel;" oncomma nd="TypoActions.toggleEnable(this.checked)"/> 307 <checkbox id="typo_enable" label="&typoCorrections.enableLabel;" oncomma nd="TypoActions.setEnabled(this.checked)"/>
310 <groupbox id="typo_whitelist_container" flex="1"> 308 <groupbox id="typo_whitelist_container" flex="1">
311 <listbox id="typo_whitelist" class="initialFocus" flex="1" seltype="mu ltiple" onselect="TypoActions.onItemSelected(this);" _removeButton="typo_whiteli st_remove-button" _emptyLabel="&typoCorrections.whitelistEmptyLabel;"> 309 <listbox id="typo_whitelist" class="initialFocus" flex="1" seltype="mu ltiple" onselect="TypoActions.onItemSelected(this);" _removeButton="typo_whiteli st_remove-button" _emptyLabel="&typoCorrections.whitelistEmptyLabel;">
312 <listhead> 310 <listhead>
313 <listheader label="&typoCorrections.whitelistLabel;"/> 311 <listheader label="&typoCorrections.whitelistLabel;"/>
314 </listhead> 312 </listhead>
315 <listcols> 313 <listcols>
316 <listcol flex="1" /> 314 <listcol flex="1" />
317 </listcols> 315 </listcols>
318 </listbox> 316 </listbox>
319 <hbox> 317 <hbox align="right">
320 <button flex="1" label="&typoCorrections.removeButtonLabel;" onclick ="TypoActions.removeRule(this,'whitelist');" disabled="true" id="typo_whitelist_ remove-button" _list="typo_whitelist" /> 318 <button label="&typoCorrections.removeButtonLabel;" onclick="TypoAct ions.removeRule(this, 'whitelist');" disabled="true" id="typo_whitelist_remove-b utton" _list="typo_whitelist" />
321 </hbox> 319 </hbox>
322 </groupbox> 320 </groupbox>
323 </tabpanel> 321 </tabpanel>
324 </tabpanels> 322 </tabpanels>
325 </tabbox> 323 </tabbox>
326 324
327 <splitter id="filtersSplitter" persist="state" orient="horizontal" collapse="a fter" state="collapsed" oncommand="FilterView.refresh();onSplitterStateChange(th is);"> 325 <splitter id="filtersSplitter" persist="state" orient="horizontal" collapse="a fter" state="collapsed" oncommand="FilterView.refresh();onSplitterStateChange(th is);">
328 <grippy id="filtersGrippy"/> 326 <grippy id="filtersGrippy"/>
329 </splitter> 327 </splitter>
330 328
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 <menuitem id="restoreOwnBackup" key="restore-key" label="&restore.own.labe l;…" oncommand="Backup.restoreFromFile();"/> 396 <menuitem id="restoreOwnBackup" key="restore-key" label="&restore.own.labe l;…" oncommand="Backup.restoreFromFile();"/>
399 </menupopup> 397 </menupopup>
400 </button> 398 </button>
401 399
402 <spacer flex="1"/> 400 <spacer flex="1"/>
403 401
404 <button id="close" dlgtype="accept" label="&close.label;"/> 402 <button id="close" dlgtype="accept" label="&close.label;"/>
405 </hbox> 403 </hbox>
406 404
407 </dialog> 405 </dialog>
LEFTRIGHT

Powered by Google App Engine
This is Rietveld