Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Scrambled777/planify
Browse files Browse the repository at this point in the history
  • Loading branch information
Scrambled777 committed Jul 13, 2024
2 parents ce67b9c + 68e95f2 commit 4078ea6
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 5 deletions.
15 changes: 14 additions & 1 deletion data/io.github.alainm23.planify.appdata.xml.in.in
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,26 @@
</kudos>
<developer_name translate="no">Alain</developer_name>
<update_contact>[email protected]</update_contact>
<url type="homepage">https://github.com/alainm23/planify</url>
<url type="homepage">https://useplanify.com/</url>
<url type="bugtracker">https://github.com/alainm23/planify/issues</url>
<url type="vcs-browser">https://github.com/alainm23/planify</url>
<url type="translate">https://github.com/alainm23/planify/tree/master/po#readme</url>
<url type="donation">https://www.patreon.com/alainm23</url>
<launchable type="desktop-id">@[email protected]</launchable>
<releases>
<release version="4.9.0" date="2024-07-11">
<description translate="no">
<ul>
<li>Added feature to switch between task and note..</li>
<li>Added a task change history feature.</li>
<li>Fixed bug when importing backup and not recovering labels.</li>
<li>Hindi translation update thanks to @Scrambled777.</li>
<li>Koren translation added thanks to @myunsyeya.</li>
<li>Spanish translation update thanks to @haggen88.</li>
</ul>
</description>
</release>

<release version="4.8.4" date="2024-06-23">
<description translate="no">
<ul>
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project(
'io.github.alainm23.planify',
'vala', 'c',
version: '4.8.4'
version: '4.9.0'
)

gnome = import('gnome')
Expand Down
21 changes: 21 additions & 0 deletions src/Layouts/HeaderBar.vala
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
public class Layouts.HeaderBar : Adw.Bin {
private Adw.HeaderBar headerbar;
private Gtk.Label title_label;
private Gtk.Label title2_label;
private Gtk.Revealer back_button_revealer;
private Gtk.Box start_box;
private Gtk.Button back_button;
Expand All @@ -39,6 +40,18 @@ public class Layouts.HeaderBar : Adw.Bin {
}
}

private string _title2;
public string title2 {
set {
_title2 = value;
title2_label.label = _title2;
}

get {
return _title;
}
}

public bool back_revealer {
set {
back_button_revealer.reveal_child = value;
Expand Down Expand Up @@ -79,11 +92,19 @@ public class Layouts.HeaderBar : Adw.Bin {
css_classes = { "font-bold" },
ellipsize = Pango.EllipsizeMode.END
};

title2_label = new Gtk.Label (null) {
css_classes = { "font-bold", "caption" },
ellipsize = Pango.EllipsizeMode.END,
margin_start = 6,
margin_top = 3
};

start_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 3);
start_box.append (sidebar_button);
start_box.append (back_button_revealer);
start_box.append (title_label);
start_box.append (title2_label);

headerbar = new Adw.HeaderBar () {
hexpand = true,
Expand Down
7 changes: 4 additions & 3 deletions src/Views/Today.vala
Original file line number Diff line number Diff line change
Expand Up @@ -538,12 +538,13 @@ public class Views.Today : Adw.Bin {
}

public void update_today_label () {
var date = new GLib.DateTime.now_local ();
var date_format = "%s %s".printf (date.format ("%a"),
var date_format = "%s %s".printf (
new GLib.DateTime.now_local ().format ("%a"),
date.format (
Granite.DateTime.get_default_date_format (false, true, false)
));
headerbar.title = "%s <small>%s</small>".printf (today_label, date_format);
headerbar.title = today_label;
headerbar.title2 = date_format;
}

private Gtk.Popover build_view_setting_popover () {
Expand Down

0 comments on commit 4078ea6

Please sign in to comment.