Merge lp:~codygarver/vocal/add-filters-to-import-dialog into lp:vocal

Proposed by Cody Garver
Status: Merged
Merged at revision: 32
Proposed branch: lp:~codygarver/vocal/add-filters-to-import-dialog
Merge into: lp:vocal
Diff against target: 28 lines (+12/-1)
1 file modified
src/MainWindow.vala (+12/-1)
To merge this branch: bzr merge lp:~codygarver/vocal/add-filters-to-import-dialog
Reviewer Review Type Date Requested Status
Nathan Dyer Pending
Review via email: mp+224937@code.launchpad.net

Description of the change

How to merge:

cd /tmp

bzr branch lp:vocal v && cd v

bzr merge lp:~codygarver/vocal/add-filters-to-import-dialog

bzr commit -m "Some commit message" --author="Cody Garver <email address hidden>"

bzr push lp:vocal

To post a comment you must log in.
32. By Cody Garver

Add filetype filters to Import dialog

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/MainWindow.vala'
2--- src/MainWindow.vala 2014-06-29 00:01:57 +0000
3+++ src/MainWindow.vala 2014-06-29 19:31:24 +0000
4@@ -834,6 +834,17 @@
5 Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
6 Gtk.Stock.OPEN, Gtk.ResponseType.ACCEPT);
7
8+ var all_files_filter = new Gtk.FileFilter();
9+ all_files_filter.set_filter_name(_("All files"));
10+ all_files_filter.add_pattern("*");
11+
12+ var opml_filter = new Gtk.FileFilter();
13+ opml_filter.set_filter_name(_("OPML files"));
14+ opml_filter.add_mime_type("text/x-opml+xml");
15+
16+ file_chooser.add_filter(opml_filter);
17+ file_chooser.add_filter(all_files_filter);
18+
19 file_chooser.modal = true;
20
21 int decision = file_chooser.run();
22@@ -1196,4 +1207,4 @@
23 return false;
24 }
25 }
26-}
27\ No newline at end of file
28+}

Subscribers

People subscribed via source and target branches