diff options
| -rw-r--r-- | plugins/unityshell/src/unityshell.cpp | 10 | ||||
| -rw-r--r-- | standalone-clients/TestShortcut.cpp | 8 | ||||
| -rw-r--r-- | tests/test_shortcut_model.cpp | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp index 0f62e751f..ad0e73cdc 100644 --- a/plugins/unityshell/src/unityshell.cpp +++ b/plugins/unityshell/src/unityshell.cpp @@ -2531,12 +2531,12 @@ void UnityScreen::InitHints() hints_.push_back(new shortcut::Hint(dash, "", "", _("Open currently focused item."), shortcut::HARDCODED_OPTION, _("Enter & Return"))); hints_.push_back(new shortcut::Hint(dash, "", "", _("'Run Command' mode."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "execute_command")); - // Top Bar - std::string const topbar = _("Top Bar"); + // Menu Bar + std::string const menubar = _("Menu Bar"); - hints_.push_back(new shortcut::Hint(topbar, "", "", _("Reveals application menu."), shortcut::HARDCODED_OPTION, "Alt")); - hints_.push_back(new shortcut::Hint(topbar, "", "", _("Opens the indicator menu."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "panel_first_menu")); - hints_.push_back(new shortcut::Hint(topbar, "", "", _("Moves focus between indicators."), shortcut::HARDCODED_OPTION, _("Cursor Left or Right"))); + hints_.push_back(new shortcut::Hint(menubar, "", "", _("Reveals application menu."), shortcut::HARDCODED_OPTION, "Alt")); + hints_.push_back(new shortcut::Hint(menubar, "", "", _("Opens the indicator menu."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "panel_first_menu")); + hints_.push_back(new shortcut::Hint(menubar, "", "", _("Moves focus between indicators."), shortcut::HARDCODED_OPTION, _("Cursor Left or Right"))); // Switching std::string const switching = _("Switching"); diff --git a/standalone-clients/TestShortcut.cpp b/standalone-clients/TestShortcut.cpp index 8a658c115..319877d3a 100644 --- a/standalone-clients/TestShortcut.cpp +++ b/standalone-clients/TestShortcut.cpp @@ -55,11 +55,11 @@ void ThreadWidgetInit(nux::NThread* thread, void* InitData) hints.push_back(new shortcut::MockHint(_("Dash"), "", "", _("Open currently focused item."), shortcut::HARDCODED_OPTION, _("Enter / Return"))); hints.push_back(new shortcut::MockHint(_("Dash"), "", "", _("'Run Command' mode."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "execute_command")); - // Top Bar + // Menu Bar // Is it really hard coded? - hints.push_back(new shortcut::MockHint(_("Top Bar"), "", "", _("Reveals application menu."), shortcut::HARDCODED_OPTION, "Alt")); - hints.push_back(new shortcut::MockHint(_("Top Bar"), "", "", _("Opens the indicator menu."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "panel_first_menu")); - hints.push_back(new shortcut::MockHint(_("Top Bar"), "", "", _("Moves focus between indicators."), shortcut::HARDCODED_OPTION, _("Cursor Left & Right"))); + hints.push_back(new shortcut::MockHint(_("Menu Bar"), "", "", _("Reveals application menu."), shortcut::HARDCODED_OPTION, "Alt")); + hints.push_back(new shortcut::MockHint(_("Menu Bar"), "", "", _("Opens the indicator menu."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "panel_first_menu")); + hints.push_back(new shortcut::MockHint(_("Menu Bar"), "", "", _("Moves focus between indicators."), shortcut::HARDCODED_OPTION, _("Cursor Left & Right"))); // Switching hints.push_back(new shortcut::MockHint(_("Switching"), "", "", _("Switch between applications."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "alt_tab_forward")); diff --git a/tests/test_shortcut_model.cpp b/tests/test_shortcut_model.cpp index 1e0d521ba..197ad8edf 100644 --- a/tests/test_shortcut_model.cpp +++ b/tests/test_shortcut_model.cpp @@ -33,14 +33,14 @@ TEST(TestShortcutModel, TestConstruction) hints.push_back(new MockHint("Launcher", "", "", "Description 1", COMPIZ_KEY_OPTION, "Plugin 1", "key_option_1")); hints.push_back(new MockHint("Launcher", "", "", "Description 2", HARDCODED_OPTION, "Value 2")); hints.push_back(new MockHint("Dash", "Prefix", "Postfix", "Description 3", COMPIZ_KEY_OPTION, "Plugin 3", "key_option_3")); - hints.push_back(new MockHint("Top Bar", "Prefix", "Postfix", "Description 4", HARDCODED_OPTION, "Value4")); + hints.push_back(new MockHint("Menu Bar", "Prefix", "Postfix", "Description 4", HARDCODED_OPTION, "Value4")); Model model(hints); EXPECT_EQ(model.categories().size(), 3); EXPECT_EQ(model.hints()["Launcher"].size(), 2); EXPECT_EQ(model.hints()["Dash"].size(), 1); - EXPECT_EQ(model.hints()["Top Bar"].size(), 1); + EXPECT_EQ(model.hints()["Menu Bar"].size(), 1); EXPECT_EQ(model.hints()["Unity"].size(), 0); } @@ -51,7 +51,7 @@ TEST(TestShortcutModel, TestFill) hints.push_back(new MockHint("Launcher", "", "", "Description 1", COMPIZ_KEY_OPTION, "Plugin 1", "key_option_1")); hints.push_back(new MockHint("Launcher", "", "", "Description 2", HARDCODED_OPTION, "Value 2")); hints.push_back(new MockHint("Dash", "Prefix", "Postfix", "Description 3", COMPIZ_KEY_OPTION, "Plugin 3", "key_option_3")); - hints.push_back(new MockHint("Top Bar", "Prefix", "Postfix", "Description 4", HARDCODED_OPTION, "Value 4")); + hints.push_back(new MockHint("Menu Bar", "Prefix", "Postfix", "Description 4", HARDCODED_OPTION, "Value 4")); Model model(hints); @@ -61,7 +61,7 @@ TEST(TestShortcutModel, TestFill) EXPECT_EQ(model.hints()["Launcher"].front()->value(), "Plugin 1-key_option_1"); EXPECT_EQ(model.hints()["Launcher"].back()->value(), "Value 2"); EXPECT_EQ(model.hints()["Dash"].front()->value(),"Plugin 3-key_option_3"); - EXPECT_EQ(model.hints()["Top Bar"].front()->value(), "Value 4"); + EXPECT_EQ(model.hints()["Menu Bar"].front()->value(), "Value 4"); } TEST(TestShortcutModel, TestProperty) |