From 68d7ce96113bb59292332d9907b6adc95915e98e Mon Sep 17 00:00:00 2001 From: Lukáš Lalinský Date: Thu, 3 Sep 2009 11:04:34 +0200 Subject: Use QKeySequence::StandardKey where possible --- src/mainwindow.cpp | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index bc912b5..0ff84f8 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -204,25 +204,26 @@ MainWindow::setupActions() m_actionNew->setText(tr("&New")); m_actionNew->setIcon(loadIcon("document-new")); - m_actionNew->setShortcut(QKeySequence(tr("Ctrl+N"))); + m_actionNew->setShortcut(QKeySequence::New); connect(m_actionNew, SIGNAL(triggered(bool)), SLOT(newModel())); m_actionOpen = new QAction(this); m_actionOpen->setText(tr("&Open...")); m_actionOpen->setIcon(loadIcon("document-open")); - m_actionOpen->setShortcut(QKeySequence(tr("Ctrl+O"))); + m_actionOpen->setShortcut(QKeySequence::Open); connect(m_actionOpen, SIGNAL(triggered(bool)), SLOT(open())); m_actionSave = new QAction(this); m_actionSave->setText(tr("&Save")); m_actionSave->setIcon(loadIcon("document-save")); - m_actionSave->setShortcut(QKeySequence(tr("Ctrl+S"))); + m_actionSave->setShortcut(QKeySequence::Save); //m_actionSave->setDisabled(true); connect(m_actionSave, SIGNAL(triggered(bool)), SLOT(save())); m_actionSaveAs = new QAction(this); m_actionSaveAs->setText(tr("Save &As...")); m_actionSaveAs->setIcon(loadIcon("document-save-as")); + m_actionSaveAs->setShortcut(QKeySequence::SaveAs); //m_actionSaveAs->setDisabled(true); connect(m_actionSaveAs, SIGNAL(triggered(bool)), SLOT(saveAs())); @@ -240,13 +241,13 @@ MainWindow::setupActions() d->printAction = new QAction(this); d->printAction->setText(tr("&Print...")); d->printAction->setIcon(loadIcon("document-print")); - d->printAction->setShortcut(QKeySequence(tr("Ctrl+P"))); + d->printAction->setShortcut(QKeySequence::Print); connect(d->printAction, SIGNAL(triggered(bool)), SLOT(print())); d->printPreviewAction = new QAction(this); d->printPreviewAction->setText(tr("Print Previe&w...")); d->printPreviewAction->setIcon(loadIcon("document-print-preview")); - d->printPreviewAction->setShortcut(QKeySequence(tr("Ctrl+Shift+P"))); + d->printPreviewAction->setShortcut(QKeySequence("Ctrl+Shift+P")); connect(d->printPreviewAction, SIGNAL(triggered(bool)), SLOT(printPreview())); for (int i = 0; i < MaxRecentFiles; i++) { @@ -272,10 +273,10 @@ MainWindow::setupActions() m_actionSwitchMode[2]->setCheckable(true); m_actionUndo = new QAction(tr("&Undo"), this); - m_actionUndo->setShortcut(QKeySequence(tr("Ctrl+Z"))); + m_actionUndo->setShortcut(QKeySequence::Undo); m_actionUndo->setIcon(loadIcon("edit-undo")); m_actionRedo = new QAction(tr("Re&do"), this); - m_actionRedo->setShortcut(QKeySequence(tr("Ctrl+Shift+Z"))); + m_actionRedo->setShortcut(QKeySequence::Redo); m_actionRedo->setIcon(loadIcon("edit-redo")); connect(m_actionSwitchMode[0], SIGNAL(triggered(bool)), SLOT(switchModeSelect())); @@ -285,25 +286,25 @@ MainWindow::setupActions() m_actionCut = new QAction(this); m_actionCut->setText(tr("Cu&t")); m_actionCut->setIcon(loadIcon("edit-cut")); - m_actionCut->setShortcut(QKeySequence(tr("Ctrl+X"))); + m_actionCut->setShortcut(QKeySequence::Cut); connect(m_actionCut, SIGNAL(triggered(bool)), SLOT(cut())); m_actionCopy = new QAction(this); m_actionCopy->setText(tr("&Copy")); m_actionCopy->setIcon(loadIcon("edit-copy")); - m_actionCopy->setShortcut(QKeySequence(tr("Ctrl+C"))); + m_actionCopy->setShortcut(QKeySequence::Copy); connect(m_actionCopy, SIGNAL(triggered(bool)), SLOT(copy())); m_actionPaste = new QAction(this); m_actionPaste->setText(tr("&Paste")); m_actionPaste->setIcon(loadIcon("edit-paste")); - m_actionPaste->setShortcut(QKeySequence(tr("Ctrl+V"))); + m_actionPaste->setShortcut(QKeySequence::Paste); connect(m_actionPaste, SIGNAL(triggered(bool)), SLOT(paste())); m_actionDelete = new QAction(this); m_actionDelete->setText(tr("&Delete")); m_actionDelete->setIcon(loadIcon("edit-delete")); - m_actionDelete->setShortcut(QKeySequence(tr("Del"))); + m_actionDelete->setShortcut(QKeySequence::Delete); connect(m_actionDelete, SIGNAL(triggered(bool)), SLOT(deleteSelectedItems())); m_actionAbout = new QAction(this); @@ -313,13 +314,13 @@ MainWindow::setupActions() m_actionClose = new QAction(this); m_actionClose->setText(tr("&Close")); m_actionClose->setIcon(loadIcon("window-close")); - m_actionClose->setShortcut(QKeySequence(tr("Ctrl+W"))); + m_actionClose->setShortcut(QKeySequence::Close); connect(m_actionClose, SIGNAL(triggered(bool)), SLOT(closeDocument())); m_actionQuit = new QAction(this); m_actionQuit->setText(tr("&Quit")); m_actionQuit->setIcon(loadIcon("application-exit")); - m_actionQuit->setShortcut(QKeySequence(tr("Ctrl+Q"))); + m_actionQuit->setShortcut(QKeySequence("Ctrl+Q")); connect(m_actionQuit, SIGNAL(triggered(bool)), SLOT(closeAll())); m_actionShowGrid = new QAction(this); -- cgit v1.2.3-54-g00ecf