From b3e9c8de30ee6e40d106b1c060c7cd04588ab85d Mon Sep 17 00:00:00 2001 From: Philipp Kewisch Date: Wed, 9 Sep 2009 11:29:06 +0200 Subject: [PATCH 01/15] Fix bug 461744 - Missing icon on minimonth dropdown button in miniday in today pane (regression). r=decathlon --HG-- extra : rebase_source : a462a8d2f0e8888ba459ec983e6ca085112fb257 --- calendar/base/content/today-pane.js | 2 +- calendar/base/content/today-pane.xul | 10 ++++------ calendar/base/themes/pinstripe/today-pane.css | 18 ++++++++++------- calendar/base/themes/winstripe/today-pane.css | 20 +++++++++++-------- 4 files changed, 28 insertions(+), 22 deletions(-) diff --git a/calendar/base/content/today-pane.js b/calendar/base/content/today-pane.js index 8ac6e7aa02..0caf0e1567 100644 --- a/calendar/base/content/today-pane.js +++ b/calendar/base/content/today-pane.js @@ -188,7 +188,7 @@ var TodayPane = { newdatetime = newdatetime.getInTimezone(calendarDefaultTimezone()); // XXX this doesn't really fit into this function - document.getElementById("aMinimonthPopupset").hidePopup(); + document.getElementById("miniday-month-panel").hidePopup(); return this.setDay(newdatetime, true); }, diff --git a/calendar/base/content/today-pane.xul b/calendar/base/content/today-pane.xul index 2deec7ce7f..c5ab6e4cda 100644 --- a/calendar/base/content/today-pane.xul +++ b/calendar/base/content/today-pane.xul @@ -177,14 +177,12 @@ - - + type="menu"> + - - + + diff --git a/calendar/base/themes/pinstripe/today-pane.css b/calendar/base/themes/pinstripe/today-pane.css index bd454eaf76..47cb87251d 100644 --- a/calendar/base/themes/pinstripe/today-pane.css +++ b/calendar/base/themes/pinstripe/today-pane.css @@ -71,11 +71,6 @@ font-size: 18px; } -#miniday-dropdown-button { - margin: 2px; - -moz-user-focus: normal; -} - .monthlabel { -moz-margin-end: 0px; } @@ -143,16 +138,25 @@ -moz-user-focus: normal; } -#miniday-dropdown-button > .toolbarbutton-icon, - .miniday-nav-buttons > .toolbarbutton-icon { +.miniday-nav-buttons > .toolbarbutton-icon { margin: 1px; } +#miniday-dropdown-button { + margin: 2px; + -moz-user-focus: normal; +} + +#miniday-dropdown-button > .toolbarbutton-icon, #miniday-dropdown-button > .toolbarbutton-text, .miniday-nav-buttons > .toolbarbutton-text { display: none; } +#miniday-dropdown-button > .toolbarbutton-menu-dropmarker { + -moz-padding-start: 0; +} + .today-closebutton { list-style-image: url("chrome://global/skin/icons/closetab.png") !important; } diff --git a/calendar/base/themes/winstripe/today-pane.css b/calendar/base/themes/winstripe/today-pane.css index f2faf1d507..021f7f89e1 100644 --- a/calendar/base/themes/winstripe/today-pane.css +++ b/calendar/base/themes/winstripe/today-pane.css @@ -70,12 +70,6 @@ font-size: 18px; } -#miniday-dropdown-button { - margin: 2px; - max-width: 15px; - -moz-user-focus: normal; -} - .monthlabel { -moz-margin-end: 0px; } @@ -143,16 +137,26 @@ -moz-image-region: rect(26px 21px 39px 16px); } -#miniday-dropdown-button > .toolbarbutton-icon, - .miniday-nav-buttons > .toolbarbutton-icon { +.miniday-nav-buttons > .toolbarbutton-icon { margin: 1px; } +#miniday-dropdown-button { + margin: 2px; + max-width: 18px; + -moz-user-focus: normal; +} + +#miniday-dropdown-button > .toolbarbutton-icon, #miniday-dropdown-button > .toolbarbutton-text, .miniday-nav-buttons > .toolbarbutton-text { display: none; } +#miniday-dropdown-button > .toolbarbutton-menu-dropmarker { + -moz-padding-start: 0; +} + .today-closebutton { list-style-image: url("chrome://global/skin/icons/close.png"); -moz-image-region: rect(0 14px 14px 0); From 391ecf3d3d4390d8bb8ff235af6ba50a4ed6bf51 Mon Sep 17 00:00:00 2001 From: Martin Schroeder Date: Wed, 9 Sep 2009 13:04:33 +0200 Subject: [PATCH 02/15] Bug 507700 - WARNING: Illegal character in window name for Calendar. r=philipp --- calendar/base/content/dialogs/calendar-alarm-dialog.js | 2 +- calendar/base/src/calCalendarManager.js | 4 ++-- calendar/base/src/calUtils.js | 2 +- calendar/providers/gdata/content/gdata-migration.js | 2 +- calendar/resources/content/calendar.js | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/calendar/base/content/dialogs/calendar-alarm-dialog.js b/calendar/base/content/dialogs/calendar-alarm-dialog.js index 000f629715..781bb85d97 100644 --- a/calendar/base/content/dialogs/calendar-alarm-dialog.js +++ b/calendar/base/content/dialogs/calendar-alarm-dialog.js @@ -187,7 +187,7 @@ function openSnoozeWindow(event, aContainerItem) { var pos = ",left=" + (event.target.boxObject.screenX - 3) + ",top=" + (event.target.boxObject.screenY + event.target.boxObject.height - 3); window.openDialog(uri, - "Calendar:AlarmSnoozePopup", + "CalendarAlarmSnoozePopup", "chrome,dependent=yes,titlebar=no" + pos, aContainerItem); } diff --git a/calendar/base/src/calCalendarManager.js b/calendar/base/src/calCalendarManager.js index 75370407fe..21f228118a 100644 --- a/calendar/base/src/calCalendarManager.js +++ b/calendar/base/src/calCalendarManager.js @@ -302,12 +302,12 @@ calCalendarManager.prototype = { let win = wm.getMostRecentWindow("Extension:Manager") || cal.getCalendarWindow(); if (win) { - win.openDialog(uri, "Calendar:ProviderUninstallDialog", features, args); + win.openDialog(uri, "CalendarProviderUninstallDialog", features, args); } else { // Use the window watcher to open a parentless window. let ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"] .getService(Components.interfaces.nsIWindowWatcher); - ww.openWindow(null, uri, "Calendar:ProviderUninstallWindow", features, args); + ww.openWindow(null, uri, "CalendarProviderUninstallWindow", features, args); } diff --git a/calendar/base/src/calUtils.js b/calendar/base/src/calUtils.js index fb923f3699..50388b997f 100644 --- a/calendar/base/src/calUtils.js +++ b/calendar/base/src/calUtils.js @@ -305,7 +305,7 @@ function openCalendarWizard(aCallback) { */ function openCalendarProperties(aCalendar) { openDialog("chrome://calendar/content/calendar-properties-dialog.xul", - "Calendar:PropertiesDialog", + "CalendarPropertiesDialog", "chrome,titlebar,modal,resizable", {calendar: aCalendar}); } diff --git a/calendar/providers/gdata/content/gdata-migration.js b/calendar/providers/gdata/content/gdata-migration.js index 0e5a112afd..91e3ecc990 100644 --- a/calendar/providers/gdata/content/gdata-migration.js +++ b/calendar/providers/gdata/content/gdata-migration.js @@ -124,7 +124,7 @@ function gdata_migration_loader() { // view specific, so there is no good non-hacked way to do this. setTimeout(function() { window.openDialog("chrome://gdata-provider/content/gdata-migration-wizard.xul", - "Gdata:MigrationWizard", + "GdataMigrationWizard", "chrome,titlebar,modal,alwaysRaised"); }, 1000); } diff --git a/calendar/resources/content/calendar.js b/calendar/resources/content/calendar.js index a6288e6a78..3a061b2df0 100644 --- a/calendar/resources/content/calendar.js +++ b/calendar/resources/content/calendar.js @@ -230,7 +230,7 @@ function pickAndGoToDate() { getMinimonth().value = pickedDate; }; openDialog("chrome://sunbird/content/calendar-gotodate-dialog.xul", - "Calendar:GoToDateDialog", + "CalendarGoToDateDialog", "chrome,modal", {callback: callback, date: initialDate}); } From 85fc295226cea3df762e10713cde562189758c03 Mon Sep 17 00:00:00 2001 From: Philipp Kewisch Date: Wed, 9 Sep 2009 14:43:48 +0200 Subject: [PATCH 03/15] Fix bug 507215 - Creating repeating event/task fails [Status Code: 400 Bad Request Body: Entry can not contain both gd:when and gd:recurrence elements]. r=markus --HG-- extra : rebase_source : be65d9e16e811102aebd4cebb119f519161efc96 --- calendar/providers/gdata/components/calGoogleRequest.js | 2 -- calendar/providers/gdata/components/calGoogleUtils.js | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/calendar/providers/gdata/components/calGoogleRequest.js b/calendar/providers/gdata/components/calGoogleRequest.js index e9b7e13225..50fb34d25f 100644 --- a/calendar/providers/gdata/components/calGoogleRequest.js +++ b/calendar/providers/gdata/components/calGoogleRequest.js @@ -50,10 +50,8 @@ function calGoogleRequest(aSession) { calGoogleRequest.prototype = { /* Members */ - uri: null, mUploadContent: null, mUploadData: null, - responseListener: null, mSession: null, mExtraData: null, mQueryParameters: null, diff --git a/calendar/providers/gdata/components/calGoogleUtils.js b/calendar/providers/gdata/components/calGoogleUtils.js index 4e04d52595..d512375829 100644 --- a/calendar/providers/gdata/components/calGoogleUtils.js +++ b/calendar/providers/gdata/components/calGoogleUtils.js @@ -362,8 +362,11 @@ function ItemToXMLEntry(aItem, aAuthorEmail, aAuthorName) { // gd:when var duration = aItem.endDate.subtractDate(aItem.startDate); - entry.gd::when.@startTime = cal.toRFC3339(aItem.startDate); - entry.gd::when.@endTime = cal.toRFC3339(aItem.endDate); + if (!aItem.recurrenceInfo) { + // gd:when isn't allowed for recurring items where gd:recurrence is set + entry.gd::when.@startTime = cal.toRFC3339(aItem.startDate); + entry.gd::when.@endTime = cal.toRFC3339(aItem.endDate); + } // gd:reminder let alarms = aItem.getAlarms({}); From 1a02e61a62ad9b7543a5eb80e3346806c1e7af49 Mon Sep 17 00:00:00 2001 From: Magnus Melin Date: Wed, 9 Sep 2009 18:17:00 +0300 Subject: [PATCH 04/15] Bug 514829: [gnomestripe] the old style folder icons are used in a number of places (those where folder.png is referred to). ui-r=clarkbw, r=philor, sr=standard8, a=standard8 --- mail/themes/gnomestripe/jar.mn | 1 - mail/themes/gnomestripe/mail/folderMenus.css | 88 ++++++----- mail/themes/gnomestripe/mail/folderPane.css | 54 +++---- mail/themes/gnomestripe/mail/icons/folder.png | Bin 7051 -> 0 bytes .../gnomestripe/mail/msgSelectOffline.css | 149 +----------------- .../mail/newsblog/feed-subscriptions.css | 26 +-- mail/themes/gnomestripe/mail/subscribe.css | 40 ++--- mailnews/base/search/content/FilterEditor.xul | 1 + 8 files changed, 107 insertions(+), 252 deletions(-) delete mode 100755 mail/themes/gnomestripe/mail/icons/folder.png diff --git a/mail/themes/gnomestripe/jar.mn b/mail/themes/gnomestripe/jar.mn index a964797f1a..09696ec5a0 100644 --- a/mail/themes/gnomestripe/jar.mn +++ b/mail/themes/gnomestripe/jar.mn @@ -108,7 +108,6 @@ classic.jar: skin/classic/messenger/icons/cancel.png (mail/icons/cancel.png) skin/classic/messenger/icons/mail-toolbar.png (mail/icons/mail-toolbar.png) skin/classic/messenger/icons/mail-toolbar-small.png (mail/icons/mail-toolbar-small.png) - skin/classic/messenger/icons/folder.png (mail/icons/folder.png) skin/classic/messenger/icons/folder-pane.png (mail/icons/folder-pane.png) skin/classic/messenger/icons/folder-blank.png (mail/icons/folder-blank.png) skin/classic/messenger/icons/folder-new-star.png (mail/icons/folder-new-star.png) diff --git a/mail/themes/gnomestripe/mail/folderMenus.css b/mail/themes/gnomestripe/mail/folderMenus.css index e8c1463089..574238dc10 100644 --- a/mail/themes/gnomestripe/mail/folderMenus.css +++ b/mail/themes/gnomestripe/mail/folderMenus.css @@ -20,6 +20,7 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): + * Magnus Melin * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -41,95 +42,96 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -/* ::::: folder icons for menus ::::: */ +/* ::::: Folder icons for menus ::::: */ +/* Folders */ .folderMenuItem { - list-style-image: url("chrome://messenger/skin/icons/folder.png"); - -moz-image-region: rect(0 16px 16px 0); -} - -.folderMenuItem[open="true"] { - -moz-image-region: rect(0 32px 16px 16px); + list-style-image: url("moz-icon://stock/gtk-directory?size=menu"); } /* Newsgroup */ .folderMenuItem[ServerType="nntp"] { - -moz-image-region: rect(0 160px 16px 144px); + list-style-image: url("chrome://messenger/skin/icons/folder-pane.png"); + -moz-image-region: rect(208px 16px 224px 0px); } /* Feed */ .folderMenuItem[ServerType="rss"] { - list-style-image: url("chrome://messenger-newsblog/skin/icons/rss-feed.png"); - -moz-image-region: rect(0 16px 16px 0); + list-style-image: url("chrome://messenger/skin/icons/folder-pane.png"); + -moz-image-region: rect(112px 16px 128px 0px); } -/* Resets list-style-image for Feed Trash and Virtual folders */ -.folderMenuItem[ServerType="rss"][SpecialFolder="Trash"], -.folderMenuItem[ServerType="rss"][SpecialFolder="Virtual"] { - list-style-image: url("chrome://messenger/skin/icons/folder.png"); -} - -/* ..... special folders ..... */ - .folderMenuItem[SpecialFolder="Inbox"] { - -moz-image-region: rect(0 48px 16px 32px); + list-style-image: url("chrome://messenger/skin/icons/folder-pane.png"); + -moz-image-region: rect(64px 16px 80px 0px); } .folderMenuItem[SpecialFolder="Sent"] { - -moz-image-region: rect(0 64px 16px 48px); + list-style-image: url("chrome://messenger/skin/icons/folder-pane.png"); + -moz-image-region: rect(144px 16px 160px 0px); } .folderMenuItem[SpecialFolder="Outbox"] { - -moz-image-region: rect(0 80px 16px 64px); + list-style-image: url("chrome://messenger/skin/icons/folder-pane.png"); + -moz-image-region: rect(96px 16px 112px 0px); } -.folderMenuItem[SpecialFolder="Drafts"] { - -moz-image-region: rect(0 96px 16px 80px); +.folderMenuItem[SpecialFolder="Drafts"] { + list-style-image: url("chrome://messenger/skin/icons/folder-pane.png"); + -moz-image-region: rect(48px 16px 64px 0px); } -.folderMenuItem[SpecialFolder="Templates"] { - -moz-image-region: rect(0 112px 16px 96px); +.folderMenuItem[SpecialFolder="Templates"] { + list-style-image: url("chrome://messenger/skin/icons/folder-pane.png"); + -moz-image-region: rect(160px 16px 176px 0px); } .folderMenuItem[SpecialFolder="Junk"] { - -moz-image-region: rect(0 128px 16px 112px); + list-style-image: url("chrome://messenger/skin/icons/folder-pane.png"); + -moz-image-region: rect(80px 16px 96px 0px); } .folderMenuItem[SpecialFolder="Trash"] { - -moz-image-region: rect(0 144px 16px 128px); + list-style-image: url("chrome://messenger/skin/icons/folder-pane.png"); + -moz-image-region: rect(176px 16px 192px 0px); +} + +.folderMenuItem[SpecialFolder="Archive"] { + list-style-image: url("chrome://messenger/skin/icons/folder-pane.png"); + -moz-image-region: rect(192px 16px 208px 0px); } .folderMenuItem[SpecialFolder="Virtual"] { - -moz-image-region: rect(0 176px 16px 160px); + list-style-image: url("chrome://messenger/skin/icons/folder-pane.png"); + -moz-image-region: rect(128px 16px 144px 0px); + } -/* ..... servers ..... */ - +/** IMAP/POP/movemail account nodes */ .folderMenuItem[IsServer="true"] { - list-style-image: url("chrome://messenger/skin/icons/server.png"); - -moz-image-region: rect(0 16px 16px 0); + list-style-image: url("chrome://messenger/skin/icons/folder-pane.png"); + -moz-image-region: rect(16px 16px 32px 0px); } -.folderMenuItem[IsServer="true"][ServerType="imap"][IsSecure="true"], -.folderMenuItem[IsServer="true"][ServerType="pop3"][IsSecure="true"] { - -moz-image-region: rect(0 32px 16px 16px); -} - -/* Local folders */ +/* Local folders account node */ .folderMenuItem[IsServer="true"][ServerType="none"] { - -moz-image-region: rect(0 48px 16px 32px); + -moz-image-region: rect(0px 16px 16px 0px); } /* News server */ .folderMenuItem[IsServer="true"][ServerType="nntp"] { - -moz-image-region: rect(0 64px 16px 48px); + list-style-image: url("chrome://messenger/skin/icons/server.png"); + -moz-image-region: rect(0px 64px 16px 48px); } +/** Secure news server */ .folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] { - -moz-image-region: rect(0 80px 16px 64px) !important; + list-style-image: url("chrome://messenger/skin/icons/server.png"); + -moz-image-region: rect(0px 80px 16px 64px); } -/* Feed server */ +/* Feed account node */ .folderMenuItem[IsServer="true"][ServerType="rss"] { - list-style-image: url("chrome://messenger-newsblog/skin/icons/server-rss.png"); + list-style-image: url("chrome://messenger/skin/icons/folder-pane.png"); + -moz-image-region: rect(32px 16px 48px 0px); } diff --git a/mail/themes/gnomestripe/mail/folderPane.css b/mail/themes/gnomestripe/mail/folderPane.css index cda1894772..6b512e2c35 100644 --- a/mail/themes/gnomestripe/mail/folderPane.css +++ b/mail/themes/gnomestripe/mail/folderPane.css @@ -11,9 +11,7 @@ treechildren::-moz-tree-image(folderNameCol) { -moz-background-origin: border; background-image: url("moz-icon://stock/gtk-directory?size=menu"); list-style-image: url("chrome://messenger/skin/icons/folder-blank.png"); -} -treechildren::-moz-tree-image(folderNameCol) { -moz-margin-end: 2px; } @@ -27,24 +25,6 @@ treechildren::-moz-tree-image(folderNameCol, selected, open, newMessages-true) { list-style-image: url("chrome://messenger/skin/icons/folder-new-star.png"); } -/* ..... Newsgroup ..... */ - -.tabmail-tab[type="folder"][ServerType="nntp"] > .tab-image-middle > .tab-icon-image, -treechildren::-moz-tree-image(folderNameCol, serverType-nntp) { - background-image: none; - list-style-image: url("chrome://messenger/skin/icons/folder.png"); - -moz-image-region: rect(0 160px 16px 144px); -} - -/* ..... Feed ..... */ - -.tabmail-tab[type="folder"][ServerType="rss"] > .tab-image-middle > .tab-icon-image, -treechildren::-moz-tree-image(folderNameCol, serverType-rss) { - background-image: url("chrome://messenger/skin/icons/folder-pane.png"); - background-position: left -112px; - list-style-image: url("chrome://messenger/skin/icons/folder-blank.png"); -} - treechildren::-moz-tree-image(folderNameCol, serverType-rss, newMessages-true) { background-image: url("chrome://messenger/skin/icons/folder-pane.png"); background-position: left -112px; @@ -157,13 +137,24 @@ treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) { list-style-image: url("chrome://messenger/skin/icons/folder-blank.png"); } -/* ..... Newsgroup ..... */ -.tabmail-tab[type="folder"][ServerType="nntp"] > .tab-image-middle > .tab-icon-image { +/* ..... Newsgroup ..... */ + +.tabmail-tab[type="folder"][ServerType="nntp"] > .tab-image-middle > .tab-icon-image, +treechildren::-moz-tree-image(folderNameCol, serverType-nntp) { background-image: url("chrome://messenger/skin/icons/folder-pane.png"); background-position: left -208px; list-style-image: url("chrome://messenger/skin/icons/folder-blank.png"); } +/* ..... Feed ..... */ + +.tabmail-tab[type="folder"][ServerType="rss"] > .tab-image-middle > .tab-icon-image, +treechildren::-moz-tree-image(folderNameCol, serverType-rss) { + background-image: url("chrome://messenger/skin/icons/folder-pane.png"); + background-position: left -112px; + list-style-image: url("chrome://messenger/skin/icons/folder-blank.png"); +} + /* ..... Account nodes ..... */ .tabmail-tab[type="folder"][IsServer="true"] > .tab-image-middle > .tab-icon-image { -moz-margin-start: 0px; @@ -199,16 +190,20 @@ treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) { -moz-image-region: rect(0 80px 16px 64px); } -treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual, newMessages-true) { - list-style-image: url("chrome://messenger/skin/icons/folder.png"); - -moz-image-region: rect(16px 176px 32px 160px); -} - treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true), treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) { font-weight: bold; } +treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) { + background-position: left -16px; + list-style-image: url("chrome://messenger/skin/icons/folder-new-star.png"); +} + +treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual, newMessages-true) { + list-style-image: url("chrome://messenger/skin/icons/folder-new-star.png"); +} + /* ..... Mail server ..... */ treechildren::-moz-tree-image(folderNameCol, isServer-true) { @@ -217,11 +212,6 @@ treechildren::-moz-tree-image(folderNameCol, isServer-true) { list-style-image: url("chrome://messenger/skin/icons/folder-blank.png"); } -treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) { - background-position: left -16px; - list-style-image: url("chrome://messenger/skin/icons/folder-new-star.png"); -} - /* ..... Secure mail server ..... */ treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true), diff --git a/mail/themes/gnomestripe/mail/icons/folder.png b/mail/themes/gnomestripe/mail/icons/folder.png deleted file mode 100755 index 1b052b252144cdd6739bbf1a4eaf0897f82b7db4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7051 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 + * HĂĄkan Waara + * Jan Varga + * Magnus Melin * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -39,150 +40,14 @@ * ***** END LICENSE BLOCK ***** */ /* ===== msgSelectOffline.css ================================================= - == Styles for the Offline Use dialog. - ======================================================================= */ + == The dialog where you select which folders to enable for offline use. + ========================================================================== */ @import url("chrome://messenger/skin/"); +@import url("chrome://messenger/skin/folderPane.css"); @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -/* ::::: Mail Folders ::::: */ - -treechildren::-moz-tree-image(folderNameCol) { - -moz-margin-end: 2px; - list-style-image: url("chrome://messenger/skin/icons/folder.png"); - -moz-image-region: rect(0 16px 16px 0); -} - -treechildren::-moz-tree-image(folderNameCol, newMessages-true) { - -moz-image-region: rect(16px 16px 32px 0); -} - -/* ..... Inbox ..... */ - -treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox) { - -moz-image-region: rect(0 48px 16px 32px); -} - -treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox, newMessages-true) { - -moz-image-region: rect(16px 48px 32px 32px); -} - -/* ..... Sent ..... */ - -treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) { - -moz-image-region: rect(0 64px 16px 48px); -} - -/* ..... Unsent ..... */ - -treechildren::-moz-tree-image(folderNameCol, specialFolder-Outbox) { - -moz-image-region: rect(0 80px 16px 64px); -} - -/* ..... Drafts ..... */ - -treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) { - -moz-image-region: rect(0 96px 16px 80px); -} - -/* ..... Templates ..... */ - -treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) { - -moz-image-region: rect(0 112px 16px 96px); -} - -/* ..... Junk ..... */ - -treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) { - -moz-image-region: rect(0 128px 16px 112px); -} - -/* ..... Trash ..... */ - -treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) { - -moz-image-region: rect(0 144px 16px 128px); -} - -/* ..... Shared folders ..... - -treechildren::-moz-tree-image(folderNameCol, imapShared-true) { - -moz-image-region: rect(0 192px 16px 176px); -} - -*/ - -/* ..... Mail server ..... */ - -treechildren::-moz-tree-image(folderNameCol, isServer-true) { - list-style-image: url("chrome://messenger/skin/icons/server.png"); - -moz-image-region: rect(0 16px 16px 0); -} - -treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) { - -moz-image-region: rect(16px 16px 32px 0); -} - -treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true), -treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) { - font-weight: bold; -} - -/* ..... Secure mail server ..... */ - -treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true), -treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-imap, isSecure-true) { - -moz-image-region: rect(0 32px 16px 16px); -} - -treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true, isSecure-true) { - -moz-image-region: rect(16px 32px 32px 16px); -} - -/* ..... Local folders ..... */ - -treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) { - -moz-image-region: rect(0 48px 16px 32px); -} - -treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none, biffState-NewMail) { - -moz-image-region: rect(16px 48px 32px 32px); -} - -/* ..... News server ..... */ - -treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) { - -moz-image-region: rect(0 64px 16px 48px) !important; -} - -treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) { - -moz-image-region: rect(0 80px 16px 64px) !important; -} - -/* ..... Newsgroup ..... */ - -treechildren::-moz-tree-image(folderNameCol, serverType-nntp) { - -moz-image-region: rect(0 160px 16px 144px); -} - -/* ::::: All Servers ::::: */ - -treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true) { - font-weight: bold; -} - -treechildren::-moz-tree-cell-text(folderNameCol, isServer-true), -treechildren::-moz-tree-cell-text(hasUnreadMessages-true) { - font-weight: bold; -} - -treechildren::-moz-tree-cell-text(folderNameCol, noSelect-true) { - color: gray; - font-style: italic; -} - -/* ::::: Download Icons ::::: */ - treechildren::-moz-tree-image(syncCol) { list-style-image: url("chrome://messenger/skin/icons/notchecked.gif"); } diff --git a/mail/themes/gnomestripe/mail/newsblog/feed-subscriptions.css b/mail/themes/gnomestripe/mail/newsblog/feed-subscriptions.css index 36ce105286..11407d26ab 100644 --- a/mail/themes/gnomestripe/mail/newsblog/feed-subscriptions.css +++ b/mail/themes/gnomestripe/mail/newsblog/feed-subscriptions.css @@ -36,9 +36,9 @@ * * ***** END LICENSE BLOCK ****** */ -/* ::::: Feed Subscription UI icons :::::: */ +/* ::::: Feed Subscription styling :::::: */ -#subscriptionsDialog { +#subscriptionsDialog { padding: 0px; } @@ -47,18 +47,22 @@ } #subscriptionChildren::-moz-tree-image(folderNameCol) { - -moz-margin-end: 2px; - list-style-image: url("chrome://messenger-newsblog/skin/icons/rss-feed.png"); - -moz-image-region: rect(0 16px 16px 0); + list-style-image: url("chrome://messenger/skin/icons/folder-pane.png"); + -moz-image-region: rect(128px 16px 144px 0px); } #subscriptionChildren::-moz-tree-image(folderNameCol, container) { - list-style-image: url("chrome://messenger/skin/icons/folder.png"); - -moz-image-region: rect(0 16px 16px 0); -} + background-position: center center; + background-repeat: no-repeat; + background-color: transparent; + background-attachment: scroll; + -moz-background-clip: border; + -moz-background-inline-policy: continuous; + -moz-background-origin: border; + background-image: url("moz-icon://stock/gtk-directory?size=menu"); + list-style-image: url("chrome://messenger/skin/icons/folder-blank.png"); -#subscriptionChildren::-moz-tree-image(folderNameCol, container, open) { - -moz-image-region: rect(0 32px 16px 16px); + -moz-margin-end: 2px; } #rssFeedInfoBox { @@ -69,6 +73,6 @@ } #backgroundBox { - background-color: #FFFFFF; + background-color: #FFFFFF; opacity: 0.5; } diff --git a/mail/themes/gnomestripe/mail/subscribe.css b/mail/themes/gnomestripe/mail/subscribe.css index 354e86717b..1cf6b347fd 100644 --- a/mail/themes/gnomestripe/mail/subscribe.css +++ b/mail/themes/gnomestripe/mail/subscribe.css @@ -3,6 +3,7 @@ ======================================================================= */ @import url("chrome://messenger/skin/"); +@import url("chrome://messenger/skin/folderMenus.css"); @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); @@ -28,35 +29,28 @@ treechildren::-moz-tree-cell-text(nameColumn, Subscribable-false) { font-style: italic; } -/* ::::: Folders :::::: */ - +/* IMAP Folders*/ treechildren::-moz-tree-image(nameColumn) { + background-position: center center; + background-repeat: no-repeat; + background-color: transparent; + background-attachment: scroll; + -moz-background-clip: border; + -moz-background-inline-policy: continuous; + -moz-background-origin: border; + background-image: url("moz-icon://stock/gtk-directory?size=menu"); + list-style-image: url("chrome://messenger/skin/icons/folder-blank.png"); + -moz-margin-end: 2px; - list-style-image: url("chrome://messenger/skin/icons/folder.png"); - -moz-image-region: rect(0 16px 16px 0); } +/* Newsgroups */ treechildren::-moz-tree-image(nameColumn, ServerType-nntp), treechildren::-moz-tree-image(nameColumn2, nntp) { + background-image: url("chrome://messenger/skin/icons/folder-pane.png"); + background-position: left -208px; + list-style-image: url("chrome://messenger/skin/icons/folder-blank.png"); + -moz-margin-end: 2px; - -moz-image-region: rect(0 160px 16px 144px); } -/* ::::: Servers :::::: */ - -.subscribeMenuItem { - list-style-image: url("chrome://messenger/skin/icons/server.png"); - -moz-image-region: rect(0 16px 16px 0); -} - -.subscribeMenuItem[ServerType="imap"][IsSecure="true"] { - -moz-image-region: rect(0 32px 16px 16px); -} - -.subscribeMenuItem[ServerType="nntp"] { - -moz-image-region: rect(0 64px 16px 48px); -} - -.subscribeMenuItem[ServerType="nntp"][IsSecure="true"] { - -moz-image-region: rect(0 80px 16px 64px); -} diff --git a/mailnews/base/search/content/FilterEditor.xul b/mailnews/base/search/content/FilterEditor.xul index 8d0ba6516e..ce6025b01f 100644 --- a/mailnews/base/search/content/FilterEditor.xul +++ b/mailnews/base/search/content/FilterEditor.xul @@ -38,6 +38,7 @@ ***** END LICENSE BLOCK ***** --> + From b1f66b9878c3ae9e6211ee1897a520b804638ee8 Mon Sep 17 00:00:00 2001 From: Blake Winton Date: Wed, 9 Sep 2009 16:31:13 +0100 Subject: [PATCH 05/15] Bug 506290 - "[autoconfig] Layout changes to quick account setup." [r=philringnalda sr=bienvenu ui-r=clarkbw a=blocking-thunderbird3] --- .../chrome/messenger/accountCreation.dtd | 41 +- .../messenger/accountCreation.properties | 17 +- .../gnomestripe/mail/accountCreation.css | 67 ++- .../themes/pinstripe/mail/accountCreation.css | 62 +- mail/themes/qute/mail/accountCreation.css | 87 ++- .../content/accountcreation/emailWizard.js | 216 ++++--- .../content/accountcreation/emailWizard.xul | 569 +++++++++--------- .../content/accountcreation/verifyConfig.js | 26 +- 8 files changed, 647 insertions(+), 438 deletions(-) diff --git a/mail/locales/en-US/chrome/messenger/accountCreation.dtd b/mail/locales/en-US/chrome/messenger/accountCreation.dtd index 6042f5e3c7..517080e807 100644 --- a/mail/locales/en-US/chrome/messenger/accountCreation.dtd +++ b/mail/locales/en-US/chrome/messenger/accountCreation.dtd @@ -1,18 +1,20 @@ - - - - - - - - - - + + + + + + + + + + + + - - - + + + @@ -21,11 +23,14 @@ - - + + + + + + + - - - - - - - -