Skip to content

Commit

Permalink
Do not change result color when window loses focus (issue #376); Impr…
Browse files Browse the repository at this point in the history
…ove result text ASCII conversion; Improve function argument quotation marks usage; Fix result display inconsistency when reopening from tray icon (issue #379); Treat non-breaking narrow space as regular narrow space when deciding if element in matrix/vector needs parenthesis; Remove flags for RUB and BYR/BYN, and show UAH flag when first using the new version; Increment version number; Update translations; Update metadata; Update manual
  • Loading branch information
hanna-kn committed Mar 14, 2022
1 parent f2ea1bf commit 74c7413
Show file tree
Hide file tree
Showing 36 changed files with 11,848 additions and 11,364 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2022-03-12 Hanna Knutsson <hanna.knutsson@protonmail.com>

* Do not change result color when window loses focus
* Fix result display inconsistency when reopening from tray icon

2022-03-07 Hanna Knutsson <hanna.knutsson@protonmail.com>

* Add option to clear history in expression popup menu
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.0.0)
* libqalculate (>= 4.1.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.0.0)
* libqalculate (>= 4.1.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.0.0],[],[qalculate-gtk])
AC_INIT([Qalculate! (GTK UI)],[4.1.0],[],[qalculate-gtk])
AC_CONFIG_SRCDIR([src/callbacks.cc])
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS(config.h)
Expand Down Expand Up @@ -111,7 +111,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.0.0
libqalculate >= 4.1.0
])
AC_SUBST(QALCULATE_CFLAGS)
AC_SUBST(QALCULATE_LIBS)
Expand Down
6 changes: 3 additions & 3 deletions data/flags.gresource.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<file>BSD.png</file>
<file>BTC.png</file>
<file>BWP.png</file>
<file>BYN.png</file>
<!--<file>BYN.png</file>-->
<file>BZD.png</file>
<file>CAD.png</file>
<file>CDF.png</file>
Expand Down Expand Up @@ -115,7 +115,7 @@
<file>QAR.png</file>
<file>RON.png</file>
<file>RSD.png</file>
<file>RUB.png</file>
<!--<file>RUB.png</file>-->
<file>RWF.png</file>
<file>SAR.png</file>
<file>SBD.png</file>
Expand Down Expand Up @@ -158,7 +158,7 @@
<file>eurocent.png</file>
<file>ATS.png</file>
<file>BEF.png</file>
<file>BYR.png</file>
<!--<file>BYR.png</file>-->
<file>CYP.png</file>
<file>DEM.png</file>
<file>EEK.png</file>
Expand Down
2 changes: 1 addition & 1 deletion data/pkg/selfcontained-binary.patch
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ index f61afc2..d4a3155 100644
@@ -31776,7 +31776,7 @@ void on_menu_item_about_activate(GtkMenuItem*, gpointer) {
gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(dialog), _("Powerful and easy to use calculator"));
gtk_about_dialog_set_license_type(GTK_ABOUT_DIALOG(dialog), GTK_LICENSE_GPL_2_0);
gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(dialog), "Copyright © 2003–2007, 2008, 2016-2022 Hanna Knutsson");
gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(dialog), "Copyright © 2003–2007, 2008, 20162022 Hanna Knutsson");
- gtk_about_dialog_set_logo_icon_name(GTK_ABOUT_DIALOG(dialog), "qalculate");
+ gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(dialog), gdk_pixbuf_new_from_resource("/qalculate-gtk/icons/128x128/apps/qalculate.png", NULL));
gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(dialog), "Qalculate! (GTK)");
Expand Down
23 changes: 23 additions & 0 deletions data/qalculate-gtk.appdata.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,29 @@
</provides>
<translation type="gettext">qalculate-gtk</translation>
<releases>
<release version="4.1.0" date="2022-03-14">
<description>
<p>Changes:</p>
<ul>
<li>Add option to only show parsed or entered expression in history</li>
<li>Add option to clear expression history</li>
<li>Do not add duplicate results to history</li>
<li>Improved result copying, with proper html format and ASCII option</li>
<li>Do not replace *, -, / with Unicode operators if cursor is within quotation marks (apply same principles on paste)</li>
<li>Improvements and fixes for interaction with history</li>
<li>Do not change result color when window loses focus</li>
<li>Do not perform automatic (continuous) conversion, from conversion view, if result contains no unit</li>
<li>Use non-breaking narrow space as digit separator in reasonably short numbers, and between quantity and unit</li>
<li>Update value of austronomical unit</li>
<li>Fix display of result with quoted symbol in history</li>
<li>Fix completion visible after expression cleared with key repetition</li>
<li>Fix segfault with local digit grouping when separator is empty (e.g. with ignore locale)</li>
<li>Fix freezes and crashes with extrememly large vectors and matrices</li>
<li>Fix segfault in matrix multiplication</li>
<li>Minor bug fixes and feature improvements</li>
</ul>
</description>
</release>
<release version="4.0.0" date="2022-02-14">
<description>
<p>Changes:</p>
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>
2022-02-14
2022-03-14
</date>
<version identifier="4.0.0" date="2022-02-14" description=""/>
<version identifier="4.1.0" date="2022-03-14" description=""/>
<subject category="GNOME|Applications|Accessories"/>
<description>
This is the Qalculate! manual
Expand Down
10 changes: 7 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.0.0">
<!ENTITY manrevision "4.0.0">
<!ENTITY date "February 2022">
<!ENTITY appversion "4.1.0">
<!ENTITY manrevision "4.1.0">
<!ENTITY date "Mars 2022">
<!ENTITY app "Qalculate!">
<!ENTITY appendixa SYSTEM "appendixa.xml">
<!ENTITY appendixb SYSTEM "appendixb.xml">
Expand Down Expand Up @@ -992,6 +992,10 @@ The menus in the menu bar provides access to most of the functionality of &app;.
<entry><para>Copy Result (<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>C</keycap></keycombo>)</para></entry>
<entry><para>Copies the current result to the clipboard.</para></entry>
</row>
<row valign="top">
<entry><para>Copy Result as Unformatted ASCII</para></entry>
<entry><para>Copies the current result with formatting removed and Unicode symbols replaced with corresponding ASCII characters.</para></entry>
</row>
<row valign="top">
<entry><para>Keyboard Shortcuts</para></entry>
<entry><para>Opens a dialog for editing key bindings.</para></entry>
Expand Down
2 changes: 1 addition & 1 deletion doc/html/index.html

Large diffs are not rendered by default.

6 changes: 3 additions & 3 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 v4.0.0"><link rel="up" href="index.html" title="Qalculate! Manual v4.0.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 in function arguments, 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 v4.1.0"><link rel="up" href="index.html" title="Qalculate! Manual v4.1.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 in function arguments, 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 v4.0.0"><link rel="up" href="index.html" title="Qalculate! Manual v4.0.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 v4.1.0"><link rel="up" href="index.html" title="Qalculate! Manual v4.1.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 v4.0.0"><link rel="up" href="index.html" title="Qalculate! Manual v4.0.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 v4.1.0"><link rel="up" href="index.html" title="Qalculate! Manual v4.1.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 74c7413

Please sign in to comment.