[Pkg-mozext-commits] [firetray] 20/33: Make mail pref pane more horizontal.
David Prévot
taffit at moszumanska.debian.org
Fri Oct 23 21:35:11 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository firetray.
commit febf0b3d3ccc4e5a7387af6d966e78e4c67780b7
Author: foudfou <foudil.newbie+git at gmail.com>
Date: Mon Aug 24 03:03:49 2015 +0200
Make mail pref pane more horizontal.
---
src/chrome/content/options.xul | 329 +++++++++++++++++++++--------------------
1 file changed, 169 insertions(+), 160 deletions(-)
diff --git a/src/chrome/content/options.xul b/src/chrome/content/options.xul
index 56a5cc0..d1dc440 100644
--- a/src/chrome/content/options.xul
+++ b/src/chrome/content/options.xul
@@ -155,178 +155,187 @@
<vbox align="left" flex="1">
- <checkbox id="ui_mail_notification_enabled"
- label="&mail_notification_enabled.label;"
- class="header"
- accesskey="&mail_notification_enabled.accesskey;"
- preference="pref_mail_notification_enabled"
- oncommand="firetrayUIOptions.toggleNotifications(this.checked)"/>
-
- <radiogroup id="ui_message_count_type" preference="pref_message_count_type"
- oncommand="firetrayUIOptions.updateMessageCountSettings()">
- <hbox align="center" flex="1">
- <label control="ui_message_count_type" observes="broadcaster-notification-disabled"
- value="&message_count_type.label;" accesskey="&message_count_type.accesskey;" />
- <radio id="ui_message_count_type_unread" label="&message_count_type_unread;"
- observes="broadcaster-notification-disabled"/>
- <radio id="ui_message_count_type_new" label="&message_count_type_new;"
- tooltiptext="&message_count_type_new.tooltip;"
- observes="broadcaster-notification-disabled"/>
- </hbox>
- </radiogroup>
-
- <groupbox id="ui_mail_notification" flex="1">
- <caption>
- <label id="ui_mail_notification_type_label"
- value="&mail_notification_type.label;"
- tooltiptext="&mail_notification_type.tooltip;"
- observes="broadcaster-notification-disabled" />
- </caption>
-
- <radiogroup id="ui_radiogroup_mail_notification" preference="pref_mail_notification_type">
- <hbox id="ui_mail_notification_unread_count">
- <radio id="ui_radio_mail_notification_unread_count" label="&mail_notification_unread_count.label;"
- accesskey="&mail_notification_unread_count.accesskey;"
- oncommand="firetrayUIOptions.updateNotificationSettings()"
- observes="broadcaster-notification-disabled" />
- <hbox id="icon_text_color" align="center">
- <label value="&icon_text_color;" accesskey="&icon_text_color.accesskey;"
- control="btn_icon_text_color"
+ <hbox>
+ <vbox id="ui_mail_col1" flex="1">
+
+ <checkbox id="ui_mail_notification_enabled"
+ label="&mail_notification_enabled.label;"
+ class="header"
+ accesskey="&mail_notification_enabled.accesskey;"
+ preference="pref_mail_notification_enabled"
+ oncommand="firetrayUIOptions.toggleNotifications(this.checked)"/>
+
+ <radiogroup id="ui_message_count_type" preference="pref_message_count_type"
+ oncommand="firetrayUIOptions.updateMessageCountSettings()">
+ <hbox align="center" flex="1">
+ <label control="ui_message_count_type" observes="broadcaster-notification-disabled"
+ value="&message_count_type.label;" accesskey="&message_count_type.accesskey;" />
+ <radio id="ui_message_count_type_unread" label="&message_count_type_unread;"
+ observes="broadcaster-notification-disabled"/>
+ <radio id="ui_message_count_type_new" label="&message_count_type_new;"
+ tooltiptext="&message_count_type_new.tooltip;"
observes="broadcaster-notification-disabled"/>
- <colorpicker id="btn_icon_text_color" type="button"
- preference="pref_icon_text_color"
- onchange="firetray.Messaging.updateIcon();"
- observes="broadcaster-notification-disabled"/>
</hbox>
- </hbox>
- <hbox>
- <radio id="ui_radio_mail_notification_newmail_icon" label="&mail_notification_newmail_icon.label;"
- accesskey="&mail_notification_newmail_icon.accesskey;"
- oncommand="firetrayUIOptions.updateNotificationSettings()"
- observes="broadcaster-notification-disabled"
- tooltiptext="&icon_themed.tooltip;" />
- <hbox id="newmail_icon_names">
- <textbox id="radio_mail_notification_newmail_icon_name1" size="12"
- placeholder="&app_icon_themed_name;" flex="1"
- observes="broadcaster-notification-disabled"
- onchange="firetrayUIOptions.updateNewMailIconNames(this);" />
- <textbox id="radio_mail_notification_newmail_icon_name2" size="12"
- placeholder="&app_icon_themed_name;" flex="1"
+ </radiogroup>
+
+ <groupbox id="ui_mail_notification" flex="1">
+ <caption>
+ <label id="ui_mail_notification_type_label"
+ value="&mail_notification_type.label;"
+ tooltiptext="&mail_notification_type.tooltip;"
+ observes="broadcaster-notification-disabled" />
+ </caption>
+
+ <radiogroup id="ui_radiogroup_mail_notification" preference="pref_mail_notification_type">
+ <hbox id="ui_mail_notification_unread_count">
+ <radio id="ui_radio_mail_notification_unread_count" label="&mail_notification_unread_count.label;"
+ accesskey="&mail_notification_unread_count.accesskey;"
+ oncommand="firetrayUIOptions.updateNotificationSettings()"
+ observes="broadcaster-notification-disabled" />
+ <hbox id="icon_text_color" align="center">
+ <label value="&icon_text_color;" accesskey="&icon_text_color.accesskey;"
+ control="btn_icon_text_color"
+ observes="broadcaster-notification-disabled"/>
+ <colorpicker id="btn_icon_text_color" type="button"
+ preference="pref_icon_text_color"
+ onchange="firetray.Messaging.updateIcon();"
+ observes="broadcaster-notification-disabled"/>
+ </hbox>
+ </hbox>
+ <hbox>
+ <radio id="ui_radio_mail_notification_newmail_icon" label="&mail_notification_newmail_icon.label;"
+ accesskey="&mail_notification_newmail_icon.accesskey;"
+ oncommand="firetrayUIOptions.updateNotificationSettings()"
observes="broadcaster-notification-disabled"
- onchange="firetrayUIOptions.updateNewMailIconNames(this);" />
- <textbox id="radio_mail_notification_newmail_icon_name3" size="12"
- placeholder="&app_icon_themed_name;" flex="1"
- onchange="firetrayUIOptions.updateNewMailIconNames(this);"
- disabled="true"/>
- </hbox>
- </hbox>
- <hbox>
- <radio id="ui_radio_mail_notification_mail_icon_custom" label="&mail_notification_mail_icon_custom.label;"
- accesskey="&mail_notification_mail_icon_custom.accesskey;"
- oncommand="firetrayUIOptions.updateNotificationSettings()"
- observes="broadcaster-notification-disabled" />
- <hbox id="mail_icon_custom" align="center" flex="1" >
- <textbox id="mail_icon_custom_filename" preference="pref_mail_icon_custom"
- observes="broadcaster-notification-disabled" flex="1" />
- <button id="mail_icon_custom_select" label="&choose;"
- accesskey="&choose.accesskey;"
- observes="broadcaster-notification-disabled"
- oncommand="firetrayUIOptions.chooseMailIconFile()" />
+ tooltiptext="&icon_themed.tooltip;" />
+ <hbox id="newmail_icon_names">
+ <textbox id="radio_mail_notification_newmail_icon_name1" size="12"
+ placeholder="&app_icon_themed_name;" flex="1"
+ observes="broadcaster-notification-disabled"
+ onchange="firetrayUIOptions.updateNewMailIconNames(this);" />
+ <textbox id="radio_mail_notification_newmail_icon_name2" size="12"
+ placeholder="&app_icon_themed_name;" flex="1"
+ observes="broadcaster-notification-disabled"
+ onchange="firetrayUIOptions.updateNewMailIconNames(this);" />
+ <textbox id="radio_mail_notification_newmail_icon_name3" size="12"
+ placeholder="&app_icon_themed_name;" flex="1"
+ onchange="firetrayUIOptions.updateNewMailIconNames(this);"
+ disabled="true"/>
+ </hbox>
+ </hbox>
+ <hbox>
+ <radio id="ui_radio_mail_notification_mail_icon_custom" label="&mail_notification_mail_icon_custom.label;"
+ accesskey="&mail_notification_mail_icon_custom.accesskey;"
+ oncommand="firetrayUIOptions.updateNotificationSettings()"
+ observes="broadcaster-notification-disabled" />
+ <hbox id="mail_icon_custom" align="center" flex="1" >
+ <textbox id="mail_icon_custom_filename" preference="pref_mail_icon_custom"
+ observes="broadcaster-notification-disabled" flex="1" />
+ <button id="mail_icon_custom_select" label="&choose;"
+ accesskey="&choose.accesskey;"
+ observes="broadcaster-notification-disabled"
+ oncommand="firetrayUIOptions.chooseMailIconFile()" />
+ </hbox>
+ </hbox>
+
+ </radiogroup>
+
+ </groupbox>
+
+ <!-- NOTE: groupbox and caption don't have a 'disabled' attribute !! -->
+ <groupbox id="unread_count_folder_exceptions" flex="1">
+ <!-- label extracted from caption so we can disable it -->
+ <caption>
+ <label id="unread_count_folder_exceptions_caption_label"
+ value="&unread_count_folder_exceptions.label;"
+ tooltiptext="&unread_count_folder_exceptions.tooltip;"
+ observes="broadcaster-notification-disabled" />
+ </caption>
+
+ <listbox id="excluded_folders_list" rows="7" flex="1" seltype="multiple"
+ tooltiptext="&excluded_folders_list.tooltip;"
+ preference="pref_excluded_folders_flags"
+ onsynctopreference="return firetrayUIOptions.saveExcludedFoldersFlags(this);"
+ observes="broadcaster-notification-disabled" />
+ </groupbox>
+
+ </vbox>
+ <vbox id="ui_mail_col2" flex="1">
+
+ <groupbox id="unread_count_account_exceptions" flex="1">
+ <!-- label extracted from caption so we can disable it -->
+ <caption>
+ <label id="unread_count_account_exceptions_caption_label"
+ value="&unread_count_account_exceptions.label;"
+ tooltiptext="&unread_count_account_exceptions.tooltip;"
+ observes="broadcaster-notification-disabled" />
+ </caption>
+
+ <hbox>
+ <checkbox id="ui_folder_count_recursive"
+ label="&folder_count_recursive.label;"
+ accesskey="&folder_count_recursive.accesskey;"
+ preference="pref_folder_count_recursive"
+ observes="broadcaster-notification-disabled"/>
+
+ <checkbox id="ui_only_favorite_folders"
+ label="&only_favorite_folders.label;"
+ accesskey="&only_favorite_folders.accesskey;"
+ preference="pref_only_favorite_folders"
+ tooltiptext="&only_favorite_folders.tooltip;"
+ observes="broadcaster-notification-disabled"/>
</hbox>
+
+ <tree id="ui_tree_mail_accounts" flex="1" rows="10" minwidth="400"
+ seltype="single" editable="true" hidecolumnpicker="false"
+ observes="broadcaster-notification-disabled"
+ preference-editable="true"
+ preference="pref_mail_accounts"
+ onsynctopreference="return firetrayUIOptions.saveTreeAccountsOrServerTypes();">
+ <treecols>
+ <treecol id="account_or_server_type_name" editable="false" flex="2"
+ persist="width" primary="true" label="&account_or_server_type_name;"
+ tooltiptext="&account_or_server_type_name.tooltip;"/>
+ <splitter class="tree-splitter" resizeafter="grow" />
+ <treecol id="account_or_server_type_excluded" type="checkbox" editable="true"
+ label="&account_or_server_type_excluded;" flex="1" persist="width"
+ tooltiptext="&account_or_server_type_excluded.tooltip;"/>
+ <splitter class="tree-splitter" resizeafter="grow" />
+ <treecol id="account_or_server_type_order" editable="true"
+ persist="width" flex="1" hidden= "true"
+ label="&account_or_server_type_order;"
+ tooltiptext="&account_or_server_type_order.tooltip;"/>
+ </treecols>
+ <treechildren id="ui_mail_accounts" flex="1"/>
+ </tree>
+
+ </groupbox>
+
+ <hbox align="center">
+ <label control="ui_mail_change_trigger" value="&mail_change_trigger.label;"
+ accesskey="&mail_change_trigger.accesskey;" />
+ <textbox id="ui_mail_change_trigger" size="18" placeholder="&mail_change_trigger.placeholder;"
+ tooltiptext="&mail_change_trigger.tooltip;" flex="1"
+ preference="pref_mail_change_trigger"
+ onsynctopreference="return firetrayUIOptions.saveMailChangeTrigger(this);"
+ observes="broadcaster-notification-disabled" />
</hbox>
- </radiogroup>
-
- </groupbox>
-
- <!-- NOTE: groupbox and caption don't have a 'disabled' attribute !! -->
- <groupbox id="unread_count_folder_exceptions" flex="1">
- <!-- label extracted from caption so we can disable it -->
- <caption>
- <label id="unread_count_folder_exceptions_caption_label"
- value="&unread_count_folder_exceptions.label;"
- tooltiptext="&unread_count_folder_exceptions.tooltip;"
- observes="broadcaster-notification-disabled" />
- </caption>
-
- <listbox id="excluded_folders_list" rows="7" flex="1" seltype="multiple"
- tooltiptext="&excluded_folders_list.tooltip;"
- preference="pref_excluded_folders_flags"
- onsynctopreference="return firetrayUIOptions.saveExcludedFoldersFlags(this);"
- observes="broadcaster-notification-disabled" />
- </groupbox>
-
- <groupbox id="unread_count_account_exceptions" flex="1">
- <!-- label extracted from caption so we can disable it -->
- <caption>
- <label id="unread_count_account_exceptions_caption_label"
- value="&unread_count_account_exceptions.label;"
- tooltiptext="&unread_count_account_exceptions.tooltip;"
- observes="broadcaster-notification-disabled" />
- </caption>
-
- <hbox>
- <checkbox id="ui_folder_count_recursive"
- label="&folder_count_recursive.label;"
- accesskey="&folder_count_recursive.accesskey;"
- preference="pref_folder_count_recursive"
+ <checkbox id="ui_mail_get_attention"
+ label="&mail_get_attention.label;"
+ accesskey="&mail_get_attention.accesskey;"
+ preference="pref_mail_get_attention"
observes="broadcaster-notification-disabled"/>
- <checkbox id="ui_only_favorite_folders"
- label="&only_favorite_folders.label;"
- accesskey="&only_favorite_folders.accesskey;"
- preference="pref_only_favorite_folders"
- tooltiptext="&only_favorite_folders.tooltip;"
+ <checkbox id="ui_nomail_hides_icon"
+ label="&nomail_hides_icon.label;"
+ accesskey="&nomail_hides_icon.accesskey;"
+ preference="pref_nomail_hides_icon"
observes="broadcaster-notification-disabled"/>
- </hbox>
- <tree id="ui_tree_mail_accounts" flex="1" rows="10" minwidth="400"
- seltype="single" editable="true" hidecolumnpicker="false"
- observes="broadcaster-notification-disabled"
- preference-editable="true"
- preference="pref_mail_accounts"
- onsynctopreference="return firetrayUIOptions.saveTreeAccountsOrServerTypes();">
- <treecols>
- <treecol id="account_or_server_type_name" editable="false" flex="2"
- persist="width" primary="true" label="&account_or_server_type_name;"
- tooltiptext="&account_or_server_type_name.tooltip;"/>
- <splitter class="tree-splitter" resizeafter="grow" />
- <treecol id="account_or_server_type_excluded" type="checkbox" editable="true"
- label="&account_or_server_type_excluded;" flex="1" persist="width"
- tooltiptext="&account_or_server_type_excluded.tooltip;"/>
- <splitter class="tree-splitter" resizeafter="grow" />
- <treecol id="account_or_server_type_order" editable="true"
- persist="width" flex="1" hidden= "true"
- label="&account_or_server_type_order;"
- tooltiptext="&account_or_server_type_order.tooltip;"/>
- </treecols>
- <treechildren id="ui_mail_accounts" flex="1"/>
- </tree>
-
- </groupbox>
-
- <hbox align="center">
- <label control="ui_mail_change_trigger" value="&mail_change_trigger.label;"
- accesskey="&mail_change_trigger.accesskey;" />
- <textbox id="ui_mail_change_trigger" size="18" placeholder="&mail_change_trigger.placeholder;"
- tooltiptext="&mail_change_trigger.tooltip;" flex="1"
- preference="pref_mail_change_trigger"
- onsynctopreference="return firetrayUIOptions.saveMailChangeTrigger(this);"
- observes="broadcaster-notification-disabled" />
+ </vbox>
</hbox>
- <checkbox id="ui_mail_get_attention"
- label="&mail_get_attention.label;"
- accesskey="&mail_get_attention.accesskey;"
- preference="pref_mail_get_attention"
- observes="broadcaster-notification-disabled"/>
-
- <checkbox id="ui_nomail_hides_icon"
- label="&nomail_hides_icon.label;"
- accesskey="&nomail_hides_icon.accesskey;"
- preference="pref_nomail_hides_icon"
- observes="broadcaster-notification-disabled"/>
-
</vbox>
</prefpane>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firetray.git
More information about the Pkg-mozext-commits
mailing list