diff --git a/mailnews/ui/messenger/resources/Makefile.in b/mailnews/ui/messenger/resources/Makefile.in index fd98e88bb5a8..e3531dfcea87 100644 --- a/mailnews/ui/messenger/resources/Makefile.in +++ b/mailnews/ui/messenger/resources/Makefile.in @@ -72,7 +72,10 @@ EXPORT_RESOURCE_SAMPLES = \ $(srcdir)/FilterListDialog.xul \ $(srcdir)/FilterEditor.xul \ $(srcdir)/FilterEditor.js \ - $(srcdir)/test1.html \ + $(srcdir)/subscribe.xul \ + $(srcdir)/check.gif \ + $(srcdir)/dot.gif \ + $(srcdir)/subscribe.css \ $(NULL) EXPORT_RESOURCE_SAMPLES_TO_REMOVE := $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES)) diff --git a/mailnews/ui/messenger/resources/check.gif b/mailnews/ui/messenger/resources/check.gif new file mode 100644 index 000000000000..ba56d26a9f90 Binary files /dev/null and b/mailnews/ui/messenger/resources/check.gif differ diff --git a/mailnews/ui/messenger/resources/commandglue.js b/mailnews/ui/messenger/resources/commandglue.js index e47b7c8b712b..bde5c36f359f 100644 --- a/mailnews/ui/messenger/resources/commandglue.js +++ b/mailnews/ui/messenger/resources/commandglue.js @@ -84,6 +84,11 @@ function MsgAccountManager() } } +function MsgSubscribe() +{ + dump('open subscribe window.\n'); +} + function LoadMessage(messageNode) { var uri = messageNode.getAttribute('id'); diff --git a/mailnews/ui/messenger/resources/dot.gif b/mailnews/ui/messenger/resources/dot.gif new file mode 100644 index 000000000000..62c6a4e2c124 Binary files /dev/null and b/mailnews/ui/messenger/resources/dot.gif differ diff --git a/mailnews/ui/messenger/resources/folderPane.xul b/mailnews/ui/messenger/resources/folderPane.xul index 9511b83730a0..59b1088aead1 100644 --- a/mailnews/ui/messenger/resources/folderPane.xul +++ b/mailnews/ui/messenger/resources/folderPane.xul @@ -6,12 +6,6 @@ - - - - - - ]> diff --git a/mailnews/ui/messenger/resources/makefile.win b/mailnews/ui/messenger/resources/makefile.win index 38d5def9c6cc..77a149af5809 100644 --- a/mailnews/ui/messenger/resources/makefile.win +++ b/mailnews/ui/messenger/resources/makefile.win @@ -64,7 +64,10 @@ install:: $(MAKE_INSTALL) FilterListDialog.xul $(DIST)\bin\res\mailnews\messenger $(MAKE_INSTALL) FilterEditor.xul $(DIST)\bin\res\mailnews\messenger $(MAKE_INSTALL) FilterEditor.js $(DIST)\bin\res\mailnews\messenger - + $(MAKE_INSTALL) subscribe.xul $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) check.gif $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) dot.gif $(DIST)\bin\res\mailnews\messenger + $(MAKE_INSTALL) subscribe.css $(DIST)\bin\res\mailnews\messenger clobber:: rm -f $(DIST)\res\mailnews\messenger\mailshell.xul @@ -99,5 +102,8 @@ clobber:: rm -f $(DIST)\res\mailnews\messenger\FilterListDialog.xul rm -f $(DIST)\res\mailnews\messenger\FilterEditor.xul rm -f $(DIST)\res\mailnews\messenger\FilterEditor.js - + rm -f $(DIST)\res\mailnews\messenger\subscribe.xul + rm -f $(DIST)\res\mailnews\messenger\check.gif + rm -f $(DIST)\res\mailnews\messenger\dot.gif + rm -f $(DIST)\res\mailnews\messenger\subscribe.css diff --git a/mailnews/ui/messenger/resources/subscribe.css b/mailnews/ui/messenger/resources/subscribe.css new file mode 100644 index 000000000000..8dd074008d37 --- /dev/null +++ b/mailnews/ui/messenger/resources/subscribe.css @@ -0,0 +1,77 @@ +window { + display: block; + background-color:white; +} + +tree { + display: table; + background-color:white; + border: none; + border-spacing: 0px; + //border-collapse: collapse; + width: 100% +} + +treeitem { + display: table-row; +} + +treehead { + display: table-header-group; +} + +treebody { + display: table-row-group; +} + +treecell { + display: table-cell; + color: black; + font-family: Verdana; + font-size: 10pt; +} + +treecell[selectedcell] { + background-color: #666699; + color: white; +} + +treehead treeitem treecell { + font-size: 9pt; + background-color: #666699; + border: thin darkgray solid; + color: white; +} + +treeitem > treecell > titledbutton { + height: 16px; + width: 16px; + list-style-image: url("chrome://messenger/skin/closedMailFolder.gif"); +} + +treeitem[open="true"] > treecell > titledbutton { + height: 16px; + width: 16px; + list-style-image: url("chrome://messenger/skin/openMailFolder.gif"); +} + +treeitem[SpecialFolder="Inbox"] > treecell > titledbutton { + vertical-align: bottom; + height: 16px; + width: 16px; + list-style-image: url("chrome://messenger/skin/closedInbox.gif"); +} + +treeitem[SpecialFolder="Trash"] > treecell > titledbutton { + vertical-align: bottom; + height: 16px; + width: 16px; + list-style-image: url("chrome://messenger/skin/closedTrash.gif"); +} + +treeitem[SpecialFolder="Unsent Messages"] > treecell > titledbutton { + vertical-align: bottom; + height: 16px; + width: 16px; + list-style-image: url("chrome://messenger/skin/closedOutbox.gif"); +} diff --git a/mailnews/ui/messenger/resources/subscribe.xul b/mailnews/ui/messenger/resources/subscribe.xul new file mode 100644 index 000000000000..f5e049574d47 --- /dev/null +++ b/mailnews/ui/messenger/resources/subscribe.xul @@ -0,0 +1,213 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> + + + + + + + &allTab.label; + &searchTab.label; + &newTab.label; + + + + + + + &nameText.label; + + + + + + + + &nameColumn.label; + + &messagesColumn.label; + + + + + tintin + + + + + news + + + + + news.mozilla.org + + + + + + + + + + + + + + + + + + + + + + + + + + + + &searchFor.label; + + + + + + + + &nameColumn.label; + + &messagesColumn.label; + + + + + a + + + + + b + + + + + c + + + + + + + + + + + + + + + + + + + + + + &newText.label; + + + + + + + &nameColumn.label; + + &messagesColumn.label; + + + + + 1 + + + + + 2 + + + + + 3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mailnews/ui/messenger/resources/widgetglue.js b/mailnews/ui/messenger/resources/widgetglue.js index 7234a6509b54..ef42ae3d4e34 100644 --- a/mailnews/ui/messenger/resources/widgetglue.js +++ b/mailnews/ui/messenger/resources/widgetglue.js @@ -262,7 +262,6 @@ function MsgSaveAsFile() {} function MsgSaveAsTemplate() {} function MsgSendUnsentMsg() {} function MsgUpdateMsgCount() {} -function MsgSubscribe() {} function MsgRenameFolder() {} function MsgEmptyTrash() {} function MsgCompactFolders() {}