From 910cefc95108cdbf980f6900e9c6a81228a9ad49 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Tue, 14 Jul 2026 18:06:41 +0200 Subject: [PATCH] Fix About dialog title and version display --- CMakeLists.txt | 2 +- po/fr.po | 11 +++++++++++ po/it.po | 11 +++++++++++ po/nl.po | 11 +++++++++++ po/prozgui.pot | 14 +++++++++----- po/pt_BR.po | 11 +++++++++++ po/ro.po | 11 +++++++++++ src/we.cxx | 25 ++++++++++++++++++++++--- src/we.fl | 7 ++++--- 9 files changed, 91 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ecffb8..1828c0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.20) -project(prozgui VERSION 2.2.1 LANGUAGES C CXX) +project(prozgui VERSION 2.2.2 LANGUAGES C CXX) include(GNUInstallDirs) find_package(Threads REQUIRED) diff --git a/po/fr.po b/po/fr.po index ddfeb9e..cae28ea 100644 --- a/po/fr.po +++ b/po/fr.po @@ -521,3 +521,14 @@ msgstr "%s ne contient pas une valeur de proxy HTTP valide" #, c-format msgid "%s does not seem to be a valid FTP proxy value" msgstr "%s ne contient pas une valeur de proxy FTP valide" +msgid "About ProzGUI" +msgstr "À propos de ProzGUI" + +msgid "Prozilla Download Accelerator %s" +msgstr "Accélérateur de téléchargement Prozilla %s" + +msgid "GUI Version %s" +msgstr "Version de l'interface %s" + +msgid "libprozilla version %s" +msgstr "Version de libprozilla %s" diff --git a/po/it.po b/po/it.po index 41db3f7..6eb00f4 100644 --- a/po/it.po +++ b/po/it.po @@ -504,3 +504,14 @@ msgstr "%s non sembra essere un valore valido per un proxy HTTP" #, c-format msgid "%s does not seem to be a valid FTP proxy value" msgstr "%s non sembra essere un valore valido per un proxy FTP" +msgid "About ProzGUI" +msgstr "Informazioni su ProzGUI" + +msgid "Prozilla Download Accelerator %s" +msgstr "Acceleratore di download Prozilla %s" + +msgid "GUI Version %s" +msgstr "Versione GUI %s" + +msgid "libprozilla version %s" +msgstr "Versione libprozilla %s" diff --git a/po/nl.po b/po/nl.po index 8e83df5..d6afaa1 100644 --- a/po/nl.po +++ b/po/nl.po @@ -420,3 +420,14 @@ msgstr "" #, c-format msgid "%s does not seem to be a valid FTP proxy value" msgstr "" +msgid "About ProzGUI" +msgstr "Over ProzGUI" + +msgid "Prozilla Download Accelerator %s" +msgstr "Prozilla-downloadversneller %s" + +msgid "GUI Version %s" +msgstr "GUI-versie %s" + +msgid "libprozilla version %s" +msgstr "libprozilla-versie %s" diff --git a/po/prozgui.pot b/po/prozgui.pot index 2271d09..71a0194 100644 --- a/po/prozgui.pot +++ b/po/prozgui.pot @@ -175,16 +175,20 @@ msgstr "" msgid "Cancel" msgstr "" -#: src/we.cxx:4241 -msgid "Prozilla Download Accelerator 2.0.5beta" +#: src/we.cxx:4244 +msgid "About ProzGUI" msgstr "" #: src/we.cxx:4247 -msgid "GUI Version 2.0.5beta" +msgid "Prozilla Download Accelerator %s" +msgstr "" + +#: src/we.cxx:4247 +msgid "GUI Version %s" msgstr "" #: src/we.cxx:4250 -msgid "libprozilla version 1.2.0" +msgid "libprozilla version %s" msgstr "" #: src/we.cxx:4265 @@ -222,7 +226,7 @@ msgid "" msgstr "" #: src/we.cxx:4300 -msgid "Pablo Iranzo Gómez - testing" +msgid "Pablo Iranzo Gómez - testing" msgstr "" #: src/we.cxx:4304 diff --git a/po/pt_BR.po b/po/pt_BR.po index 0e30a57..b2e0678 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -523,3 +523,14 @@ msgstr "%s não parece ser um valor de proxy FTP válido" #~ msgid "HTTP" #~ msgstr "HTTP" +msgid "About ProzGUI" +msgstr "Sobre o ProzGUI" + +msgid "Prozilla Download Accelerator %s" +msgstr "Acelerador de downloads Prozilla %s" + +msgid "GUI Version %s" +msgstr "Versão da interface %s" + +msgid "libprozilla version %s" +msgstr "Versão da libprozilla %s" diff --git a/po/ro.po b/po/ro.po index 5802e2c..b42c0ad 100644 --- a/po/ro.po +++ b/po/ro.po @@ -443,3 +443,14 @@ msgstr "%s nu pare sã fie o valoare validã pentru proxy HTTP" #, c-format msgid "%s does not seem to be a valid FTP proxy value" msgstr "%s nu pare sã fie o valoare validã pentru proxy FTP" +msgid "About ProzGUI" +msgstr "Despre ProzGUI" + +msgid "Prozilla Download Accelerator %s" +msgstr "Accelerator de descărcări Prozilla %s" + +msgid "GUI Version %s" +msgstr "Versiune interfață %s" + +msgid "libprozilla version %s" +msgstr "Versiune libprozilla %s" diff --git a/src/we.cxx b/src/we.cxx index 66c3f1c..fab0ffa 100644 --- a/src/we.cxx +++ b/src/we.cxx @@ -1,6 +1,10 @@ // generated by Fast Light User Interface Designer (fluid) version 1.0102 #include +#include +#include +#include +#include "config.h" #include "we.h" Fl_Window *win_prefs=(Fl_Window *)0; @@ -4235,19 +4239,33 @@ static Fl_Pixmap image_BigProZilla01(idata_BigProZilla01); Fl_Window* make_about_win() { Fl_Window* w; + char version_label[128]; + char *libprozilla_version = proz_get_libprozilla_version(); + const char *display_libprozilla_version = + libprozilla_version ? libprozilla_version : "unknown"; { Fl_Window* o = win_about = new Fl_Window(560, 345); w = o; + o->copy_label(gettext("About ProzGUI")); o->labeltype(FL_NORMAL_LABEL); - { Fl_Box* o = new Fl_Box(5, 25, 215, 30, gettext("Prozilla Download Accelerator 2.0.5beta")); + { Fl_Box* o = new Fl_Box(5, 25, 215, 30); + snprintf(version_label, sizeof(version_label), + gettext("Prozilla Download Accelerator %s"), PACKAGE_VERSION); + o->copy_label(version_label); o->labelfont(1); o->labelsize(12); o->labelcolor(4); o->align(FL_ALIGN_WRAP); } - { Fl_Box* o = new Fl_Box(15, 55, 185, 20, gettext("GUI Version 2.0.5beta")); + { Fl_Box* o = new Fl_Box(15, 55, 185, 20); + snprintf(version_label, sizeof(version_label), + gettext("GUI Version %s"), PACKAGE_VERSION); + o->copy_label(version_label); o->labelsize(12); } - { Fl_Box* o = new Fl_Box(20, 80, 185, 20, gettext("libprozilla version 1.2.0")); + { Fl_Box* o = new Fl_Box(20, 80, 185, 20); + snprintf(version_label, sizeof(version_label), + gettext("libprozilla version %s"), display_libprozilla_version); + o->copy_label(version_label); o->labelsize(12); } { Fl_Button* o = new Fl_Button(60, 310, 85, 20, gettext("OK")); @@ -4363,6 +4381,7 @@ esources at genesys.ro, testing")); } o->end(); } + free(libprozilla_version); return w; } diff --git a/src/we.fl b/src/we.fl index 6415c98..3ead73b 100644 --- a/src/we.fl +++ b/src/we.fl @@ -251,18 +251,19 @@ Function {make_prefs_win()} {} { Function {make_about_win()} {} { Fl_Window win_about {open + label {About ProzGUI} xywh {156 167 560 345} labeltype NORMAL_LABEL visible } { Fl_Box {} { - label {Prozilla Download Accelerator 2.0.5beta} + label {Prozilla Download Accelerator} xywh {5 25 215 30} labelfont 1 labelsize 12 labelcolor 4 align 128 } Fl_Box {} { - label {GUI Version 2.0.5beta} + label {GUI Version} xywh {15 55 185 20} labelsize 12 } Fl_Box {} { - label {libprozilla version 1.2.0} + label {libprozilla version} xywh {20 80 185 20} labelsize 12 } Fl_Button {} {