Skip to content

Commit

Permalink
minor text changes
Browse files Browse the repository at this point in the history
  • Loading branch information
dsmunev committed Jun 23, 2021
1 parent e9fb506 commit 59ddfe4
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 9 deletions.
5 changes: 2 additions & 3 deletions help/en/HelpSet.hs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"http://java.sun.com/products/javahelp/helpset_1_0.dtd">

<helpset version="1.0">
<title>ADDA GUI Help</title>
<title>ADDA GUI Help [beta version, under developing]</title>
<maps>
<mapref location="Map.jhm"/>
<homeID>introduction</homeID>
Expand All @@ -29,11 +29,10 @@
<size width="1024" height="700" />
<location x="200" y="200" />
<image>icon</image>
<title>ADDA GUI Help</title>
<title>ADDA GUI Help [beta version, under developing]</title>
<toolbar>
<helpaction>javax.help.BackAction</helpaction>
<helpaction>javax.help.ForwardAction</helpaction>

</toolbar>
</presentation>
</helpset>
2 changes: 1 addition & 1 deletion help/en/TOC.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<toc>
<tocitem text="ADDA GUI Help">
<tocitem text="ADDA GUI Help [beta version, under developing]">
<tocitem target="introduction" text="Introduction" />
<tocitem target="using_the_manual" text="Using the Manual" />
<tocitem target="running_adda" text="Running ADDA">
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/adda/Context.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@

public class Context {

public static final String VERSION = "beta0.2.1";

protected JFrame mainFrame;

protected MainForm mainForm;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/adda/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void run() {



JFrame frame = new JFrame(" ADDA GUI");
JFrame frame = new JFrame(" ADDA GUI ["+ Context.VERSION + "]");
MainForm app = new MainForm();
app.setLoadingVisible(true);
app.getShortcutPanel().setBorder(BorderFactory.createMatteBorder(0, 0, 1, 0, Color.lightGray));
Expand Down Expand Up @@ -165,7 +165,7 @@ public void actionPerformed(ActionEvent e) {
helpMenu.add(openHelpSystem);
final JMenuItem about = new JMenuItem("About");
about.addActionListener(e -> {
JOptionPane.showMessageDialog(null, "<html>Version <b>0.1beta</b>.<br> Use [email protected] to contact dev team</html>");
JOptionPane.showMessageDialog(null, "<html>Version <b>" + Context.VERSION +"</b>.<br> Use [email protected] to contact dev team</html>");
});
helpMenu.add(about);

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/adda/help/HelpProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ public static String getShortDescByID(String id) {
"specifying scattere...");

case "predefined_shapes":
return StringHelper.toDisplayString("Predefined" +
return StringHelper.toDisplayString("Predefined " +
"shapes are initialized by the command line option...");

case "granule_generator":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ private JButton createZeroButton() {

fileOpenButton.addActionListener(e -> {
JFileChooser fileChooser = new JFileChooser();
fileChooser.setDialogTitle("ADDA orientation average");//todo localization
fileChooser.setDialogTitle(StringHelper.toDisplayString("Project directory"));//todo localization
FileNameExtensionFilter filter = new FileNameExtensionFilter("ADDA config", "dat");
fileChooser.setFileFilter(filter);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public void setShapeRefractiveIndexesCount(int shapeRefractiveIndexesCount) {


public RefractiveIndexAggregatorModel() {
setLabel("Refractive indexes");//todo localization
setLabel(StringHelper.toDisplayString("Refractive indices"));//todo localization
SwingUtilities.invokeLater(() -> {
shapeBoxes.forEach(BoxBase::init);
granulBox.init();
Expand Down

0 comments on commit 59ddfe4

Please sign in to comment.