Skip to content

Commit

Permalink
Fix bad button position in setup dialog, make the SetupDialog fixed s…
Browse files Browse the repository at this point in the history
…ize and EffectDialog resizeable
  • Loading branch information
Umcaruje committed Feb 1, 2016
1 parent f528e3d commit 216143a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion include/RenameDialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ class RenameDialog : public QDialog

protected:
void keyPressEvent( QKeyEvent * _ke );
virtual void resizeEvent(QResizeEvent * event);


protected slots:
Expand All @@ -58,4 +59,3 @@ protected slots:


#endif

9 changes: 3 additions & 6 deletions src/gui/SetupDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
setWindowIcon( embed::getIconPixmap( "setup_general" ) );
setWindowTitle( tr( "Setup LMMS" ) );
setModal( true );
setFixedSize( 452, 520 );

Engine::projectJournal()->setJournalling( false );

Expand Down Expand Up @@ -411,8 +412,8 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
pathScroll->move( 0, 30 );
pathSelectors->resize( 360, pathsHeight - 50 );

const int txtLength = 285;
const int btnStart = 305;
const int txtLength = 284;
const int btnStart = 297;


// working-dir
Expand Down Expand Up @@ -1526,7 +1527,3 @@ void SetupDialog::displayMIDIHelp()
"controls to setup the selected "
"MIDI-interface." ) );
}




14 changes: 8 additions & 6 deletions src/gui/widgets/RenameDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ RenameDialog::RenameDialog( QString & _string ) :
m_originalString( _string )
{
setWindowTitle( tr("Rename...") );
setFixedHeight( 30 );
m_stringLE = new QLineEdit( this );
m_stringLE->setText( _string );
m_stringLE->setGeometry ( 10, 5, 220, 20 );
Expand All @@ -56,6 +57,13 @@ RenameDialog::~RenameDialog()



void RenameDialog::resizeEvent (QResizeEvent * event) {
m_stringLE->setGeometry ( 10, 5, width() - 20, 20 );
}




void RenameDialog::keyPressEvent( QKeyEvent * _ke )
{
if( _ke->key() == Qt::Key_Escape )
Expand All @@ -72,9 +80,3 @@ void RenameDialog::textChanged( const QString & _new_string )
{
m_stringToEdit = _new_string;
}






0 comments on commit 216143a

Please sign in to comment.