Adding upstream version 4.7.upstream/4.7

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 154 insertions, 0 deletions

diff --git a/content/manager/editAccountOverlay.xhtml b/content/manager/editAccountOverlay.xhtml
new file mode 100644
index 0000000..dc37731
--- /dev/null
+++ b/content/manager/editAccountOverlay.xhtml
@@ -0,0 +1,154 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://tbsync/content/skin/fix_dropdown_1534697.css" type="text/css"?>
+
+<overlay 
+    id="tbSyncAccountConfig" 
+    xmlns:html="http://www.w3.org/1999/xhtml">
+
+    <script type="application/javascript" src="chrome://eas4tbsync/content/manager/editAccountOverlay.js"/>
+    <script type="application/javascript" src="chrome://eas4tbsync/content/locales.js"/>
+
+    <menuitem 
+        id="TbSync.eas.FolderListContextMenuDelete" 
+        label="__EAS4TBSYNCMSG_pref.ShowTrashedFolders__" 
+        class="menuitem-iconic"
+        image="chrome://tbsync/content/skin/trash16.png"
+        appendto="tbsync.accountsettings.FolderListContextMenu"
+        oncommand="tbSyncEditAccountOverlay.deleteFolder();"/>
+    
+    <tab id="manager.tabs.accountsettings" label="__EAS4TBSYNCMSG_manager.tabs.accountsettings__" appendto="manager.tabs" />
+    <tab id="manager.tabs.syncsettings" label="__EAS4TBSYNCMSG_manager.tabs.syncsettings__" appendto="manager.tabs" />
+
+    <tabpanel id="manager.tabpanels.accountsettings" appendto="manager.tabpanels" flex="1" orient="vertical"><!-- ACCOUNT SETTINGS -->
+          <vbox flex="1">
+                <label class="header lockIfConnected" style="margin-left:0; margin-bottom:1ex;" value="" id="tbsync.accountsettings.label.config" />                
+                <html:table flex="1">
+                    <html:tr>
+                        <html:td style="margin-right:1ex;">
+                            <vbox pack="center">
+                                <label style="text-align:left" control="tbsync.accountsettings.pref.accountname" value="__EAS4TBSYNCMSG_pref.AccountName__" />
+                            </vbox>
+                        </html:td>
+                        <html:td width="100%">
+                            <html:input id="tbsync.accountsettings.pref.accountname" />
+                        </html:td>
+                    </html:tr>
+                    
+                    <html:tr>
+                        <html:td style="margin-right:1ex;" >
+                            <vbox pack="center">
+                                <label class="lockIfConnected" style="text-align:left" control="tbsync.accountsettings.pref.user" value="__EAS4TBSYNCMSG_pref.UserName__" />
+                            </vbox>
+                        </html:td>
+                        <html:td>
+                            <html:input class="lockIfConnected" tooltiptext="__EAS4TBSYNCMSG_pref.UserNameDescription__" id="tbsync.accountsettings.pref.user" />
+                        </html:td>
+                    </html:tr>
+                    
+                    <html:tr>
+                        <html:td style="margin-right:1ex;" >
+                            <vbox pack="center">
+                                <label class="lockIfConnected" style="text-align:left" control="tbsync.accountsettings.pref.host" value="__EAS4TBSYNCMSG_pref.ServerName__" />
+                            </vbox>
+                        </html:td>
+                        <html:td>
+                            <html:input class="lockIfConnected"  tooltiptext="__EAS4TBSYNCMSG_pref.ServerNameDescription__" id="tbsync.accountsettings.pref.host" onblur="tbSyncEditAccountOverlay.stripHost(document);" />
+                        </html:td>
+                    </html:tr>
+
+                    <html:tr>
+                        <html:td style="margin-right:1ex;" >
+                            <hbox/>
+                        </html:td>
+                        <html:td>
+                            <checkbox class="lockIfConnected" style="margin-bottom:1ex" id="tbsync.accountsettings.pref.https" label="__EAS4TBSYNCMSG_pref.usehttps__"  />
+                        </html:td>
+                    </html:tr>
+                    
+                    <html:tr>
+                        <html:td style="margin-right:1ex;" >
+                            <vbox id="asversion.hook" pack="center">
+                                <label class="lockIfConnected"  style="text-align:left" control="tbsync.accountsettings.pref.asversionselected" value="__EAS4TBSYNCMSG_pref.ActiveSyncVersion__" />
+                            </vbox>
+                        </html:td>
+                        <html:td>
+                            <menulist flex="0" id="tbsync.accountsettings.pref.asversionselected" class="lockIfConnected">
+                                <menupopup id="asversion.popup">
+                                    <menuitem label="__EAS4TBSYNCMSG_pref.autodetect__" value="auto" />
+                                    <menuitem label="v2.5" value="2.5" />
+                                    <menuitem label="v14.0" value="14.0" />
+                                </menupopup>
+                            </menulist>
+                        </html:td>
+                    </html:tr>
+
+                    <html:tr>
+                        <html:td style="margin-right:1ex;" >
+                            <label class="lockIfConnected" style="text-align:left" value="__EAS4TBSYNCMSG_pref.DeviceId__" />
+                        </html:td>
+                        <html:td>
+                            <label value="" disabled="true" id="tbsync.accountsettings.pref.deviceId" />
+                        </html:td>
+                    </html:tr>
+                </html:table>
+
+                <vbox flex="1" />
+                <vbox class="showIfConnected">
+                    <hbox>
+                        <vbox pack="center"><image src="chrome://tbsync/content/skin/info16.png" /></vbox>
+                        <description flex="1">__EAS4TBSYNCMSG_manager.lockedsettings.description__</description>
+                    </hbox>
+                </vbox>
+
+        </vbox>
+    </tabpanel>
+
+    <tabpanel id="manager.tabpanels.syncsettings" appendto="manager.tabpanels" flex="1" orient="vertical"><!-- SYNC SETTINGS -->
+          <vbox flex="1">
+                <label style="margin-left:0; margin-bottom: 1ex;" class="header lockIfConnected" value="__EAS4TBSYNCMSG_pref.generaloptions__"/>
+                <vbox>                            
+                    <checkbox class="lockIfConnected" id="tbsync.accountsettings.pref.provision" label="__EAS4TBSYNCMSG_pref.provision__"  />
+                </vbox>                            
+
+                <label style="margin-left:0; margin-bottom: 1ex; margin-top: 3ex" class="header lockIfConnected" value="__EAS4TBSYNCMSG_pref.contactoptions__"/>
+                <vbox>                            
+                    <checkbox class="lockIfConnected" id="tbsync.accountsettings.pref.displayoverride" label="__EAS4TBSYNCMSG_pref.displayoverride__" />
+                    <hbox align="center">
+                        <description id="separator.hook" class="lockIfConnected" flex="0">__EAS4TBSYNCMSG_pref.seperator.description__</description>
+                        <menulist id="tbsync.accountsettings.pref.seperator" class="lockIfConnected">
+                            <menupopup id="separator.popup">
+                                <menuitem label="__EAS4TBSYNCMSG_pref.seperator.linebreak__" value="10" />
+                                <menuitem label="__EAS4TBSYNCMSG_pref.seperator.comma__" value="44" />
+                            </menupopup>
+                        </menulist>                            
+                    </hbox>
+                </vbox>                            
+
+                <label style="margin-left:0; margin-bottom: 1ex; margin-top: 3ex" class="header lockIfConnected" value="__EAS4TBSYNCMSG_pref.calendaroptions__"/>
+                <vbox>                            
+                    <hbox align="center">
+                        <description id="synclimit.hook" class="lockIfConnected" flex="0">__EAS4TBSYNCMSG_pref.synclimit.description__</description>
+                        <menulist id="tbsync.accountsettings.pref.synclimit" class="lockIfConnected">
+                            <menupopup id="synclimit.popup">
+                                <menuitem label="__EAS4TBSYNCMSG_pref.synclimit.all__" value="0" />
+                                <menuitem label="__EAS4TBSYNCMSG_pref.synclimit.2weeks__" value="4" />
+                                <menuitem label="__EAS4TBSYNCMSG_pref.synclimit.1month__" value="5" />
+                                <menuitem label="__EAS4TBSYNCMSG_pref.synclimit.3month__" value="6" />
+                                <menuitem label="__EAS4TBSYNCMSG_pref.synclimit.6month__" value="7" />
+                            </menupopup>
+                        </menulist>                            
+                    </hbox>
+                </vbox>                            
+
+
+                <vbox flex="1" />
+                <vbox class="showIfConnected">
+                    <hbox>
+                        <vbox pack="center"><image src="chrome://tbsync/content/skin/info16.png" /></vbox>
+                        <description flex="1">__EAS4TBSYNCMSG_manager.lockedsettings.description__</description>
+                    </hbox>
+                </vbox>
+            </vbox>
+    </tabpanel>
+
+</overlay>