dergeorg/tourplaner
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Setting -> Deutsch / Englisch

Browse Source
This commit is contained in:
Georg Reisinger
2021-04-17 18:43:24 +02:00
parent 63e736152b
commit 58e94e6cbd
5 changed files with 98 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tourplaner/business/ConfigHelper.java
View File

@ -56,7 +56,7 @@ public class ConfigHelper {
* @return Den angeforderten String
*/
public static String getLangIniString(String optionName){
return ConfigHelper.getIniString(ConfigHelper.getStandartLangde(), ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "lang", "lang"),optionName);
return ConfigHelper.getIniString(getIniString(getStandartConfig(), "lang", "lang") + ".ini", ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "lang", "lang"),optionName);
}
/**

4
src/tourplaner/tourplaner.fxml
View File

@ -62,8 +62,8 @@
<CheckMenuItem fx:id="openpdf" mnemonicParsing="false" onAction="#openpdfaction" text="Report automatisch öffnen" />
<Menu mnemonicParsing="false" text="Sprache">
<items>
<RadioMenuItem mnemonicParsing="false" text="Deutsch" />
<RadioMenuItem mnemonicParsing="false" text="Englisch" />
<RadioMenuItem fx:id="langdeutsch" mnemonicParsing="false" onAction="#onlangdeutsch" text="Deutsch" />
<RadioMenuItem fx:id="langenglisch" mnemonicParsing="false" onAction="#onlangenglisch" text="Englisch" />
</items>
</Menu>
</items>

22
src/tourplaner/ui/TourplanerController.java
View File

@ -47,6 +47,18 @@ public class TourplanerController implements Initializable {
public TableColumn<Log, String> logDauerCol, logStreckeCol, logDatumCol, logAvgCol, logHightCol, logPauseCol, logGegangenCol, logBemerkungCol;
//Menue
public CheckMenuItem openmap, openpdf;
public RadioMenuItem langenglisch, langdeutsch;
public ToggleGroup langgroup;
@FXML
private void onlangenglisch(){
ConfigHelper.setIniString(ConfigHelper.getStandartConfig(), "lang", "lang", "langen");
}
@FXML
private void onlangdeutsch(){
ConfigHelper.setIniString(ConfigHelper.getStandartConfig(), "lang", "lang", "langde");
}
@FXML
private void tourReport(){
@ -248,6 +260,16 @@ public class TourplanerController implements Initializable {
}else {
this.openmap.setSelected(false);
}
this.langgroup = new ToggleGroup();
this.langdeutsch.setToggleGroup(this.langgroup);
this.langenglisch.setToggleGroup(this.langgroup);
if(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "lang", "lang").equals("langde")){
this.langdeutsch.setSelected(true);
this.langenglisch.setSelected(false);
}else if(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "lang", "lang").equals("langen")){
this.langdeutsch.setSelected(false);
this.langenglisch.setSelected(true);
}
}
@FXML

20
src/tourplaner/viewmodels/ViewModel.java
View File

@ -500,16 +500,18 @@ public class ViewModel {
* Entfernt eine Tour anhand der ausgewählten Tour
*/
public void delTour(){
try {
if (this.selectedTour != null) {
String tourname = this.selectedTour.getName();
tourData.removeIf(s -> s.getName().equals(tourname));
tourNamen.removeIf(s -> s.equals(tourname));
logData.removeIf(s -> true);
setSelectedTour(null);
TourPlaner.delTour(tourname);
}catch (NullPointerException e){
LogHelper.error(ConfigHelper.getLangIniString("keinetourselected"),
ConfigHelper.getLangIniString("deltournoselect"));
try {
tourData.removeIf(s -> s.getName().equals(tourname));
tourNamen.removeIf(s -> s.equals(tourname));
logData.removeIf(s -> true);
TourPlaner.delTour(tourname);
setSelectedTour(null);
} catch (NullPointerException e) {
LogHelper.error(e);
}
}else {
AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
ConfigHelper.getLangIniString("keinetourselected"),
ConfigHelper.getLangIniString("deltournoselectmsg"));