From e862194b323ef09bf318243cfca96e802c89dd26 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 15 Nov 2013 15:50:46 -0500 Subject: [PATCH] Convert color picker to an inline widget The colors are now limited to the colors offered in Thunderbird. --- NEWS | 1 + UI/Scheduler/GNUmakefile | 3 +- UI/Scheduler/UIxColorPicker.h | 31 --- UI/Scheduler/UIxColorPicker.m | 29 --- UI/Scheduler/product.plist | 4 - UI/Templates/PreferencesUI/UIxPreferences.wox | 82 ++++++- .../SchedulerUI/UIxCalendarProperties.wox | 90 ++++++- UI/WebServerResources/SchedulerUI.js | 1 - .../UIxCalendarProperties.css | 20 +- .../UIxCalendarProperties.js | 42 ++-- UI/WebServerResources/UIxPreferences.css | 16 ++ UI/WebServerResources/UIxPreferences.js | 91 ++++--- UI/WebServerResources/generic.css | 222 +++++++++++++++++- UI/WebServerResources/js_color_picker_v2.css | 191 --------------- 14 files changed, 482 insertions(+), 341 deletions(-) delete mode 100644 UI/Scheduler/UIxColorPicker.h delete mode 100644 UI/Scheduler/UIxColorPicker.m delete mode 100644 UI/WebServerResources/js_color_picker_v2.css diff --git a/NEWS b/NEWS index e5c0885ff..ac552b2de 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ New features - creation and modification of mail labels Enhancements + - the color picker is no longer a popup window Bug fixes diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile index 2ade17522..c3bc3b3d7 100644 --- a/UI/Scheduler/GNUmakefile +++ b/UI/Scheduler/GNUmakefile @@ -15,13 +15,12 @@ SchedulerUI_OBJC_FILES = \ \ UIxCalMainView.m \ UIxCalendarProperties.m \ - UIxColorPicker.m \ \ UIxCalFilterPanel.m \ UIxCalDayTable.m \ UIxCalDateSelector.m \ UIxCalUserRightsEditor.m \ - UIxCalFolderActions.m \ + UIxCalFolderActions.m \ \ UIxCalView.m \ UIxCalDayView.m \ diff --git a/UI/Scheduler/UIxColorPicker.h b/UI/Scheduler/UIxColorPicker.h deleted file mode 100644 index 179c8b309..000000000 --- a/UI/Scheduler/UIxColorPicker.h +++ /dev/null @@ -1,31 +0,0 @@ -/* UIxColorPicker.h - this file is part of SOGo - * - * Copyright (C) 2008 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef UIXCOLORPICKER_H -#define UIXCOLORPICKER_H - -#import - -@interface UIxColorPicker : UIxComponent -@end - -#endif /* UIXCOLORPICKER_H */ diff --git a/UI/Scheduler/UIxColorPicker.m b/UI/Scheduler/UIxColorPicker.m deleted file mode 100644 index bda17c45b..000000000 --- a/UI/Scheduler/UIxColorPicker.m +++ /dev/null @@ -1,29 +0,0 @@ -/* UIxColorPicker.m - this file is part of SOGo - * - * Copyright (C) 2008 Inverse inc. - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import "UIxColorPicker.h" - -#warning this module should probably be moved into a "Utility" product - -@implementation UIxColorPicker - -@end diff --git a/UI/Scheduler/product.plist b/UI/Scheduler/product.plist index df8ad4852..3c3af6be9 100644 --- a/UI/Scheduler/product.plist +++ b/UI/Scheduler/product.plist @@ -131,10 +131,6 @@ protectedBy = "View"; pageName = "UIxReminderEditor"; }; - colorPicker = { - protectedBy = "View"; - pageName = "UIxColorPicker"; - }; }; }; diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox index ec3824f31..ed4fa7e76 100644 --- a/UI/Templates/PreferencesUI/UIxPreferences.wox +++ b/UI/Templates/PreferencesUI/UIxPreferences.wox @@ -16,6 +16,82 @@ + + +
    @@ -147,8 +223,7 @@ >
    @@ -309,8 +384,7 @@ -
    +
    diff --git a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox index 375a33623..510ff73b4 100644 --- a/UI/Templates/SchedulerUI/UIxCalendarProperties.wox +++ b/UI/Templates/SchedulerUI/UIxCalendarProperties.wox @@ -10,6 +10,82 @@ const:toolbar="none" const:popup="YES" title="title"> + + + @@ -32,15 +108,11 @@ class="textField" var:value="calendarName" />
-
+