Changeset 6b3729

Timestamp:

Sep 10, 2018, 6:47:35 PM (4 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

46c88d

Parents:

bef78c

Message:

unified previously splitted pref-dialog

Files:

• content/prefDialog/vI_prefDialog.xul (modified) (2 diffs)
• content/prefDialog/vI_prefDialog_TB3.xul (deleted)
• content/vI_context.xul (modified) (1 diff)
• content/v_identity.xul (modified) (1 diff)
• install.rdf (modified) (1 diff)

content/prefDialog/vI_prefDialog.xul

@@ -42 +42 @@
 <?xml-stylesheet href="chrome://messenger/skin/messageHeader.css"?>
 
-
-<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    xmlns:xhtml="http://www.w3.org/1999/xhtml" >
-
-<dialog id="vI_prefDialog">
+<dialog id="vI_prefDialog"
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:xhtml="http://www.w3.org/1999/xhtml"
+        onload="virtualIdentityExtension.prefDialog.init();"
+        buttons="accept,cancel,help"
+        ondialogaccept="virtualIdentityExtension.prefDialog.savePrefs();"
+        ondialoghelp="virtualIdentityExtension.prefDialog.toggleHelp();"
+        buttonlabelhelp="&vI_prefDialog.dlgHelpButton.label;"
+        persist="screenX screenY"
+        title="&vI_prefDialog.dlgTitle.label;" >
+
+<script type="application/x-javascript"
+            src="chrome://v_identity/content/prefDialog/vI_prefDialog.js" />
 
 <hbox>
@@ -561 +569 @@
 <textbox id="virtualIdentityExtension_debugBox" />
 </dialog>
-</overlay>

content/vI_context.xul

@@ -61 +61 @@
             <menupopup>
                 <menuitem label="&vident.vI_Menu.Settings.label;"
-                      oncommand="window.open('chrome://v_identity/content/prefDialog/vI_prefDialog_TB3.xul', '', 'chrome, dialog, alwaysRaised, resizable=yes');" />
+                      oncommand="window.open('chrome://v_identity/content/prefDialog/vI_prefDialog.xul', '', 'chrome, dialog, alwaysRaised, resizable=yes');" />
                 <menu label="&vident.vI_Menu.DataStorage.label;">
                     <menupopup>                        

content/v_identity.xul

@@ -59 +59 @@
           <menuseparator id="virtualIdentityExtension_statusMenu_separator" />
           <menuitem class="menuitem-iconic" label="&vident.vI_Menu.Settings.label;"
-            oncommand="window.open('chrome://v_identity/content/prefDialog/vI_prefDialog_TB3.xul', '', 'chrome, dialog, alwaysRaised, resizable=yes');" />
+            oncommand="window.open('chrome://v_identity/content/prefDialog/vI_prefDialog.xul', '', 'chrome, dialog, alwaysRaised, resizable=yes');" />
           <menuitem class="menuitem-iconic" label="&vident.vI_Menu.DataEditor.label;"
             oncommand="window.open('chrome://v_identity/content/vI_rdfDataTree.xul', '', 'chrome, dialog, resizable=yes');" />

install.rdf

@@ -23 +23 @@
                    em:updateURL="http://absorb.it/software/virtual_identity/v_identity_update.rdf"
                    em:updateKey="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDY5lTLkMzbwKDrWvC5rAjR9Uiv6THmeOK03lBCsQ89KXYlz8i2CNTgvp44+/kK+73u+ZdduNSID+HGuzfoWy+cJLznFSlKx5DcYWDKKGKhCrXvRZ/nFX1JowmfdR5LskQMLNHMjadUCuS6ka3tX+yWErxOMPTdYmSWazU8tp1fGwIDAQAB"
-                   em:optionsURL="chrome://v_identity/content/prefDialog/vI_prefDialog_TB3.xul" >
+                   em:optionsURL="chrome://v_identity/content/prefDialog/vI_prefDialog.xul" >
     <em:targetApplication RDF:resource="rdf:#$njP94"/>
     <em:targetApplication RDF:resource="rdf:#$rjP94"/>