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

Merge branch 'stable-0.4' into stable-0.4-new-fx-mixer

Browse Source 
Conflicts:
	src/core/FxMixer.cpp
	src/gui/FxMixerView.cpp
This commit is contained in:
Tobias Doerffel
2014-01-17 19:56:51 +01:00
parent dddf5eb61c 4b5b0fa4fa
commit c868d691ab
8 changed files with 913 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/InlineAutomation.h
View File

@@ -52,9 +52,7 @@ public:
inline bool hasAutomation() const
{
return m_autoPattern != NULL &&
!typeInfo<float>::isEqual(
m_autoPattern->getTimeMap()[0],
defaultValue() );
m_autoPattern->getTimeMap().isEmpty() == false;
}
AutomationPattern * automationPattern()

48
include/lmms_style.h → include/LmmsStyle.h
View File

@@ -1,8 +1,8 @@
/*
* lmms_style.h - the graphical style used by LMMS to create a consistent
* LmmsStyle.h - the graphical style used by LMMS to create a consistent
* interface
*
* Copyright (c) 2007-2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2007-2014 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -30,16 +30,46 @@
#include <QtGui/QPlastiqueStyle>
class lmmsStyle : public QPlastiqueStyle
class LmmsStyle : public QPlastiqueStyle
{
public:
lmmsStyle();
virtual ~lmmsStyle()
enum ColorRole
{
AutomationBarFill,
AutomationBarValue,
AutomationSelectedBarFill,
AutomationCrosshair,
PianoRollStepNote,
PianoRollSelectedNote,
PianoRollDefaultNote,
PianoRollFrozenNote,
PianoRollMutedNote,
PianoRollEditHandle,
PianoRollVolumeLevel,
PianoRollPanningLevel,
PianoRollSelectedLevel,
TimelineForecolor,
StandardGraphLine,
StandardGraphHandle,
StandardGraphHandleBorder,
StandardGraphCrosshair,
TextFloatForecolor,
TextFloatFill,
VisualizationLevelLow,
VisualizationLevelMid,
VisualizationLevelPeak,
NumColorRoles
};
LmmsStyle();
virtual ~LmmsStyle()
{
}
virtual QPalette standardPalette( void ) const;
virtual void drawControl( ControlElement element, const QStyleOption* option, QPainter* painter, const QWidget* widget ) const;
virtual void drawComplexControl(
ComplexControl control,
const QStyleOptionComplex * option,
@@ -54,6 +84,14 @@ public:
const QStyleOption * option = 0,
const QWidget * widget = 0 ) const;
QSize sizeFromContents( ContentsType type, const QStyleOption* option, const QSize& size, const QWidget* widget ) const;
QRect subControlRect( ComplexControl control, const QStyleOptionComplex *option, SubControl subControl, const QWidget *widget ) const;
private:
QImage colorizeXpm( const char * const * xpm, const QBrush& fill ) const;
void hoverColors( bool sunken, bool hover, bool active, QColor& color, QColor& blend ) const;
QColor m_colors[ LmmsStyle::NumColorRoles ];
} ;
#endif