summaryrefslogtreecommitdiff
path: root/src/mainwin.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainwin.cc')
-rw-r--r--src/mainwin.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mainwin.cc b/src/mainwin.cc
index be82d26..9944f67 100644
--- a/src/mainwin.cc
+++ b/src/mainwin.cc
@@ -218,8 +218,12 @@ MainWindow::MainWindow(const QString &filename)
connect(this->fileActionReload, SIGNAL(triggered()), this, SLOT(actionReload()));
connect(this->fileActionQuit, SIGNAL(triggered()), this, SLOT(quit()));
#ifndef __APPLE__
- this->fileActionSave->setShortcut(QKeySequence(Qt::Key_F2));
- this->fileActionReload->setShortcut(QKeySequence(Qt::Key_F3));
+ QList<QKeySequence> shortcuts = this->fileActionSave->shortcuts();
+ shortcuts.push_back(QKeySequence(Qt::Key_F2));
+ this->fileActionSave->setShortcuts(shortcuts);
+ shortcuts = this->fileActionReload->shortcuts();
+ shortcuts.push_back(QKeySequence(Qt::Key_F3));
+ this->fileActionReload->setShortcuts(shortcuts);
#endif
// Open Recent
for (int i = 0;i<maxRecentFiles; i++) {
@@ -872,7 +876,6 @@ void MainWindow::compileCSG(bool procevents)
this->thrownTogetherRenderer = new ThrownTogetherRenderer(this->root_chain,
this->highlights_chain,
this->background_chain);
-
PRINT("CSG generation finished.");
int s = t.elapsed() / 1000;
PRINTF("Total rendering time: %d hours, %d minutes, %d seconds", s / (60*60), (s / 60) % 60, s % 60);
contact: Jan Huwald // Impressum