hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Rename automatable_slider to AutomatableSlider

Browse Source
This commit is contained in:
Lukas W
2014-11-26 01:23:04 +01:00
parent c33bef346a
commit 58ec27ef75
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/automatable_slider.h → include/AutomatableSlider.h
View File

@@ -1,5 +1,5 @@
/*
* automatable_slider.h - class automatableSlider, a QSlider with automation
* AutomatableSlider.h - class automatableSlider, a QSlider with automation
*
* Copyright (c) 2006-2008 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
*
@@ -32,12 +32,12 @@
class automatableSlider : public QSlider, public IntModelView
class AutomatableSlider : public QSlider, public IntModelView
{
Q_OBJECT
public:
automatableSlider( QWidget * _parent, const QString & _name = QString::null );
virtual ~automatableSlider();
AutomatableSlider( QWidget * _parent, const QString & _name = QString::null );
virtual ~AutomatableSlider();
bool showStatus()
{

6
include/SongEditor.h
View File

@@ -32,7 +32,7 @@
class QLabel;
class QScrollBar;
class automatableSlider;
class AutomatableSlider;
class comboBox;
class LcdSpinBox;
class MeterDialog;
@@ -113,8 +113,8 @@ private:
Timeline * m_timeLine;
MeterDialog * m_timeSigDisplay;
automatableSlider * m_masterVolumeSlider;
automatableSlider * m_masterPitchSlider;
AutomatableSlider * m_masterVolumeSlider;
AutomatableSlider * m_masterPitchSlider;
textFloat * m_mvsStatus;
textFloat * m_mpsStatus;

6
src/gui/SongEditor.cpp
View File

@@ -36,7 +36,7 @@
#include <math.h>
#include "SongEditor.h"
#include "automatable_slider.h"
#include "AutomatableSlider.h"
#include "combobox.h"
#include "ConfigManager.h"
#include "cpuload_widget.h"
@@ -154,7 +154,7 @@ SongEditor::SongEditor( Song * _song ) :
QLabel * master_vol_lbl = new QLabel( tb );
master_vol_lbl->setPixmap( embed::getIconPixmap( "master_volume" ) );
m_masterVolumeSlider = new automatableSlider( tb,
m_masterVolumeSlider = new AutomatableSlider( tb,
tr( "Master volume" ) );
m_masterVolumeSlider->setModel( &m_song->m_masterVolumeModel );
m_masterVolumeSlider->setOrientation( Qt::Vertical );
@@ -188,7 +188,7 @@ SongEditor::SongEditor( Song * _song ) :
master_pitch_lbl->setPixmap( embed::getIconPixmap( "master_pitch" ) );
master_pitch_lbl->setFixedHeight( 64 );
m_masterPitchSlider = new automatableSlider( tb, tr( "Master pitch" ) );
m_masterPitchSlider = new AutomatableSlider( tb, tr( "Master pitch" ) );
m_masterPitchSlider->setModel( &m_song->m_masterPitchModel );
m_masterPitchSlider->setOrientation( Qt::Vertical );
m_masterPitchSlider->setPageStep( 1 );

24
src/gui/widgets/automatable_slider.cpp → src/gui/widgets/AutomatableSlider.cpp
View File

@@ -1,5 +1,5 @@
/*
* automatable_slider.cpp - implementation of class automatableSlider
* AutomatableSlider.cpp - implementation of class automatableSlider
*
* Copyright (c) 2006-2007 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
* Copyright (c) 2007-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
@@ -23,7 +23,7 @@
*
*/
#include "automatable_slider.h"
#include "AutomatableSlider.h"
#include <QCursor>
#include <QMouseEvent>
@@ -36,7 +36,7 @@
automatableSlider::automatableSlider( QWidget * _parent,
AutomatableSlider::AutomatableSlider( QWidget * _parent,
const QString & _name ) :
QSlider( _parent ),
IntModelView( new IntModel( 0, 0, 0, NULL, _name, true ), this ),
@@ -53,14 +53,14 @@ automatableSlider::automatableSlider( QWidget * _parent,
automatableSlider::~automatableSlider()
AutomatableSlider::~AutomatableSlider()
{
}
void automatableSlider::contextMenuEvent( QContextMenuEvent * _me )
void AutomatableSlider::contextMenuEvent( QContextMenuEvent * _me )
{
captionMenu contextMenu( model()->displayName() );
addDefaultActions( &contextMenu );
@@ -70,7 +70,7 @@ void automatableSlider::contextMenuEvent( QContextMenuEvent * _me )
void automatableSlider::mousePressEvent( QMouseEvent * _me )
void AutomatableSlider::mousePressEvent( QMouseEvent * _me )
{
if( _me->button() == Qt::LeftButton &&
! ( _me->modifiers() & Qt::ControlModifier ) )
@@ -87,7 +87,7 @@ void automatableSlider::mousePressEvent( QMouseEvent * _me )
void automatableSlider::mouseReleaseEvent( QMouseEvent * _me )
void AutomatableSlider::mouseReleaseEvent( QMouseEvent * _me )
{
m_showStatus = false;
QSlider::mouseReleaseEvent( _me );
@@ -96,7 +96,7 @@ void automatableSlider::mouseReleaseEvent( QMouseEvent * _me )
void automatableSlider::wheelEvent( QWheelEvent * _me )
void AutomatableSlider::wheelEvent( QWheelEvent * _me )
{
bool old_status = m_showStatus;
m_showStatus = true;
@@ -107,7 +107,7 @@ void automatableSlider::wheelEvent( QWheelEvent * _me )
void automatableSlider::modelChanged()
void AutomatableSlider::modelChanged()
{
QSlider::setRange( model()->minValue(), model()->maxValue() );
updateSlider();
@@ -118,7 +118,7 @@ void automatableSlider::modelChanged()
void automatableSlider::changeValue( int _value )
void AutomatableSlider::changeValue( int _value )
{
model()->setValue( _value );
emit logicValueChanged( model()->value() );
@@ -127,7 +127,7 @@ void automatableSlider::changeValue( int _value )
void automatableSlider::moveSlider( int _value )
void AutomatableSlider::moveSlider( int _value )
{
model()->setValue( _value );
emit logicSliderMoved( model()->value() );
@@ -136,7 +136,7 @@ void automatableSlider::moveSlider( int _value )
void automatableSlider::updateSlider()
void AutomatableSlider::updateSlider()
{
QSlider::setValue( model()->value() );
}