diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89d7503..4f01d76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.16.0)
project(pipedal
- VERSION 1.3.59
+ VERSION 1.3.60
DESCRIPTION "PiPedal Guitar Effect Pedal For Raspberry Pi"
HOMEPAGE_URL "https://rerdavies.github.io/pipedal"
)
-set (DISPLAY_VERSION "PiPedal v1.3.59-Release")
+set (DISPLAY_VERSION "PiPedal v1.3.60-Release")
set (PACKAGE_ARCHITECTURE "arm64")
set (CMAKE_INSTALL_PREFIX "/usr/")
diff --git a/README.md b/README.md
index 16fe6df..a3fc0f5 100644
--- a/README.md
+++ b/README.md
@@ -6,13 +6,13 @@
-Download: v1.3.59
+Download: v1.3.60
Website: [https://rerdavies.github.io/pipedal](https://rerdavies.github.io/pipedal).
Documentation: [https://rerdavies.github.io/pipedal/Documentation.html](https://rerdavies.github.io/pipedal/Documentation.html).
-#### NEW version 1.3.59 Release, providing [snapshots](https://rerdavies.github.io/pipedal/Snaphots.html), and a new Performance View. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.
+#### NEW version 1.3.60 Release, providing [snapshots](https://rerdavies.github.io/pipedal/Snaphots.html), and a new Performance View. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.
diff --git a/docs/Installing.md b/docs/Installing.md
index 4855311..4af51c5 100644
--- a/docs/Installing.md
+++ b/docs/Installing.md
@@ -13,17 +13,17 @@ page_icon: img/Install4.jpg
Download the most recent Debian (.deb) package for your platform:
-- [Raspberry Pi OS bookworm (64-bit) v1.3.59](https://github.com/rerdavies/pipedal/releases/download/)
+- [Raspberry Pi OS bookworm (64-bit) v1.3.60](https://github.com/rerdavies/pipedal/releases/download/)
- [Ubuntu/Raspberry Pi OS bullseyeye (64-bit) v1.2.31](https://github.com/rerdavies/pipedal/releases/download/v1.1.31/pipedal_1.1.31_arm64.deb)
-Version 1.3.59 has not yet been tested on Ubuntu or Raspberry Pi OS bullseye. On these platforms, we recommend that you use version 1.1.31.
+Version 1.3.60 has not yet been tested on Ubuntu or Raspberry Pi OS bullseye. On these platforms, we recommend that you use version 1.1.31.
Install the package by running
```
sudo apt update
cd ~/Downloads
- sudo apt-get install pipedal_1.3.59_arm64.deb
+ sudo apt-get install pipedal_1.3.60_arm64.deb
```
Adjust accordingly if you have downloaded v1.1.31.
diff --git a/docs/ReleaseNotes.md b/docs/ReleaseNotes.md
index 8ab10d2..57112d0 100644
--- a/docs/ReleaseNotes.md
+++ b/docs/ReleaseNotes.md
@@ -1,5 +1,13 @@
# Release Notes
+## PiPedal 1.3.60 Release
+
+Bug fixes:
+- Uploading of preset and bank files now work properly.
+- Uploaded plugin presets are merged with existing presets, instead of overwriting existing presets.
+
+(re-issue of v1.3.58)
+
## PiPedal 1.3.59 Release
20% performance improvement when using Toob Neural Amp Modeller with large Wavenet models.
diff --git a/docs/download.md b/docs/download.md
index f858180..ab98513 100644
--- a/docs/download.md
+++ b/docs/download.md
@@ -4,7 +4,7 @@
Download the most recent Debian (.deb) package for your platform:
-- Raspberry Pi OS Bookworm (64-bit) v1.3.59
+- Raspberry Pi OS Bookworm (64-bit) v1.3.60
Install the package by running
@@ -12,7 +12,7 @@ Install the package by running
```
sudo apt update
cd ~/Downloads
- sudo apt-get install ./pipedal_1.3.59_arm64.deb
+ sudo apt-get install ./pipedal_1.3.60_arm64.deb
```
Follow the instructions in [_Configuring PiPedal After Installation_](https://rerdavies.github.io/pipedal/Configuring.html) to complete the installation.
diff --git a/docs/index.md b/docs/index.md
index dcb02f7..76bb850 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,7 +1,7 @@
-v1.3.59
+v1.3.60
@@ -9,7 +9,7 @@ To download PiPedal, click [here](download.md).
To view PiPedal documentation, click [here](Documentation.md).
-#### NEW version 1.3.59 Release. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.
+#### NEW version 1.3.60 Release. See the [release notes](https://rerdavies.github.io/pipedal/ReleaseNotes) for details.
diff --git a/react/src/PluginPresetsDialog.tsx b/react/src/PluginPresetsDialog.tsx
index 9e012c9..0ab5dac 100644
--- a/react/src/PluginPresetsDialog.tsx
+++ b/react/src/PluginPresetsDialog.tsx
@@ -354,7 +354,7 @@ const PluginPresetsDialog = withStyles(styles, { withTheme: true })(
let pluginUri = this.getPluginUri();
let plugin = this.model.getUiPlugin(pluginUri);
if (plugin) {
- title = "Presets - " + plugin.name;
+ title = "Plugin Presets - " + plugin.name;
}
@@ -440,7 +440,7 @@ const PluginPresetsDialog = withStyles(styles, { withTheme: true })(
- Download presets
+ Download plugin presets
@@ -449,7 +449,7 @@ const PluginPresetsDialog = withStyles(styles, { withTheme: true })(
- Upload presets
+ Upload plugin presets
diff --git a/react/src/SnapshotDialog.tsx b/react/src/SnapshotDialog.tsx
index 8c1b973..9207334 100644
--- a/react/src/SnapshotDialog.tsx
+++ b/react/src/SnapshotDialog.tsx
@@ -35,6 +35,7 @@ import ResizeResponsiveComponent from './ResizeResponsiveComponent';
import { TransitionProps } from '@mui/material/transitions';
import Fade from '@mui/material/Fade';
+import Slide from '@mui/material/Slide';
import SnapshotPanel from './SnapshotPanel';
const styles = {
@@ -45,7 +46,7 @@ const styles = {
};
-const Transition = React.forwardRef(function Transition(
+const FadeTransition = React.forwardRef(function Transition(
props: TransitionProps & {
children: React.ReactElement;
},
@@ -55,6 +56,17 @@ const Transition = React.forwardRef(function Transition(
});
+const SlideTransition = React.forwardRef(function Transition(
+ props: TransitionProps & {
+ children: React.ReactElement;
+ },
+ ref: React.Ref,
+ ) {
+ return ;
+ });
+
+
+
export interface SnapshotDialogProps {
open: boolean,
@@ -100,11 +112,10 @@ export default class SnapshotDialog extends ResizeResponsiveComponent this.props.onOk()} fullScreen={this.state.fullScreen}
- TransitionComponent={Transition} keepMounted
+ TransitionComponent={this.state.fullScreen? SlideTransition: FadeTransition} keepMounted
style={{ userSelect: "none", }}
PaperProps={{
style: {
- maxWidth: '1000px'
},
}}