From d4bc94ad944ebcce892bab2a9be2c20d9d85328a Mon Sep 17 00:00:00 2001 From: Pierre MARECHAL Date: Mon, 17 May 2010 11:20:53 +0200 Subject: [PATCH] ATOMS GUI: bug 6976 fixed - Webpages URLs linked with a module were missing from the presentation frame. Change-Id: I5e29fe98120ee8362c637c92f8154648e1fe822b --- scilab/CHANGES_5.3.X | 3 ++ scilab/modules/atoms/locales/en_US/atoms.pot | 18 +++++++----- scilab/modules/atoms/locales/fr_FR/atoms.po | 5 ++++ .../modules/atoms/macros/atoms_gui/cbAtomsGui.sci | 30 ++++++++++++++++++++ .../modules/atoms/tests/nonreg_tests/bug_6976.tst | 28 ++++++++++++++++++ 5 files changed, 77 insertions(+), 7 deletions(-) create mode 100644 scilab/modules/atoms/tests/nonreg_tests/bug_6976.tst diff --git a/scilab/CHANGES_5.3.X b/scilab/CHANGES_5.3.X index 4b38ee8..43da53a 100644 --- a/scilab/CHANGES_5.3.X +++ b/scilab/CHANGES_5.3.X @@ -309,6 +309,9 @@ ATOMS: one, the ATOMS GUI claimed that the newest version was installed. +* bug 6976 fixed - ATOMS GUI: Webpages URLs linked with a module were missing + from the presentation frame. + * bug 6977 fixed - ATOMS GUI: In the presentation frame, URLs and emails were not hyperlinked. diff --git a/scilab/modules/atoms/locales/en_US/atoms.pot b/scilab/modules/atoms/locales/en_US/atoms.pot index 5730af5..df8e3df 100644 --- a/scilab/modules/atoms/locales/en_US/atoms.pot +++ b/scilab/modules/atoms/locales/en_US/atoms.pot @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -"Revision-Date: 2010-05-18 15:22+0100\n" +"Revision-Date: 2010-05-18 15:24+0100\n" # File: macros/atomsAutoloadAdd.sci, line: 168 # File: macros/atomsAutoloadAdd.sci, line: 173 @@ -994,7 +994,7 @@ msgstr "" msgid "?" msgstr "" # -# File: macros/atoms_gui/cbAtomsGui.sci, line: 290 +# File: macros/atoms_gui/cbAtomsGui.sci, line: 323 #, c-format msgid "A new version (''%s'') of ''%s'' is available" msgstr "" @@ -1027,7 +1027,7 @@ msgstr "" msgid "Automatically Installed" msgstr "" # -# File: macros/atoms_gui/cbAtomsGui.sci, line: 329 +# File: macros/atoms_gui/cbAtomsGui.sci, line: 362 msgid "Bytes" msgstr "" # @@ -1044,7 +1044,7 @@ msgid "Depend" msgstr "" # # File: macros/atomsShow.sci, line: 99 -# File: macros/atoms_gui/cbAtomsGui.sci, line: 256 +# File: macros/atoms_gui/cbAtomsGui.sci, line: 285 msgid "Description" msgstr "" # @@ -1080,7 +1080,7 @@ msgstr "" msgid "Installation failed!" msgstr "" # -# File: macros/atoms_gui/cbAtomsGui.sci, line: 332 +# File: macros/atoms_gui/cbAtomsGui.sci, line: 365 msgid "KB" msgstr "" # @@ -1093,7 +1093,7 @@ msgstr "" msgid "List of installed modules" msgstr "" # -# File: macros/atoms_gui/cbAtomsGui.sci, line: 335 +# File: macros/atoms_gui/cbAtomsGui.sci, line: 368 msgid "MB" msgstr "" # @@ -1133,6 +1133,10 @@ msgstr "" msgid "Scilab Version" msgstr "" # +# File: macros/atoms_gui/cbAtomsGui.sci, line: 261 +msgid "See also" +msgstr "" +# # File: macros/atomsShow.sci, line: 92 msgid "Status" msgstr "" @@ -1158,7 +1162,7 @@ msgid "Update failed!" msgstr "" # # File: macros/atomsShow.sci, line: 82 -# File: macros/atoms_gui/cbAtomsGui.sci, line: 251 +# File: macros/atoms_gui/cbAtomsGui.sci, line: 280 msgid "Version" msgstr "" # diff --git a/scilab/modules/atoms/locales/fr_FR/atoms.po b/scilab/modules/atoms/locales/fr_FR/atoms.po index 51a5138..5899fe6 100644 --- a/scilab/modules/atoms/locales/fr_FR/atoms.po +++ b/scilab/modules/atoms/locales/fr_FR/atoms.po @@ -743,6 +743,11 @@ msgstr "Désintallation echouée!" msgid "Scilab Version" msgstr "Version Scilab" +# +# File: macros/atoms_gui/cbAtomsGui.sci, line: 261 +msgid "See also" +msgstr "" + msgid "Status" msgstr "Statut" diff --git a/scilab/modules/atoms/macros/atoms_gui/cbAtomsGui.sci b/scilab/modules/atoms/macros/atoms_gui/cbAtomsGui.sci index f916cf8..d6c52aa 100644 --- a/scilab/modules/atoms/macros/atoms_gui/cbAtomsGui.sci +++ b/scilab/modules/atoms/macros/atoms_gui/cbAtomsGui.sci @@ -241,6 +241,35 @@ function updateDescFrame() authorHTML = authorHTML + ""; + // URLs (See also) + // ========================================================================= + + URLs = []; + seeAlsoHTML = ""; + + if isfield(thisModuleDetails,"URL") & (thisModuleDetails.URL<>"") then + URLs = [ URLs ; thisModuleDetails.URL ]; + end + + if isfield(thisModuleDetails,"WebSite") & (thisModuleDetails.WebSite<>"") then + URLs = [ URLs ; thisModuleDetails.WebSite ]; + end + + if ~isempty(URLs) then + + seeAlsoHTML = "
" + .. + gettext("See also") + .. + "
" + .. + "
"; + + for i=1:size(URLs,"*") + seeAlsoHTML = seeAlsoHTML + " • "+URLs(i)+"
"; + end + + seeAlsoHTML = seeAlsoHTML + "
"; + + end + // Build and Set the HTML code // ========================================================================= @@ -258,6 +287,7 @@ function updateDescFrame() "
" + .. strcat(thisModuleDetails.Description,"
") + .. "
" + .. + seeAlsoHTML + .. sizeHTML + .. "" + .. ""; diff --git a/scilab/modules/atoms/tests/nonreg_tests/bug_6976.tst b/scilab/modules/atoms/tests/nonreg_tests/bug_6976.tst new file mode 100644 index 0000000..6cbe792 --- /dev/null +++ b/scilab/modules/atoms/tests/nonreg_tests/bug_6976.tst @@ -0,0 +1,28 @@ +// ============================================================================= +// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab +// Copyright (C) 2010 - DIGITEO - Pierre MARECHAL +// +// This file is distributed under the same license as the Scilab package. +// ============================================================================= + +// <-- TEST WITH ATOMS --> +// <-- INTERACTIVE TEST --> +// +// <-- Non-regression test for bug 6976 --> +// +// <-- Bugzilla URL --> +// http://bugzilla.scilab.org/show_bug.cgi?id=6976 +// +// <-- Short Description --> +// Improve connexion from the GUI to the related ATOMS webpages. +// In the Presentation frame: Add a "See also" or "Atoms webpage" section, +// giving the related hyperlink. Ex: For the Matrix Market module, give +// http://atoms.scilab.org/toolboxes/MatrixMarket +// Or set this hyperlink on the module's title. +// This would allow to easily access important infos that are presently not +// accessible through the GUI, such as comments,download rate, supported OS, etc. + +atomsGui(); + +// Select a module +// Check the "See Also" section -- 1.7.9.5