diff --git a/ChangeLog b/ChangeLog index ace602b94..9d9943a51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2008-09-08 Tobias Doerffel + * include/gui_templates.h: + * src/core/instrument_sound_shaping.cpp: + * src/gui/widgets/instrument_sound_shaping_view.cpp: + * src/gui/widgets/lcd_spinbox.cpp: + * data/locale/de.qm: + * data/locale/de.ts: + further UI finetuning + * include/midi_winmm.h: * src/core/midi/midi_winmm.cpp: finally made WinMM MIDI driver work properly by fixing internal data diff --git a/data/locale/de.qm b/data/locale/de.qm index cf37c821a..6366df887 100644 Binary files a/data/locale/de.qm and b/data/locale/de.qm differ diff --git a/data/locale/de.ts b/data/locale/de.ts index 2f8955e01..235429144 100644 --- a/data/locale/de.ts +++ b/data/locale/de.ts @@ -2143,7 +2143,7 @@ Bitte stellen Sie sicher, dass Sie Schreibrechte auf diese Datei und das Verzeic PITCH - TONHÖHE + PITCH diff --git a/include/gui_templates.h b/include/gui_templates.h index a831e5422..8045e26c9 100644 --- a/include/gui_templates.h +++ b/include/gui_templates.h @@ -40,8 +40,13 @@ template inline QFont pointSize( QFont _f ) { static const float DPI = 96; +#ifdef LMMS_BUILD_WIN32 + _f.setPointSizeF( ((float) SIZE+0.5f) * DPI / + QApplication::desktop()->logicalDpiY() ); +#else _f.setPointSizeF( (float) SIZE * DPI / QApplication::desktop()->logicalDpiY() ); +#endif return( _f ); } diff --git a/src/core/instrument_sound_shaping.cpp b/src/core/instrument_sound_shaping.cpp index 0c3989223..420a39872 100644 --- a/src/core/instrument_sound_shaping.cpp +++ b/src/core/instrument_sound_shaping.cpp @@ -53,8 +53,8 @@ const QString __targetNames[instrumentSoundShaping::NumTargets][3] = instrumentSoundShaping::tr( "Pitch" ),*/ { instrumentSoundShaping::tr( "CUTOFF" ), "cut", instrumentSoundShaping::tr( "Cutoff frequency" ) }, - { instrumentSoundShaping::tr( "Q/RESO" ), "res", - instrumentSoundShaping::tr( "Q/Resonance" ) } + { instrumentSoundShaping::tr( "RESO" ), "res", + instrumentSoundShaping::tr( "Resonance" ) } } ; diff --git a/src/gui/widgets/instrument_sound_shaping_view.cpp b/src/gui/widgets/instrument_sound_shaping_view.cpp index f4acae5f9..357b3e8a1 100644 --- a/src/gui/widgets/instrument_sound_shaping_view.cpp +++ b/src/gui/widgets/instrument_sound_shaping_view.cpp @@ -111,9 +111,9 @@ instrumentSoundShapingView::instrumentSoundShapingView( QWidget * _parent ) : m_filterResKnob = new knob( knobBright_26, m_filterGroupBox ); - m_filterResKnob->setLabel( tr( "Q/RESO" ) ); - m_filterResKnob->move( 190, 18 ); - m_filterResKnob->setHintText( tr( "Q/Resonance:" ) + " ", "" ); + m_filterResKnob->setLabel( tr( "RESO" ) ); + m_filterResKnob->move( 196, 18 ); + m_filterResKnob->setHintText( tr( "Resonance:" ) + " ", "" ); m_filterResKnob->setWhatsThis( tr( "Use this knob for setting Q/Resonance for the selected " "filter. Q/Resonance tells the filter how much it " diff --git a/src/gui/widgets/lcd_spinbox.cpp b/src/gui/widgets/lcd_spinbox.cpp index 1f5e79ffd..dd046618b 100644 --- a/src/gui/widgets/lcd_spinbox.cpp +++ b/src/gui/widgets/lcd_spinbox.cpp @@ -116,7 +116,7 @@ void lcdSpinBox::paintEvent( QPaintEvent * _me ) int margin = 1; // QStyle::PM_DefaultFrameWidth; int lcdWidth = m_cellWidth * m_numDigits + (margin*m_marginWidth)*2; - p.translate( width() / 2 - lcdWidth / 2, 0 ); +// p.translate( width() / 2 - lcdWidth / 2, 0 ); p.save(); p.translate( margin, margin ); @@ -180,12 +180,12 @@ void lcdSpinBox::paintEvent( QPaintEvent * _me ) p.setFont( pointSize<6>( p.font() ) ); p.setPen( QColor( 64, 64, 64 ) ); p.drawText( width() / 2 - - p.fontMetrics().width( m_label ) / 2 + 1, - height() - 1, m_label ); + p.fontMetrics().width( m_label ) / 2 + 1, + height(), m_label ); p.setPen( QColor( 255, 255, 255 ) ); p.drawText( width() / 2 - p.fontMetrics().width( m_label ) / 2, - height() - 2, m_label ); + height() - 1, m_label ); } }