From: Changyong Jeon Date: Tue, 30 Apr 2013 06:32:06 +0000 (+0900) Subject: Updates license X-Git-Tag: submit/tizen_2.1/20130514.050937~11 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=983bae7cf3ae4011934c1fc26919ec2363e9fa26;p=apps%2Fosp%2FCalendar.git Updates license Change-Id: I4c57d5ae6b138135e3d38ad1fa3fea0e4ecf72c7 --- diff --git a/LICENSE.Flora b/LICENSE.Flora index fd90a36..571fe79 100755 --- a/LICENSE.Flora +++ b/LICENSE.Flora @@ -1,6 +1,6 @@ Flora License -Version 1.0, April, 2013 +Version 1.1, April, 2013 http://floralicense.org/license/ @@ -119,17 +119,17 @@ Object form, provided that You meet the following conditions: Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only - and do not modify the License. - -You may add Your own attribution notices within Derivative Works -that You distribute, alongside or as an addendum to the NOTICE text -from the Work, provided that such additional attribution notices -cannot be construed as modifying the License. You may add Your own -copyright statement to Your modifications and may provide additional or -different license terms and conditions for use, reproduction, or -distribution of Your modifications, or for any such Derivative Works -as a whole, provided Your use, reproduction, and distribution of -the Work otherwise complies with the conditions stated in this License. + and do not modify the License. You may add Your own attribution notices + within Derivative Works that You distribute, alongside or as an addendum + to the NOTICE text from the Work, provided that such additional attribution + notices cannot be construed as modifying the License. You may add Your own + copyright statement to Your modifications and may provide additional or + different license terms and conditions for use, reproduction, or + distribution of Your modifications, or for any such Derivative Works + as a whole, provided Your use, reproduction, and distribution of + the Work otherwise complies with the conditions stated in this License + and your own copyright statement or terms and conditions do not conflict + the conditions stated in the License including section 3. 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work @@ -192,7 +192,7 @@ identification within third-party archives. Copyright [yyyy] [name of copyright owner] - Licensed under the Flora License, Version 1.0 (the "License"); + Licensed under the Flora 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 diff --git a/NOTICE b/NOTICE index 9ec42be..a5964ea 100755 --- a/NOTICE +++ b/NOTICE @@ -1,3 +1,3 @@ Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved. -Except as noted, this software is licensed under Flora License, Version 1. -Please, see the LICENSE.Flora file for Flora License, Version 1 terms and conditions. \ No newline at end of file +Except as noted, this software is licensed under Flora License, Version 1.1. +Please, see the LICENSE.Flora file for Flora License, Version 1.1 terms and conditions. diff --git a/inc/ClCalendarApp.h b/inc/ClCalendarApp.h index ff90ec1..f7a87b1 100644 --- a/inc/ClCalendarApp.h +++ b/inc/ClCalendarApp.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClCalendarListForm.h b/inc/ClCalendarListForm.h index 67f90c0..59922bd 100644 --- a/inc/ClCalendarListForm.h +++ b/inc/ClCalendarListForm.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClCalendarSelectorPopup.h b/inc/ClCalendarSelectorPopup.h index 4f827d9..9066916 100644 --- a/inc/ClCalendarSelectorPopup.h +++ b/inc/ClCalendarSelectorPopup.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClDayEventListForm.h b/inc/ClDayEventListForm.h index ed9f2a6..f12109e 100644 --- a/inc/ClDayEventListForm.h +++ b/inc/ClDayEventListForm.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClDayPanel.h b/inc/ClDayPanel.h index b6bfe70..25e7d69 100644 --- a/inc/ClDayPanel.h +++ b/inc/ClDayPanel.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClEventDeleterForm.h b/inc/ClEventDeleterForm.h index e191fc9..8e84354 100755 --- a/inc/ClEventDeleterForm.h +++ b/inc/ClEventDeleterForm.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClEventDetailsForm.h b/inc/ClEventDetailsForm.h index 19fc6cb..57cc4f6 100644 --- a/inc/ClEventDetailsForm.h +++ b/inc/ClEventDetailsForm.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClEventEditorForm.h b/inc/ClEventEditorForm.h index 3fca127..0b62ae9 100644 --- a/inc/ClEventEditorForm.h +++ b/inc/ClEventEditorForm.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClEventItem.h b/inc/ClEventItem.h index 4032990..8739be9 100644 --- a/inc/ClEventItem.h +++ b/inc/ClEventItem.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClEventListPresentationModel.h b/inc/ClEventListPresentationModel.h index f3dad5f..f81f7f7 100644 --- a/inc/ClEventListPresentationModel.h +++ b/inc/ClEventListPresentationModel.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClEventPresentationModel.h b/inc/ClEventPresentationModel.h index aa3e794..66044b3 100644 --- a/inc/ClEventPresentationModel.h +++ b/inc/ClEventPresentationModel.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClEventSearchPresentationModel.h b/inc/ClEventSearchPresentationModel.h index 7d8250b..112bb6d 100644 --- a/inc/ClEventSearchPresentationModel.h +++ b/inc/ClEventSearchPresentationModel.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClEventSearcherForm.h b/inc/ClEventSearcherForm.h index 23736a3..c6de182 100644 --- a/inc/ClEventSearcherForm.h +++ b/inc/ClEventSearcherForm.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClEventSelectorForm.h b/inc/ClEventSelectorForm.h index 90677c5..b0532c4 100644 --- a/inc/ClEventSelectorForm.h +++ b/inc/ClEventSelectorForm.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClFormFactory.h b/inc/ClFormFactory.h index 11bb96d..ca07f4d 100644 --- a/inc/ClFormFactory.h +++ b/inc/ClFormFactory.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClGoToDatePopup.h b/inc/ClGoToDatePopup.h index 9cdb1c3..70ec480 100644 --- a/inc/ClGoToDatePopup.h +++ b/inc/ClGoToDatePopup.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClICalendarAppStatusChangedEventListener.h b/inc/ClICalendarAppStatusChangedEventListener.h index 9ce51c0..c72d393 100644 --- a/inc/ClICalendarAppStatusChangedEventListener.h +++ b/inc/ClICalendarAppStatusChangedEventListener.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClICalendarEventChangedEventListener.h b/inc/ClICalendarEventChangedEventListener.h index 2a9f882..0c2c06d 100644 --- a/inc/ClICalendarEventChangedEventListener.h +++ b/inc/ClICalendarEventChangedEventListener.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClICurrentDateChangedEventListener.h b/inc/ClICurrentDateChangedEventListener.h index 27112c5..5265600 100644 --- a/inc/ClICurrentDateChangedEventListener.h +++ b/inc/ClICurrentDateChangedEventListener.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClIDateFocusEventListener.h b/inc/ClIDateFocusEventListener.h index f51858a..57d51fb 100644 --- a/inc/ClIDateFocusEventListener.h +++ b/inc/ClIDateFocusEventListener.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClIEventActionEventListener.h b/inc/ClIEventActionEventListener.h index c485ed3..90d4377 100644 --- a/inc/ClIEventActionEventListener.h +++ b/inc/ClIEventActionEventListener.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClIPanningAnimationControlProvider.h b/inc/ClIPanningAnimationControlProvider.h index efa21a7..01c34ee 100644 --- a/inc/ClIPanningAnimationControlProvider.h +++ b/inc/ClIPanningAnimationControlProvider.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClIPanningAnimationEventListener.h b/inc/ClIPanningAnimationEventListener.h index a7ebdda..9d92644 100644 --- a/inc/ClIPanningAnimationEventListener.h +++ b/inc/ClIPanningAnimationEventListener.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClImportForm.h b/inc/ClImportForm.h index 485353b..42598f9 100644 --- a/inc/ClImportForm.h +++ b/inc/ClImportForm.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClListPanel.h b/inc/ClListPanel.h index 6e5e172..deea348 100644 --- a/inc/ClListPanel.h +++ b/inc/ClListPanel.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClMainForm.h b/inc/ClMainForm.h index 0d6a402..4884386 100644 --- a/inc/ClMainForm.h +++ b/inc/ClMainForm.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClMainFrame.h b/inc/ClMainFrame.h index 4e7eb22..f71c4af 100644 --- a/inc/ClMainFrame.h +++ b/inc/ClMainFrame.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClMonthPanel.h b/inc/ClMonthPanel.h index e7030d7..2986e7e 100644 --- a/inc/ClMonthPanel.h +++ b/inc/ClMonthPanel.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClNodes.h b/inc/ClNodes.h index 6072a59..eb910b5 100644 --- a/inc/ClNodes.h +++ b/inc/ClNodes.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClPanelFactory.h b/inc/ClPanelFactory.h index 3497424..fd08d7c 100644 --- a/inc/ClPanelFactory.h +++ b/inc/ClPanelFactory.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClPanningAnimationManager.h b/inc/ClPanningAnimationManager.h index c0afa25..e138b8f 100644 --- a/inc/ClPanningAnimationManager.h +++ b/inc/ClPanningAnimationManager.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClReminderForm.h b/inc/ClReminderForm.h index ca63613..e6e17e3 100644 --- a/inc/ClReminderForm.h +++ b/inc/ClReminderForm.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClRepeatForm.h b/inc/ClRepeatForm.h index d558bda..3e79709 100644 --- a/inc/ClRepeatForm.h +++ b/inc/ClRepeatForm.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClResourceManager.h b/inc/ClResourceManager.h index 87e62bf..a2fb9e6 100644 --- a/inc/ClResourceManager.h +++ b/inc/ClResourceManager.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClSceneRegister.h b/inc/ClSceneRegister.h index b671fbb..22a0cf2 100644 --- a/inc/ClSceneRegister.h +++ b/inc/ClSceneRegister.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClSettingForm.h b/inc/ClSettingForm.h index 5bd039a..6b17278 100644 --- a/inc/ClSettingForm.h +++ b/inc/ClSettingForm.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClSharePopup.h b/inc/ClSharePopup.h index 9d1260a..d200c5f 100644 --- a/inc/ClSharePopup.h +++ b/inc/ClSharePopup.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClTaskItem.h b/inc/ClTaskItem.h index ee9c35b..656ff80 100644 --- a/inc/ClTaskItem.h +++ b/inc/ClTaskItem.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClTaskSelectorForm.h b/inc/ClTaskSelectorForm.h index f953772..09dc40b 100644 --- a/inc/ClTaskSelectorForm.h +++ b/inc/ClTaskSelectorForm.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClThreeButtonPopup.h b/inc/ClThreeButtonPopup.h index 5b12f39..68d1779 100644 --- a/inc/ClThreeButtonPopup.h +++ b/inc/ClThreeButtonPopup.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClTwoButtonPopup.h b/inc/ClTwoButtonPopup.h index 1833eb8..d99fe89 100644 --- a/inc/ClTwoButtonPopup.h +++ b/inc/ClTwoButtonPopup.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClVcsSelectorForm.h b/inc/ClVcsSelectorForm.h index 9d657ff..e7ecf1f 100644 --- a/inc/ClVcsSelectorForm.h +++ b/inc/ClVcsSelectorForm.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/inc/ClYearPanel.h b/inc/ClYearPanel.h index 63a2a9f..7b2dbfd 100644 --- a/inc/ClYearPanel.h +++ b/inc/ClYearPanel.h @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/res/screen-size-normal/IDL_TWO_BUTTON_POPUP.xml b/res/screen-size-normal/IDL_TWO_BUTTON_POPUP.xml index bf72870..d7da2d3 100644 --- a/res/screen-size-normal/IDL_TWO_BUTTON_POPUP.xml +++ b/res/screen-size-normal/IDL_TWO_BUTTON_POPUP.xml @@ -3,25 +3,26 @@ This XML file was automatically generated by UiBuilder - do not modify by hand. --> - + + - - - + + + - + diff --git a/src/ClCalendarApp.cpp b/src/ClCalendarApp.cpp index f4e89a8..215e90f 100644 --- a/src/ClCalendarApp.cpp +++ b/src/ClCalendarApp.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClCalendarEntry.cpp b/src/ClCalendarEntry.cpp index aa4b565..355392e 100644 --- a/src/ClCalendarEntry.cpp +++ b/src/ClCalendarEntry.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClCalendarListForm.cpp b/src/ClCalendarListForm.cpp index 60856ee..76410d9 100644 --- a/src/ClCalendarListForm.cpp +++ b/src/ClCalendarListForm.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClCalendarSelectorPopup.cpp b/src/ClCalendarSelectorPopup.cpp index c1e6d5a..c1b895a 100644 --- a/src/ClCalendarSelectorPopup.cpp +++ b/src/ClCalendarSelectorPopup.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // @@ -47,7 +47,7 @@ static const int H_2_ITEMS_EVENT_LIST = 478; static const int H_3_ITEMS_EVENT_LIST = 620; static const int H_MANY_ITEMS_EVENT_LIST = 680; static const int H_ITEM = 140; -static const int X_CALENDAR_ICON = 16; +static const int X_CALENDAR_ICON = 20; static const int Y_CALENDAR_ICON = 38; static const int W_CALENDAR_ICON = 64; static const int W_CALENDAR_ICON_MARGIN = 16; diff --git a/src/ClDayEventListForm.cpp b/src/ClDayEventListForm.cpp index 96b5982..d08f264 100644 --- a/src/ClDayEventListForm.cpp +++ b/src/ClDayEventListForm.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClDayPanel.cpp b/src/ClDayPanel.cpp index b00e2b0..08b4be6 100644 --- a/src/ClDayPanel.cpp +++ b/src/ClDayPanel.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClEventDeleterForm.cpp b/src/ClEventDeleterForm.cpp index fcff4dd..189aa96 100755 --- a/src/ClEventDeleterForm.cpp +++ b/src/ClEventDeleterForm.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClEventDetailsForm.cpp b/src/ClEventDetailsForm.cpp index 053a0a1..18a4be6 100644 --- a/src/ClEventDetailsForm.cpp +++ b/src/ClEventDetailsForm.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClEventEditorForm.cpp b/src/ClEventEditorForm.cpp index 600caac..8724a49 100644 --- a/src/ClEventEditorForm.cpp +++ b/src/ClEventEditorForm.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClEventItem.cpp b/src/ClEventItem.cpp index d91fbff..d3b7d19 100644 --- a/src/ClEventItem.cpp +++ b/src/ClEventItem.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClEventListPresentationModel.cpp b/src/ClEventListPresentationModel.cpp index 3a9afa0..2adc835 100644 --- a/src/ClEventListPresentationModel.cpp +++ b/src/ClEventListPresentationModel.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClEventPresentationModel.cpp b/src/ClEventPresentationModel.cpp index 391b463..f775bde 100644 --- a/src/ClEventPresentationModel.cpp +++ b/src/ClEventPresentationModel.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClEventSearchPresentationModel.cpp b/src/ClEventSearchPresentationModel.cpp index 15de7ff..9e100a5 100644 --- a/src/ClEventSearchPresentationModel.cpp +++ b/src/ClEventSearchPresentationModel.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClEventSearcherForm.cpp b/src/ClEventSearcherForm.cpp index 4f4609b..335e9ce 100644 --- a/src/ClEventSearcherForm.cpp +++ b/src/ClEventSearcherForm.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClEventSelectorForm.cpp b/src/ClEventSelectorForm.cpp index 58c59ad..875c591 100644 --- a/src/ClEventSelectorForm.cpp +++ b/src/ClEventSelectorForm.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClFormFactory.cpp b/src/ClFormFactory.cpp index ef5f09a..a75d686 100644 --- a/src/ClFormFactory.cpp +++ b/src/ClFormFactory.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClGoToDatePopup.cpp b/src/ClGoToDatePopup.cpp index cc65c8d..b41c546 100644 --- a/src/ClGoToDatePopup.cpp +++ b/src/ClGoToDatePopup.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClImportForm.cpp b/src/ClImportForm.cpp index 3557b12..bc85d06 100644 --- a/src/ClImportForm.cpp +++ b/src/ClImportForm.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClListPanel.cpp b/src/ClListPanel.cpp index a12905e..a7841e8 100644 --- a/src/ClListPanel.cpp +++ b/src/ClListPanel.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClMainForm.cpp b/src/ClMainForm.cpp index ed18bd9..ac92b45 100644 --- a/src/ClMainForm.cpp +++ b/src/ClMainForm.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClMainFrame.cpp b/src/ClMainFrame.cpp index 61d2733..9739181 100644 --- a/src/ClMainFrame.cpp +++ b/src/ClMainFrame.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClMonthPanel.cpp b/src/ClMonthPanel.cpp index d9d3a43..91bf27a 100644 --- a/src/ClMonthPanel.cpp +++ b/src/ClMonthPanel.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClNodes.cpp b/src/ClNodes.cpp index 73338c4..997751a 100644 --- a/src/ClNodes.cpp +++ b/src/ClNodes.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClPanelFactory.cpp b/src/ClPanelFactory.cpp index 8b7988c..c8a51b7 100644 --- a/src/ClPanelFactory.cpp +++ b/src/ClPanelFactory.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClPanningAnimationManager.cpp b/src/ClPanningAnimationManager.cpp index 1404987..33df77f 100644 --- a/src/ClPanningAnimationManager.cpp +++ b/src/ClPanningAnimationManager.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClReminderForm.cpp b/src/ClReminderForm.cpp index 4e37e98..0b9416f 100644 --- a/src/ClReminderForm.cpp +++ b/src/ClReminderForm.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClRepeatForm.cpp b/src/ClRepeatForm.cpp index 807d59a..d5a3fa5 100644 --- a/src/ClRepeatForm.cpp +++ b/src/ClRepeatForm.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClResourceManager.cpp b/src/ClResourceManager.cpp index 7151670..93cefbe 100644 --- a/src/ClResourceManager.cpp +++ b/src/ClResourceManager.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClSceneRegister.cpp b/src/ClSceneRegister.cpp index 783e8f4..4f49114 100644 --- a/src/ClSceneRegister.cpp +++ b/src/ClSceneRegister.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClSharePopup.cpp b/src/ClSharePopup.cpp index 7a0b802..7a0949a 100644 --- a/src/ClSharePopup.cpp +++ b/src/ClSharePopup.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClTaskItem.cpp b/src/ClTaskItem.cpp index 8275ec7..c41a794 100644 --- a/src/ClTaskItem.cpp +++ b/src/ClTaskItem.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClThreeButtonPopup.cpp b/src/ClThreeButtonPopup.cpp index 14ca18c..8738a42 100755 --- a/src/ClThreeButtonPopup.cpp +++ b/src/ClThreeButtonPopup.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClTwoButtonPopup.cpp b/src/ClTwoButtonPopup.cpp index f79a3e8..3127b8b 100644 --- a/src/ClTwoButtonPopup.cpp +++ b/src/ClTwoButtonPopup.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 // diff --git a/src/ClYearPanel.cpp b/src/ClYearPanel.cpp index a7f62d0..2074eaa 100644 --- a/src/ClYearPanel.cpp +++ b/src/ClYearPanel.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2012 Samsung Electronics Co., Ltd. // -// Licensed under the Flora License, Version 1.0 (the License); +// Licensed under the Flora 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 //