History

More work on menus and some code cleanup

Brad Davis committed 11 years ago

Commit 1ff8c671 parent c0d562e21 files · +437 −512Browse files

Showing the changes to interface/src/scripting/MenuScriptingInterface.cpp (1 of 21 files). Show all

Unified · Split

interface/src/scripting/MenuScriptingInterface.cpp+13−35
@@ -28,72 +28,50 @@ void MenuScriptingInterface::menuItemTriggered() { · 27 unmodified lines
28}28}
29 29
30void MenuScriptingInterface::addMenu(const QString& menu) {30void MenuScriptingInterface::addMenu(const QString& menu) {
31 QMetaObject::invokeMethod(Menu::getInstance(), "addMenu", Q_ARG(const QString&, menu));31 Menu::getInstance()->addMenu("", menu);
32}32}
33 33
34void MenuScriptingInterface::removeMenu(const QString& menu) {34void MenuScriptingInterface::removeMenu(const QString& menu) {
35 QMetaObject::invokeMethod(Menu::getInstance(), "removeMenu", Q_ARG(const QString&, menu));35 Menu::getInstance()->removeMenu(menu);
36}36}
37 37
38bool MenuScriptingInterface::menuExists(const QString& menu) {38bool MenuScriptingInterface::menuExists(const QString& menu) {
39 bool result;39 return Menu::getInstance()->menuExists(menu);
40 QMetaObject::invokeMethod(Menu::getInstance(), "menuExists", Qt::BlockingQueuedConnection,
41 Q_RETURN_ARG(bool, result),
42 Q_ARG(const QString&, menu));
43 return result;
44}40}
45 41
46void MenuScriptingInterface::addSeparator(const QString& menuName, const QString& separatorName) {42void MenuScriptingInterface::addSeparator(const QString& menuName, const QString& separatorName) {
47 QMetaObject::invokeMethod(Menu::getInstance(), "addSeparator",43 Menu::getInstance()->addSeparator(menuName, separatorName);
48 Q_ARG(const QString&, menuName),
49 Q_ARG(const QString&, separatorName));
50}44}
51 45
52void MenuScriptingInterface::removeSeparator(const QString& menuName, const QString& separatorName) {46void MenuScriptingInterface::removeSeparator(const QString& menuName, const QString& separatorName) {
53 QMetaObject::invokeMethod(Menu::getInstance(), "removeSeparator",47 Menu::getInstance()->removeSeparator(menuName, separatorName);
54 Q_ARG(const QString&, menuName),
55 Q_ARG(const QString&, separatorName));
56}48}
57 49
58void MenuScriptingInterface::addMenuItem(const MenuItemProperties& properties) {50void MenuScriptingInterface::addMenuItem(const MenuItemProperties& properties) {
59 QMetaObject::invokeMethod(Menu::getInstance(), "addMenuItem", Q_ARG(const MenuItemProperties&, properties));51 Menu::getInstance()->addMenuItem(properties);
60}52}
61 53
62void MenuScriptingInterface::addMenuItem(const QString& menu, const QString& menuitem, const QString& shortcutKey) {54void MenuScriptingInterface::addMenuItem(const QString& menu, const QString& menuitem, const QString& shortcutKey) {
63 MenuItemProperties properties(menu, menuitem, shortcutKey);55 Menu::getInstance()->addItem(menu, menuitem);
64 QMetaObject::invokeMethod(Menu::getInstance(), "addMenuItem", Q_ARG(const MenuItemProperties&, properties));56 Menu::getInstance()->setItemShortcut(menuitem, shortcutKey);
65}57}
66 58
67void MenuScriptingInterface::addMenuItem(const QString& menu, const QString& menuitem) {59void MenuScriptingInterface::addMenuItem(const QString& menu, const QString& menuitem) {
68 MenuItemProperties properties(menu, menuitem);60 Menu::getInstance()->addItem(menu, menuitem);
69 QMetaObject::invokeMethod(Menu::getInstance(), "addMenuItem", Q_ARG(const MenuItemProperties&, properties));
70}61}
71 62
72void MenuScriptingInterface::removeMenuItem(const QString& menu, const QString& menuitem) {63void MenuScriptingInterface::removeMenuItem(const QString& menu, const QString& menuitem) {
73 QMetaObject::invokeMethod(Menu::getInstance(), "removeMenuItem", 64 Menu::getInstance()->removeItem(menuitem);
74 Q_ARG(const QString&, menu),
75 Q_ARG(const QString&, menuitem));
76};65};
77 66
78bool MenuScriptingInterface::menuItemExists(const QString& menu, const QString& menuitem) {67bool MenuScriptingInterface::menuItemExists(const QString& menu, const QString& menuitem) {
79 bool result;68 return Menu::getInstance()->itemExists(menu, menuitem);
80 QMetaObject::invokeMethod(Menu::getInstance(), "menuItemExists", Qt::BlockingQueuedConnection,
81 Q_RETURN_ARG(bool, result),
82 Q_ARG(const QString&, menu),
83 Q_ARG(const QString&, menuitem));
84 return result;
85}69}
86 70
87bool MenuScriptingInterface::isOptionChecked(const QString& menuOption) {71bool MenuScriptingInterface::isOptionChecked(const QString& menuOption) {
88 bool result;72 return Menu::getInstance()->isChecked(menuOption);
89 QMetaObject::invokeMethod(Menu::getInstance(), "isOptionChecked", Qt::BlockingQueuedConnection,
90 Q_RETURN_ARG(bool, result),
91 Q_ARG(const QString&, menuOption));
92 return result;
93}73}
94 74
95void MenuScriptingInterface::setIsOptionChecked(const QString& menuOption, bool isChecked) {75void MenuScriptingInterface::setIsOptionChecked(const QString& menuOption, bool isChecked) {
96 QMetaObject::invokeMethod(Menu::getInstance(), "setIsOptionChecked", Qt::BlockingQueuedConnection,76 Menu::getInstance()->setChecked(menuOption, isChecked);
97 Q_ARG(const QString&, menuOption),
98 Q_ARG(bool, isChecked));
99}77}