[aseprite] 15/196: Add tooltip to "Super" key checkbox in shortcut dialog

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 645486f435154d7ff6fd8a01918e83a8326c2dac
Author: David Capello <davidcapello at gmail.com>
Date:   Wed Mar 2 12:33:05 2016 -0300

    Add tooltip to "Super" key checkbox in shortcut dialog
---
 src/app/ui/select_accelerator.cpp | 3 +++
 src/app/ui/select_accelerator.h   | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/app/ui/select_accelerator.cpp b/src/app/ui/select_accelerator.cpp
index 4cb305c..d33dbcc 100644
--- a/src/app/ui/select_accelerator.cpp
+++ b/src/app/ui/select_accelerator.cpp
@@ -101,6 +101,8 @@ SelectAccelerator::SelectAccelerator(const ui::Accelerator& accel, KeyContext ke
   clearButton()->Click.connect(base::Bind<void>(&SelectAccelerator::onClear, this));
   okButton()->Click.connect(base::Bind<void>(&SelectAccelerator::onOK, this));
   cancelButton()->Click.connect(base::Bind<void>(&SelectAccelerator::onCancel, this));
+
+  addChild(&m_tooltipManager);
 }
 
 void SelectAccelerator::onModifierChange(KeyModifiers modifier, CheckBox* checkbox)
@@ -162,6 +164,7 @@ void SelectAccelerator::updateModifiers()
 #else
   #if __linux__
     win()->setText(kWinKeyName);
+    m_tooltipManager.addTooltipFor(win(), "Also known as Windows key, logo key,\ncommand key, or system key.", TOP);
   #endif
   win()->setSelected(m_accel.modifiers() & kKeyWinModifier ? true: false);
   cmd()->setVisible(false);
diff --git a/src/app/ui/select_accelerator.h b/src/app/ui/select_accelerator.h
index 82171a8..9085353 100644
--- a/src/app/ui/select_accelerator.h
+++ b/src/app/ui/select_accelerator.h
@@ -1,5 +1,5 @@
 // Aseprite
-// Copyright (C) 2001-2015  David Capello
+// Copyright (C) 2001-2016  David Capello
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 2 as
@@ -11,6 +11,7 @@
 
 #include "app/ui/keyboard_shortcuts.h"
 #include "ui/accelerator.h"
+#include "ui/tooltips.h"
 
 #include "select_accelerator.xml.h"
 
@@ -34,6 +35,7 @@ namespace app {
 
     class KeyField;
 
+    ui::TooltipManager m_tooltipManager;
     KeyField* m_keyField;
     KeyContext m_keyContext;
     ui::Accelerator m_origAccel;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git