lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

print: Use AdwSpinRow

Browse source 
Part-of: <https://gitlab.gnome.org/GNOME/loupe/-/merge_requests/240>
This commit is contained in:
Sophie Herold 2023-06-21 16:55:43 +02:00 • committed by Christopher Davis
parent ae23db6967
commit 9bfa9f7294
2 changed files with 27 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

30
data/gtk/print.ui
View file

@ -110,27 +110,15 @@
<object class="AdwPreferencesGroup"> <object class="AdwPreferencesGroup">
<property name="title" translatable="yes">Margins</property> <property name="title" translatable="yes">Margins</property>
<child> <child>
<object class="AdwActionRow"> <object class="AdwSpinRow" id="margin_left">
<property name="title" translatable="yes">Horizontal</property> <property name="title" translatable="yes">Horizontal</property>
<child> <property name="digits">2</property>
<object class="GtkSpinButton" id="margin_left">
<property name="valign">center</property>
<property name="max-width-chars">5</property>
<signal name="value-changed" handler="margin_left_changed" swapped="yes" />
</object>
</child>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwActionRow"> <object class="AdwSpinRow" id="margin_top">
<property name="title" translatable="yes">Vertical</property> <property name="title" translatable="yes">Vertical</property>
<child> <property name="digits">2</property>
<object class="GtkSpinButton" id="margin_top">
<property name="valign">center</property>
<property name="max-width-chars">5</property>
<signal name="value-changed" handler="margin_top_changed" swapped="yes" />
</object>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -139,15 +127,9 @@
<object class="AdwPreferencesGroup"> <object class="AdwPreferencesGroup">
<property name="title" translatable="yes">Image Size</property> <property name="title" translatable="yes">Image Size</property>
<child> <child>
<object class="AdwActionRow"> <object class="AdwSpinRow" id="width">
<property name="title" translatable="yes">Width</property> <property name="title" translatable="yes">Width</property>
<child> <property name="digits">2</property>
<object class="GtkSpinButton" id="width">
<property name="valign">center</property>
<property name="max-width-chars">5</property>
<signal name="value-changed" handler="width_changed" swapped="yes" />
</object>
</child>
</object> </object>
</child> </child>
<child> <child>

33
src/widgets/print.rs
View file

@ -41,13 +41,13 @@ mod imp {
// ListBox entries // ListBox entries
#[template_child] #[template_child]
pub(super) width: TemplateChild<gtk::SpinButton>, pub(super) width: TemplateChild<adw::SpinRow>,
#[template_child] #[template_child]
pub(super) scale: TemplateChild<gtk::Label>, pub(super) scale: TemplateChild<gtk::Label>,
#[template_child] #[template_child]
pub(super) margin_left: TemplateChild<gtk::SpinButton>, pub(super) margin_left: TemplateChild<adw::SpinRow>,
#[template_child] #[template_child]
pub(super) margin_top: TemplateChild<gtk::SpinButton>, pub(super) margin_top: TemplateChild<adw::SpinRow>,
#[template_child] #[template_child]
pub(super) unit: TemplateChild<adw::ComboRow>, pub(super) unit: TemplateChild<adw::ComboRow>,
@ -111,6 +111,15 @@ mod imp {
obj.set_transient_for(Some(&obj.parent_window())); obj.set_transient_for(Some(&obj.parent_window()));
obj.set_modal(true); obj.set_modal(true);
self.width
.connect_value_notify(glib::clone!(@weak obj => move |_| obj.on_width_changed()));
self.margin_left.connect_value_notify(
glib::clone!(@weak obj => move |_| obj.on_margin_left_changed()),
);
self.margin_top.connect_value_notify(
glib::clone!(@weak obj => move |_| obj.on_margin_top_changed()),
);
self.print_operation self.print_operation
.set_print_settings(Some(&obj.print_settings())); .set_print_settings(Some(&obj.print_settings()));
self.print_operation.set_allow_async(true); self.print_operation.set_allow_async(true);
@ -130,9 +139,12 @@ mod imp {
glib::clone!(@weak obj => move |_operation, _context, _page_nr| { glib::clone!(@weak obj => move |_operation, _context, _page_nr| {
let imp = obj.imp(); let imp = obj.imp();
imp.width.set_increments(1., 5.); imp.width.adjustment().set_step_increment(1.);
imp.margin_left.set_increments(1., 5.); imp.width.adjustment().set_page_increment(5.);
imp.margin_top.set_increments(1., 5.); imp.margin_left.adjustment().set_step_increment(1.);
imp.margin_left.adjustment().set_page_increment(5.);
imp.margin_top.adjustment().set_step_increment(1.);
imp.margin_top.adjustment().set_page_increment(5.);
obj.set_ranges(); obj.set_ranges();
@ -213,8 +225,7 @@ impl LpPrint {
self.print_settings().resolution() as f64 self.print_settings().resolution() as f64
} }
#[template_callback] pub fn on_width_changed(&self) {
pub fn width_changed(&self) {
self.imp() self.imp()
.scale .scale
.set_label(&format!("{:.2}\u{202F}%", self.user_scale() * 100.)); .set_label(&format!("{:.2}\u{202F}%", self.user_scale() * 100.));
@ -234,8 +245,7 @@ impl LpPrint {
self.user_width() / orig_width as f64 self.user_width() / orig_width as f64
} }
#[template_callback] pub fn on_margin_left_changed(&self) {
pub fn margin_left_changed(&self) {
self.draw_preview(); self.draw_preview();
} }
@ -244,8 +254,7 @@ impl LpPrint {
self.imp().margin_left.value() / self.unit_factor() self.imp().margin_left.value() / self.unit_factor()
} }
#[template_callback] pub fn on_margin_top_changed(&self) {
pub fn margin_top_changed(&self) {
self.draw_preview(); self.draw_preview();
} }