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

Merge pull request #2532 from Umcaruje/settingbutton

Browse Source 
Fix bad button position in setup dialog, make the SetupDialog fixed size and EffectDialog resizeable
This commit is contained in:
Tres Finocchiaro
2016-02-01 22:34:01 -05:00
parent 7c42823d9a 216143a8f5
commit e03eb1ce05
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/RenameDialog.h
View File

@@ -43,6 +43,7 @@ public:
protected:
void keyPressEvent( QKeyEvent * _ke );
virtual void resizeEvent(QResizeEvent * event);
protected slots:
@@ -58,4 +59,3 @@ private:
#endif

9
src/gui/SetupDialog.cpp
View File

@@ -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 );
@@ -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
@@ -1526,7 +1527,3 @@ void SetupDialog::displayMIDIHelp()
"controls to setup the selected "
"MIDI-interface." ) );
}

14
src/gui/widgets/RenameDialog.cpp
View File

@@ -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 );
@@ -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 )
@@ -72,9 +80,3 @@ void RenameDialog::textChanged( const QString & _new_string )
{
m_stringToEdit = _new_string;
}