aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog9
-rw-r--r--calendar/gui/dialogs/calendar-setup.c13
-rw-r--r--calendar/gui/dialogs/calendar-setup.glade7
3 files changed, 21 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index feaf052ef1..ccd2f9ebbd 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,13 @@
2004-04-27 Larry Ewing <lewing@ximian.com>
+ * gui/dialogs/calendar-setup.c: hook up the color picker and test
+ buttons in the new task dialog.
+
+ * gui/dialogs/calendar-setup.glade: fix visibility and color
+ picker names.
+
+2004-04-27 Larry Ewing <lewing@ximian.com>
+
* gui/dialogs/calendar-setup.c (new_calendar_test_uri): add
handler for test button.
(calendar_setup_new_calendar): connect test button, fill in color
@@ -7,6 +15,7 @@
(source_to_dialog): set the color picker color if the source has
one.
(dialog_to_source): set the source color.
+
2004-04-27 Jeffrey Stedfast <fejj@ximian.com>
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index 93270fea48..d841150e48 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -30,6 +30,7 @@
#include <gtk/gtkmenuitem.h>
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtkoptionmenu.h>
+#include <libgnome/libgnome.h>
#include <libgnomeui/gnome-druid.h>
#include <libgnomeui/gnome-druid-page.h>
#include <libgnomeui/gnome-color-picker.h>
@@ -552,10 +553,11 @@ source_group_changed_sensitive (SourceDialog *source_dialog)
}
static void
-new_calendar_test_uri (SourceDialog *source_dialog)
+general_test_uri (SourceDialog *source_dialog)
{
+ /* FIXME this should do something more specific that just showing the uri */
gnome_url_show (gtk_entry_get_text (GTK_ENTRY (source_dialog->uri_entry)),
- NULL)
+ NULL);
}
static void
@@ -641,7 +643,7 @@ calendar_setup_new_calendar (GtkWindow *parent)
source_to_dialog (source_dialog);
g_signal_connect_swapped (glade_xml_get_widget (source_dialog->gui_xml, "uri-button"), "clicked",
- G_CALLBACK (new_calendar_test_uri), source_dialog);
+ G_CALLBACK (general_test_uri), source_dialog);
gtk_window_set_type_hint (GTK_WINDOW (source_dialog->window), GDK_WINDOW_TYPE_HINT_DIALOG);
@@ -798,6 +800,11 @@ calendar_setup_new_task_list (GtkWindow *parent)
g_object_weak_ref (G_OBJECT (source_dialog->window),
(GWeakNotify) source_dialog_destroy, source_dialog);
+ source_dialog->source_color = glade_xml_get_widget (source_dialog->gui_xml, "source-color");
+
+ g_signal_connect_swapped (glade_xml_get_widget (source_dialog->gui_xml, "uri-button"), "clicked",
+ G_CALLBACK (general_test_uri), source_dialog);
+
source_to_dialog (source_dialog);
gtk_window_set_type_hint (GTK_WINDOW (source_dialog->window), GDK_WINDOW_TYPE_HINT_DIALOG);
diff --git a/calendar/gui/dialogs/calendar-setup.glade b/calendar/gui/dialogs/calendar-setup.glade
index bd67f362eb..9f916d237f 100644
--- a/calendar/gui/dialogs/calendar-setup.glade
+++ b/calendar/gui/dialogs/calendar-setup.glade
@@ -5,7 +5,6 @@
<requires lib="gnome"/>
<widget class="GtkWindow" id="add-calendar-window">
- <property name="visible">True</property>
<property name="title" translatable="yes">Add Calendar</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
@@ -1187,7 +1186,6 @@
</widget>
<widget class="GtkWindow" id="add-task-list-window">
- <property name="visible">True</property>
<property name="title" translatable="yes">Add Tasks Group</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
@@ -1218,7 +1216,7 @@
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
- <property name="text" translatable="yes">Chillonia</property>
+ <property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
<property name="invisible_char" translatable="yes">*</property>
<property name="activates_default">False</property>
@@ -1293,7 +1291,6 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="mnemonic_widget">group-color</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -1306,7 +1303,7 @@
</child>
<child>
- <widget class="GnomeColorPicker" id="group-color">
+ <widget class="GnomeColorPicker" id="source-color">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="dither">True</property>