Changeset 2f8c7f


Ignore:
Timestamp:
Sep 16, 2008, 10:44:01 PM (13 years ago)
Author:
rene <rene@…>
Branches:
lite_0.1, multiEdit, ng_0.6, ng_0.6_help, ng_0.8, ng_0.9
Children:
1c8ec4
Parents:
643bca
Message:

collection of changes to 0.6 branch

Location:
chrome
Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed
  • chrome/content/v_identity/vI_Dialog.js

    r643bca r2f8c7f  
    3333        vI_Dialog.setDescription(document.getElementById("vI_Dialog_recLabel"), warning.recLabel);
    3434        vI_Dialog.setDescription(document.getElementById("vI_Dialog_recipient"), warning.recipient);
    35         vI_htmlTextBox.init("vI_Dialog_browser", null, warning.warning, warning.css);       
     35        document.getElementById("vI_Dialog_browser").outputString = warning.warning;
    3636        vI_Dialog.setDescription(document.getElementById("vI_Dialog_query"), warning.query);
    3737    }
  • chrome/content/v_identity/vI_Dialog.xul

    r643bca r2f8c7f  
    4545    <description id="vI_Dialog_recLabel" />
    4646    <description id="vI_Dialog_recipient" />
    47     <browser id="vI_Dialog_browser" disablehistory="true" flex="1" />
     47    <browser id="vI_Dialog_browser" class="vI_htmlTextBox"
     48         documentStyle="background-color: -moz-dialog; font: -moz-dialog;"
     49         cssSource="vI_DialogBrowser.css" flex="1" disablehistory="true" />
    4850    <description id="vI_Dialog_query" />
    4951</dialog>
  • chrome/content/v_identity/vI_htmlTextBox.xml

    r643bca r2f8c7f  
    3232    <constructor>
    3333        <![CDATA[       
    34 //      vI_notificationBar.dump('******* vI_htmlTextBox.xml constructor\n');
     34<!--        vI_notificationBar.dump('******* vI_htmlTextBox.xml constructor\n'); -->
    3535        ]]>
    3636    </constructor>
    3737    <property name="outputString" >
    3838        <setter><![CDATA[
    39         if (!this._cssRead) this.cssSource = this.getAttribute('cssSource');    // read initial Attribute.
     39        if (!this._cssRead) this.cssSource = this.getAttribute('cssSource');    // read initial Attributes
     40        this.contentDocument.lastChild.setAttribute("style", this.getAttribute('documentStyle'));
    4041       
    4142        var oldChilds = this.contentDocument.body.childNodes;
     
    108109                this._currentList = this.contentDocument
    109110                    .createElementNS("http://www.w3.org/1999/xhtml", 'html:ul');
    110                 this.contentDocument.body.appendChild(vI_htmlTextBox.currentList);
     111                this.contentDocument.body.appendChild(this._currentList);
    111112            }
    112113            this._currentBaseNode = this.contentDocument
    113114                                .createElementNS("http://www.w3.org/1999/xhtml", 'html:li');
    114             this._currentList.appendChild(vI_htmlTextBox.currentBaseNode);
     115            this._currentList.appendChild(this._currentBaseNode);
    115116        }
    116117        else {
  • chrome/content/v_identity/vI_upgrade.js

    r643bca r2f8c7f  
    3434        vI_upgrade.__initRequirements();
    3535        document.documentElement.getButton("cancel").setAttribute("hidden", "true")
    36         vI_upgrade.skipUpgradePages(); // skip obsolete upgrade Pages
    3736    },
    3837
     
    6665    },
    6766
    68     skipUpgradePages : function() {
    69         var preUpdateWizardPage = document.getElementById("license")       
    70         // if former version of extension was at least 0.5.0, start with WizardPage 0.5.2
    71         if (vI_upgrade.versionChecker.compare(vI_rdfDatasource.getCurrentExtFileVersion(), "0.5.0") >= 0)
    72             preUpdateWizardPage.setAttribute("next", "upgrade")
    73     },
    74    
    75     adaptButtons : function() {
     67    prepare : function(elem) {
    7668        document.documentElement.getButton('back').setAttribute('hidden','true');
    7769        document.documentElement.getButton('next').focus();
     70        var pageid = elem.getAttribute("pageid");
     71        var browser = document.getElementById('vITextBox.' + pageid)
     72        if (browser)
     73            browser.outputString =
     74                    document.getElementById('vITextBoxBundle').getString('vident.' + pageid);
    7875    },
    7976   
  • chrome/content/v_identity/vI_upgrade.xul

    r643bca r2f8c7f  
    3838<wizard id="upgradeWizard" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    3939        title="&vident.upgrade.dlgTitle.label;"
    40     zlevel="6" onload="vI_upgrade.init();">
     40    zlevel="6" onload="vI_upgrade.init(); vI_upgrade.prepare(document.getElementById('introPage'));" >
    4141
    4242<script type="application/x-javascript" src="chrome://v_identity/content/vI_upgrade.js" />
     
    5151<stringbundle id="vITextBoxBundle" src="chrome://v_identity/locale/vI_upgrade.properties" />
    5252   
    53     <wizardpage onpageshow="vI_upgrade.adaptButtons();vI_htmlTextBox.init('vITextBox.intro', 'vident.intro');"
     53    <wizardpage id="introPage"
    5454        label="&vident.upgrade.intro.label;" description="&vident.upgrade.intro.description;"
    5555        pageid="intro" next="features" >
    5656        <groupbox>
    5757            <caption label="&vident.upgrade.intro.caption;"/>
    58             <browser id="vITextBox.intro" disablehistory="true" />
     58            <browser id="vITextBox.intro" class="vI_htmlTextBox" disablehistory="true"
     59                documentStyle="background-color: -moz-dialog; font: -moz-dialog;" />
    5960        </groupbox>
    6061    </wizardpage>
    6162    <!-- features -->
    62     <wizardpage onpageshow="vI_upgrade.adaptButtons();vI_htmlTextBox.init('vITextBox.features', 'vident.features');"
     63    <wizardpage onpageshow="vI_upgrade.prepare(this);"
    6364        label="&vident.upgrade.features.label;" description="&vident.upgrade.features.description;"
    6465        pageid="features" next="license" >
    6566        <groupbox>
    6667            <caption label="&vident.upgrade.features.caption;"/>
    67             <browser id="vITextBox.features" disablehistory="true" />
     68            <browser id="vITextBox.features" class="vI_htmlTextBox" disablehistory="true"
     69                documentStyle="background-color: -moz-dialog; font: -moz-dialog;" />
    6870        </groupbox>
    6971    </wizardpage>
    7072    <!-- GPL license -->
    71     <wizardpage onpageshow="vI_upgrade.adaptButtons();vI_htmlTextBox.init('vITextBox.license', 'vident.license');"
     73    <wizardpage onpageshow="vI_upgrade.prepare(this);"
    7274        label="&vident.upgrade.license.label;" description="&vident.upgrade.license.description;"
    73         id="license" pageid="license" next="0.5.0" >
     75        pageid="license" next="upgrade" >
    7476        <groupbox>
    7577            <caption label="&vident.upgrade.license.caption;"/>
    76             <browser id="vITextBox.license" disablehistory="true" />
     78            <browser id="vITextBox.license" class="vI_htmlTextBox" disablehistory="true"
     79                 cssSource="vI_upgrade_license.css"
     80                 documentStyle="background-color: -moz-dialog; font: -moz-dialog;" />
    7781        </groupbox>
    7882    </wizardpage>
    79     <!-- upgrade information -->
    80     <!-- 0.5.0 -->
    81     <wizardpage onpageshow="vI_upgrade.adaptButtons();vI_htmlTextBox.init('vITextBox.0.5.0', 'vident.0.5.0');"
    82         label="&vident.upgrade.0.5.0.label;" description="&vident.upgrade.0.5.0.description;"
    83         pageid="0.5.0" next="upgrade" >
    84         <groupbox>
    85             <caption label="&vident.upgrade.0.5.0.caption;"/>
    86             <browser id="vITextBox.0.5.0" disablehistory="true" />
    87         </groupbox>
    88     </wizardpage>
    89     <!-- 0.5.3 -->
    90 <!--    <wizardpage onpageshow="vI_upgrade.adaptButtons();vI_htmlTextBox.init('vITextBox.0.5.3', 'vident.0.5.3');"
    91         label="&vident.upgrade.0.5.3.label;" description="&vident.upgrade.0.5.3.description;"
    92         pageid="0.5.3" next="upgrade" >
    93         <groupbox>
    94             <caption label="&vident.upgrade.0.5.3.caption;"/>
    95             <browser id="vITextBox.0.5.3" disablehistory="true" />
    96         </groupbox>
    97     </wizardpage>   
    98 -->
    9983    <!-- upgrade procedure -->
    100     <wizardpage onpageshow="vI_upgrade.adaptButtons();vI_upgrade.upgrade();"
     84    <wizardpage onpageshow="vI_upgrade.prepare(this);vI_upgrade.upgrade();"
    10185        label="&vident.upgrade.upgrade.label;" description="&vident.upgrade.upgrade.description;"
    10286        pageid="upgrade" next="finish" >
     
    10791    </wizardpage>   
    10892    <!-- finish -->
    109     <wizardpage onpageshow="vI_upgrade.adaptButtons();vI_htmlTextBox.init('vITextBox.finish', 'vident.finish');"
     93    <wizardpage onpageshow="vI_upgrade.prepare(this);"
    11094        label="&vident.upgrade.finish.label;" description="&vident.upgrade.finish.description;"
    11195        pageid="finish" >
    11296        <groupbox>
    11397            <caption label="&vident.upgrade.finish.caption;"/>
    114             <browser id="vITextBox.finish" disablehistory="true" />
     98            <browser id="vITextBox.finish" class="vI_htmlTextBox" disablehistory="true"
     99                documentStyle="background-color: -moz-dialog; font: -moz-dialog;" />
    115100        </groupbox>
    116101    </wizardpage>   
  • chrome/content/v_identity/vI_upgradeOverlay.js

    r643bca r2f8c7f  
    2828        if (vI_rdfDatasource.rdfUpgradeRequired() || vI_rdfDatasource.extUpgradeRequired()) {
    2929            if (!vI_upgrade.quick_upgrade())
    30                 window.openDialog("chrome://v_identity/content/vI_upgrade.xul",0, // give the Dialog a unique id
    31                 "chrome, dialog, modal, alwaysRaised, resizable=yes").focus();
     30                window.open("chrome://v_identity/content/vI_upgrade.xul",0, // give the Dialog a unique id
     31                "chrome, dialog, alwaysRaised, resizable=yes").focus();
    3232        }
    3333        else {
  • chrome/content/v_identity/v_identity.xml

    r643bca r2f8c7f  
    4949    <parameter name="permanent" />
    5050            <body><![CDATA[
    51         vI_notificationBar.dump("** v_identity.xml: addTooltip.\n");
    5251        var randID = elem.tooltipElem.getAttribute("tooltip");
    5352        this.removeTooltip(randID);
     
    6160        toolTip.elem = elem;
    6261        toolTip.permanent = permanent;
    63         vI_notificationBar.dump("** v_identity.xml: addTooltip 3.\n");
    6462        this.appendChild(toolTip);
    65         vI_notificationBar.dump("** v_identity.xml: addTooltip done.\n");
    6663        ]]></body>
    6764    </method>
     
    8380    <method name="popupshowing">
    8481            <body><![CDATA[
    85         vI_notificationBar.dump("** v_identity.xml: popupshowing\n");
    8682        if (!this._identityInfo) {
    87             vI_notificationBar.dump("** v_identity.xml: popupshowing 2\n");
    8883            this._identityInfo =
    8984                "<table>" +
     
    9792            this._tooltipBrowser.outputString = this._identityInfo;
    9893        }
    99         vI_notificationBar.dump("** v_identity.xml: popupshowing done.\n");
    10094        ]]></body>
    10195    </method>
    10296    <method name ="popuphidden">
    10397            <body><![CDATA[
    104         vI_notificationBar.dump("** v_identity.xml: popuphidden\n");
    10598        if (!this.permanent) this._identityInfo = null;
    10699        ]]></body>
     
    109102        <body><![CDATA[
    110103        if (!this._identityInfo) return;
    111         vI_notificationBar.dump("** v_identity.xml: resize.\n");
    112104        var width = document.getElementById("msgIdentity_clone").boxObject.width * 0.7;
    113105        var height = this._tooltipBrowser.contentDocument.lastChild.scrollHeight + 5;
     
    115107        width = document.getElementById("msgIdentity_clone").boxObject.width * 0.75;
    116108        this.sizeTo(width, height);
    117         vI_notificationBar.dump("** v_identity.xml: resize done.\n");
    118109        ]]></body>
    119110    </method>
     
    314305    <method name="init">
    315306        <body><![CDATA[
    316         vI_notificationBar.dump("** v_identity.xml: clone_Obj_MsgIdentity\n");
    317        
    318307        var MenuItems = this._msgIdentityPopupElem.childNodes
    319308        for (var index = 0; index < MenuItems.length; index++) {
     
    329318            if (this._msgIdentity_selectedItem == MenuItems[index]) {
    330319                this.selectedItem = menuItem;
    331                 vI_notificationBar.dump("** v_identity.xml: clone_Obj_MsgIdentity selectedMenuItem " + menuItem.value + " found\n");
    332320                this.identityData = newIdentity.getDuplicate();
    333321            }
     
    340328    <method name="clean">
    341329        <body><![CDATA[
    342         vI_notificationBar.dump("** v_identity.xml: clean\n");
    343330        var MenuItems = this._popupElem.childNodes;
    344331        while (MenuItems.length > 0) {
     
    353340        <parameter name="localIdentityData" />
    354341        <body><![CDATA[
    355         vI_notificationBar.dump("** v_identity.xml: addIdentityToCloneMenu '" + localIdentityData.id + "'\n");
    356        
    357342        var existingItem = this._isExistingCloneMenuItem(localIdentityData);
    358343        if (!existingItem) {
     
    384369        <body><![CDATA[
    385370        var MenuItems = this._popupElem.childNodes;
    386         vI_notificationBar.dump("** v_identity.xml: getMenuItemForIdentity key " + identitykey + " menulength " + MenuItems.length + "\n");
    387371        for (var index = 0; index < MenuItems.length; index++) {
    388372            if (MenuItems[index].value == identitykey)
     
    421405        <parameter name="localIdentityData" />
    422406        <body><![CDATA[
    423         vI_notificationBar.dump("** _isExistingCloneMenuItem\n");
    424            
    425407        var MenuItems = this._popupElem.childNodes
    426408        for (var j = 0; j < MenuItems.length; j++) {
    427409            if (MenuItems[j].localName == "menuseparator") continue;
    428             vI_notificationBar.dump("** comparing id " + MenuItems[j].identityData.id + " with " + localIdentityData.id + "\n");
    429             if (MenuItems[j].identityData.equals(localIdentityData)) {
    430                 vI_notificationBar.dump("** _isExistingCloneMenuItem: found existing one\n");
    431                 return MenuItems[j];
    432             }
    433         }
    434         vI_notificationBar.dump("** _isExistingCloneMenuItem: none found\n");
     410            if (MenuItems[j].identityData.equals(localIdentityData)) return MenuItems[j];
     411        }
    435412        return null;
    436413        ]]></body>
     
    485462    <property name="identityData">
    486463        <getter><![CDATA[
    487         vI_notificationBar.dump("** v_identity.xml: read identityData.\n");
    488464        this._identityDataStorage.extras.readValues(); // update with current data
    489         vI_notificationBar.dump("** v_identity.xml: extras update done identityData.\n");
    490465        return this._identityDataStorage;
    491466        ]]></getter>
     
    493468        if (!val) this._identityDataStorage = null
    494469        else {
    495             vI_notificationBar.dump("** v_identity.xml: updating DataStorage.\n");
    496470            var oldIdentityData = this._identityDataStorage;
    497471            this._identityDataStorage = val;
     
    503477                    this._identityDataStorage.sideDescription = (idName)?" - "+idName:"";
    504478                }
    505                 vI_notificationBar.dump("** v_identity.xml: set extra Values\n");
    506479                this._identityDataStorage.extras.setValues();
    507480           
     
    515488            document.getAnonymousElementByAttribute(this, "anonid", "smtpServerListHbox").smtp = this._identityDataStorage.smtp;
    516489           
    517             vI_notificationBar.dump("** v_identity.xml: updating DataStorage done.\n");
    518490        }
    519491        ]]></setter>
  • chrome/locale/en-US/v_identity/vI_upgrade.dtd

    r643bca r2f8c7f  
    99<!ENTITY vident.upgrade.license.description "license">
    1010<!ENTITY vident.upgrade.license.caption "GNU General Public License">
    11 <!ENTITY vident.upgrade.0.5.0.label "Virtual Identity Install/Upgrade">
    12 <!ENTITY vident.upgrade.0.5.0.description "upgrade step 1/2">
    13 <!ENTITY vident.upgrade.0.5.0.caption "Virtual Identity Data-Storage">
    1411<!ENTITY vident.upgrade.upgrade.label "Virtual Identity Install/Upgrade">
    1512<!ENTITY vident.upgrade.upgrade.description "upgrade step 2/2">
  • chrome/locale/en-US/v_identity/vI_upgrade.properties

    r643bca r2f8c7f  
    11vident.intro= Thank you for using Virtual Identity.\n\nVirtual Identity is an Extension for your email client, which gives you the possibility to create Identity's on the fly without using the Account Dialog. This is especially useful, if you have an own mailserver and use many different Identities.\n\nPlease report all problems, ideas or requierements at https://www.absorb.it/virtual-id\n\nContinue all steps of the Ugrade-Wizard.
    2 vident.features= New features of the 0.5 releases\n* all Virtual Identities can now be stored and reused (default)\n* possibility to use Virtual Identities for Newsgroup-Messages\n* works now smoothly with SMTP-selector, choose default smtp\nenjoy the new version!
     2vident.features= New features of the 0.6 releases\n* TO BE FILLED IN!
    33vident.license= This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License at http://www.gnu.org/copyleft/gpl.html for more details.\n\n---\nThis program was developed by Rene Ejury (2008).
    4 vident.0.5.0= In order to use the new Version of Virtual Identity you have to upgrade the database.\n\nVirtual Identities are not stored in the Addressbook anymore, a seperate file is used from 0.5pre on. If you continue now, Information about Virtual Identities will be transferred from your Addressbook to the new file.
    54vident.finish= Upgrade/Installation successfull.\n\nEnjoy using Virtal Identity.\n\nThe quality of the software is also depending on you, so please report bugs and problems or help writing some documentation at https://www.absorb.it/virtual-id . You can also help translating the program at http://babelzilla.org .
  • chrome/skin/classic/v_identity/vI_Dialog.css

    r643bca r2f8c7f  
    2626}
    2727
     28.vI_htmlTextBox {
     29  -moz-binding: url("chrome://v_identity/content/vI_htmlTextBox.xml#vI_htmlTextBox");
     30}
     31
    2832#vI_Dialog_query {
    2933    text-align: right;
Note: See TracChangeset for help on using the changeset viewer.