Skip to content

Commit

Permalink
Fix edit unit dialog for gtk 3.10; Make some digits non-translatable;…
Browse files Browse the repository at this point in the history
… Update manual; Increment version number; Update some tooltips; Fix spelling error in ChangeLog
  • Loading branch information
hanna-kn committed Jun 11, 2020
1 parent e8f5d2c commit ca2fb26
Show file tree
Hide file tree
Showing 29 changed files with 1,955 additions and 1,979 deletions.
2 changes: 1 addition & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

2019-05-15 Hanna Knutsson <hanna.knutsson@protonmail.com>

* Support for automatic uppdates of self-contained binaries
* Support for automatic updates of self-contained binaries
* Add check for updates menu item

2019-05-12 Hanna Knutsson <hanna.knutsson@protonmail.com>
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dnl ----------------------
dnl | initialize autotools |---------------------------------------------------
dnl ----------------------

AC_INIT([Qalculate! (GTK+ UI)], [3.10.0],[],[qalculate-gtk])
AC_INIT([Qalculate! (GTK+ UI)], [3.11.0],[],[qalculate-gtk])
AC_CONFIG_SRCDIR([src/callbacks.cc])
AM_INIT_AUTOMAKE
AC_CONFIG_MACRO_DIR([m4])
Expand Down
10 changes: 5 additions & 5 deletions data/argumentrules.ui
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.2 -->
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<object class="GtkAdjustment" id="adjustment_max">
Expand All @@ -22,9 +22,6 @@
<property name="title" translatable="yes">Argument Rules</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<child type="titlebar">
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="vbox56">
<property name="visible">True</property>
Expand Down Expand Up @@ -132,7 +129,7 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Ex. if argument is a matrix that must have equal number of rows and columns: rows(\x) = columns(\x)</property>
<property name="tooltip_text" translatable="yes">For example if argument is a matrix that must have equal number of rows and columns: rows(\x) = columns(\x)</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<signal name="changed" handler="on_argument_changed" swapped="no"/>
Expand Down Expand Up @@ -375,5 +372,8 @@
<action-widget response="-6">button6</action-widget>
<action-widget response="-5">argument_rules_button_ok</action-widget>
</action-widgets>
<child type="titlebar">
<placeholder/>
</child>
</object>
</interface>
16 changes: 8 additions & 8 deletions data/functionedit.ui
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.2 -->
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<object class="GtkDialog" id="function_edit_dialog">
Expand All @@ -8,9 +8,6 @@
<property name="title" translatable="yes">Edit Function</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<child type="titlebar">
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="vbox27">
<property name="visible">True</property>
Expand Down Expand Up @@ -407,7 +404,7 @@
<object class="GtkEntry" id="function_edit_entry_condition">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Condition that must be true for the function. Ex. if the second argument must be greater than the first: "\y &gt; \x"</property>
<property name="tooltip_text" translatable="yes">Condition that must be true for the function (e.g. if the second argument must be greater than the first: "\y &gt; \x")</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<signal name="changed" handler="on_function_changed" swapped="no"/>
Expand Down Expand Up @@ -687,16 +684,16 @@
<action-widget response="-6">button1</action-widget>
<action-widget response="-5">function_edit_button_ok</action-widget>
</action-widgets>
<child type="titlebar">
<placeholder/>
</child>
</object>
<object class="GtkDialog" id="function_edit_dialog_subfunctions">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes">Sub-Functions</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<child type="titlebar">
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property>
Expand Down Expand Up @@ -907,5 +904,8 @@
<action-widgets>
<action-widget response="-7">closebutton1</action-widget>
</action-widgets>
<child type="titlebar">
<placeholder/>
</child>
</object>
</interface>
10 changes: 5 additions & 5 deletions data/nbases.ui
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.2 -->
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<object class="GtkDialog" id="nbases_dialog">
Expand All @@ -10,9 +10,6 @@
<signal name="delete-event" handler="gtk_widget_hide" object="nbases_dialog" swapped="yes"/>
<signal name="destroy-event" handler="gtk_widget_hide" object="nbases_dialog" swapped="yes"/>
<signal name="key-press-event" handler="on_nbases_dialog_key_press_event" swapped="no"/>
<child type="titlebar">
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox5">
<property name="visible">True</property>
Expand Down Expand Up @@ -610,7 +607,7 @@
<object class="GtkLabel" id="nbases_label_three">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">3</property>
<property name="label">3</property>
</object>
</child>
</object>
Expand Down Expand Up @@ -999,5 +996,8 @@
</child>
</object>
</child>
<child type="titlebar">
<placeholder/>
</child>
</object>
</interface>
17 changes: 7 additions & 10 deletions data/plot.ui
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.2 -->
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<object class="GtkAdjustment" id="adjustment1">
Expand Down Expand Up @@ -52,9 +52,6 @@
<signal name="delete-event" handler="gtk_widget_hide" object="plot_dialog" swapped="yes"/>
<signal name="destroy-event" handler="gtk_widget_hide" object="plot_dialog" swapped="yes"/>
<signal name="hide" handler="on_plot_dialog_hide" swapped="no"/>
<child type="titlebar">
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="vbox60">
<property name="visible">True</property>
Expand Down Expand Up @@ -644,7 +641,7 @@
<object class="GtkEntry" id="plot_entry_min">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="text" translatable="yes">0</property>
<property name="text">0</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
</object>
Expand Down Expand Up @@ -684,7 +681,7 @@
<object class="GtkEntry" id="plot_entry_max">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="text" translatable="yes">10</property>
<property name="text">10</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
</object>
Expand Down Expand Up @@ -775,7 +772,7 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="text" translatable="yes">1</property>
<property name="text">1</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
</object>
Expand Down Expand Up @@ -954,7 +951,6 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="text" translatable="yes">10</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="adjustment">adjustment4</property>
Expand Down Expand Up @@ -1002,7 +998,6 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="text" translatable="yes">10</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="adjustment">adjustment5</property>
Expand Down Expand Up @@ -1216,7 +1211,6 @@
<object class="GtkSpinButton" id="plot_spinbutton_linewidth">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="text" translatable="yes">10</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="adjustment">adjustment6</property>
Expand Down Expand Up @@ -1418,5 +1412,8 @@
<action-widget response="0">plot_button_save</action-widget>
<action-widget response="-7">plot_button_close</action-widget>
</action-widgets>
<child type="titlebar">
<placeholder/>
</child>
</object>
</interface>
11 changes: 5 additions & 6 deletions data/precision.ui
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.2 -->
<!-- Generated with glade 3.36.0 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<object class="GtkAdjustment" id="adjustment1">
Expand All @@ -17,9 +17,6 @@
<property name="type_hint">normal</property>
<signal name="delete-event" handler="gtk_widget_hide" object="precision_dialog" swapped="yes"/>
<signal name="destroy-event" handler="gtk_widget_hide" object="precision_dialog" swapped="yes"/>
<child type="titlebar">
<placeholder/>
</child>
<child internal-child="vbox">
<object class="GtkBox" id="vbox45">
<property name="visible">True</property>
Expand Down Expand Up @@ -101,14 +98,13 @@
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">The number of significant digits to display/calculate (simple arithmetics are always calculated exact)</property>
<property name="hexpand">True</property>
<property name="text" translatable="yes">1</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
<property name="adjustment">adjustment1</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
<property name="value">1</property>
<property name="value">8</property>
<signal name="value-changed" handler="on_precision_dialog_spinbutton_precision_value_changed" swapped="no"/>
</object>
<packing>
Expand All @@ -129,5 +125,8 @@
<action-widget response="-7">precision_dialog_button_close</action-widget>
<action-widget response="0">precision_dialog_button_recalculate</action-widget>
</action-widgets>
<child type="titlebar">
<placeholder/>
</child>
</object>
</interface>
4 changes: 0 additions & 4 deletions data/preferences.ui
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,6 @@ Note that only the mode, history and definitions of the last closed instance wil
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="width_chars">15</property>
<property name="text" translatable="yes">3</property>
<property name="adjustment">adjustment_plot_time</property>
<property name="snap_to_ticks">True</property>
<property name="value">5</property>
Expand Down Expand Up @@ -1103,7 +1102,6 @@ Note that only the mode, history and definitions of the last closed instance wil
<object class="GtkSpinButton" id="preferences_spin_completion_min">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="text" translatable="yes">7</property>
<property name="adjustment">adjustment_completion</property>
<property name="numeric">True</property>
<property name="value">1</property>
Expand Down Expand Up @@ -1142,7 +1140,6 @@ Note that only the mode, history and definitions of the last closed instance wil
<object class="GtkSpinButton" id="preferences_spin_completion_min2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="text" translatable="yes">1</property>
<property name="adjustment">adjustment_completion2</property>
<property name="numeric">True</property>
<property name="value">1</property>
Expand All @@ -1169,7 +1166,6 @@ Note that only the mode, history and definitions of the last closed instance wil
<object class="GtkSpinButton" id="preferences_spin_completion_delay">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="text" translatable="yes">1</property>
<property name="adjustment">adjustment_completion_delay</property>
<property name="numeric">True</property>
<signal name="value-changed" handler="on_preferences_spin_completion_delay_value_changed" swapped="no"/>
Expand Down
Loading

0 comments on commit ca2fb26

Please sign in to comment.