diff options
-rw-r--r-- | calendar/gui/calendar-config.c | 32 | ||||
-rw-r--r-- | calendar/gui/calendar-config.h | 3 | ||||
-rw-r--r-- | calendar/gui/gnome-cal.c | 66 |
3 files changed, 0 insertions, 101 deletions
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c index 81c0675bea..a57b0c2411 100644 --- a/calendar/gui/calendar-config.c +++ b/calendar/gui/calendar-config.c @@ -565,22 +565,6 @@ calendar_config_set_hpane_pos (gint hpane_pos) gconf_client_set_int (config, CALENDAR_CONFIG_HPANE_POS, hpane_pos, NULL); } -gint -calendar_config_get_vpane_pos (void) -{ - calendar_config_init (); - - return gconf_client_get_int (config, CALENDAR_CONFIG_VPANE_POS, NULL); -} - -void -calendar_config_set_vpane_pos (gint vpane_pos) -{ - calendar_config_init (); - - gconf_client_set_int (config, CALENDAR_CONFIG_VPANE_POS, vpane_pos, NULL); -} - gboolean calendar_config_get_preview_state (void) { @@ -625,22 +609,6 @@ calendar_config_set_month_hpane_pos (gint hpane_pos) gconf_client_set_int (config, CALENDAR_CONFIG_MONTH_HPANE_POS, hpane_pos, NULL); } -gint -calendar_config_get_month_vpane_pos (void) -{ - calendar_config_init (); - - return gconf_client_get_int (config, CALENDAR_CONFIG_MONTH_VPANE_POS, NULL); -} - -void -calendar_config_set_month_vpane_pos (gint vpane_pos) -{ - calendar_config_init (); - - gconf_client_set_int (config, CALENDAR_CONFIG_MONTH_VPANE_POS, vpane_pos, NULL); -} - gfloat calendar_config_get_tag_vpane_pos (void) { diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h index 3341b66163..241ed8fe4c 100644 --- a/calendar/gui/calendar-config.h +++ b/calendar/gui/calendar-config.h @@ -138,9 +138,6 @@ guint calendar_config_add_notification_dview_show_week_no (GConfClientNotifyFunc gint calendar_config_get_hpane_pos (void); void calendar_config_set_hpane_pos (gint hpane_pos); -gint calendar_config_get_vpane_pos (void); -void calendar_config_set_vpane_pos (gint vpane_pos); - gboolean calendar_config_get_preview_state (void); void calendar_config_set_preview_state (gboolean state); guint calendar_config_add_notification_preview_state (GConfClientNotifyFunc func, gpointer data); diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index b245248f33..b4eacf8a07 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -145,8 +145,6 @@ struct _GnomeCalendarPrivate { will work OK after theme changes. */ gint hpane_pos; gint hpane_pos_month_view; - gint vpane_pos; - gint vpane_pos_month_view; /* The signal handler id for our GtkCalendar "day_selected" handler. */ guint day_selected_id; @@ -198,15 +196,12 @@ static void gnome_calendar_goto_date (GnomeCalendar *gcal, static void gnome_calendar_change_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type); -static void gnome_calendar_set_pane_positions (GnomeCalendar *gcal); static void update_view_times (GnomeCalendar *gcal, time_t start_time); static void gnome_calendar_update_date_navigator (GnomeCalendar *gcal); static void gnome_calendar_hpane_realized (GtkWidget *w, GnomeCalendar *gcal); static void gnome_calendar_date_navigator_scrolled (GtkWidget *widget, GdkEventScroll *event, gpointer user_data); static gboolean gnome_calendar_hpane_resized (GtkWidget *w, GdkEventButton *e, GnomeCalendar *gcal); -static void gnome_calendar_vpane_realized (GtkWidget *w, GnomeCalendar *gcal); -static gboolean gnome_calendar_vpane_resized (GtkWidget *w, GdkEventButton *e, GnomeCalendar *gcal); static void gnome_calendar_on_date_navigator_date_range_changed (ECalendarItem *calitem, GnomeCalendar *gcal); @@ -1203,9 +1198,7 @@ setup_config (GnomeCalendar *calendar) /* Pane positions */ priv->hpane_pos = calendar_config_get_hpane_pos (); - priv->vpane_pos = calendar_config_get_vpane_pos (); priv->hpane_pos_month_view = calendar_config_get_month_hpane_pos (); - priv->vpane_pos_month_view = calendar_config_get_month_vpane_pos (); } static void @@ -1379,15 +1372,6 @@ setup_widgets (GnomeCalendar *gcal) g_signal_connect (w, "scroll-event", G_CALLBACK (gnome_calendar_date_navigator_scrolled), gcal); - /* The VPaned widget, to contain the ToDo list & Memo list */ - priv->vpane = gtk_vpaned_new (); - g_signal_connect_after (priv->vpane, "realize", - G_CALLBACK(gnome_calendar_vpane_realized), gcal); - g_signal_connect (priv->vpane, "button_release_event", - G_CALLBACK (gnome_calendar_vpane_resized), gcal); - gtk_widget_show (priv->vpane); - gtk_paned_pack2 (GTK_PANED (priv->hpane), priv->vpane, TRUE, TRUE); - /* The ToDo list. */ vbox = gtk_vbox_new (FALSE, 0); sep = gtk_hseparator_new (); @@ -2008,8 +1992,6 @@ display_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean gra if (grab_focus) focus_current_view (gcal); - gnome_calendar_set_pane_positions (gcal); - /* For the week & month views we want the selection in the date navigator to be rounded to the nearest week when the arrow buttons are pressed to move to the previous/next month. */ @@ -2066,22 +2048,6 @@ display_view_cb (GalViewInstance *view_instance, GalView *view, gpointer data) } -static void -gnome_calendar_set_pane_positions (GnomeCalendar *gcal) -{ - GnomeCalendarPrivate *priv; - - priv = gcal->priv; - - if (priv->current_view_type == GNOME_CAL_MONTH_VIEW && !priv->range_selected) { - gtk_paned_set_position (GTK_PANED (priv->hpane), priv->hpane_pos_month_view); - gtk_paned_set_position (GTK_PANED (priv->vpane), priv->vpane_pos_month_view); - } else { - gtk_paned_set_position (GTK_PANED (priv->hpane), priv->hpane_pos); - gtk_paned_set_position (GTK_PANED (priv->vpane), priv->vpane_pos); - } -} - struct _mclient_msg { Message header; ECalModel *model; @@ -2957,38 +2923,6 @@ gnome_calendar_hpane_resized (GtkWidget *w, GdkEventButton *e, GnomeCalendar *gc return FALSE; } -static void -gnome_calendar_vpane_realized (GtkWidget *w, GnomeCalendar *gcal) -{ - GnomeCalendarPrivate *priv; - - priv = gcal->priv; - - if (priv->current_view_type == GNOME_CAL_MONTH_VIEW && !priv->range_selected) { - gtk_paned_set_position (GTK_PANED (priv->vpane), priv->vpane_pos_month_view); - } else { - gtk_paned_set_position (GTK_PANED (priv->vpane), priv->vpane_pos); - } -} - -static gboolean -gnome_calendar_vpane_resized (GtkWidget *w, GdkEventButton *e, GnomeCalendar *gcal) -{ - GnomeCalendarPrivate *priv; - - priv = gcal->priv; - - if (priv->current_view_type == GNOME_CAL_MONTH_VIEW && !priv->range_selected) { - priv->vpane_pos_month_view = gtk_paned_get_position (GTK_PANED (priv->vpane)); - calendar_config_set_month_vpane_pos (priv->vpane_pos_month_view); - } else { - priv->vpane_pos = gtk_paned_get_position (GTK_PANED (priv->vpane)); - calendar_config_set_vpane_pos (priv->vpane_pos); - } - - return FALSE; -} - void gnome_calendar_cut_clipboard (GnomeCalendar *gcal) { |