Commit 2fb491db authored 8 years ago by tobias

Merge branch 'media-folder' into dev-5-1

Conflicts:
	PlayWall/assets/de/tobias/playpad/assets/lang/_de.properties
	PlayWall/src/de/tobias/playpad/Strings.java

parents 1a738949 eb2ace59

No related branches found

No related tags found

Show whitespace changes

Inline Side-by-side

Showing

PlayWall/assets/de/tobias/playpad/assets/dialog/newProjectDialog.fxml 18 additions, 0 deletions

...ets/de/tobias/playpad/assets/dialog/newProjectDialog.fxml
PlayWall/assets/de/tobias/playpad/assets/lang/_de.properties 4 additions, 1 deletion

PlayWall/assets/de/tobias/playpad/assets/lang/_de.properties
PlayWall/assets/de/tobias/playpad/assets/lang/ui_de.properties 9 additions, 1 deletion

...all/assets/de/tobias/playpad/assets/lang/ui_de.properties
PlayWall/assets/de/tobias/playpad/assets/view/option/global/keysTab.fxml 1 addition, 1 deletion

.../de/tobias/playpad/assets/view/option/global/keysTab.fxml
PlayWall/assets/de/tobias/playpad/assets/view/option/project/pathTab.fxml 30 additions, 0 deletions

...de/tobias/playpad/assets/view/option/project/pathTab.fxml
PlayWall/src/de/tobias/playpad/Strings.java 5 additions, 2 deletions

PlayWall/src/de/tobias/playpad/Strings.java
PlayWall/src/de/tobias/playpad/audio/JavaFXAudioHandler.java 8 additions, 12 deletions

PlayWall/src/de/tobias/playpad/audio/JavaFXAudioHandler.java
PlayWall/src/de/tobias/playpad/layout/desktop/DesktopMenuToolbarViewController.java 3 additions, 35 deletions

...ypad/layout/desktop/DesktopMenuToolbarViewController.java
PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java 2 additions, 1 deletion

...bias/playpad/layout/desktop/DesktopPadViewController.java
PlayWall/src/de/tobias/playpad/pad/content/AudioContent.java 3 additions, 2 deletions

PlayWall/src/de/tobias/playpad/pad/content/AudioContent.java
PlayWall/src/de/tobias/playpad/viewcontroller/dialog/NewProjectDialog.java 42 additions, 4 deletions

...obias/playpad/viewcontroller/dialog/NewProjectDialog.java
PlayWall/src/de/tobias/playpad/viewcontroller/main/MainViewControllerV2.java 7 additions, 3 deletions

...ias/playpad/viewcontroller/main/MainViewControllerV2.java
PlayWall/src/de/tobias/playpad/viewcontroller/option/global/GlobalSettingsViewController.java 42 additions, 0 deletions

...ontroller/option/global/GlobalSettingsViewController.java
PlayWall/src/de/tobias/playpad/viewcontroller/option/global/KeysTabViewController.java 14 additions, 4 deletions

...d/viewcontroller/option/global/KeysTabViewController.java
PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/AudioTabViewController.java 14 additions, 7 deletions

...viewcontroller/option/profile/AudioTabViewController.java
PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/DesignTabViewController.java 20 additions, 5 deletions

...iewcontroller/option/profile/DesignTabViewController.java
PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/MappingTabViewController.java 22 additions, 10 deletions

...ewcontroller/option/profile/MappingTabViewController.java
PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/MidiTabViewController.java 0 additions, 7 deletions

.../viewcontroller/option/profile/MidiTabViewController.java
PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/PlayerTabViewController.java 0 additions, 5 deletions

...iewcontroller/option/profile/PlayerTabViewController.java
PlayWall/src/de/tobias/playpad/viewcontroller/option/profile/ProfileSettingsViewController.java 45 additions, 0 deletions

...troller/option/profile/ProfileSettingsViewController.java

with 289 additions and 100 deletions

Please register or to comment