[evolution-patches] Assign Tasks and Naming
- From: JP Rosevear <jpr novell com>
- To: evolution-patches ximian com
- Subject: [evolution-patches] Assign Tasks and Naming
- Date: Tue, 20 Jul 2004 13:51:06 -0400
So, as agreed with product design we will keep using "Address Book" and
"Task List" in the ui. Also added Assigned Task new item (comparable to
meeting so it can be accessed).
a) the breaks string freeze
b) this is late but i got too busy doing the release yesterday to do it
-JP
--
JP Rosevear <jpr novell com>
Novell, Inc.
? gui/component/ldap-config.gladep
? gui/component/select-names/select-names.gladep
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1794
diff -u -r1.1794 ChangeLog
--- ChangeLog 19 Jul 2004 17:23:46 -0000 1.1794
+++ ChangeLog 20 Jul 2004 13:35:32 -0000
@@ -1,3 +1,11 @@
+2004-07-19 JP Rosevear <jpr novell com>
+
+ * gui/component/ldap-config.glade: change contacts group to
+ address book
+
+ * gui/component/addressbook-component.c
+ (impl__get_userCreatableItems): ditto
+
2004-07-16 Hans Petter Jansson <hpj ximian com>
* gui/contact-editor/e-contact-editor.c (contact_added_cb)
Index: gui/component/addressbook-component.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook-component.c,v
retrieving revision 1.129
diff -u -r1.129 addressbook-component.c
--- gui/component/addressbook-component.c 28 Jun 2004 08:46:00 -0000 1.129
+++ gui/component/addressbook-component.c 20 Jul 2004 13:35:32 -0000
@@ -106,10 +106,10 @@
list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT;
list->_buffer[2].id = "address_book";
- list->_buffer[2].description = _("New Contacts Group");
- list->_buffer[2].menuDescription = _("Contacts Grou_p");
- list->_buffer[2].tooltip = _("Create a new contacts group");
- list->_buffer[2].menuShortcut = 'p';
+ list->_buffer[2].description = _("New Address Book");
+ list->_buffer[2].menuDescription = _("Address _Book");
+ list->_buffer[2].tooltip = _("Create a new address book");
+ list->_buffer[2].menuShortcut = 'b';
list->_buffer[2].iconName = "stock_addressbook";
list->_buffer[2].type = GNOME_Evolution_CREATABLE_FOLDER;
Index: gui/component/ldap-config.glade
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/ldap-config.glade,v
retrieving revision 1.28
diff -u -r1.28 ldap-config.glade
--- gui/component/ldap-config.glade 21 Jun 2004 21:49:01 -0000 1.28
+++ gui/component/ldap-config.glade 20 Jul 2004 13:35:33 -0000
@@ -2,19 +2,15 @@
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
<glade-interface>
+<requires lib="gnome"/>
<widget class="GtkWindow" id="account-add-window">
- <property name="title" translatable="yes">Add Contacts Group</property>
+ <property name="title" translatable="yes">Add Address Book</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<child>
<widget class="GtkVBox" id="">
@@ -732,7 +728,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
<child>
<widget class="GtkAlignment" id="alignment13">
@@ -741,10 +736,6 @@
<property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
<child>
<widget class="GtkHBox" id="hbox16">
@@ -1212,7 +1203,6 @@
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
</widget>
</child>
@@ -1222,7 +1212,6 @@
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
<child>
<widget class="GtkAlignment" id="alignment12">
@@ -1231,10 +1220,6 @@
<property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
<child>
<widget class="GtkHBox" id="hbox14">
@@ -1304,11 +1289,6 @@
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@@ -1330,7 +1310,6 @@
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
<property name="response_id">-6</property>
</widget>
</child>
@@ -1343,7 +1322,6 @@
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
<property name="response_id">-5</property>
</widget>
</child>
@@ -1864,6 +1842,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="mnemonic_widget">auth-entry</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -2205,7 +2184,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
<child>
<widget class="GtkAlignment" id="alignment61">
@@ -2214,10 +2192,6 @@
<property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
- <property name="top_padding">0</property>
- <property name="bottom_padding">0</property>
- <property name="left_padding">0</property>
- <property name="right_padding">0</property>
<child>
<widget class="GtkHBox" id="hbox126">
@@ -2604,11 +2578,6 @@
<property name="default_height">200</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
- <property name="decorated">True</property>
- <property name="skip_taskbar_hint">False</property>
- <property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@@ -2630,7 +2599,6 @@
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
<property name="response_id">-6</property>
</widget>
</child>
@@ -2643,7 +2611,6 @@
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
<property name="response_id">-5</property>
</widget>
</child>
? Makefile.bk
? e-pilot-settings.c
? e-pilot-settings.h
? search-name.patch
? select.patch
? temp.patch
? temp2.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/ChangeLog,v
retrieving revision 1.319
diff -u -r1.319 ChangeLog
--- ChangeLog 16 Jul 2004 08:11:59 -0000 1.319
+++ ChangeLog 20 Jul 2004 13:34:55 -0000
@@ -1,3 +1,8 @@
+2004-07-20 JP Rosevear <jpr novell com>
+
+ * e-search-bar.c (setup_bonobo_menus): use ctrl-shift-q to clear
+ search bar
+
2004-07-16 Chris Toshok <toshok ximian com>
* e-clipped-label.c (e_clipped_label_recalc_chars_displayed):
Index: e-search-bar.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-search-bar.c,v
retrieving revision 1.78
diff -u -r1.78 e-search-bar.c
--- e-search-bar.c 13 Mar 2004 02:39:28 -0000 1.78
+++ e-search-bar.c 20 Jul 2004 13:34:55 -0000
@@ -544,7 +544,7 @@
g_string_append (xml, "<placeholder name=\"SearchBar\">");
append_xml_menu_item (xml, "FindNow", _("_Find Now"), "ESearchBar:FindNow", NULL);
- append_xml_menu_item (xml, "Clear", _("_Clear"), "ESearchBar:Clear", "*Control**Shift*b");
+ append_xml_menu_item (xml, "Clear", _("_Clear"), "ESearchBar:Clear", "*Control**Shift*q");
for (p = esb->menu_items; p != NULL; p = p->next) {
const ESearchBarItem *item;
? gui/Helgdagar_2004.ics
? gui/cal-comp.patch
? gui/month.patch
? gui/monthview.patch
? gui/nav-scroll.patch
? gui/navigator.patch
? gui/new-editor-2.patch
? gui/new-editor.patch
? gui/old-e-cal-model.h
? gui/old.c
? gui/scroll.patch
? gui/sel.patch
? gui/summary.patch
? gui/temp2.c
? gui/alarm-notify/alarm.patch
? gui/dialogs/alarm-dialog.gladep
? gui/dialogs/alarm-list-dialog.gladep
? gui/dialogs/calendar-setup.gladep
? gui/dialogs/event-page.gladep
? gui/dialogs/meeting-page.gladep
? gui/dialogs/recurrence-page.gladep
? gui/dialogs/temp.c
? gui/dialogs/temp2.c
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2450
diff -u -r1.2450 ChangeLog
--- ChangeLog 19 Jul 2004 22:02:28 -0000 1.2450
+++ ChangeLog 20 Jul 2004 13:51:15 -0000
@@ -1,3 +1,19 @@
+2004-07-20 JP Rosevear <jpr novell com>
+
+ * gui/dialogs/calendar-setup.c (calendar_setup_edit_calendar): set
+ a different title if we are editing; de-sensitize option menu if
+ we are editing
+ (calendar_setup_edit_task_list): set a different title if we are editing
+
+ * gui/dialogs/calendar-setup.glade: use task list instead of tasks
+ group
+
+ * gui/tasks-component.c (impl__get_userCreatableItems): add
+ assigned task as an item, use task list instead of tasks group
+
+ * gui/calendar-component.c (impl__get_userCreatableItems): fiddle
+ with shortcuts
+
2004-07-16 JP Rosevear <jpr novell com>
Fixes #61451
Index: gui/calendar-component.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/calendar-component.c,v
retrieving revision 1.178
diff -u -r1.178 calendar-component.c
--- gui/calendar-component.c 19 Jul 2004 16:42:59 -0000 1.178
+++ gui/calendar-component.c 20 Jul 2004 13:51:15 -0000
@@ -1252,9 +1252,9 @@
list->_buffer[2].id = CREATE_ALLDAY_EVENT_ID;
list->_buffer[2].description = _("New all day appointment");
- list->_buffer[2].menuDescription = _("All _Day Appointment");
+ list->_buffer[2].menuDescription = _("All Day A_ppointment");
list->_buffer[2].tooltip = _("Create a new all-day appointment");
- list->_buffer[2].menuShortcut = 'd';
+ list->_buffer[2].menuShortcut = 'p';
list->_buffer[2].iconName = "stock_new-24h-appointment";
list->_buffer[2].type = GNOME_Evolution_CREATABLE_OBJECT;
Index: gui/tasks-component.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/tasks-component.c,v
retrieving revision 1.71
diff -u -r1.71 tasks-component.c
--- gui/tasks-component.c 14 Jul 2004 02:20:55 -0000 1.71
+++ gui/tasks-component.c 20 Jul 2004 13:51:15 -0000
@@ -49,8 +49,9 @@
#include "widgets/misc/e-info-label.h"
#include "e-util/e-icon-factory.h"
-#define CREATE_TASK_ID "task"
-#define CREATE_TASK_LIST_ID "task-list"
+#define CREATE_TASK_ID "task"
+#define CREATE_TASK_ASSIGNED_ID "task-assigned"
+#define CREATE_TASK_LIST_ID "task-list"
enum DndTargetType {
DND_TARGET_TYPE_CALENDAR_LIST,
@@ -783,13 +784,12 @@
}
static gboolean
-create_new_todo (TasksComponent *task_component, TasksComponentView *component_view)
+create_new_todo (TasksComponent *task_component, gboolean is_assigned, TasksComponentView *component_view)
{
ECal *ecal;
TasksComponentPrivate *priv;
ECalComponent *comp;
TaskEditor *editor;
- gboolean read_only;
priv = task_component->priv;
@@ -801,6 +801,8 @@
comp = cal_comp_task_new_with_defaults (ecal);
comp_editor_edit_comp (COMP_EDITOR (editor), comp);
+ if (is_assigned)
+ task_editor_show_assignment (editor);
comp_editor_focus (COMP_EDITOR (editor));
e_comp_editor_registry_add (comp_editor_registry, COMP_EDITOR (editor), TRUE);
@@ -828,7 +830,9 @@
}
if (strcmp (item_type_name, CREATE_TASK_ID) == 0) {
- create_new_todo (tasks_component, component_view);
+ create_new_todo (tasks_component, FALSE, component_view);
+ } else if (strcmp (item_type_name, CREATE_TASK_ASSIGNED_ID) == 0) {
+ create_new_todo (tasks_component, TRUE, component_view);
} else if (strcmp (item_type_name, CREATE_TASK_LIST_ID) == 0) {
calendar_setup_new_task_list (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (component_view->tasks))));
}
@@ -1028,7 +1032,7 @@
{
GNOME_Evolution_CreatableItemTypeList *list = GNOME_Evolution_CreatableItemTypeList__alloc ();
- list->_length = 2;
+ list->_length = 3;
list->_maximum = list->_length;
list->_buffer = GNOME_Evolution_CreatableItemTypeList_allocbuf (list->_length);
@@ -1042,13 +1046,21 @@
list->_buffer[0].iconName = "stock_task";
list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
- list->_buffer[1].id = CREATE_TASK_LIST_ID;
- list->_buffer[1].description = _("New tasks group");
- list->_buffer[1].menuDescription = _("Tasks Gro_up");
- list->_buffer[1].tooltip = _("Create a new tasks group");
- list->_buffer[1].menuShortcut = 'u';
- list->_buffer[1].iconName = "stock_todo";
- list->_buffer[1].type = GNOME_Evolution_CREATABLE_FOLDER;
+ list->_buffer[1].id = CREATE_TASK_ASSIGNED_ID;
+ list->_buffer[1].description = _("New assigned task");
+ list->_buffer[1].menuDescription = _("Assigne_d Task");
+ list->_buffer[1].tooltip = _("Create a new assigned task");
+ list->_buffer[1].menuShortcut = 'd';
+ list->_buffer[1].iconName = "stock_task";
+ list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT;
+
+ list->_buffer[2].id = CREATE_TASK_LIST_ID;
+ list->_buffer[2].description = _("New task list");
+ list->_buffer[2].menuDescription = _("Task l_ist");
+ list->_buffer[2].tooltip = _("Create a new task list");
+ list->_buffer[2].menuShortcut = 'i';
+ list->_buffer[2].iconName = "stock_todo";
+ list->_buffer[2].type = GNOME_Evolution_CREATABLE_FOLDER;
return list;
}
@@ -1064,7 +1076,10 @@
priv = tasks_component->priv;
if (strcmp (item_type_name, CREATE_TASK_ID) == 0) {
- if (!create_new_todo (tasks_component, NULL))
+ if (!create_new_todo (tasks_component, FALSE, NULL))
+ bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
+ } else if (strcmp (item_type_name, CREATE_TASK_ASSIGNED_ID) == 0) {
+ if (!create_new_todo (tasks_component, TRUE, NULL))
bonobo_exception_set (ev, ex_GNOME_Evolution_Component_Failed);
} else if (strcmp (item_type_name, CREATE_TASK_LIST_ID) == 0) {
/* FIXME Should we use the last opened window? */
Index: gui/dialogs/calendar-setup.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/calendar-setup.c,v
retrieving revision 1.27
diff -u -r1.27 calendar-setup.c
--- gui/dialogs/calendar-setup.c 2 Jun 2004 03:53:44 -0000 1.27
+++ gui/dialogs/calendar-setup.c 20 Jul 2004 13:51:15 -0000
@@ -657,11 +657,12 @@
source_dialog->window = glade_xml_get_widget (source_dialog->gui_xml, "add-calendar-window");
if (source) {
+ gtk_window_set_title (GTK_WINDOW (source_dialog->window), "Calendar Properties");
source_dialog->source = source;
source_dialog->source_group = e_source_peek_group (source);
g_object_ref (source);
}
-
+
g_signal_connect (source_dialog->window, "key-press-event", G_CALLBACK (key_press_event), NULL);
source_dialog->name_entry = glade_xml_get_widget (source_dialog->gui_xml, "name-entry");
@@ -676,6 +677,7 @@
gtk_option_menu_set_menu (GTK_OPTION_MENU (source_dialog->group_optionmenu), menu);
gtk_widget_show (menu);
}
+ gtk_widget_set_sensitive (source_dialog->group_optionmenu, source == NULL);
/* NOTE: This assumes that we have sources. If they don't exist, they're set up
* on startup of the calendar component. */
@@ -783,10 +785,11 @@
source_dialog->window = glade_xml_get_widget (source_dialog->gui_xml, "add-task-list-window");
if (source) {
+ gtk_window_set_title (GTK_WINDOW (source_dialog->window), "Task List Properties");
source_dialog->source = source;
source_dialog->source_group = e_source_peek_group (source);
g_object_ref (source);
- }
+ }
g_signal_connect (source_dialog->window, "key-press-event", G_CALLBACK (key_press_event), NULL);
Index: gui/dialogs/calendar-setup.glade
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/calendar-setup.glade,v
retrieving revision 1.12
diff -u -r1.12 calendar-setup.glade
--- gui/dialogs/calendar-setup.glade 23 Jun 2004 03:42:05 -0000 1.12
+++ gui/dialogs/calendar-setup.glade 20 Jul 2004 13:51:15 -0000
@@ -462,7 +462,7 @@
</widget>
<widget class="GtkWindow" id="add-task-list-window">
- <property name="title" translatable="yes">Add Tasks Group</property>
+ <property name="title" translatable="yes">Add Task List</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
