Add tTouchBarActionItem

theCheeseboard · Sep 14, 2023 · 091463e · 091463e
1 parent a5f6a23
commit 091463e
Show file tree

Hide file tree

Showing 29 changed files with 268 additions and 0 deletions.
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -119,6 +119,7 @@ cntp_sourcelist(
         touchbar/ttouchbarsegmentedcontrolitem.cpp
         touchbar/ttouchbarlabelitem.cpp
         touchbar/tcompositetouchbar.cpp
+        touchbar/ttouchbaractionitem.cpp
         touchbar/ttouchbargroupitem.cpp
 
         taboutdialog.ui
@@ -214,6 +215,7 @@ cntp_sourcelist(
         touchbar/tcompositetouchbar.h
         touchbar/ttouchbargroupitem.h
         touchbar/ttouchbardialogalertitem.h
+        touchbar/ttouchbaractionitem.h
         touchbar/ttouchbar_forwarddeclares.h
 
         tsettingswindow/tsettingswindow.h

diff --git a/lib/touchbar/ttouchbar.cpp b/lib/touchbar/ttouchbar.cpp
@@ -62,4 +62,7 @@ void tTouchBar::invalidateTouchBar() {
 NSTouchBar* tTouchBar::makeTouchBar() {
     return nullptr;
 }
+
+void tTouchBar::addCustomizationMenuItem(QMenu* menu) {
+}
 #endif
diff --git a/lib/touchbar/ttouchbar.h b/lib/touchbar/ttouchbar.h
@@ -11,12 +11,15 @@ struct tTouchBarPrivate;
 class tTouchBarPopoverItem;
 class tTouchBarGroupItem;
 class QAction;
+class QMenu;
 class tTouchBar : public QObject {
         Q_OBJECT
     public:
         explicit tTouchBar(QObject* parent = nullptr);
         ~tTouchBar();
 
+        static void addCustomizationMenuItem(QMenu* menu);
+
         virtual void attach(QWidget* widget);
         virtual void detach();
 

diff --git a/lib/touchbar/ttouchbar_objc.mm b/lib/touchbar/ttouchbar_objc.mm
@@ -5,6 +5,7 @@
 #include "private/ttouchbar_p.h"
 #include "ranges/trange.h"
 #include <QWidget>
+#include <QMenu>
 
 @interface TTouchBarMainWindowDelegate: NSResponder<NSTouchBarDelegate, NSApplicationDelegate, NSWindowDelegate>
 @property QWidget* parent;
@@ -145,3 +146,13 @@ - (void)forwardInvocation: (NSInvocation *)invocation {
 {
     return [d->delegate makeTouchBar];
 }
+
+
+void tTouchBar::addCustomizationMenuItem(QMenu *menu)
+{
+    NSMenuItem *customizeTouchBarItem = [[NSMenuItem alloc] initWithTitle:tr("Customize Touch Bar...").toNSString()
+                                                                   action:@selector(toggleTouchBarCustomizationPalette:)
+                                                            keyEquivalent:@""];
+    [customizeTouchBarItem setTarget:nil];
+    [menu->toNSMenu() addItem:customizeTouchBarItem];
+}
diff --git a/lib/touchbar/ttouchbaractionitem.cpp b/lib/touchbar/ttouchbaractionitem.cpp
@@ -0,0 +1,39 @@
+#include "ttouchbaractionitem.h"
+
+#include <QAction>
+
+struct tTouchBarActionItemPrivate {
+        QAction* action;
+        QIcon icon;
+};
+
+tTouchBarActionItem::tTouchBarActionItem(QString identifier, QAction* action, QString customizationLabel, QIcon icon, QObject* parent) :
+    tTouchBarButtonItem{identifier, customizationLabel.isEmpty() ? action->text() : customizationLabel, parent} {
+    d = new tTouchBarActionItemPrivate();
+    d->action = action;
+    d->icon = icon;
+
+    connect(action, &QAction::changed, this, &tTouchBarActionItem::updateItem);
+    connect(action, &QAction::enabledChanged, this, &tTouchBarActionItem::setEnabled);
+    connect(this, &tTouchBarActionItem::clicked, action, &QAction::trigger);
+
+    this->updateItem();
+}
+
+tTouchBarActionItem::~tTouchBarActionItem() {
+    delete d;
+}
+
+void tTouchBarActionItem::setTouchBarIcon(QIcon touchBarIcon) {
+    d->icon = touchBarIcon;
+    this->updateItem();
+}
+
+QIcon tTouchBarActionItem::touchBarIcon() {
+    return d->icon;
+}
+
+void tTouchBarActionItem::updateItem() {
+    this->setText(d->action->text());
+    this->setIcon(d->icon.isNull() ? d->action->icon() : d->icon);
+}
diff --git a/lib/touchbar/ttouchbaractionitem.h b/lib/touchbar/ttouchbaractionitem.h
@@ -0,0 +1,26 @@
+#ifndef TTOUCHBARACTIONITEM_H
+#define TTOUCHBARACTIONITEM_H
+
+#include "ttouchbarbuttonitem.h"
+#include <QIcon>
+
+class QAction;
+struct tTouchBarActionItemPrivate;
+class tTouchBarActionItem : public tTouchBarButtonItem {
+        Q_OBJECT
+    public:
+        explicit tTouchBarActionItem(QString identifier, QAction* action, QString customizationLabel = "", QIcon icon = {}, QObject* parent = nullptr);
+        ~tTouchBarActionItem();
+
+        void setTouchBarIcon(QIcon touchBarIcon);
+        QIcon touchBarIcon();
+
+    signals:
+
+    private:
+        tTouchBarActionItemPrivate* d;
+
+        void updateItem();
+};
+
+#endif // TTOUCHBARACTIONITEM_H
diff --git a/lib/translations/ar_SA.ts b/lib/translations/ar_SA.ts
@@ -812,6 +812,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>tTouchBar</name>
+    <message>
+        <location filename="../touchbar/ttouchbar_objc.mm" line="153"/>
+        <source>Customize Touch Bar...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>tWindowTabber</name>
     <message>

diff --git a/lib/translations/bg.ts b/lib/translations/bg.ts
@@ -801,6 +801,14 @@
         <translation></translation>
     </message>
 </context>
+<context>
+    <name>tTouchBar</name>
+    <message>
+        <location filename="../touchbar/ttouchbar_objc.mm" line="153"/>
+        <source>Customize Touch Bar...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>tWindowTabber</name>
     <message>

diff --git a/lib/translations/cs_CZ.ts b/lib/translations/cs_CZ.ts
@@ -837,6 +837,14 @@
         <translation>Nastavení</translation>
     </message>
 </context>
+<context>
+    <name>tTouchBar</name>
+    <message>
+        <location filename="../touchbar/ttouchbar_objc.mm" line="153"/>
+        <source>Customize Touch Bar...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>tWindowTabber</name>
     <message>

diff --git a/lib/translations/cy_GB.ts b/lib/translations/cy_GB.ts
@@ -805,6 +805,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>tTouchBar</name>
+    <message>
+        <location filename="../touchbar/ttouchbar_objc.mm" line="153"/>
+        <source>Customize Touch Bar...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>tWindowTabber</name>
     <message>

diff --git a/lib/translations/da_DK.ts b/lib/translations/da_DK.ts
@@ -812,6 +812,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>tTouchBar</name>
+    <message>
+        <location filename="../touchbar/ttouchbar_objc.mm" line="153"/>
+        <source>Customize Touch Bar...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>tWindowTabber</name>
     <message>

diff --git a/lib/translations/de_DE.ts b/lib/translations/de_DE.ts
@@ -812,6 +812,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>tTouchBar</name>
+    <message>
+        <location filename="../touchbar/ttouchbar_objc.mm" line="153"/>
+        <source>Customize Touch Bar...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>tWindowTabber</name>
     <message>

diff --git a/lib/translations/en_GB.ts b/lib/translations/en_GB.ts
@@ -812,6 +812,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>tTouchBar</name>
+    <message>
+        <location filename="../touchbar/ttouchbar_objc.mm" line="153"/>
+        <source>Customize Touch Bar...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>tWindowTabber</name>
     <message>

diff --git a/lib/translations/en_US.ts b/lib/translations/en_US.ts
@@ -801,6 +801,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>tTouchBar</name>
+    <message>
+        <location filename="../touchbar/ttouchbar_objc.mm" line="153"/>
+        <source>Customize Touch Bar...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>tWindowTabber</name>
     <message>

diff --git a/lib/translations/fr_CA.ts b/lib/translations/fr_CA.ts
@@ -837,6 +837,14 @@
         <translation>Paramètres</translation>
     </message>
 </context>
+<context>
+    <name>tTouchBar</name>
+    <message>
+        <location filename="../touchbar/ttouchbar_objc.mm" line="153"/>
+        <source>Customize Touch Bar...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>tWindowTabber</name>
     <message>

diff --git a/lib/translations/he_IL.ts b/lib/translations/he_IL.ts
@@ -837,6 +837,14 @@
         <translation>הגדרות</translation>
     </message>
 </context>
+<context>
+    <name>tTouchBar</name>
+    <message>
+        <location filename="../touchbar/ttouchbar_objc.mm" line="153"/>
+        <source>Customize Touch Bar...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>tWindowTabber</name>
     <message>

diff --git a/lib/translations/id_ID.ts b/lib/translations/id_ID.ts
@@ -805,6 +805,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>tTouchBar</name>
+    <message>
+        <location filename="../touchbar/ttouchbar_objc.mm" line="153"/>
+        <source>Customize Touch Bar...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>tWindowTabber</name>
     <message>

diff --git a/lib/translations/ja_JP.ts b/lib/translations/ja_JP.ts
@@ -801,6 +801,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>tTouchBar</name>
+    <message>
+        <location filename="../touchbar/ttouchbar_objc.mm" line="153"/>
+        <source>Customize Touch Bar...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>tWindowTabber</name>
     <message>

diff --git a/lib/translations/nl_NL.ts b/lib/translations/nl_NL.ts
@@ -812,6 +812,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>tTouchBar</name>
+    <message>
+        <location filename="../touchbar/ttouchbar_objc.mm" line="153"/>
+        <source>Customize Touch Bar...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>tWindowTabber</name>
     <message>

diff --git a/lib/translations/pl_PL.ts b/lib/translations/pl_PL.ts
@@ -801,6 +801,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>tTouchBar</name>
+    <message>
+        <location filename="../touchbar/ttouchbar_objc.mm" line="153"/>
+        <source>Customize Touch Bar...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>tWindowTabber</name>
     <message>

diff --git a/lib/translations/pt_BR.ts b/lib/translations/pt_BR.ts
@@ -805,6 +805,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>tTouchBar</name>
+    <message>
+        <location filename="../touchbar/ttouchbar_objc.mm" line="153"/>
+        <source>Customize Touch Bar...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>tWindowTabber</name>
     <message>

diff --git a/lib/translations/ro_RO.ts b/lib/translations/ro_RO.ts
@@ -817,6 +817,14 @@
         <translation></translation>
     </message>
 </context>
+<context>
+    <name>tTouchBar</name>
+    <message>
+        <location filename="../touchbar/ttouchbar_objc.mm" line="153"/>
+        <source>Customize Touch Bar...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>tWindowTabber</name>
     <message>

diff --git a/lib/translations/sl_SI.ts b/lib/translations/sl_SI.ts
@@ -812,6 +812,14 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>tTouchBar</name>
+    <message>
+        <location filename="../touchbar/ttouchbar_objc.mm" line="153"/>
+        <source>Customize Touch Bar...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>tWindowTabber</name>
     <message>

diff --git a/lib/translations/ta.ts b/lib/translations/ta.ts
@@ -838,6 +838,14 @@
         <translation>அமைப்புகள்</translation>
     </message>
 </context>
+<context>
+    <name>tTouchBar</name>
+    <message>
+        <location filename="../touchbar/ttouchbar_objc.mm" line="153"/>
+        <source>Customize Touch Bar...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>tWindowTabber</name>
     <message>