[gnome-calculator: 2/2] Merge branch 'aplazas/gnome-calculator-preferences'




commit eff5c518f31d7ca348997ee734b4e4e2122969f0
Merge: f8b6dffc f196b762
Author: Robert Roth <robert roth off gmail com>
Date:   Fri Mar 26 02:14:08 2021 +0200

    Merge branch 'aplazas/gnome-calculator-preferences'

 src/math-preferences.vala  | 104 ++++++++++++++------
 src/ui/math-preferences.ui | 229 +++++++++------------------------------------
 2 files changed, 121 insertions(+), 212 deletions(-)
---
diff --cc src/math-preferences.vala
index 7978624e,10c5b245..aab233bc
--- a/src/math-preferences.vala
+++ b/src/math-preferences.vala
@@@ -36,12 -67,16 +67,16 @@@ public class MathPreferencesDialog : Hd
      {
          settings = new Settings ("org.gnome.calculator");
  
+         populate_combo_row (row_angle_units, entries_angle_units);
+         populate_combo_row (row_word_size, entries_word_size);
+         populate_combo_row (row_refresh_interval, entries_refresh_interval);
+ 
          spinbutton_decimals.value_changed.connect (() => { equation.accuracy = 
spinbutton_decimals.get_value_as_int (); });
 -        switch_trailing_zeroes.state_set.connect ((state) => { equation.show_trailing_zeroes = state; });
 -        switch_thousands_separators.state_set.connect ((state) => { equation.show_thousands_separators = 
state; });
 +        switch_trailing_zeroes.state_set.connect ((state) => { equation.show_trailing_zeroes = state; 
return false; });
 +        switch_thousands_separators.state_set.connect ((state) => { equation.show_thousands_separators = 
state; return false; });
-         combo_angle_units.changed.connect (combo_angle_units_changed_cb);
-         combo_word_size.changed.connect (combo_word_size_changed_cb);
-         combo_refresh_interval.changed.connect (combo_refresh_interval_changed_cb);
+         row_angle_units.notify["selected-index"].connect (row_angle_units_changed_cb);
+         row_word_size.notify["selected-index"].connect (row_word_size_changed_cb);
+         row_refresh_interval.notify["selected-index"].connect (row_refresh_interval_changed_cb);
  
          spinbutton_decimals.set_value (equation.accuracy);
          equation.notify["accuracy"].connect ((pspec) => { spinbutton_decimals.set_value 
(equation.accuracy); });


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]