Allow WidgetTab to use artwork tabs

data/locale/fr.ts

@@ -3261,13 +3261,11 @@ Vous pouvez supprimer et déplacer les canaux d'effet avec le menu contextu
     </message>
     <message>
         <source>FUNC</source>
-        <translatorcomment>&quot;FONCTIONS&quot; (previous translation) is too long for the limited available width. </translatorcomment>
-        <translation>FONCT</translation>
+        <translation>FONCTIONS</translation>
     </message>
     <message>
         <source>FX</source>
-        <translatorcomment>&quot;EFFETS&quot; (previous translation) is too long for the limited available width. &quot;FX&quot; should be understable by all</translatorcomment>
-        <translation>FX</translation>
+        <translation>EFFETS</translation>
     </message>
     <message>
         <source>MIDI</source>

data/themes/default/style.css

@@ -126,6 +126,19 @@ PianoRoll {
 	qproperty-textShadow: rgb( 240, 240, 240 );
 }
 
+TabWidget {
+	background-color: #5b6571; 
+	qproperty-tabText: rgb(32, 48, 64);
+	qproperty-tabTitleText: rgb(255, 255, 255);
+	qproperty-tabSelected: rgb(160, 160, 160);
+	qproperty-tabBackground: rgb(60, 67, 75);
+	qproperty-tabBorder: rgb(60, 67, 75);
+}
+
+GroupBox {
+	background-color: #5b6571; 
+}
+
 /* main toolbar oscilloscope - can have transparent bg now */
 
 VisualizationWidget  {

include/GroupBox.h

@@ -57,7 +57,7 @@ class GroupBox : public QWidget, public BoolModelView
 
 protected:
 	virtual void mousePressEvent( QMouseEvent * _me );
-	virtual void resizeEvent( QResizeEvent * _re );
+        virtual void paintEvent( QPaintEvent * _pe );
 
 
 private:

include/TabWidget.h

@@ -29,25 +29,47 @@
 #include <QWidget>
 #include <QtCore/QMap>
 
+const int TEXT_TAB_HEIGHT = 14;
+const int GRAPHIC_TAB_HEIGHT = 17;
 
 class TabWidget : public QWidget
 {
 	Q_OBJECT
 public:
-	TabWidget( const QString & _caption, QWidget * _parent );
+	TabWidget( const QString & _caption, QWidget * _parent, bool usePixmap = false );
 	virtual ~TabWidget();
 
-	void addTab( QWidget * _w, const QString & _name, int _idx = -1 );
+	void addTab( QWidget *_w, const QString &_name, const QString &_tooltip = NULL, const char *activePixmap = NULL, const char *inactivePixmap = NULL, int _idx = -1 );
 
 	void setActiveTab( int _idx );
 
+	int findTabAtPos( const QPoint *pos );
+
 	inline int activeTab() const
 	{
 		return( m_activeTab );
 	}
 
+	// Themeability
+	Q_PROPERTY( QColor tabText READ tabText WRITE setTabText)
+	Q_PROPERTY( QColor tabTitleText READ tabTitleText WRITE setTabTitleText)
+	Q_PROPERTY( QColor tabSelected READ tabSelected WRITE setTabSelected)
+	Q_PROPERTY( QColor tabBackground READ tabBackground WRITE setTabBackground)
+	Q_PROPERTY( QColor tabBorder READ tabBorder WRITE setTabBorder)
+
+	QColor tabText() const;
+	void setTabText( const QColor & c );
+	QColor tabTitleText() const;
+	void setTabTitleText( const QColor & c );
+	QColor tabSelected() const;
+	void setTabSelected( const QColor & c );
+	QColor tabBackground() const;
+	void setTabBackground( const QColor & c );
+	QColor tabBorder() const;
+	void setTabBorder( const QColor & c );
 
 protected:
+	virtual bool event( QEvent * event );
 	virtual void mousePressEvent( QMouseEvent * _me );
 	virtual void paintEvent( QPaintEvent * _pe );
 	virtual void resizeEvent( QResizeEvent * _re );
@@ -57,16 +79,28 @@ class TabWidget : public QWidget
 private:
 	struct widgetDesc
 	{
-		QWidget * w;	// ptr to widget
-		QString name;	// name for widget
-		int nwidth;	// width of name when painting
+		QWidget       * w;	   	// ptr to widget
+		const char    *activePixmap; 	// artwork for the widget 
+		const char    *inactivePixmap; 	// artwork for the widget 
+		QString       name;	   	// name for widget
+		QString       tooltip;	   	// name for widget
+		int           nwidth;	   	// width of name when painting (only valid for text tab)
 	} ;
 	typedef QMap<int, widgetDesc> widgetStack;
 
 	widgetStack m_widgets;
-	int m_activeTab;
+
+	int 	m_activeTab;
 	QString m_caption;
-	quint8 m_tabheight;
+	quint8 	m_tabbarHeight;	// The height of the tab bar
+	quint8 	m_tabheight;	// The height of the tabs
+	bool	m_usePixmap;	// true if the tabs are to be displayed with icons. False for text tabs.
+
+	QColor m_tabText;	// The color of the tabs' text.
+	QColor m_tabTitleText;	// The color of the TabWidget's title text.
+	QColor m_tabSelected;	// The highlighting color for the selected tab.
+	QColor m_tabBackground;	// The TabWidget's background color.
+	QColor m_tabBorder;	// The TabWidget's borders color.
 } ;
 
 #endif

src/gui/widgets/EffectRackView.cpp

@@ -40,7 +40,7 @@ EffectRackView::EffectRackView( EffectChain* model, QWidget* parent ) :
 	ModelView( NULL, this )
 {
 	QVBoxLayout* mainLayout = new QVBoxLayout( this );
-	mainLayout->setMargin( 0 );
+	mainLayout->setMargin( 5 );
 
 	m_effectsGroupBox = new GroupBox( tr( "EFFECTS CHAIN" ) );
 	mainLayout->addWidget( m_effectsGroupBox );

src/gui/widgets/GroupBox.cpp

@@ -43,7 +43,7 @@ GroupBox::GroupBox( const QString & _caption, QWidget * _parent ) :
 	m_caption( _caption ),
 	m_titleBarHeight( 11 )
 {
-	updatePixmap();
+	update();
 
 	m_led = new PixmapButton( this, _caption );
 	m_led->setCheckable( true );
@@ -86,60 +86,22 @@ void GroupBox::mousePressEvent( QMouseEvent * _me )
 
 
 
-void GroupBox::resizeEvent( QResizeEvent * _ev )
+void GroupBox::paintEvent( QPaintEvent * pe )
 {
-	updatePixmap();
-	QWidget::resizeEvent( _ev );
-}
-
-
-
-void GroupBox::updatePixmap()
-{
-	QColor bg_color = QApplication::palette().color( QPalette::Active,
-							QPalette::Background );
-	QPixmap pm( size() );
-	pm.fill( bg_color/*.dark( 132 )*/ );
-
-	QPainter p( &pm );
+	QPainter p( this );
 
+        // Draw background
+        p.fillRect( 0, 0, width() - 1, height() - 1, p.background() );
+
 	// outer rect
-	p.setPen( bg_color.dark( 150 ) );
+	p.setPen( p.background().color().dark( 150 ) );
 	p.drawRect( 0, 0, width() - 1, height() - 1 );
 
-	// brighter line at bottom/right
-	p.setPen( bg_color.light( 150 ) );
-	p.drawLine( width() - 1, 0, width() - 1, height() - 1 );
-	p.drawLine( 0, height() - 1, width() - 1, height() - 1 );
-
-	// draw groupbox-titlebar
-	QLinearGradient g( 0, 0, 0, m_titleBarHeight );
-	g.setColorAt( 0, bg_color.darker( 250 ) );
-	g.setColorAt( 0.1, bg_color.lighter( 120 ) );
-	g.setColorAt( 1, bg_color.darker( 250 ) );
-	p.fillRect( 2, 2, width() - 4, m_titleBarHeight, g );
-
 	// draw line below titlebar
-	p.setPen( bg_color.dark( 400 ) );
-	p.drawLine( 1, m_titleBarHeight + 1, width() - 3, m_titleBarHeight + 1 );
-
-	// black inner rect
-	p.drawRect( 1, 1, width() - 3, height() - 3 );
+	p.fillRect( 1, 1, width() - 2, m_titleBarHeight + 1, p.background().color().darker( 150 ) );
 
-
-	//p.setPen( QColor( 255, 255, 255 ) );
+	// draw text
 	p.setPen( palette().color( QPalette::Active, QPalette::Text ) );
 	p.setFont( pointSize<8>( font() ) );
 	p.drawText( 22, m_titleBarHeight, m_caption );
-
-	QPalette pal = palette();
-	pal.setBrush( backgroundRole(), QBrush( pm ) );
-	setPalette( pal );
 }
-
-
-
-
-
-
-

src/gui/widgets/InstrumentSoundShapingView.cpp

@@ -76,7 +76,8 @@ InstrumentSoundShapingView::InstrumentSoundShapingView( QWidget * _parent ) :
 	{
 		m_envLfoViews[i] = new EnvelopeAndLfoView( m_targetsTabWidget );
 		m_targetsTabWidget->addTab( m_envLfoViews[i],
-						tr( InstrumentSoundShaping::targetNames[i][0].toUtf8().constData() ) );
+						tr( InstrumentSoundShaping::targetNames[i][0].toUtf8().constData() ), 
+                                                NULL );
 	}