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

In some cases when the addMenuItem function was called the separator boolean was true by default.

Browse source 
This fix addresses this issue by setting it to false.
This commit is contained in:
Nex Pro 2015-05-11 18:50:54 +01:00
parent 7f8ac5013d
commit fb9ff6e016
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,12 +23,13 @@ MenuItemProperties::MenuItemProperties() :
beforeItem(""), beforeItem(""),
afterItem(""), afterItem(""),
isCheckable(false), isCheckable(false),
isChecked(false) isChecked(false),
isSeparator(false)
{ {
}; };
MenuItemProperties::MenuItemProperties(const QString& menuName, const QString& menuItemName, MenuItemProperties::MenuItemProperties(const QString& menuName, const QString& menuItemName,
const QString& shortcutKey, bool checkable, bool checked) : const QString& shortcutKey, bool checkable, bool checked, bool separator) :
menuName(menuName), menuName(menuName),
menuItemName(menuItemName), menuItemName(menuItemName),
shortcutKey(shortcutKey), shortcutKey(shortcutKey),
@ -38,12 +39,13 @@ MenuItemProperties::MenuItemProperties(const QString& menuName, const QString& m
beforeItem(""), beforeItem(""),
afterItem(""), afterItem(""),
isCheckable(checkable), isCheckable(checkable),
isChecked(checked) isChecked(checked),
isSeparator(separator)
{ {
} }
MenuItemProperties::MenuItemProperties(const QString& menuName, const QString& menuItemName, MenuItemProperties::MenuItemProperties(const QString& menuName, const QString& menuItemName,
const KeyEvent& shortcutKeyEvent, bool checkable, bool checked) : const KeyEvent& shortcutKeyEvent, bool checkable, bool checked, bool separator) :
menuName(menuName), menuName(menuName),
menuItemName(menuItemName), menuItemName(menuItemName),
shortcutKey(""), shortcutKey(""),
@ -53,7 +55,8 @@ MenuItemProperties::MenuItemProperties(const QString& menuName, const QString& m
beforeItem(""), beforeItem(""),
afterItem(""), afterItem(""),
isCheckable(checkable), isCheckable(checkable),
isChecked(checked) isChecked(checked),
isSeparator(separator)
{ {
} }

4
libraries/script-engine/src/MenuItemProperties.h
View file

@ -22,9 +22,9 @@ class MenuItemProperties {
public: public:
MenuItemProperties(); MenuItemProperties();
MenuItemProperties(const QString& menuName, const QString& menuItemName, MenuItemProperties(const QString& menuName, const QString& menuItemName,
const QString& shortcutKey = QString(""), bool checkable = false, bool checked = false); const QString& shortcutKey = QString(""), bool checkable = false, bool checked = false, bool separator = false);
MenuItemProperties(const QString& menuName, const QString& menuItemName, MenuItemProperties(const QString& menuName, const QString& menuItemName,
const KeyEvent& shortcutKeyEvent, bool checkable = false, bool checked = false); const KeyEvent& shortcutKeyEvent, bool checkable = false, bool checked = false, bool separator = false);
QString menuName; QString menuName;
QString menuItemName; QString menuItemName;