Comments, consistency

tresf · Feb 9, 2025 · e805eba · e805eba
1 parent 7f988cb
commit e805eba
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/include/KeyboardShortcuts.h b/include/KeyboardShortcuts.h
@@ -54,14 +54,17 @@ constexpr const char* UI_ALT_KEY =
 "Alt";
 #endif
 
-constexpr const char* UI_LINK_KEY =
+// UI hint for copying OR linking a UI component
+// this MUST be consistent with KBD_COPY_MODIFIER
+constexpr const char* UI_COPY_KEY =
 #ifdef LMMS_BUILD_APPLE
 UI_ALT_KEY;
 #else
 UI_CTRL_KEY;
 #endif
 
 // Shortcut for copying OR linking a UI component
+// this MUST be consistent with UI_COPY_KEY
 constexpr Qt::KeyboardModifier KBD_COPY_MODIFIER =
 #ifdef LMMS_BUILD_APPLE
 Qt::AltModifier;

diff --git a/src/core/AutomationClip.cpp b/src/core/AutomationClip.cpp
@@ -953,7 +953,7 @@ QString AutomationClip::name() const
 	{
 		return m_objects.front()->fullDisplayName();
 	}
-	return tr( "Drag a control while pressing <%1>" ).arg(UI_LINK_KEY);
+	return tr( "Drag a control while pressing <%1>" ).arg(UI_COPY_KEY);
 }
 
 

diff --git a/src/gui/clips/ClipView.cpp b/src/gui/clips/ClipView.cpp
@@ -727,7 +727,7 @@ void ClipView::mousePressEvent( QMouseEvent * me )
 			QString hint = m_action == Action::Move || m_action == Action::MoveSelection
 						? tr( "Press <%1> and drag to make a copy." )
 						: tr( "Press <%1> for free resizing." );
-			m_hint = TextFloat::displayMessage( tr( "Hint" ), UI_LINK_KEY,
+			m_hint = TextFloat::displayMessage( tr( "Hint" ), UI_COPY_KEY,
 					embed::getIconPixmap( "hint" ), 0 );
 		}
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -953,7 +953,7 @@ QString AutomationClip::name() const @@
     	{
     		return m_objects.front()->fullDisplayName();
     	}
-    	return tr( "Drag a control while pressing <%1>" ).arg(UI_LINK_KEY);
+    	return tr( "Drag a control while pressing <%1>" ).arg(UI_COPY_KEY);
     }
@@ Expand Down @@