diff --git a/ChangeLog b/ChangeLog index 5054910e2..a9f906fa0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-01-09 Tobias Doerffel + + * include/setup_dialog.h: + * src/core/config_mgr.cpp: + * src/core/setup_dialog.cpp: + made appearence of two dialogs switchable (question whether to re-run + wizard after up-/downgrade and message after accepting setup-dialog) + 2006-01-08 Tobias Doerffel * include/piano_roll.h: @@ -34,7 +42,7 @@ certain arpeggio-times * src/core/lmms_main_win.cpp: - commented out code for creating effect-board-window + commented out code for creating effect-board-window-button * src/core/channel_track.cpp: removed inclusion of paths.h which isn't part of LMMS for quite a long diff --git a/configure.in b/configure.in index 3946b44fa..eb037898f 100644 --- a/configure.in +++ b/configure.in @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.50) -AC_INIT(lmms, 0.1.2-cvs20060108, tobydox/at/users.sourceforge.net) -AM_INIT_AUTOMAKE(lmms, 0.1.2-cvs20060108) +AC_INIT(lmms, 0.1.2-cvs20060109, tobydox/at/users.sourceforge.net) +AM_INIT_AUTOMAKE(lmms, 0.1.2-cvs20060109) AM_CONFIG_HEADER(config.h) diff --git a/include/setup_dialog.h b/include/setup_dialog.h index 4bb554f04..e705199d2 100644 --- a/include/setup_dialog.h +++ b/include/setup_dialog.h @@ -1,7 +1,7 @@ /* * setup_dialog.h - dialog for setting up LMMS * - * Copyright (c) 2005 Tobias Doerffel + * Copyright (c) 2005-2006 Tobias Doerffel * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * @@ -92,6 +92,8 @@ private slots: void toggleToolTips( bool _disabled ); void toggleKnobUsability( bool _classical ); void toggleGIMPLikeWindows( bool _enabled ); + void toggleNoWizard( bool _enabled ); + void toggleNoMsgAfterSetup( bool _enabled ); void openWorkingDir( void ); @@ -108,6 +110,8 @@ private: bool m_disableToolTips; bool m_classicalKnobUsability; bool m_gimpLikeWindows; + bool m_noWizard; + bool m_noMsgAfterSetup; QLineEdit * m_wdLineEdit; diff --git a/resources/setup_audio.png b/resources/setup_audio.png index 705c7fd5f..5b3a7676a 100644 Binary files a/resources/setup_audio.png and b/resources/setup_audio.png differ diff --git a/resources/setup_general.png b/resources/setup_general.png index 270de5614..660f04864 100644 Binary files a/resources/setup_general.png and b/resources/setup_general.png differ diff --git a/resources/setup_midi.png b/resources/setup_midi.png index 307440444..dc5d50ca3 100644 Binary files a/resources/setup_midi.png and b/resources/setup_midi.png differ diff --git a/src/core/config_mgr.cpp b/src/core/config_mgr.cpp index ef1fb8c3c..77f5b9d3b 100644 --- a/src/core/config_mgr.cpp +++ b/src/core/config_mgr.cpp @@ -769,38 +769,6 @@ bool configManager::loadConfigFile( void ) // get the head information from the DOM QDomElement root = dom_tree.documentElement(); - if( root.isElement() ) - { - QString cfg_file_ver = root.toElement().attribute( "version" ); - if( ( cfg_file_ver.length() == 0 || cfg_file_ver != VERSION ) && - QMessageBox:: -#if QT_VERSION >= 0x030200 - question -#else - information -#endif - ( 0, tr( "Version mismatches" ), - tr( "Accordingly to the information in " - "your LMMS-configuration-file " - "you seem\nto have run a " - "different (probably older) " - "version of LMMS before.\n" - "It is recommended to run the " - "setup-wizard again to ensure " - "that\nthe latest samples, " - "presets, demo-projects etc. " - "are installed in your\n" - "LMMS-working-directory. " - "Run the setup-wizard now?" ), - QMessageBox::Yes, QMessageBox::No ) - == QMessageBox::Yes ) - { - if( exec() ) - { - return( loadConfigFile() ); - } - } - } QDomNode node = root.firstChild(); @@ -835,6 +803,40 @@ bool configManager::loadConfigFile( void ) m_vstDir = QDir::home().absolutePath(); } + if( root.isElement() ) + { + QString cfg_file_ver = root.toElement().attribute( "version" ); + if( ( cfg_file_ver.length() == 0 || cfg_file_ver != VERSION ) && + value( "app", "nowizard" ).toInt() == FALSE && + QMessageBox:: +#if QT_VERSION >= 0x030200 + question +#else + information +#endif + ( 0, tr( "Version mismatches" ), + tr( "Accordingly to the information in " + "your LMMS-configuration-file " + "you seem\nto have run a " + "different (probably older) " + "version of LMMS before.\n" + "It is recommended to run the " + "setup-wizard again to ensure " + "that\nthe latest samples, " + "presets, demo-projects etc. " + "are installed in your\n" + "LMMS-working-directory. " + "Run the setup-wizard now?" ), + QMessageBox::Yes, QMessageBox::No ) + == QMessageBox::Yes ) + { + if( exec() ) + { + return( loadConfigFile() ); + } + } + } + return( TRUE ); } diff --git a/src/core/setup_dialog.cpp b/src/core/setup_dialog.cpp index 4dee53cc7..b95ae8afa 100644 --- a/src/core/setup_dialog.cpp +++ b/src/core/setup_dialog.cpp @@ -105,6 +105,9 @@ setupDialog::setupDialog( configTabs _tab_to_open ) : "classicalusability" ).toInt() ), m_gimpLikeWindows( configManager::inst()->value( "app", "gimplikewindows" ).toInt() ), + m_noWizard( configManager::inst()->value( "app", "nowizard" ).toInt() ), + m_noMsgAfterSetup( configManager::inst()->value( "app", + "nomsgaftersetup" ).toInt() ), m_workingDir( configManager::inst()->workingDir() ), m_vstDir( configManager::inst()->vstDir() ) { @@ -125,10 +128,10 @@ setupDialog::setupDialog( configTabs _tab_to_open ) : m_tabBar->setFixedWidth( 72 ); QWidget * ws = new QWidget( settings ); - ws->setFixedSize( 360, 200 ); + ws->setFixedSize( 360, 240 ); QWidget * general = new QWidget( ws ); - general->setFixedSize( 360, 200 ); + general->setFixedSize( 360, 240 ); QVBoxLayout * gen_layout = new QVBoxLayout( general ); gen_layout->setSpacing( 0 ); gen_layout->setMargin( 0 ); @@ -174,7 +177,7 @@ setupDialog::setupDialog( configTabs _tab_to_open ) : tabWidget * misc_tw = new tabWidget( tr( "MISC" ), general ); - misc_tw->setFixedHeight( 76 ); + misc_tw->setFixedHeight( 110 ); ledCheckBox * disable_tooltips = new ledCheckBox( tr( "Disable tooltips (no spurious " @@ -206,6 +209,25 @@ setupDialog::setupDialog( configTabs _tab_to_open ) : this, SLOT( toggleGIMPLikeWindows( bool ) ) ); + ledCheckBox * no_wizard = new ledCheckBox( + tr( "Do not show wizard after " + "up-/downgrade" ), misc_tw ); + no_wizard->move( 10, 72 ); + no_wizard->setChecked( m_noWizard ); + connect( no_wizard, SIGNAL( toggled( bool ) ), + this, SLOT( toggleNoWizard( bool ) ) ); + + + ledCheckBox * no_msg = new ledCheckBox( + tr( "Do not show message after " + "closing this dialog" ), + misc_tw ); + no_msg->move( 10, 90 ); + no_msg->setChecked( m_noMsgAfterSetup ); + connect( no_msg, SIGNAL( toggled( bool ) ), + this, SLOT( toggleNoMsgAfterSetup( bool ) ) ); + + gen_layout->addWidget( bufsize_tw ); gen_layout->addSpacing( 10 ); gen_layout->addWidget( misc_tw ); @@ -515,6 +537,10 @@ void setupDialog::accept( void ) QString::number( m_classicalKnobUsability ) ); configManager::inst()->setValue( "app", "gimplikewindows", QString::number( m_gimpLikeWindows ) ); + configManager::inst()->setValue( "app", "nowizard", + QString::number( m_noWizard ) ); + configManager::inst()->setValue( "app", "nomsgaftersetup", + QString::number( m_noMsgAfterSetup ) ); configManager::inst()->setWorkingDir( m_workingDir ); configManager::inst()->setVSTDir( m_vstDir ); @@ -543,11 +569,14 @@ void setupDialog::accept( void ) configManager::inst()->saveConfigFile(); QDialog::accept(); - QMessageBox::information( NULL, tr( "Restart LMMS" ), + if( m_noMsgAfterSetup == FALSE ) + { + QMessageBox::information( NULL, tr( "Restart LMMS" ), tr( "Please note that most changes " "won't take effect until " "you restart LMMS!" ), QMessageBox::Ok ); + } } @@ -750,10 +779,27 @@ void setupDialog::toggleKnobUsability( bool _classical ) void setupDialog::toggleGIMPLikeWindows( bool _enabled ) { - m_gimpLikeWindows = _enabled; + m_gimpLikeWindows = _enabled; } + +void setupDialog::toggleNoWizard( bool _enabled ) +{ + m_noWizard = _enabled; +} + + + + +void setupDialog::toggleNoMsgAfterSetup( bool _enabled ) +{ + m_noMsgAfterSetup = _enabled; +} + + + + #include "setup_dialog.moc" diff --git a/src/core/track.cpp b/src/core/track.cpp index ef189bc20..c8e7439ed 100644 --- a/src/core/track.cpp +++ b/src/core/track.cpp @@ -737,7 +737,7 @@ trackOperationsWidget::trackOperationsWidget( trackWidget * _parent ) : } toolTip::add( this, tr( "Press while clicking on move-grip " - "to begin a new drag'n'drop-action" ) ); + "to begin a new drag'n'drop-action." ) ); QMenu * to_menu = new QMenu( this ); to_menu->setFont( pointSize<9>( to_menu->font() ) ); @@ -753,7 +753,7 @@ trackOperationsWidget::trackOperationsWidget( trackWidget * _parent ) : "", this ); m_trackOps->setGeometry( 12, 1, 28, 28 ); m_trackOps->setMenu( to_menu ); - toolTip::add( m_trackOps, tr( "Operations for this track" ) ); + toolTip::add( m_trackOps, tr( "Actions for this track" ) ); m_muteBtn = new pixmapButton( this );