Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
af8daf9d
Commit
af8daf9d
authored
Feb 09, 2011
by
hjk
Browse files
actionmanager: rename Command::CA_NonConfigureable to CA_NonConfigurable
parent
703d637c
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/plugins/coreplugin/actionmanager/command.cpp
View file @
af8daf9d
...
...
@@ -83,7 +83,7 @@
\value CA_Hide
When there is no active action, hide the user "visible" action, instead of just
disabling it.
\value CA_NonConfigur
e
able
\value CA_NonConfigurable
Flag to indicate that the keyboard shortcut of this Command should not be
configurable by the user.
*/
...
...
@@ -535,7 +535,7 @@ void Action::setAttribute(CommandAttribute attr)
case
Core
::
Command
::
CA_UpdateIcon
:
m_action
->
setAttribute
(
Utils
::
ProxyAction
::
UpdateIcon
);
break
;
case
Core
::
Command
::
CA_NonConfigur
e
able
:
case
Core
::
Command
::
CA_NonConfigurable
:
break
;
}
}
...
...
@@ -553,7 +553,7 @@ void Action::removeAttribute(CommandAttribute attr)
case
Core
::
Command
::
CA_UpdateIcon
:
m_action
->
removeAttribute
(
Utils
::
ProxyAction
::
UpdateIcon
);
break
;
case
Core
::
Command
::
CA_NonConfigur
e
able
:
case
Core
::
Command
::
CA_NonConfigurable
:
break
;
}
}
src/plugins/coreplugin/actionmanager/command.h
View file @
af8daf9d
...
...
@@ -57,7 +57,7 @@ public:
CA_Hide
=
1
,
CA_UpdateText
=
2
,
CA_UpdateIcon
=
4
,
CA_NonConfigur
e
able
=
8
CA_NonConfigurable
=
8
};
Q_DECLARE_FLAGS
(
CommandAttributes
,
CommandAttribute
)
...
...
src/plugins/coreplugin/dialogs/shortcutsettings.cpp
View file @
af8daf9d
...
...
@@ -300,7 +300,7 @@ void ShortcutSettings::initialize()
QMap
<
QString
,
QTreeWidgetItem
*>
sections
;
foreach
(
Command
*
c
,
am
->
commands
())
{
if
(
c
->
hasAttribute
(
Command
::
CA_NonConfigur
e
able
))
if
(
c
->
hasAttribute
(
Command
::
CA_NonConfigurable
))
continue
;
if
(
c
->
action
()
&&
c
->
action
()
->
isSeparator
())
continue
;
...
...
src/plugins/debugger/debuggerplugin.cpp
View file @
af8daf9d
...
...
@@ -3027,7 +3027,7 @@ void DebuggerPluginPrivate::extensionsInitialized()
cmd
->
action
()
->
setEnabled
(
true
);
editorContextMenu
->
addAction
(
cmd
);
cmd
->
setAttribute
(
Command
::
CA_Hide
);
cmd
->
setAttribute
(
Command
::
CA_NonConfigur
e
able
);
// ADD_TO_WATCH1 is enough.
cmd
->
setAttribute
(
Command
::
CA_NonConfigurable
);
// ADD_TO_WATCH1 is enough.
}
m_plugin
->
addAutoReleasedObject
(
new
CommonOptionsPage
);
...
...
src/plugins/designer/formeditorw.cpp
View file @
af8daf9d
...
...
@@ -625,7 +625,7 @@ Core::ActionContainer *FormEditorW::createPreviewStyleMenu(Core::ActionManager *
bindShortcut
(
command
,
a
);
if
(
isDeviceProfile
)
{
command
->
setAttribute
(
Core
::
Command
::
CA_UpdateText
);
command
->
setAttribute
(
Core
::
Command
::
CA_NonConfigur
e
able
);
command
->
setAttribute
(
Core
::
Command
::
CA_NonConfigurable
);
}
menuPreviewStyle
->
addAction
(
command
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment