remove the title label from lfo_controller_artwork.png/new alignment (#2999)

This commit is contained in:
BaraMGB
2016-08-26 13:01:07 +02:00
committed by Umcaruje
parent cf824bd6f1
commit f3ce31250d
2 changed files with 10 additions and 11 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

View File

@@ -44,19 +44,19 @@
#include "TempoSyncKnob.h"
#include "PixmapButton.h"
const int CD_ENV_KNOBS_LBL_Y = 20;
const int CD_ENV_KNOBS_LBL_Y = 11;
const int CD_KNOB_X_SPACING = 32;
const int CD_LFO_SHAPES_X = 6;
const int CD_LFO_SHAPES_Y = 36;
const int CD_LFO_SHAPES_Y = CD_ENV_KNOBS_LBL_Y + 4;
const int CD_LFO_GRAPH_Y = CD_ENV_KNOBS_LBL_Y+15;
const int CD_LFO_GRAPH_Y = CD_ENV_KNOBS_LBL_Y+3;
const int CD_LFO_CD_KNOB_Y = CD_LFO_GRAPH_Y-2;
const int CD_LFO_BASE_CD_KNOB_X = CD_LFO_SHAPES_X + 64;
const int CD_LFO_BASE_CD_KNOB_X = CD_LFO_SHAPES_X + 68;
const int CD_LFO_SPEED_CD_KNOB_X = CD_LFO_BASE_CD_KNOB_X+CD_KNOB_X_SPACING;
const int CD_LFO_AMOUNT_CD_KNOB_X = CD_LFO_SPEED_CD_KNOB_X+CD_KNOB_X_SPACING;
const int CD_LFO_PHASE_CD_KNOB_X = CD_LFO_AMOUNT_CD_KNOB_X+CD_KNOB_X_SPACING;
const int CD_LFO_MULTIPLIER_X = CD_LFO_PHASE_CD_KNOB_X+CD_KNOB_X_SPACING;
const int CD_LFO_MULTIPLIER_X = CD_LFO_PHASE_CD_KNOB_X+CD_KNOB_X_SPACING+3;
LfoControllerDialog::LfoControllerDialog( Controller * _model, QWidget * _parent ) :
ControllerDialog( _model, _parent )
@@ -67,7 +67,7 @@ LfoControllerDialog::LfoControllerDialog( Controller * _model, QWidget * _parent
title.append( ")" );
setWindowTitle( title );
setWindowIcon( embed::getIconPixmap( "controller" ) );
setFixedSize( 240, 80 );
setFixedSize( 240, 58 );
ToolTip::add( this, tr( "LFO Controller" ) );
@@ -201,21 +201,21 @@ LfoControllerDialog::LfoControllerDialog( Controller * _model, QWidget * _parent
PixmapButton * x1 = new PixmapButton( this, NULL );
x1->move( CD_LFO_MULTIPLIER_X, CD_LFO_SHAPES_Y );
x1->move( CD_LFO_MULTIPLIER_X, CD_LFO_SHAPES_Y +7);
x1->setActiveGraphic( embed::getIconPixmap(
"lfo_x1_active" ) );
x1->setInactiveGraphic( embed::getIconPixmap(
"lfo_x1_inactive" ) );
PixmapButton * x100 = new PixmapButton( this, NULL );
x100->move( CD_LFO_MULTIPLIER_X, CD_LFO_SHAPES_Y - 15 );
x100->move( CD_LFO_MULTIPLIER_X, CD_LFO_SHAPES_Y - 8 );
x100->setActiveGraphic( embed::getIconPixmap(
"lfo_x100_active" ) );
x100->setInactiveGraphic( embed::getIconPixmap(
"lfo_x100_inactive" ) );
PixmapButton * d100 = new PixmapButton( this, NULL );
d100->move( CD_LFO_MULTIPLIER_X, CD_LFO_SHAPES_Y + 15 );
d100->move( CD_LFO_MULTIPLIER_X, CD_LFO_SHAPES_Y + 22 );
d100->setActiveGraphic( embed::getIconPixmap(
"lfo_d100_active" ) );
d100->setInactiveGraphic( embed::getIconPixmap(
@@ -231,8 +231,7 @@ LfoControllerDialog::LfoControllerDialog( Controller * _model, QWidget * _parent
setAutoFillBackground( true );
QPalette pal;
pal.setBrush( backgroundRole(),
embed::getIconPixmap( "lfo_controller_artwork" ) );
pal.setBrush( backgroundRole(), embed::getIconPixmap( "lfo_controller_artwork" ) );
setPalette( pal );
}