summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2010-05-17 11:20:53 +0200
committerClément DAVID <clement.david@scilab.org>2010-05-20 15:35:37 +0200
commitd4bc94ad944ebcce892bab2a9be2c20d9d85328a (patch)
tree36a5675cb6755f573b5bb54f46e49db9e2ba0f1f /scilab/modules
parentff17f5ec694e3d00662571e1f167d006644aa4e7 (diff)
downloadscilab-d4bc94ad944ebcce892bab2a9be2c20d9d85328a.zip
scilab-d4bc94ad944ebcce892bab2a9be2c20d9d85328a.tar.gz
ATOMS GUI: bug 6976 fixed - Webpages URLs linked with a module were missing from the presentation frame.
Change-Id: I5e29fe98120ee8362c637c92f8154648e1fe822b
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/atoms/locales/en_US/atoms.pot18
-rw-r--r--scilab/modules/atoms/locales/fr_FR/atoms.po5
-rw-r--r--scilab/modules/atoms/macros/atoms_gui/cbAtomsGui.sci30
-rw-r--r--scilab/modules/atoms/tests/nonreg_tests/bug_6976.tst28
4 files changed, 74 insertions, 7 deletions
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 ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-05-18 15:22+0100\n" 17"Revision-Date: 2010-05-18 15:24+0100\n"
18 18
19# File: macros/atomsAutoloadAdd.sci, line: 168 19# File: macros/atomsAutoloadAdd.sci, line: 168
20# File: macros/atomsAutoloadAdd.sci, line: 173 20# File: macros/atomsAutoloadAdd.sci, line: 173
@@ -994,7 +994,7 @@ msgstr ""
994msgid "?" 994msgid "?"
995msgstr "" 995msgstr ""
996# 996#
997# File: macros/atoms_gui/cbAtomsGui.sci, line: 290 997# File: macros/atoms_gui/cbAtomsGui.sci, line: 323
998#, c-format 998#, c-format
999msgid "A new version (''%s'') of ''%s'' is available" 999msgid "A new version (''%s'') of ''%s'' is available"
1000msgstr "" 1000msgstr ""
@@ -1027,7 +1027,7 @@ msgstr ""
1027msgid "Automatically Installed" 1027msgid "Automatically Installed"
1028msgstr "" 1028msgstr ""
1029# 1029#
1030# File: macros/atoms_gui/cbAtomsGui.sci, line: 329 1030# File: macros/atoms_gui/cbAtomsGui.sci, line: 362
1031msgid "Bytes" 1031msgid "Bytes"
1032msgstr "" 1032msgstr ""
1033# 1033#
@@ -1044,7 +1044,7 @@ msgid "Depend"
1044msgstr "" 1044msgstr ""
1045# 1045#
1046# File: macros/atomsShow.sci, line: 99 1046# File: macros/atomsShow.sci, line: 99
1047# File: macros/atoms_gui/cbAtomsGui.sci, line: 256 1047# File: macros/atoms_gui/cbAtomsGui.sci, line: 285
1048msgid "Description" 1048msgid "Description"
1049msgstr "" 1049msgstr ""
1050# 1050#
@@ -1080,7 +1080,7 @@ msgstr ""
1080msgid "Installation failed!" 1080msgid "Installation failed!"
1081msgstr "" 1081msgstr ""
1082# 1082#
1083# File: macros/atoms_gui/cbAtomsGui.sci, line: 332 1083# File: macros/atoms_gui/cbAtomsGui.sci, line: 365
1084msgid "KB" 1084msgid "KB"
1085msgstr "" 1085msgstr ""
1086# 1086#
@@ -1093,7 +1093,7 @@ msgstr ""
1093msgid "List of installed modules" 1093msgid "List of installed modules"
1094msgstr "" 1094msgstr ""
1095# 1095#
1096# File: macros/atoms_gui/cbAtomsGui.sci, line: 335 1096# File: macros/atoms_gui/cbAtomsGui.sci, line: 368
1097msgid "MB" 1097msgid "MB"
1098msgstr "" 1098msgstr ""
1099# 1099#
@@ -1133,6 +1133,10 @@ msgstr ""
1133msgid "Scilab Version" 1133msgid "Scilab Version"
1134msgstr "" 1134msgstr ""
1135# 1135#
1136# File: macros/atoms_gui/cbAtomsGui.sci, line: 261
1137msgid "See also"
1138msgstr ""
1139#
1136# File: macros/atomsShow.sci, line: 92 1140# File: macros/atomsShow.sci, line: 92
1137msgid "Status" 1141msgid "Status"
1138msgstr "" 1142msgstr ""
@@ -1158,7 +1162,7 @@ msgid "Update failed!"
1158msgstr "" 1162msgstr ""
1159# 1163#
1160# File: macros/atomsShow.sci, line: 82 1164# File: macros/atomsShow.sci, line: 82
1161# File: macros/atoms_gui/cbAtomsGui.sci, line: 251 1165# File: macros/atoms_gui/cbAtomsGui.sci, line: 280
1162msgid "Version" 1166msgid "Version"
1163msgstr "" 1167msgstr ""
1164# 1168#
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!"
743msgid "Scilab Version" 743msgid "Scilab Version"
744msgstr "Version Scilab" 744msgstr "Version Scilab"
745 745
746#
747# File: macros/atoms_gui/cbAtomsGui.sci, line: 261
748msgid "See also"
749msgstr ""
750
746msgid "Status" 751msgid "Status"
747msgstr "Statut" 752msgstr "Statut"
748 753
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()
241 241
242 authorHTML = authorHTML + "</div>"; 242 authorHTML = authorHTML + "</div>";
243 243
244 // URLs (See also)
245 // =========================================================================
246
247 URLs = [];
248 seeAlsoHTML = "";
249
250 if isfield(thisModuleDetails,"URL") & (thisModuleDetails.URL<>"") then
251 URLs = [ URLs ; thisModuleDetails.URL ];
252 end
253
254 if isfield(thisModuleDetails,"WebSite") & (thisModuleDetails.WebSite<>"") then
255 URLs = [ URLs ; thisModuleDetails.WebSite ];
256 end
257
258 if ~isempty(URLs) then
259
260 seeAlsoHTML = "<div style=""font-weight:bold;margin-top:10px;margin-bottom:5px;"">" + ..
261 gettext("See also") + ..
262 "</div>" + ..
263 "<div>";
264
265 for i=1:size(URLs,"*")
266 seeAlsoHTML = seeAlsoHTML + "&nbsp;&bull;&nbsp;"+URLs(i)+"<br>";
267 end
268
269 seeAlsoHTML = seeAlsoHTML + "</div>";
270
271 end
272
244 // Build and Set the HTML code 273 // Build and Set the HTML code
245 // ========================================================================= 274 // =========================================================================
246 275
@@ -258,6 +287,7 @@ function updateDescFrame()
258 "<div>" + .. 287 "<div>" + ..
259 strcat(thisModuleDetails.Description,"<br>") + .. 288 strcat(thisModuleDetails.Description,"<br>") + ..
260 "</div>" + .. 289 "</div>" + ..
290 seeAlsoHTML + ..
261 sizeHTML + .. 291 sizeHTML + ..
262 "</body>" + .. 292 "</body>" + ..
263 "</html>"; 293 "</html>";
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 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2010 - DIGITEO - Pierre MARECHAL
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7
8// <-- TEST WITH ATOMS -->
9// <-- INTERACTIVE TEST -->
10//
11// <-- Non-regression test for bug 6976 -->
12//
13// <-- Bugzilla URL -->
14// http://bugzilla.scilab.org/show_bug.cgi?id=6976
15//
16// <-- Short Description -->
17// Improve connexion from the GUI to the related ATOMS webpages.
18// In the Presentation frame: Add a "See also" or "Atoms webpage" section,
19// giving the related hyperlink. Ex: For the Matrix Market module, give
20// http://atoms.scilab.org/toolboxes/MatrixMarket
21// Or set this hyperlink on the module's title.
22// This would allow to easily access important infos that are presently not
23// accessible through the GUI, such as comments,download rate, supported OS, etc.
24
25atomsGui();
26
27// Select a module
28// Check the "See Also" section