Skip to content

Commit e7094c2

Browse files
alainm23alainm23
committed
Fix #1217 
1 parent 7e3b4cf commit e7094c2

13 files changed

+24
-42
lines changed

‎core/Objects/Filters/Anytime.vala

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class Objects.Filters.Anytime : Objects.BaseObject {
3131

3232
construct {
3333
name = _("Anytime");
34-
keywords = "%s;%s;%s".printf (_("anytime"), _("filter"), _("no date"));
34+
keywords = "%s;%s;%s".printf (_("anytime"), _("filters"), _("no date"));
3535
icon_name = "grid-large-symbolic";
3636
view_id = "anytime-view";
3737
}

‎core/Objects/Filters/Completed.vala

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class Objects.Filters.Completed : Objects.BaseObject {
4848

4949
construct {
5050
name = _("Completed");
51-
keywords = "%s;%s;%s".printf (_("completed"), _("filter"), _("logbook"));
51+
keywords = "%s;%s;%s".printf (_("completed"), _("filters"), _("logbook"));
5252
icon_name = "check-round-outline-symbolic";
5353
view_id = FilterType.COMPLETED.to_string ();
5454

‎core/Objects/Filters/Labels.vala

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class Objects.Filters.Labels : Objects.BaseObject {
4848

4949
construct {
5050
name = _("Labels");
51-
keywords = "%s;%s".printf (_("labels"), _("filter"));
51+
keywords = "%s;%s".printf (_("labels"), _("filters"));
5252
icon_name = "tag-outline-symbolic";
5353
view_id = FilterType.LABELS.to_string ();
5454

‎core/Objects/Filters/Pinboard.vala

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class Objects.Filters.Pinboard : Objects.BaseObject {
4848

4949
construct {
5050
name = ("Pinboard");
51-
keywords = _("Pinboard") + ";" + _("filter");
51+
keywords = _("Pinboard") + ";" + _("filters");
5252
icon_name = "pin-symbolic";
5353
view_id = FilterType.PINBOARD.to_string ();
5454

‎core/Objects/Filters/Priority.vala

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class Objects.Filters.Priority : Objects.BaseObject {
5656

5757
construct {
5858
name = Util.get_default ().get_priority_title (priority);
59-
keywords = Util.get_default ().get_priority_keywords (priority) + ";" + _("filter");
59+
keywords = Util.get_default ().get_priority_keywords (priority) + ";" + _("filters");
6060
view_id = "priority-%d".printf (priority);
6161

6262
Services.Database.get_default ().item_added.connect (() => {

‎core/Objects/Filters/Repeating.vala

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class Objects.Filters.Repeating : Objects.BaseObject {
3131

3232
construct {
3333
name = _("Repeating");
34-
keywords = "%s;%s".printf (_("repeating"), _("filter"));
34+
keywords = "%s;%s".printf (_("repeating"), _("filters"));
3535
icon_name = "arrow-circular-top-right-symbolic";
3636
view_id = "repeating-view";
3737
}

‎core/Objects/Filters/Scheduled.vala

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class Objects.Filters.Scheduled : Objects.BaseObject {
4848

4949
construct {
5050
name = _("Scheduled");
51-
keywords = "%s;%s;%s".printf (_("scheduled"), _("upcoming"), _("filter"));
51+
keywords = "%s;%s;%s".printf (_("scheduled"), _("upcoming"), _("filters"));
5252
icon_name = "month-symbolic";
5353
view_id = FilterType.SCHEDULED.to_string ();
5454

‎core/Objects/Filters/Today.vala

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public class Objects.Filters.Today : Objects.BaseObject {
6464

6565
construct {
6666
name = _("Today");
67-
keywords = _("today") + ";" + _("filter");
67+
keywords = _("today") + ";" + _("filters");
6868
icon_name = "star-outline-thick-symbolic";
6969
view_id = FilterType.TODAY.to_string ();
7070

‎core/Objects/Filters/Tomorrow.vala

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class Objects.Filters.Tomorrow : Objects.BaseObject {
3131

3232
construct {
3333
name = _("Tomorrow");
34-
keywords = "%s;%s;%s".printf (_("tomorrow"), _("filter"), _("date"));
34+
keywords = "%s;%s;%s".printf (_("tomorrow"), _("filters"), _("date"));
3535
icon_name = "today-calendar-symbolic";
3636
view_id = "tomorrow-view";
3737
}

‎core/Objects/Filters/Unlabeled.vala

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class Objects.Filters.Unlabeled : Objects.BaseObject {
3131

3232
construct {
3333
name = _("Unlabeled");
34-
keywords = "%s;%s;%s".printf (_("no label"), _("unlabeled"), _("filter"));
34+
keywords = "%s;%s;%s".printf (_("no label"), _("unlabeled"), _("filters"));
3535
icon_name = "tag-outline-remove-symbolic";
3636
view_id = "unlabeled-view";
3737
}

‎core/Util/Util.vala

+5-5
Original file line numberDiff line numberDiff line change
@@ -900,25 +900,25 @@ public class Util : GLib.Object {
900900
if (priority == Constants.PRIORITY_1) {
901901
return new Gtk.Image.from_icon_name ("flag-outline-thick-symbolic") {
902902
css_classes = { "priority-1-icon" },
903-
pixel_size = 19
903+
pixel_size = 16
904904
};
905905
} else if (priority == Constants.PRIORITY_2) {
906906
return new Gtk.Image.from_icon_name ("flag-outline-thick-symbolic") {
907907
css_classes = { "priority-1-icon" },
908-
pixel_size = 19
908+
pixel_size = 16
909909
};
910910
} else if (priority == Constants.PRIORITY_3) {
911911
return new Gtk.Image.from_icon_name ("flag-outline-thick-symbolic") {
912912
css_classes = { "priority-1-icon" },
913-
pixel_size = 19
913+
pixel_size = 16
914914
};
915915
} else if (priority == Constants.PRIORITY_4) {
916916
return new Gtk.Image.from_icon_name ("flag-outline-thick-symbolic") {
917-
pixel_size = 19
917+
pixel_size = 16
918918
};
919919
} else {
920920
return new Gtk.Image.from_icon_name ("flag-outline-thick-symbolic") {
921-
pixel_size = 19
921+
pixel_size = 16
922922
};
923923
}
924924
}

‎data/io.github.alainm23.planify.appdata.xml.in.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<release version="4.5.10" date="2024-03-26">
7171
<description translatable="no">
7272
<ul>
73-
<li>Morning, Untagged, Repeat and Anytime filter added from Quick Search.</li>
73+
<li>Tomorrow, Untagged, Repeat and Anytime filter added from Quick Search.</li>
7474
<li>Completed view added to the sidebar.</li>
7575
<li>Dutch translations added thanks to @Gert-dev.</li>
7676
<li>French translation update thanks to @rene-coty.</li>

‎src/MainWindow.vala

+8-26
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,6 @@ public class MainWindow : Adw.ApplicationWindow {
301301
}
302302

303303
public Views.Project add_project_view (Objects.Project project) {
304-
remove_filter_view ();
305-
306304
Views.Project? project_view;
307305
project_view = (Views.Project) views_stack.get_child_by_name (project.view_id);
308306
if (project_view == null) {
@@ -315,8 +313,6 @@ public class MainWindow : Adw.ApplicationWindow {
315313
}
316314

317315
public void add_today_view () {
318-
remove_filter_view ();
319-
320316
Views.Today? today_view;
321317
today_view = (Views.Today) views_stack.get_child_by_name ("today-view");
322318
if (today_view == null) {
@@ -328,8 +324,6 @@ public class MainWindow : Adw.ApplicationWindow {
328324
}
329325

330326
public void add_scheduled_view () {
331-
remove_filter_view ();
332-
333327
Views.Scheduled.Scheduled? scheduled_view;
334328
scheduled_view = (Views.Scheduled.Scheduled) views_stack.get_child_by_name ("scheduled-view");
335329
if (scheduled_view == null) {
@@ -340,9 +334,7 @@ public class MainWindow : Adw.ApplicationWindow {
340334
views_stack.set_visible_child_name ("scheduled-view");
341335
}
342336

343-
public void add_labels_view () {
344-
remove_filter_view ();
345-
337+
public void add_labels_view () {
346338
Views.Labels? labels_view;
347339
labels_view = (Views.Labels) views_stack.get_child_by_name ("labels-view");
348340
if (labels_view == null) {
@@ -354,8 +346,6 @@ public class MainWindow : Adw.ApplicationWindow {
354346
}
355347

356348
private void add_label_view (string id) {
357-
remove_filter_view ();
358-
359349
Views.Label? label_view;
360350
label_view = (Views.Label) views_stack.get_child_by_name ("label-view");
361351
if (label_view == null) {
@@ -369,34 +359,26 @@ public class MainWindow : Adw.ApplicationWindow {
369359

370360
public void add_priority_view (string view_id) {
371361
Views.Filter? filter_view;
372-
filter_view = (Views.Filter) views_stack.get_child_by_name ("filter-view");
362+
filter_view = (Views.Filter) views_stack.get_child_by_name (view_id);
373363
if (filter_view == null) {
374364
filter_view = new Views.Filter ();
375-
views_stack.add_named (filter_view, "filter-view");
365+
views_stack.add_named (filter_view, view_id);
376366
}
377367

378368
filter_view.filter = Util.get_default ().get_priority_filter (view_id);
379-
views_stack.set_visible_child_name ("filter-view");
369+
views_stack.set_visible_child_name (view_id);
380370
}
381371

382372
private void add_filter_view (Objects.BaseObject base_object) {
383373
Views.Filter? filter_view;
384-
filter_view = (Views.Filter) views_stack.get_child_by_name ("filter-view");
374+
filter_view = (Views.Filter) views_stack.get_child_by_name (base_object.view_id);
385375
if (filter_view == null) {
386376
filter_view = new Views.Filter ();
387-
views_stack.add_named (filter_view, "filter-view");
377+
filter_view.filter = base_object;
378+
views_stack.add_named (filter_view, base_object.view_id);
388379
}
389380

390-
filter_view.filter = base_object;
391-
views_stack.set_visible_child_name ("filter-view");
392-
}
393-
394-
private void remove_filter_view () {
395-
Views.Filter? filter_view;
396-
filter_view = (Views.Filter) views_stack.get_child_by_name ("filter-view");
397-
if (filter_view != null) {
398-
views_stack.remove (filter_view);
399-
}
381+
views_stack.set_visible_child_name (base_object.view_id);
400382
}
401383

402384
public void go_homepage () {

0 commit comments

Comments
 (0)