Skip to content

Commit be9476b

Browse files
author
Alain M
committed
Release 1.2.3
1 parent bd35ba2 commit be9476b

File tree

5 files changed

+52
-20
lines changed

5 files changed

+52
-20
lines changed

data/com.github.alainm23.planner.appdata.xml.in

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,19 @@
2929
<binary>com.github.alainm23.planner</binary>
3030
</provides>
3131
​<releases>
32+
<release version="1.2.3" date="2019-01-29">
33+
<description>
34+
<p>New features:</p>
35+
<ul>
36+
<li>Labels preview</li>
37+
<li>Weather forecast</li>
38+
</ul>
39+
<p>Translations:</p>
40+
<ul>
41+
<li>Lithuanian (welaq)</li>
42+
</ul>
43+
</description>
44+
</release>
3245
<release version="1.2.2" date="2019-01-19">
3346
<description>
3447
<p>Improvements:</p>
@@ -157,4 +170,4 @@
157170
<value key="x-appcenter-color-primary-text">#000</value>
158171
<value key="x-appcenter-suggested-price">15</value>
159172
</custom>
160-
</component>
173+
</component>

data/credits.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,13 @@
6666
"username": "",
6767
"avatar": "https://avatars1.githubusercontent.com/u/685879?s=400&v=4",
6868
"profile_url": "https://github.com/kr428"
69+
},
70+
{
71+
"id": "28876465",
72+
"name": "welaq",
73+
"username": "",
74+
"avatar": "https://avatars0.githubusercontent.com/u/28876465?s=400&v=4",
75+
"profile_url": "https://github.com/welaq"
6976
}
7077
],
7178
"support" : [

src/Application.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class Application : Gtk.Application {
5858
github = new Services.Github ();
5959
share = new Services.Share ();
6060

61-
APP_VERSION = "1.2.2";
61+
APP_VERSION = "1.2.3";
6262
}
6363

6464
public static Application _instance = null;

src/Dialogs/PreferencesDialog.vala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,10 @@ public class Dialogs.PreferencesDialog : Gtk.Dialog {
359359
main_grid.add (new Gtk.Separator (Gtk.Orientation.HORIZONTAL));
360360
main_grid.add (listbox);
361361
main_grid.add (new Gtk.Separator (Gtk.Orientation.HORIZONTAL));
362-
main_grid.add (s_1);
363-
main_grid.add (repos_box);
364-
main_grid.add (s_2);
365-
main_grid.add (s_3);
362+
//main_grid.add (s_1);
363+
//main_grid.add (repos_box);
364+
//main_grid.add (s_2);
365+
//main_grid.add (s_3);
366366
main_grid.add (action_grid);
367367

368368
var scrolled = new Gtk.ScrolledWindow (null, null);

src/Views/AllTasks.vala

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -88,25 +88,21 @@ public class Views.AllTasks : Gtk.EventBox {
8888
labels_popover = new Widgets.Popovers.LabelsPopover (labels_button, true);
8989
labels_popover.position = Gtk.PositionType.BOTTOM;
9090

91-
var share_button = new Gtk.Button.from_icon_name ("planner-share-symbolic", Gtk.IconSize.MENU);
92-
share_button.get_style_context ().add_class ("planner-share-menu");
93-
share_button.tooltip_text = _("Share");
94-
share_button.valign = Gtk.Align.CENTER;
95-
share_button.halign = Gtk.Align.CENTER;
96-
97-
share_button.clicked.connect (() => {
98-
var share_dialog = new Dialogs.ShareDialog (Application.instance.main_window);
99-
share_dialog.inbox = true;
100-
share_dialog.destroy.connect (Gtk.main_quit);
101-
share_dialog.show_all ();
102-
});
91+
var search_button = new Gtk.ToggleButton ();
92+
search_button.get_style_context ().add_class ("planner-search-menu");
93+
search_button.tooltip_text = _("Search");
94+
search_button.valign = Gtk.Align.CENTER;
95+
search_button.halign = Gtk.Align.CENTER;
96+
search_button.add (new Gtk.Image.from_icon_name ("edit-find-symbolic", Gtk.IconSize.MENU));
97+
98+
var search_popover = new Widgets.Popovers.SearchPopover (search_button);
10399

104100
var action_grid = new Gtk.Grid ();
105101
action_grid.valign = Gtk.Align.CENTER;
106102
action_grid.column_spacing = 12;
107103

108104
action_grid.add (labels_button);
109-
action_grid.add (share_button);
105+
action_grid.add (search_button);
110106
action_grid.add (show_hide_all_button);
111107

112108
var top_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
@@ -172,7 +168,6 @@ public class Views.AllTasks : Gtk.EventBox {
172168
main_overlay.add (main_box);
173169

174170
add (main_overlay);
175-
176171
// Events
177172

178173
Gdk.Display display = Gdk.Display.get_default ();
@@ -283,6 +278,23 @@ public class Views.AllTasks : Gtk.EventBox {
283278
}
284279
});
285280

281+
search_button.toggled.connect (() => {
282+
if (search_button.active) {
283+
search_popover.show_all ();
284+
}
285+
});
286+
287+
search_popover.closed.connect (() => {
288+
search_button.active = false;
289+
});
290+
291+
search_popover.search_changed.connect ((text) => {
292+
tasks_list.set_filter_func ((row) => {
293+
var item = row as Widgets.TaskRow;
294+
return text.down () in item.task.content.down ();
295+
});
296+
});
297+
286298
tasks_list.remove.connect ((widget) => {
287299
check_visible_alertview ();
288300
});

0 commit comments

Comments
 (0)