comparison main/MainWindow.cpp @ 163:652b22dcd4ed

* Add mouse actions to key and mouse reference dialog
* Use QDialogButtonBox in all dialogs, for proper button ordering across
  platforms (requires Qt 4.2)
* Fix #1733610 program does not exit if preferences dialog visible on close

     delete m_playTarget;
     delete m_playSource;
     delete m_viewManager;
     delete m_oscQueue;
     delete m_keyReference;
+    delete m_preferencesDialog;
     Profiles::getInstance()->dump();
 }
 
 QString
 MainWindow::getOpenFileName(FileFinder::FileType type)

             this, SLOT(insertInstant()));
     m_keyReference->registerAlternativeShortcut(action, shortcut);
 
     action = new QAction(tr("Insert Instants at Selection &Boundaries"), this);
     action->setShortcut(tr("Shift+Enter"));
-    action->setStatusTip(tr("Insert new time instants at the start and end of the current selection, in a new layer if necessary"));
+    action->setStatusTip(tr("Insert new time instants at the start and end of the current selected regions, in a new layer if necessary"));
     connect(action, SIGNAL(triggered()), this, SLOT(insertInstantsAtBoundaries()));
     connect(this, SIGNAL(canInsertInstantsAtBoundaries(bool)), action, SLOT(setEnabled(bool)));
     m_keyReference->registerShortcut(action);
     menu->addAction(action);
 }

 
                         if (isDefault) {
                             action = new QAction(icon, actionText, this);
                             if (!model || model == getMainModel()) {
                                 action->setShortcut(shortcutText); 
-                                m_keyReference->registerShortcut(action);
                             }
                         } else {
                             action = new QAction(actionText, this);
                         }
 

     setupExistingLayersMenus();
 
     m_rightButtonLayerMenu->addSeparator();
     menu->addSeparator();
 
-    action = new QAction(tr("&Rename Layer..."), this);
-    action->setShortcut(tr("R"));
-    action->setStatusTip(tr("Rename the currently active layer"));
-    connect(action, SIGNAL(triggered()), this, SLOT(renameCurrentLayer()));
-    connect(this, SIGNAL(canRenameLayer(bool)), action, SLOT(setEnabled(bool)));
-    m_keyReference->registerShortcut(action);
-    menu->addAction(action);
-    m_rightButtonLayerMenu->addAction(action);
+    QAction *raction = new QAction(tr("&Rename Layer..."), this);
+    raction->setShortcut(tr("R"));
+    raction->setStatusTip(tr("Rename the currently active layer"));
+    connect(raction, SIGNAL(triggered()), this, SLOT(renameCurrentLayer()));
+    connect(this, SIGNAL(canRenameLayer(bool)), raction, SLOT(setEnabled(bool)));
+    menu->addAction(raction);
+    m_rightButtonLayerMenu->addAction(raction);
 
     action = new QAction(QIcon(":/icons/editdelete.png"), tr("&Delete Layer"), this);
     action->setShortcut(tr("Ctrl+D"));
     action->setStatusTip(tr("Delete the currently active layer"));
     connect(action, SIGNAL(triggered()), this, SLOT(deleteCurrentLayer()));
     connect(this, SIGNAL(canDeleteCurrentLayer(bool)), action, SLOT(setEnabled(bool)));
     m_keyReference->registerShortcut(action);
     menu->addAction(action);
     m_rightButtonLayerMenu->addAction(action);
+
+    m_keyReference->registerShortcut(raction); // rename after delete, so delete layer goes next to delete pane
 }
 
 void
 MainWindow::setupTransformsMenu()
 {

     action = new QAction(tr("Sonic Visualiser on the &Web"), this); 
     action->setStatusTip(tr("Open the Sonic Visualiser website")); 
     connect(action, SIGNAL(triggered()), this, SLOT(website()));
     menu->addAction(action);
 
-    action = new QAction(tr("&Key Reference"), this);
+    action = new QAction(tr("&Key and Mouse Reference"), this);
     action->setShortcut(tr("F2"));
     action->setStatusTip(tr("Open a window showing the keystrokes you can use in Sonic Visualiser"));
     connect(action, SIGNAL(triggered()), this, SLOT(keyReference()));
     m_keyReference->registerShortcut(action);
     menu->addAction(action);

 	QAction *action = new QAction(files[i], this);
 	connect(action, SIGNAL(triggered()), this, SLOT(openRecentFile()));
         if (i == 0) {
             action->setShortcut(tr("Ctrl+R"));
             m_keyReference->registerShortcut
-                (action, tr("Re-open the most recently opened file"));
+                (tr("Re-open"),
+                 action->shortcut(),
+                 tr("Re-open the current or most recently opened file"));
         }
 	m_recentFilesMenu->addAction(action);
     }
 }
 

             continue;
         }
         if (i == 0) {
             ti->second->setShortcut(tr("Ctrl+T"));
             m_keyReference->registerShortcut
-                (tr("Re-run the most recently run transform"),
+                (tr("Repeat Transform"),
                  ti->second->shortcut(),
-                 "");
+                 tr("Re-select the most recently run transform"));
         }
 	m_recentTransformsMenu->addAction(ti->second);
     }
 }
 

     connect(this, SIGNAL(canPlay(bool)), rwdStartAction, SLOT(setEnabled(bool)));
 
     QAction *m_rwdAction = toolbar->addAction(QIcon(":/icons/rewind.png"),
                                               tr("Rewind"));
     m_rwdAction->setShortcut(tr("PgUp"));
+    m_rwdAction->setStatusTip(tr("Rewind to the previous time instant or time ruler notch"));
     connect(m_rwdAction, SIGNAL(triggered()), this, SLOT(rewind()));
     connect(this, SIGNAL(canRewind(bool)), m_rwdAction, SLOT(setEnabled(bool)));
 
     QAction *playAction = toolbar->addAction(QIcon(":/icons/playpause.png"),
                                              tr("Play / Pause"));

     connect(this, SIGNAL(canPlay(bool)), playAction, SLOT(setEnabled(bool)));
 
     m_ffwdAction = toolbar->addAction(QIcon(":/icons/ffwd.png"),
                                               tr("Fast Forward"));
     m_ffwdAction->setShortcut(tr("PgDown"));
+    m_ffwdAction->setStatusTip(tr("Fast-forward to the next time instant or time ruler notch"));
     connect(m_ffwdAction, SIGNAL(triggered()), this, SLOT(ffwd()));
     connect(this, SIGNAL(canFfwd(bool)), m_ffwdAction, SLOT(setEnabled(bool)));
 
     QAction *ffwdEndAction = toolbar->addAction(QIcon(":/icons/ffwd-end.png"),
                                                 tr("Fast Forward to End"));

     QAction *psAction = toolbar->addAction(QIcon(":/icons/playselection.png"),
                                            tr("Constrain Playback to Selection"));
     psAction->setCheckable(true);
     psAction->setChecked(m_viewManager->getPlaySelectionMode());
     psAction->setShortcut(tr("s"));
-    psAction->setStatusTip(tr("Constrain playback to the selected area"));
+    psAction->setStatusTip(tr("Constrain playback to the selected regions"));
     connect(m_viewManager, SIGNAL(playSelectionModeChanged(bool)),
             psAction, SLOT(setChecked(bool)));
     connect(psAction, SIGNAL(triggered()), this, SLOT(playSelectionToggled()));
     connect(this, SIGNAL(canPlaySelection(bool)), psAction, SLOT(setEnabled(bool)));
 

     m_rightButtonPlaybackMenu->addAction(ffwdEndAction);
     m_rightButtonPlaybackMenu->addSeparator();
 
     QAction *fastAction = menu->addAction(tr("Speed Up"));
     fastAction->setShortcut(tr("Ctrl+PgUp"));
+    fastAction->setStatusTip(tr("Time-stretch playback to speed it up without changing pitch"));
     connect(fastAction, SIGNAL(triggered()), this, SLOT(speedUpPlayback()));
     connect(this, SIGNAL(canSpeedUpPlayback(bool)), fastAction, SLOT(setEnabled(bool)));
     
     QAction *slowAction = menu->addAction(tr("Slow Down"));
     slowAction->setShortcut(tr("Ctrl+PgDown"));
+    slowAction->setStatusTip(tr("Time-stretch playback to slow it down without changing pitch"));
     connect(slowAction, SIGNAL(triggered()), this, SLOT(slowDownPlayback()));
     connect(this, SIGNAL(canSlowDownPlayback(bool)), slowAction, SLOT(setEnabled(bool)));
 
     QAction *normalAction = menu->addAction(tr("Restore Normal Speed"));
     normalAction->setShortcut(tr("Ctrl+Home"));
+    normalAction->setStatusTip(tr("Restore non-time-stretched playback"));
     connect(normalAction, SIGNAL(triggered()), this, SLOT(restoreNormalPlayback()));
     connect(this, SIGNAL(canChangePlaybackSpeed(bool)), normalAction, SLOT(setEnabled(bool)));
 
     m_keyReference->registerShortcut(fastAction);
     m_keyReference->registerShortcut(slowAction);

 //    connect(action, SIGNAL(triggered()), this, SLOT(toolTextSelected()));
 //    group->addAction(action);
 //    m_toolActions[ViewManager::TextMode] = action;
 
     toolNavigateSelected();
+
+    Pane::registerShortcuts(*m_keyReference);
 }
 
 void
 MainWindow::updateMenuStates()
 {

     settings.beginGroup("MainWindow");
     settings.setValue("size", size());
     settings.setValue("position", pos());
     settings.endGroup();
 
+    delete m_keyReference;
+    m_keyReference = 0;
+
+    closeSession();
+    if (m_preferencesDialog &&
+        m_preferencesDialog->isVisible()) {
+        m_preferencesDialog->applicationClosing(false);
+    }
+
     e->accept();
     return;
 }
 
 bool
 MainWindow::commitData(bool mayAskUser)
 {
     if (mayAskUser) {
-        return checkSaveModified();
+        bool rv = checkSaveModified();
+        if (rv) {
+            if (m_preferencesDialog &&
+                m_preferencesDialog->isVisible()) {
+                m_preferencesDialog->applicationClosing(false);
+            }
+        }
+        return rv;
     } else {
+        if (m_preferencesDialog &&
+            m_preferencesDialog->isVisible()) {
+            m_preferencesDialog->applicationClosing(true);
+        }
         if (!m_documentModified) return true;
 
         // If we can't check with the user first, then we can't save
         // to the original session file (even if we have it) -- have
         // to use a temporary file