Merge pull request #34 from scratchcpp/turbo_mode_option

Add turbo mode option

Author: adazem009

build/module.cmake

@@ -20,6 +20,8 @@ set(QML_IMPORT_PATH "${QML_IMPORT_PATH};${CMAKE_CURRENT_LIST_DIR}"
 )
 
 target_link_libraries(${MODULE} PRIVATE ${QT_LIBS})
+target_include_directories(${MODULE} PRIVATE ${PROJECT_SOURCE_DIR}/src)
+target_include_directories(${MODULE} PRIVATE ${PROJECT_SOURCE_DIR}/src/global)
 
 list(APPEND QML_IMPORT_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 list(REMOVE_DUPLICATES QML_IMPORT_PATH)

res/icons/CMakeLists.txt

@@ -10,5 +10,6 @@ qt_add_resources(
     PREFIX "/icons/scratchcpp/32x32"
     FILES
         green_flag.svg
-	stop.svg
+        stop.svg
+        turbo.svg
 )

res/icons/turbo.svg

@@ -2,3 +2,4 @@ add_subdirectory(app)
 
 add_subdirectory(global)
 add_subdirectory(uicomponents)
+add_subdirectory(keyboard)

src/CMakeLists.txt

@@ -21,7 +21,7 @@ AppMenuBar::AppMenuBar(QObject *parent) :
 
     // File menu
     m_fileMenu = new MenuModel(m_model);
-    m_fileMenu->setTitle(tr("File"));
+    m_fileMenu->setTitle(tr("&File"));
     m_model->addMenu(m_fileMenu);
 
     // File -> Open
@@ -33,6 +33,19 @@ AppMenuBar::AppMenuBar(QObject *parent) :
 #ifdef Q_OS_WASM
     connect(m_openFileDialog, &FileDialog::fileContentReady, this, &AppMenuBar::loadOpenedFile);
 #endif
+
+    // Edit menu
+    m_editMenu = new MenuModel(m_model);
+    m_editMenu->setTitle(tr("&Edit"));
+    m_model->addMenu(m_editMenu);
+
+    // Edit -> Turbo mode
+    m_turboModeItem = new MenuItemModel(m_editMenu);
+    m_turboModeItem->setText(tr("Turbo Mode"));
+    m_turboModeItem->setCheckable(true);
+    m_turboModeItem->setChecked(false);
+    m_editMenu->addItem(m_turboModeItem);
+    connect(m_turboModeItem, &MenuItemModel::checkedChanged, this, &AppMenuBar::turboModeChanged);
 }
 
 MenuBarModel *AppMenuBar::model() const
@@ -68,3 +81,16 @@ void AppMenuBar::loadOpenedFile(const QByteArray &content)
         qWarning("Failed to create temporary file.");
 }
 #endif
+
+bool AppMenuBar::turboMode() const
+{
+    return m_turboModeItem->checked();
+}
+
+void AppMenuBar::setTurboMode(bool newTurboMode)
+{
+    if (m_turboModeItem->checked() == newTurboMode)
+        return;
+
+    m_turboModeItem->setChecked(newTurboMode);
+}

src/app/appmenubar.cpp

@@ -27,15 +27,20 @@ class AppMenuBar : public QObject
         QML_ELEMENT
         QML_SINGLETON
         Q_PROPERTY(uicomponents::MenuBarModel *model READ model NOTIFY modelChanged)
+        Q_PROPERTY(bool turboMode READ turboMode WRITE setTurboMode NOTIFY turboModeChanged)
 
     public:
         explicit AppMenuBar(QObject *parent = nullptr);
 
         uicomponents::MenuBarModel *model() const;
 
+        bool turboMode() const;
+        void setTurboMode(bool newTurboMode);
+
     signals:
         void modelChanged();
         void fileOpened(const QString &fileName);
+        void turboModeChanged();
 
     private:
         void openFile();
@@ -44,10 +49,14 @@ class AppMenuBar : public QObject
 #endif
 
         uicomponents::MenuBarModel *m_model = nullptr;
+
         uicomponents::MenuModel *m_fileMenu = nullptr;
         uicomponents::MenuItemModel *m_openFileItem = nullptr;
         uicomponents::FileDialog *m_openFileDialog = nullptr;
         QTemporaryFile *m_tmpFile = nullptr;
+
+        uicomponents::MenuModel *m_editMenu = nullptr;
+        uicomponents::MenuItemModel *m_turboModeItem = nullptr;
 };
 
 } // namespace scratchcpp

src/app/appmenubar.h

@@ -1,12 +1,16 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 #include "app.h"
+#include "globalmodule.h"
+#include "keyboard/keyboardmodule.h"
 
 using namespace scratchcpp;
 
 int main(int argc, char *argv[])
 {
     App app;
+    app.addModule(new GlobalModule);
+    app.addModule(new keyboard::KeyboardModule);
 
     return app.run(argc, argv);
 }

src/app/main.cpp

@@ -6,6 +6,7 @@ import QtQuick.Layouts
 import ScratchCPP
 import ScratchCPP.UiComponents
 import ScratchCPP.Render
+import ScratchCPP.Keyboard
 
 ApplicationWindow {
     id: root
@@ -40,12 +41,17 @@ ApplicationWindow {
             Layout.fillWidth: true
 
             CustomToolButton {
+                id: greenFlagButton
                 icon.name: "green_flag"
                 icon.color: "transparent"
                 onClicked: {
-                    player.stop()
-                    player.start()
-                    player.forceActiveFocus(Qt.TabFocusReason);
+                    if (KeyboardInfo.keyboardModifiers() === Qt.ShiftModifier)
+                        AppMenuBar.turboMode = !AppMenuBar.turboMode
+                    else {
+                        player.stop()
+                        player.start()
+                        player.forceActiveFocus(Qt.TabFocusReason);
+                    }
                 }
             }
 
@@ -57,6 +63,22 @@ ApplicationWindow {
                 }
             }
 
+            IconLabel {
+                icon.name: "turbo"
+                icon.color: "transparent"
+                text: qsTr("Turbo Mode")
+                color: Qt.rgba(1, 0.67, 0.1, 1)
+                visible: AppMenuBar.turboMode
+
+                font {
+                    // Reuse the font from the green flag button
+                    family: greenFlagButton.font.family
+                    capitalization: Font.MixedCase
+                    pointSize: 8
+                    bold: true
+                }
+            }
+
             TextField {
                 id: urlField
                 Layout.fillWidth: true
@@ -78,6 +100,7 @@ ApplicationWindow {
             activeFocusOnTab: true
             focus: true
             spriteFencing: false
+            turboMode: AppMenuBar.turboMode
             stageRect.border.color: Material.theme == Material.Dark ? Qt.rgba(1, 1, 1, 0.15) : Qt.rgba(0, 0, 0, 0.15)
             stageRect.border.width: 5
         }

src/app/main.qml

@@ -0,0 +1,11 @@
+set(MODULE keyboard)
+set(MODULE_URI Keyboard)
+set(MODULE_SRC
+    keyboardmodule.cpp
+    keyboardmodule.h
+    ikeyboardinfo.h
+    internal/keyboardinfo.cpp
+    internal/keyboardinfo.h
+)
+
+include(${PROJECT_SOURCE_DIR}/build/module.cmake)

src/keyboard/CMakeLists.txt

@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include <modularity/ioc.h>
+#include <Qt>
+
+namespace scratchcpp::keyboard
+{
+
+class IKeyboardInfo : MODULE_EXPORT_INTERFACE
+{
+    public:
+        virtual ~IKeyboardInfo() { }
+
+        virtual Qt::KeyboardModifiers keyboardModifiers() const = 0;
+};
+
+} // namespace scratchcpp::keyboard