Skip to content

Commit c5b05c9

Browse files
alainm23alainm23
committed
*
1 parent d858519 commit c5b05c9

22 files changed

+208
-55
lines changed

‎config.vala.in

+1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ namespace Build {
66
public const string DATADIR = @DATADIR@;
77
public const string PROFILE = @PROFILE@;
88
public const string LOCALEDIR = @LOCALEDIR@;
9+
public const string GNOMELOCALEDIR = @GNOMELOCALEDIR@;
910
}

‎core/Objects/Project.vala

-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ public class Objects.Project : Objects.BaseObject {
234234
public signal void loading_changed (bool value);
235235
public signal void project_count_updated ();
236236
public signal void show_multi_select_change ();
237-
public signal void expand_all_items (bool value);
238237

239238
construct {
240239
deleted.connect (() => {

‎core/QuickAdd.vala

+19-18
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ public class Layouts.QuickAdd : Adw.Bin {
44

55
private Gtk.Entry content_entry;
66
private Widgets.LoadingButton submit_button;
7-
private Widgets.HyperTextView description_textview;
7+
private Widgets.Markdown.Buffer current_buffer;
8+
private Widgets.Markdown.EditView markdown_edit_view;
89
private Widgets.ItemLabels item_labels;
910
private Widgets.ProjectPicker.ProjectPickerButton project_picker_button;
1011
private Widgets.ScheduleButton schedule_button;
@@ -75,16 +76,16 @@ public class Layouts.QuickAdd : Adw.Bin {
7576

7677
content_box.append (content_entry);
7778

78-
description_textview = new Widgets.HyperTextView (_("Add a description…")) {
79-
height_request = 64,
79+
current_buffer = new Widgets.Markdown.Buffer ();
80+
81+
markdown_edit_view = new Widgets.Markdown.EditView () {
8082
left_margin = 14,
8183
right_margin = 6,
8284
top_margin = 6,
83-
wrap_mode = Gtk.WrapMode.WORD_CHAR,
84-
hexpand = true
85+
connect_typing = false
8586
};
86-
87-
description_textview.remove_css_class ("view");
87+
88+
markdown_edit_view.buffer = current_buffer;
8889

8990
item_labels = new Widgets.ItemLabels (item) {
9091
margin_start = 6,
@@ -127,7 +128,7 @@ public class Layouts.QuickAdd : Adw.Bin {
127128
quick_add_content.add_css_class ("card");
128129
quick_add_content.add_css_class ("sidebar-card");
129130
quick_add_content.append (content_box);
130-
quick_add_content.append (description_textview);
131+
quick_add_content.append (markdown_edit_view);
131132
quick_add_content.append (item_labels);
132133
quick_add_content.append (action_box);
133134

@@ -280,15 +281,15 @@ public class Layouts.QuickAdd : Adw.Bin {
280281
return false;
281282
});
282283

283-
var description_controller_key = new Gtk.EventControllerKey ();
284-
description_textview.add_controller (description_controller_key);
285-
description_controller_key.key_pressed.connect ((keyval, keycode, state) => {
286-
if ((ctrl_pressed || shift_pressed) && keyval == 65293) {
287-
add_item ();
288-
}
284+
// var description_controller_key = new Gtk.EventControllerKey ();
285+
// description_textview.add_controller (description_controller_key);
286+
// description_controller_key.key_pressed.connect ((keyval, keycode, state) => {
287+
// if ((ctrl_pressed || shift_pressed) && keyval == 65293) {
288+
// add_item ();
289+
// }
289290

290-
return false;
291-
});
291+
// return false;
292+
// });
292293

293294
var event_controller_key = new Gtk.EventControllerKey ();
294295
((Gtk.Widget) this).add_controller (event_controller_key);
@@ -330,7 +331,7 @@ public class Layouts.QuickAdd : Adw.Bin {
330331
}
331332

332333
item.content = content_entry.get_text ();
333-
item.description = description_textview.get_text ();
334+
item.description = current_buffer.get_all_text ().chomp ();
334335

335336
if (item.project.backend_type == BackendType.LOCAL) {
336337
item.id = Util.get_default ().generate_id ();
@@ -380,7 +381,7 @@ public class Layouts.QuickAdd : Adw.Bin {
380381
reset_item ();
381382

382383
content_entry.text = "";
383-
description_textview.set_text ("");
384+
current_buffer.set_text ("");
384385
schedule_button.reset ();
385386
priority_button.reset ();
386387
pin_button.reset ();

‎core/Services/Database.vala

+15
Original file line numberDiff line numberDiff line change
@@ -1595,6 +1595,21 @@ public class Services.Database : GLib.Object {
15951595
}
15961596
}
15971597

1598+
public Gee.ArrayList<Objects.Item> get_items_no_parent (bool checked = true) {
1599+
Gee.ArrayList<Objects.Item> return_value = new Gee.ArrayList<Objects.Item> ();
1600+
lock (_items) {
1601+
foreach (Objects.Item item in items) {
1602+
if (!item.was_archived () &&
1603+
item.checked == checked &&
1604+
!item.has_parent) {
1605+
return_value.add (item);
1606+
}
1607+
}
1608+
1609+
return return_value;
1610+
}
1611+
}
1612+
15981613
public bool valid_item_by_date (Objects.Item item, GLib.DateTime date, bool checked = true) {
15991614
if (!item.has_due || item.was_archived ()) {
16001615
return false;

‎core/Services/EventBus.vala

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public class Services.EventBus : Object {
6161
public signal void section_sort_order_changed (string project_id);
6262
public signal void request_escape ();
6363
public signal void drag_n_drop_active (string project_id, bool active);
64+
public signal void expand_all (string project_id, bool active);
6465

6566
public bool _mobile_mode = Services.Settings.get_default ().settings.get_boolean ("mobile-mode");
6667
public bool mobile_mode {

‎core/Widgets/DateTimePicker/ScheduleButton.vala

+8-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public class Widgets.ScheduleButton : Gtk.Grid {
2727
private Gtk.Box schedule_box;
2828
private Gtk.Image due_image;
2929
private Widgets.DateTimePicker.DateTimePicker datetime_picker;
30+
private Gtk.Revealer clear_revealer;
3031

3132
private GLib.DateTime _datetime;
3233
public GLib.DateTime datetime {
@@ -52,6 +53,12 @@ public class Widgets.ScheduleButton : Gtk.Grid {
5253
}
5354
}
5455

56+
public bool visible_clear_button {
57+
set {
58+
clear_revealer.visible = value;
59+
}
60+
}
61+
5562
public signal void date_changed (GLib.DateTime? date);
5663

5764
public ScheduleButton () {
@@ -103,7 +110,7 @@ public class Widgets.ScheduleButton : Gtk.Grid {
103110
css_classes = { "flat" }
104111
};
105112

106-
var clear_revealer = new Gtk.Revealer () {
113+
clear_revealer = new Gtk.Revealer () {
107114
transition_type = Gtk.RevealerTransitionType.CROSSFADE,
108115
child = clear_button
109116
};

‎core/Widgets/Markdown/MarkdownEditView.vala

+7-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* https://github.com/toolstack/Folio
55
*/
66

7-
public class Widgets.Markdown.EditView : Adw.Bin {
7+
public class Widgets.Markdown.EditView : Adw.Bin {
88
public bool text_mode {
99
set {
1010
markdown_view.text_mode = value;
@@ -68,12 +68,13 @@
6868
}
6969
}
7070

71+
public bool connect_typing { get; set; default = false; }
72+
7173
private Widgets.Markdown.View markdown_view;
7274

7375
private bool is_ctrl = false;
7476

7577
public bool is_editable { get; set; }
76-
7778
public signal void enter ();
7879
public signal void leave ();
7980
public signal void changed ();
@@ -166,7 +167,6 @@
166167

167168
var gesture = new Gtk.EventControllerFocus ();
168169
markdown_view.add_controller (gesture);
169-
170170
gesture.enter.connect (handle_focus_in);
171171
gesture.leave.connect (update_on_leave);
172172

@@ -190,8 +190,10 @@
190190
}
191191

192192
public void update_on_leave () {
193-
Services.EventBus.get_default ().connect_typing_accel ();
194-
leave ();
193+
if (connect_typing) {
194+
Services.EventBus.get_default ().connect_typing_accel ();
195+
leave ();
196+
}
195197
}
196198

197199
public void on_dark_changed (bool dark) {

‎data/io.github.alainm23.planify.service.in

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[D-BUS Service]
2+
Name=@app_id@
3+
Exec=@bindir@/@app_id@ --gapplication-service

‎data/meson.build

+10
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,14 @@ install_data('markdownpp.lang',
6262
install_dir: get_option('datadir') / 'gtksourceview-5' / 'language-specs'
6363
)
6464

65+
# service_conf = configuration_data()
66+
# service_conf.set('appid', application_id)
67+
# service_conf.set('bindir', bindir)
68+
# configure_file(
69+
# input: 'io.github.alainm23.planify.service.in',
70+
# output: '@0@.service'.format(application_id),
71+
# configuration: service_conf,
72+
# install_dir: datadir / 'dbus-1' / 'services'
73+
# )
74+
6575
subdir('icons')

‎meson.build

+13-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
project(
22
'io.github.alainm23.planify',
33
'vala', 'c',
4-
version: '4.7.6'
4+
version: '4.8'
55
)
66

77
gnome = import('gnome')
@@ -51,23 +51,31 @@ if profile == 'development'
5151
rev_txt = run_command('git','rev-parse','--short','HEAD').stdout().strip()
5252
rev = '-@0@'.format(rev_txt)
5353
application_id = 'io.github.alainm23.planify.Devel'
54+
application_path = '/io/github/alainm23/planify/Devel'
5455
else
5556
rev = ''
5657
application_id = 'io.github.alainm23.planify'
58+
application_path = '/io/github/alainm23/planify'
5759
endif
5860

5961
############
6062
# Config #
6163
############
64+
prefix = get_option('prefix')
65+
bindir = prefix / get_option('bindir')
66+
datadir = prefix / get_option('datadir')
67+
localedir = prefix / get_option ('localedir')
68+
libexecdir = prefix / get_option('libexecdir')
6269

6370
conf_data = configuration_data()
6471
conf_data.set_quoted('APPLICATION_ID', application_id)
6572
conf_data.set_quoted('GETTEXT_PACKAGE', application_id)
73+
conf_data.set_quoted('GNOMELOCALEDIR', localedir)
6674
conf_data.set_quoted('VERSION', meson.project_version())
67-
conf_data.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
75+
conf_data.set_quoted('LOCALEDIR', localedir)
6876
conf_data.set_quoted('PACKAGE_VERSION', meson.project_version())
69-
conf_data.set_quoted('PREFIX', get_option('prefix'))
70-
conf_data.set_quoted('DATADIR', join_paths (get_option('prefix'), get_option('datadir')))
77+
conf_data.set_quoted('PREFIX', prefix)
78+
conf_data.set_quoted('DATADIR', datadir)
7179
conf_data.set_quoted('PROFILE', profile)
7280

7381
config_file = configure_file(
@@ -80,6 +88,7 @@ subdir('core')
8088
subdir('src')
8189
subdir('quick-add')
8290
subdir('data')
91+
# subdir('search-provider')
8392
subdir('po')
8493

8594
summary({

‎search-provider/io.github.alainm23.planify.SearchProvider.ini.in

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[Shell Search Provider]
2+
DesktopId=@appid@.desktop
3+
BusName=@appid@.SearchProvider
4+
ObjectPath=@path@/SearchProvider
5+
Version=2

‎search-provider/io.github.alainm23.planify.SearchProvider.service.in

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[D-BUS Service]
2+
Name=@appid@.SearchProvider
3+
Exec=@libexecdir@/@appid@-search-provider

‎search-provider/main.vala

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// This file is part of Highscore. License: GPL-3.0-or-later
2+
3+
int main (string[] args) {
4+
Intl.bindtextdomain (Build.GETTEXT_PACKAGE, Build.GNOMELOCALEDIR);
5+
Intl.bind_textdomain_codeset (Build.GETTEXT_PACKAGE, "UTF-8");
6+
Intl.textdomain (Build.GETTEXT_PACKAGE);
7+
8+
var app = new Planify.SearchProvider ();
9+
10+
return app.run (args);
11+
}

‎search-provider/meson.build

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
search_provider_c_args = [
2+
'-DGETTEXT_PACKAGE="' + meson.project_name () + '"',
3+
'-DG_LOG_DOMAIN="PlanifySearchProvider"',
4+
]
5+
6+
search_provider_sources = [
7+
'main.vala',
8+
'search-provider.vala'
9+
]
10+
11+
search_provider_deps = [
12+
gio_dep,
13+
gtk_dep,
14+
sqlite3_dep,
15+
]
16+
17+
executable (
18+
'io.github.alainmh23.planify-search-provider',
19+
search_provider_sources,
20+
config_file,
21+
dependencies: search_provider_deps,
22+
c_args: search_provider_c_args,
23+
install: true,
24+
install_dir: libexecdir
25+
)
26+
27+
search_provider_conf = configuration_data()
28+
search_provider_conf.set('appid', application_id)
29+
search_provider_conf.set('path', application_path)
30+
configure_file(
31+
configuration: search_provider_conf,
32+
input: 'io.github.alainm23.planify.SearchProvider.ini.in',
33+
install_dir: datadir / 'gnome-shell' / 'search-providers',
34+
install: true,
35+
output: '@0@.SearchProvider.ini'.format(application_id)
36+
)
37+
38+
search_provider_dbus_conf = configuration_data()
39+
search_provider_dbus_conf.set('appid', application_id)
40+
search_provider_dbus_conf.set('libexecdir', libexecdir)
41+
configure_file (
42+
input: 'io.github.alainm23.planify.SearchProvider.service.in',
43+
output: '@0@.SearchProvider.service'.format(application_id),
44+
configuration: search_provider_dbus_conf,
45+
install: true,
46+
install_dir: datadir / 'dbus-1' / 'services'
47+
)

‎search-provider/search-provider.vala

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// This file is part of Highscore. License: GPL-3.0+.
2+
3+
[DBus (name = "org.gnome.Shell.SearchProvider2")]
4+
public class Planify.SearchProvider : Gtk.Application {
5+
internal SearchProvider () {
6+
Object (
7+
application_id: Build.APPLICATION_ID + ".SearchProvider",
8+
flags: ApplicationFlags.IS_SERVICE,
9+
inactivity_timeout: 10000
10+
);
11+
}
12+
13+
construct {
14+
15+
}
16+
17+
protected override bool dbus_register (DBusConnection connection, string object_path) {
18+
try {
19+
connection.register_object (object_path, this);
20+
} catch (IOError e) {
21+
warning ("Could not register search provider: %s", e.message);
22+
quit ();
23+
}
24+
25+
return true;
26+
}
27+
28+
}

‎src/App.vala

+8-3
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,15 @@ public class Planify : Adw.Application {
4747
{ null }
4848
};
4949

50-
construct {
51-
application_id = Build.APPLICATION_ID;
52-
flags |= ApplicationFlags.HANDLES_OPEN;
50+
public Planify () {
51+
Object (
52+
application_id: Build.APPLICATION_ID,
53+
flags: ApplicationFlags.HANDLES_OPEN
54+
);
55+
}
5356

57+
58+
construct {
5459
Intl.setlocale (LocaleCategory.ALL, "");
5560
string langpack_dir = Path.build_filename (Build.INSTALL_PREFIX, "share", "locale");
5661
Intl.bindtextdomain (Build.GETTEXT_PACKAGE, langpack_dir);

0 commit comments

Comments
 (0)