# HG changeset patch # User Chris Cannam # Date 1213188858 0 # Node ID 2b4a4b8c465a73902345ddb6330eb2f8e4a41c0b # Parent 1a1c764ea636feb11c5569f5aa418c15ca271cbb * A bit more work on the data editor diff -r 1a1c764ea636 -r 2b4a4b8c465a main/MainWindow.cpp --- a/main/MainWindow.cpp Mon Jun 09 16:01:50 2008 +0000 +++ b/main/MainWindow.cpp Wed Jun 11 12:54:18 2008 +0000 @@ -43,7 +43,6 @@ #include "widgets/AudioDial.h" #include "widgets/IconLoader.h" #include "widgets/LayerTreeDialog.h" -#include "widgets/ModelDataTableDialog.h" #include "widgets/ListInputDialog.h" #include "widgets/SubdividingMenu.h" #include "widgets/NotifyingPushButton.h" @@ -210,8 +209,8 @@ m_playSpeed->setMinimum(0); m_playSpeed->setMaximum(200); m_playSpeed->setValue(100); - m_playSpeed->setFixedWidth(24); - m_playSpeed->setFixedHeight(24); + m_playSpeed->setFixedWidth(32); + m_playSpeed->setFixedHeight(32); m_playSpeed->setNotchesVisible(true); m_playSpeed->setPageStep(10); m_playSpeed->setObjectName(tr("Playback Speedup")); @@ -3045,33 +3044,6 @@ } void -MainWindow::editCurrentLayer() -{ - //!!! maintain one per layer only - - Pane *pane = m_paneStack->getCurrentPane(); - if (pane) { - Layer *layer = pane->getSelectedLayer(); - if (layer) { - Model *model = layer->getModel(); - if (model) { - - ModelDataTableDialog *dialog = new ModelDataTableDialog(model); - dialog->setAttribute(Qt::WA_DeleteOnClose); - connect(m_viewManager, - SIGNAL(globalCentreFrameChanged(unsigned long)), - dialog, SLOT(scrollToFrame(unsigned long))); - connect(m_viewManager, - SIGNAL(playbackFrameChanged(unsigned long)), - dialog, SLOT(scrollToFrame(unsigned long))); - dialog->show(); - return; - } - } - } -} - -void MainWindow::playSoloToggled() { MainWindowBase::playSoloToggled(); diff -r 1a1c764ea636 -r 2b4a4b8c465a main/MainWindow.h --- a/main/MainWindow.h Mon Jun 09 16:01:50 2008 +0000 +++ b/main/MainWindow.h Wed Jun 11 12:54:18 2008 +0000 @@ -126,7 +126,6 @@ virtual void addPane(); virtual void addLayer(); virtual void renameCurrentLayer(); - virtual void editCurrentLayer(); virtual void paneAdded(Pane *); virtual void paneHidden(Pane *);