Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 02:04:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove more cruft

Browse source
This commit is contained in:
ZappoMan 2014-02-25 10:31:29 -08:00
parent 74d48ab239
commit 0b6e81b8a6
4 changed files with 17 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
examples/menuExample.js
View file

@ -14,15 +14,18 @@ function setupMenus() {
Menu.addMenuItem("Foo","Foo item 1", "SHIFT+CTRL+F" );
Menu.addMenuItem("Foo","Foo item 2", "SHIFT+F" );
Menu.addMenuItem("Foo","Foo item 3", "META+F" );
Menu.addCheckableMenuItem("Foo","Foo item 4", true);
Menu.addMenuItem({
menuName: "Foo",
menuItemName: "Foo item 4",
isCheckable: true,
isChecked: true
});
Menu.addMenuItem({
menuName: "Foo",
menuItemName: "Foo item 5",
shortcutKey: "ALT+F",
isCheckable: true,
isChecked: true
isCheckable: true
});
@ -40,13 +43,20 @@ function setupMenus() {
Menu.addMenu("Bar > Spam");
Menu.addMenuItem("Bar > Spam","Spam item 1");
Menu.addCheckableMenuItem("Bar > Spam","Spam item 2",false);
Menu.addMenuItem({
menuName: "Bar > Spam",
menuItemName: "Spam item 2",
isCheckable: true,
isChecked: false
});
Menu.addSeparator("Bar > Spam","Other Items");
Menu.addMenuItem("Bar > Spam","Remove Spam item 2");
Menu.addMenuItem("Foo","Remove Spam item 2");
Menu.addMenuItem({ menuName: "Foo",
menuItemName: "Remove Spam item 2"
Menu.addMenuItem({
menuName: "Foo",
menuItemName: "Remove Spam item 2"
});
}

11
interface/src/Menu.cpp
View file

@ -1508,17 +1508,6 @@ void MenuScriptingInterface::addMenuItem(const QString& menu, const QString& men
QMetaObject::invokeMethod(Menu::getInstance(), "addMenuItem", Q_ARG(const MenuItemProperties&, properties));
}
void MenuScriptingInterface::addCheckableMenuItem(const QString& menu, const QString& menuitem,
const QString& shortcutKey, bool checked) {
MenuItemProperties properties(menu, menuitem, shortcutKey, true, checked);
QMetaObject::invokeMethod(Menu::getInstance(), "addMenuItem", Q_ARG(const MenuItemProperties&, properties));
}
void MenuScriptingInterface::addCheckableMenuItem(const QString& menu, const QString& menuitem, bool checked) {
MenuItemProperties properties(menu, menuitem, "", true, checked);
QMetaObject::invokeMethod(Menu::getInstance(), "addMenuItem", Q_ARG(const MenuItemProperties&, properties));
}
void MenuScriptingInterface::removeMenuItem(const QString& menu, const QString& menuitem) {
QMetaObject::invokeMethod(Menu::getInstance(), "removeMenuItem",
Q_ARG(const QString&, menu),

2
interface/src/Menu.h
View file

@ -340,8 +340,6 @@ public slots:
void addMenuItem(const MenuItemProperties& properties);
void addMenuItem(const QString& menuName, const QString& menuitem, const QString& shortcutKey);
void addMenuItem(const QString& menuName, const QString& menuitem);
void addCheckableMenuItem(const QString& menuName, const QString& menuitem, const QString& shortcutKey, bool checked);
void addCheckableMenuItem(const QString& menuName, const QString& menuitem, bool checked);
void removeMenuItem(const QString& menuName, const QString& menuitem);

13
libraries/script-engine/src/MenuTypes.cpp
View file

@ -55,11 +55,6 @@ MenuItemProperties::MenuItemProperties(const QString& menuName, const QString& m
isCheckable(checkable),
isChecked(checked)
{
qDebug() << "MenuItemProperties::MenuItemProperties(... KeyEvent... )";
qDebug() << "shortcutKeyEvent.text=" << shortcutKeyEvent.text;
qDebug() << "shortcutKeyEvent.key=" << shortcutKeyEvent.key;
qDebug() << "shortcutKeyEvent.isControl=" << shortcutKeyEvent.isControl;
qDebug() << "shortcutKeySequence=" << shortcutKeySequence;
}
void registerMenuTypes(QScriptEngine* engine) {
@ -81,21 +76,13 @@ void menuItemPropertiesFromScriptValue(const QScriptValue& object, MenuItemPrope
// handle the shortcut key options in order...
QScriptValue shortcutKeyValue = object.property("shortcutKey");
if (shortcutKeyValue.isValid()) {
qDebug() << "got shortcutKey...";
properties.shortcutKey = shortcutKeyValue.toVariant().toString();
properties.shortcutKeySequence = properties.shortcutKey;
} else {
qDebug() << "testing shortcutKeyEvent...";
QScriptValue shortcutKeyEventValue = object.property("shortcutKeyEvent");
if (shortcutKeyEventValue.isValid()) {
qDebug() << "got shortcutKeyEvent...";
keyEventFromScriptValue(shortcutKeyEventValue, properties.shortcutKeyEvent);
qDebug() << "shortcutKeyEvent.text=" << properties.shortcutKeyEvent.text;
qDebug() << "shortcutKeyEvent.key=" << properties.shortcutKeyEvent.key;
qDebug() << "shortcutKeyEvent.isControl=" << properties.shortcutKeyEvent.isControl;
properties.shortcutKeySequence = properties.shortcutKeyEvent;
qDebug() << "shortcutKeySequence=" << properties.shortcutKeySequence;
}
}