Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PIM
KAlarm
Commits
333c2ae5
Commit
333c2ae5
authored
Jan 02, 2015
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show where we need to port to qt5
parent
da84e576
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
mainwindow.cpp
mainwindow.cpp
+6
-0
No files found.
mainwindow.cpp
View file @
333c2ae5
...
...
@@ -428,21 +428,25 @@ void MainWindow::initActions()
QAction
*
action
=
mActionNew
->
displayAlarmAction
();
actions
->
addAction
(
QLatin1String
(
"newDisplay"
),
action
);
#pragma "port QT5"
//QT5 action->setGlobalShortcut(dummy); // actions->addAction() must be called first!
connect
(
action
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotNewDisplay
);
action
=
mActionNew
->
commandAlarmAction
();
actions
->
addAction
(
QLatin1String
(
"newCommand"
),
action
);
#pragma "port QT5"
//QT5 action->setGlobalShortcut(dummy); // actions->addAction() must be called first!
connect
(
action
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotNewCommand
);
action
=
mActionNew
->
emailAlarmAction
();
actions
->
addAction
(
QLatin1String
(
"newEmail"
),
action
);
#pragma "port QT5"
//QT5 action->setGlobalShortcut(dummy); // actions->addAction() must be called first!
connect
(
action
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotNewEmail
);
action
=
mActionNew
->
audioAlarmAction
();
actions
->
addAction
(
QLatin1String
(
"newAudio"
),
action
);
#pragma "port QT5"
//QT5 action->setGlobalShortcut(dummy); // actions->addAction() must be called first!
connect
(
action
,
&
QAction
::
triggered
,
this
,
&
MainWindow
::
slotNewAudio
);
...
...
@@ -517,6 +521,8 @@ void MainWindow::initActions()
mActionSpreadWindows
=
KAlarm
::
createSpreadWindowsAction
(
this
);
actions
->
addAction
(
QLatin1String
(
"spread"
),
mActionSpreadWindows
);
#pragma "port QT5"
//QT5 mActionSpreadWindows->setGlobalShortcut(dummy); // actions->addAction() must be called first!
mActionImportAlarms
=
new
QAction
(
i18nc
(
"@action"
,
"Import &Alarms..."
),
this
);
...
...
Write
Preview
Markdown
is supported
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