Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bad button position in setup dialog, make the SetupDialog fixed size and EffectDialog resizeable #2532

Merged
merged 1 commit into from
Feb 2, 2016
Merged

Fix bad button position in setup dialog, make the SetupDialog fixed size and EffectDialog resizeable #2532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/RenameDialog.h
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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 );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Side note on this... I feel we shouldn't get too comfortable with the resize hacks, but rather use containers which can handle resizing properly. That said, looks *good.

}




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;
}