Merge branch 'dev' into patch-localeOption

Author: SunderB

.github/workflows/build.yml

@@ -1,12 +1,14 @@
 name: Build
 
 on:
+  # Do it on every push or PR on these branches
   push:
     branches: [ dev, main, workflow_dispatch, features/sp-api ]
   pull_request:
     branches: [ dev, main, workflow_dispatch, features/sp-api ]
 
 jobs:
+  # Build Sonic Pi
   build:
     name: "${{matrix.title}} (${{matrix.cc}}, ${{matrix.arch}}, ${{matrix.build_type}})"
     runs-on: ${{matrix.os}}
@@ -83,6 +85,7 @@ jobs:
         otp-version: 23.2.1
       if: matrix.os == 'ubuntu-latest'
 
+      # Install Erlang on MacOS
     - name: Mac Erlang
       continue-on-error: true
       run: |
@@ -91,6 +94,7 @@ jobs:
         brew install erlang
       if: matrix.os == 'macos-latest'
 
+      # Prebuild on Ubuntu
     - name: Prebuild Linux
       working-directory: ${{github.workspace}}/app
       env:
@@ -100,7 +104,8 @@ jobs:
         sudo apt install -y pulseaudio dbus-x11 libssl-dev ruby-dev supercollider-server sc3-plugins-server alsa-utils jackd2 libjack-jackd2-dev libjack-jackd2-0 libasound2-dev librtmidi-dev pulseaudio-module-jack
         ./linux-prebuild.sh --build-aubio
       if: matrix.os == 'ubuntu-latest'
-   
+
+      # Prebuild on Mac
     - name: Prebuild Mac
       working-directory: ${{github.workspace}}/app
       env:
@@ -110,6 +115,7 @@ jobs:
         ./mac-prebuild.sh
       if: matrix.os == 'macos-latest'
 
+    # Prebuild on Windows
     # Note that we 'hide' the msys folders on windows to stop conflicts when building 
     # Flac
     - name: Prebuild Windows
@@ -125,7 +131,8 @@ jobs:
 
       #- name: Setup tmate session
       # uses: mxschmitt/action-tmate@v3
-        
+
+      # Run Configuration Config on Ubuntu
     - name: Config Linux
       working-directory: ${{github.workspace}}/app
       env:
@@ -134,7 +141,8 @@ jobs:
       run: |
         ./linux-config.sh
       if: matrix.os == 'ubuntu-latest'
-    
+
+      # Run Configuration Config on Mac
     - name: Config Mac
       working-directory: ${{github.workspace}}/app
       env:
@@ -143,7 +151,8 @@ jobs:
       run: |
         ./mac-config.sh
       if: matrix.os == 'macos-latest'
-    
+
+      # Run Configuration Config on Windows
     - name: Config Windows
       working-directory: ${{github.workspace}}/app
       shell: cmd
@@ -154,6 +163,7 @@ jobs:
         win-config.bat
       if: matrix.os == 'windows-latest'
 
+    # Finally: Build
     - name: Do build
       working-directory: ${{github.workspace}}/app/build
       run: cmake --build . --config ${{ matrix.build_type }}

BUILD-LINUX.md

@@ -127,8 +127,8 @@ cmake --build . --config Release
 ## 4. Start Sonic Pi
 
 Finally, you can run your newly compiled `Sonic Pi` app within the `build`
-directly either by double clicking it in the Finder or via the terminal
-(from within the `build` directory):
+directly either by double clicking it in your file manager or via the terminal
+(from within the `build/gui/qt/sonic-pi` directory):
 
 ```
 ./sonic-pi

app/CMakeLists.txt

@@ -11,8 +11,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-#set (QT_OLD_API 1)
-
 if(APPLE)
   set(CMAKE_OSX_DEPLOYMENT_TARGET '10.13')
 endif()
@@ -38,4 +36,3 @@ configure_file(${APP_ROOT}/cmake/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
 add_subdirectory(api)
 add_subdirectory(api-tests)
 add_subdirectory(gui)
-

app/gui/qt/CMakeLists.txt

@@ -46,39 +46,12 @@ add_subdirectory(QScintilla-2.11.6)
 set(APP_NAME sonic-pi)
 set(MACOS_APP_NAME "Sonic Pi")
 
-if (QT_OLD_API)
-set(OLD_API_SOURCES
-    ${QTAPP_ROOT}/osc/oschandler.cpp
-    ${QTAPP_ROOT}/osc/oscsender.cpp
-    ${QTAPP_ROOT}/osc/sonic_pi_osc_server.cpp
-    ${QTAPP_ROOT}/osc/sonic_pi_udp_osc_server.cpp
-    ${QTAPP_ROOT}/osc/sonic_pi_tcp_osc_server.cpp
-    ${QTAPP_ROOT}/osc/oscpkt.hh
-    ${QTAPP_ROOT}/osc/udp.hh
-    ${QTAPP_ROOT}/osc/oschandler.h
-    ${QTAPP_ROOT}/osc/oscsender.h
-    ${QTAPP_ROOT}/osc/sonic_pi_osc_server.h
-    ${QTAPP_ROOT}/osc/sonic_pi_udp_osc_server.h
-    ${QTAPP_ROOT}/osc/sonic_pi_tcp_osc_server.h
-    
-    ${QTAPP_ROOT}/visualizer/scope.cpp
-    ${QTAPP_ROOT}/visualizer/scope.h
-    ${QTAPP_ROOT}/visualizer/scope_buffer.hpp
-    ${QTAPP_ROOT}/visualizer/server_shm.hpp
-
-    ${APP_ROOT}/external/kiss_fft/kiss_fft.c
-    ${APP_ROOT}/external/kiss_fft/kiss_fft.h
-    )
-endif()
-
-if (NOT QT_OLD_API)
-set(NEW_API_SOURCES 
+set(NEW_API_SOURCES
     ${QTAPP_ROOT}/qt_api_client.cpp
     ${QTAPP_ROOT}/qt_api_client.h
     ${QTAPP_ROOT}/visualizer/scope_window.cpp
     ${QTAPP_ROOT}/visualizer/scope_window.h
     )
-endif()
 
 set(EDITOR_SOURCES
     ${QTAPP_ROOT}/widgets/sonicpiscintilla.cpp

app/gui/qt/html/doc.html

@@ -15,7 +15,7 @@
  code_as <span class="highlight">:art</span></pre>
     </p>
 
-    <p class="version">v3.3.1</p>
+    <p class="version">v3.4-dev</p>
 
   </center>
 

app/gui/qt/html/info.html

@@ -29,6 +29,6 @@
 
     <br/>
 
-    <p class="version">v3.3.1</p>
+    <p class="version">v3.4-dev</p>
   </center>
 </body>

app/gui/qt/images/splash.png

@@ -808,7 +808,7 @@ Entschuldigung, beim Start trat ein kritischer Fehler auf</translation>
     <message>
         <location filename="../mainwindow.cpp" line="2957"/>
         <source>Show Cue Log</source>
-        <translation type="unfinished"></translation>
+        <translation>Cue Log zeigen</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="2962"/>
@@ -871,7 +871,7 @@ Get Sonic Pi %1</source>
     <message>
         <location filename="../mainwindow.cpp" line="3864"/>
         <source>Line: %1,  Position: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeile: %1, Position: %2</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="2515"/>
@@ -1132,7 +1132,7 @@ Get Sonic Pi %1</source>
     <message>
         <location filename="../widgets/settingswidget.cpp" line="41"/>
         <source>Visuals</source>
-        <translation type="unfinished">Anzeigen</translation>
+        <translation>Visualisierung</translation>
     </message>
     <message>
         <location filename="../widgets/settingswidget.cpp" line="44"/>
@@ -1279,7 +1279,7 @@ to and from other programs or computers
     <message>
         <location filename="../widgets/settingswidget.cpp" line="171"/>
         <source>Allow OSC from other computers</source>
-        <translation type="unfinished"></translation>
+        <translation>OSC von anderen Computern erlauben</translation>
     </message>
     <message>
         <location filename="../widgets/settingswidget.cpp" line="172"/>
@@ -1296,7 +1296,7 @@ to and from other programs or computers
     <message>
         <location filename="../widgets/settingswidget.cpp" line="285"/>
         <source>Show code completion</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeige Codevervollständigung</translation>
     </message>
     <message>
         <location filename="../widgets/settingswidget.cpp" line="397"/>
@@ -1466,7 +1466,7 @@ Sonic Pi, die über die midi_* fns gesendet werden können</translation>
     <message>
         <location filename="../widgets/settingswidget.cpp" line="288"/>
         <source>Show code context</source>
-        <translation type="unfinished"></translation>
+        <translation>Code-Kontext anzeigen</translation>
     </message>
     <message>
         <location filename="../widgets/settingswidget.cpp" line="289"/>