Skip to content

Commit e97e072

Browse files
alainm23alainm23
committed
fix #589 
1 parent e5fbd5e commit e97e072

36 files changed

+254
-135
lines changed

‎build-aux/io.github.alainm23.planify.Devel.json

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"--share=network",
1212
"--socket=fallback-x11",
1313
"--socket=wayland",
14-
"--filesystem=home",
1514
"--talk-name=org.gnome.evolution.dataserver.Calendar8",
1615
"--talk-name=org.gnome.evolution.dataserver.Sources5",
1716
"--talk-name=io.github.alainm23.planify",

‎core/QuickAdd.vala

+32-3
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public class Layouts.QuickAdd : Adw.Bin {
4141
public signal void send_interface_id (string id);
4242
public signal void add_item_db (Objects.Item item, Gee.ArrayList<Objects.Reminder> reminders);
4343
public signal void error (HttpResponse response);
44+
public signal void parent_can_close (bool active);
4445

4546
public bool ctrl_pressed { get; set; default = false; }
4647

@@ -119,7 +120,8 @@ public class Layouts.QuickAdd : Adw.Bin {
119120
top_margin = 12,
120121
wrap_mode = Gtk.WrapMode.WORD_CHAR,
121122
hexpand = true,
122-
event_focus = false
123+
event_focus = false,
124+
accepts_tab = false
123125
};
124126

125127
description_textview.remove_css_class ("view");
@@ -132,9 +134,15 @@ public class Layouts.QuickAdd : Adw.Bin {
132134
schedule_button = new Widgets.ScheduleButton ();
133135
priority_button = new Widgets.PriorityButton ();
134136
priority_button.update_from_item (item);
135-
label_button = new Widgets.LabelPicker.LabelButton ();
137+
138+
label_button = new Widgets.LabelPicker.LabelButton () {
139+
tooltip_markup = Util.get_default ().markup_accel_tooltip (_("Add Labels"), "Ctrl+L"),
140+
};
136141
label_button.source = item.project.source;
137-
reminder_button = new Widgets.ReminderPicker.ReminderButton (true);
142+
143+
reminder_button = new Widgets.ReminderPicker.ReminderButton (true) {
144+
tooltip_markup = Util.get_default ().markup_accel_tooltip (_("Add Reminders"), "Ctrl+R"),
145+
};
138146

139147
var action_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 12) {
140148
margin_start = 6,
@@ -290,6 +298,13 @@ public class Layouts.QuickAdd : Adw.Bin {
290298
});
291299

292300
label_button.labels_changed.connect (set_labels);
301+
label_button.picker_opened.connect ((active) => {
302+
parent_can_close (!active);
303+
});
304+
305+
reminder_button.picker_opened.connect ((active) => {
306+
parent_can_close (!active);
307+
});
293308

294309
var destroy_controller = new Gtk.EventControllerKey ();
295310
add_controller (destroy_controller);
@@ -350,6 +365,20 @@ public class Layouts.QuickAdd : Adw.Bin {
350365
create_more_button.activate.connect (() => {
351366
Services.Settings.get_default ().settings.set_boolean ("quick-add-create-more", create_more_button.active);
352367
});
368+
369+
var open_label_shortcut = new Gtk.Shortcut (Gtk.ShortcutTrigger.parse_string ("<Control>l"), new Gtk.CallbackAction (() => {
370+
label_button.open_picker ();
371+
}));
372+
373+
var open_reminder_shortcut = new Gtk.Shortcut (Gtk.ShortcutTrigger.parse_string ("<Control>r"), new Gtk.CallbackAction (() => {
374+
reminder_button.open_picker ();
375+
}));
376+
377+
var shortcutController = new Gtk.ShortcutController ();
378+
shortcutController.add_shortcut (open_label_shortcut);
379+
shortcutController.add_shortcut (open_reminder_shortcut);
380+
381+
add_controller (shortcutController);
353382
}
354383

355384
private void add_item () {

‎core/Services/EventBus.vala

+2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ public class Services.EventBus : Object {
3232
// Shortcuts
3333
public signal void disconnect_typing_accel ();
3434
public signal void connect_typing_accel ();
35+
public signal void disconnect_all_accels ();
36+
public signal void connect_all_accels ();
3537

3638
// General
3739
public signal void theme_changed ();

‎core/Services/SignalManager.vala

-63
This file was deleted.

‎core/Widgets/ContextMenu/MenuCheckPicker.vala

+6-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public class Widgets.ContextMenu.MenuItemCheckPicker : Gtk.ListBoxRow {
163163
}
164164

165165
construct {
166-
add_css_class ("no-selectable");
166+
add_css_class ("border-radius-6");
167167

168168
check_button = new Gtk.CheckButton.with_label (filter.name) {
169169
hexpand = true,
@@ -187,5 +187,10 @@ public class Widgets.ContextMenu.MenuItemCheckPicker : Gtk.ListBoxRow {
187187
check_button.active = !check_button.active;
188188
checked (filter, check_button.active);
189189
});
190+
191+
activate.connect (() => {
192+
check_button.active = !check_button.active;
193+
checked (filter, check_button.active);
194+
});
190195
}
191196
}

‎core/Widgets/ContextMenu/MenuItem.vala

+1-2
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ public class Widgets.ContextMenu.MenuItem : Gtk.Button {
101101
Object (
102102
title: title,
103103
icon: icon,
104-
hexpand: true,
105-
can_focus: false
104+
hexpand: true
106105
);
107106
}
108107

‎core/Widgets/ContextMenu/MenuPicker.vala

+6-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public class Widgets.ContextMenu.MenuItemPicker : Gtk.ListBoxRow {
175175
}
176176

177177
construct {
178-
add_css_class ("no-selectable");
178+
add_css_class ("border-radius-6");
179179
add_css_class ("transition");
180180

181181
radio_button = new Gtk.CheckButton.with_label (title) {
@@ -202,5 +202,10 @@ public class Widgets.ContextMenu.MenuItemPicker : Gtk.ListBoxRow {
202202
radio_button.active = !radio_button.active;
203203
selected (get_index ());
204204
});
205+
206+
activate.connect (() => {
207+
radio_button.active = !radio_button.active;
208+
selected (get_index ());
209+
});
205210
}
206211
}

‎core/Widgets/ContextMenu/MenuSwitch.vala

+1-2
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ public class Widgets.ContextMenu.MenuSwitch : Gtk.Button {
5858
Object (
5959
title: title,
6060
icon: icon,
61-
hexpand: true,
62-
can_focus: false
61+
hexpand: true
6362
);
6463
}
6564

‎core/Widgets/LabelPicker/LabelButton.vala

+16
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public class Widgets.LabelPicker.LabelButton : Adw.Bin {
4545
}
4646

4747
public signal void labels_changed (Gee.HashMap<string, Objects.Label> labels);
48+
public signal void picker_opened (bool active);
4849

4950
public LabelButton () {
5051
Object (
@@ -123,6 +124,13 @@ public class Widgets.LabelPicker.LabelButton : Adw.Bin {
123124
labels_picker.closed.connect (() => {
124125
labels_changed (labels_picker.picked);
125126
});
127+
128+
labels_picker.show.connect (() => {
129+
picker_opened (true);
130+
});
131+
labels_picker.closed.connect (() => {
132+
picker_opened (false);
133+
});
126134
}
127135

128136
public void reset () {
@@ -146,4 +154,12 @@ public class Widgets.LabelPicker.LabelButton : Adw.Bin {
146154
labels_label.tooltip_text = labels_label.label;
147155
}
148156
}
157+
158+
public void open_picker () {
159+
if (is_board) {
160+
labels_picker.show ();
161+
} else {
162+
button.active = true;
163+
}
164+
}
149165
}

‎core/Widgets/LabelPicker/LabelPicker.vala

+4
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ public class Widgets.LabelPicker.LabelPicker : Gtk.Popover {
6565
picker.close.connect (() => {
6666
popdown ();
6767
});
68+
69+
picker.show.connect (() => {
70+
picker.entry_focus ();
71+
});
6872
}
6973

7074
public void reset () {

‎core/Widgets/LabelPicker/LabelRow.vala

+5-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class Widgets.LabelPicker.LabelRow : Gtk.ListBoxRow {
4242
}
4343

4444
construct {
45-
add_css_class ("no-selectable");
45+
add_css_class ("border-radius-6");
4646

4747
checked_button = new Gtk.CheckButton () {
4848
valign = Gtk.Align.CENTER,
@@ -79,6 +79,10 @@ public class Widgets.LabelPicker.LabelRow : Gtk.ListBoxRow {
7979
destroy.connect (() => {
8080
checked_button_gesture.disconnect (signal_id);
8181
});
82+
83+
activate.connect (() => {
84+
update_checked_toggled ();
85+
});
8286
}
8387

8488
public void update_checked_toggled () {

‎core/Widgets/LabelsPickerCore.vala

+18-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public class Widgets.LabelsPickerCore : Adw.Bin {
128128
toolbar_view.content = listbox_scrolled;
129129

130130
child = toolbar_view;
131-
131+
132132
var listbox_controller_key = new Gtk.EventControllerKey ();
133133
listbox.add_controller (listbox_controller_key);
134134
signal_map[listbox_controller_key.key_pressed.connect ((keyval, keycode, state) => {
@@ -180,6 +180,16 @@ public class Widgets.LabelsPickerCore : Adw.Bin {
180180
}
181181
})] = search_entry;
182182

183+
var search_entry_ctrl_key = new Gtk.EventControllerKey ();
184+
search_entry.add_controller (search_entry_ctrl_key);
185+
signal_map[search_entry_ctrl_key.key_pressed.connect ((keyval, keycode, state) => {
186+
if (keyval == 65307) {
187+
close ();
188+
}
189+
190+
return false;
191+
})] = search_entry_ctrl_key;
192+
183193
signal_map[Services.Store.instance ().label_added.connect ((label) => {
184194
add_label (label);
185195
})] = Services.Store.instance ();
@@ -321,4 +331,11 @@ public class Widgets.LabelsPickerCore : Adw.Bin {
321331
add_label (label);
322332
}
323333
}
334+
335+
public void entry_focus () {
336+
Timeout.add (275, () => {
337+
search_entry.grab_focus ();
338+
return GLib.Source.REMOVE;
339+
});
340+
}
324341
}

‎core/Widgets/Markdown/MarkdownEditView.vala

+6-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@
9999
auto_indent = true,
100100
wrap_mode = Gtk.WrapMode.CHAR,
101101
show_gutter = false,
102-
height_request = 64
102+
height_request = 64,
103+
text_mode = !Services.Settings.get_default ().settings.get_boolean ("enable-markdown-formatting")
103104
};
104105

105106
markdown_view.remove_css_class ("view");
@@ -189,6 +190,10 @@
189190
on_dark_changed (Services.Settings.get_default ().settings.get_boolean ("dark-mode"));
190191
});
191192

193+
Services.Settings.get_default ().settings.changed["enable-markdown-formatting"].connect (() => {
194+
markdown_view.text_mode = !Services.Settings.get_default ().settings.get_boolean ("enable-markdown-formatting");
195+
});
196+
192197
recolor (Color.RGB ());
193198
}
194199

‎core/Widgets/ReminderPicker/ReminderButton.vala

+21-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@ public class Widgets.ReminderPicker.ReminderButton : Adw.Bin {
2525

2626
private Gtk.Revealer indicator_revealer;
2727
private Gtk.Label value_label;
28-
private Widgets.ReminderPicker._ReminderPicker picker;
28+
private Widgets.ReminderPicker.ReminderPicker picker;
29+
private Gtk.MenuButton button;
2930

3031
public signal void reminder_added (Objects.Reminder reminder);
31-
32+
public signal void picker_opened (bool active);
33+
3234
public ReminderButton (bool is_creating = false) {
3335
Object (
3436
is_board: false,
@@ -48,7 +50,7 @@ public class Widgets.ReminderPicker.ReminderButton : Adw.Bin {
4850
}
4951

5052
construct {
51-
picker = new Widgets.ReminderPicker._ReminderPicker (is_creating);
53+
picker = new Widgets.ReminderPicker.ReminderPicker (is_creating);
5254

5355
if (is_board) {
5456
var title_label = new Gtk.Label (_("Reminders")) {
@@ -106,7 +108,7 @@ public class Widgets.ReminderPicker.ReminderButton : Adw.Bin {
106108
sensitive = false,
107109
};
108110

109-
var button = new Gtk.MenuButton () {
111+
button = new Gtk.MenuButton () {
110112
icon_name = "alarm-symbolic",
111113
popover = picker,
112114
css_classes = { "flat" }
@@ -127,6 +129,13 @@ public class Widgets.ReminderPicker.ReminderButton : Adw.Bin {
127129
add_reminder (reminder, new Gee.ArrayList<Objects.Reminder> ());
128130
}
129131
});
132+
133+
picker.show.connect (() => {
134+
picker_opened (true);
135+
});
136+
picker.closed.connect (() => {
137+
picker_opened (false);
138+
});
130139
}
131140

132141
public void set_reminders (Gee.ArrayList<Objects.Reminder> reminders) {
@@ -183,4 +192,12 @@ public class Widgets.ReminderPicker.ReminderButton : Adw.Bin {
183192
public Gee.ArrayList<Objects.Reminder> reminders () {
184193
return picker.reminders ();
185194
}
195+
196+
public void open_picker () {
197+
if (is_board) {
198+
picker.show ();
199+
} else {
200+
button.active = true;
201+
}
202+
}
186203
}

0 commit comments

Comments
 (0)