[Sv1-commits] SF.net SVN: sv1:[1469] sonic-visualiser/trunk
Brought to you by:
cannam
From: <ca...@us...> - 2009-02-25 11:26:12
|
Revision: 1469 http://sv1.svn.sourceforge.net/sv1/?rev=1469&view=rev Author: cannam Date: 2009-02-25 11:26:07 +0000 (Wed, 25 Feb 2009) Log Message: ----------- * Make Activity Log a bit more of a proper window Modified Paths: -------------- sonic-visualiser/trunk/sv/main/MainWindow.cpp sonic-visualiser/trunk/sv/main/MainWindow.h sonic-visualiser/trunk/widgets/ActivityLog.cpp sonic-visualiser/trunk/widgets/ActivityLog.h Modified: sonic-visualiser/trunk/sv/main/MainWindow.cpp =================================================================== --- sonic-visualiser/trunk/sv/main/MainWindow.cpp 2009-02-25 11:15:22 UTC (rev 1468) +++ sonic-visualiser/trunk/sv/main/MainWindow.cpp 2009-02-25 11:26:07 UTC (rev 1469) @@ -280,11 +280,10 @@ connect(CommandHistory::getInstance(), SIGNAL(activity(QString)), m_activityLog, SLOT(activityHappened(QString))); connect(this, SIGNAL(replacedDocument()), this, SLOT(documentReplaced())); + m_activityLog->hide(); newSession(); - m_activityLog->show(); - connect(m_midiInput, SIGNAL(eventsAvailable()), this, SLOT(midiEventsAvailable())); @@ -836,6 +835,11 @@ 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 @@ -3607,6 +3611,14 @@ } void +MainWindow::showActivityLog() +{ + m_activityLog->show(); + m_activityLog->raise(); + m_activityLog->scrollToEnd(); +} + +void MainWindow::preferences() { if (!m_preferencesDialog.isNull()) { Modified: sonic-visualiser/trunk/sv/main/MainWindow.h =================================================================== --- sonic-visualiser/trunk/sv/main/MainWindow.h 2009-02-25 11:15:22 UTC (rev 1468) +++ sonic-visualiser/trunk/sv/main/MainWindow.h 2009-02-25 11:26:07 UTC (rev 1469) @@ -160,6 +160,7 @@ virtual void modelAdded(Model *); virtual void showLayerTree(); + virtual void showActivityLog(); virtual void mouseEnteredWidget(); virtual void mouseLeftWidget(); Modified: sonic-visualiser/trunk/widgets/ActivityLog.cpp =================================================================== --- sonic-visualiser/trunk/widgets/ActivityLog.cpp 2009-02-25 11:15:22 UTC (rev 1468) +++ sonic-visualiser/trunk/widgets/ActivityLog.cpp 2009-02-25 11:26:07 UTC (rev 1469) @@ -18,18 +18,31 @@ #include <QListView> #include <QGridLayout> #include <QStringListModel> +#include <QLabel> +#include <QDialogButtonBox> #include <QTime> +#include <QApplication> #include <iostream> ActivityLog::ActivityLog() : QDialog() { - m_model = new QStringListModel; - m_listView = new QListView; + setWindowTitle(tr("Activity Log")); + QGridLayout *layout = new QGridLayout; - layout->addWidget(m_listView, 0, 0); setLayout(layout); + + layout->addWidget(new QLabel(tr("<p>Activity Log shows a list of your interactions and other events within %1.</p>").arg(QApplication::applicationName())), 0, 0); + + m_listView = new QListView; + m_model = new QStringListModel; m_listView->setModel(m_model); + layout->addWidget(m_listView, 1, 0); + layout->setRowStretch(1, 10); + + QDialogButtonBox *bb = new QDialogButtonBox(QDialogButtonBox::Close); + connect(bb, SIGNAL(rejected()), this, SLOT(hide())); + layout->addWidget(bb, 2, 0); } ActivityLog::~ActivityLog() @@ -54,3 +67,12 @@ if (isVisible()) m_listView->scrollTo(ix); } +void +ActivityLog::scrollToEnd() +{ + if (m_model->rowCount() == 0 || !isVisible()) return; + QModelIndex ix = m_model->index(m_model->rowCount()-1, 0); + m_listView->scrollTo(ix); +} + + Modified: sonic-visualiser/trunk/widgets/ActivityLog.h =================================================================== --- sonic-visualiser/trunk/widgets/ActivityLog.h 2009-02-25 11:15:22 UTC (rev 1468) +++ sonic-visualiser/trunk/widgets/ActivityLog.h 2009-02-25 11:26:07 UTC (rev 1469) @@ -32,6 +32,7 @@ public slots: void activityHappened(QString); + void scrollToEnd(); private: QListView *m_listView; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |