Improve the graph clearing logic

Merge branch 'origin/master' into Weblate.
Fixed display artifact in the graph tab bar
2024-11-24 03:35:53 +01:00 · 2024-09-20 09:34:54 +02:00 · 2024-09-20 07:10:25 +00:00 · 2024-09-20 09:05:55 +02:00 · 2024-09-20 09:05:42 +02:00 · 2024-09-18 19:40:56 +02:00
7 changed files with 16 additions and 15 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -1,4 +1,4 @@
-version: 13.25.{build}
+version: 13.26.{build}

 configuration:
  - Release
--- a/gpxsee.pro
+++ b/gpxsee.pro
@ -3,7 +3,7 @@ unix:!macx:!android {
 } else {
    TARGET = GPXSee
 }
-VERSION = 13.25
+VERSION = 13.26


 QT += core \
--- a/lang/gpxsee_eo.ts
+++ b/lang/gpxsee_eo.ts
@ -486,7 +486,7 @@
    <message>
        <location filename="../src/GUI/gui.cpp" line="370"/>
        <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Ĉiuj</translation>
    </message>
    <message>
        <location filename="../src/GUI/gui.cpp" line="374"/>
--- a/lang/gpxsee_fi.ts
+++ b/lang/gpxsee_fi.ts
@ -492,17 +492,17 @@
    <message>
        <location filename="../src/GUI/gui.cpp" line="370"/>
        <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Kaikki</translation>
    </message>
    <message>
        <location filename="../src/GUI/gui.cpp" line="374"/>
        <source>Raster only</source>
-        <translation type="unfinished"></translation>
+        <translation>Vain rasteri</translation>
    </message>
    <message>
        <location filename="../src/GUI/gui.cpp" line="378"/>
        <source>Vector only</source>
-        <translation type="unfinished"></translation>
+        <translation>Vain vektori</translation>
    </message>
    <message>
        <location filename="../src/GUI/gui.cpp" line="385"/>
--- a/lang/gpxsee_ru.ts
+++ b/lang/gpxsee_ru.ts
@ -492,17 +492,17 @@
    <message>
        <location filename="../src/GUI/gui.cpp" line="370"/>
        <source>All</source>
-        <translation type="unfinished"></translation>
+        <translation>Все</translation>
    </message>
    <message>
        <location filename="../src/GUI/gui.cpp" line="374"/>
        <source>Raster only</source>
-        <translation type="unfinished"></translation>
+        <translation>Только растр</translation>
    </message>
    <message>
        <location filename="../src/GUI/gui.cpp" line="378"/>
        <source>Vector only</source>
-        <translation type="unfinished"></translation>
+        <translation>Только вектор</translation>
    </message>
    <message>
        <location filename="../src/GUI/gui.cpp" line="385"/>
@ -699,7 +699,7 @@
    <message>
        <location filename="../src/GUI/gui.cpp" line="695"/>
        <source>Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>Слои</translation>
    </message>
    <message>
        <location filename="../src/GUI/gui.cpp" line="721"/>
--- a/pkg/windows/gpxsee64.nsi
+++ b/pkg/windows/gpxsee64.nsi
@ -37,7 +37,7 @@ Unicode true
 ; The name of the installer
 Name "GPXSee"
 ; Program version
-!define VERSION "13.25"
+!define VERSION "13.26"

 ; The file to write
 OutFile "GPXSee-${VERSION}_x64.exe"
--- a/src/GUI/graphview.cpp
+++ b/src/GUI/graphview.cpp
@ -264,8 +264,7 @@ QRectF GraphView::bounds() const

 void GraphView::redraw()
 {
-	if (!_graphs.isEmpty())
-		redraw(viewport()->size() - QSizeF(MARGIN, MARGIN));
+	redraw(viewport()->size() - QSizeF(MARGIN, MARGIN));
 }

 void GraphView::redraw(const QSizeF &size)
@ -275,7 +274,6 @@ void GraphView::redraw(const QSizeF &size)
 	RangeF rx, ry;
 	qreal sx, sy;

-
 	if (_bounds.isNull()) {
 		removeItem(_xAxis);
 		removeItem(_yAxis);
@ -284,7 +282,10 @@ void GraphView::redraw(const QSizeF &size)
 		removeItem(_slider);
 		removeItem(_info);
 		removeItem(_grid);
-		addItem(_message);
+		if (_graphs.isEmpty())
+			removeItem(_message);
+		else
+			addItem(_message);
 		_scene->setSceneRect(_scene->itemsBoundingRect());
 		return;
 	}
Author	SHA1	Message	Date
Martin Tůma	c68a2a1ac4	Improve the graph clearing logic	2024-09-20 09:34:54 +02:00
Hosted Weblate	672fca9dd5	Merge branch 'origin/master' into Weblate.	2024-09-20 07:10:25 +00:00
Martin Tůma	8c2e2f65c3	Fixed display artifact in the graph tab bar Yet another workaroud for the Qt 6.7 bug that draws QGraphicsScene items to the graph tab bar. Follow up to `6ce0b03295`.	2024-09-20 09:05:55 +02:00
Martin Tůma	c5a7a4bb0e	Version++	2024-09-20 09:05:42 +02:00
Nikolay Korotkiy	4f77d7a40e	Translated using Weblate (Esperanto) Currently translated at 91.5% (447 of 488 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/eo/	2024-09-18 19:40:56 +02:00
Nikolay Korotkiy	285a9a55f3	Translated using Weblate (Russian) Currently translated at 100.0% (488 of 488 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/	2024-09-18 19:40:55 +02:00
Nikolay Korotkiy	9c00ff53c2	Translated using Weblate (Finnish) Currently translated at 95.4% (466 of 488 strings) Translation: GPXSee/Translations Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/fi/	2024-09-18 19:40:55 +02:00