[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25212 - gnunet-gtk/src/setup
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r25212 - gnunet-gtk/src/setup |
|
Date: |
Tue, 4 Dec 2012 10:21:56 +0100 |
Author: grothoff
Date: 2012-12-04 10:21:56 +0100 (Tue, 04 Dec 2012)
New Revision: 25212
Modified:
gnunet-gtk/src/setup/gnunet-setup-gns-edit.c
Log:
-adding sane defaults for exp times
Modified: gnunet-gtk/src/setup/gnunet-setup-gns-edit.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-gns-edit.c 2012-12-04 08:54:30 UTC
(rev 25211)
+++ gnunet-gtk/src/setup/gnunet-setup-gns-edit.c 2012-12-04 09:21:56 UTC
(rev 25212)
@@ -195,6 +195,11 @@
GtkListStore *ls;
GtkTreeIter iter;
gchar *opt;
+ struct GNUNET_TIME_Absolute at;
+ struct GNUNET_TIME_Relative rt;
+ time_t tp;
+ struct tm *ymd;
+ GtkCalendar *cal;
if (GNUNET_YES !=
edc->old_record_in_namestore)
@@ -224,64 +229,65 @@
gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
"edit_dialog_expiration_relative_combobox")));
}
+ if ( (edc->n_is_relative) &&
+ (GNUNET_TIME_UNIT_FOREVER_REL.rel_value != edc->n_exp_time) )
+ {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(edc->builder,
+
"edit_dialog_expiration_relative_radiobutton")),
+ TRUE);
+ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
+
"edit_dialog_expiration_absolute_calendar")));
+ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
+
"edit_dialog_expiration_absolute_hbox")));
+ rt.rel_value = edc->n_exp_time;
+ }
else
{
- if (edc->n_is_relative)
- {
- struct GNUNET_TIME_Relative rt;
-
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(edc->builder,
-
"edit_dialog_expiration_relative_radiobutton")),
- TRUE);
- gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
-
"edit_dialog_expiration_absolute_calendar")));
- gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
-
"edit_dialog_expiration_absolute_hbox")));
- rt.rel_value = edc->n_exp_time;
-
- cb = GTK_COMBO_BOX (gtk_builder_get_object (edc->builder,
-
"edit_dialog_expiration_relative_combobox"));
- ls = GTK_LIST_STORE (gtk_combo_box_get_model (cb));
- gtk_list_store_insert_with_values (ls, &iter,
- -1 /* position: append */,
- 0,
GNUNET_STRINGS_relative_time_to_string (rt, GNUNET_NO),
- -1);
- gtk_combo_box_set_active_iter (cb, &iter);
- }
- else
- {
- struct GNUNET_TIME_Absolute at;
- time_t tp;
- struct tm *ymd;
- GtkCalendar *cal;
-
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(edc->builder,
-
"edit_dialog_expiration_absolute_radiobutton")),
- TRUE);
-
- gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
-
"edit_dialog_expiration_relative_combobox")));
- at.abs_value = edc->n_exp_time;
- tp = (time_t) (at.abs_value / 1000LL); /* convert to seconds */
- ymd = gmtime (&tp);
- cal = GTK_CALENDAR (gtk_builder_get_object (edc->builder,
-
"edit_dialog_expiration_absolute_calendar"));
- gtk_calendar_select_month (cal,
- ymd->tm_mon,
- ymd->tm_year + 1900);
- gtk_calendar_mark_day (cal,
- ymd->tm_mday);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtk_builder_get_object
(edc->builder,
-
"edit_dialog_expiration_absolute_hours_spinbutton")),
- (double) ymd->tm_hour);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtk_builder_get_object
(edc->builder,
-
"edit_dialog_expiration_absolute_minutes_spinbutton")),
- (double) ymd->tm_min);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtk_builder_get_object
(edc->builder,
-
"edit_dialog_expiration_absolute_seconds_spinbutton")),
- (double) ymd->tm_sec);
- }
+ /* select a sane default */
+ rt = GNUNET_TIME_UNIT_DAYS;
}
+ cb = GTK_COMBO_BOX (gtk_builder_get_object (edc->builder,
+
"edit_dialog_expiration_relative_combobox"));
+ ls = GTK_LIST_STORE (gtk_combo_box_get_model (cb));
+ gtk_list_store_insert_with_values (ls, &iter,
+ -1 /* position: append */,
+ 0, GNUNET_STRINGS_relative_time_to_string
(rt, GNUNET_NO),
+ -1);
+ gtk_combo_box_set_active_iter (cb, &iter);
+ if ( (! edc->n_is_relative) &&
+ (GNUNET_TIME_UNIT_FOREVER_ABS.abs_value != edc->n_exp_time) )
+ {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(edc->builder,
+
"edit_dialog_expiration_absolute_radiobutton")),
+ TRUE);
+
+ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (edc->builder,
+
"edit_dialog_expiration_relative_combobox")));
+ at.abs_value = edc->n_exp_time;
+ }
+ else
+ {
+ /* select a sane default: right now */
+ at = GNUNET_TIME_absolute_get ();
+ }
+ tp = (time_t) (at.abs_value / 1000LL); /* convert to seconds */
+ ymd = gmtime (&tp);
+ cal = GTK_CALENDAR (gtk_builder_get_object (edc->builder,
+
"edit_dialog_expiration_absolute_calendar"));
+ gtk_calendar_select_month (cal,
+ ymd->tm_mon,
+ ymd->tm_year + 1900);
+ gtk_calendar_mark_day (cal,
+ ymd->tm_mday);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtk_builder_get_object
(edc->builder,
+
"edit_dialog_expiration_absolute_hours_spinbutton")),
+ (double) ymd->tm_hour);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtk_builder_get_object
(edc->builder,
+
"edit_dialog_expiration_absolute_minutes_spinbutton")),
+ (double) ymd->tm_min);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (gtk_builder_get_object
(edc->builder,
+
"edit_dialog_expiration_absolute_seconds_spinbutton")),
+ (double) ymd->tm_sec);
/* set source zone! */
cb = GTK_COMBO_BOX (gtk_builder_get_object (edc->builder,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25212 - gnunet-gtk/src/setup,
gnunet <=