hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fixes #1055] Change 'LOADED' sim status look to 'UPTODATE' look

Browse Source
This commit is contained in:
Sibo Van Gool 2022-02-01 15:40:56 +01:00
parent e4d852e46f
commit b52bcfa0eb
11 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/resources/l10n/messages.properties
View File

@ -503,7 +503,6 @@ simpanel.col.Timetoapogee = Time to apogee
simpanel.col.Flighttime = Flight time
simpanel.col.Groundhitvelocity = Ground hit velocity
simpanel.ttip.uptodate = <i>Up to date</i>
simpanel.ttip.loaded = <i>Data loaded from a file</i>
simpanel.ttip.outdated = <i><font color=\"red\">Data is out of date</font></i><br>Click <i><b>Run simulations</b></i> to simulate.
simpanel.ttip.external = <i>Imported data</i>
simpanel.ttip.notSimulated = <i>Not simulated yet</i><br>Click <i><b>Run simulations</b></i> to simulate.

1
core/resources/l10n/messages_es.properties
View File

@ -1835,7 +1835,6 @@ simpanel.dlg.lbl.DeleteSim2 = <html><i>Esta operaci\u00f3n no puede deshacer
simpanel.dlg.lbl.DeleteSim3 = Borrar las simulaciones
simpanel.lbl.defpref = Puede cambiar la operaci\u00f3n por defecto por las preferencias
simpanel.ttip.external = <i>Datos importados</i>
simpanel.ttip.loaded = <i>Datos recientes.</i>
simpanel.ttip.noData = No hay datos de simulaci\u00f3n disponibles.
simpanel.ttip.noWarnings = <font color="gray">Sin alertas.</font>
simpanel.ttip.notSimulated = <i>A\u00fan no ejecutada</i><br>Seleccione y haga Click en <i><b>Lanzar las simulaciones</b></i> para obtener datos.

1
core/resources/l10n/messages_fr.properties
View File

@ -1827,7 +1827,6 @@ simpanel.dlg.lbl.DeleteSim2 = <html><i>Cette op\u00E9ration n'est pas r\u00E
simpanel.dlg.lbl.DeleteSim3 = Effacer les simulations
simpanel.lbl.defpref = Vous pouvez changer le mode op\u00E9ratoire par d\u00E9faut dans pr\u00E9f\u00E9rences.
simpanel.ttip.external = <i>Donn\u00E9es import\u00E9es</i>
simpanel.ttip.loaded = <i>Donn\u00E9es charg\u00E9es depuis un fichier</i>
simpanel.ttip.noData = Pas de donn\u00E9es de simulations disponible.
simpanel.ttip.noWarnings = <font color="gray">Pas d'avertissements.</font>
simpanel.ttip.notSimulated = <i>Pas encore simul\u00E9</i><br>Cliquez <i><b>Lancer simulations</b></i> pour simuler.

1
core/resources/l10n/messages_ja.properties
View File

@ -395,7 +395,6 @@ simpanel.col.Timetoapogee = \u9060\u5730\u70B9\u306E\u6642\u523B
simpanel.col.Flighttime = \u30D5\u30E9\u30A4\u30C8\u6642\u9593
simpanel.col.Groundhitvelocity = \u5730\u9762\u885D\u7A81\u901F\u5EA6
simpanel.ttip.uptodate = <i>Up to date</i>
simpanel.ttip.loaded = <i>Data loaded from a file</i>
simpanel.ttip.outdated = <i><font color
simpanel.ttip.external = <i>Imported data</i>
simpanel.ttip.notSimulated = <i>Not simulated yet</i><br>Click <i><b>Run simulations</b></i> to simulate.

1
core/resources/l10n/messages_nl.properties
View File

@ -487,7 +487,6 @@ simpanel.col.Timetoapogee = Tijd tot apogee
simpanel.col.Flighttime = Vluchttijd
simpanel.col.Groundhitvelocity = Snelheid bij grondcontact
simpanel.ttip.uptodate = <i>Up-to-date</i>
simpanel.ttip.loaded = <i>Uit een bestand geladen gegevens</i>
simpanel.ttip.outdated = <i><font color=\"red\">Gegevens zijn verouderd</font></i><br>Klik <i><b>Voer simulaties uit</b></i> om te simuleren.
simpanel.ttip.external = <i>Geïmporteerde data</i>
simpanel.ttip.notSimulated = <i>Nog niet gesimuleerd</i><br>Klik <i><b>Voer simulaties uit</b></i> om te simuleren.

1
core/resources/l10n/messages_pt.properties
View File

@ -1780,7 +1780,6 @@ simpanel.dlg.lbl.DeleteSim2 = <html><i>Esta opera\u00e7\u00e3o n\u00e3o pode
simpanel.dlg.lbl.DeleteSim3 = Excluir simula\u00e7\u00f5es
simpanel.lbl.defpref = Voc\u00ea pode alterar a opera\u00e7\u00e3o padr\u00e3o em Prefer\u00eancias.
simpanel.ttip.external = <i>Dados importados </i>
simpanel.ttip.loaded = <i>Dados carregado de um arquivo</i>
simpanel.ttip.noData = N\u00e3o h\u00e1 dados dispon\u00edveis para simula\u00e7\u00e3o.
simpanel.ttip.noWarnings = <font color="gray">Nenhuma advert\u00eancia.</font>
simpanel.ttip.notSimulated = <i>N\u00e3o simulado ainda</i><br>Clique<i><b>Executar simula\u00e7\u00f5es</b></i> para simular.

1
core/resources/l10n/messages_ru.properties
View File

@ -440,7 +440,6 @@ simpanel.col.Timetoapogee = \u0412\u0440\u0435\u043c\u044f \u0434\u043e \u0430\u
simpanel.col.Flighttime = \u0412\u0440\u0435\u043c\u044f \u043f\u043e\u043b\u0435\u0442\u0430
simpanel.col.Groundhitvelocity = \u0421\u043a\u043e\u0440\u043e\u0441\u0442\u044c \u043f\u0440\u0438\u0437\u0435\u043c\u043b\u0435\u043d\u0438\u044f
simpanel.ttip.uptodate = <i>\u0414\u0430\u043d\u043d\u044b\u0435 \u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u044b</i>
simpanel.ttip.loaded = <i>\u0414\u0430\u043d\u043d\u044b\u0435 \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043d\u044b \u0438\u0437 \u0444\u0430\u0439\u043b\u0430</i>
simpanel.ttip.outdated = <i><font color=\"red\">\u0414\u0430\u043d\u043d\u044b\u0435 \u0443\u0441\u0442\u0430\u0440\u0435\u043b\u0438</font></i><br>\u041d\u0430\u0436\u043c\u0438\u0442\u0435 <i><b>\u0412\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0440\u0430\u0441\u0447\u0435\u0442\u044b</b></i> \u0434\u043b\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0440\u0430\u0441\u0447\u0435\u0442\u0430.
simpanel.ttip.external = <i>\u0418\u043c\u043f\u043e\u0440\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435</i>
simpanel.ttip.notSimulated = <i>\u0420\u0430\u0441\u0447\u0435\u0442 \u0435\u0449\u0435 \u043d\u0435 \u0432\u044b\u043f\u043e\u043b\u043d\u044f\u043b\u0441\u044f</i><br>\u041d\u0430\u0436\u043c\u0438\u0442\u0435 <i><b>\u0412\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0440\u0430\u0441\u0447\u0435\u0442\u044b</b></i> \u0434\u043b\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0440\u0430\u0441\u0447\u0435\u0442\u0430.

1
core/resources/l10n/messages_uk_UA.properties
View File

@ -444,7 +444,6 @@ simpanel.col.Timetoapogee = Time to apogee
simpanel.col.Flighttime = Flight time
simpanel.col.Groundhitvelocity = Ground hit velocity
simpanel.ttip.uptodate = <i>Up to date</i>
simpanel.ttip.loaded = <i>Data loaded from a file</i>
simpanel.ttip.outdated = <i><font color=\"red\">Data is out of date</font></i><br>Click <i><b>Run simulations</b></i> to simulate.
simpanel.ttip.external = <i>Imported data</i>
simpanel.ttip.notSimulated = <i>Not simulated yet</i><br>Click <i><b>Run simulations</b></i> to simulate.

1
core/resources/l10n/messages_zh_CN.properties
View File

@ -1928,7 +1928,6 @@ simpanel.dlg.lbl.DeleteSim2 = <html><i>\u8BE5\u64CD\u4F5C\u65E0\u6CD5\u64
simpanel.dlg.lbl.DeleteSim3 = \u5220\u9664\u4EFF\u771F
simpanel.lbl.defpref = \u60A8\u53EF\u5728\u9996\u9009\u9879\u4E2D\u4FEE\u6539\u9ED8\u8BA4\u64CD\u4F5C.
simpanel.ttip.external = <i>\u5BFC\u5165\u7684\u6570\u636E</i>
simpanel.ttip.loaded = <i>\u4ECE\u6587\u4EF6\u8F7D\u5165\u6570\u636E</i>
simpanel.ttip.noData = \u6CA1\u6709\u53EF\u7528\u7684\u4EFF\u771F\u6570\u636E.
simpanel.ttip.noWarnings = <font color="gray">\u6CA1\u6709\u8B66\u544A.</font>
simpanel.ttip.notSimulated = <i>\u672A\u8FDB\u884C\u8FC7\u4EFF\u771F</i><br>\u70B9\u51FB<i><b>\u8FD0\u884C\u4EFF\u771F</b></i>.

5
swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
View File

@ -814,14 +814,11 @@ public class SimulationPanel extends JPanel {
case CANT_RUN:
tip += trans.get("simpanel.ttip.noData")+"<br>";
break;
case LOADED:
case UPTODATE:
tip += trans.get("simpanel.ttip.uptodate") + "<br>";
break;
case LOADED:
tip += trans.get("simpanel.ttip.loaded") + "<br>";
break;
case OUTDATED:
tip += trans.get("simpanel.ttip.outdated") + "<br>";
break;

2
swing/src/net/sf/openrocket/gui/util/Icons.java
View File

@ -33,7 +33,7 @@ public class Icons {
map.put(Simulation.Status.NOT_SIMULATED, loadImageIcon("pix/spheres/gray-16x16.png", "Not simulated"));
map.put(Simulation.Status.CANT_RUN, loadImageIcon("pix/spheres/yellow-16x16.png", "Can't run, no motors assigned."));
map.put(Simulation.Status.UPTODATE, loadImageIcon("pix/spheres/green-16x16.png", "Up to date"));
map.put(Simulation.Status.LOADED, loadImageIcon("pix/spheres/yellow-16x16.png", "Loaded from file"));
map.put(Simulation.Status.LOADED, loadImageIcon("pix/spheres/green-16x16.png", "Up to date"));
map.put(Simulation.Status.OUTDATED, loadImageIcon("pix/spheres/red-16x16.png", "Out-of-date"));
map.put(Simulation.Status.EXTERNAL, loadImageIcon("pix/spheres/blue-16x16.png", "Imported data"));
SIMULATION_STATUS_ICON_MAP = Collections.unmodifiableMap(map);