aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--calendar/gui/Makefile.am6
-rw-r--r--calendar/gui/dialogs/Makefile.am4
-rw-r--r--calendar/gui/dialogs/goto-dialog.c (renamed from calendar/gui/goto.c)15
-rw-r--r--calendar/gui/dialogs/goto-dialog.h (renamed from calendar/gui/goto.h)4
-rw-r--r--calendar/gui/dialogs/goto-dialog.ui (renamed from calendar/gui/goto-dialog.ui)7
-rw-r--r--calendar/gui/e-cal-list-view.c2
-rw-r--r--calendar/gui/e-calendar-view.c2
-rw-r--r--calendar/gui/e-day-view.c2
-rw-r--r--calendar/gui/e-week-view.c2
-rw-r--r--calendar/gui/ea-cal-view.c2
-rw-r--r--modules/calendar/e-cal-shell-view-private.h2
-rw-r--r--po/POTFILES.in4
12 files changed, 28 insertions, 24 deletions
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index a74d4a1a70..0a404d429c 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -42,7 +42,6 @@ ecalendarinclude_HEADERS = \
e-week-view.h \
e-timezone-entry.h \
gnome-cal.h \
- goto.h \
itip-utils.h \
misc.h \
tag-calendar.h \
@@ -74,9 +73,6 @@ libevolution_calendar_la_CPPFLAGS = \
$(EVOLUTION_CALENDAR_CFLAGS) \
$(CAMEL_CFLAGS)
-ui_DATA = \
- goto-dialog.ui
-
etspec_DATA = \
e-calendar-table.etspec \
e-meeting-time-sel.etspec \
@@ -170,8 +166,6 @@ libevolution_calendar_la_SOURCES = \
e-week-view.h \
e-timezone-entry.c \
e-timezone-entry.h \
- goto.c \
- goto.h \
gnome-cal.c \
gnome-cal.h \
itip-utils.c \
diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am
index 38e0c47e62..684550990b 100644
--- a/calendar/gui/dialogs/Makefile.am
+++ b/calendar/gui/dialogs/Makefile.am
@@ -36,6 +36,7 @@ ecalendarinclude_HEADERS = \
e-send-options-utils.h \
event-editor.h \
event-page.h \
+ goto-dialog.h \
memo-editor.h \
memo-page.h \
recurrence-page.h \
@@ -85,6 +86,8 @@ libcal_dialogs_la_SOURCES = \
event-editor.h \
event-page.c \
event-page.h \
+ goto-dialog.c \
+ goto-dialog.h \
memo-editor.c \
memo-editor.h \
memo-page.c \
@@ -113,6 +116,7 @@ ui_DATA = \
alarm-list-dialog.ui \
e-delegate-dialog.ui \
event-page.ui \
+ goto-dialog.ui \
memo-page.ui \
recurrence-page.ui \
schedule-page.ui \
diff --git a/calendar/gui/goto.c b/calendar/gui/dialogs/goto-dialog.c
index bf24c3c097..282d5547ff 100644
--- a/calendar/gui/goto.c
+++ b/calendar/gui/dialogs/goto-dialog.c
@@ -24,13 +24,18 @@
*
*/
+#ifdef HAVE_CONFIG_H
#include <config.h>
+#endif
+
#include <gtk/gtk.h>
+
+#include "goto-dialog.h"
+
#include "e-util/e-util.h"
#include "e-util/e-util-private.h"
-#include "calendar-config.h"
-#include "tag-calendar.h"
-#include "goto.h"
+#include "calendar/gui/calendar-config.h"
+#include "calendar/gui/tag-calendar.h"
typedef struct
{
@@ -171,7 +176,7 @@ goto_today (GoToDialog *dlg)
static gboolean
get_widgets (GoToDialog *dlg)
{
-#define GW(name) e_builder_get_widget (dlg->builder, name)
+ #define GW(name) e_builder_get_widget (dlg->builder, name)
dlg->dialog = GW ("goto-dialog");
@@ -179,7 +184,7 @@ get_widgets (GoToDialog *dlg)
dlg->year = GW ("year");
dlg->vbox = GW ("vbox");
-#undef GW
+ #undef GW
return (dlg->dialog
&& dlg->month_combobox
diff --git a/calendar/gui/goto.h b/calendar/gui/dialogs/goto-dialog.h
index 2b81757127..9cd416be80 100644
--- a/calendar/gui/goto.h
+++ b/calendar/gui/dialogs/goto-dialog.h
@@ -16,7 +16,7 @@
*
*
* Authors:
- * Federico Mena <federico@ximian.com>
+ * Federico Mena <federico@ximian.com>
* JP Rosevear <jpr@ximian.com>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -27,7 +27,7 @@
#ifndef GOTO_DIALOG_H
#define GOTO_DIALOG_H
-#include "gnome-cal.h"
+#include "calendar/gui/gnome-cal.h"
void goto_dialog (GtkWindow *parent, GnomeCalendar *gcal);
diff --git a/calendar/gui/goto-dialog.ui b/calendar/gui/dialogs/goto-dialog.ui
index 8ddbfb8575..4bcb1da863 100644
--- a/calendar/gui/goto-dialog.ui
+++ b/calendar/gui/dialogs/goto-dialog.ui
@@ -66,6 +66,7 @@
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
+ <property name="border_width">12</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
@@ -130,8 +131,8 @@
</object>
<packing>
<property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
<child>
@@ -155,7 +156,7 @@
</object>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index 27a11787ae..b81a4412bd 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -51,13 +51,13 @@
#include "e-cell-date-edit-text.h"
#include "dialogs/delete-comp.h"
#include "dialogs/delete-error.h"
+#include "dialogs/goto-dialog.h"
#include "dialogs/send-comp.h"
#include "dialogs/cancel-comp.h"
#include "dialogs/recur-comp.h"
#include "comp-util.h"
#include "itip-utils.h"
#include "calendar-config.h"
-#include "goto.h"
#include "misc.h"
static void e_cal_list_view_dispose (GObject *object);
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index d9b7e91ce4..1f4ac33cb6 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -57,8 +57,8 @@
#include "dialogs/cancel-comp.h"
#include "dialogs/recur-comp.h"
#include "dialogs/select-source-dialog.h"
+#include "dialogs/goto-dialog.h"
#include "print.h"
-#include "goto.h"
#include "misc.h"
struct _ECalendarViewPrivate {
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index b5bd081839..af28e3cc12 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -48,10 +48,10 @@
#include "dialogs/send-comp.h"
#include "dialogs/cancel-comp.h"
#include "dialogs/recur-comp.h"
+#include "dialogs/goto-dialog.h"
#include "print.h"
#include "comp-util.h"
#include "itip-utils.h"
-#include "goto.h"
#include "e-cal-model-calendar.h"
#include "e-day-view-time-item.h"
#include "e-day-view-top-item.h"
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 9fd9abcfcc..d6f430f2a1 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -47,12 +47,12 @@
#include "dialogs/send-comp.h"
#include "dialogs/cancel-comp.h"
#include "dialogs/recur-comp.h"
+#include "dialogs/goto-dialog.h"
#include "comp-util.h"
#include "itip-utils.h"
#include <libecal/e-cal-time-util.h>
#include "calendar-config.h"
#include "print.h"
-#include "goto.h"
#include "e-cal-model-calendar.h"
#include "e-week-view-event-item.h"
#include "e-week-view-layout.h"
diff --git a/calendar/gui/ea-cal-view.c b/calendar/gui/ea-cal-view.c
index 1c49d2896b..15381ee772 100644
--- a/calendar/gui/ea-cal-view.c
+++ b/calendar/gui/ea-cal-view.c
@@ -24,7 +24,7 @@
#include "ea-calendar-helpers.h"
#include "e-day-view.h"
#include "e-week-view.h"
-#include "goto.h"
+#include "dialogs/goto-dialog.h"
#include <glib.h>
#include <glib/gi18n.h>
diff --git a/modules/calendar/e-cal-shell-view-private.h b/modules/calendar/e-cal-shell-view-private.h
index b3b4092788..52ec374295 100644
--- a/modules/calendar/e-cal-shell-view-private.h
+++ b/modules/calendar/e-cal-shell-view-private.h
@@ -50,11 +50,11 @@
#include "calendar/gui/e-day-view.h"
#include "calendar/gui/e-week-view.h"
#include "calendar/gui/gnome-cal.h"
-#include "calendar/gui/goto.h"
#include "calendar/gui/print.h"
#include "calendar/gui/dialogs/calendar-setup.h"
#include "calendar/gui/dialogs/copy-source-dialog.h"
#include "calendar/gui/dialogs/event-editor.h"
+#include "calendar/gui/dialogs/goto-dialog.h"
#include "calendar/gui/dialogs/memo-editor.h"
#include "calendar/gui/dialogs/select-source-dialog.h"
#include "calendar/gui/dialogs/task-editor.h"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index af941b9c56..700d9a8c81 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -62,6 +62,8 @@ calendar/gui/dialogs/delete-error.c
calendar/gui/dialogs/event-editor.c
calendar/gui/dialogs/event-page.c
[type: gettext/glade]calendar/gui/dialogs/event-page.ui
+calendar/gui/dialogs/goto-dialog.c
+[type: gettext/glade]calendar/gui/dialogs/goto-dialog.ui
calendar/gui/dialogs/memo-editor.c
calendar/gui/dialogs/memo-page.c
[type: gettext/glade]calendar/gui/dialogs/memo-page.ui
@@ -111,8 +113,6 @@ calendar/gui/ea-jump-button.c
calendar/gui/ea-week-view-main-item.c
calendar/gui/ea-week-view.c
calendar/gui/gnome-cal.c
-[type: gettext/glade]calendar/gui/goto-dialog.ui
-calendar/gui/goto.c
calendar/gui/itip-utils.c
calendar/gui/memotypes.xml
calendar/gui/misc.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 18:23:04 +0800