From c188ffef3ae78b6c8d38cb7c79c3ea4a1d402a19 Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan.grewe@g-node.org>
Date: Wed, 29 Jan 2025 22:30:07 +0100
Subject: [PATCH] [tracks] tooltip fixes

---
 fixtracks/widgets/tracks.py | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/fixtracks/widgets/tracks.py b/fixtracks/widgets/tracks.py
index ff6e52c..23b83be 100644
--- a/fixtracks/widgets/tracks.py
+++ b/fixtracks/widgets/tracks.py
@@ -125,39 +125,39 @@ class SelectionControls(QWidget):
         fwdBtn.setToolTip(f"Proceed to next window ({fwdBtn.shortcut().toString()})")
         fwdBtn.clicked.connect(lambda: self.on_Fwd(fullstep))
         halfstepFwdBtn = QPushButton(">>")
-        halfstepFwdBtn.setToolTip(f"Proceed by half a window ({halfstepFwdBtn.shortcut().toString()})")
         halfstepFwdBtn.setFont(font)
         halfstepFwdBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
         halfstepFwdBtn.setShortcut(Qt.KeyboardModifier.AltModifier + Qt.Key.Key_Right)
+        halfstepFwdBtn.setToolTip(f"Proceed by half a window ({halfstepFwdBtn.shortcut().toString()})")
         halfstepFwdBtn.clicked.connect(lambda: self.on_Fwd(halfstep))
         quarterstepFwdBtn = QPushButton(">")
-        quarterstepFwdBtn.setToolTip(f"Proceed by a quarter window ({quarterstepFwdBtn.shortcut().toString()})")
-        quarterstepFwdBtn.setShortcut(Qt.KeyboardModifier.ShiftModifier + Qt.Key.Key_Right)
         quarterstepFwdBtn.setFont(font)
+        quarterstepFwdBtn.setShortcut(Qt.KeyboardModifier.ShiftModifier + Qt.Key.Key_Right)
+        quarterstepFwdBtn.setToolTip(f"Proceed by a quarter window ({quarterstepFwdBtn.shortcut().toString()})")
         quarterstepFwdBtn.clicked.connect(lambda: self.on_Fwd(quarterstep))
 
         assignOneBtn = QPushButton("Track One")
         assignOneBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
         assignOneBtn.setStyleSheet("QPushButton { background-color: orange; }")
         assignOneBtn.setShortcut("Ctrl+1")
-        assignOneBtn.setToolTip("Assign current selection to Track One (Ctrl+1)")
+        assignOneBtn.setToolTip(f"Assign current selection to Track One ({assignOneBtn.shortcut().toString()})")
         assignOneBtn.setFont(font)
         assignOneBtn.clicked.connect(self.on_TrackOne)
 
         assignTwoBtn = QPushButton("Track Two")
+        assignTwoBtn.setShortcut("Ctrl+2")
         assignTwoBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
         assignTwoBtn.setStyleSheet("QPushButton { background-color: green; }")
-        assignTwoBtn.setToolTip("Assign current selection to Track Two (Ctrl+2)")
+        assignTwoBtn.setToolTip(f"Assign current selection to Track Two ({assignTwoBtn.shortcut().toString()})")
         assignTwoBtn.setFont(font)
-        assignTwoBtn.setShortcut("Ctrl+2")
         assignTwoBtn.clicked.connect(self.on_TrackTwo)
 
         assignOtherBtn = QPushButton("Other")
+        assignOtherBtn.setShortcut("Ctrl+0")
+        assignOtherBtn.setFont(font)
         assignOtherBtn.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding)
         assignOtherBtn.setStyleSheet("QPushButton { background-color: red; }")
-        assignOtherBtn.setToolTip("Assign current selection to Unassigned (Ctrl+0)")
-        assignOtherBtn.setFont(font)
-        assignOtherBtn.setShortcut("Ctrl+0")
+        assignOtherBtn.setToolTip(f"Assign current selection to Unassigned ({assignOtherBtn.shortcut().toString()})")
         assignOtherBtn.clicked.connect(self.on_TrackOther)
 
         self.tone_selection = QLabel("0")
@@ -167,8 +167,8 @@ class SelectionControls(QWidget):
 
         grid = QGridLayout()
         grid.addWidget(backBtn, 0, 0, 2, 2)
-        grid.addWidget(halfstepBackBtn, 0, 6, 1, 2)
-        grid.addWidget(quarterstepBackBtn, 0, 6, 1, 2)
+        grid.addWidget(halfstepBackBtn, 2, 0, 1, 2)
+        grid.addWidget(quarterstepBackBtn, 3, 0, 1, 2)
         grid.addWidget(fwdBtn, 0, 6, 2, 2)
         grid.addWidget(halfstepFwdBtn, 2, 6, 1, 2)
         grid.addWidget(quarterstepFwdBtn, 3, 6, 1, 2)
@@ -339,6 +339,8 @@ class FixTracks(QWidget):
         self._controls_widget.assignOne.connect(self.on_assignOne)
         self._controls_widget.assignTwo.connect(self.on_assignTwo)
         self._controls_widget.assignOther.connect(self.on_assignOther)
+        self._controls_widget.fwd.connect(self.on_forward)
+        self._controls_widget.back.connect(self.on_back)
 
         self._trackone_table = QTableView()
         font = QFont()
@@ -573,6 +575,11 @@ class FixTracks(QWidget):
         self._controls_widget.setSelectedTracks(tracks)
         self.update()
 
+    def on_forward(self, stepsize):
+        logging.debug("Tracks: recieve forward command with stepsize: %.2f", stepsize)
+
+    def on_back(self, stepsize):
+        logging.debug("Tracks: recieve backward command with stepsize: %.2f", stepsize)
 
 def main():
     from PySide6.QtWidgets import QApplication