Skip to content

RepeatPanel: use revealers #916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danirabbit merged 4 commits into from
Feb 5, 2026
+56 −57
Merged

RepeatPanel: use revealers #916

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
933cbf7
RepeatPanel: use revealers
danirabbit Feb 4, 2026
efa87b3
Merge branch 'master' into danirabbit/repeatpanel-noshowall
danirabbit Feb 5, 2026
d83fc39
merge master
danirabbit Feb 5, 2026
a5ad159
Merge branch 'master' into danirabbit/repeatpanel-noshowall
danirabbit Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 56 additions & 57 deletions src/EventEdition/RepeatPanel.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class Maya.View.EventEdition.RepeatPanel : Gtk.Bin {
private Gtk.Switch repeat_switch;
private Gtk.ComboBoxText repeat_combobox;
private Gtk.ComboBoxText ends_combobox;
private Gtk.SpinButton end_entry;
private Gtk.SpinButton repeats_spinbutton;
private Granite.Widgets.DatePicker end_datepicker;
private Gtk.Box week_box;
private Gtk.SpinButton every_entry;
Expand Down Expand Up @@ -67,13 +67,6 @@ public class Maya.View.EventEdition.RepeatPanel : Gtk.Bin {

var ends_label = new Granite.HeaderLabel (_("Ends:"));

///Translators: Give a word to describe an event ending after a certain number of repeats.
///This will be displayed in the format like: "Ends After 2 Repeats",
///where this string always represents the last word in the phrase.
var end_label = new Gtk.Label (ngettext ("Repeat", "Repeats", 1)) {
no_show_all = true
};

ends_combobox = new Gtk.ComboBoxText () {
hexpand = true
};
Expand All @@ -82,24 +75,37 @@ public class Maya.View.EventEdition.RepeatPanel : Gtk.Bin {
ends_combobox.append_text (_("After"));
ends_combobox.active = 0;

end_entry = new Gtk.SpinButton.with_range (1, 99, 1) {
hexpand = true,
no_show_all = true
repeats_spinbutton = new Gtk.SpinButton.with_range (1, 99, 1) {
hexpand = true
};

///Translators: Give a word to describe an event ending after a certain number of repeats.
///This will be displayed in the format like: "Ends After 2 Repeats",
///where this string always represents the last word in the phrase.
var repeats_label = new Gtk.Label (ngettext ("Repeat", "Repeats", 1));

var end_repeat_box = new Gtk.Box (HORIZONTAL, 12);
end_repeat_box.add (repeats_spinbutton);
end_repeat_box.add (repeats_label);

var end_repeat_revealer = new Gtk.Revealer () {
child = end_repeat_box
};

var format = Granite.DateTime.get_default_date_format (false, true, true);

end_datepicker = new Granite.Widgets.DatePicker.with_format (format) {
no_show_all = true
end_datepicker = new Granite.Widgets.DatePicker.with_format (format);

var end_date_revealer = new Gtk.Revealer () {
child = end_datepicker
};

var ends_grid = new Gtk.Box (HORIZONTAL, 12) {
var ends_grid = new Gtk.Box (VERTICAL, 6) {
sensitive = false
};
ends_grid.add (ends_combobox);
ends_grid.add (end_entry);
ends_grid.add (end_label);
ends_grid.add (end_datepicker);
ends_grid.add (end_date_revealer);
ends_grid.add (end_repeat_revealer);

mon_button = new Gtk.ToggleButton.with_label (_("Mon"));
tue_button = new Gtk.ToggleButton.with_label (_("Tue"));
Expand All @@ -121,15 +127,22 @@ public class Maya.View.EventEdition.RepeatPanel : Gtk.Bin {
week_box.add (sat_button);
week_box.add (sun_button);

var weekday_revealer = new Gtk.Revealer () {
child = week_box
};

same_radiobutton = new Gtk.RadioButton.with_label (null, _("The same day every month"));
every_radiobutton = new Gtk.RadioButton.from_widget (same_radiobutton);

var month_grid = new Gtk.Box (VERTICAL, 6) {
no_show_all = true,
var monthly_box = new Gtk.Box (VERTICAL, 6) {
sensitive = false
};
month_grid.add (same_radiobutton);
month_grid.add (every_radiobutton);
monthly_box.add (same_radiobutton);
monthly_box.add (every_radiobutton);

var monthly_revealer = new Gtk.Revealer () {
child = monthly_box
};

var exceptions_label = new Granite.HeaderLabel (_("Exceptions:"));

Expand Down Expand Up @@ -176,8 +189,8 @@ public class Maya.View.EventEdition.RepeatPanel : Gtk.Bin {
main_box.add (repeat_box);
main_box.add (every_label);
main_box.add (every_box);
main_box.add (week_box);
main_box.add (month_grid);
main_box.add (weekday_revealer);
main_box.add (monthly_revealer);
main_box.add (ends_label);
main_box.add (ends_grid);
main_box.add (exceptions_label);
Expand All @@ -203,38 +216,36 @@ public class Maya.View.EventEdition.RepeatPanel : Gtk.Bin {
repeat_combobox.sensitive = active;
every_box.sensitive = active;
week_box.sensitive = active;
month_grid.sensitive = active;
monthly_box.sensitive = active;
ends_grid.sensitive = active;
exceptions_box.sensitive = active;
});
repeat_switch.active = false;

repeat_combobox.changed.connect (() => {
switch (repeat_combobox.active) {
// Weekly
case 1:
week_box.no_show_all = false;
week_box.show_all ();
month_grid.no_show_all = true;
month_grid.hide ();
weekday_revealer.reveal_child = true;
monthly_revealer.reveal_child = false;
break;
// Monthly
case 2:
int day_of_week = parent_dialog.date_time.get_day_of_week () + 1;
if (day_of_week > 7) {
day_of_week = 1;
}
set_every_day ((short)(day_of_week + Math.ceil ((double)parent_dialog.date_time.get_day_of_month () / (double)7) * 8));
week_box.no_show_all = true;
week_box.hide ();
month_grid.no_show_all = false;
month_grid.show_all ();

weekday_revealer.reveal_child = false;
monthly_revealer.reveal_child = true;
break;
default:
month_grid.no_show_all = true;
month_grid.hide ();
week_box.no_show_all = true;
week_box.hide ();
monthly_revealer.reveal_child = false;
weekday_revealer.reveal_child = false;
break;
}

every_entry.value_changed ();
});

Expand All @@ -256,27 +267,15 @@ public class Maya.View.EventEdition.RepeatPanel : Gtk.Bin {
});

ends_combobox.changed.connect (() => {
switch (ends_combobox.active) {
case 0:
end_label.hide ();
end_entry.hide ();
end_datepicker.hide ();
break;
case 1:
end_label.hide ();
end_entry.hide ();
end_datepicker.show ();
break;
case 2:
end_label.show ();
end_entry.show ();
end_datepicker.hide ();
break;
}
// On Date
end_date_revealer.reveal_child = ends_combobox.active == 1;

// After n repeats
end_repeat_revealer.reveal_child = ends_combobox.active == 2;
});

end_entry.value_changed.connect (() => {
end_label.label = ngettext ("Repeat", "Repeats", (ulong)end_entry.value);
repeats_spinbutton.value_changed.connect (() => {
repeats_label.label = ngettext ("Repeat", "Repeats", (ulong)repeats_spinbutton.value);
});

load ();
Expand Down Expand Up @@ -370,7 +369,7 @@ public class Maya.View.EventEdition.RepeatPanel : Gtk.Bin {
end_datepicker.date = Calendar.Util.icaltime_to_datetime (until);
}
if (rrule.get_count () > 0) {
end_entry.value = rrule.get_count ();
repeats_spinbutton.value = rrule.get_count ();
ends_combobox.active = 2;
}
}
Expand Down Expand Up @@ -736,7 +735,7 @@ public class Maya.View.EventEdition.RepeatPanel : Gtk.Bin {
break;
}
if (ends_combobox.active == 2) {
rrule.set_count ((int)end_entry.value);
rrule.set_count ((int)repeats_spinbutton.value);
} else if (ends_combobox.active == 1) {
rrule.set_until (new ICal.Time.from_day_of_year (end_datepicker.date.get_day_of_year (), end_datepicker.date.get_year ()));
}
Expand Down