[Sv1-commits] SF.net SVN: sv1:[1693] sonic-visualiser/tags
Brought to you by:
cannam
Menu
▾
▴
[Sv1-commits] SF.net SVN: sv1:[1693] sonic-visualiser/tags
|
From: <ca...@us...> - 2010-05-05 16:22:49
|
Revision: 1693
http://sv1.svn.sourceforge.net/sv1/?rev=1693&view=rev
Author: cannam
Date: 2010-05-05 16:22:41 +0000 (Wed, 05 May 2010)
Log Message:
-----------
* Tag for 1.7.2
Added Paths:
-----------
sonic-visualiser/tags/sv-v1.7.2/
sonic-visualiser/tags/sv-v1.7.2/INSTALL
sonic-visualiser/tags/sv-v1.7.2/INSTALL.ubuntu
sonic-visualiser/tags/sv-v1.7.2/sv/main/MainWindow.cpp
sonic-visualiser/tags/sv-v1.7.2/sv/main/Surveyer.cpp
sonic-visualiser/tags/sv-v1.7.2/version.h
Removed Paths:
-------------
sonic-visualiser/tags/sv-v1.7.2/INSTALL
sonic-visualiser/tags/sv-v1.7.2/sv/main/MainWindow.cpp
sonic-visualiser/tags/sv-v1.7.2/sv/main/Surveyer.cpp
sonic-visualiser/tags/sv-v1.7.2/version.h
Property changes on: sonic-visualiser/tags/sv-v1.7.2
___________________________________________________________________
Added: svn:mergeinfo
+ /sonic-visualiser/branches/one-fftdataserver-per-fftmodel:1406-1415
Deleted: sonic-visualiser/tags/sv-v1.7.2/INSTALL
===================================================================
--- sonic-visualiser/trunk/INSTALL 2010-05-05 14:45:32 UTC (rev 1690)
+++ sonic-visualiser/tags/sv-v1.7.2/INSTALL 2010-05-05 16:22:41 UTC (rev 1693)
@@ -1,139 +0,0 @@
-
-To compile from source
-----------------------
-
-First, please consider getting one of the ready-to-run binary
-distributions available from http://www.sonicvisualiser.org/ .
-
-The following additional libraries are required or optional when
-building Sonic Visualiser:
-
-REQUIRED Vamp Plugin SDK v2.0 http://www.vamp-plugins.org/
-
-REQUIRED Qt4 Free Edition http://www.trolltech.com/
-REQUIRED libsndfile http://www.mega-nerd.com/libsndfile/
-REQUIRED libsamplerate http://www.mega-nerd.com/SRC/
-REQUIRED FFTW3 http://www.fftw.org/
-REQUIRED bzip2 library http://www.bzip.org/
-REQUIRED Redland RDF libraries http://librdf.org/
-REQUIRED Rubber Band http://www.breakfastquay.com/rubberband/
-
-Optional JACK http://www.jackaudio.org/
-Optional PortAudio v18 or v19 http://www.portaudio.com/
-Optional PulseAudio http://www.pulseaudio.org/
-Optional MAD mp3 decoder http://www.underbit.com/products/mad/
-Optional Oggz and fishsound http://www.annodex.net/software/libraries.html
-Optional liblo OSC library http://www.plugin.org.uk/liblo/
-
-Although JACK, PortAudio, and PulseAudio are individually optional,
-you will need to have one or the other of them in order to get any
-audio playback. Usually JACK is preferred on Linux with PulseAudio as
-a backup, and PortAudio is used elsewhere.
-
-The Redland RDF libraries include the Raptor RDF parser library,
-Rasqal RDF query library, and librdf, the Redland RDF datastore (which
-depends on both of those). Sonic Visualiser uses Rasqal and Redland
-directly, and so indirectly also requires Raptor. For best
-performance it's strongly recommended that you build with Redland
-1.0.8 or newer.
-
-On Linux, you will need the ALSA libraries (used for MIDI).
-
-If you happen to be using a Debian-based Linux, you probably want to
-apt-get install the following packages: libqt4-dev libsndfile1-dev
-libsamplerate0-dev fftw3-dev libbz2-dev libjack-dev libmad0-dev
-liboggz1-dev libfishsound1-dev liblo0-dev liblrdf0-dev librdf0-dev .
-
-If you are building on a Unix-like system that supports pkg-config and
-uses it for all appropriate libraries (such as a modern Linux
-distribution) then you should be able to just run "qmake" (being
-careful to ensure it is the Qt 4 version of qmake you are running, and
-not a Qt 3 version).
-
-If you do not have pkg-config, you should first edit the file prf/sv.prf
-and comment out any of the optional HAVE_* lines (in the section
-starting "If you don't have pkg-config...") for library dependencies
-that you aren't using. Then run the Qt 4 "qmake" command. This will
-create the proper Makefile.
-
-(If you're on the Mac and you have Qt3 installed as well, you must
-export QMAKESPEC=macx-g++ before you do this, or Qt will get confused.)
-
-Then type "make". The program will then either build, or not build.
-If it builds, the result will be a binary file in sv/sonic-visualiser
-(on Linux) or sv/release/Sonic Visualiser.exe (on Win32), or a bundle
-in sv/Sonic Visualiser.app. There should be nothing to install apart
-from the executable itself and any of the above listed third-party
-shared libraries that are not already installed.
-
-
-Qt Library Version Requirements
--------------------------------
-
-Sonic Visualiser requires Qt version 4.3 or newer. It can not be
-built with Qt3 or with Qt 4.0.x, 4.1.x, or 4.2.x.
-
-
-A Note on SV Library Dependencies
----------------------------------
-
-Sonic Visualiser compiles as a set of static libraries, with various
-dependencies. In some cases these dependencies are circular (which
-may indicate a design flaw, or a "deliberate compromise"). You
-shouldn't need to know any of this just to build SV, but it may be of
-interest to developers.
-
-
- Library Provides Depends on
- ------- -------- ----------
-
- audioio Audio playback
- -> base data plugin
- -> QtCore
-
- base Miscellaneous handy classes
- -> system
- -> QtCore
-
- data File & network I/O
- FFT cache
- Data model abstraction classes
- -> base
- -> QtNetwork QtXml QtGui QtCore
-
- framework Application base classes
- -> base layer view transform data widgets
- -> QtNetwork QtXml QtGui QtCore
-
- layer Display layer implementations
- -> base data view widgets
- -> QtXml QtGui QtCore
-
- plugin Plugin loaders and interface classes
- -> base system
- -> QtXml QtCore
-
- sv Main application classes
- -> base data view widgets framework
- transform layer audioio
- -> QtNetwork QtXml QtGui QtCore
-
- system Platform helper functions
-
- transform Model-to-model data processing
- -> base data plugin widgets
- -> QtXml QtGui QtCore
-
- rdf RDF data discovery and querying
- -> base data plugin transform
- -> QtNetwork QtGui QtCore
-
- view View and pane widgets
- -> base data layer widgets
- -> QtXml QtGui QtCore
-
- widgets Widget and other GUI classes
- -> base data layer plugin view
- -> QtXml QtGui QtCore
-
-
Copied: sonic-visualiser/tags/sv-v1.7.2/INSTALL (from rev 1691, sonic-visualiser/trunk/INSTALL)
===================================================================
--- sonic-visualiser/tags/sv-v1.7.2/INSTALL (rev 0)
+++ sonic-visualiser/tags/sv-v1.7.2/INSTALL 2010-05-05 16:22:41 UTC (rev 1693)
@@ -0,0 +1,145 @@
+
+To compile from source
+----------------------
+
+First, please consider getting one of the ready-to-run binary
+distributions available from http://www.sonicvisualiser.org/ .
+
+This file provides various instructions useful when compiling Sonic
+Visualiser from source, but it doesn't have a complete recipe for any
+one platform -- there are too many variables. However, you can find a
+recipe for one platform (Ubuntu Linux) in the file INSTALL.ubuntu.
+
+The following additional libraries are required or optional when
+building Sonic Visualiser:
+
+REQUIRED Vamp Plugin SDK v2.0 http://www.vamp-plugins.org/
+
+REQUIRED Qt4 Free Edition http://www.trolltech.com/
+REQUIRED libsndfile http://www.mega-nerd.com/libsndfile/
+REQUIRED libsamplerate http://www.mega-nerd.com/SRC/
+REQUIRED FFTW3 http://www.fftw.org/
+REQUIRED bzip2 library http://www.bzip.org/
+REQUIRED Redland RDF libraries http://librdf.org/
+REQUIRED Rubber Band http://www.breakfastquay.com/rubberband/
+
+Optional JACK http://www.jackaudio.org/
+Optional PortAudio v18 or v19 http://www.portaudio.com/
+Optional PulseAudio http://www.pulseaudio.org/
+Optional MAD mp3 decoder http://www.underbit.com/products/mad/
+Optional Oggz and fishsound http://www.annodex.net/software/libraries.html
+Optional liblo OSC library http://www.plugin.org.uk/liblo/
+
+Although JACK, PortAudio, and PulseAudio are individually optional,
+you will need to have one or the other of them in order to get any
+audio playback. Usually JACK is preferred on Linux with PulseAudio as
+a backup, and PortAudio is used elsewhere.
+
+The Redland RDF libraries include the Raptor RDF parser library,
+Rasqal RDF query library, and librdf, the Redland RDF datastore (which
+depends on both of those). Sonic Visualiser uses Rasqal and Redland
+directly, and so indirectly also requires Raptor. For best
+performance it's strongly recommended that you build with Redland
+1.0.8 or newer.
+
+On Linux, you will need the ALSA libraries (used for MIDI).
+
+If you happen to be using a Debian-based Linux, you probably want to
+apt-get install the following packages: libqt4-dev libsndfile1-dev
+libsamplerate0-dev fftw3-dev libbz2-dev libjack-dev libmad0-dev
+liboggz1-dev libfishsound1-dev libasound2-dev liblo0-dev liblrdf0-dev
+librdf0-dev .
+
+If you are building on a Unix-like system that supports pkg-config and
+uses it for all appropriate libraries (such as a modern Linux
+distribution) then you should be able to just run "qmake" (being
+careful to ensure it is the Qt 4 version of qmake you are running, and
+not a Qt 3 version).
+
+If you do not have pkg-config, you should first edit the file prf/sv.prf
+and comment out any of the optional HAVE_* lines (in the section
+starting "If you don't have pkg-config...") for library dependencies
+that you aren't using. Then run the Qt 4 "qmake" command. This will
+create the proper Makefile.
+
+(If you're on the Mac and you have Qt3 installed as well, you must
+export QMAKESPEC=macx-g++ before you do this, or Qt will get confused.)
+
+Then type "make". The program will then either build, or not build.
+If it builds, the result will be a binary file in sv/sonic-visualiser
+(on Linux) or sv/release/Sonic Visualiser.exe (on Win32), or a bundle
+in sv/Sonic Visualiser.app. There should be nothing to install apart
+from the executable itself and any of the above listed third-party
+shared libraries that are not already installed.
+
+
+Qt Library Version Requirements
+-------------------------------
+
+Sonic Visualiser requires Qt version 4.3 or newer. It can not be
+built with Qt3 or with Qt 4.0.x, 4.1.x, or 4.2.x.
+
+
+A Note on SV Library Dependencies
+---------------------------------
+
+Sonic Visualiser compiles as a set of static libraries, with various
+dependencies. In some cases these dependencies are circular (which
+may indicate a design flaw, or a "deliberate compromise"). You
+shouldn't need to know any of this just to build SV, but it may be of
+interest to developers.
+
+
+ Library Provides Depends on
+ ------- -------- ----------
+
+ audioio Audio playback
+ -> base data plugin
+ -> QtCore
+
+ base Miscellaneous handy classes
+ -> system
+ -> QtCore
+
+ data File & network I/O
+ FFT cache
+ Data model abstraction classes
+ -> base
+ -> QtNetwork QtXml QtGui QtCore
+
+ framework Application base classes
+ -> base layer view transform data widgets
+ -> QtNetwork QtXml QtGui QtCore
+
+ layer Display layer implementations
+ -> base data view widgets
+ -> QtXml QtGui QtCore
+
+ plugin Plugin loaders and interface classes
+ -> base system
+ -> QtXml QtCore
+
+ sv Main application classes
+ -> base data view widgets framework
+ transform layer audioio
+ -> QtNetwork QtXml QtGui QtCore
+
+ system Platform helper functions
+
+ transform Model-to-model data processing
+ -> base data plugin widgets
+ -> QtXml QtGui QtCore
+
+ rdf RDF data discovery and querying
+ -> base data plugin transform
+ -> QtNetwork QtGui QtCore
+
+ view View and pane widgets
+ -> base data layer widgets
+ -> QtXml QtGui QtCore
+
+ widgets Widget and other GUI classes
+ -> base data layer plugin view
+ -> QtXml QtGui QtCore
+
+
Copied: sonic-visualiser/tags/sv-v1.7.2/INSTALL.ubuntu (from rev 1691, sonic-visualiser/trunk/INSTALL.ubuntu)
===================================================================
--- sonic-visualiser/tags/sv-v1.7.2/INSTALL.ubuntu (rev 0)
+++ sonic-visualiser/tags/sv-v1.7.2/INSTALL.ubuntu 2010-05-05 16:22:41 UTC (rev 1693)
@@ -0,0 +1,23 @@
+
+To compile Sonic Visualiser from source in Ubuntu 10.04
+-------------------------------------------------------
+
+See INSTALL for general notes on compilation. This is a specific
+recipe for Ubuntu 10.04.
+
+Starting from a clean installation of Ubuntu 10.04 desktop edition,
+with a working network connection, with the Sonic Visualiser source
+code unpacked into $HOME/sonic-visualiser:
+
+$ cd sonic-visualiser
+$ sudo apt-get update
+$ sudo apt-get install build-essential libqt4-dev libsndfile-dev libsamplerate-dev fftw3-dev libbz2-dev libjack-dev libasound-dev libmad0-dev liboggz-dev libfishsound-dev liblo-dev liblrdf-dev librdf-dev librubberband-dev vamp-plugin-sdk
+$ qmake-qt4
+$ make
+
+And wait for some time for the build to complete.
+
+You should now have an executable file at sv/sonic-visualiser. You
+don't need to properly install this -- just run it in place, or copy
+it to wherever you like.
+
Deleted: sonic-visualiser/tags/sv-v1.7.2/sv/main/MainWindow.cpp
===================================================================
--- sonic-visualiser/trunk/sv/main/MainWindow.cpp 2010-05-05 14:45:32 UTC (rev 1690)
+++ sonic-visualiser/tags/sv-v1.7.2/sv/main/MainWindow.cpp 2010-05-05 16:22:41 UTC (rev 1693)
@@ -1,4068 +0,0 @@
-/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
-
-/*
- Sonic Visualiser
- An audio file viewer and annotation editor.
- Centre for Digital Music, Queen Mary, University of London.
- This file copyright 2006-2007 Chris Cannam and QMUL.
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version. See the file
- COPYING included with this distribution for more information.
-*/
-
-#include "../version.h"
-
-#include "MainWindow.h"
-#include "PreferencesDialog.h"
-
-#include "view/Pane.h"
-#include "view/PaneStack.h"
-#include "data/model/WaveFileModel.h"
-#include "data/model/SparseOneDimensionalModel.h"
-#include "data/model/NoteModel.h"
-#include "data/model/Labeller.h"
-#include "data/osc/OSCQueue.h"
-#include "framework/Document.h"
-#include "view/ViewManager.h"
-#include "base/Preferences.h"
-#include "layer/WaveformLayer.h"
-#include "layer/TimeRulerLayer.h"
-#include "layer/TimeInstantLayer.h"
-#include "layer/TimeValueLayer.h"
-#include "layer/NoteLayer.h"
-#include "layer/Colour3DPlotLayer.h"
-#include "layer/SliceLayer.h"
-#include "layer/SliceableLayer.h"
-#include "layer/ImageLayer.h"
-#include "layer/RegionLayer.h"
-#include "widgets/Fader.h"
-#include "view/Overview.h"
-#include "widgets/PropertyBox.h"
-#include "widgets/PropertyStack.h"
-#include "widgets/AudioDial.h"
-#include "widgets/IconLoader.h"
-#include "widgets/LayerTreeDialog.h"
-#include "widgets/ListInputDialog.h"
-#include "widgets/SubdividingMenu.h"
-#include "widgets/NotifyingPushButton.h"
-#include "widgets/KeyReference.h"
-#include "widgets/TransformFinder.h"
-#include "widgets/LabelCounterInputDialog.h"
-#include "widgets/ActivityLog.h"
-#include "audioio/AudioCallbackPlaySource.h"
-#include "audioio/AudioCallbackPlayTarget.h"
-#include "audioio/AudioTargetFactory.h"
-#include "audioio/PlaySpeedRangeMapper.h"
-#include "data/fileio/DataFileReaderFactory.h"
-#include "data/fileio/PlaylistFileReader.h"
-#include "data/fileio/WavFileWriter.h"
-#include "data/fileio/CSVFileWriter.h"
-#include "data/fileio/MIDIFileWriter.h"
-#include "data/fileio/BZipFileDevice.h"
-#include "data/fileio/FileSource.h"
-#include "data/fft/FFTDataServer.h"
-#include "data/midi/MIDIInput.h"
-#include "base/RecentFiles.h"
-#include "transform/TransformFactory.h"
-#include "transform/ModelTransformerFactory.h"
-#include "base/PlayParameterRepository.h"
-#include "base/XmlExportable.h"
-#include "widgets/CommandHistory.h"
-#include "base/Profiler.h"
-#include "base/Clipboard.h"
-#include "base/UnitDatabase.h"
-#include "layer/ColourDatabase.h"
-#include "widgets/ModelDataTableDialog.h"
-#include "rdf/PluginRDFIndexer.h"
-#include "rdf/RDFExporter.h"
-
-#include "Surveyer.h"
-#include "framework/VersionTester.h"
-
-// For version information
-#include <vamp/vamp.h>
-#include <vamp-hostsdk/PluginBase.h>
-#include "plugin/api/ladspa.h"
-#include "plugin/api/dssi.h"
-
-#include <QApplication>
-#include <QMessageBox>
-#include <QGridLayout>
-#include <QLabel>
-#include <QAction>
-#include <QMenuBar>
-#include <QToolBar>
-#include <QInputDialog>
-#include <QStatusBar>
-#include <QTreeView>
-#include <QFile>
-#include <QFileInfo>
-#include <QDir>
-#include <QTextStream>
-#include <QProcess>
-#include <QShortcut>
-#include <QSettings>
-#include <QDateTime>
-#include <QProcess>
-#include <QCheckBox>
-#include <QRegExp>
-#include <QScrollArea>
-
-#include <iostream>
-#include <cstdio>
-#include <errno.h>
-
-using std::cerr;
-using std::endl;
-
-using std::vector;
-using std::map;
-using std::set;
-
-
-MainWindow::MainWindow(bool withAudioOutput, bool withOSCSupport) :
- MainWindowBase(withAudioOutput, withOSCSupport, true),
- m_overview(0),
- m_mainMenusCreated(false),
- m_paneMenu(0),
- m_layerMenu(0),
- m_transformsMenu(0),
- m_playbackMenu(0),
- m_existingLayersMenu(0),
- m_sliceMenu(0),
- m_recentFilesMenu(0),
- m_recentTransformsMenu(0),
- m_rightButtonMenu(0),
- m_rightButtonLayerMenu(0),
- m_rightButtonTransformsMenu(0),
- m_rightButtonPlaybackMenu(0),
- m_soloAction(0),
- m_soloModified(false),
- m_prevSolo(false),
- m_rwdStartAction(0),
- m_rwdSimilarAction(0),
- m_rwdAction(0),
- m_ffwdAction(0),
- m_ffwdSimilarAction(0),
- m_ffwdEndAction(0),
- m_playAction(0),
- m_playSelectionAction(0),
- m_playLoopAction(0),
- m_playControlsSpacer(0),
- m_playControlsWidth(0),
- m_preferencesDialog(0),
- m_layerTreeDialog(0),
- m_activityLog(new ActivityLog()),
- m_keyReference(new KeyReference())
-{
- Profiler profiler("MainWindow::MainWindow");
-
- setWindowTitle(tr("Sonic Visualiser"));
-
- UnitDatabase *udb = UnitDatabase::getInstance();
- udb->registerUnit("Hz");
- udb->registerUnit("dB");
- udb->registerUnit("s");
-
- ColourDatabase *cdb = ColourDatabase::getInstance();
- cdb->addColour(Qt::black, tr("Black"));
- cdb->addColour(Qt::darkRed, tr("Red"));
- cdb->addColour(Qt::darkBlue, tr("Blue"));
- cdb->addColour(Qt::darkGreen, tr("Green"));
- cdb->addColour(QColor(200, 50, 255), tr("Purple"));
- cdb->addColour(QColor(255, 150, 50), tr("Orange"));
- cdb->setUseDarkBackground(cdb->addColour(Qt::white, tr("White")), true);
- cdb->setUseDarkBackground(cdb->addColour(Qt::red, tr("Bright Red")), true);
- cdb->setUseDarkBackground(cdb->addColour(QColor(30, 150, 255), tr("Bright Blue")), true);
- cdb->setUseDarkBackground(cdb->addColour(Qt::green, tr("Bright Green")), true);
- cdb->setUseDarkBackground(cdb->addColour(QColor(225, 74, 255), tr("Bright Purple")), true);
- cdb->setUseDarkBackground(cdb->addColour(QColor(255, 188, 80), tr("Bright Orange")), true);
-
- QFrame *frame = new QFrame;
- setCentralWidget(frame);
-
- QGridLayout *layout = new QGridLayout;
-
- m_descriptionLabel = new QLabel; //!!! hang on, this is declared in base class -- should be declared and initialised by same class
-
- QScrollArea *scroll = new QScrollArea(frame);
- scroll->setWidgetResizable(true);
- scroll->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- scroll->setFrameShape(QFrame::NoFrame);
-
- scroll->setWidget(m_paneStack);
-
- m_overview = new Overview(frame);
- m_overview->setViewManager(m_viewManager);
- m_overview->setFixedHeight(40);
-#ifndef _WIN32
- // For some reason, the contents of the overview never appear if we
- // make this setting on Windows. I have no inclination at the moment
- // to track down the reason why.
- m_overview->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
-#endif
- connect(m_overview, SIGNAL(contextHelpChanged(const QString &)),
- this, SLOT(contextHelpChanged(const QString &)));
-
- m_panLayer = new WaveformLayer;
- m_panLayer->setChannelMode(WaveformLayer::MergeChannels);
- m_panLayer->setAggressiveCacheing(true);
- m_overview->addLayer(m_panLayer);
-
- if (m_viewManager->getGlobalDarkBackground()) {
- m_panLayer->setBaseColour
- (ColourDatabase::getInstance()->getColourIndex(tr("Bright Green")));
- } else {
- m_panLayer->setBaseColour
- (ColourDatabase::getInstance()->getColourIndex(tr("Green")));
- }
-
- m_fader = new Fader(frame, false);
- connect(m_fader, SIGNAL(mouseEntered()), this, SLOT(mouseEnteredWidget()));
- connect(m_fader, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget()));
-
- m_playSpeed = new AudioDial(frame);
- m_playSpeed->setMinimum(0);
- m_playSpeed->setMaximum(200);
- m_playSpeed->setValue(100);
- m_playSpeed->setFixedWidth(32);
- m_playSpeed->setFixedHeight(32);
- m_playSpeed->setNotchesVisible(true);
- m_playSpeed->setPageStep(10);
- m_playSpeed->setObjectName(tr("Playback Speedup"));
- m_playSpeed->setDefaultValue(100);
- m_playSpeed->setRangeMapper(new PlaySpeedRangeMapper(0, 200));
- m_playSpeed->setShowToolTip(true);
- connect(m_playSpeed, SIGNAL(valueChanged(int)),
- this, SLOT(playSpeedChanged(int)));
- connect(m_playSpeed, SIGNAL(mouseEntered()), this, SLOT(mouseEnteredWidget()));
- connect(m_playSpeed, SIGNAL(mouseLeft()), this, SLOT(mouseLeftWidget()));
-
- IconLoader il;
-
- QSettings settings;
- settings.beginGroup("MainWindow");
- settings.endGroup();
-
- m_playControlsSpacer = new QFrame;
-
- layout->setSpacing(4);
- layout->addWidget(scroll, 0, 0, 1, 5);
- layout->addWidget(m_overview, 1, 1);
- layout->addWidget(m_playControlsSpacer, 1, 2);
- layout->addWidget(m_playSpeed, 1, 3);
- layout->addWidget(m_fader, 1, 4);
-
- m_playControlsWidth =
- m_fader->width() + m_playSpeed->width() + layout->spacing() * 2;
-
- layout->setColumnMinimumWidth(0, 14);
- layout->setColumnStretch(0, 0);
-
- m_paneStack->setPropertyStackMinWidth(m_playControlsWidth
- + 2 + layout->spacing());
- m_playControlsSpacer->setFixedSize(QSize(2, 2));
-
- layout->setColumnStretch(1, 10);
-
- connect(m_paneStack, SIGNAL(propertyStacksResized(int)),
- this, SLOT(propertyStacksResized(int)));
-
- frame->setLayout(layout);
-
- setupMenus();
- setupToolbars();
- setupHelpMenu();
-
- statusBar();
- m_currentLabel = new QLabel;
- statusBar()->addPermanentWidget(m_currentLabel);
-
- connect(m_viewManager, SIGNAL(activity(QString)),
- m_activityLog, SLOT(activityHappened(QString)));
- connect(m_playSource, SIGNAL(activity(QString)),
- m_activityLog, SLOT(activityHappened(QString)));
- connect(CommandHistory::getInstance(), SIGNAL(activity(QString)),
- m_activityLog, SLOT(activityHappened(QString)));
- connect(this, SIGNAL(activity(QString)),
- m_activityLog, SLOT(activityHappened(QString)));
- connect(this, SIGNAL(replacedDocument()), this, SLOT(documentReplaced()));
- m_activityLog->hide();
-
- newSession();
-
- connect(m_midiInput, SIGNAL(eventsAvailable()),
- this, SLOT(midiEventsAvailable()));
-
- TransformFactory::getInstance()->startPopulationThread();
-
- Surveyer *surveyer = new Surveyer(this);
- VersionTester *vt = new VersionTester
- ("sonicvisualiser.org", "/latest-version.txt", SV_VERSION);
- connect(vt, SIGNAL(newerVersionAvailable(QString)),
- this, SLOT(newerVersionAvailable(QString)));
-}
-
-MainWindow::~MainWindow()
-{
-// std::cerr << "MainWindow::~MainWindow" << std::endl;
- delete m_keyReference;
- delete m_preferencesDialog;
- delete m_layerTreeDialog;
- Profiles::getInstance()->dump();
-// std::cerr << "MainWindow::~MainWindow finishing" << std::endl;
-}
-
-void
-MainWindow::setupMenus()
-{
- if (!m_mainMenusCreated) {
- m_rightButtonMenu = new QMenu();
-
- // No -- we don't want tear-off enabled on the right-button
- // menu. If it is enabled, then simply right-clicking and
- // releasing will pop up the menu, activate the tear-off, and
- // leave the torn-off menu window in front of the main window.
- // That isn't desirable. I'm not sure it ever would be, in a
- // context menu -- perhaps technically a Qt bug?
-// m_rightButtonMenu->setTearOffEnabled(true);
- }
-
- if (m_rightButtonLayerMenu) {
- m_rightButtonLayerMenu->clear();
- } else {
- m_rightButtonLayerMenu = m_rightButtonMenu->addMenu(tr("&Layer"));
- m_rightButtonLayerMenu->setTearOffEnabled(true);
- m_rightButtonMenu->addSeparator();
- }
-
- if (m_rightButtonTransformsMenu) {
- m_rightButtonTransformsMenu->clear();
- } else {
- m_rightButtonTransformsMenu = m_rightButtonMenu->addMenu(tr("&Transform"));
- m_rightButtonTransformsMenu->setTearOffEnabled(true);
- m_rightButtonMenu->addSeparator();
- }
-
- if (!m_mainMenusCreated) {
- CommandHistory::getInstance()->registerMenu(m_rightButtonMenu);
- m_rightButtonMenu->addSeparator();
- }
-
- setupFileMenu();
- setupEditMenu();
- setupViewMenu();
- setupPaneAndLayerMenus();
- setupTransformsMenu();
-
- m_mainMenusCreated = true;
-}
-
-void
-MainWindow::setupFileMenu()
-{
- if (m_mainMenusCreated) return;
-
- QMenu *menu = menuBar()->addMenu(tr("&File"));
- menu->setTearOffEnabled(true);
- QToolBar *toolbar = addToolBar(tr("File Toolbar"));
-
- m_keyReference->setCategory(tr("File and Session Management"));
-
- IconLoader il;
-
- QIcon icon = il.load("filenew");
- icon.addPixmap(il.loadPixmap("filenew-22"));
- QAction *action = new QAction(icon, tr("&New Session"), this);
- action->setShortcut(tr("Ctrl+N"));
- action->setStatusTip(tr("Abandon the current Sonic Visualiser session and start a new one"));
- connect(action, SIGNAL(triggered()), this, SLOT(newSession()));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
- toolbar->addAction(action);
-
- icon = il.load("fileopensession");
- action = new QAction(icon, tr("&Open Session..."), this);
- action->setShortcut(tr("Ctrl+O"));
- action->setStatusTip(tr("Open a previously saved Sonic Visualiser session file"));
- connect(action, SIGNAL(triggered()), this, SLOT(openSession()));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- icon = il.load("fileopen");
- icon.addPixmap(il.loadPixmap("fileopen-22"));
-
- action = new QAction(icon, tr("&Open..."), this);
- action->setStatusTip(tr("Open a session file, audio file, or layer"));
- connect(action, SIGNAL(triggered()), this, SLOT(openSomething()));
- toolbar->addAction(action);
-
- icon = il.load("filesave");
- icon.addPixmap(il.loadPixmap("filesave-22"));
- action = new QAction(icon, tr("&Save Session"), this);
- action->setShortcut(tr("Ctrl+S"));
- action->setStatusTip(tr("Save the current session into a Sonic Visualiser session file"));
- connect(action, SIGNAL(triggered()), this, SLOT(saveSession()));
- connect(this, SIGNAL(canSave(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
- toolbar->addAction(action);
-
- icon = il.load("filesaveas");
- icon.addPixmap(il.loadPixmap("filesaveas-22"));
- action = new QAction(icon, tr("Save Session &As..."), this);
- action->setShortcut(tr("Ctrl+Shift+S"));
- action->setStatusTip(tr("Save the current session into a new Sonic Visualiser session file"));
- connect(action, SIGNAL(triggered()), this, SLOT(saveSessionAs()));
- menu->addAction(action);
- toolbar->addAction(action);
-
- menu->addSeparator();
-
- icon = il.load("fileopenaudio");
- action = new QAction(icon, tr("&Import Audio File..."), this);
- action->setShortcut(tr("Ctrl+I"));
- action->setStatusTip(tr("Import an existing audio file"));
- connect(action, SIGNAL(triggered()), this, SLOT(importAudio()));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- action = new QAction(tr("Import Secondary Audio File..."), this);
- action->setShortcut(tr("Ctrl+Shift+I"));
- action->setStatusTip(tr("Import an extra audio file as a separate layer"));
- connect(action, SIGNAL(triggered()), this, SLOT(importMoreAudio()));
- connect(this, SIGNAL(canImportMoreAudio(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- action = new QAction(tr("&Export Audio File..."), this);
- action->setStatusTip(tr("Export selection as an audio file"));
- connect(action, SIGNAL(triggered()), this, SLOT(exportAudio()));
- connect(this, SIGNAL(canExportAudio(bool)), action, SLOT(setEnabled(bool)));
- menu->addAction(action);
-
- menu->addSeparator();
-
- action = new QAction(tr("Import Annotation &Layer..."), this);
- action->setShortcut(tr("Ctrl+L"));
- action->setStatusTip(tr("Import layer data from an existing file"));
- connect(action, SIGNAL(triggered()), this, SLOT(importLayer()));
- connect(this, SIGNAL(canImportLayer(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- action = new QAction(tr("Export Annotation Layer..."), this);
- action->setStatusTip(tr("Export layer data to a file"));
- connect(action, SIGNAL(triggered()), this, SLOT(exportLayer()));
- connect(this, SIGNAL(canExportLayer(bool)), action, SLOT(setEnabled(bool)));
- menu->addAction(action);
-
- menu->addSeparator();
-
- action = new QAction(tr("Export Image File..."), this);
- action->setStatusTip(tr("Export a single pane to an image file"));
- connect(action, SIGNAL(triggered()), this, SLOT(exportImage()));
- connect(this, SIGNAL(canExportImage(bool)), action, SLOT(setEnabled(bool)));
- menu->addAction(action);
-
- menu->addSeparator();
-
- action = new QAction(tr("Open Lo&cation..."), this);
- action->setShortcut(tr("Ctrl+Shift+O"));
- action->setStatusTip(tr("Open or import a file from a remote URL"));
- connect(action, SIGNAL(triggered()), this, SLOT(openLocation()));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- menu->addSeparator();
-
- m_recentFilesMenu = menu->addMenu(tr("&Recent Files"));
- m_recentFilesMenu->setTearOffEnabled(true);
- setupRecentFilesMenu();
- connect(&m_recentFiles, SIGNAL(recentChanged()),
- this, SLOT(setupRecentFilesMenu()));
-
- menu->addSeparator();
- action = new QAction(tr("&Preferences..."), this);
- action->setStatusTip(tr("Adjust the application preferences"));
- connect(action, SIGNAL(triggered()), this, SLOT(preferences()));
- menu->addAction(action);
-
- menu->addSeparator();
- action = new QAction(il.load("exit"),
- tr("&Quit"), this);
- action->setShortcut(tr("Ctrl+Q"));
- action->setStatusTip(tr("Exit Sonic Visualiser"));
- connect(action, SIGNAL(triggered()), this, SLOT(close()));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-}
-
-void
-MainWindow::setupEditMenu()
-{
- if (m_mainMenusCreated) return;
-
- QMenu *menu = menuBar()->addMenu(tr("&Edit"));
- menu->setTearOffEnabled(true);
- CommandHistory::getInstance()->registerMenu(menu);
-
- m_keyReference->setCategory(tr("Editing"));
-
- menu->addSeparator();
-
- IconLoader il;
-
- QAction *action = new QAction(il.load("editcut"),
- tr("Cu&t"), this);
- action->setShortcut(tr("Ctrl+X"));
- action->setStatusTip(tr("Cut the selection from the current layer to the clipboard"));
- connect(action, SIGNAL(triggered()), this, SLOT(cut()));
- connect(this, SIGNAL(canEditSelection(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
- m_rightButtonMenu->addAction(action);
-
- action = new QAction(il.load("editcopy"),
- tr("&Copy"), this);
- action->setShortcut(tr("Ctrl+C"));
- action->setStatusTip(tr("Copy the selection from the current layer to the clipboard"));
- connect(action, SIGNAL(triggered()), this, SLOT(copy()));
- connect(this, SIGNAL(canEditSelection(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
- m_rightButtonMenu->addAction(action);
-
- action = new QAction(il.load("editpaste"),
- tr("&Paste"), this);
- action->setShortcut(tr("Ctrl+V"));
- action->setStatusTip(tr("Paste from the clipboard to the current layer"));
- connect(action, SIGNAL(triggered()), this, SLOT(paste()));
- connect(this, SIGNAL(canPaste(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
- m_rightButtonMenu->addAction(action);
-
- m_deleteSelectedAction = new QAction(tr("&Delete Selected Items"), this);
- m_deleteSelectedAction->setShortcut(tr("Del"));
- m_deleteSelectedAction->setStatusTip(tr("Delete items in current selection from the current layer"));
- connect(m_deleteSelectedAction, SIGNAL(triggered()), this, SLOT(deleteSelected()));
- connect(this, SIGNAL(canDeleteSelection(bool)), m_deleteSelectedAction, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(m_deleteSelectedAction);
- menu->addAction(m_deleteSelectedAction);
- m_rightButtonMenu->addAction(m_deleteSelectedAction);
-
- menu->addSeparator();
- m_rightButtonMenu->addSeparator();
-
- m_keyReference->setCategory(tr("Selection"));
-
- action = new QAction(tr("Select &All"), this);
- action->setShortcut(tr("Ctrl+A"));
- action->setStatusTip(tr("Select the whole duration of the current session"));
- connect(action, SIGNAL(triggered()), this, SLOT(selectAll()));
- connect(this, SIGNAL(canSelect(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
- m_rightButtonMenu->addAction(action);
-
- action = new QAction(tr("Select &Visible Range"), this);
- action->setShortcut(tr("Ctrl+Shift+A"));
- action->setStatusTip(tr("Select the time range corresponding to the current window width"));
- connect(action, SIGNAL(triggered()), this, SLOT(selectVisible()));
- connect(this, SIGNAL(canSelect(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- action = new QAction(tr("Select to &Start"), this);
- action->setShortcut(tr("Shift+Left"));
- action->setStatusTip(tr("Select from the start of the session to the current playback position"));
- connect(action, SIGNAL(triggered()), this, SLOT(selectToStart()));
- connect(this, SIGNAL(canSelect(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- action = new QAction(tr("Select to &End"), this);
- action->setShortcut(tr("Shift+Right"));
- action->setStatusTip(tr("Select from the current playback position to the end of the session"));
- connect(action, SIGNAL(triggered()), this, SLOT(selectToEnd()));
- connect(this, SIGNAL(canSelect(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- action = new QAction(tr("C&lear Selection"), this);
- action->setShortcut(tr("Esc"));
- action->setStatusTip(tr("Clear the selection"));
- connect(action, SIGNAL(triggered()), this, SLOT(clearSelection()));
- connect(this, SIGNAL(canClearSelection(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
- m_rightButtonMenu->addAction(action);
-
- menu->addSeparator();
-
- m_keyReference->setCategory(tr("Tapping Time Instants"));
-
- action = new QAction(tr("&Insert Instant at Playback Position"), this);
- action->setShortcut(tr("Enter"));
- action->setStatusTip(tr("Insert a new time instant at the current playback position, in a new layer if necessary"));
- connect(action, SIGNAL(triggered()), this, SLOT(insertInstant()));
- connect(this, SIGNAL(canInsertInstant(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- // Laptop shortcut (no keypad Enter key)
- QString shortcut(tr(";"));
- connect(new QShortcut(shortcut, this), SIGNAL(activated()),
- 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 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);
-
- action = new QAction(tr("Insert Item at Selection"), this);
- action->setShortcut(tr("Ctrl+Shift+Enter"));
- action->setStatusTip(tr("Insert a new note or region item corresponding to the current selection"));
- connect(action, SIGNAL(triggered()), this, SLOT(insertItemAtSelection()));
- connect(this, SIGNAL(canInsertItemAtSelection(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- menu->addSeparator();
-
- QMenu *numberingMenu = menu->addMenu(tr("Number New Instants with"));
- numberingMenu->setTearOffEnabled(true);
- QActionGroup *numberingGroup = new QActionGroup(this);
-
- Labeller::TypeNameMap types = m_labeller->getTypeNames();
- for (Labeller::TypeNameMap::iterator i = types.begin(); i != types.end(); ++i) {
-
- if (i->first == Labeller::ValueFromLabel ||
- i->first == Labeller::ValueFromExistingNeighbour) continue;
-
- action = new QAction(i->second, this);
- connect(action, SIGNAL(triggered()), this, SLOT(setInstantsNumbering()));
- action->setCheckable(true);
- action->setChecked(m_labeller->getType() == i->first);
- numberingGroup->addAction(action);
- numberingMenu->addAction(action);
- m_numberingActions[action] = (int)i->first;
-
- if (i->first == Labeller::ValueFromTwoLevelCounter) {
-
- QMenu *cycleMenu = numberingMenu->addMenu(tr("Cycle size"));
- QActionGroup *cycleGroup = new QActionGroup(this);
-
- int cycles[] = { 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 16 };
- for (int i = 0; i < int(sizeof(cycles)/sizeof(cycles[0])); ++i) {
- action = new QAction(QString("%1").arg(cycles[i]), this);
- connect(action, SIGNAL(triggered()), this, SLOT(setInstantsCounterCycle()));
- action->setCheckable(true);
- action->setChecked(cycles[i] == m_labeller->getCounterCycleSize());
- cycleGroup->addAction(action);
- cycleMenu->addAction(action);
- }
- }
-
- if (i->first == Labeller::ValueNone ||
- i->first == Labeller::ValueFromTwoLevelCounter ||
- i->first == Labeller::ValueFromRealTime) {
- numberingMenu->addSeparator();
- }
- }
-
- action = new QAction(tr("Set Numbering Counters..."), this);
- action->setStatusTip(tr("Set the counters used for counter-based labelling"));
- connect(action, SIGNAL(triggered()), this, SLOT(resetInstantsCounters()));
- menu->addAction(action);
-
- action = new QAction(tr("Renumber Selected Instants"), this);
- action->setStatusTip(tr("Renumber the selected instants using the current labelling scheme"));
- connect(action, SIGNAL(triggered()), this, SLOT(renumberInstants()));
- connect(this, SIGNAL(canRenumberInstants(bool)), action, SLOT(setEnabled(bool)));
-// m_keyReference->registerShortcut(action);
- menu->addAction(action);
-}
-
-void
-MainWindow::setupViewMenu()
-{
- if (m_mainMenusCreated) return;
-
- IconLoader il;
-
- QAction *action = 0;
-
- m_keyReference->setCategory(tr("Panning and Navigation"));
-
- QMenu *menu = menuBar()->addMenu(tr("&View"));
- menu->setTearOffEnabled(true);
- action = new QAction(tr("Scroll &Left"), this);
- action->setShortcut(tr("Left"));
- action->setStatusTip(tr("Scroll the current pane to the left"));
- connect(action, SIGNAL(triggered()), this, SLOT(scrollLeft()));
- connect(this, SIGNAL(canScroll(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- action = new QAction(tr("Scroll &Right"), this);
- action->setShortcut(tr("Right"));
- action->setStatusTip(tr("Scroll the current pane to the right"));
- connect(action, SIGNAL(triggered()), this, SLOT(scrollRight()));
- connect(this, SIGNAL(canScroll(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- action = new QAction(tr("&Jump Left"), this);
- action->setShortcut(tr("Ctrl+Left"));
- action->setStatusTip(tr("Scroll the current pane a big step to the left"));
- connect(action, SIGNAL(triggered()), this, SLOT(jumpLeft()));
- connect(this, SIGNAL(canScroll(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- action = new QAction(tr("J&ump Right"), this);
- action->setShortcut(tr("Ctrl+Right"));
- action->setStatusTip(tr("Scroll the current pane a big step to the right"));
- connect(action, SIGNAL(triggered()), this, SLOT(jumpRight()));
- connect(this, SIGNAL(canScroll(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- action = new QAction(tr("Peek Left"), this);
- action->setShortcut(tr("Alt+Left"));
- action->setStatusTip(tr("Scroll the current pane to the left without moving the playback cursor or other panes"));
- connect(action, SIGNAL(triggered()), this, SLOT(peekLeft()));
- connect(this, SIGNAL(canScroll(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- action = new QAction(tr("Peek Right"), this);
- action->setShortcut(tr("Alt+Right"));
- action->setStatusTip(tr("Scroll the current pane to the right without moving the playback cursor or other panes"));
- connect(action, SIGNAL(triggered()), this, SLOT(peekRight()));
- connect(this, SIGNAL(canScroll(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- menu->addSeparator();
-
- m_keyReference->setCategory(tr("Zoom"));
-
- action = new QAction(il.load("zoom-in"),
- tr("Zoom &In"), this);
- action->setShortcut(tr("Up"));
- action->setStatusTip(tr("Increase the zoom level"));
- connect(action, SIGNAL(triggered()), this, SLOT(zoomIn()));
- connect(this, SIGNAL(canZoom(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- action = new QAction(il.load("zoom-out"),
- tr("Zoom &Out"), this);
- action->setShortcut(tr("Down"));
- action->setStatusTip(tr("Decrease the zoom level"));
- connect(action, SIGNAL(triggered()), this, SLOT(zoomOut()));
- connect(this, SIGNAL(canZoom(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- action = new QAction(tr("Restore &Default Zoom"), this);
- action->setStatusTip(tr("Restore the zoom level to the default"));
- connect(action, SIGNAL(triggered()), this, SLOT(zoomDefault()));
- connect(this, SIGNAL(canZoom(bool)), action, SLOT(setEnabled(bool)));
- menu->addAction(action);
-
- action = new QAction(il.load("zoom-fit"),
- tr("Zoom to &Fit"), this);
- action->setShortcut(tr("F"));
- action->setStatusTip(tr("Zoom to show the whole file"));
- connect(action, SIGNAL(triggered()), this, SLOT(zoomToFit()));
- connect(this, SIGNAL(canZoom(bool)), action, SLOT(setEnabled(bool)));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- menu->addSeparator();
-
- m_keyReference->setCategory(tr("Display Features"));
-
- QActionGroup *overlayGroup = new QActionGroup(this);
-
- action = new QAction(tr("Show &No Overlays"), this);
- action->setShortcut(tr("0"));
- action->setStatusTip(tr("Hide centre indicator, frame times, layer names and scale"));
- connect(action, SIGNAL(triggered()), this, SLOT(showNoOverlays()));
- action->setCheckable(true);
- action->setChecked(false);
- overlayGroup->addAction(action);
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- action = new QAction(tr("Show &Minimal Overlays"), this);
- action->setShortcut(tr("9"));
- action->setStatusTip(tr("Show centre indicator only"));
- connect(action, SIGNAL(triggered()), this, SLOT(showMinimalOverlays()));
- action->setCheckable(true);
- action->setChecked(false);
- overlayGroup->addAction(action);
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- action = new QAction(tr("Show &Standard Overlays"), this);
- action->setShortcut(tr("8"));
- action->setStatusTip(tr("Show centre indicator, frame times and scale"));
- connect(action, SIGNAL(triggered()), this, SLOT(showStandardOverlays()));
- action->setCheckable(true);
- action->setChecked(true);
- overlayGroup->addAction(action);
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- action = new QAction(tr("Show &All Overlays"), this);
- action->setShortcut(tr("7"));
- action->setStatusTip(tr("Show all texts and scale"));
- connect(action, SIGNAL(triggered()), this, SLOT(showAllOverlays()));
- action->setCheckable(true);
- action->setChecked(false);
- overlayGroup->addAction(action);
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- menu->addSeparator();
-
- action = new QAction(tr("Show &Zoom Wheels"), this);
- action->setShortcut(tr("Z"));
- action->setStatusTip(tr("Show thumbwheels for zooming horizontally and vertically"));
- connect(action, SIGNAL(triggered()), this, SLOT(toggleZoomWheels()));
- action->setCheckable(true);
- action->setChecked(m_viewManager->getZoomWheelsEnabled());
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- action = new QAction(tr("Show Property Bo&xes"), this);
- action->setShortcut(tr("X"));
- action->setStatusTip(tr("Show the layer property boxes at the side of the main window"));
- connect(action, SIGNAL(triggered()), this, SLOT(togglePropertyBoxes()));
- action->setCheckable(true);
- action->setChecked(true);
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- action = new QAction(tr("Show Status &Bar"), this);
- action->setStatusTip(tr("Show context help information in the status bar at the bottom of the window"));
- connect(action, SIGNAL(triggered()), this, SLOT(toggleStatusBar()));
- action->setCheckable(true);
- action->setChecked(true);
- menu->addAction(action);
-
- QSettings settings;
- settings.beginGroup("MainWindow");
- bool sb = settings.value("showstatusbar", true).toBool();
- if (!sb) {
- action->setChecked(false);
- statusBar()->hide();
- }
- settings.endGroup();
-
- menu->addSeparator();
-
- action = new QAction(tr("Show La&yer Summary"), this);
- action->setShortcut(tr("Y"));
- action->setStatusTip(tr("Open a window displaying the hierarchy of panes and layers in this session"));
- connect(action, SIGNAL(triggered()), this, SLOT(showLayerTree()));
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- action = new QAction(tr("Show Acti&vity Log"), this);
- action->setStatusTip(tr("Open a window listing interactions and other events"));
- connect(action, SIGNAL(triggered()), this, SLOT(showActivityLog()));
- menu->addAction(action);
-}
-
-void
-MainWindow::setupPaneAndLayerMenus()
-{
- if (m_paneMenu) {
- m_paneActions.clear();
- m_paneMenu->clear();
- } else {
- m_paneMenu = menuBar()->addMenu(tr("&Pane"));
- m_paneMenu->setTearOffEnabled(true);
- }
-
- if (m_layerMenu) {
- m_layerActions.clear();
- m_layerMenu->clear();
- } else {
- m_layerMenu = menuBar()->addMenu(tr("&Layer"));
- m_layerMenu->setTearOffEnabled(true);
- }
-
- QMenu *menu = m_paneMenu;
-
- IconLoader il;
-
- m_keyReference->setCategory(tr("Managing Panes and Layers"));
-
- QAction *action = new QAction(il.load("pane"), tr("Add &New Pane"), this);
- action->setShortcut(tr("N"));
- action->setStatusTip(tr("Add a new pane containing only a time ruler"));
- connect(action, SIGNAL(triggered()), this, SLOT(addPane()));
- connect(this, SIGNAL(canAddPane(bool)), action, SLOT(setEnabled(bool)));
- m_paneActions[action] = LayerConfiguration(LayerFactory::TimeRuler);
- m_keyReference->registerShortcut(action);
- menu->addAction(action);
-
- menu->addSeparator();
-
- menu = m_layerMenu;
-
-// menu->addSeparator();
-
- LayerFactory::LayerTypeSet emptyLayerTypes =
- LayerFactory::getInstance()->getValidEmptyLayerTypes();
-
- for (LayerFactory::LayerTypeSet::iterator i = emptyLayerTypes.begin();
- i != emptyLayerTypes.end(); ++i) {
-
- QIcon icon;
- QString mainText, tipText, channelText;
- LayerFactory::LayerType type = *i;
- QString name = LayerFactory::getInstance()->getLayerPresentationName(type);
-
- icon = il.load(LayerFactory::getInstance()->getLayerIconName(type));
-
- mainText = tr("Add New %1 Layer").arg(name);
- tipText = tr("Add a new empty layer of type %1").arg(name);
-
- action = new QAction(icon, mainText, this);
- action->setStatusTip(tipText);
-
- if (type == LayerFactory::Text) {
- action->setShortcut(tr("T"));
- m_keyReference->registerShortcut(action);
- }
-
- connect(action, SIGNAL(triggered()), this, SLOT(addLayer()));
- connect(this, SIGNAL(canAddLayer(bool)), action, SLOT(setEnabled(bool)));
- m_layerActions[action] = LayerConfiguration(type);
- menu->addAction(action);
- m_rightButtonLayerMenu->addAction(action);
- }
-
- m_rightButtonLayerMenu->addSeparator();
- menu->addSeparator();
-
- LayerFactory::LayerType backgroundTypes[] = {
- LayerFactory::Waveform,
- LayerFactory::Spectrogram,
- LayerFactory::MelodicRangeSpectrogram,
- LayerFactory::PeakFrequencySpectrogram,
- LayerFactory::Spectrum
- };
-
- std::vector<Model *> models;
- if (m_document) models = m_document->getTransformInputModels();
- bool plural = (models.size() > 1);
- if (models.empty()) {
- models.push_back(getMainModel()); // probably 0
- }
-
- for (unsigned int i = 0;
- i < sizeof(backgroundTypes)/sizeof(backgroundTypes[0]); ++i) {
-
- const int paneMenuType = 0, layerMenuType = 1;
-
- for (int menuType = paneMenuType; menuType <= layerMenuType; ++menuType) {
-
- if (menuType == paneMenuType) menu = m_paneMenu;
- else menu = m_layerMenu;
-
- QMenu *submenu = 0;
-
- QIcon icon;
- QString mainText, shortcutText, tipText, channelText;
- LayerFactory::LayerType type = backgroundTypes[i];
- bool mono = true;
-
- switch (type) {
-
- case LayerFactory::Waveform:
- icon = il.load("waveform");
- mainText = tr("Add &Waveform");
- if (menuType == paneMenuType) {
- shortcutText = tr("W");
- tipText = tr("Add a new pane showing a waveform view");
- } else {
- tipText = tr("Add a new layer showing a waveform view");
- }
- mono = false;
- break;
-
- case LayerFactory::Spectrogram:
- icon = il.load("spectrogram");
- mainText = tr("Add Spectro&gram");
- if (menuType == paneMenuType) {
- shortcutText = tr("G");
- tipText = tr("Add a new pane showing a spectrogram");
- } else {
- tipText = tr("Add a new layer showing a spectrogram");
- }
- break;
-
- case LayerFactory::MelodicRangeSpectrogram:
- icon = il.load("spectrogram");
- mainText = tr("Add &Melodic Range Spectrogram");
- if (menuType == paneMenuType) {
- shortcutText = tr("M");
- tipText = tr("Add a new pane showing a spectrogram set up for an overview of note pitches");
- } else {
- tipText = tr("Add a new layer showing a spectrogram set up for an overview of note pitches");
- }
- break;
-
- case LayerFactory::PeakFrequencySpectrogram:
- icon = il.load("spectrogram");
- mainText = tr("Add Pea&k Frequency Spectrogram");
- if (menuType == paneMenuType) {
- shortcutText = tr("K");
- tipText = tr("Add a new pane showing a spectrogram set up for tracking frequencies");
- } else {
- tipText = tr("Add a new layer showing a spectrogram set up for tracking frequencies");
- }
- break;
-
- case LayerFactory::Spectrum:
- icon = il.load("spectrum");
- mainText = tr("Add Spectr&um");
- if (menuType == paneMenuType) {
- shortcutText = tr("U");
- tipText = tr("Add a new pane showing a frequency spectrum");
- } else {
- tipText = tr("Add a new layer showing a frequency spectrum");
- }
- break;
-
- default: break;
- }
-
- std::vector<Model *> candidateModels;
-// if (menuType == paneMenuType) {
- candidateModels = models;
-// } else {
-// candidateModels.push_back(0);
-// }
-
- for (std::vector<Model *>::iterator mi =
- candidateModels.begin();
- mi != candidateModels.end(); ++mi) {
-
- Model *model = *mi;
-
- int channels = 0;
- if (model) {
- DenseTimeValueModel *dtvm =
- dynamic_cast<DenseTimeValueModel *>(model);
- if (dtvm) channels = dtvm->getChannelCount();
- }
- if (channels < 1 && getMainModel()) {
- channels = getMainModel()->getChannelCount();
- }
- if (channels < 1) channels = 1;
-
- for (int c = 0; c <= channels; ++c) {
-
- if (c == 1 && channels == 1) continue;
- bool isDefault = (c == 0);
- bool isOnly = (isDefault && (channels == 1));
-
-// if (menuType == layerMenuType) {
-// if (isDefault) isOnly = true;
-// else continue;
-// }
-
- if (isOnly && (!plural /*|| menuType == layerMenuType*/)) {
-
-// if (menuType == layerMenuType && type != LayerFactory::Waveform) {
-// action = new QAction(mainText, this);
-// } else {
- action = new QAction(icon, mainText, this);
-// }
-
- action->setShortcut(shortcutText);
- action->setStatusTip(tipText);
- if (menuType == paneMenuType) {
- connect(action, SIGNAL(triggered()),
- this, SLOT(addPane()));
- connect(this, SIGNAL(canAddPane(bool)),
- action, SLOT(setEnabled(bool)));
- m_paneActions[action] = LayerConfiguration(type);
- } else {
- connect(action, SIGNAL(triggered()),
- this, SLOT(addLayer()));
- connect(this, SIGNAL(canAddLayer(bool)),
- action, SLOT(setEnabled(bool)));
- m_layerActions[action] = LayerConfiguration(type);
- }
- if (shortcutText != "") {
- m_keyReference->registerShortcut(action);
- }
- menu->addAction(action);
-
- } else {
-
- if (!submenu) {
- submenu = menu->addMenu(mainText);
- submenu->setTearOffEnabled(true);
- } else if (isDefault) {
- submenu->addSeparator();
- }
-
- QString actionText;
- if (c == 0) {
- if (mono) {
- actionText = tr("&All Channels Mixed");
- } else {
- actionText = tr("&All Channels");
- }
- }...
[truncated message content] |