Changeset 1b7cff


Ignore:
Timestamp:
Sep 19, 2008, 11:43:15 AM (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:
e561f9
Parents:
c7ec22
Message:

collection of changes to 0.6 branch

Location:
chrome
Files:
3 edited

Legend:

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

    rc7ec22 r1b7cff  
    222222}
    223223function vI_storageExtras_characterEncoding() {
    224     this.active = vI_storageExtrasHelper.preferences.getBoolPref(this.option)
     224    this.active = vI_storageExtrasHelper.preferences.getBoolPref("storage") &&
     225                vI_storageExtrasHelper.preferences.getBoolPref(this.option)
    225226    this.comp = { compareValue : null, equal : null }
    226227}
     
    286287
    287288function vI_storageExtras_msgFormat() {
    288     this.active = vI_storageExtrasHelper.preferences.getBoolPref(this.option)
     289    this.active = vI_storageExtrasHelper.preferences.getBoolPref("storage") &&
     290                vI_storageExtrasHelper.preferences.getBoolPref(this.option)
    289291    this.comp = { value : null, compareValue : null, equal : null }
    290292}
     
    340342
    341343function vI_storageExtras_sMime_messageEncryption() {
    342     this.active = vI_storageExtrasHelper.preferences.getBoolPref(this.option)
     344    this.active = vI_storageExtrasHelper.preferences.getBoolPref("storage") &&
     345                vI_storageExtrasHelper.preferences.getBoolPref(this.option)
    343346    this.comp = { value : null, compareValue : null, equal : null }
    344347}
     
    403406    this.updateFunction = updateFunction;
    404407    this.valueFromIdentityFunction = identityValue;
    405     this.active = vI_storageExtrasHelper.preferences.getBoolPref(this.option) &&
     408    this.active = vI_storageExtrasHelper.preferences.getBoolPref("storage") &&
     409                vI_storageExtrasHelper.preferences.getBoolPref(this.option) &&
    406410        document.getElementById(this.composeDialogElementID);
    407411    this.comp = { compareValue : null, equal : null }
  • chrome/content/v_identity/v_identity.xml

    rc7ec22 r1b7cff  
    123123        <xul:image class="menupopup_clone-icon" xbl:inherits="src"/>
    124124        <xul:label class="menupopup_clone-text" xbl:inherits="value=label,accesskey,crop" crop="right" flex="1"/>
    125         <xul:label value="&vident.accPane.prettyName.prefix;" class="menu_clone-description virtIdLabel" vid="false" xbl:inherits="vid" crop="right"/>
     125        <xul:label value="&vident.accPane.prettyName.prefix;" class="menupopup_clone-description virtIdLabel" vid="false" xbl:inherits="vid" crop="right"/>
    126126            <xul:label class="menupopup_clone-description" xbl:inherits="value=description" crop="right"/>
    127127    </content>
     
    133133        this.label = this._identityDataStorage.combinedName;
    134134        this.value = this._identityDataStorage.id.key;
    135 //      vI_notificationBar.dump("** v_identity.xml fromPopupItem_clone constructor id='" + this.value + "'.\n")
     135        vI_notificationBar.dump("** v_identity.xml fromPopupItem_clone constructor id='" + this.value + "'.\n")
    136136
    137137        this.description = this._identityDataStorage.sideDescription;
     
    351351                MenuItem.identityData = localIdentityData;
    352352            MenuItem.setAttribute("class", "identity_clone-popup-item");
    353             MenuItem.value = localIdentityData.id.value;
     353            MenuItem.value = localIdentityData.id.key; // might be accessed before item is constructed
    354354
    355355            // set vid explicitely
  • chrome/skin/classic/v_identity/v_identity.css

    rc7ec22 r1b7cff  
    198198
    199199.menupopup_clone-description, .menu_clone-description {
    200     margin-left:    0px;
     200    margin:     0 5px 0 0;
    201201    font-style: italic;
    202202    color:      graytext;
Note: See TracChangeset for help on using the changeset viewer.