EpisodesView: Remove Year category.
This commit is contained in:
parent
ae6a97d725
commit
832495bece
@ -260,60 +260,6 @@
|
|||||||
<property name="position">3</property>
|
<property name="position">3</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
|
||||||
<object class="GtkBox" id="year_box">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">False</property>
|
|
||||||
<property name="no_show_all">True</property>
|
|
||||||
<property name="orientation">vertical</property>
|
|
||||||
<property name="spacing">6</property>
|
|
||||||
<child>
|
|
||||||
<object class="GtkLabel">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">False</property>
|
|
||||||
<property name="halign">start</property>
|
|
||||||
<property name="label" translatable="yes">This Year</property>
|
|
||||||
<attributes>
|
|
||||||
<attribute name="weight" value="bold"/>
|
|
||||||
<attribute name="scale" value="1.5"/>
|
|
||||||
</attributes>
|
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="expand">False</property>
|
|
||||||
<property name="fill">True</property>
|
|
||||||
<property name="position">0</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
<child>
|
|
||||||
<object class="GtkFrame">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">False</property>
|
|
||||||
<property name="label_xalign">0</property>
|
|
||||||
<property name="shadow_type">in</property>
|
|
||||||
<child>
|
|
||||||
<object class="GtkListBox" id="year_list">
|
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="can_focus">False</property>
|
|
||||||
<property name="selection_mode">none</property>
|
|
||||||
</object>
|
|
||||||
</child>
|
|
||||||
<child type="label_item">
|
|
||||||
<placeholder/>
|
|
||||||
</child>
|
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="expand">False</property>
|
|
||||||
<property name="fill">True</property>
|
|
||||||
<property name="position">1</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
</object>
|
|
||||||
<packing>
|
|
||||||
<property name="expand">False</property>
|
|
||||||
<property name="fill">True</property>
|
|
||||||
<property name="position">4</property>
|
|
||||||
</packing>
|
|
||||||
</child>
|
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkBox" id="rest_box">
|
<object class="GtkBox" id="rest_box">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
@ -326,7 +272,7 @@
|
|||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can_focus">False</property>
|
||||||
<property name="halign">start</property>
|
<property name="halign">start</property>
|
||||||
<property name="label" translatable="yes">Older than a Year</property>
|
<property name="label" translatable="yes">Older</property>
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="weight" value="bold"/>
|
<attribute name="weight" value="bold"/>
|
||||||
<attribute name="scale" value="1.5"/>
|
<attribute name="scale" value="1.5"/>
|
||||||
|
|||||||
@ -66,7 +66,7 @@ fn build_ui(app: >k::Application) {
|
|||||||
|
|
||||||
// Get the main window
|
// Get the main window
|
||||||
let window = gtk::ApplicationWindow::new(app);
|
let window = gtk::ApplicationWindow::new(app);
|
||||||
window.set_default_size(1150, 650);
|
window.set_default_size(1024, 576);
|
||||||
|
|
||||||
// Get the headerbar
|
// Get the headerbar
|
||||||
let header = Rc::new(headerbar::Header::default());
|
let header = Rc::new(headerbar::Header::default());
|
||||||
|
|||||||
@ -16,7 +16,6 @@ enum ListSplit {
|
|||||||
Yday,
|
Yday,
|
||||||
Week,
|
Week,
|
||||||
Month,
|
Month,
|
||||||
Year,
|
|
||||||
Rest,
|
Rest,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -28,13 +27,11 @@ pub struct EpisodesView {
|
|||||||
yday_box: gtk::Box,
|
yday_box: gtk::Box,
|
||||||
week_box: gtk::Box,
|
week_box: gtk::Box,
|
||||||
month_box: gtk::Box,
|
month_box: gtk::Box,
|
||||||
year_box: gtk::Box,
|
|
||||||
rest_box: gtk::Box,
|
rest_box: gtk::Box,
|
||||||
today_list: gtk::ListBox,
|
today_list: gtk::ListBox,
|
||||||
yday_list: gtk::ListBox,
|
yday_list: gtk::ListBox,
|
||||||
week_list: gtk::ListBox,
|
week_list: gtk::ListBox,
|
||||||
month_list: gtk::ListBox,
|
month_list: gtk::ListBox,
|
||||||
year_list: gtk::ListBox,
|
|
||||||
rest_list: gtk::ListBox,
|
rest_list: gtk::ListBox,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -47,13 +44,11 @@ impl Default for EpisodesView {
|
|||||||
let yday_box: gtk::Box = builder.get_object("yday_box").unwrap();
|
let yday_box: gtk::Box = builder.get_object("yday_box").unwrap();
|
||||||
let week_box: gtk::Box = builder.get_object("week_box").unwrap();
|
let week_box: gtk::Box = builder.get_object("week_box").unwrap();
|
||||||
let month_box: gtk::Box = builder.get_object("month_box").unwrap();
|
let month_box: gtk::Box = builder.get_object("month_box").unwrap();
|
||||||
let year_box: gtk::Box = builder.get_object("year_box").unwrap();
|
|
||||||
let rest_box: gtk::Box = builder.get_object("rest_box").unwrap();
|
let rest_box: gtk::Box = builder.get_object("rest_box").unwrap();
|
||||||
let today_list: gtk::ListBox = builder.get_object("today_list").unwrap();
|
let today_list: gtk::ListBox = builder.get_object("today_list").unwrap();
|
||||||
let yday_list: gtk::ListBox = builder.get_object("yday_list").unwrap();
|
let yday_list: gtk::ListBox = builder.get_object("yday_list").unwrap();
|
||||||
let week_list: gtk::ListBox = builder.get_object("week_list").unwrap();
|
let week_list: gtk::ListBox = builder.get_object("week_list").unwrap();
|
||||||
let month_list: gtk::ListBox = builder.get_object("month_list").unwrap();
|
let month_list: gtk::ListBox = builder.get_object("month_list").unwrap();
|
||||||
let year_list: gtk::ListBox = builder.get_object("year_list").unwrap();
|
|
||||||
let rest_list: gtk::ListBox = builder.get_object("rest_list").unwrap();
|
let rest_list: gtk::ListBox = builder.get_object("rest_list").unwrap();
|
||||||
|
|
||||||
EpisodesView {
|
EpisodesView {
|
||||||
@ -63,13 +58,11 @@ impl Default for EpisodesView {
|
|||||||
yday_box,
|
yday_box,
|
||||||
week_box,
|
week_box,
|
||||||
month_box,
|
month_box,
|
||||||
year_box,
|
|
||||||
rest_box,
|
rest_box,
|
||||||
today_list,
|
today_list,
|
||||||
yday_list,
|
yday_list,
|
||||||
week_list,
|
week_list,
|
||||||
month_list,
|
month_list,
|
||||||
year_list,
|
|
||||||
rest_list,
|
rest_list,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -105,10 +98,6 @@ impl EpisodesView {
|
|||||||
view.month_list.add(&viewep.container);
|
view.month_list.add(&viewep.container);
|
||||||
view.month_list.add(&sep)
|
view.month_list.add(&sep)
|
||||||
}
|
}
|
||||||
ListSplit::Year => {
|
|
||||||
view.year_list.add(&viewep.container);
|
|
||||||
view.year_list.add(&sep)
|
|
||||||
}
|
|
||||||
ListSplit::Rest => {
|
ListSplit::Rest => {
|
||||||
view.rest_list.add(&viewep.container);
|
view.rest_list.add(&viewep.container);
|
||||||
view.rest_list.add(&sep)
|
view.rest_list.add(&sep)
|
||||||
@ -134,10 +123,6 @@ impl EpisodesView {
|
|||||||
view.month_box.hide();
|
view.month_box.hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
if view.year_list.get_children().is_empty() {
|
|
||||||
view.year_box.hide();
|
|
||||||
}
|
|
||||||
|
|
||||||
if view.rest_list.get_children().is_empty() {
|
if view.rest_list.get_children().is_empty() {
|
||||||
view.rest_box.hide();
|
view.rest_box.hide();
|
||||||
}
|
}
|
||||||
@ -163,10 +148,6 @@ impl EpisodesView {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if !self.year_list.get_children().is_empty() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if !self.rest_list.get_children().is_empty() {
|
if !self.rest_list.get_children().is_empty() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -186,8 +167,6 @@ fn split(now: &DateTime<Utc>, epoch: i64) -> ListSplit {
|
|||||||
ListSplit::Week
|
ListSplit::Week
|
||||||
} else if now.month() == ep.month() && now.year() == ep.year() {
|
} else if now.month() == ep.month() && now.year() == ep.year() {
|
||||||
ListSplit::Month
|
ListSplit::Month
|
||||||
} else if now.year() == ep.year() {
|
|
||||||
ListSplit::Year
|
|
||||||
} else {
|
} else {
|
||||||
ListSplit::Rest
|
ListSplit::Rest
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user