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

removed specialBgHandlingWidget, style sheet, some cleaning up

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@579 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Javier Serrano Polo
2007-11-10 21:11:32 +00:00
parent 4f057a7068
commit 87612a2d13
32 changed files with 189 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
ChangeLog
View File

@@ -1,3 +1,61 @@
2007-11-10 Javier Serrano Polo <jasp00/at/terra/dot/es>
* Makefile.am:
* include/envelope_and_lfo_widget.h:
* include/pixmap_button.h:
* include/spc_bg_hndl_widget.h:
* include/tab_widget.h:
* plugins/audio_file_processor/audio_file_processor.cpp:
* plugins/audio_file_processor/audio_file_processor.h:
* plugins/bit_invader/bit_invader.cpp:
* plugins/bit_invader/bit_invader.h:
* plugins/organic/organic.cpp:
* plugins/organic/organic.h:
* plugins/patman/patman.cpp:
* plugins/patman/patman.h:
* plugins/vestige/vestige.cpp:
* plugins/vestige/vestige.h:
* src/core/envelope_and_lfo_widget.cpp:
* src/widgets/group_box.cpp:
* src/widgets/knob.cpp:
* src/widgets/led_checkbox.cpp:
* src/widgets/pixmap_button.cpp:
* src/widgets/tab_widget.cpp:
removed obsolete specialBgHandlingWidget
* src/core/main_window.cpp:
fixed label in save project dialog
* data/themes/default/style.css:
* include/track.h:
* src/core/track.cpp:
turned more code into style sheet
* data/themes/default/style.css:
* src/core/track.cpp:
reverted positioning in style sheet
* data/themes/default/style.css:
restricted style inheritance
* plugins/bass_booster/bassbooster_control_dialog.cpp:
* plugins/flp_import/unrtf/parse.c:
* plugins/vestige/vestige.h:
* plugins/vst_effect/vst_control_dialog.cpp:
* plugins/vst_effect/vst_effect.cpp:
* plugins/vst_effect/vst_subplugin_features.cpp:
removed Qt3 code
* plugins/bit_invader/bit_invader.cpp:
* plugins/bit_invader/bit_invader.h:
* plugins/organic/organic.cpp:
* plugins/organic/organic.h:
* plugins/vestige/vestige.cpp:
reduced dependencies
* plugins/bit_invader/bit_invader.cpp:
removed deprecated code
2007-11-06 Javier Serrano Polo <jasp00/at/terra/dot/es>
* include/track.h:

1
Makefile.am
View File

@@ -322,7 +322,6 @@ lmms_SOURCES = \
$(srcdir)/include/embed.h \
$(srcdir)/include/timeline.h \
$(srcdir)/include/config_mgr.h \
$(srcdir)/include/spc_bg_hndl_widget.h \
$(srcdir)/include/tab_bar.h \
$(srcdir)/include/tab_button.h \
$(srcdir)/include/project_notes.h \

4
configure.in
View File

@@ -2,8 +2,8 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.50)
AC_INIT(lmms, 0.4.0-svn20071106, lmms-devel/at/lists/dot/sf/dot/net)
AM_INIT_AUTOMAKE(lmms, 0.4.0-svn20071106)
AC_INIT(lmms, 0.4.0-svn20071110, lmms-devel/at/lists/dot/sf/dot/net)
AM_INIT_AUTOMAKE(lmms, 0.4.0-svn20071110)
AM_CONFIG_HEADER(config.h)

12
data/themes/default/style.css
View File

@@ -6,18 +6,20 @@ captionMenu::item:disabled {
text-align: center;
}
trackOperationsWidget QPushButton {
margin-left: 12px;
margin-top: 1px;
trackOperationsWidget > QPushButton {
max-height: 26px;
max-width: 26px;
min-height: 26px;
min-width: 26px;
}
/*trackOperationsWidget QPushButton::menu-indicator {
trackOperationsWidget#automationDisabled > QPushButton::menu-indicator {
image: url(resources:track_op_menu_disabled.png);
}
trackOperationsWidget#automationEnabled > QPushButton::menu-indicator {
image: url(resources:track_op_menu.png);
}*/
}
QWidget#mainToolbar {
background-image: url(resources:main_toolbar_bg.png);

8
include/envelope_and_lfo_widget.h
View File

@@ -28,14 +28,13 @@
#ifndef _ENVELOPE_AND_LFO_WIDGET_H
#define _ENVELOPE_AND_LFO_WIDGET_H
#include <QtGui/QWidget>
#include <QtCore/QVector>
#include <QtGui/QWidget>
#include "journalling_object.h"
#include "types.h"
#include "spc_bg_hndl_widget.h"
#include "sample_buffer.h"
#include "types.h"
class QPaintEvent;
@@ -53,8 +52,7 @@ class track;
class flpImport;
class envelopeAndLFOWidget : public QWidget, public journallingObject,
public specialBgHandlingWidget
class envelopeAndLFOWidget : public QWidget, public journallingObject
{
Q_OBJECT
public:

2
include/pixmap_button.h
View File

@@ -41,7 +41,6 @@ public:
void setActiveGraphic( const QPixmap & _pm );
void setInactiveGraphic( const QPixmap & _pm, bool _update = TRUE );
void setBgGraphic( const QPixmap & _pm );
signals:
@@ -58,7 +57,6 @@ protected:
private:
QPixmap m_activePixmap;
QPixmap m_inactivePixmap;
QPixmap m_bgPixmap;
} ;

110
include/spc_bg_hndl_widget.h
View File

@@ -1,110 +0,0 @@
/*
* spc_bg_hndl_widget.h - class specialBgHandlingWidget
*
* Copyright (c) 2005-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
* 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.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program (see COPYING); if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA.
*
*/
#ifndef _SPC_BG_HNDL_WIDGET_H
#define _SPC_BG_HNDL_WIDGET_H
#include <QtGui/QWidget>
#include <QtGui/QPainter>
#include <QtGui/QPixmap>
class specialBgHandlingWidget
{
public:
specialBgHandlingWidget( const QPixmap & _pm ) :
m_backgroundPixmap( _pm ),
m_backgroundColor( QColor( 0, 0, 0 ) )
{
}
specialBgHandlingWidget( const QColor & _c ) :
m_backgroundPixmap(),
m_backgroundColor( _c )
{
}
~specialBgHandlingWidget()
{
}
const QPixmap & backgroundPixmap( void ) const
{
return( m_backgroundPixmap );
}
const QColor & backgroundColor( void ) const
{
return( m_backgroundColor );
}
static QPixmap getBackground( const QWidget * _w )
{
QPixmap pm( _w->size() );
const QWidget * pw = _w->parentWidget();
if( dynamic_cast<const specialBgHandlingWidget *>( pw ) )
{
const specialBgHandlingWidget * s = dynamic_cast<
const specialBgHandlingWidget *>( pw );
if( s->backgroundPixmap().isNull() == FALSE )
{
QPainter p( &pm );
p.drawPixmap( 0, 0, s->backgroundPixmap(),
_w->x(), _w->y(), _w->width(),
_w->height() );
}
else
{
pm.fill( s->backgroundColor() );
}
}
else
{
QPainter p( &pm );
const QBrush & br = pw->palette().brush(
pw->backgroundRole() );
if( br.style() == Qt::TexturePattern )
{
p.drawPixmap( 0, 0, br.texture(),
_w->x(), _w->y(),
_w->width(), _w->height() );
}
else
{
pm.fill( br.color() );
}
}
return( pm );
}
private:
QPixmap m_backgroundPixmap;
QColor m_backgroundColor;
} ;
#endif

4
include/tab_widget.h
View File

@@ -29,10 +29,8 @@
#include <QtGui/QWidget>
#include <QtCore/QMap>
#include "spc_bg_hndl_widget.h"
class tabWidget : public QWidget, public specialBgHandlingWidget
class tabWidget : public QWidget
{
Q_OBJECT
public:

2
include/track.h
View File

@@ -266,8 +266,6 @@ private:
static QPixmap * s_muteOffEnabled;
static QPixmap * s_muteOnDisabled;
static QPixmap * s_muteOnEnabled;
static QPixmap * s_trackOpsDisabled;
static QPixmap * s_trackOpsEnabled;
trackWidget * m_trackWidget;

7
plugins/audio_file_processor/audio_file_processor.cpp
View File

@@ -76,7 +76,6 @@ QPixmap * audioFileProcessor::s_artwork = NULL;
audioFileProcessor::audioFileProcessor( instrumentTrack * _channel_track ) :
instrument( _channel_track, &audiofileprocessor_plugin_descriptor ),
specialBgHandlingWidget( PLUGIN_NAME::getIconPixmap( "artwork" ) ),
m_drawMethod( sampleBuffer::LINE_CONNECT )
{
connect( &m_sampleBuffer, SIGNAL( sampleUpdated() ), this,
@@ -96,8 +95,6 @@ audioFileProcessor::audioFileProcessor( instrumentTrack * _channel_track ) :
"project_open_down" ) );
m_openAudioFileButton->setInactiveGraphic( embed::getIconPixmap(
"project_open" ) );
m_openAudioFileButton->setBgGraphic( getBackground(
m_openAudioFileButton ) );
connect( m_openAudioFileButton, SIGNAL( clicked() ), this,
SLOT( openAudioFile() ) );
toolTip::add( m_openAudioFileButton, tr( "Open other sample" ) );
@@ -117,7 +114,6 @@ audioFileProcessor::audioFileProcessor( instrumentTrack * _channel_track ) :
"reverse_on" ) );
m_reverseButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap(
"reverse_off" ) );
m_reverseButton->setBgGraphic( getBackground( m_reverseButton ) );
connect( m_reverseButton, SIGNAL( toggled( bool ) ), this,
SLOT( reverseBtnToggled( bool ) ) );
toolTip::add( m_reverseButton, tr( "Reverse sample" ) );
@@ -133,7 +129,6 @@ audioFileProcessor::audioFileProcessor( instrumentTrack * _channel_track ) :
"loop_on" ) );
m_loopButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap(
"loop_off" ) );
m_loopButton->setBgGraphic( getBackground( m_loopButton ) );
toolTip::add( m_loopButton,
tr( "Loop sample at start- and end-point" ) );
m_loopButton->setWhatsThis(
@@ -191,7 +186,6 @@ audioFileProcessor::audioFileProcessor( instrumentTrack * _channel_track ) :
m_viewLinesPB = new pixmapButton( this, NULL, NULL );
m_viewLinesPB->move( 154, 158 );
m_viewLinesPB->setBgGraphic( getBackground( m_viewLinesPB ) );
if( m_drawMethod == sampleBuffer::LINE_CONNECT )
{
m_viewLinesPB->setChecked( TRUE );
@@ -206,7 +200,6 @@ audioFileProcessor::audioFileProcessor( instrumentTrack * _channel_track ) :
m_viewDotsPB = new pixmapButton( this, NULL, NULL );
m_viewDotsPB->move( 204, 158 );
m_viewDotsPB->setBgGraphic( getBackground( m_viewDotsPB ) );
if( m_drawMethod == sampleBuffer::DOTS )
{
m_viewDotsPB->setChecked( TRUE );

3
plugins/audio_file_processor/audio_file_processor.h
View File

@@ -31,7 +31,6 @@
#include "instrument.h"
#include "sample_buffer.h"
#include "spc_bg_hndl_widget.h"
class knob;
@@ -39,7 +38,7 @@ class pixmapButton;
class volumeKnob;
class audioFileProcessor : public instrument, public specialBgHandlingWidget
class audioFileProcessor : public instrument
{
Q_OBJECT
public:

8
plugins/bass_booster/bassbooster_control_dialog.cpp
View File

@@ -23,16 +23,8 @@
*/
#ifndef QT3
#include <QtGui/QLayout>
#else
#include <qlayout.h>
#endif
#include "bass_booster.h"
#include "knob.h"

195
plugins/bit_invader/bit_invader.cpp
View File

@@ -23,30 +23,26 @@
*/
#include <QtGui/QPainter>
#include <Qt/QtXml>
#include <QtGui/QDropEvent>
#include "bit_invader.h"
#include <QtXml/QDomElement>
#include <iostream>
#include <cstdlib>
#include <ctime>
#include "math.h"
using namespace std;
#include "bit_invader.h"
#include "base64.h"
#include "engine.h"
#include "graph.h"
#include "instrument_track.h"
#include "note_play_handle.h"
#include "templates.h"
#include "knob.h"
#include "pixmap_button.h"
#include "tooltip.h"
#include "song_editor.h"
#include "led_checkbox.h"
#include "note_play_handle.h"
#include "oscillator.h"
#include "sample_buffer.h"
#include "pixmap_button.h"
#include "song_editor.h"
#include "templates.h"
#include "tooltip.h"
#undef SINGLE_SOURCE_COMPILE
#include "embed.cpp"
@@ -72,7 +68,8 @@ plugin::descriptor bitinvader_plugin_descriptor =
QPixmap * bitInvader::s_artwork = NULL;
bSynth::bSynth(float* shape, int length, float _pitch, bool _interpolation, float factor, const sample_rate_t _sample_rate )
bSynth::bSynth( float * shape, int length, float _pitch, bool _interpolation,
float factor, const sample_rate_t _sample_rate )
{
interpolation = _interpolation;
@@ -155,8 +152,7 @@ sample_t bSynth::nextStringSample( void )
bitInvader::bitInvader( instrumentTrack * _channel_track ) :
instrument( _channel_track,
&bitinvader_plugin_descriptor ),
specialBgHandlingWidget( PLUGIN_NAME::getIconPixmap( "artwork" ) )
&bitinvader_plugin_descriptor )
{
@@ -336,24 +332,25 @@ bitInvader::bitInvader( instrumentTrack * _channel_track ) :
void bitInvader::sinWaveClicked( void )
{
// generate a Sinus wave using static oscillator-method
for (int i=0; i < sample_length; i++)
{
sample_shape[i] = oscillator::sinSample( i/static_cast<float>(sample_length) );
}
for (int i=0; i < sample_length; i++)
{
sample_shape[i] = oscillator::sinSample( i / static_cast<float>(
sample_length ) );
}
sampleChanged();
}
void bitInvader::triangleWaveClicked( void )
{
// generate a Triangle wave using static oscillator-method
for (int i=0; i < sample_length; i++)
{
sample_shape[i] = oscillator::triangleSample( i/static_cast<float>(sample_length) );
}
sampleChanged();
for (int i=0; i < sample_length; i++)
{
sample_shape[i] = oscillator::triangleSample( i /
static_cast<float>( sample_length) );
}
sampleChanged();
}
@@ -361,35 +358,36 @@ void bitInvader::sawWaveClicked( void )
{
// generate a Saw wave using static oscillator-method
for (int i=0; i < sample_length; i++)
{
sample_shape[i] = oscillator::sawSample( i/static_cast<float>(sample_length) );
}
sampleChanged();
{
sample_shape[i] = oscillator::sawSample( i / static_cast<float>(
sample_length ) );
}
sampleChanged();
}
void bitInvader::sqrWaveClicked( void )
{
// generate a Sqr wave using static oscillator-method
for (int i=0; i < sample_length; i++)
{
sample_shape[i] = oscillator::squareSample( i/static_cast<float>(sample_length) );
}
sampleChanged();
{
sample_shape[i] = oscillator::squareSample( i /
static_cast<float>( sample_length ) );
}
sampleChanged();
}
void bitInvader::noiseWaveClicked( void )
{
// generate a Noise wave using static oscillator-method
for (int i=0; i < sample_length; i++)
{
sample_shape[i] = oscillator::noiseSample( i/static_cast<float>(sample_length) );
}
sampleChanged();
{
sample_shape[i] = oscillator::noiseSample( i /
static_cast<float>( sample_length ) );
}
sampleChanged();
}
void bitInvader::usrWaveClicked( void )
@@ -408,119 +406,19 @@ void bitInvader::usrWaveClicked( void )
buffer.setAudioFile( af );
// copy buffer data
sample_length = min( sample_length, static_cast<int>(buffer.frames()) );
sample_length = min( sample_length, static_cast<int>(
buffer.frames() ) );
for ( int i = 0; i < sample_length; i++ )
{
sample_shape[i] = (float)*buffer.data()[i];
}
}
sampleChanged();
}
/*
deprecated code
was replaced by static oscillator methods
void bitInvader::sinWaveClicked( void )
{
// generate sample data
for (int i=0; i < sample_length; i++)
{
// sin(x)
sample_shape[i] = sinf(i * 6.2831853 / sample_length);
}
sampleChanged();
}
void bitInvader::triangleWaveClicked( void )
{
int half_sample_length = sample_length / 2;
if ((sample_length % 2) == 0) {
for (int i=0; i < half_sample_length; i++)
{
// triangle
sample_shape[i] = (((float)i) / half_sample_length * 2) - 1;
}
for (int i=half_sample_length; i < sample_length; i++)
{
// triangle
sample_shape[i] = - (((float)(i-half_sample_length)) / half_sample_length * 2) + 1;
}
} else {
for (int i=0; i < half_sample_length; i++)
{
// triangle
sample_shape[i] = (((float)i) / half_sample_length * 2) - 1;
}
sample_shape[half_sample_length] = 1;
for (int i=half_sample_length+1; i < sample_length; i++)
{
// triangle
sample_shape[i] = - (((float)(i-half_sample_length)) / half_sample_length * 2) + 1;
}
}
sampleChanged();
}
void bitInvader::sawWaveClicked( void )
{
for (int i=0; i < sample_length; i++)
{
// saw
sample_shape[i] = (((float)i) / sample_length * 2) - 1;
}
sampleChanged();
}
void bitInvader::sqrWaveClicked( void )
{
int half_sample_length = sample_length / 2;
for (int i=0; i < half_sample_length; i++)
{
// triangle
sample_shape[i] = 1;
}
for (int i=half_sample_length; i < sample_length; i++)
{
// triangle
sample_shape[i] = -1;
}
sampleChanged();
}
void bitInvader::noiseWaveClicked( void)
{
srand(time(NULL));
for (int i=0; i < sample_length; i++)
{
sample_shape[i]= ((float)rand() / RAND_MAX * 2.0) - 1.0;
}
sampleChanged();
}
*/
bitInvader::~bitInvader()
{
@@ -769,3 +667,6 @@ plugin * lmms_plugin_main( void * _data )
}
#include "bit_invader.moc"

20
plugins/bit_invader/bit_invader.h
View File

@@ -2,7 +2,7 @@
* bit_invader.h - declaration of class bitInvader and bSynth which
* are a wavetable synthesizer
*
* Copyright (c) 2006 Andreas Brandmaier <andy/at/brandmaier/dot/de>
* Copyright (c) 2006-2007 Andreas Brandmaier <andy/at/brandmaier/dot/de>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -29,28 +29,27 @@
#include "instrument.h"
#include "spc_bg_hndl_widget.h"
#include "graph.h"
#include "led_checkbox.h"
#include "oscillator.h"
#include "types.h"
class QPixmap;
class graph;
class knob;
class notePlayHandle;
class ledCheckBox;
class oscillator;
class pixmapButton;
class bSynth
{
public:
bSynth(float* sample, int length, float _pitch, bool _interpolation, float factor, const sample_rate_t _sample_rate);
bSynth( float * sample, int length, float _pitch, bool _interpolation,
float factor, const sample_rate_t _sample_rate );
virtual ~bSynth();
sample_t nextStringSample();
sample_t nextStringSample();
private:
int sample_index;
float sample_realindex;
int sample_length;
@@ -61,7 +60,7 @@ private:
} ;
class bitInvader : public instrument, public specialBgHandlingWidget
class bitInvader : public instrument
{
Q_OBJECT
public:
@@ -132,7 +131,6 @@ private:
} ;
#include "bit_invader.moc"
#endif

4
plugins/flp_import/unrtf/parse.c
View File

@@ -156,11 +156,7 @@ static int my_getchar (QBuffer* f)
error_handler("Cannot allocate read buffer");
}
}
#ifndef QT3
read_buf_end = f->read(read_buf, buffer_size);
#else
read_buf_end = f->readBlock(read_buf, buffer_size);
#endif
read_buf_index = 0;
if (!read_buf_end)
return EOF;

22
plugins/organic/organic.cpp
View File

@@ -23,19 +23,12 @@
*/
#include <QtGui/QPainter>
#include <Qt/QtXml>
#include <QtGui/QDropEvent>
#include <iostream>
#include <cstdlib>
#include <ctime>
#include "math.h"
using namespace std;
#include "organic.h"
#include <QtXml/QDomElement>
#include "engine.h"
#include "instrument_track.h"
#include "knob.h"
@@ -83,7 +76,6 @@ QPixmap * organicInstrument::s_artwork = NULL;
organicInstrument::organicInstrument( instrumentTrack * _channel_track ) :
instrument( _channel_track,
&organic_plugin_descriptor ),
specialBgHandlingWidget( PLUGIN_NAME::getIconPixmap( "artwork" ) ),
m_modulationAlgo( oscillator::MIX )
{
m_num_oscillators = 8;
@@ -525,3 +517,7 @@ plugin * lmms_plugin_main( void * _data )
* - randomize preset
*/
#include "organic.moc"

5
plugins/organic/organic.h
View File

@@ -28,8 +28,6 @@
#include "instrument.h"
#include "spc_bg_hndl_widget.h"
#include "led_checkbox.h"
#include "oscillator.h"
class QPixmap;
@@ -77,7 +75,7 @@ private slots:
class organicInstrument : public instrument, public specialBgHandlingWidget
class organicInstrument : public instrument
{
Q_OBJECT
public:
@@ -137,7 +135,6 @@ private slots:
} ;
#include "organic.moc"
#endif

10
plugins/patman/patman.cpp
View File

@@ -23,11 +23,12 @@
*/
#include "patman.h"
#include <QtGui/QFileDialog>
#include <QtGui/QDragEnterEvent>
#include <QtXml/QDomElement>
#include "patman.h"
#include "endian_handling.h"
#include "engine.h"
#include "gui_templates.h"
@@ -72,8 +73,7 @@ plugin * lmms_plugin_main( void * _data )
patmanSynth::patmanSynth( instrumentTrack * _track ) :
instrument( _track, &patman_plugin_descriptor ),
specialBgHandlingWidget( PLUGIN_NAME::getIconPixmap( "artwork" ) )
instrument( _track, &patman_plugin_descriptor )
{
setAutoFillBackground( TRUE );
QPalette pal;
@@ -88,8 +88,6 @@ patmanSynth::patmanSynth( instrumentTrack * _track ) :
"project_open_down" ) );
m_openFileButton->setInactiveGraphic( embed::getIconPixmap(
"project_open" ) );
m_openFileButton->setBgGraphic( getBackground(
m_openFileButton ) );
connect( m_openFileButton, SIGNAL( clicked() ), this,
SLOT( openFile() ) );
toolTip::add( m_openFileButton, tr( "Open other patch" ) );
@@ -105,7 +103,6 @@ patmanSynth::patmanSynth( instrumentTrack * _track ) :
"loop_on" ) );
m_loopButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap(
"loop_off" ) );
m_loopButton->setBgGraphic( getBackground( m_loopButton ) );
toolTip::add( m_loopButton, tr( "Loop mode" ) );
m_loopButton->setWhatsThis(
tr( "Here you can toggle the Loop mode. If enabled, PatMan "
@@ -120,7 +117,6 @@ patmanSynth::patmanSynth( instrumentTrack * _track ) :
"tune_on" ) );
m_tuneButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap(
"tune_off" ) );
m_tuneButton->setBgGraphic( getBackground( m_tuneButton ) );
toolTip::add( m_tuneButton, tr( "Tune mode" ) );
m_tuneButton->setWhatsThis(
tr( "Here you can toggle the Tune mode. If enabled, PatMan "

3
plugins/patman/patman.h
View File

@@ -29,7 +29,6 @@
#include "instrument.h"
#include "sample_buffer.h"
#include "spc_bg_hndl_widget.h"
class pixmapButton;
@@ -45,7 +44,7 @@ class pixmapButton;
#define MODES_CLAMPED ( 1 << 7 )
class patmanSynth : public instrument, public specialBgHandlingWidget
class patmanSynth : public instrument
{
Q_OBJECT
public:

15
plugins/vestige/vestige.cpp
View File

@@ -23,25 +23,21 @@
*/
#include <Qt/QtXml>
#include <QtGui/QMessageBox>
#include "vestige.h"
#include <QtGui/QFileDialog>
#include <QtCore/QFileInfo>
#include <QtCore/QDir>
#include <QtGui/QMessageBox>
#include <QtGui/QPushButton>
#include <QtGui/QCursor>
#include <QtXml/QDomElement>
#include "engine.h"
#include "vestige.h"
#include "gui_templates.h"
#include "instrument_play_handle.h"
#include "instrument_track.h"
#include "lvsl_client.h"
#include "mixer.h"
#include "note_play_handle.h"
#include "pixmap_button.h"
#include "song_editor.h"
#include "spc_bg_hndl_widget.h"
#include "text_float.h"
#include "tooltip.h"
@@ -73,7 +69,6 @@ QPixmap * vestigeInstrument::s_artwork = NULL;
vestigeInstrument::vestigeInstrument( instrumentTrack * _instrument_track ) :
instrument( _instrument_track, &vestige_plugin_descriptor ),
specialBgHandlingWidget( PLUGIN_NAME::getIconPixmap( "artwork" ) ),
m_plugin( NULL ),
m_pluginMutex()
{
@@ -91,8 +86,6 @@ vestigeInstrument::vestigeInstrument( instrumentTrack * _instrument_track ) :
"project_open_down" ) );
m_openPluginButton->setInactiveGraphic( embed::getIconPixmap(
"project_open" ) );
m_openPluginButton->setBgGraphic( getBackground(
m_openPluginButton ) );
connect( m_openPluginButton, SIGNAL( clicked() ), this,
SLOT( openPlugin() ) );
toolTip::add( m_openPluginButton, tr( "Open other VST-plugin" ) );

16
plugins/vestige/vestige.h
View File

@@ -27,30 +27,22 @@
#define _VESTIGE_H
#ifndef QT3
#include <QtCore/QMutex>
#else
#include <qmutex.h>
#endif
#include "instrument.h"
#include "midi.h"
#include "note.h"
#include "spc_bg_hndl_widget.h"
class QPixmap;
class QPushButton;
class pixmapButton;
class QPushButton;
class remoteVSTPlugin;
class QPixmap;
class vestigeInstrument : public instrument, public specialBgHandlingWidget
class vestigeInstrument : public instrument
{
Q_OBJECT
public:

12
plugins/vst_effect/vst_control_dialog.cpp
View File

@@ -23,16 +23,10 @@
*/
#ifndef QT3
#include "vst_control_dialog.h"
#include <QtGui/QLayout>
#else
#include <qlayout.h>
#endif
#include "vst_effect.h"
@@ -45,11 +39,7 @@ vstControlDialog::vstControlDialog( QWidget * _parent,
QWidget * pw = m_effect->m_plugin->pluginWidget();
if( pw )
{
#ifndef QT3
pw->setParent( this );
#else
pw->reparent( this, QPoint( 0, 0 ) );
#endif
pw->show();
l->addWidget( pw );
}

12
plugins/vst_effect/vst_effect.cpp
View File

@@ -23,21 +23,13 @@
*/
#ifndef QT3
#include "vst_effect.h"
#include <QtGui/QMessageBox>
#else
#include <qmessagebox.h>
#endif
#include "vst_effect.h"
#include "vst_subplugin_features.h"
#include "song_editor.h"
#include "text_float.h"
#include "vst_subplugin_features.h"
#undef SINGLE_SOURCE_COMPILE

15
plugins/vst_effect/vst_subplugin_features.cpp
View File

@@ -25,20 +25,11 @@
*/
#ifndef QT3
#include "vst_subplugin_features.h"
#include <QtCore/QDir>
#include <QtGui/QLabel>
#else
#include <qdir.h>
#include <qlabel.h>
#endif
#include "vst_subplugin_features.h"
#include "config_mgr.h"
@@ -64,12 +55,8 @@ void vstSubPluginFeatures::listSubPluginKeys( plugin::descriptor * _desc,
keyList & _kl )
{
QStringList dlls = QDir( configManager::inst()->vstDir() ).
#ifndef QT3
entryList( QStringList() << "*.dll",
QDir::Files, QDir::Name );
#else
entryList( "*.dll", QDir::Files, QDir::Name );
#endif
// TODO: eval m_type
for( QStringList::const_iterator it = dlls.begin();
it != dlls.end(); ++it )

30
src/core/envelope_and_lfo_widget.cpp
View File

@@ -26,27 +26,28 @@
*/
#include <QtGui/QPainter>
#include <QtGui/QPaintEvent>
#include <Qt/QtXml>
#include <QtGui/QLabel>
#include "envelope_and_lfo_widget.h"
#include "song_editor.h"
#include <QtGui/QMouseEvent>
#include <QtGui/QPainter>
#include <QtXml/QDomElement>
#include "debug.h"
#include "embed.h"
#include "engine.h"
#include "knob.h"
#include "pixmap_button.h"
#include "oscillator.h"
#include "debug.h"
#include "tooltip.h"
#include "gui_templates.h"
#include "knob.h"
#include "led_checkbox.h"
#include "tempo_sync_knob.h"
#include "string_pair_drag.h"
#include "mmp.h"
#include "oscillator.h"
#include "pixmap_button.h"
#include "song_editor.h"
#include "string_pair_drag.h"
#include "tempo_sync_knob.h"
#include "text_float.h"
#include "tooltip.h"
@@ -95,7 +96,6 @@ envelopeAndLFOWidget::envelopeAndLFOWidget( float _value_for_zero_amount,
QWidget * _parent,
track * _track ) :
QWidget( _parent ),
specialBgHandlingWidget( palette().color( backgroundRole() ) ),
m_used( FALSE ),
m_valueForZeroAmount( _value_for_zero_amount ),
m_pahdEnv( NULL ),

1
src/core/main_window.cpp
View File

@@ -671,6 +671,7 @@ bool mainWindow::saveProjectAs( void )
QFileDialog sfd( this, tr( "Save project" ), "",
tr( "MultiMedia Project (*.mmp *.mmpz);;"
"MultiMedia Project Template (*.mpt)" ) );
sfd.setAcceptMode( QFileDialog::AcceptSave );
sfd.setFileMode( QFileDialog::AnyFile );
QString f = engine::getSongEditor()->projectFileName();
if( f != "" )

19
src/core/track.cpp
View File

@@ -921,8 +921,6 @@ QPixmap * trackOperationsWidget::s_muteOffDisabled;
QPixmap * trackOperationsWidget::s_muteOffEnabled;
QPixmap * trackOperationsWidget::s_muteOnDisabled;
QPixmap * trackOperationsWidget::s_muteOnEnabled;
QPixmap * trackOperationsWidget::s_trackOpsDisabled;
QPixmap * trackOperationsWidget::s_trackOpsEnabled;
trackOperationsWidget::trackOperationsWidget( trackWidget * _parent ) :
@@ -942,10 +940,6 @@ trackOperationsWidget::trackOperationsWidget( trackWidget * _parent ) :
"mute_on_disabled" ) );
s_muteOnEnabled = new QPixmap( embed::getIconPixmap(
"mute_on" ) );
s_trackOpsDisabled = new QPixmap( embed::getIconPixmap(
"track_op_menu_disabled" ) );
s_trackOpsEnabled = new QPixmap( embed::getIconPixmap(
"track_op_menu" ) );
}
toolTip::add( this, tr( "Press <Ctrl> while clicking on move-grip "
@@ -956,8 +950,11 @@ trackOperationsWidget::trackOperationsWidget( trackWidget * _parent ) :
connect( to_menu, SIGNAL( aboutToShow() ), this, SLOT( updateMenu() ) );
setObjectName( "automationEnabled" );
m_trackOps = new QPushButton( this );
m_trackOps->setIcon( *s_trackOpsEnabled );
m_trackOps->move( 12, 1 );
m_trackOps->setMenu( to_menu );
toolTip::add( m_trackOps, tr( "Actions for this track" ) );
@@ -1052,8 +1049,8 @@ void trackOperationsWidget::paintEvent( QPaintEvent * _pe )
if( !m_automationDisabled )
{
m_automationDisabled = TRUE;
m_trackOps->setIcon(
*s_trackOpsDisabled );
setObjectName( "automationDisabled" );
setStyle( NULL );
m_muteBtn->setActiveGraphic(
*s_muteOnDisabled );
m_muteBtn->setInactiveGraphic(
@@ -1065,8 +1062,8 @@ void trackOperationsWidget::paintEvent( QPaintEvent * _pe )
if( m_automationDisabled )
{
m_automationDisabled = FALSE;
m_trackOps->setIcon(
*s_trackOpsEnabled );
setObjectName( "automationEnabled" );
setStyle( NULL );
m_muteBtn->setActiveGraphic(
*s_muteOnEnabled );
m_muteBtn->setInactiveGraphic(

8
src/widgets/group_box.cpp
View File

@@ -25,9 +25,12 @@
*/
#include "group_box.h"
#include <QtCore/QTimer>
#include <QtGui/QPainter>
#include <QtGui/QMouseEvent>
#include <QtGui/QPainter>
#ifndef __USE_XOPEN
@@ -37,9 +40,7 @@
#include <math.h>
#include "group_box.h"
#include "embed.h"
#include "spc_bg_hndl_widget.h"
#include "gui_templates.h"
@@ -68,7 +69,6 @@ groupBox::groupBox( const QString & _caption, QWidget * _parent,
m_led->move( 2, 3 );
m_led->setActiveGraphic( embed::getIconPixmap( "led_green" ) );
m_led->setInactiveGraphic( embed::getIconPixmap( "led_off" ) );
m_led->setBgGraphic( specialBgHandlingWidget::getBackground( m_led ) );
connect( m_led, SIGNAL( toggled( bool ) ),
this, SLOT( setState( bool ) ) );
}

3
src/widgets/knob.cpp
View File

@@ -51,7 +51,6 @@
#include "engine.h"
#include "gui_templates.h"
#include "main_window.h"
#include "spc_bg_hndl_widget.h"
#include "string_pair_drag.h"
#include "templates.h"
#include "text_float.h"
@@ -160,8 +159,6 @@ void knob::setTotalAngle( float _angle )
void knob::drawKnob( QPainter * _p )
{
_p->drawPixmap( 0, 0, specialBgHandlingWidget::getBackground( this ) );
const float radius = m_knobPixmap->width() / 2 - 1;
const float xm = m_knobPixmap->width() / 2;//radius + 1;
const float ym = m_knobPixmap->height() / 2;//radius+1;

6
src/widgets/led_checkbox.cpp
View File

@@ -25,15 +25,15 @@
*/
#include "led_checkbox.h"
#include <QtGui/QFontMetrics>
#include <QtGui/QPainter>
#include <QtGui/QPaintEvent>
#include "led_checkbox.h"
#include "automatable_object_templates.h"
#include "embed.h"
#include "gui_templates.h"
#include "spc_bg_hndl_widget.h"
static const QString names[ledCheckBox::TOTAL_COLORS] =
@@ -81,8 +81,6 @@ void ledCheckBox::paintEvent( QPaintEvent * )
{
QPainter p( this );
p.drawPixmap( 0, 0, specialBgHandlingWidget::getBackground( this ) );
if( isChecked() == TRUE )
{
p.drawPixmap( 0, 0, *m_ledOnPixmap );

17
src/widgets/pixmap_button.cpp
View File

@@ -39,13 +39,10 @@ pixmapButton::pixmapButton( QWidget * _parent, const QString & _name,
track * _track ) :
automatableButton( _parent, _name, _track ),
m_activePixmap(),
m_inactivePixmap(),
m_bgPixmap()
m_inactivePixmap()
{
setActiveGraphic( embed::getIconPixmap( "led_yellow" ) );
setInactiveGraphic( embed::getIconPixmap( "led_off" ), FALSE );
//setCheckable( TRUE );
}
@@ -62,11 +59,6 @@ void pixmapButton::paintEvent( QPaintEvent * )
{
QPainter p( this );
if( !m_bgPixmap.isNull() )
{
p.drawPixmap( 0, 0, m_bgPixmap );
}
if( isChecked() )
{
if( !m_activePixmap.isNull() )
@@ -130,13 +122,6 @@ void pixmapButton::setInactiveGraphic( const QPixmap & _pm, bool _update )
void pixmapButton::setBgGraphic( const QPixmap & _pm )
{
m_bgPixmap = _pm;
}
#include "pixmap_button.moc"

6
src/widgets/tab_widget.cpp
View File

@@ -3,7 +3,7 @@
/*
* tab_widget.cpp - tabwidget for LMMS
*
* Copyright (c) 2005-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
* Copyright (c) 2005-2007 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
*
@@ -25,19 +25,19 @@
*/
#include "tab_widget.h"
#include <QtGui/QMouseEvent>
#include <QtGui/QPainter>
#include <QtGui/QPixmap>
#include <QtGui/QWheelEvent>
#include "tab_widget.h"
#include "gui_templates.h"
tabWidget::tabWidget( const QString & _caption, QWidget * _parent ) :
QWidget( _parent ),
specialBgHandlingWidget( QColor( 96, 96, 96 ) ),
m_activeTab( 0 ),
m_caption( _caption )
{