Merge branch 'main' of https://github.com/Sjoerd1993/Graphs

data/se.sjoerd.Graphs.appdata.xml.in.in

@@ -47,14 +47,14 @@
     </screenshot>
   </screenshots>
   <releases>
-    <release version="1.5.2" date="2023-04-19">
+    <release version="1.5.2" date="2023-05-09">
       <description>
         <p>Changes:</p>
         <ul>
 	  <li>Add support for .xry file types from Leybold X-Ray apparatus.</li>
           <li>Add support for single-column files</li>
           <li>Changed the behaviour of the canvas so that the limits are not reset unnecessarily</li>
-          <li>Started initial work on localization support</li>
+          <li>Started work to add localization support</li>
           <li>Refactors under-the-hood</li>
         </ul>
         <p>Bug fixes:</p>

data/whats_new

@@ -1,45 +1,15 @@
-<p>Major Highlights</p>
+<p>Changes</p>
 <ul>
-  <li>Massive UI overhaul</li>
-  <li>Save and Load functionality</li>
-  <li>Customizable Plot Styles</li>
-  <li>Loads of optimizations and refactors in the background</li>
+	<li>Add support for .xry file types from Leybold X-Ray apparatus.</li>
+	<li>Add support for single-column files</li>
+	<li>Changed the behaviour of the canvas so that the limits are not reset unnecessarily</li>
+	<li>Started initial work on localization support</li>
+	<li>Refactors under-the-hood</li>
 </ul>
-<p>Detailed Changelist</p>
+<p>Bug fixes:</p>
 <ul>
-  <li>Removed PIP mode</li>
-  <li>Removed Toolbar</li>
-  <li>Sidebar is now responsive</li>
-  <li>Rearranged button layouts</li>
-  <li>Dialogs now save automatically</li>
-  <li>Graph now has three different interaction modes: pan, zoom and select</li>
-  <li>Operation Buttons are now enabled only when items are selected</li>
-  <li>Operations can now be be performed for just a selected span of data</li>
-  <li>Added combine operation</li>
-  <li>Added custom Adwaita stylesheets for the graph</li>
-  <li>Added a function to quickly change axis scale in the view menu</li>
-  <li>Added a notice when no data is loaded</li>
-  <li>Added functionality to save and load a project</li>
-  <li>Graph ornaments like the zoom rectangle and selector overlay now follow the system colors</li>
-  <li>Follow GNOME HIG in regards to keyboard shortcuts</li>
-  <li>Add a warning dialog, when opening a project while data is loaded</li>
-  <li>Separate Item related options into own dialog</li>
-  <li>Added Toasts on some occasions</li>
-  <li>Removed some options in Preferences, Plot Settings and the Item menu</li>
-  <li>Added a Plot Style editor</li>
-  <li>Plot limits can now be set in Plot Settings</li>
-  <li>Added reordering of items via drag and drop</li>
-  <li>Added an option to hide unselected items from the graph</li>
-  <li>Added a dialog before exporting the figure</li>
-  <li>Support for Panalytical .xdrml files</li>
-  <li>Improved clipboard behaviour</li>
-
-</ul>
-<p>Background Changes</p>
-<ul>
-  <li>Loads of optimizations and refactors</li>
-  <li>Migrate to GNOME 44</li>
-  <li>Blueprint is now used for the UI</li>
-  <li>Introduce linting and follow PEP8</li>
-  <li>Many fixed bugs and edge cases</li>
-</ul>
+	<li>Fixed a bug where data was not saved when multiple files were exported simultaneously</li>
+	<li>Fixes a bug that prevents "Add Equation" from generating new data</li>
+	<li>Fixes a bug where a change of item properties was not included in the clipboard when loading a new style</li>
+	<li>Fixes a bug where the "Restore View" did not properly find the correct limits in specific situations</li>
+</ul>

meson.build

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 project('graphs',
-          version: '1.5.1',
+          version: '1.5.2',
     meson_version: '>= 0.59.0',
   default_options: [ 'warning_level=2', 'werror=false', ],
 )

po/de.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: graphs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-29 20:52+0200\n"
-"PO-Revision-Date: 2023-04-17 17:45+0200\n"
+"POT-Creation-Date: 2023-05-08 10:54-0400\n"
+"PO-Revision-Date: 2023-04-17 18:28+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
@@ -2186,7 +2186,7 @@ msgstr ""
 msgid "Loading configuration file"
 msgstr ""
 
-#: src/preferences.py:44
+#: src/preferences.py:46
 msgid "Loaded new config"
 msgstr ""
 

po/fr.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: graphs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-29 20:52+0200\n"
+"POT-Creation-Date: 2023-05-08 10:54-0400\n"
 "PO-Revision-Date: 2023-04-17 18:28+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -2186,7 +2186,7 @@ msgstr ""
 msgid "Loading configuration file"
 msgstr ""
 
-#: src/preferences.py:44
+#: src/preferences.py:46
 msgid "Loaded new config"
 msgstr ""
 

po/graphs.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: graphs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-29 20:52+0200\n"
+"POT-Creation-Date: 2023-05-08 10:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -2186,7 +2186,7 @@ msgstr ""
 msgid "Loading configuration file"
 msgstr ""
 
-#: src/preferences.py:44
+#: src/preferences.py:46
 msgid "Loaded new config"
 msgstr ""
 

src/file_io.py

@@ -47,7 +47,7 @@ def save_file(self, path):
             file_path = f"{path}/{filename}.txt"
             if os.path.exists(file_path):
                 file_path = f"{path}/{filename} (copy).txt"
-            numpy.savetxt(str(file_path, array), delimiter="\t")
+            numpy.savetxt(str(file_path), array, delimiter="\t")
 
 
 def get_xrdml(self, import_settings):