Changeset 8b09cf
- Timestamp:
- Sep 9, 2018, 2:10:17 PM (2 years ago)
- Branches:
- ng_0.9
- Children:
- 4c815c
- Parents:
- c5860f
- Files:
-
- 3 deleted
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
content/prefDialog/vI_prefDialog.js
rc5860f r8b09cf 116 116 117 117 base: { 118 _elementIDs: ["VIdent_identity.doFcc", 119 "VIdent_identity.fccFolderPickerMode", 120 "VIdent_identity.fccFolder", 121 "VIdent_identity.fccReplyFollowsParent", 122 "VIdent_identity.draftFolderPickerMode", 123 "VIdent_identity.draftFolder", 124 "VIdent_identity.stationeryFolderPickerMode", 125 "VIdent_identity.stationeryFolder", 126 "VIdent_identity.copySMIMESettings", 127 "VIdent_identity.copyAttachVCardSettings", 128 "VIdent_identity.copyNewEnigmailSettings", 118 _elementIDs: [ 129 119 "VIdent_identity.smart_reply", 130 120 "VIdent_identity.smart_detectByReceivedHeader", 131 121 "VIdent_identity.smart_reply_for_newsgroups", 132 122 "VIdent_identity.show_status", 133 "VIdent_identity.fcc_show_switch",134 123 "VIdent_identity.menu_entry", 135 124 "VIdent_identity.smart_reply_headers", … … 157 146 "VIdent_identity.storage_store_base_id", 158 147 "VIdent_identity.storage_dont_update_multiple", 159 "VIdent_identity.storage_show_switch",160 "VIdent_identity.storage_show_baseID_switch",161 148 "VIdent_identity.storage_colorIndication", 162 149 "VIdent_identity.storage_warn_update", … … 322 309 mAttr("VIdent_identity.storage_store_base_id", "disabled", element.checked); 323 310 mAttr("VIdent_identity.storage_dont_update_multiple", "disabled", element.checked); 324 mAttr("VIdent_identity.storage_show_switch", "disabled", element.checked);325 mAttr("VIdent_identity.storage_show_baseID_switch", "disabled", element.checked);326 311 mAttr("VIdent_identity.storage_colorIndication", "disabled", element.checked); 327 312 mAttr("VIdent_identity.storage_warn_update", "disabled", element.checked); … … 373 358 prefDialog.unicodeConverter.charset = "UTF-8"; 374 359 prefDialog.base.init(); 375 vI.onInitCopiesAndFolders()376 360 377 361 // check for enigmail extension … … 380 364 document.getElementById("openPGPencryption").removeAttribute("hidden"); 381 365 document.getElementById("VIdent_identity.hide_openPGP_messageSignature").removeAttribute("hidden"); 382 document.getElementById("VIdent_identity.copyNewEnigmailSettings").removeAttribute("hidden");383 366 } 384 367 }); … … 396 379 savePrefs: function () { 397 380 // Copy all changes to Elements 398 vI.onSaveCopiesAndFolders();399 381 prefDialog.base.savePrefs(); 400 382 }, -
content/prefDialog/vI_prefDialog.xul
rc5860f r8b09cf 48 48 <dialog id="vI_prefDialog"> 49 49 50 <broadcaster id="VIdent_broadcaster_doFcc"/>51 52 <textbox hidden="true" id="VIdent_identity.fccFolder"53 prefstring="fccFolder"/>54 <textbox hidden="true" id="VIdent_identity.fccFolderPickerMode"55 prefstring="fccFolderPickerMode"/>56 <textbox hidden="true" id="VIdent_identity.draftFolder"57 prefstring="draftFolder"/>58 <textbox hidden="true" id="VIdent_identity.draftFolderPickerMode"59 prefstring="draftFolderPickerMode"/>60 <textbox hidden="true" id="VIdent_identity.stationeryFolder"61 prefstring="stationeryFolder"/>62 <textbox hidden="true" id="VIdent_identity.stationeryFolderPickerMode"63 prefstring="stationeryFolderPickerMode"/>64 50 <hbox> 65 51 <tabbox id="prefTabbox" class="viewSelector "> … … 363 349 <checkbox id="VIdent_identity.show_status" label="&vI_prefDialog.composeDialog.status.label;" 364 350 tooltiptext="&vI_prefDialog.composeDialog.status.tooltiptext;" prefstring="show_status" /> 365 <checkbox id="VIdent_identity.fcc_show_switch" label="&vI_prefDialog.composeDialog.fcc_show_switch.label;"366 tooltiptext="&vI_prefDialog.composeDialog.fcc_show_switch.tooltiptext;" prefstring="fcc_show_switch" />367 351 <checkbox id="VIdent_identity.storage_colorIndication" label="&vI_prefDialog.composeDialog.storage_colorIndication.label;" 368 352 prefstring="storage_colorIndication" /> 369 </groupbox>370 <groupbox>371 <caption label="&vI_prefDialog.composeDialog.caption3;"/>372 <checkbox id="VIdent_identity.storage_show_switch" label="&vI_prefDialog.composeDialog.show_switch.label;"373 prefstring="storage_show_switch"/>374 <checkbox id="VIdent_identity.storage_show_baseID_switch" label="&vI_prefDialog.composeDialog.show_baseID_switch.label;"375 prefstring="storage_show_baseID_switch"/>376 353 </groupbox> 377 354 </tabpanel> … … 386 363 <treecols orient="vertical"><treecol flex="1" hideheader="true" primary="true"/></treecols> 387 364 <treechildren> 388 <treeitem container="true" open="true" >389 <treerow><treecell label="&vI_prefDialog.sending.Folder.label;" /></treerow>390 <treechildren>391 <treeitem><treerow><treecell label="&vI_prefDialog.sending.Folder.row0.label;" /></treerow></treeitem>392 <treeitem><treerow><treecell label="&vI_prefDialog.sending.Folder.row1.label;" /></treerow></treeitem>393 <treeitem><treerow><treecell label="&vI_prefDialog.sending.Folder.row2.label;" /></treerow></treeitem>394 </treechildren>395 </treeitem>396 365 <treeitem><treerow><treecell label="&vI_prefDialog.sending.warnings.label;" /></treerow></treeitem> 397 366 </treechildren> … … 403 372 </tabs> 404 373 <tabpanels class="plain"> 405 <tabpanel orient="vertical">406 <dialogheader title="&vI_prefDialog.sending.Folder.header;"/>407 <groupbox>408 <caption label="&vI_prefDialog.sending.Folder.caption;"/>409 <description class="widthXX">&vI_prefDialog.sending.Folder.desc;</description>410 <checkbox id="VIdent_identity.copyNewEnigmailSettings" label="&vI_prefDialog.sending.Folder.Enigmail.label;"411 prefstring="copyNewEnigmailSettings" hidden="true"/>412 <checkbox id="VIdent_identity.copySMIMESettings" label="&vI_prefDialog.sending.Folder.SMIME.label;"413 prefstring="copySMIMESettings"/>414 <checkbox id="VIdent_identity.copyAttachVCardSettings" label="&vI_prefDialog.sending.Folder.VCard.label;"415 prefstring="copyAttachVCardSettings"/>416 </groupbox>417 </tabpanel>418 <tabpanel orient="vertical">419 <dialogheader title="&vI_prefDialog.sending.fccTab.header;" />420 <groupbox>421 <caption label="&vI_prefDialog.sending.fccTab.caption;"/>422 <hbox align="center">423 <checkbox id="VIdent_identity.doFcc" label="&fccMailFolder.label;"424 accesskey="&fccMailFolder.accesskey;"425 oncommand="setupFccItems();" prefstring="doFcc"/>426 </hbox>427 <radiogroup id="VIdent_doFcc">428 <grid class="specialFolderPickerGrid">429 <columns>430 <column flex="1"/>431 <column flex="2"/>432 </columns>433 <rows>434 <radio id="VIdent_fcc_Settings_Of_Account"435 value="3" label="&vI_prefDialog.sending.vidAccount.label;"436 oncommand="virtualIdentityExtension.setPickersState('msgFccFolderPicker', 'msgFccAccountPicker', event)"437 observes="VIdent_broadcaster_doFcc"/>438 <radio id="VIdent_fcc_Settings_Of_Default"439 value="2" label="&vI_prefDialog.sending.vidDefault.label;"440 oncommand="virtualIdentityExtension.setPickersState('msgFccFolderPicker', 'msgFccAccountPicker', event)"441 observes="VIdent_broadcaster_doFcc"/>442 <row align="center" id="msgFccAccountPickerRow">443 <radio id="VIdent_fcc_selectAccount"444 value="0" label="&sentFolderOn.label;"445 accesskey="&sentFolderOn.accesskey;"446 oncommand="virtualIdentityExtension.setPickersState('msgFccAccountPicker', 'msgFccFolderPicker', event)"447 observes="VIdent_broadcaster_doFcc"/>448 </row>449 <row align="center" id="msgFccFolderPickerRow">450 <radio id="VIdent_fcc_selectFolder"451 value="1" label="&sentInOtherFolder.label;"452 accesskey="&sentInOtherFolder.accesskey;"453 oncommand="virtualIdentityExtension.setPickersState('msgFccFolderPicker', 'msgFccAccountPicker', event)"454 observes="VIdent_broadcaster_doFcc"/>455 </row>456 </rows>457 </grid>458 </radiogroup>459 <hbox id="fccReplyFollowsParentBox" align="center" class="fccReplyFollowsParent">460 <checkbox wsm_persist="true" id="VIdent_identity.fccReplyFollowsParent"461 label="&fccReplyFollowsParent.label;"462 accesskey="&fccReplyFollowsParent.accesskey;"463 prefattribute="value"464 prefstring="fccReplyFollowsParent"465 observes="VIdent_broadcaster_doFcc"/>466 </hbox>467 </groupbox>468 </tabpanel>469 <tabpanel orient="vertical">470 <dialogheader title="&vI_prefDialog.sending.draftTab.header;" />471 <groupbox>472 <caption label="&vI_prefDialog.sending.draftTab.caption;" />473 <radiogroup id="VIdent_messageDrafts">474 <grid class="specialFolderPickerGrid">475 <columns>476 <column flex="1"/>477 <column flex="2"/>478 </columns>479 <rows>480 <radio id="VIdent_draft_Settings_Of_Account"481 value="3" label="&vI_prefDialog.sending.vidAccount.label;"482 oncommand="virtualIdentityExtension.setPickersState('msgDraftsFolderPicker', 'msgDraftsAccountPicker', event)" />483 <radio id="VIdent_draft_Settings_Of_Default"484 value="2" label="&vI_prefDialog.sending.vidDefault.label;"485 oncommand="virtualIdentityExtension.setPickersState('msgDraftsFolderPicker', 'msgDraftsAccountPicker', event)" />486 <row align="center" id="msgDraftsAccountPickerRow">487 <radio id="VIdent_draft_selectAccount"488 value="0" label="&draftsFolderOn.label;"489 accesskey="&draftsFolderOn.accesskey;"490 oncommand="virtualIdentityExtension.setPickersState('msgDraftsAccountPicker', 'msgDraftsFolderPicker', event)" />491 </row>492 <row align="center" id="msgDraftsFolderPickerRow">493 <radio id="VIdent_draft_selectFolder"494 value="1" label="&draftInOtherFolder.label;"495 accesskey="&draftInOtherFolder.accesskey;"496 oncommand="virtualIdentityExtension.setPickersState('msgDraftsFolderPicker', 'msgDraftsAccountPicker', event)" />497 </row>498 </rows>499 </grid>500 </radiogroup>501 </groupbox>502 </tabpanel>503 <tabpanel orient="vertical">504 <dialogheader title="&vI_prefDialog.sending.tmplTab.header;" />505 <groupbox>506 <caption label="&vI_prefDialog.sending.tmplTab.caption;"/>507 <radiogroup id="VIdent_messageTemplates">508 <grid class="specialFolderPickerGrid">509 <columns>510 <column flex="1"/>511 <column flex="2"/>512 </columns>513 <rows>514 <radio id="VIdent_tmpl_Settings_Of_Account"515 value="3" label="&vI_prefDialog.sending.vidAccount.label;"516 oncommand="virtualIdentityExtension.setPickersState('msgStationeryFolderPicker', 'msgStationeryAccountPicker', event)" />517 <radio id="VIdent_tmpl_Settings_Of_Default"518 value="2" label="&vI_prefDialog.sending.vidDefault.label;"519 oncommand="virtualIdentityExtension.setPickersState('msgStationeryFolderPicker', 'msgStationeryAccountPicker', event)" />520 <row align="center" id="msgStationeryAccountPickerRow">521 <radio id="VIdent_tmpl_selectAccount"522 value="0" label="&templatesFolderOn.label;"523 accesskey="&templatesFolderOn.accesskey;"524 oncommand="virtualIdentityExtension.setPickersState('msgStationeryAccountPicker', 'msgStationeryFolderPicker', event)" />525 </row>526 <row align="center" id="msgStationeryFolderPickerRow">527 <radio id="VIdent_tmpl_selectFolder"528 value="1" label="&templateInOtherFolder.label;"529 accesskey="&templateInOtherFolder.accesskey;"530 oncommand="virtualIdentityExtension.setPickersState('msgStationeryFolderPicker', 'msgStationeryAccountPicker', event)" />531 </row>532 </rows>533 </grid>534 </radiogroup>535 </groupbox>536 </tabpanel>537 374 <tabpanel orient="vertical"> 538 375 <dialogheader title="&vI_prefDialog.sending.warnings.header;"/> -
content/prefDialog/vI_prefDialog_TB3.xul
rc5860f r8b09cf 24 24 - ***** END LICENSE BLOCK ***** --> 25 25 26 <?xul-overlay href="chrome://v_identity/content/prefDialog/vI_prefDialog_TB3FolderPicker.xul"?>27 26 <?xul-overlay href="chrome://v_identity/content/prefDialog/vI_prefDialog.xul"?> 28 27 -
content/vI_upgrade.js
rc5860f r8b09cf 57 57 new virtualIdentityExtension.rdfDatasourceImporter(window, 'virtualIdentity_0.10.rdf', false); 58 58 vI_localRdfDatasource.importFileByName("virtualIdentity.rdf"); 59 60 // cleanup created accounts for the last time :) 61 vI.vIaccount_cleanupSystem(); // always clean leftover accounts and directories 62 59 63 // no break 60 64 default: … … 114 118 { 115 119 version: "0.10", 116 prefs: Array("extensions.virtualIdentity.show_smtp", 120 prefs: Array( 121 "extensions.virtualIdentity.show_smtp", 117 122 "extensions.virtualIdentity.storage_store_SMTP", 118 "extensions.virtualIdentity.storage_show_SMTP_switch") 123 "extensions.virtualIdentity.storage_show_SMTP_switch", 124 "extensions.virtualIdentity.doFcc", 125 "extensions.virtualIdentity.fccFolder", 126 "extensions.virtualIdentity.fccFolderPickerMode", 127 "extensions.virtualIdentity.fccReplyFollowsParent", 128 "extensions.virtualIdentity.draftFolder", 129 "extensions.virtualIdentity.draftFolderPickerMode", 130 "extensions.virtualIdentity.stationeryFolder", 131 "extensions.virtualIdentity.stationeryFolderPickerMode", 132 "extensions.virtualIdentity.fcc_show_switch", 133 "extensions.virtualIdentity.storage_show_switch", 134 "extensions.virtualIdentity.storage_show_baseID_switch", 135 "extensions.virtualIdentity.copySMIMESettings", 136 "extensions.virtualIdentity.copyAttachVCardSettings", 137 "extensions.virtualIdentity.copyNewEnigmailSettings") 138 119 139 } 120 140 ]; -
defaults/preferences/preferences.js
rc5860f r8b09cf 1 pref("extensions.virtualIdentity.doFcc", true);2 pref("extensions.virtualIdentity.fccFolder", "");3 pref("extensions.virtualIdentity.fccFolderPickerMode", "3");4 pref("extensions.virtualIdentity.fccReplyFollowsParent", false);5 pref("extensions.virtualIdentity.draftFolder", "");6 pref("extensions.virtualIdentity.draftFolderPickerMode", "3");7 pref("extensions.virtualIdentity.stationeryFolder", "");8 pref("extensions.virtualIdentity.stationeryFolderPickerMode", "3");9 pref("extensions.virtualIdentity.copySMIMESettings", false);10 pref("extensions.virtualIdentity.copyAttachVCardSettings", false);11 pref("extensions.virtualIdentity.copyNewEnigmailSettings", true);12 1 pref("extensions.virtualIdentity.show_status", true); 13 pref("extensions.virtualIdentity.fcc_show_switch", false);14 2 pref("extensions.virtualIdentity.smart_draft", true); 15 3 pref("extensions.virtualIdentity.smart_reply", true); … … 43 31 pref("extensions.virtualIdentity.storage_store_base_id", false); 44 32 pref("extensions.virtualIdentity.storage_dont_update_multiple", true); 45 pref("extensions.virtualIdentity.storage_show_switch", false);46 pref("extensions.virtualIdentity.storage_show_baseID_switch", false);47 33 pref("extensions.virtualIdentity.storage_colorIndication", true); 48 34 pref("extensions.virtualIdentity.storage_warn_update", true);
Note: See TracChangeset
for help on using the changeset viewer.