Skip to content

Commit

Permalink
Use empty value in insert function dialog when default value is empty…
Browse files Browse the repository at this point in the history
… symbol; Improve vector handling in insert function dialog; Restore initial focus when opening dialogs a second time; Use gtk_widget_focus_on_click or gtk_button_focus_on_click depending on GTK version; Improve layout in insert function dialog; Always use decimal base in plot dialog; Improve handling of ignore comma/dot option outside of the main expression entry; Fix alternatives in to menu and result context menu for result in complex angle form; Set initial nth root dialog value to 2; Increment version number
  • Loading branch information
hanna-kn committed Oct 19, 2020
1 parent 5ae0fe4 commit ececa2e
Show file tree
Hide file tree
Showing 24 changed files with 2,055 additions and 2,031 deletions.
9 changes: 9 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
2020-10-18 Hanna Knutsson <hanna.knutsson@protonmail.com>

* Improve handling of ignore comma/dot option outside of the main expression entry
* Fix alternatives in to menu and result context menu for result in complex angle form
* Set initial nth root dialog value to 2
* Always use decimal base in plot dialog
* Restore initial focus when opening dialogs a second time
* Improve layout in insert function dialog

2020-09-30 Hanna Knutsson <hanna.knutsson@protonmail.com>

* Notifications for invisible actions (e.g. result left-click copy)
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.13.1],[],[qalculate-gtk])
AC_INIT([Qalculate! (GTK+ UI)], [3.14.0],[],[qalculate-gtk])
AC_CONFIG_SRCDIR([src/callbacks.cc])
AM_INIT_AUTOMAKE
AC_CONFIG_MACRO_DIR([m4])
Expand Down
3,681 changes: 1,778 additions & 1,903 deletions data/main.ui

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions data/namesedit.ui
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="closebutton1">
<object class="GtkButton" id="button_close">
<property name="label" translatable="yes">_Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
Expand Down Expand Up @@ -323,7 +323,7 @@
</object>
</child>
<action-widgets>
<action-widget response="-7">closebutton1</action-widget>
<action-widget response="-7">button_close</action-widget>
</action-widgets>
<child>
<placeholder/>
Expand Down
20 changes: 20 additions & 0 deletions data/qalculate-gtk.appdata.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,26 @@
</provides>
<translation type="gettext">qalculate-gtk</translation>
<releases>
<release version="3.14.0" date="2020-10-26">
<description>
<p>Changes:</p>
<ul>
<li>Customizable keypad buttons—change labels and actions for all buttons on the right-hand side of the keypad</li>
<li>Support traditional calculator memory (MR/MC/MS/M+/M-)</li>
<li>Notifications for invisible actions, e.g. result left-click copy</li>
<li>Use v1, v2, … as default variable names</li>
<li>Add Rutherford (Rd), millirem (mrem), mrem/s, and erg/g units</li>
<li>Add yr and annus names for year unit, röntgen name for roentgen (R) unit, and rem for roentgen equivalent man</li>
<li>Keep angle units in calculations involving both length and (plane) angle units (fixes lumen calculations)</li>
<li>Improve plot speed for functions defined using expression</li>
<li>Improvements and fixes in insert function dialog</li>
<li>Improvements and fixes for qalc on Windows</li>
<li>Compiled definitions without GIO and with support for out-of-tree builds</li>
<li>Fix programming keypad base conversion for negative integers</li>
<li>Minor bug fixes and feature improvements</li>
</ul>
</description>
</release>
<release version="3.13.0" date="2020-09-21">
<description>
<p>Changes:</p>
Expand Down
4 changes: 2 additions & 2 deletions data/setbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="button1">
<object class="GtkButton" id="button_close">
<property name="label" translatable="yes">_Close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
Expand Down Expand Up @@ -502,7 +502,7 @@
</object>
</child>
<action-widgets>
<action-widget response="-7">button1</action-widget>
<action-widget response="-7">button_close</action-widget>
</action-widgets>
</object>
</interface>
2 changes: 1 addition & 1 deletion doc/C/qalculate-gtk-C.omf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<date>
2020-09-21
</date>
<version identifier="3.13.0" date="2020-09-21" description=""/>
<version identifier="3.14.0" date="2020-10-26" 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 "3.13.0">
<!ENTITY manrevision "3.13.0">
<!ENTITY date "September 2020">
<!ENTITY appversion "3.14.0">
<!ENTITY manrevision "3.14.0">
<!ENTITY date "October 2020">
<!ENTITY app "Qalculate!">
<!ENTITY appendixa SYSTEM "appendixa.xml">
<!ENTITY appendixb SYSTEM "appendixb.xml">
Expand Down
2 changes: 1 addition & 1 deletion doc/html/index.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions doc/html/qalculate-definitions-functions.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion doc/html/qalculate-definitions-units.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion doc/html/qalculate-definitions-variables.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion doc/html/qalculate-examples.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Appendix D. Example expressions</title><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"><link rel="home" href="index.html" title="Qalculate! Manual v3.13.0"><link rel="up" href="index.html" title="Qalculate! Manual v3.13.0"><link rel="prev" href="qalculate-definitions-units.html" title="Appendix C. Unit List"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Appendix D. Example expressions</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="qalculate-definitions-units.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> </td></tr></table><hr></div><div class="appendix"><div class="titlepage"><div><div><h1 class="title"><a name="qalculate-examples"></a>Appendix D. Example expressions</h1></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="sect1"><a href="qalculate-examples.html#qalculate-examples-1">Basic functions and operators</a></span></dt><dt><span class="sect1"><a href="qalculate-examples.html#qalculate-examples-2">Units</a></span></dt><dt><span class="sect1"><a href="qalculate-examples.html#qalculate-examples-3">Physical constants</a></span></dt><dt><span class="sect1"><a href="qalculate-examples.html#qalculate-examples-4">Uncertainty and interval arithmetic</a></span></dt><dt><span class="sect1"><a href="qalculate-examples.html#qalculate-examples-5">Algebra</a></span></dt><dt><span class="sect1"><a href="qalculate-examples.html#qalculate-examples-6">Calculus</a></span></dt><dt><span class="sect1"><a href="qalculate-examples.html#qalculate-examples-7">Matrices and vectors</a></span></dt><dt><span class="sect1"><a href="qalculate-examples.html#qalculate-examples-8">Statistics</a></span></dt><dt><span class="sect1"><a href="qalculate-examples.html#qalculate-examples-9">Time and date</a></span></dt><dt><span class="sect1"><a href="qalculate-examples.html#qalculate-examples-10">Number bases</a></span></dt></dl></div><p><span class="emphasis"><em>Note that semicolon can be replaced with comma, if comma is not used as decimal or thousands separator.</em></span></p><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="qalculate-examples-1"></a>Basic functions and operators</h2></div></div></div><div class="blockquote"><blockquote class="blockquote"><p><span class="command"><strong>
<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Appendix D. Example expressions</title><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"><link rel="home" href="index.html" title="Qalculate! Manual v3.14.0"><link rel="up" href="index.html" title="Qalculate! Manual v3.14.0"><link rel="prev" href="qalculate-definitions-units.html" title="Appendix C. Unit List"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Appendix D. Example expressions</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="qalculate-definitions-units.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> </td></tr></table><hr></div><div class="appendix"><div class="titlepage"><div><div><h1 class="title"><a name="qalculate-examples"></a>Appendix D. Example expressions</h1></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="sect1"><a href="qalculate-examples.html#qalculate-examples-1">Basic functions and operators</a></span></dt><dt><span class="sect1"><a href="qalculate-examples.html#qalculate-examples-2">Units</a></span></dt><dt><span class="sect1"><a href="qalculate-examples.html#qalculate-examples-3">Physical constants</a></span></dt><dt><span class="sect1"><a href="qalculate-examples.html#qalculate-examples-4">Uncertainty and interval arithmetic</a></span></dt><dt><span class="sect1"><a href="qalculate-examples.html#qalculate-examples-5">Algebra</a></span></dt><dt><span class="sect1"><a href="qalculate-examples.html#qalculate-examples-6">Calculus</a></span></dt><dt><span class="sect1"><a href="qalculate-examples.html#qalculate-examples-7">Matrices and vectors</a></span></dt><dt><span class="sect1"><a href="qalculate-examples.html#qalculate-examples-8">Statistics</a></span></dt><dt><span class="sect1"><a href="qalculate-examples.html#qalculate-examples-9">Time and date</a></span></dt><dt><span class="sect1"><a href="qalculate-examples.html#qalculate-examples-10">Number bases</a></span></dt></dl></div><p><span class="emphasis"><em>Note that semicolon can be replaced with comma, if comma is not used as decimal or thousands separator.</em></span></p><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="qalculate-examples-1"></a>Basic functions and operators</h2></div></div></div><div class="blockquote"><blockquote class="blockquote"><p><span class="command"><strong>
sqrt 4</strong></span> <span class="emphasis"><em>= sqrt(4) = 4^(0.5) = 4^(1/2) = 2</em></span></p></blockquote></div><div class="blockquote"><blockquote class="blockquote"><p><span class="command"><strong>
sqrt(25; 16; 9; 4)</strong></span> <span class="emphasis"><em>= [5; 4; 3; 2]</em></span></p></blockquote></div><div class="blockquote"><blockquote class="blockquote"><p><span class="command"><strong>
sqrt(32)</strong></span> <span class="emphasis"><em>= 4 × √(2) (in exact mode)</em></span></p></blockquote></div><div class="blockquote"><blockquote class="blockquote"><p><span class="command"><strong>
Expand Down
2 changes: 1 addition & 1 deletion doc/html/qalculate-expressions.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Chapter 3. Expressions</title><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"><link rel="home" href="index.html" title="Qalculate! Manual v3.13.0"><link rel="up" href="index.html" title="Qalculate! Manual v3.13.0"><link rel="prev" href="qalculate-user-interface.html" title="Chapter 2. User Interface"><link rel="next" href="qalculate-mode.html" title="Chapter 4. Calculator Modes"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 3. Expressions</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="qalculate-user-interface.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="qalculate-mode.html">Next</a></td></tr></table><hr></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="qalculate-expressions"></a>Chapter 3. Expressions</h1></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="sect1"><a href="qalculate-expressions.html#qalculate-expression-objects">Objects</a></span></dt><dt><span class="sect1"><a href="qalculate-expressions.html#qalculate-expression-operators">Operators</a></span></dt><dt><span class="sect1"><a href="qalculate-expressions.html#qalculate-implicit-multiplication">Implicit Multiplication and Parsing Modes</a></span></dt><dt><span class="sect1"><a href="qalculate-expressions.html#qalculate-to">The <span class="quote"><span class="quote">to</span></span> (and <span class="quote"><span class="quote">where</span></span>) operators</a></span></dt></dl></div><p>
<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Chapter 3. Expressions</title><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"><link rel="home" href="index.html" title="Qalculate! Manual v3.14.0"><link rel="up" href="index.html" title="Qalculate! Manual v3.14.0"><link rel="prev" href="qalculate-user-interface.html" title="Chapter 2. User Interface"><link rel="next" href="qalculate-mode.html" title="Chapter 4. Calculator Modes"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 3. Expressions</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="qalculate-user-interface.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="qalculate-mode.html">Next</a></td></tr></table><hr></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="qalculate-expressions"></a>Chapter 3. Expressions</h1></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="sect1"><a href="qalculate-expressions.html#qalculate-expression-objects">Objects</a></span></dt><dt><span class="sect1"><a href="qalculate-expressions.html#qalculate-expression-operators">Operators</a></span></dt><dt><span class="sect1"><a href="qalculate-expressions.html#qalculate-implicit-multiplication">Implicit Multiplication and Parsing Modes</a></span></dt><dt><span class="sect1"><a href="qalculate-expressions.html#qalculate-to">The <span class="quote"><span class="quote">to</span></span> (and <span class="quote"><span class="quote">where</span></span>) operators</a></span></dt></dl></div><p>
Expressions are mathematical statements. Mathematical questions are asked through expressions, which contains objects tied together with operators. The result of an expression may also be an expression, if the result is not a single object. Apples and oranges can be mixed, but the result will hold them apart. Qalculate! knows algebra.
</p><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="qalculate-expression-objects"></a>Objects</h2></div></div></div><p>
In Qalculate! mathematical entities, such as numbers and variables, are referred to as objects. The recognized object types are listed below.
Expand Down
2 changes: 1 addition & 1 deletion doc/html/qalculate-functions.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Chapter 7. Functions</title><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"><link rel="home" href="index.html" title="Qalculate! Manual v3.13.0"><link rel="up" href="index.html" title="Qalculate! Manual v3.13.0"><link rel="prev" href="qalculate-variables.html" title="Chapter 6. Variables"><link rel="next" href="qalculate-units.html" title="Chapter 8. Units"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 7. Functions</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="qalculate-variables.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="qalculate-units.html">Next</a></td></tr></table><hr></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="qalculate-functions"></a>Chapter 7. Functions</h1></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="sect1"><a href="qalculate-functions.html#qalculate-available-functions">Available Functions</a></span></dt><dt><span class="sect1"><a href="qalculate-functions.html#qalculate-function-creation">Function creation/editing</a></span></dt></dl></div><p>
<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Chapter 7. Functions</title><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"><link rel="home" href="index.html" title="Qalculate! Manual v3.14.0"><link rel="up" href="index.html" title="Qalculate! Manual v3.14.0"><link rel="prev" href="qalculate-variables.html" title="Chapter 6. Variables"><link rel="next" href="qalculate-units.html" title="Chapter 8. Units"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 7. Functions</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="qalculate-variables.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="qalculate-units.html">Next</a></td></tr></table><hr></div><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="qalculate-functions"></a>Chapter 7. Functions</h1></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="sect1"><a href="qalculate-functions.html#qalculate-available-functions">Available Functions</a></span></dt><dt><span class="sect1"><a href="qalculate-functions.html#qalculate-function-creation">Function creation/editing</a></span></dt></dl></div><p>
Functions are essentially mathematical formulas. They are used to store expressions with variable values, arguments. To execute a function, the values for a number of arguments need to specified. These arguments are then inserted into the expression, making it possible to calculate.
</p><p>
Functions is normally entered in an expression by writing the name followed by arguments, separated by commas (or semicolons in languages with comma as decimal point), in parenthesis, thus following the syntax <span class="command"><strong>name(arg1, arg2, ...)</strong></span>. Qalculate! will give a helpful error message if the arguments are not correct.
Expand Down
Loading

0 comments on commit ececa2e

Please sign in to comment.