← Back to branch summary

~ubuntu-branches/ubuntu/maverick/adblock-plus/maverick-updates

« back to all changes in this revision

Viewing changes to chrome/content/ui/settings.xul

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2010-05-04 14:45:07 UTC
  • mto: This revision was merged to the branch mainline in revision 19.
  • Revision ID: james.westby@ubuntu.com-20100504144507-3419mba2341luamh
Tags: upstream-1.2
Import upstream version 1.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
chrome/content/ui/settings.xul
17
17
   -
18
18
   - The Initial Developer of the Original Code is
19
19
   - Wladimir Palant.
20
 
   - Portions created by the Initial Developer are Copyright (C) 2006-2009
 
20
   - Portions created by the Initial Developer are Copyright (C) 2006-2010
21
21
   - the Initial Developer. All Rights Reserved.
22
22
   -
23
23
   - Contributor(s):
45
45
  ondialogaccept="applyChanges(); return true;"
46
46
  ondialogextra2="treeView.startEditor(true)"
47
47
  buttons="accept,cancel,extra2"
48
 
  buttonlabelextra2="&add.label;..."
 
48
  buttonlabelextra2="&add.label;…"
49
49
  buttonaccesskeyextra2="&add.accesskey;"
50
50
  width="600"
51
51
  height="450"
97
97
<popupset id="abpPopups">
98
98
  <popup id="listitem-context" onpopupshowing="return fillContext()">
99
99
    <menuitem id="context-synchsubscription" label="&context.synchsubscription.label;" oncommand="synchSubscription(event.shiftKey)" key="synchsubscription-key" />
100
 
    <menuitem id="context-editsubscription" label="&context.editsubscription.label;..." oncommand="editFilter('subscription')" key="edit-key"/>
 
100
    <menuitem id="context-editsubscription" label="&context.editsubscription.label;…" oncommand="editFilter('subscription')" key="edit-key"/>
101
101
    <menuitem id="context-edit" label="&context.edit.label;" oncommand="editFilter('filter')" key="edit-key"/>
102
 
    <menuitem id="context-resethitcount" label="&context.resethitcount.label;..." oncommand="resetHitCounts(false)"/>
 
102
    <menuitem id="context-resethitcount" label="&context.resethitcount.label;…" oncommand="resetHitCounts(false)"/>
103
103
    <menuitem id="context-moveup" label="&context.moveup.label;" oncommand="treeView.moveFilter(true)" key="moveup-key"/>
104
104
    <menuitem id="context-movedown" label="&context.movedown.label;" oncommand="treeView.moveFilter(false)" key="movedown-key"/>
105
105
    <menuseparator/>
121
121
  <menubar id="menu" onpopupshowing="treeView.stopEditor(true, true);">
122
122
    <menu id="filters-menu" label="&filters.label;" accesskey="&filters.accesskey;">
123
123
      <menupopup id="filters-popup" onpopupshowing="fillFiltersPopup()">
124
 
        <menuitem id="addfilter" label="&add.label;..." accesskey="&add.accesskey;" key="addfilter-key" oncommand="treeView.startEditor(true)"/>
 
124
        <menuitem id="addfilter" label="&add.label;…" accesskey="&add.accesskey;" key="addfilter-key" oncommand="treeView.startEditor(true)"/>
125
125
        <menuseparator/>
126
 
        <menuitem id="addsubscription" label="&addsubscription.label;..." accesskey="&addsubscription.accesskey;" command="addsubscription-command"/>
 
126
        <menuitem id="addsubscription" label="&addsubscription.label;…" accesskey="&addsubscription.accesskey;" command="addsubscription-command"/>
127
127
        <menuitem id="synchsubscriptions" label="&synchsubscriptions.label;" accesskey="&synchsubscriptions.accesskey;" key="synchsubscriptions-key" command="synchsubscriptions-command"/>
128
128
        <menuseparator/>
129
 
        <menuitem id="import" label="&import.label;..." accesskey="&import.accesskey;" key="import-key" command="import-command"/>
130
 
        <menuitem id="export" label="&export.label;..." accesskey="&export.accesskey;" key="export-key" command="export-command"/>
131
 
        <menuitem id="clearall" label="&clearall.label;..." accesskey="&clearall.accesskey;" oncommand="clearList()"/>
 
129
        <menuitem id="import" label="&import.label;…" accesskey="&import.accesskey;" key="import-key" command="import-command"/>
 
130
        <menuitem id="export" label="&export.label;…" accesskey="&export.accesskey;" key="export-key" command="export-command"/>
 
131
        <menuitem id="clearall" label="&clearall.label;…" accesskey="&clearall.accesskey;" oncommand="clearList()"/>
132
132
        <menuseparator/>
133
 
        <menuitem id="resethitcounts" label="&resethitcounts.label;..." accesskey="&resethitcounts.accesskey;" oncommand="resetHitCounts(true)"/>
 
133
        <menuitem id="resethitcounts" label="&resethitcounts.label;…" accesskey="&resethitcounts.accesskey;" oncommand="resetHitCounts(true)"/>
134
134
      </menupopup>
135
135
    </menu>
136
136
    <menu id="edit-menu" label="&edit.label;" accesskey="&edit.accesskey;">
137
 
      <menupopup id="edit-popup" onpopupshowing="fillContext()">
 
137
      <menupopup id="edit-popup">
138
138
        <menuitem id="cut" label="&cut.label;" accesskey="&cut.accesskey;" command="cut-command" key="cut-key"/>
139
139
        <menuitem id="copy" label="&copy.label;" accesskey="&copy.accesskey;" command="copy-command" key="copy-key"/>
140
140
        <menuitem id="paste" label="&paste.label;" accesskey="&paste.accesskey;" command="paste-command" key="paste-key"/>
141
141
        <menuitem id="remove" label="&remove.label;" accesskey="&remove.accesskey;" command="remove-command" key="remove-key"/>
142
142
        <menuseparator/>
143
 
        <menuitem id="find" label="&menu.find.label;..." accesskey="&menu.find.accesskey;" command="find-command" key="find-key"/>
 
143
        <menuitem id="find" label="&menu.find.label;…" accesskey="&menu.find.accesskey;" command="find-command" key="find-key"/>
144
144
        <menuitem id="find-again" label="&menu.findagain.label;" accesskey="&menu.findagain.accesskey;" command="find-again-command" key="find-again-key"/>
145
145
      </menupopup>
146
146
    </menu>
184
184
        <menuitem id="faqLink" label="&faq.label;" accesskey="&faq.accesskey;" oncommand="abp.loadInBrowser('&faq.url;')"/>
185
185
        <menuitem id="filtersLink" label="&filterdoc.label;" accesskey="&filterdoc.accesskey;" oncommand="abp.loadInBrowser('&filterdoc.url;')"/>
186
186
        <menuseparator/>
187
 
        <menuitem id="aboutAbp" label="&about.label;..." accesskey="&about.accesskey;" oncommand="openAbout()"/>
 
187
        <menuitem id="aboutAbp" label="&about.label;…" accesskey="&about.accesskey;" oncommand="openAbout()"/>
188
188
      </menupopup>
189
189
    </menu>
190
190
  </menubar>
198
198
 
199
199
<vbox id="listarea" flex="1">
200
200
  <stack id="listStack" flex="1">
201
 
    <tree id="list" persist="closedSubscriptions" flex="1" seltype="multiple" hidecolumnpicker="true" enableColumnDrag="true">
 
201
    <tree id="list" onselect="updateCommands()" context="listitem-context" persist="closedSubscriptions" flex="1" seltype="multiple" hidecolumnpicker="true" enableColumnDrag="true">
202
202
      <treecols context="treecols-context">
203
203
        <treecol id="col-filter" label="&filter.column;" primary="true" flex="10" persist="width ordinal sortDirection hidden"/>
204
204
        <splitter class="tree-splitter"/>
211
211
        <treecol id="col-lasthit" label="&lasthit.column;" hidden="true" flex="4" persist="width ordinal sortDirection hidden"/>
212
212
      </treecols>
213
213
 
214
 
      <treechildren tooltip="tree-tooltip" context="listitem-context" onclick="onListClick(event)" ondblclick="onListDblClick(event)" ondraggesture="onListDragGesture(event)"/>
 
214
      <treechildren tooltip="tree-tooltip" onclick="onListClick(event)" ondblclick="onListDblClick(event)" ondraggesture="onListDragGesture(event)"/>
215
215
    </tree>
216
216
    <hbox id="listEditorParent" align="center" hidden="true">
217
217
      <textbox id="listEditor" class="tree-input" flex="1"/>