diff options
Diffstat (limited to 'packages/pimlico/files/tasks-owl.diff')
| -rw-r--r-- | packages/pimlico/files/tasks-owl.diff | 60 |
1 files changed, 24 insertions, 36 deletions
diff --git a/packages/pimlico/files/tasks-owl.diff b/packages/pimlico/files/tasks-owl.diff index ea867d890d..ce1ed9db7e 100644 --- a/packages/pimlico/files/tasks-owl.diff +++ b/packages/pimlico/files/tasks-owl.diff @@ -1,14 +1,24 @@ Index: src/gtk/tasks-ui.xml =================================================================== ---- src/gtk/tasks-ui.xml (revision 288) +--- src/gtk/tasks-ui.xml (revision 338) +++ src/gtk/tasks-ui.xml (working copy) -@@ -10,10 +10,8 @@ +@@ -7,17 +7,14 @@ + <menuitem action="EditTask"/> + <menuitem action="CompleteTask"/> + <separator/> ++ <menuitem action="Undo"/> ++ <menuitem action="Redo"/> ++ <separator/> <menuitem action="DeleteTask"/> <menuitem action="PurgeTasks"/> <separator/> + <menuitem action="About"/> <menuitem action="Quit"/> </menu> +- <menu action="EditMenu"> +- <menuitem action="Undo"/> +- <menuitem action="Redo"/> +- </menu> - <menu action="HelpMenu"> - <menuitem action="About"/> - </menu> @@ -16,7 +26,7 @@ Index: src/gtk/tasks-ui.xml </ui> Index: src/gtk/main.c =================================================================== ---- src/gtk/main.c (revision 288) +--- src/gtk/main.c (revision 338) +++ src/gtk/main.c (working copy) @@ -21,6 +21,7 @@ #include <libecal/e-cal.h> @@ -25,50 +35,28 @@ Index: src/gtk/main.c +#include <owlwindowmenu.h> #include <libkoto/ical-util.h> - #include <libkoto/koto-category-group.h> -@@ -462,17 +463,6 @@ - NULL); - } - --/* -- * Callback from the UI manager with the GtkMenu widget. Pack and add this to -- * the container. -- */ --static void --ui_add_widget (GtkUIManager *ui, GtkWidget *widget, GtkContainer *container) --{ -- gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); -- gtk_widget_show (widget); --} -- - /* TODO: split into global actions and actions that require a task to be selected */ - static const GtkActionEntry actions[] = - { -@@ -563,11 +553,12 @@ - } - /* Bind the accelerators */ + #include <libkoto/koto-actions.h> +@@ -564,8 +565,8 @@ gtk_window_add_accel_group (GTK_WINDOW (window), gtk_ui_manager_get_accel_group (ui_manager)); -- g_signal_connect (ui_manager, "add-widget", G_CALLBACK (ui_add_widget), top_box); - - /* Do this so that the menu is packed now instead of in the idle loop */ gtk_ui_manager_ensure_update (ui_manager); -- -+ owl_set_window_menu_item (GTK_WINDOW (window), -+ GTK_MENU_ITEM (gtk_ui_manager_get_widget (ui_manager, "/MenuBar/TasksMenu"))); -+ + +- menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar"); +- gtk_box_pack_start (GTK_BOX (top_box), menu, FALSE, FALSE, 0); ++ menu = gtk_ui_manager_get_widget (ui_manager, "/MenuBar/TasksMenu"); ++ owl_set_window_menu_item (GTK_WINDOW (window), GTK_MENU_ITEM (menu)); + box = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (box), 4); - gtk_container_add (GTK_CONTAINER (top_box), box); Index: src/gtk/Makefile.am =================================================================== ---- src/gtk/Makefile.am (revision 288) +--- src/gtk/Makefile.am (revision 338) +++ src/gtk/Makefile.am (working copy) @@ -4,7 +4,7 @@ bin_PROGRAMS = tasks tasks_CPPFLAGS = -I$(top_srcdir)/ - tasks_CFLAGS = -Wall $(GTK_CFLAGS) $(ECAL_CFLAGS) $(SEXY_CFLAGS) + tasks_CFLAGS = $(WARN_CFLAGS) $(GTK_CFLAGS) $(ECAL_CFLAGS) $(SEXY_CFLAGS) -tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS) -+tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS) -lowl ++tasks_LDADD = $(top_builddir)/libkoto/libkoto.a $(GTK_LIBS) $(ECAL_LIBS) $(SEXY_LIBS) -lowl tasks_SOURCES = \ main.c \ |