Skip to content

GitLab

Commit 6b5cbfb4 authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier
Browse files

In "TopographyWindow" and "Online/PostVisualizationWindows", replaced "About"... 

In "TopographyWindow" and "Online/PostVisualizationWindows", replaced "About" button by "Setting" button.
parent a836cbcd
Pipeline #70159 passed with stages
in 64 minutes and 8 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 46 deletions
VadereGui/resources/messages.properties
View file @ 6b5cbfb4
......@@ -62,9 +62,7 @@ ProjectView.btnAbout.tooltip=About
ProjectView.about.title=About
ProjectView.title=Vadere
ProjectView.version= Version {0}
ProjectView.cooperation=Vadere has been developed at the Munich University of Applied Sciences at the department for Computer Science and Mathematics
ProjectView.license.text=This software is licensed under the {0}
ProjectView.aboutDialog.text=Vadere GUI\nVersion: 2.0\nOrganisation: University of Applied Sciences Munich\nManagement-Tool for Vadere Pedestrian Crowd Simulations.
ProjectView.aboutDialog.label=About Vadere
ProjectView.startDialog.label=Vadere GUI
ProjectView.startDialog.text=Create a new Project or load an existing project
......
VadereGui/resources/messages_de_DE.properties
View file @ 6b5cbfb4
......@@ -63,8 +63,6 @@ ProjectView.about.title=\u00dcber
ProjectView.title=Vadere
ProjectView.version= Version {0}
ProjectView.license.text=Dieses Software ist unter der {0} lizenziert
ProjectView.cooperation=Vadere wurde an der Hochschule f\u00FCr angewandte Wissenschaften M\u00FCnchen an der Fakult\u00E4t f\u00FCr Informatik und Mathematik entwickelt
ProjectView.aboutDialog.text=Vadere GUI\nVersion: 2.0\nOrganisation: Hochschule M\u00FCnchen\nManagement-Tool f\u00FCr Vadere Pedestrian Crowd Simulationen.
ProjectView.aboutDialog.label=\u00DCber Vadere
ProjectView.startDialog.label=Vadere GUI
ProjectView.startDialog.text=Erstellen oder laden Sie ein existierendes Projekt
......@@ -205,11 +203,6 @@ PostVis.btnPlay.tooltip=Start
PostVis.btnPause.tooltip=Pause
PostVis.btnStop.tooltip=Stopp
PostVis.btnRecord.tooltip=Starte Aufnahme
PostVis.btnAbout.tooltip=\u00dcber
PostVis.about.title=\u00dcber
PostVis.title=Vadere Post-Visualization
PostVis.version= Version {0}
PostVis.license.text=Dieses Produkt ist unter der {0} lizenziert
PostVis.chbHidePedAtTarget.text=Fu\u00dfg\u00E4nger im Ziel nicht anzeigen
PostVis.chbHideTrajAtTarget.text=Trajektorien am Ziel nicht anzeigen
......
VadereGui/src/org/vadere/gui/onlinevisualization/view/OnlineVisualisationWindow.java
View file @ 6b5cbfb4
......@@ -227,7 +227,8 @@ public class OnlineVisualisationWindow extends JPanel implements Observer {
SwingUtils.addActionToToolbar(toolbar, showPotentialField, Messages.getString("OnlineVis.btnShowPotentialfield.tooltip"));
toolbar.addSeparator();
toolbar.add(Box.createHorizontalGlue());
SwingUtils.addActionToToolbar(toolbar, openSettingsDialog,
Messages.getString("ProjectView.btnSettings.tooltip"));
......
VadereGui/src/org/vadere/gui/postvisualization/view/PostvisualizationWindow.java
View file @ 6b5cbfb4
......@@ -130,25 +130,6 @@ public class PostvisualizationWindow extends JPanel implements Observer {
add(adjustPanel, cc.xy(2, 6));
}
final String test = java.text.MessageFormat.format(Messages.getString("PostVis.about.text"), "0.1");
JButton infoButton = new JButton(new ImageIcon(Resources.class.getResource("/icons/info_icon.png")));
infoButton.setBorderPainted(false);
infoButton.addActionListener(e -> {
String text = "<html><font size =\"5\"><b>"+Messages.getString("PostVis.title") + "</font></b><br>" +
"<font size =\"3\"><em>" + MessageFormat.format(Messages.getString("PostVis.version"), HashGenerator.releaseNumber()) + "</em></font><br>" +
"<font size =\"3\">" + MessageFormat.format(Messages.getString("PostVis.license.text"), "<a href=\"https://www.gnu.org/licenses/lgpl-3.0.txt\">LGPL</a>")+".</font></html>";
JOptionPane.showMessageDialog(null, text,
Messages.getString("PostVis.about.title"),
JOptionPane.INFORMATION_MESSAGE);
});
/*
"<html>" + java.text.MessageFormat.format(Messages.getString("PostVis.about.text"), "0.1")
+ "<a href=\"http://www.gnu.org/licenses/lgpl-3.0.txt/\">a link</a></html>"
*/
int iconHeight = Integer.valueOf(resources.getProperty("ProjectView.icon.height.value"));
int iconWidth = Integer.valueOf(resources.getProperty("ProjectView.icon.width.value"));
addActionToToolbar(toolbar,
......@@ -274,7 +255,7 @@ public class PostvisualizationWindow extends JPanel implements Observer {
model, null, imgOptions);
addActionMenuToToolbar(toolbar, imgDialog, Messages.getString("ProjectView.btnSnapshot.tooltip"));
toolbar.addSeparator(new Dimension(5, 50));
toolbar.add(Box.createHorizontalGlue());
addActionToToolbar(
toolbar,
......@@ -287,11 +268,6 @@ public class PostvisualizationWindow extends JPanel implements Observer {
;
}, "ProjectView.btnSettings.tooltip");
toolbar.add(Box.createHorizontalGlue());
toolbar.add(infoButton);
infoButton.setToolTipText(Messages.getString("PostVis.btnAbout.tooltip"));
menuBar = new JMenuBar();
JMenu mFile = new JMenu(Messages.getString("PostVis.menuFile.title"));
JMenu mEdit = new JMenu(Messages.getString("PostVis.menuSettings.title"));
......
VadereGui/src/org/vadere/gui/topographycreator/view/TopographyWindow.java
View file @ 6b5cbfb4
......@@ -125,14 +125,6 @@ public class TopographyWindow extends JPanel {
int windowHeight = screenSize.height - 250;
int windowWidth = screenSize.width - 250;
JButton infoButton = new JButton(new ImageIcon(Resources.class.getResource("/icons/info_icon.png")));
infoButton.setBorderPainted(false);
infoButton.addActionListener(e -> {
JOptionPane.showMessageDialog(null,
"Scenario Creator\nVersion: 2.0\nCooperation: Hochschule München", "About",
JOptionPane.INFORMATION_MESSAGE);
});
/* basic action */
final TopographyAction basicAction = new ActionBasic("notify", panelModel);
......@@ -313,7 +305,7 @@ public class TopographyWindow extends JPanel {
/* Makros */
ActionTopographyMakroMenu actionTopographyMakroMenu =
new ActionTopographyMakroMenu("TopographyMakros",
new ImageIcon(Resources.class.getResource("/icons/setting32x32.png")),
new ImageIcon(Resources.class.getResource("/icons/auto_generate_ids.png")),
panelModel);
/* Topography checker*/
......@@ -359,8 +351,6 @@ public class TopographyWindow extends JPanel {
toolbar.add(Box.createHorizontalGlue());
addActionToToolbar(toolbar, actionTopographyMakroMenu, "TopographyCreator.btnMakro.tooltip");
addActionToToolbar(toolbar, actionTopographyCheckerMenu, "TopographyCreator.btnChecker.tooltip");
toolbar.add(infoButton);
infoButton.setToolTipText("About");
mainPanel.setBorder(BorderFactory.createLineBorder(Color.red));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment