Merge pull request #76 from diizy/stable-0.4

Another UI branch merge...?

data/themes/default/style.css

@@ -155,6 +155,58 @@ nameLabel, effectLabel, sf2InstrumentView > QLabel {
 }
 
 
+
+automatableSlider::groove:vertical {
+	background: rgba(0,0,0, 128);
+	border: 1px inset rgba(100,100,100, 64);
+	border-radius: 2px;
+	width: 2px;
+	margin: 2px 2px;
+}
+
+automatableSlider::handle:vertical {
+	background: none;
+	border-image: url(resources:main_slider.png);
+	width: 26px;
+	height: 10px;
+	border-radius: 2px;
+	margin: -4px -12px -2px;
+}
+
+EffectRackView QScrollArea, EffectRackView QVBoxLayout  {
+    border-radius: 2px;
+    border: 1px solid rgba(0,0,0, 64);
+    background: #49515b;
+}
+
+EffectSelectDialog QScrollArea {
+	background: #5b6571;
+}
+
+ControllerRackView QScrollArea, ControllerRackView QVBoxLayout {
+    border-radius: 2px;
+    border: 1px solid rgba(0,0,0, 64);
+    background: #49515b;
+}
+
+EffectControlDialog QGroupBox {
+	background: #49515b;
+	margin-top: 1ex;
+	padding: 10px 2px 1px;
+	border-radius: 4px;
+	border: 1px solid rgba(0,0,0, 64);
+}
+
+EffectControlDialog QGroupBox::title {
+	subcontrol-origin: margin;
+	subcontrol-position: top left;
+	background: #7b838d;
+	color: white;
+	border-radius: 2px;
+	border: 1px solid rgba(0,0,0, 64);
+	padding: 2px 1px;
+}
+
 QWidget#mainToolbar {
 	background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #98a2a7, stop:1 #5b646f);
 }

plugins/peak_controller_effect/peak_controller_effect_control_dialog.cpp

@@ -44,7 +44,7 @@ PeakControllerEffectControlDialog::PeakControllerEffectControlDialog(
 	pal.setBrush( backgroundRole(),
 				PLUGIN_NAME::getIconPixmap( "artwork" ) );
 	setPalette( pal );
-	setFixedSize( 288, 110 );
+	setFixedSize( 170, 150 );
 
 	QVBoxLayout * tl = new QVBoxLayout( this );
 	tl->addSpacing( 25 );
@@ -85,7 +85,7 @@ PeakControllerEffectControlDialog::PeakControllerEffectControlDialog(
 	l->addStretch(); // expand, so other widgets have minimum width
 	tl->addLayout( l );
 
-	l = new QHBoxLayout; // = 2nd hbox
+	QVBoxLayout * l2 = new QVBoxLayout; // = 2nd vbox
 
 	m_muteLed = new ledCheckBox( "Mute Effect", this );
 	m_muteLed->setModel( &_controls->m_muteModel );
@@ -98,11 +98,11 @@ PeakControllerEffectControlDialog::PeakControllerEffectControlDialog(
 
 	tl->addSpacing( 5 );
 
-	l->addWidget( m_muteLed );
-	l->addWidget( m_absLed );
-	l->addWidget( m_muteOutputLed );
-	l->addStretch(); // expand, so other widgets have minimum width
-	tl->addLayout( l );
+	l2->addWidget( m_muteLed );
+	l2->addWidget( m_absLed );
+	l2->addWidget( m_muteOutputLed );
+	l2->addStretch(); // expand, so other widgets have minimum height
+	tl->addLayout( l2 );
 
 	setLayout( tl );
 }

src/gui/song_editor.cpp

@@ -286,13 +286,13 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) :
 						m_toolBar );
 
 	m_addSampleTrackButton = new toolButton( embed::getIconPixmap(
-					"add_sample_track", 24, 24 ),
+					"add_sample_track" ),
 					tr( "Add sample-track" ),
 					m_s, SLOT( addSampleTrack() ),
 					m_toolBar );
 
 	m_addAutomationTrackButton = new toolButton( embed::getIconPixmap(
-					"add_automation", 24, 24 ),
+					"add_automation" ),
 					tr( "Add automation-track" ),
 					m_s, SLOT( addAutomationTrack() ),
 					m_toolBar );

src/gui/widgets/knob.cpp

@@ -328,18 +328,22 @@ void knob::drawKnob( QPainter * _p )
 				width() / 2 - m_knobPixmap->width() / 2 ), 0,
 				*m_knobPixmap );
 
-	p.setPen( QPen( QColor( 200, 0, 0 ), 2 ) );
+//	p.setPen( QPen( QColor( 200, 0, 0 ), 2 ) );
 	p.setRenderHint( QPainter::Antialiasing );
 
 	switch( m_knobNum )
 	{
 		case knobSmall_17:
 		{
-			p.drawLine( calculateLine( mid, radius ) );
+			p.setPen( QPen( QApplication::palette().color( QPalette::Active,
+							QPalette::WindowText ), 2 ) );
+			p.drawLine( calculateLine( mid, radius-2 ) );
 			break;
 		}
 		case knobBright_26:
 		{
+			p.setPen( QPen( QApplication::palette().color( QPalette::Active,
+							QPalette::WindowText ), 2 ) );
 			p.drawLine( calculateLine( mid, radius-5 ) );
 			break;
 		}
@@ -355,7 +359,8 @@ void knob::drawKnob( QPainter * _p )
 		}
 		case knobGreen_17:
 		{
-			p.setPen( QPen( QColor( 0, 200, 0 ), 2 ) );
+			p.setPen( QPen( QApplication::palette().color( QPalette::Active,
+							QPalette::BrightText), 2 ) );
 			p.drawLine( calculateLine( mid, radius ) );
 			break;
 		}