Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
5646a76e
Commit
5646a76e
authored
Feb 07, 2015
by
Fabio Bas
Browse files
OSX: merge the duplicate cockatrice menu in the main one
parent
adb259fd
Changes
1
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/window_main.cpp
View file @
5646a76e
...
@@ -337,6 +337,27 @@ void MainWindow::createActions()
...
@@ -337,6 +337,27 @@ void MainWindow::createActions()
aAbout
=
new
QAction
(
this
);
aAbout
=
new
QAction
(
this
);
connect
(
aAbout
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
actAbout
()));
connect
(
aAbout
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
actAbout
()));
#if defined(__APPLE__)
/* For OSX */
aConnect
->
setMenuRole
(
QAction
::
ApplicationSpecificRole
);
aDisconnect
->
setMenuRole
(
QAction
::
ApplicationSpecificRole
);
aSinglePlayer
->
setMenuRole
(
QAction
::
ApplicationSpecificRole
);
aWatchReplay
->
setMenuRole
(
QAction
::
ApplicationSpecificRole
);
aDeckEditor
->
setMenuRole
(
QAction
::
ApplicationSpecificRole
);
aFullScreen
->
setMenuRole
(
QAction
::
ApplicationSpecificRole
);
aSettings
->
setMenuRole
(
QAction
::
PreferencesRole
);
aExit
->
setMenuRole
(
QAction
::
QuitRole
);
aAbout
->
setMenuRole
(
QAction
::
AboutRole
);
char
const
*
foo
;
// avoid "warning: expression result unused" under clang
foo
=
QT_TRANSLATE_NOOP
(
"QMenuBar"
,
"Services"
);
foo
=
QT_TRANSLATE_NOOP
(
"QMenuBar"
,
"Hide %1"
);
foo
=
QT_TRANSLATE_NOOP
(
"QMenuBar"
,
"Hide Others"
);
foo
=
QT_TRANSLATE_NOOP
(
"QMenuBar"
,
"Show All"
);
foo
=
QT_TRANSLATE_NOOP
(
"QMenuBar"
,
"Preferences..."
);
foo
=
QT_TRANSLATE_NOOP
(
"QMenuBar"
,
"Quit %1"
);
foo
=
QT_TRANSLATE_NOOP
(
"QMenuBar"
,
"About %1"
);
#endif
}
}
void
MainWindow
::
createMenus
()
void
MainWindow
::
createMenus
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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