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

Inverted master sliders, updated previous commit

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@603 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Paul Giblock
2007-11-20 05:54:30 +00:00
parent 1ca8cf11ee
commit b61a93c5d3
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -3,6 +3,9 @@
* src/core/main_window:
fixed flashing/moving windows on project load
* src/core/song_editor.cpp:
inverted direction of master-volume and master-pitch sliders
2007-11-19 Paul Giblock <drfaygo/at/gmail/dot/com>
* plugins/midi_import/midi_import.cpp:

22
src/core/main_window.cpp
View File

@@ -540,19 +540,18 @@ void mainWindow::clearKeyModifiers( void )
void mainWindow::saveWidgetState( QWidget * _w, QDomElement & _de )
{
if( _w->parentWidget() != NULL )
if( _w->parentWidget() != NULL &&
_w->parentWidget()->inherits("QMdiSubWindow"))
{
_de.setAttribute( "x", _w->parentWidget()->x() );
_de.setAttribute( "y", _w->parentWidget()->y() );
}
else
{
_de.setAttribute( "x", 0 );
_de.setAttribute( "y", 0 );
_w = _w->parentWidget();
}
_de.setAttribute( "x", _w->x() );
_de.setAttribute( "y", _w->y() );
_de.setAttribute( "visible", _w->isVisible() );
_de.setAttribute( "width", _w->width() );
_de.setAttribute( "height", _w->height() );
_de.setAttribute( "visible", _w->isVisible() );
}
@@ -567,17 +566,16 @@ void mainWindow::restoreWidgetState( QWidget * _w, const QDomElement & _de )
if( !r.isNull())
{
_w->show();
if (_w->parentWidget() != NULL &&
_w->parentWidget()->inherits("QMdiSubWindow"))
{
_w = _w->parentWidget();
}
_w->show();
_w->resize( r.size() );
_w->move( r.topLeft() );
_w->setShown( _de.attribute( "visible" ).toInt() );
_w->resize( r.size() );
}
}

2
src/core/song_editor.cpp
View File

@@ -182,6 +182,7 @@ songEditor::songEditor( void ) :
m_masterVolumeSlider->setTickPosition( QSlider::TicksLeft );
m_masterVolumeSlider->setFixedSize( 26, 60 );
m_masterVolumeSlider->setTickInterval( 50 );
m_masterVolumeSlider->setInvertedAppearance( true );
toolTip::add( m_masterVolumeSlider, tr( "master volume" ) );
connect( m_masterVolumeSlider, SIGNAL( logicValueChanged( int ) ), this,
@@ -216,6 +217,7 @@ songEditor::songEditor( void ) :
m_masterPitchSlider->setTickPosition( QSlider::TicksLeft );
m_masterPitchSlider->setFixedSize( 26, 60 );
m_masterPitchSlider->setTickInterval( 12 );
m_masterPitchSlider->setInvertedAppearance( true );
toolTip::add( m_masterPitchSlider, tr( "master pitch" ) );
connect( m_masterPitchSlider, SIGNAL( logicValueChanged( int ) ), this,
SLOT( masterPitchChanged( int ) ) );