removed specialBgHandlingWidget, style sheet, some cleaning up

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@579 0778d3d1-df1d-0410-868b-ea421aaaa00d

src/core/envelope_and_lfo_widget.cpp

@@ -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 ),

src/core/main_window.cpp

@@ -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 != "" )

src/core/track.cpp

@@ -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(

src/widgets/group_box.cpp

@@ -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 ) ) );
 }

src/widgets/knob.cpp

@@ -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;

src/widgets/led_checkbox.cpp

@@ -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 );

src/widgets/pixmap_button.cpp

@@ -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"
 
 

src/widgets/tab_widget.cpp

@@ -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 )
 {