From 8474590f94b8066acffc7d12f3fa0d929a4b5504 Mon Sep 17 00:00:00 2001 From: Paul Giblock Date: Mon, 30 Jun 2008 04:03:31 +0000 Subject: [PATCH] subWindow resizing, minimum, and intial sizes git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1219 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 13 +++++++++++++ include/automation_editor.h | 2 +- plugins/ladspa_browser/ladspa_browser.cpp | 5 +++++ src/gui/automation_editor.cpp | 8 ++++---- src/gui/fx_mixer_view.cpp | 12 +++++++++--- src/gui/piano_roll.cpp | 4 +++- src/gui/widgets/controller_rack_view.cpp | 11 ++++++++++- src/gui/widgets/controller_view.cpp | 6 ++++++ src/tracks/instrument_track.cpp | 10 +++++++++- 9 files changed, 60 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index e07ff6ea9..366e93d73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2008-06-30 Paul Giblock + + * plugins/ladspa_browser/ladspa_browser.cpp: + * include/automation_editor.h: + * src/gui/piano_roll.cpp: + * src/gui/fx_mixer_view.cpp: + * src/gui/widgets/controller_rack_view.cpp: + * src/gui/widgets/controller_view.cpp: + * src/gui/automation_editor.cpp: + * src/tracks/instrument_track.cpp: + Remove maximize and resize capability from many windows and set proper + minimum and intial sizes + 2008-06-29 Javier Serrano Polo * data/locale/ca.ts: diff --git a/include/automation_editor.h b/include/automation_editor.h index 19d9f48b3..4b06b4a60 100644 --- a/include/automation_editor.h +++ b/include/automation_editor.h @@ -142,7 +142,7 @@ private: } ; // some constants... - static const int INITIAL_WIDTH = 640; + static const int INITIAL_WIDTH = 740; static const int INITIAL_HEIGHT = 480; static const int SCROLLBAR_SIZE = 16; diff --git a/plugins/ladspa_browser/ladspa_browser.cpp b/plugins/ladspa_browser/ladspa_browser.cpp index de5b777d1..4a990339d 100644 --- a/plugins/ladspa_browser/ladspa_browser.cpp +++ b/plugins/ladspa_browser/ladspa_browser.cpp @@ -179,6 +179,11 @@ ladspaBrowserView::ladspaBrowserView( tool * _tool ) : parentWidget()->hide(); parentWidget()->layout()->setSizeConstraint( QLayout::SetFixedSize ); + + Qt::WindowFlags flags = parentWidget()->windowFlags(); + flags |= Qt::MSWindowsFixedSizeDialogHint; + flags &= ~Qt::WindowMaximizeButtonHint; + parentWidget()->setWindowFlags( flags ); } } diff --git a/src/gui/automation_editor.cpp b/src/gui/automation_editor.cpp index 5c373e74a..ee8629d44 100644 --- a/src/gui/automation_editor.cpp +++ b/src/gui/automation_editor.cpp @@ -354,6 +354,8 @@ automationEditor::automationEditor( void ) : setMouseTracking( TRUE ); + setMinimumSize( tb_layout->minimumSize().width(), 128 ); + // add us to workspace if( engine::getMainWindow()->workspace() ) { @@ -677,14 +679,12 @@ void automationEditor::drawLine( int _x0, float _y0, int _x1, float _y1 ) while( i < deltax ) { y = _y0 + ( ystep * yscale * i ); - m_pattern->removeValue( midiTime( x ) ); - m_pattern->putValue( midiTime( x ), y ); x += xstep; i += 1; + m_pattern->removeValue( midiTime( x ) ); + m_pattern->putValue( midiTime( x ), y ); } - m_pattern->removeValue( midiTime( _x1 ) ); - m_pattern->putValue( midiTime( _x1 ), _y1 ); }; diff --git a/src/gui/fx_mixer_view.cpp b/src/gui/fx_mixer_view.cpp index 630398609..0b399a287 100644 --- a/src/gui/fx_mixer_view.cpp +++ b/src/gui/fx_mixer_view.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -45,8 +46,6 @@ #include "tooltip.h" #include "pixmap_button.h" - - class fxLine : public QWidget { public: @@ -229,7 +228,14 @@ fxMixerView::fxMixerView() : // add ourself to workspace - engine::getMainWindow()->workspace()->addSubWindow( this ); + QMdiSubWindow * subWin = + engine::getMainWindow()->workspace()->addSubWindow( this ); + Qt::WindowFlags flags = subWin->windowFlags(); + flags |= Qt::MSWindowsFixedSizeDialogHint; + flags &= ~Qt::WindowMaximizeButtonHint; + subWin->setWindowFlags( flags ); + subWin->layout()->setSizeConstraint(QLayout::SetFixedSize); + parentWidget()->setAttribute( Qt::WA_DeleteOnClose, FALSE ); parentWidget()->move( 10, 200 ); diff --git a/src/gui/piano_roll.cpp b/src/gui/piano_roll.cpp index 7d31a0e2e..5ff644b90 100644 --- a/src/gui/piano_roll.cpp +++ b/src/gui/piano_roll.cpp @@ -77,7 +77,7 @@ extern Keys whiteKeys[]; // defined in piano_widget.cpp // some constants... -const int INITIAL_PIANOROLL_WIDTH = 640; +const int INITIAL_PIANOROLL_WIDTH = 840; const int INITIAL_PIANOROLL_HEIGHT = 480; const int SCROLLBAR_SIZE = 16; @@ -442,6 +442,8 @@ pianoRoll::pianoRoll( void ) : setMouseTracking( TRUE ); + setMinimumSize( tb_layout->minimumSize().width(), 160 ); + // add us to workspace if( engine::getMainWindow()->workspace() ) { diff --git a/src/gui/widgets/controller_rack_view.cpp b/src/gui/widgets/controller_rack_view.cpp index 582587b73..35bd9f539 100644 --- a/src/gui/widgets/controller_rack_view.cpp +++ b/src/gui/widgets/controller_rack_view.cpp @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -71,7 +72,15 @@ controllerRackView::controllerRackView( ) : setModel( engine::getSong() ); - engine::getMainWindow()->workspace()->addSubWindow( this ); + QMdiSubWindow * subWin = + engine::getMainWindow()->workspace()->addSubWindow( this ); + Qt::WindowFlags flags = subWin->windowFlags(); + flags |= Qt::MSWindowsFixedSizeDialogHint; + flags &= ~Qt::WindowMaximizeButtonHint; + subWin->setWindowFlags( flags ); + setWindowFlags( flags ); + subWin->layout()->setSizeConstraint(QLayout::SetFixedSize); + parentWidget()->setAttribute( Qt::WA_DeleteOnClose, FALSE ); } diff --git a/src/gui/widgets/controller_view.cpp b/src/gui/widgets/controller_view.cpp index 90f2d28fd..9c73ab6cc 100644 --- a/src/gui/widgets/controller_view.cpp +++ b/src/gui/widgets/controller_view.cpp @@ -75,6 +75,12 @@ controllerView::controllerView( controller * _model, QWidget * _parent ) : m_subWindow = engine::getMainWindow()->workspace()->addSubWindow( m_controllerDlg ); + + Qt::WindowFlags flags = m_subWindow->windowFlags(); + flags |= Qt::MSWindowsFixedSizeDialogHint; + flags &= ~Qt::WindowMaximizeButtonHint; + m_subWindow->setWindowFlags( flags ); + m_subWindow->setFixedSize( m_subWindow->size() ); m_subWindow->setWindowIcon( m_controllerDlg->windowIcon() ); diff --git a/src/tracks/instrument_track.cpp b/src/tracks/instrument_track.cpp index 5cafc452e..024ed2981 100644 --- a/src/tracks/instrument_track.cpp +++ b/src/tracks/instrument_track.cpp @@ -41,6 +41,7 @@ #include #include #include +#include #include @@ -1204,7 +1205,14 @@ instrumentTrackWindow::instrumentTrackWindow( instrumentTrackView * _itv ) : if( engine::getMainWindow()->workspace() ) { - engine::getMainWindow()->workspace()->addSubWindow( this ); + QMdiSubWindow * subWin = + engine::getMainWindow()->workspace()->addSubWindow( this ); + Qt::WindowFlags flags = subWin->windowFlags(); + flags |= Qt::MSWindowsFixedSizeDialogHint; + flags &= ~Qt::WindowMaximizeButtonHint; + subWin->setWindowFlags( flags ); + subWin->setFixedSize( subWin->size() ); + parentWidget()->hide(); } else