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

Fix coding style

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1975 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Paul Giblock
2009-01-28 08:05:45 +00:00
parent 26c20113cf
commit 18c8296dfd
5 changed files with 167 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/classic_style.h
View File

@@ -56,20 +56,20 @@ public:
const QStyleOption * option = 0,
const QWidget * widget = 0 ) const;
// LMMS Stuff
// LMMS Stuff
virtual void drawFxLine(QPainter * _painter, const QWidget *_fxLine,
const QString & _name, bool _active);
virtual void drawFxLine(QPainter * _painter, const QWidget *_fxLine,
const QString & _name, bool _active);
virtual void drawTrackContentBackground(QPainter * _painter,
const QSize & _size, const int _pixelsPerTact);
virtual void drawTrackContentBackground(QPainter * _painter,
const QSize & _size, const int _pixelsPerTact);
virtual QColor color(LmmsStyle::ColorRole _role) const;
virtual QColor color(LmmsStyle::ColorRole _role) const;
private:
QImage colorizeXpm( const char * const * xpm, const QBrush & fill ) const;
private:
QImage colorizeXpm( const char * const * xpm, const QBrush & fill ) const;
QColor colors[LmmsStyle::NumColorRoles];
QColor colors[LmmsStyle::NumColorRoles];
};

14
include/engine.h
View File

@@ -165,13 +165,15 @@ public:
return( s_pluginFileHandling );
}
static void setLmmsStyle( LmmsStyle * _style ) {
s_lmmsStyle = _style;
}
static void setLmmsStyle( LmmsStyle * _style )
{
s_lmmsStyle = _style;
}
static LmmsStyle * getLmmsStyle( void ) {
return s_lmmsStyle;
}
static LmmsStyle * getLmmsStyle( void )
{
return s_lmmsStyle;
}
private:
static bool s_hasGUI;

107
include/lmms_style.h
View File

@@ -35,87 +35,58 @@
class LmmsStyle
{
public:
enum ColorRole
{
AutomationBarFill,
AutomationBarValue,
AutomationSelectedBarFill,
AutomationCrosshair,
PianoRollStepNote,
PianoRollSelectedNote,
PianoRollDefaultNote,
PianoRollEditHandle,
PianoRollVolumeLevel,
PianoRollPanningLevel,
PianoRollSelectedLevel,
TimelineForecolor,
StandardGraphLine,
StandardGraphHandle,
StandardGraphHandleBorder,
StandardGraphCrosshair,
TextFloatForecolor,
TextFloatFill,
VisualizationLevelLow,
VisualizationLevelMid,
VisualizationLevelPeak,
NumColorRoles
};
enum ColorRole
{
AutomationBarFill,
AutomationBarValue,
AutomationSelectedBarFill,
AutomationCrosshair,
PianoRollStepNote,
PianoRollSelectedNote,
PianoRollDefaultNote,
PianoRollEditHandle,
PianoRollVolumeLevel,
PianoRollPanningLevel,
PianoRollSelectedLevel,
TimelineForecolor,
StandardGraphLine,
StandardGraphHandle,
StandardGraphHandleBorder,
StandardGraphCrosshair,
TextFloatForecolor,
TextFloatFill,
VisualizationLevelLow,
VisualizationLevelMid,
VisualizationLevelPeak,
NumColorRoles
};
/* TODO: Still need to style:
* combobox.cpp
* fade_button.cpp
* knob.cpp - Will be reimplemented to use image-strips
* tab_widget.cpp
* tool_button.cpp - Will be obsoleted in favor of real Qt toolbars
*/
/* TODO: Still need to style:
* combobox.cpp
* fade_button.cpp
* knob.cpp - Will be reimplemented to use image-strips
* tab_widget.cpp
* tool_button.cpp - Will be obsoleted in favor of real Qt toolbars
*/
LmmsStyle()
{
}
{
}
virtual ~LmmsStyle()
{
}
virtual void drawFxLine(QPainter * _painter, const QWidget *_fxLine,
const QString & _name, bool _active) = 0;
virtual void drawFxLine(QPainter * _painter, const QWidget *_fxLine,
const QString & _name, bool _active) = 0;
virtual void drawTrackContentBackground(QPainter * _painter,
const QSize & _size, const int _pixelsPerTact) = 0;
virtual void drawTrackContentBackground(QPainter * _painter,
const QSize & _size, const int _pixelsPerTact) = 0;
virtual QColor color(ColorRole _role) const = 0;
virtual QColor color(ColorRole _role) const = 0;
/*
virtual QPalette standardPalette( void ) const;
virtual void drawComplexControl(
ComplexControl control,
const QStyleOptionComplex * option,
QPainter *painter,
const QWidget *widget ) const;
virtual void drawPrimitive( PrimitiveElement element,
const QStyleOption *option,
QPainter *painter,
const QWidget *widget = 0 ) const;
virtual void drawControl( ControlElement element, const QStyleOption * option,
QPainter * painter, const QWidget * widget ) const;
virtual int pixelMetric( PixelMetric metric,
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;
*/
} ;
#endif

10
src/core/main.cpp
View File

@@ -369,10 +369,10 @@ int main( int argc, char * * argv )
if( render_out.isEmpty() && file_to_save.isEmpty() )
{
// init style and palette
// TODO, select based on theme.xml!
ClassicStyle * style = new ClassicStyle();
QApplication::setStyle( style );
engine::setLmmsStyle( style );
// TODO, select based on theme.xml!
ClassicStyle * style = new ClassicStyle();
QApplication::setStyle( style );
engine::setLmmsStyle( style );
// init splash screen - this is a bit difficult as we have a
// semi-transparent splash-image therefore we first need to grab
@@ -380,7 +380,7 @@ int main( int argc, char * * argv )
// which covers all pixels which are not fully transparent in
// splash-image - otherwise we get nasty edges etc.
const QPixmap splash = embed::getIconPixmap( "splash" );
const QPoint pt = QApplication::desktop()->
const QPoint pt = QApplication::desktop()->
#ifdef LMMS_BUILD_LINUX
availableGeometry().
#else

211
src/gui/classic_style.cpp
View File

@@ -44,38 +44,38 @@ ClassicStyle::ClassicStyle() :
qApp->setPalette( standardPalette() );
colors[AutomationBarFill] = QColor( 0xFF, 0xB0, 0x00 );
colors[AutomationBarValue] = QColor( 0xFF, 0xDF, 0x20 );
colors[AutomationSelectedBarFill] = QColor( 0x00, 0x40, 0xC0 );
colors[AutomationCrosshair] = QColor( 0xFF, 0x33, 0x33 );
colors[PianoRollDefaultNote] = QColor( 0x00, 0xAA, 0x00 );
colors[PianoRollStepNote] = QColor( 0x00, 0xFF, 0x00 );
colors[PianoRollSelectedNote] = QColor( 0x00, 0x40, 0xC0 );
colors[PianoRollEditHandle] = QColor( 0xEA, 0xA1, 0x00 );
colors[PianoRollSelectedLevel] = QColor( 0x00, 0x40, 0xC0 );
colors[PianoRollVolumeLevel] = QColor( 0x00, 0xFF, 0x00 );
colors[PianoRollPanningLevel] = QColor( 0xFF, 0xB0, 0x00 );
colors[AutomationBarFill] = QColor( 0xFF, 0xB0, 0x00 );
colors[AutomationBarValue] = QColor( 0xFF, 0xDF, 0x20 );
colors[AutomationSelectedBarFill] = QColor( 0x00, 0x40, 0xC0 );
colors[AutomationCrosshair] = QColor( 0xFF, 0x33, 0x33 );
colors[PianoRollDefaultNote] = QColor( 0x00, 0xAA, 0x00 );
colors[PianoRollStepNote] = QColor( 0x00, 0xFF, 0x00 );
colors[PianoRollSelectedNote] = QColor( 0x00, 0x40, 0xC0 );
colors[PianoRollEditHandle] = QColor( 0xEA, 0xA1, 0x00 );
colors[PianoRollSelectedLevel] = QColor( 0x00, 0x40, 0xC0 );
colors[PianoRollVolumeLevel] = QColor( 0x00, 0xFF, 0x00 );
colors[PianoRollPanningLevel] = QColor( 0xFF, 0xB0, 0x00 );
colors[TimelineForecolor] = QColor( 192, 192, 192 );
colors[TimelineForecolor] = QColor( 192, 192, 192 );
colors[StandardGraphLine] = QColor( 96, 255, 128 );
colors[StandardGraphHandle] = QColor( 0xFF, 0xBF, 0x22 );
colors[StandardGraphHandleBorder] = QColor( 0x00, 0x00, 0x02 );
colors[StandardGraphCrosshair] = QColor( 0xAA, 0xFF, 0x00, 0x70 );
colors[StandardGraphLine] = QColor( 96, 255, 128 );
colors[StandardGraphHandle] = QColor( 0xFF, 0xBF, 0x22 );
colors[StandardGraphHandleBorder] = QColor( 0x00, 0x00, 0x02 );
colors[StandardGraphCrosshair] = QColor( 0xAA, 0xFF, 0x00, 0x70 );
colors[TextFloatForecolor] = QColor( 0, 0, 0 );
colors[TextFloatFill] = QColor( 224, 224, 224 );
colors[TextFloatForecolor] = QColor( 0, 0, 0 );
colors[TextFloatFill] = QColor( 224, 224, 224 );
colors[VisualizationLevelLow] = QColor( 128, 224, 128 );
colors[VisualizationLevelMid] = QColor( 255, 192, 64 );
colors[VisualizationLevelPeak] = QColor( 255, 64, 64 );
colors[VisualizationLevelLow] = QColor( 128, 224, 128 );
colors[VisualizationLevelMid] = QColor( 255, 192, 64 );
colors[VisualizationLevelPeak] = QColor( 255, 64, 64 );
}
QColor ClassicStyle::color( LmmsStyle::ColorRole _role ) const
{
return colors[_role];
return colors[_role];
}
@@ -100,9 +100,9 @@ QPalette ClassicStyle::standardPalette( void ) const
void ClassicStyle::drawComplexControl( ComplexControl control,
const QStyleOptionComplex * option,
QPainter *painter,
const QWidget *widget ) const
const QStyleOptionComplex * option,
QPainter *painter,
const QWidget *widget ) const
{
// fix broken titlebar styling on win32
if( control == CC_TitleBar )
@@ -131,8 +131,9 @@ void ClassicStyle::drawComplexControl( ComplexControl control,
void ClassicStyle::drawPrimitive( PrimitiveElement element,
const QStyleOption *option, QPainter *painter,
const QWidget *widget) const
const QStyleOption *option,
QPainter *painter,
const QWidget *widget ) const
{
if( element == QStyle::PE_Frame ||
element == QStyle::PE_FrameLineEdit ||
@@ -154,96 +155,96 @@ void ClassicStyle::drawPrimitive( PrimitiveElement element,
// black inside lines
// 50%
black.setAlpha(a100);
painter->setPen(QPen(black, 0));
lines[0] = QLine(rect.left() + 2, rect.top() + 1,
rect.right() - 2, rect.top() + 1);
lines[1] = QLine(rect.left() + 2, rect.bottom() - 1,
rect.right() - 2, rect.bottom() - 1);
lines[2] = QLine(rect.left() + 1, rect.top() + 2,
rect.left() + 1, rect.bottom() - 2);
lines[3] = QLine(rect.right() - 1, rect.top() + 2,
rect.right() - 1, rect.bottom() - 2);
painter->drawLines(lines, 4);
black.setAlpha( a100 );
painter->setPen( QPen( black, 0 ) );
lines[0] = QLine( rect.left() + 2, rect.top() + 1,
rect.right() - 2, rect.top() + 1 );
lines[1] = QLine( rect.left() + 2, rect.bottom() - 1,
rect.right() - 2, rect.bottom() - 1 );
lines[2] = QLine( rect.left() + 1, rect.top() + 2,
rect.left() + 1, rect.bottom() - 2 );
lines[3] = QLine( rect.right() - 1, rect.top() + 2,
rect.right() - 1, rect.bottom() - 2 );
painter->drawLines( lines, 4 );
// black inside dots
black.setAlpha(a50);
painter->setPen(QPen(black, 0));
points[0] = QPoint(rect.left() + 2, rect.top() + 2);
points[1] = QPoint(rect.left() + 2, rect.bottom() - 2);
points[2] = QPoint(rect.right() - 2, rect.top() + 2);
points[3] = QPoint(rect.right() - 2, rect.bottom() - 2);
painter->drawPoints(points, 4);
black.setAlpha( a50 );
painter->setPen( QPen( black, 0 ) );
points[0] = QPoint( rect.left() + 2, rect.top() + 2 );
points[1] = QPoint( rect.left() + 2, rect.bottom() - 2 );
points[2] = QPoint( rect.right() - 2, rect.top() + 2 );
points[3] = QPoint( rect.right() - 2, rect.bottom() - 2 );
painter->drawPoints( points, 4 );
// outside lines - shadow
// 100%
shadow.setAlpha(a75);
painter->setPen(QPen(shadow, 0));
lines[0] = QLine(rect.left() + 2, rect.top(),
rect.right() - 2, rect.top());
lines[1] = QLine(rect.left(), rect.top() + 2,
rect.left(), rect.bottom() - 2);
painter->drawLines(lines, 2);
shadow.setAlpha( a75 );
painter->setPen( QPen( shadow, 0 ) );
lines[0] = QLine( rect.left() + 2, rect.top(),
rect.right() - 2, rect.top() );
lines[1] = QLine( rect.left(), rect.top() + 2,
rect.left(), rect.bottom() - 2 );
painter->drawLines( lines, 2 );
// outside corner dots - shadow
// 75%
shadow.setAlpha(a50);
painter->setPen(QPen(shadow, 0));
points[0] = QPoint(rect.left() + 1, rect.top() + 1);
points[1] = QPoint(rect.right() - 1, rect.top() + 1);
painter->drawPoints(points, 2);
shadow.setAlpha( a50 );
painter->setPen( QPen( shadow, 0 ) );
points[0] = QPoint( rect.left() + 1, rect.top() + 1 );
points[1] = QPoint( rect.right() - 1, rect.top() + 1 );
painter->drawPoints( points, 2 );
// outside end dots - shadow
// 50%
shadow.setAlpha(a25);
painter->setPen(QPen(shadow, 0));
points[0] = QPoint(rect.left() + 1, rect.top());
points[1] = QPoint(rect.left(), rect.top() + 1);
points[2] = QPoint(rect.right() - 1, rect.top());
points[3] = QPoint(rect.left(), rect.bottom() - 1);
painter->drawPoints(points, 4);
shadow.setAlpha( a25 );
painter->setPen( QPen( shadow, 0 ) );
points[0] = QPoint( rect.left() + 1, rect.top() );
points[1] = QPoint( rect.left(), rect.top() + 1 );
points[2] = QPoint( rect.right() - 1, rect.top() );
points[3] = QPoint( rect.left(), rect.bottom() - 1 );
painter->drawPoints( points, 4 );
// outside lines - highlight
// 100%
highlight.setAlpha(a75);
painter->setPen(QPen(highlight, 0));
lines[0] = QLine(rect.left() + 2, rect.bottom(),
rect.right() - 2, rect.bottom());
lines[1] = QLine(rect.right(), rect.top() + 2,
rect.right(), rect.bottom() - 2);
painter->drawLines(lines, 2);
highlight.setAlpha( a75 );
painter->setPen( QPen( highlight, 0 ) );
lines[0] = QLine( rect.left() + 2, rect.bottom(),
rect.right() - 2, rect.bottom() );
lines[1] = QLine( rect.right(), rect.top() + 2,
rect.right(), rect.bottom() - 2 );
painter->drawLines( lines, 2 );
// outside corner dots - highlight
// 75%
highlight.setAlpha(a50);
painter->setPen(QPen(highlight, 0));
points[0] = QPoint(rect.left() + 1, rect.bottom() - 1);
points[1] = QPoint(rect.right() - 1, rect.bottom() - 1);
painter->drawPoints(points, 2);
highlight.setAlpha( a50 );
painter->setPen( QPen(highlight, 0 ) );
points[0] = QPoint( rect.left() + 1, rect.bottom() - 1 );
points[1] = QPoint( rect.right() - 1, rect.bottom() - 1 );
painter->drawPoints( points, 2 );
// outside end dots - highlight
// 50%
highlight.setAlpha(a25);
painter->setPen(QPen(highlight, 0));
points[0] = QPoint(rect.right() - 1, rect.bottom());
points[1] = QPoint(rect.right(), rect.bottom() - 1);
points[2] = QPoint(rect.left() + 1, rect.bottom());
points[3] = QPoint(rect.right(), rect.top() + 1);
painter->drawPoints(points, 4);
highlight.setAlpha( a25 );
painter->setPen( QPen(highlight, 0 ) );
points[0] = QPoint( rect.right() - 1, rect.bottom() );
points[1] = QPoint( rect.right(), rect.bottom() - 1 );
points[2] = QPoint( rect.left() + 1, rect.bottom() );
points[3] = QPoint( rect.right(), rect.top() + 1 );
painter->drawPoints( points, 4 );
}
else
{
QPlastiqueStyle::drawPrimitive( element, option, painter,
widget );
QPlastiqueStyle::drawPrimitive( element, option, painter, widget );
}
}
int ClassicStyle::pixelMetric( PixelMetric _metric, const QStyleOption * _option,
const QWidget * _widget ) const
int ClassicStyle::pixelMetric( PixelMetric _metric,
const QStyleOption * _option,
const QWidget * _widget ) const
{
switch( _metric )
{
@@ -263,31 +264,31 @@ int ClassicStyle::pixelMetric( PixelMetric _metric, const QStyleOption * _option
return 24;
default:
return QPlastiqueStyle::pixelMetric( _metric, _option,
_widget );
return QPlastiqueStyle::pixelMetric(
_metric, _option, _widget );
}
}
void ClassicStyle::drawFxLine(QPainter * _painter, const QWidget *_fxLine,
const QString & _name, bool _active)
void ClassicStyle::drawFxLine( QPainter * _painter, const QWidget *_fxLine,
const QString & _name, bool _active )
{
int width = _fxLine->rect().width();
int height = _fxLine->rect().height();
int width = _fxLine->rect().width();
int height = _fxLine->rect().height();
QPainter * p = _painter;
p->fillRect( _fxLine->rect(), QColor( 72, 76, 88 ) );
p->setPen( QColor( 40, 42, 48 ) );
p->drawRect( 0, 0, width-2, height-2 );
p->setPen( QColor( 108, 114, 132 ) );
p->drawRect( 1, 1, width-2, height-2 );
p->setPen( QColor( 20, 24, 32 ) );
p->drawRect( 0, 0, width-1, height-1 );
QPainter * p = _painter;
p->fillRect( _fxLine->rect(), QColor( 72, 76, 88 ) );
p->setPen( QColor( 40, 42, 48 ) );
p->drawRect( 0, 0, width-2, height-2 );
p->setPen( QColor( 108, 114, 132 ) );
p->drawRect( 1, 1, width-2, height-2 );
p->setPen( QColor( 20, 24, 32 ) );
p->drawRect( 0, 0, width-1, height-1 );
p->rotate( -90 );
p->setPen( _active ? QColor( 0, 255, 0 ) : Qt::white );
p->setFont( pointSizeF( _fxLine->font(), 7.5f ) );
p->drawText( -90, 20, _name );
p->rotate( -90 );
p->setPen( _active ? QColor( 0, 255, 0 ) : Qt::white );
p->setFont( pointSizeF( _fxLine->font(), 7.5f ) );
p->drawText( -90, 20, _name );
}
void ClassicStyle::drawTrackContentBackground(QPainter * _painter,