toxblh/podcasts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove the update section

Browse Source
This commit is contained in:
Zander Brown 2018-06-08 19:27:11 +01:00 committed by Jordan Petridis
parent bce80cca0b
commit a9c38f5a03
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
2 changed files with 25 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

241
hammond-gtk/resources/gtk/prefs.ui
View File

@ -9,17 +9,9 @@
<property name="step_increment">1</property> <property name="step_increment">1</property>
<property name="page_increment">10</property> <property name="page_increment">10</property>
</object> </object>
<object class="GtkAdjustment" id="refresh_value_adj">
<property name="lower">1</property>
<property name="upper">100</property>
<property name="value">1</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkWindow" id="prefs"> <object class="GtkWindow" id="prefs">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="title" translatable="yes">Preferences</property> <property name="title" translatable="yes">Preferences</property>
<property name="default_width">500</property>
<property name="type_hint">dialog</property> <property name="type_hint">dialog</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
@ -31,7 +23,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="min_content_width">480</property> <property name="min_content_width">480</property>
<property name="min_content_height">250</property> <property name="min_content_height">200</property>
<property name="propagate_natural_width">True</property> <property name="propagate_natural_width">True</property>
<property name="propagate_natural_height">True</property> <property name="propagate_natural_height">True</property>
<child> <child>
@ -51,7 +43,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="margin_top">20</property> <property name="margin_top">10</property>
<property name="margin_bottom">5</property> <property name="margin_bottom">5</property>
<property name="label" translatable="yes">Appearance</property> <property name="label" translatable="yes">Appearance</property>
</object> </object>
@ -136,214 +128,6 @@
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="margin_top">20</property>
<property name="margin_bottom">5</property>
<property name="label" translatable="yes">Refresh</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkFrame">
<property name="width_request">300</property>
<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="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkListBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="selection_mode">none</property>
<property name="activate_on_single_click">False</property>
<child>
<object class="GtkListBoxRow">
<property name="height_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<property name="selectable">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Refresh at startup</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSwitch" id="startup_toggle">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="height_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<property name="selectable">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Automatically Refresh</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSwitch" id="auto_toggle">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="valign">center</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkListBoxRow">
<property name="width_request">100</property>
<property name="height_request">50</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<property name="selectable">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Every</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkSpinButton" id="refresh_value">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="input_purpose">digits</property>
<property name="adjustment">refresh_value_adj</property>
<property name="climb_rate">1</property>
<property name="value">1</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="refresh_type">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<style>
<class name="linked"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
</child>
<child type="label_item">
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child> <child>
<object class="GtkLabel"> <object class="GtkLabel">
<property name="visible">True</property> <property name="visible">True</property>
@ -356,7 +140,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">4</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -460,7 +244,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">5</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
</object> </object>
@ -477,7 +261,22 @@
</object> </object>
</child> </child>
<child type="titlebar"> <child type="titlebar">
<placeholder/> <object class="GtkHeaderBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title">Prefrences</property>
<property name="show_close_button">True</property>
<child>
<placeholder/>
</child>
</object>
</child> </child>
</object> </object>
<object class="GtkAdjustment" id="refresh_value_adj">
<property name="lower">1</property>
<property name="upper">100</property>
<property name="value">1</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
</interface> </interface>

54
hammond-gtk/src/prefs.rs
View File

@ -9,10 +9,6 @@ use gtk::prelude::*;
pub struct Prefs { pub struct Prefs {
dialog: gtk::Window, dialog: gtk::Window,
dark_toggle: gtk::Switch, dark_toggle: gtk::Switch,
startup_toggle: gtk::Switch,
auto_toggle: gtk::Switch,
refresh_value: gtk::SpinButton,
refresh_type: gtk::ComboBox,
cleanup_value: gtk::SpinButton, cleanup_value: gtk::SpinButton,
cleanup_type: gtk::ComboBox, cleanup_type: gtk::ComboBox,
} }
@ -23,20 +19,12 @@ impl Default for Prefs {
let dialog = builder.get_object("prefs").unwrap(); let dialog = builder.get_object("prefs").unwrap();
let dark_toggle = builder.get_object("dark_toggle").unwrap(); let dark_toggle = builder.get_object("dark_toggle").unwrap();
let startup_toggle = builder.get_object("startup_toggle").unwrap();
let auto_toggle = builder.get_object("auto_toggle").unwrap();
let refresh_value = builder.get_object("refresh_value").unwrap();
let refresh_type = builder.get_object("refresh_type").unwrap();
let cleanup_value = builder.get_object("cleanup_value").unwrap(); let cleanup_value = builder.get_object("cleanup_value").unwrap();
let cleanup_type = builder.get_object("cleanup_type").unwrap(); let cleanup_type = builder.get_object("cleanup_type").unwrap();
Prefs { Prefs {
dialog, dialog,
dark_toggle, dark_toggle,
startup_toggle,
auto_toggle,
refresh_value,
refresh_type,
cleanup_value, cleanup_value,
cleanup_type, cleanup_type,
} }
@ -58,58 +46,26 @@ impl Prefs {
"active", "active",
gio::SettingsBindFlags::DEFAULT, gio::SettingsBindFlags::DEFAULT,
); );
settings.bind(
"refresh-on-startup",
&self.startup_toggle,
"active",
gio::SettingsBindFlags::DEFAULT,
);
settings.bind(
"refresh-interval",
&self.auto_toggle,
"active",
gio::SettingsBindFlags::DEFAULT,
);
settings.bind(
"refresh-interval-time",
&self.refresh_value,
"value",
gio::SettingsBindFlags::DEFAULT,
);
settings.bind( settings.bind(
"cleanup-age-time", "cleanup-age-time",
&self.cleanup_value, &self.cleanup_value,
"value", "value",
gio::SettingsBindFlags::DEFAULT, gio::SettingsBindFlags::DEFAULT,
); );
let refresh_p = settings.get_string("refresh-interval-period").unwrap();
let mut refresh_pos = 0;
let cleanup_p = settings.get_string("cleanup-age-period").unwrap(); let cleanup_p = settings.get_string("cleanup-age-period").unwrap();
let mut cleanup_pos = 0; let mut cleanup_pos = 0;
let store = gtk::ListStore::new(&[gtk::Type::String]); let store = gtk::ListStore::new(&[gtk::Type::String]);
for (i, item) in ["Seconds", "Minutes", "Hours", "Days", "Weeks"].iter().enumerate() { for (i, item) in ["Seconds", "Minutes", "Hours", "Days", "Weeks"].iter().enumerate() {
let row: &[&ToValue] = &[item]; let row: &[&ToValue] = &[item];
if item.to_lowercase() == refresh_p {
refresh_pos = i;
}
if item.to_lowercase() == cleanup_p { if item.to_lowercase() == cleanup_p {
cleanup_pos = i; cleanup_pos = i as i32;
} }
store.insert_with_values(None, &[0], &row); store.insert_with_values(None, &[0], &row);
} }
for combo in &[self.refresh_type.clone(), self.cleanup_type.clone()] { self.cleanup_type.set_model(Some(&store));
combo.set_model(Some(&store)); let renderer = gtk::CellRendererText::new();
let renderer = gtk::CellRendererText::new(); self.cleanup_type.pack_start(&renderer, true);
combo.pack_start(&renderer, true); self.cleanup_type.add_attribute(&renderer, "text", 0);
combo.add_attribute(&renderer, "text", 0);
}
self.refresh_type.set_active(refresh_pos);
self.refresh_type
.connect_changed(clone!(settings, store => move |combo| {
let value = store.get_value(&combo.get_active_iter().unwrap(), 0);
let value: &str = value.get().unwrap();
settings.set_string("refresh-interval-period", &value.to_lowercase());
}));
self.cleanup_type.set_active(cleanup_pos); self.cleanup_type.set_active(cleanup_pos);
self.cleanup_type self.cleanup_type
.connect_changed(clone!(settings, store => move |combo| { .connect_changed(clone!(settings, store => move |combo| {