Improvements/fixes for custom buttons; Do not calculate empty express…

…ion when opening set unknowns dialog; Improve/fix updating of equals button and information/warning/error tooltip; Fix list of units to convert to when result contains prefix; Fix minimal height of expression entry (height of icons) in minimal mode; Update manual; Increment version number
akaydev-coder · Nov 12, 2020 · ff6e5c7 · ff6e5c7
1 parent 3ff9882
commit ff6e5c7
Show file tree

Hide file tree

Showing 34 changed files with 6,271 additions and 6,131 deletions.
diff --git a/configure.ac b/configure.ac
@@ -6,7 +6,7 @@ dnl  ----------------------
 dnl | initialize autotools |---------------------------------------------------
 dnl  ----------------------
 
-AC_INIT([Qalculate! (GTK+ UI)], [3.14.0],[],[qalculate-gtk])
+AC_INIT([Qalculate! (GTK+ UI)], [3.15.0],[],[qalculate-gtk])
 AC_CONFIG_SRCDIR([src/callbacks.cc])
 AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/data/main.ui b/data/main.ui
diff --git a/doc/C/figures/completion.png b/doc/C/figures/completion.png
diff --git a/doc/C/figures/mainwindow-screen.png b/doc/C/figures/mainwindow-screen.png
diff --git a/doc/C/figures/mainwindow.dia b/doc/C/figures/mainwindow.dia
diff --git a/doc/C/figures/mainwindow.png b/doc/C/figures/mainwindow.png
diff --git a/doc/C/figures/minimal-window.png b/doc/C/figures/minimal-window.png
diff --git a/doc/C/qalculate-gtk-C.omf b/doc/C/qalculate-gtk-C.omf
@@ -8,9 +8,9 @@
       Qalculate! Manual
     </title>
     <date>
-      2020-09-21
+      2020-11-23
    </date>
-    <version identifier="3.14.0" date="2020-10-26" description=""/>
+    <version identifier="3.15.0" date="2020-11-23" description=""/>
     <subject category="GNOME|Applications|Accessories"/>
     <description>
       This is the Qalculate! manual

diff --git a/doc/C/qalculate-gtk.xml b/doc/C/qalculate-gtk.xml
@@ -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.14.0">
-  <!ENTITY manrevision "3.14.0">
-  <!ENTITY date "October 2020">
+  <!ENTITY appversion "3.15.0">
+  <!ENTITY manrevision "3.15.0">
+  <!ENTITY date "November 2020">
   <!ENTITY app "Qalculate!">
   <!ENTITY appendixa SYSTEM "appendixa.xml">
   <!ENTITY appendixb SYSTEM "appendixb.xml">
@@ -70,7 +70,7 @@ Although use of &app; for simple calculations should be natural and self-explana
 	<screenshot>
 		<mediaobject>
 			<imageobject>
-				<imagedata fileref="figures/mainwindow.png" format="PNG" width="690"/>
+				<imagedata fileref="figures/mainwindow.png" format="PNG" width="594"/>
 			</imageobject>
 		</mediaobject>
 	</screenshot>
@@ -84,12 +84,15 @@ The main window provides a menu bar, the expression entry, the result display an
 <para>
 The expression entry is the most important part of the &app; user interface. The normal calculation procedure in &app; is to type in a mathematical expression (e.g. <quote>5 + 5</quote>) and press <keycap>Enter</keycap> (or click <guibutton>=</guibutton>). The result (<quote>10</quote>) is then displayed below the expression entry in the result display.
 </para>
+<para>
+The icon in the upper right corner of the expression entry changes function depending on the current status. While editing the expression an equals sign is shown. When the icon is clicked the expression will be calculated. If this results in an error or a warning, the be corresponding icon will be displayed instead, and if this is clicked, or if the pointer is placed over it, the error/warning text will be shown. If no error or warning is triggered, activation of the icon will instead clear the expression entry. No icon is shown when the expression is empty.
+</para>
 <figure id="qalculate-FIG-completion">
 	<title>Completion</title>
 	<screenshot>
 		<mediaobject>
 			<imageobject>
-				<imagedata fileref="figures/completion.png" format="PNG" width="485"/>
+				<imagedata fileref="figures/completion.png" format="PNG" width="347"/>
 			</imageobject>
 		</mediaobject>
 	</screenshot>
@@ -171,7 +174,7 @@ Operators will be placed after any selected text (except bitwise and logical NOT
 The mathematical functions accessed using keypad buttons (and menus) behave differently depending on the current edited expression. If the cursor is at the end of the expression and there is no operator or parenthesis immediately to left of the cursor (at the end of expression), the whole expression is used as function argument and the expression is immediately calculated using the function (if you type <quote>5 + 2</quote> and then click <guibutton>sin</guibutton>, <quote>sin(5 + 2)</quote> will be calculated). If text in the expression is selected, the selection will be used as the function argument. If the whole expression was selected the resulting expression will immediately be calculated. Functions that requires more than one argument do not follow these rules and in many cases opens a separate dialog for argument input. In RPN mode the function will always be applied to the register(s) at the top of stack, if the current expression is empty and there are enough registers for functions that require more one argument.
 </para>
 <para>
-All actions and labels of the buttons on the right be customed using <menuchoice><guimenu>Edit</guimenu><guimenuitem>Customize Keypad Buttons</guimenuitem></menuchoice>. The default buttons, and associated actions, are listed below.
+All actions and labels of the buttons on the right can be customed using <menuchoice><guimenu>Edit</guimenu><guimenuitem>Customize Keypad Buttons</guimenuitem></menuchoice> (it is also possible to add an additional column of buttons). The default buttons, and associated actions, are listed below.
 <table id="qalculate-TBL-keypad-right" frame="topbot" colsep="1">
 	<title>Right Keypad</title> 
 	<tgroup cols="2" colsep="1" rowsep="0">
@@ -766,13 +769,13 @@ Additional actions are available in the context menu of the history list. This i
 </sect1>
 <sect1 id="minimal-window">
 <title>Minimal Window</title>
-<para>It is possible to minimize the footprint of the calculator window using <menuchoice><guimenu>File</guimenu><guimenuitem>Minimal Window</guimenuitem></menuchoice> or <keycombo><keycap>Ctrl</keycap><keycap>Space</keycap></keycombo>. This will hide everything but the expression entry and the equals button. The window is expanded to reveal to result, but the result display stays hidden while empty. Restore the window using the keyboard shortcut or the lower right button.</para>
+<para>It is possible to minimize the footprint of the calculator window using <menuchoice><guimenu>File</guimenu><guimenuitem>Minimal Window</guimenuitem></menuchoice> or <keycombo><keycap>Ctrl</keycap><keycap>Space</keycap></keycombo>. This will hide everything but the expression entry and the equals button. The window is expanded to reveal to result, but the result display stays hidden while empty. Restore the window using the keyboard shortcut or the icon in lower right corner of the expression entry.</para>
 <figure id="qalculate-FIG-minimal-window">
 	<title>Minimal Window</title>
 	<screenshot>
 		<mediaobject>
 			<imageobject>
-				<imagedata fileref="figures/minimal-window.png" format="PNG" width="336"/>
+				<imagedata fileref="figures/minimal-window.png" format="PNG" width="294"/>
 			</imageobject>
 		</mediaobject>
 	</screenshot>
@@ -995,7 +998,7 @@ The menus in the menu bar provides access to most of the functionality of &app;.
 			</row>
 			<row valign="top">
 				<entry><para>Customize Keypad Buttons</para></entry>
-				<entry><para>Opens a dialog for customizing the labels and actions for the the keypad buttons on the right side.</para></entry>
+				<entry><para>Opens a dialog for customizing the labels and actions for the the keypad buttons on the right side, and optionally adding another column of buttons.</para></entry>
 			</row>
 			<row valign="top">
 				<entry><para>Preferences</para></entry>
@@ -1015,7 +1018,7 @@ The menus in the menu bar provides access to most of the functionality of &app;.
 				<entry colname="COLSPEC1"><para>Description</para></entry>
 			</row>
 		</thead> 
-                <tbody>
+		<tbody>
 			<row valign="top">
 				<entry><para>Number Base</para></entry>
 				<entry><para>Submenu with a list of number bases (binary, octal, decimal, duodecimal, hexadecimal, sexagesimal, time format, and other bases, and roman numerals) to select for result display, and a menu item (<keycombo><keycap>Ctrl</keycap><keycap>B</keycap></keycombo>) for opening a dialog to switch number bases in expression (input) and result (output).</para></entry>

diff --git a/doc/html/figures/completion.png b/doc/html/figures/completion.png
diff --git a/doc/html/figures/mainwindow.png b/doc/html/figures/mainwindow.png
diff --git a/doc/html/figures/minimal-window.png b/doc/html/figures/minimal-window.png
diff --git a/doc/html/index.html b/doc/html/index.html
diff --git a/doc/html/qalculate-definitions-functions.html b/doc/html/qalculate-definitions-functions.html
diff --git a/doc/html/qalculate-definitions-units.html b/doc/html/qalculate-definitions-units.html
diff --git a/doc/html/qalculate-definitions-variables.html b/doc/html/qalculate-definitions-variables.html
diff --git a/doc/html/qalculate-examples.html b/doc/html/qalculate-examples.html
@@ -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.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>
+<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.15.0"><link rel="up" href="index.html" title="Qalculate! Manual v3.15.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>

diff --git a/doc/html/qalculate-expressions.html b/doc/html/qalculate-expressions.html
@@ -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.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>
+<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.15.0"><link rel="up" href="index.html" title="Qalculate! Manual v3.15.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.