Merge branch 'master' into 'master'

Set dim-label for secondary labels of EpisodeWidget in Glade.

See merge request alatiera/Hammond!7
This commit is contained in:
Jordan Petridis 2017-12-17 14:30:10 +00:00
commit 945600b20d
2 changed files with 18 additions and 16 deletions

View File

@ -58,6 +58,9 @@
<property name="label" translatable="yes">1970/01/01</property>
<property name="single_line_mode">True</property>
<property name="track_visited_links">False</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
<property name="expand">False</property>
@ -71,6 +74,9 @@
<property name="no_show_all">True</property>
<property name="label" translatable="yes">·</property>
<property name="track_visited_links">False</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
<property name="expand">False</property>
@ -85,6 +91,9 @@
<property name="label" translatable="yes">42 min</property>
<property name="single_line_mode">True</property>
<property name="track_visited_links">False</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
<property name="expand">False</property>
@ -98,6 +107,9 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">·</property>
<property name="track_visited_links">False</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
<property name="expand">False</property>
@ -112,6 +124,9 @@
<property name="label" translatable="yes">42 MB</property>
<property name="single_line_mode">True</property>
<property name="track_visited_links">False</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
<property name="expand">False</property>
@ -126,6 +141,9 @@
<property name="label" translatable="yes">12 MB / 42 MB</property>
<property name="single_line_mode">True</property>
<property name="track_visited_links">False</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
<property name="expand">False</property>

View File

@ -65,22 +65,6 @@ impl Default for EpisodeWidget {
let size: gtk::Label = builder.get_object("size_label").unwrap();
let progress_label: gtk::Label = builder.get_object("progress_label").unwrap();
let sep1: gtk::Label = builder.get_object("separator1").unwrap();
let sep2: gtk::Label = builder.get_object("separator2").unwrap();
// Dim(grey out) the labels.
// If it's possible through glade, feel free to open a PR.
duration
.get_style_context()
.map(|c| c.add_class("dim-label"));
progress_label
.get_style_context()
.map(|c| c.add_class("dim-label"));
date.get_style_context().map(|c| c.add_class("dim-label"));
size.get_style_context().map(|c| c.add_class("dim-label"));
sep1.get_style_context().map(|c| c.add_class("dim-label"));
sep2.get_style_context().map(|c| c.add_class("dim-label"));
EpisodeWidget {
container,
progress,