Merge pull request #47 from scratchcpp/mute

Add mute option

Author: adazem009

res/icons/CMakeLists.txt

@@ -12,4 +12,5 @@ qt_add_resources(
         green_flag.svg
         stop.svg
         turbo.svg
+        mute.svg
 )

res/icons/mute.svg

@@ -55,6 +55,14 @@ AppMenuBar::AppMenuBar(QObject *parent) :
     m_editMenu->addItem(m_fps60ModeItem);
     connect(m_fps60ModeItem, &MenuItemModel::checkedChanged, this, &AppMenuBar::fps60ModeChanged);
 
+    // Edit -> Mute
+    m_muteItem = new MenuItemModel(m_editMenu);
+    m_muteItem->setText(tr("Mute"));
+    m_muteItem->setCheckable(true);
+    m_muteItem->setChecked(false);
+    m_editMenu->addItem(m_muteItem);
+    connect(m_muteItem, &MenuItemModel::checkedChanged, this, &AppMenuBar::muteChanged);
+
     // Edit -> Project settings
     m_projectSettingsItem = new MenuItemModel(m_editMenu);
     m_projectSettingsItem->setText(tr("Project settings..."));
@@ -133,3 +141,17 @@ void AppMenuBar::setFps60Mode(bool newFps60Mode)
     m_fps60ModeItem->setChecked(newFps60Mode);
     emit fps60ModeChanged();
 }
+
+bool AppMenuBar::mute() const
+{
+    return m_muteItem->checked();
+}
+
+void AppMenuBar::setMute(bool newMute)
+{
+    if (m_muteItem->checked() == newMute)
+        return;
+
+    m_muteItem->setChecked(newMute);
+    emit muteChanged();
+}

src/app/appmenubar.cpp

@@ -29,6 +29,7 @@ class AppMenuBar : public QObject
         Q_PROPERTY(uicomponents::MenuBarModel *model READ model NOTIFY modelChanged)
         Q_PROPERTY(bool turboMode READ turboMode WRITE setTurboMode NOTIFY turboModeChanged)
         Q_PROPERTY(bool fps60Mode READ fps60Mode WRITE setFps60Mode NOTIFY fps60ModeChanged)
+        Q_PROPERTY(bool mute READ mute WRITE setMute NOTIFY muteChanged)
 
     public:
         explicit AppMenuBar(QObject *parent = nullptr);
@@ -41,11 +42,15 @@ class AppMenuBar : public QObject
         bool fps60Mode() const;
         void setFps60Mode(bool newFps60Mode);
 
+        bool mute() const;
+        void setMute(bool newMute);
+
     signals:
         void modelChanged();
         void fileOpened(const QString &fileName);
         void turboModeChanged();
         void fps60ModeChanged();
+        void muteChanged();
         void projectSettingsTriggered();
         void aboutAppTriggered();
 
@@ -65,6 +70,7 @@ class AppMenuBar : public QObject
         uicomponents::MenuModel *m_editMenu = nullptr;
         uicomponents::MenuItemModel *m_turboModeItem = nullptr;
         uicomponents::MenuItemModel *m_fps60ModeItem = nullptr;
+        uicomponents::MenuItemModel *m_muteItem = nullptr;
         uicomponents::MenuItemModel *m_projectSettingsItem = nullptr;
 
         uicomponents::MenuModel *m_helpMenu = nullptr;

src/app/appmenubar.h

@@ -79,6 +79,10 @@ ApplicationWindow {
                             AppMenuBar.fps60Mode = !AppMenuBar.fps60Mode
                             break;
 
+                        case Qt.ControlModifier:
+                            AppMenuBar.mute = !AppMenuBar.mute
+                            break;
+
                         default:
                             player.stop()
                             player.start()
@@ -96,6 +100,13 @@ ApplicationWindow {
                 }
             }
 
+            IconLabel {
+                icon.name: "mute"
+                icon.color: "transparent"
+                text: ""
+                visible: AppMenuBar.mute
+            }
+
             IconLabel {
                 icon.name: "turbo"
                 icon.color: "transparent"
@@ -141,6 +152,7 @@ ApplicationWindow {
             activeFocusOnTab: true
             focus: true
             turboMode: AppMenuBar.turboMode
+            mute: AppMenuBar.mute
         }
     }
 }