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

Side by Side Diff: chrome/content/ui/filters.xul

Issue 8559070: Integrated URL Fixer into Adblock Plus (Closed)
Patch Set: Changes to opt-in notification text Created Oct. 19, 2012, 3:14 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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 32
32 <keyset id="filtersKeyset"> 33 <keyset id="filtersKeyset">
33 <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"/>
34 <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"/>
35 <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();"/>
36 <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();"/>
37 <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"/>
38 <key id="moveUp-key" keycode="VK_UP" modifiers="accel"/> 39 <key id="moveUp-key" keycode="VK_UP" modifiers="accel"/>
39 <key id="moveDown-key" keycode="VK_DOWN" modifiers="accel"/> 40 <key id="moveDown-key" keycode="VK_DOWN" modifiers="accel"/>
40 <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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 125
125 <description id="tooltip-additional"/> 126 <description id="tooltip-additional"/>
126 </tooltip> 127 </tooltip>
127 </popupset> 128 </popupset>
128 129
129 <hbox id="content" flex="1"> 130 <hbox id="content" flex="1">
130 <tabbox id="tabs" flex="1" persist="selectedIndex"> 131 <tabbox id="tabs" flex="1" persist="selectedIndex">
131 <tabs onselect="onTabChange(this.parentNode);"> 132 <tabs onselect="onTabChange(this.parentNode);">
132 <tab label="&subscriptions.tab.label;"/> 133 <tab label="&subscriptions.tab.label;"/>
133 <tab label="&filters.tab.label;"/> 134 <tab label="&filters.tab.label;"/>
135 <tab label="&typoCorrections.tab.label;"/>
134 </tabs> 136 </tabs>
135 <tabpanels flex="1"> 137 <tabpanels flex="1">
136 <tabpanel id="subscriptionsTab" orient="vertical" flex="1"> 138 <tabpanel id="subscriptionsTab" orient="vertical" flex="1">
137 <hbox pack="end"> 139 <hbox pack="end">
138 <button id="selectSubscriptionButton" label="&addSubscription.label;…" accesskey="&addSubscription.accesskey;" command="subscription-add-command"/> 140 <button id="selectSubscriptionButton" label="&addSubscription.label;…" accesskey="&addSubscription.accesskey;" command="subscription-add-command"/>
139 </hbox> 141 </hbox>
140 142
141 <panel id="selectSubscriptionPanel" type="arrow" position="bottomcenter topleft" 143 <panel id="selectSubscriptionPanel" type="arrow" position="bottomcenter topleft"
142 orient="vertical" onkeypress="SelectSubscription.keyPress(event); "> 144 orient="vertical" onkeypress="SelectSubscription.keyPress(event); ">
143 <menuitem id="selectSubscriptionTemplate" hidden="true" 145 <menuitem id="selectSubscriptionTemplate" hidden="true"
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 <deck id="noFiltersDeck" flex="1"> 298 <deck id="noFiltersDeck" flex="1">
297 <description flex="1">&noFilters.text;</description> 299 <description flex="1">&noFilters.text;</description>
298 <richlistbox id="groups" class="initialFocus" flex="1" 300 <richlistbox id="groups" class="initialFocus" flex="1"
299 onselect="onSelectionChange(this);" 301 onselect="onSelectionChange(this);"
300 ondragover="SubscriptionActions.dragOver(event);" 302 ondragover="SubscriptionActions.dragOver(event);"
301 ondrop="SubscriptionActions.drop(event, null);" 303 ondrop="SubscriptionActions.drop(event, null);"
302 onkeypress="SubscriptionActions.keyPress(event);"> 304 onkeypress="SubscriptionActions.keyPress(event);">
303 </richlistbox> 305 </richlistbox>
304 </deck> 306 </deck>
305 </tabpanel> 307 </tabpanel>
308 <tabpanel id="typoCorrectionsTab" orient="vertical" flex="1">
309 <checkbox id="typo_enable" label="&typoCorrections.enableLabel;" oncomma nd="TypoActions.toggleEnable(this.checked)"/>
Wladimir Palant 2012/11/06 15:48:03 This isn't a "toggle" action if you pass in the va
310 <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;">
312 <listhead>
313 <listheader label="&typoCorrections.whitelistLabel;"/>
314 </listhead>
315 <listcols>
316 <listcol flex="1" />
317 </listcols>
318 </listbox>
319 <hbox>
320 <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. Ple
321 </hbox>
322 </groupbox>
323 </tabpanel>
306 </tabpanels> 324 </tabpanels>
307 </tabbox> 325 </tabbox>
308 326
309 <splitter id="filtersSplitter" persist="state" orient="horizontal" collapse="a fter" state="collapsed" oncommand="FilterView.refresh();onSplitterStateChange(th is);"> 327 <splitter id="filtersSplitter" persist="state" orient="horizontal" collapse="a fter" state="collapsed" oncommand="FilterView.refresh();onSplitterStateChange(th is);">
310 <grippy id="filtersGrippy"/> 328 <grippy id="filtersGrippy"/>
311 </splitter> 329 </splitter>
312 330
313 <vbox id="filtersContainer" persist="width height" width="500"> 331 <vbox id="filtersContainer" persist="width height" width="500">
314 <hbox pack="end"> 332 <hbox pack="end">
315 <button id="findButton" label="&find.label;" accesskey="&find.accesskey;" command="find-command"/> 333 <button id="findButton" label="&find.label;" accesskey="&find.accesskey;" command="find-command"/>
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 <menuitem id="restoreOwnBackup" key="restore-key" label="&restore.own.labe l;…" oncommand="Backup.restoreFromFile();"/> 398 <menuitem id="restoreOwnBackup" key="restore-key" label="&restore.own.labe l;…" oncommand="Backup.restoreFromFile();"/>
381 </menupopup> 399 </menupopup>
382 </button> 400 </button>
383 401
384 <spacer flex="1"/> 402 <spacer flex="1"/>
385 403
386 <button id="close" dlgtype="accept" label="&close.label;"/> 404 <button id="close" dlgtype="accept" label="&close.label;"/>
387 </hbox> 405 </hbox>
388 406
389 </dialog> 407 </dialog>
OLDNEW

Powered by Google App Engine
This is Rietveld