Skip to content

Commit

Permalink
BUG: Fix non-translatable text in Welcome module
Browse files Browse the repository at this point in the history 
Text in the collapsible sections were loaded from HTML resources that were not translatable (lupdate did not extract content from that). See #6177.

The large "Welcome" text was actually an image, which was not possible to translate using the current translation infrastructure. This commit makes that text displayed using formatted text instead of a .png image. See #6639.
  • Loading branch information
@lassoan @jcfr
lassoan authored and jcfr committed Feb 21, 2023
1 parent a2fd791 commit ae894ab
Show file tree
Hide file tree
Showing 11 changed files with 70 additions and 216 deletions.
18 changes: 0 additions & 18 deletions Modules/Loadable/SlicerWelcome/Resources/HTML/About.html
View file

This file was deleted.

40 changes: 0 additions & 40 deletions Modules/Loadable/SlicerWelcome/Resources/HTML/Acknowledgment.html
View file

This file was deleted.

25 changes: 0 additions & 25 deletions Modules/Loadable/SlicerWelcome/Resources/HTML/Feedback.html
View file

This file was deleted.

42 changes: 0 additions & 42 deletions Modules/Loadable/SlicerWelcome/Resources/HTML/OtherUsefulHints.html
View file

This file was deleted.

22 changes: 0 additions & 22 deletions Modules/Loadable/SlicerWelcome/Resources/HTML/stylesheet.css
View file

This file was deleted.

Binary file removed Modules/Loadable/SlicerWelcome/Resources/Images/WelcomeLogo.png
View file
Binary file not shown.
Binary file removed Modules/Loadable/SlicerWelcome/Resources/Images/WelcomeLogo@2x.png
View file
Binary file not shown.
72 changes: 59 additions & 13 deletions Modules/Loadable/SlicerWelcome/Resources/UI/qSlicerWelcomeModuleWidget.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>463</width>
<height>818</height>
<height>2368</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -17,10 +17,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../qSlicerWelcomeModule.qrc">:/Images/WelcomeLogo.png</pixmap>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:22pt; color:#afb7d5;&quot;&gt;Welcome&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -190,7 +187,7 @@
<string>Feedback</string>
</property>
<property name="collapsed">
<bool>true</bool>
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13">
<property name="spacing">
Expand All @@ -209,7 +206,7 @@
<number>0</number>
</property>
<item>
<widget class="ctkFittedTextBrowser" name="textBrowser_13">
<widget class="ctkFittedTextBrowser" name="feedbackTextBrowser">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Minimum">
<horstretch>0</horstretch>
Expand All @@ -219,9 +216,19 @@
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="html">
<string>&lt;table border=&quot;0&quot; align=&quot;center&quot; cellspacing=&quot;0&quot; cellpadding=&quot;5&quot;&gt;&lt;tr&gt;
&lt;td style=&quot; vertical-align:middle;&quot;&gt;&lt;p&gt;&lt;a href=&quot;https://discourse.slicer.org&quot;&gt;&lt;img src=&quot;qrc:Icons/Chat.png&quot; width=&quot;64&quot; style=&quot;vertical-align: middle;&quot; /&gt;&lt;/a&gt;&lt;/p&gt;&lt;/td&gt;
&lt;td style=&quot; vertical-align:middle;&quot;&gt;&lt;p&gt;Share your stories with us on the &lt;a href=&quot;https://discourse.slicer.org&quot;&gt;Slicer forum&lt;/a&gt; and let us know about how 3D Slicer has enabled your research.&lt;/p&gt;&lt;/td&gt;
&lt;/tr&gt;&lt;/table&gt;
&lt;p&gt;We are always interested in improving 3D Slicer, to tell us about your problem or submit a bug report, open &lt;b&gt;Help -&amp;gt; Report a Bug&lt;/b&gt;.&lt;/p&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
<property name="collapsed">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
Expand Down Expand Up @@ -252,7 +259,7 @@
<number>0</number>
</property>
<item>
<widget class="ctkFittedTextBrowser" name="textBrowse">
<widget class="ctkFittedTextBrowser" name="aboutTextBrowser">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Minimum">
<horstretch>0</horstretch>
Expand All @@ -262,6 +269,10 @@
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="html">
<string>&lt;p&gt;&lt;b&gt;3D Slicer&lt;/b&gt; is a free open source software platform for medical image processing and 3D visualization of image data. This module contains some basic information and useful links to get you started using Slicer. For more information, please visit our website &lt;a href=&quot;https://www.slicer.org&quot;&gt;https://www.slicer.org&lt;/a&gt;.&lt;/p&gt;
&lt;p&gt;&lt;b&gt;3D Slicer&lt;/b&gt; is distributed under a BSD-style license; for details about the contribution and software license agreement, please see the &lt;a href=&quot;https://github.com/Slicer/Slicer/blob/main/License.txt&quot;&gt;3D Slicer Software License Agreement&lt;/a&gt;. This software has been designed for research purposes only and has not been reviewed or approved by the Food and Drug Administration, or by any other agency.&lt;/p&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
Expand All @@ -276,7 +287,7 @@
<string>Documentation &amp;&amp; Tutorials</string>
</property>
<property name="collapsed">
<bool>true</bool>
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
<property name="spacing">
Expand All @@ -295,7 +306,7 @@
<number>0</number>
</property>
<item>
<widget class="ctkFittedTextBrowser" name="textBrowser_9">
<widget class="ctkFittedTextBrowser" name="documentationTextBrowser">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Minimum">
<horstretch>0</horstretch>
Expand All @@ -305,9 +316,31 @@
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="html">
<string>&lt;p&gt;&lt;b&gt;Documentation&lt;/b&gt;&lt;/p&gt;
&lt;ul&gt;&lt;li&gt;&lt;a href=&quot;https://slicer.readthedocs.io/en/latest/&quot;&gt;Documentation&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;https://slicer.readthedocs.io/en/latest/user_guide/getting_started.html#quick-start&quot;&gt;Quick Start&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;https://slicer.readthedocs.io/en/latest/user_guide/get_help.html&quot;&gt;Get Help&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;https://slicer.readthedocs.io/en/latest/user_guide/user_interface.html&quot;&gt;User Interface&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;https://slicer.readthedocs.io/en/latest/user_guide/user_interface.html#mouse-keyboard-shortcuts&quot;&gt;Mouse Buttons, &amp;quot;Hot-keys&amp;quot; and Keyboard Shortcuts&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;https://slicer.readthedocs.io/en/latest/user_guide/getting_started.html#tutorials&quot;&gt;Browse Tutorials&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;
&lt;p&gt;&lt;b&gt;Contact Us&lt;/p&gt;
&lt;ul&gt;&lt;li&gt;&lt;a href=&quot;https://discourse.slicer.org/&quot;&gt;Visit the Slicer Forum&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;https://twitter.com/3dslicerapp&quot;&gt;Join Us on Twitter&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;https://discourse.slicer.org/c/support/feature-requests/9&quot;&gt;Search Feature Requests&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;https://slicer.readthedocs.io/en/latest/user_guide/get_help.html#i-want-to-report-a-problem&quot;&gt;Report a Bug&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;
&lt;p&gt;&lt;b&gt;About 3D Slicer&lt;/p&gt;
&lt;ul&gt;&lt;li&gt;&lt;a href=&quot;https://github.com/Slicer/Slicer/blob/main/License.txt&quot;&gt;View License&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;https://slicer.readthedocs.io/en/latest/user_guide/about.html#how-to-cite&quot;&gt;How to Cite&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;https://scholar.google.com/scholar?&amp;amp;as_sdt=1%2C22&amp;amp;as_vis=1&amp;amp;q=%28%223D+Slicer%22+OR+%22slicer+org%22+OR+Slicer3D%29+-Slic3r+&amp;amp;btnG=&quot;&gt;Slicer Publications&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;https://slicer.readthedocs.io/en/latest/user_guide/about.html#acknowledgments&quot;&gt;Acknowledgments&lt;/a&gt;&lt;/li&gt;&lt;/ul&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
<property name="collapsed">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
Expand All @@ -322,7 +355,7 @@
<string>Updates</string>
</property>
<property name="collapsed">
<bool>true</bool>
<bool>false</bool>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="horizontalSpacing">
Expand Down Expand Up @@ -463,7 +496,7 @@
<string>Acknowledgment</string>
</property>
<property name="collapsed">
<bool>true</bool>
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_11">
<property name="spacing">
Expand All @@ -482,7 +515,7 @@
<number>0</number>
</property>
<item>
<widget class="ctkFittedTextBrowser" name="textBrowser_11">
<widget class="ctkFittedTextBrowser" name="acknowledgmentTextBrowser">
<property name="sizePolicy">
<sizepolicy hsizetype="Ignored" vsizetype="Minimum">
<horstretch>0</horstretch>
Expand All @@ -492,9 +525,22 @@
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="html">
<string>&lt;table align=&quot;center&quot; cellspacing=&quot;0&quot; cellpadding=&quot;5&quot;&gt;&lt;tr&gt;&lt;td&gt;&lt;p align=&quot;center&quot;&gt;
&lt;a href=&quot;https://www.na-mic.org/&quot;&gt;&lt;img src=&quot;qrc:Logos/NAMIC.png&quot; width=&quot;80&quot; style=&quot;vertical-align: middle;&quot; /&gt;&lt;/a&gt;&lt;a href=&quot;https://www.na-mic.org/&quot;&gt;&lt;/a&gt;&lt;/p&gt;&lt;/td&gt;
&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;a href=&quot;https://nac.spl.harvard.edu/&quot;&gt;&lt;img src=&quot;qrc:Logos/NAC.png&quot; style=&quot;vertical-align: middle;&quot; /&gt;&lt;/a&gt;&lt;a href=&quot;https://nac.spl.harvard.edu/&quot;&gt;&lt;/a&gt;&lt;/p&gt;&lt;/td&gt;
&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;a href=&quot;https://www.ncigt.org/&quot;&gt;&lt;img src=&quot;qrc:Logos/NCIGT.png&quot; style=&quot;vertical-align: middle;&quot; /&gt;&lt;/a&gt;&lt;a href=&quot;https://www.ncigt.org/&quot;&gt;&lt;/a&gt;&lt;/p&gt;&lt;/td&gt;
&lt;td&gt;&lt;p align=&quot;center&quot;&gt;&lt;a href=&quot;https://www.spl.harvard.edu/&quot;&gt;&lt;img src=&quot;qrc:Logos/SPL.png&quot; style=&quot;vertical-align: middle;&quot; /&gt;&lt;/a&gt;&lt;a href=&quot;https://www.spl.harvard.edu/&quot;&gt;&lt;/a&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;
&lt;p&gt;Development of 3D Slicer is supported by &lt;a href=&quot;https://www.na-mic.org/&quot;&gt;NA-MIC&lt;/a&gt;, &lt;a href=&quot;https://nac.spl.harvard.edu/&quot;&gt;NAC&lt;/a&gt;, &lt;a href=&quot;https://www.ncigt.org/&quot;&gt;NCIGT&lt;/a&gt;, &lt;a href=&quot;https://www.spl.harvard.edu&quot;&gt;SPL&lt;/a&gt; and the &lt;a href=&quot;https://slicer.readthedocs.io/en/latest/user_guide/about.html#acknowledgments&quot;&gt;Slicer Community&lt;/a&gt;. See &lt;a href=&quot;https://www.slicer.org&quot;&gt;https://www.slicer.org&lt;/a&gt; for details.&lt;/p&gt;
&lt;p&gt;We would also like to express our sincere thanks to members of the Slicer User Community who have helped us to design the contents of this Welcome Module, and whose feedback continues to improve functionality, usability and Slicer user experience.&lt;/p&gt;
&lt;p&gt;This module was developed by Jean-Christophe Fillion-Robin and Julien Finet at Kitware, Inc., and by Wendy Plesniak, Sonia Pujol, Steve Pieper and Ron Kikinis at Brigham and Women's Hospital.&lt;/p&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
<property name="collapsed">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
Expand Down
7 changes: 0 additions & 7 deletions Modules/Loadable/SlicerWelcome/Resources/qSlicerWelcomeModule.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,8 @@
<file>Icons/SlicerWelcome.png</file>
</qresource>
<qresource>
<file>HTML/stylesheet.css</file>
<file>HTML/About.html</file>
<file>Images/WelcomeLogo.png</file>
<file>Images/WelcomeLogo@2x.png</file>
<file>HTML/OtherUsefulHints.html</file>
<file>HTML/Feedback.html</file>
<file>Images/SlicerWWW-Original.png</file>
<file>Images/SlicerAdvancedGear-Original.png</file>
<file>Images/WelcomeSubjectHierarchy.png</file>
<file>HTML/Acknowledgment.html</file>
</qresource>
</RCC>

0 comments on commit ae894ab

Please sign in to comment.