Skip to content

Commit

Permalink
Fix editing of function arguments; Show value instead of stored expre…
Browse files Browse the repository at this point in the history
…ssion in variable edit dialog for approximate variables with expression without uncertainty; Make closing of application with Escape key optional (enabled by default if system tray icon is used); Add temporary option to unknown edit dialog; Disable editing of name for x, y, and z variables; Fix "E" at end of longitude; Improve labels for objects without specific title; Fix compatibility with old GTK versions; Reduce height of edit function dialog; Fix width of min and max field in function argument dialog; Update ChangeLog; Increment version number
  • Loading branch information
hanna-kn committed Aug 21, 2023
1 parent 448a0f1 commit f79822a
Show file tree
Hide file tree
Showing 42 changed files with 9,589 additions and 9,291 deletions.
30 changes: 30 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,33 @@
2023-08-13 Hanna Knutsson <[email protected]>

* Make closing of application with Escape key optional (enabled by default if system tray icon is used)
* Add temporary option to unknown edit dialog
* Disable editing of name for x, y, and z variables
* Fix "E" at end of longitude

2023-08-02 Hanna Knutsson <[email protected]>

* Add support for concise and relative interval input and output
* Fix initial height of list and description in units window

2023-07-25 Hanna Knutsson <[email protected]>

* Add Microship (PIC16/17) 24 and 32 bit floating point formats

2023-07-16 Hanna Knutsson <[email protected]>

* Show user-defined objects in a separate category in menus and dialogs (as in qalculate-qt)
* Update CSV import and export dialogs to match the corresponding dialogs in qalculate-qt
* Do not change the width of the (de)activate button when the label text changes;

2023-07-15 Hanna Knutsson <[email protected]>

* Add option to disable tooltips (all or only in keypad)

2023-07-14 Hanna Knutsson <[email protected]>

* Update variable, function, unit, unknown, and matrix edit dialogs to match the corresponding dialogs in qalculate-qt

2023-06-28 Hanna Knutsson <[email protected]>

* Add optional value to copy result action, allowing expression copy and formatting selection
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Qt, and CLI).
1. Requirements

* GTK (>= 3.10)
* libqalculate (>= 4.7.0)
* libqalculate (>= 4.8.0)

2. Installation

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Qalculate! is a multi-purpose cross-platform desktop calculator. It is simple to

## Requirements
* GTK (>= 3.10)
* libqalculate (>= 4.7.0)
* libqalculate (>= 4.8.0)

## Installation
Instructions and download links for installers, binaries packages, and the source code of released versions of Qalculate! are available at https://qalculate.github.io/downloads.html.
Expand Down
4 changes: 2 additions & 2 deletions 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)],[4.7.0],[],[qalculate-gtk])
AC_INIT([Qalculate! (GTK UI)],[4.8.0],[],[qalculate-gtk])
AC_CONFIG_SRCDIR([src/callbacks.cc])
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS(config.h)
Expand Down Expand Up @@ -125,7 +125,7 @@ AS_IF([test "x$with_local_help" != "xno"], [
AM_CONDITIONAL(ENABLE_LOCAL_HELP, [test "x$with_local_help" != "xno"])

PKG_CHECK_MODULES(QALCULATE, [
libqalculate >= 4.7.0
libqalculate >= 4.8.0
])
AC_SUBST(QALCULATE_CFLAGS)
AC_SUBST(QALCULATE_LIBS)
Expand Down
2 changes: 2 additions & 0 deletions data/argumentrules.ui
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="text">1</property>
<property name="primary-icon-activatable">False</property>
<property name="secondary-icon-activatable">False</property>
Expand Down Expand Up @@ -330,6 +331,7 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="text">1</property>
<property name="primary-icon-activatable">False</property>
<property name="secondary-icon-activatable">False</property>
Expand Down
8 changes: 4 additions & 4 deletions data/functionedit.ui
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
</child>
<child>
<object class="GtkScrolledWindow" id="function_edit_scrolled_subfunctions">
<property name="height-request">125</property>
<property name="height-request">100</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
Expand All @@ -232,7 +232,7 @@
<property name="visible">True</property>
<property name="can-focus">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
<object class="GtkTreeSelection" id="function_edit_treeview_subfunctions_selection"/>
</child>
</object>
</child>
Expand Down Expand Up @@ -323,7 +323,7 @@
</child>
<child>
<object class="GtkScrolledWindow" id="function_edit_scrolled_arguments">
<property name="height-request">125</property>
<property name="height-request">100</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
Expand All @@ -335,7 +335,7 @@
<property name="can-focus">True</property>
<signal name="row-activated" handler="on_function_edit_treeview_arguments_row_activated" swapped="no"/>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
<object class="GtkTreeSelection" id="function_edit_treeview_arguments_selection"/>
</child>
</object>
</child>
Expand Down
2 changes: 1 addition & 1 deletion data/matrixedit.ui
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<signal name="cursor-changed" handler="on_tMatrixEdit_cursor_changed" swapped="no"/>
<signal name="key-press-event" handler="on_tMatrixEdit_key_press_event" swapped="no"/>
<child internal-child="selection">
<object class="GtkTreeSelection"/>
<object class="GtkTreeSelection" id="matrix_edit_view_selection"/>
</child>
</object>
</child>
Expand Down
27 changes: 22 additions & 5 deletions data/preferences.ui
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,23 @@ Note that only the mode, history and definitions of the last closed instance wil
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="preferences_checkbutton_close_with_esc">
<property name="label" translatable="yes">Close application with Escape key</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="tooltip-text" translatable="yes">Close the application with the Escape key if the expression field is empty.</property>
<property name="use-underline">True</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="on_preferences_checkbutton_close_with_esc_toggled" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="preferences_checkbutton_rpn_keys">
<property name="label" translatable="yes">Use keyboard keys for RPN</property>
Expand All @@ -216,7 +233,7 @@ Note that only the mode, history and definitions of the last closed instance wil
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">5</property>
<property name="position">6</property>
</packing>
</child>
<child>
Expand All @@ -234,7 +251,7 @@ Note that only the mode, history and definitions of the last closed instance wil
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">6</property>
<property name="position">7</property>
</packing>
</child>
<child>
Expand Down Expand Up @@ -277,7 +294,7 @@ Note that only the mode, history and definitions of the last closed instance wil
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">7</property>
<property name="position">8</property>
</packing>
</child>
<child>
Expand Down Expand Up @@ -334,7 +351,7 @@ Note that only the mode, history and definitions of the last closed instance wil
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">8</property>
<property name="position">9</property>
</packing>
</child>
<child>
Expand Down Expand Up @@ -374,7 +391,7 @@ Note that only the mode, history and definitions of the last closed instance wil
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">9</property>
<property name="position">10</property>
</packing>
</child>
</object>
Expand Down
22 changes: 22 additions & 0 deletions data/qalculate-gtk.appdata.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,28 @@
</provides>
<translation type="gettext">qalculate-gtk</translation>
<releases>
<release version="4.8.0" date="2023-08-21">
<description>
<p>Changes:</p>
<ul>
<li>Update dialogs for editing of variables, functions, units, etc. to match the corresponding dialogs in the Qt UI</li>
<li>Show user-defined objects in a separate category in menus and dialogs</li>
<li>Add option to disable tooltips in keypad or everywhere</li>
<li>Make closing of application with Escape key optional and disabled by default</li>
<li>Add Microship (PIC16/17) 24 and 32 bit floating point formats</li>
<li>Add support for specifying position of sign bit in floating point functions</li>
<li>Concise (e.g. "1.2345(67)") and relative (e.g. "5+/-2%") notation for output and input (disabled by default for concise notation) of interval</li>
<li>Optimize rest of unit expression when converting to partial (insufficient) expression (e.g. 18MA×100ns to J = 1.8 J/V)</li>
<li>Round high precision intervals enclosing integers for integer arguments</li>
<li>New derived units: Debye, C·m, Daraf, F^-1, V/C, N/C, kcal, kcal/g, kJ</li>
<li>Use international foot as base unit for rod</li>
<li>Fix initial height of list and description in units window</li>
<li>Fix fibonacci() for non-integers and recursive use</li>
<li>Fix conversion options presented for speed units (and possibly other)</li>
<li>Minor bug fixes and feature enhancements</li>
</ul>
</description>
</release>
<release version="4.7.0" date="2023-07-03">
<description>
<p>Changes:</p>
Expand Down
22 changes: 21 additions & 1 deletion data/unknownedit.ui
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</packing>
</child>
<child>
<!-- n-columns=2 n-rows=4 -->
<!-- n-columns=2 n-rows=5 -->
<object class="GtkGrid" id="grid">
<property name="visible">True</property>
<property name="can-focus">False</property>
Expand Down Expand Up @@ -194,6 +194,26 @@
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="unknown_edit_checkbutton_temporary">
<property name="label" translatable="yes">Temporary</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="halign">end</property>
<property name="valign">start</property>
<property name="use-underline">True</property>
<property name="draw-indicator">True</property>
<signal name="toggled" handler="on_unknown_changed" swapped="no"/>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">4</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
Expand Down
4 changes: 2 additions & 2 deletions doc/C/qalculate-gtk-C.omf
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
Qalculate! Manual
</title>
<date>
2023-07-03
2023-08-21
</date>
<version identifier="4.7.0" date="2023-07-03" description=""/>
<version identifier="4.8.0" date="2023-08-21" description=""/>
<subject category="GNOME|Applications|Accessories"/>
<description>
This is the Qalculate! manual
Expand Down
6 changes: 3 additions & 3 deletions doc/C/qalculate-gtk.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
<!ENTITY legal SYSTEM "legal.xml">
<!ENTITY appversion "4.6.1">
<!ENTITY manrevision "4.6.1">
<!ENTITY date "July 2023">
<!ENTITY appversion "4.8.0">
<!ENTITY manrevision "4.8.0">
<!ENTITY date "August 2023">
<!ENTITY app "Qalculate!">
<!ENTITY appendixa SYSTEM "appendixa.xml">
<!ENTITY appendixb SYSTEM "appendixb.xml">
Expand Down
6 changes: 3 additions & 3 deletions doc/html/index.html

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions doc/html/qalc.html
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ <h1>QALC man page</h1>
<div class="level0"><span Class="bold">units (on*, off)</span> <p/></div>
<div class="level0"><span Class="bold">unknowns (on, off*)</span> Interpret undefined symbols in expressions as unknown variables. <p/></div>
<div class="level0"><span Class="bold">variables, var (on*, off)</span> <p/></div>
<div class="level0"><span Class="bold">variable units, varunit (on*, off)</span> If activated physical constants include units (e.g. c = 299 792 458 m∕s). <p/>Generic display options: <p/></div>
<div class="level0"><span Class="bold">variable units, varunits (on*, off)</span> If activated physical constants include units (e.g. c = 299 792 458 m∕s). <p/>Generic display options: <p/></div>
<div class="level0"><span Class="bold">abbreviations, abbr (on*, off)</span> Use abbreviated names for units and variables. <p/></div>
<div class="level0"><span Class="bold">color (0 = off, 1* = default, 2 = light)</span> Use colors to highlight different elements of expressions and results. <p/></div>
<div class="level0"><span Class="bold">division sign, divsign (0* = /, 1 = division slash, 2 = division sign)</span> <p/></div>
Expand All @@ -157,16 +157,18 @@ <h1>QALC man page</h1>
<div class="level0"><span Class="bold">fractions, fr (-1* = auto, 0 = off, 1 = exact, 2 = on, 3 = mixed, 4 = long, 5 = dual)</span> Determines how rational numbers are displayed (e.g. 5/4 = 1 + 1/4 = 1.25). 'long' removes limits on the size of the numerator and denonimator. <p/></div>
<div class="level0"><span Class="bold">hexadecimal two's, hextwos (on, off*)</span> Enables two's complement representation for display of negative hexadecimal numbers. <p/></div>
<div class="level0"><span Class="bold">imaginary j, imgj (on, off*)</span> Use 'j' (instead of 'i') as default symbol for the imaginary unit. <p/></div>
<div class="level0"><span Class="bold">interval display, ivdisp (0* = adaptive, 1 = significant, 2 = interval, 3 = plusminus, 4 = midpoint, 5 = upper, 6 = lower)</span> <p/></div>
<div class="level0"><span Class="bold">interval display, ivdisp (0* = adaptive, 1 = significant, 2 = interval, 3 = plusminus, 4 = midpoint, 5 = lower, 6 = upper, 7 = concise, 8 = relative)</span> <p/></div>
<div class="level0"><span Class="bold">lowercase e, lowe (on, off*)</span> Use lowercase e for E-notation (5e2 = 5 * 10^2). <p/></div>
<div class="level0"><span Class="bold">lowercase numbers, lownum (on, off*)</span> Use lowercase letters for number bases &gt; 10. <p/></div>
<div class="level0"><span Class="bold">max decimals, maxdeci (-1 = off*, &gt;= 0)</span> <p/></div>
<div class="level0"><span Class="bold">min decimals, mindeci (-1 = off*, &gt;= 0)</span> <p/></div>
<div class="level0"><span Class="bold">rounding (0 = standard*, 1 = even, 2 = truncate)</span> Determines whether how approximate numbers are rounded (round halfway numbers away from zero or towards the nearest even digit, or round all numbers towards zero). <p/></div>
<div class="level0"><span Class="bold">scientific notation, exp (0 = off, -1 = auto*, -3 = engineering, 1 = pure, 3 = scientific, &gt;= 0)</span> Determines how scientific notation is used (e.g. 5 543 000 = 5.543E6). <p/></div>
<div class="level0"><span Class="bold">show ending zeroes, zeroes (on*, off)</span> If actived, zeroes are kept at the end of approximate numbers. <p/></div>
<div class="level0"><span Class="bold">two's complement, twos (on*, off)</span> Enables two's complement representation for display of negative binary numbers. <p/>Parsing: <p/></div>
<div class="level0"><span Class="bold">two's complement, twos (on*, off)</span> Enables two's complement representation for display of negative binary numbers. <p/></div>
<div class="level0"><span Class="bold">duodecimal symbols, duosyms (on, off*)</span> Use special symbols for digits 10 and 11 in numbers with base 12. <p/>Parsing: <p/></div>
<div class="level0"><span Class="bold">caret as xor, xor^ (on, off*)</span> Use ^ as bitwise exclusive OR operator. <p/></div>
<div class="level0"><span Class="bold">concise uncertainty, concise (on, off*)</span> Allow input of uncertainty using concise notation. <p/></div>
<div class="level0"><span Class="bold">decimal comma (locale*, off, on)</span> Determines the default decimal separator. <p/></div>
<div class="level0"><span Class="bold">ignore comma (on, off*)</span> Allows use of ',' as thousands separator. <p/></div>
<div class="level0"><span Class="bold">ignore dot (on, off*)</span> Allows use of '.' as thousands separator. <p/></div>
Expand Down
Loading

0 comments on commit f79822a

Please sign in to comment.