[Sv1-commits] SF.net SVN: sv1:[1462] sonic-visualiser/trunk
Brought to you by:
cannam
From: <ca...@us...> - 2009-02-24 12:22:41
|
Revision: 1462 http://sv1.svn.sourceforge.net/sv1/?rev=1462&view=rev Author: cannam Date: 2009-02-24 12:02:19 +0000 (Tue, 24 Feb 2009) Log Message: ----------- * Make it possible to switch panes by clicking on the current-pane indicator area at left (#1935591) Modified Paths: -------------- sonic-visualiser/trunk/view/PaneStack.cpp sonic-visualiser/trunk/view/PaneStack.h sonic-visualiser/trunk/widgets/widgets.pro Added Paths: ----------- sonic-visualiser/trunk/widgets/ClickableLabel.h Modified: sonic-visualiser/trunk/view/PaneStack.cpp =================================================================== --- sonic-visualiser/trunk/view/PaneStack.cpp 2009-02-24 11:39:45 UTC (rev 1461) +++ sonic-visualiser/trunk/view/PaneStack.cpp 2009-02-24 12:02:19 UTC (rev 1462) @@ -18,6 +18,7 @@ #include "Pane.h" #include "widgets/PropertyStack.h" #include "widgets/IconLoader.h" +#include "widgets/ClickableLabel.h" #include "layer/Layer.h" #include "ViewManager.h" @@ -67,23 +68,15 @@ layout->setMargin(0); layout->setSpacing(2); - -// QHBoxLayout *layout = new QHBoxLayout; - -// QVBoxLayout *vlayout = new QVBoxLayout; -// layout->addLayout(vlayout); -// layout->setStretchFactor(vlayout, 0); - QPushButton *xButton = new QPushButton(frame); xButton->setIcon(IconLoader().load("cross")); xButton->setFixedSize(QSize(16, 16)); xButton->setFlat(true); layout->addWidget(xButton, 0, 0); -// vlayout->setStretchFactor(xButton, 0); connect(xButton, SIGNAL(clicked()), this, SLOT(paneDeleteButtonClicked())); - QLabel *currentIndicator = new QLabel(frame); -// currentIndicator->setFixedWidth(QPainter(this).fontMetrics().width("x")); + ClickableLabel *currentIndicator = new ClickableLabel(frame); + connect(currentIndicator, SIGNAL(clicked()), this, SLOT(indicatorClicked())); layout->addWidget(currentIndicator, 1, 0); layout->setRowStretch(1, 20); currentIndicator->setMinimumWidth(8); @@ -541,6 +534,19 @@ } void +PaneStack::indicatorClicked() +{ + QObject *s = sender(); + + for (size_t i = 0; i < m_panes.size(); ++i) { + if (m_panes[i].currentIndicator == s) { + setCurrentPane(m_panes[i].pane); + return; + } + } +} + +void PaneStack::sizePanesEqually() { QList<int> sizes = m_splitter->sizes(); Modified: sonic-visualiser/trunk/view/PaneStack.h =================================================================== --- sonic-visualiser/trunk/view/PaneStack.h 2009-02-24 11:39:45 UTC (rev 1461) +++ sonic-visualiser/trunk/view/PaneStack.h 2009-02-24 12:02:19 UTC (rev 1462) @@ -100,6 +100,7 @@ void paneDropAccepted(QStringList); void paneDropAccepted(QString); void paneDeleteButtonClicked(); + void indicatorClicked(); protected: Pane *m_currentPane; Added: sonic-visualiser/trunk/widgets/ClickableLabel.h =================================================================== --- sonic-visualiser/trunk/widgets/ClickableLabel.h (rev 0) +++ sonic-visualiser/trunk/widgets/ClickableLabel.h 2009-02-24 12:02:19 UTC (rev 1462) @@ -0,0 +1,39 @@ +/* -*- 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 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. +*/ + +#ifndef _CLICKABLE_LABEL_H_ +#define _CLICKABLE_LABEL_H_ + +#include <QLabel> + +class ClickableLabel : public QLabel +{ + Q_OBJECT + +public: + ClickableLabel(const QString &text, QWidget *parent = 0) : + QLabel(text, parent) { } + ClickableLabel(QWidget *parent = 0) : QLabel(parent) { } + ~ClickableLabel() { } + +signals: + void clicked(); + +protected: + virtual void mousePressEvent(QMouseEvent *) { + emit clicked(); + } +}; + +#endif Modified: sonic-visualiser/trunk/widgets/widgets.pro =================================================================== --- sonic-visualiser/trunk/widgets/widgets.pro 2009-02-24 11:39:45 UTC (rev 1461) +++ sonic-visualiser/trunk/widgets/widgets.pro 2009-02-24 12:02:19 UTC (rev 1462) @@ -15,6 +15,7 @@ # Input HEADERS += AudioDial.h \ + ClickableLabel.h \ ColourNameDialog.h \ CommandHistory.h \ CSVFormatDialog.h \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |