Fix bug 442571 - Integrate "Create a new Calendar" into the account central pane. r=mschroeder, ui-r=christian

git-svn-id: svn://10.0.0.236/trunk@252749 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mozilla%kewis.ch
2008-07-01 14:07:56 +00:00
parent 8a2f17adf2
commit e6c909a2f7
5 changed files with 158 additions and 0 deletions

View File

@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Sun Microsystems code.
-
- The Initial Developer of the Original Code is
- Philipp Kewisch <mozilla@kewis.ch>
- Portions created by the Initial Developer are Copyright (C) 2008
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
-
- 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
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the LGPL or the GPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
<!DOCTYPE overlay [
<!ENTITY % lightningDTD SYSTEM "chrome://lightning/locale/lightning.dtd">
<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
%lightningDTD;
%globalDTD;
]>
<?xml-stylesheet href="chrome://lightning/skin/accountCentral.css" type="text/css"?>
<overlay id="calendar-list-overlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<rows id="acctCentralRows">
<row id="lightning-newCalendar-row"
class="acctCentralRow"
insertbefore="AccountsSection.separator1">
<hbox>
<label class="acctCentralText acctCentralLinkText"
value="&lightning.acctCentral.newCalendar.label;"
chromedir="&locale.dir;"
onclick="window.parent.openCalendarWizard()"/>
</hbox>
</row>
<separator id="lightning-newCalendar-separator"
class="thin"
insertbefore="AccountsSection.separator1"/>
</rows>
</overlay>

View File

@@ -1,6 +1,7 @@
lightning.jar:
% content lightning %content/lightning/
% overlay chrome://messenger/content/messenger.xul chrome://lightning/content/lightning-migration.xul
% overlay chrome://messenger/content/msgAccountCentral.xul chrome://lightning/content/messenger-overlay-accountCentral.xul
% overlay chrome://messenger/content/messenger.xul chrome://lightning/content/messenger-overlay-sidebar.xul
% overlay chrome://messenger/content/messageWindow.xul chrome://lightning/content/imip-bar-overlay.xul
% overlay chrome://lightning/content/messenger-overlay-sidebar.xul chrome://lightning/content/imip-bar-overlay.xul
@@ -31,6 +32,7 @@ lightning.jar:
content/lightning/lightning-widgets.xml (content/lightning-widgets.xml)
content/lightning/lightning-today-pane.js (content/lightning-today-pane.js)
content/lightning/messenger-overlay-sidebar.css (content/messenger-overlay-sidebar.css)
content/lightning/messenger-overlay-accountCentral.xul (content/messenger-overlay-accountCentral.xul)
content/lightning/messenger-overlay-sidebar.js (content/messenger-overlay-sidebar.js)
* content/lightning/messenger-overlay-sidebar.xul (content/messenger-overlay-sidebar.xul)
content/lightning/messenger-overlay-preferences.js (content/messenger-overlay-preferences.js)
@@ -40,6 +42,7 @@ lightning.jar:
content/lightning/toolkit-overlay-custombar.xul (content/toolkit-overlay-custombar.xul)
#expand skin/classic/lightning/imip.css (themes/__THEME__/imip.css)
#expand skin/classic/lightning/lightning.css (themes/__THEME__/lightning.css)
#expand skin/classic/lightning/accountCentral.css (themes/__THEME__/accountCentral.css)
#expand skin/classic/lightning/lightning-widgets.css (themes/__THEME__/lightning-widgets.css)
calendar.jar:

View File

@@ -0,0 +1,42 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Sun Microsystems code.
*
* The Initial Developer of the Original Code is
* Philipp Kewisch <mozilla@kewis.ch>
* Portions created by the Initial Developer are Copyright (C) 2008
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* 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
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#lightning-newCalendar-row > hbox > label {
background: url(chrome://calendar/skin/cal-icon32.png) no-repeat !important;
padding-left: 50px;
font-size: 11px;
padding-top: 7px;
}

View File

@@ -0,0 +1,46 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is Sun Microsystems code.
*
* The Initial Developer of the Original Code is
* Philipp Kewisch <mozilla@kewis.ch>
* Portions created by the Initial Developer are Copyright (C) 2008
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* 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
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#lightning-newCalendar-row > hbox > label[chromedir="rtl"] {
background: url(chrome://calendar/skin/cal-icon32.png) right no-repeat !important;
}
#lightning-newCalendar-row > hbox > label {
background: url(chrome://calendar/skin/cal-icon32.png) no-repeat !important;
padding-top: .55em;
padding-bottom: .55em;
-moz-padding-start: 45px;
}

View File

@@ -106,3 +106,6 @@
<!-- Lightning specific keybindings -->
<!ENTITY lightning.keys.event.new "I">
<!ENTITY lightning.keys.todo.new "D">
<!-- Account Central page -->
<!ENTITY lightning.acctCentral.newCalendar.label "Create a new calendar">