From fe521d0cb7fc2a8f699b3a727a32febd2a07b43b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= Date: Sun, 9 Feb 2014 20:28:20 +0200 Subject: [PATCH] Use vlmc/ instead of general/ as a settings category --- src/Gui/MainWindow.cpp | 26 +++++++++++++------------- src/Gui/export/RendererSettings.cpp | 4 ++-- src/Gui/export/ShareOnInternet.cpp | 2 +- src/Gui/import/ImportController.cpp | 1 - src/Gui/project/GuiProjectManager.cpp | 24 ++++++++++++------------ src/Gui/timeline/TracksScene.cpp | 4 ++-- src/Gui/wizard/GeneralPage.cpp | 2 +- src/Gui/wizard/ProjectWizard.cpp | 4 ++-- src/Gui/wizard/WelcomePage.cpp | 2 +- src/Library/Library.cpp | 2 +- src/Library/MediaContainer.cpp | 2 +- src/Main/guimain.cpp | 2 +- src/Media/Transcoder.cpp | 2 +- src/Project/ProjectManager.cpp | 6 +++--- src/Project/Workspace.cpp | 8 ++++---- 15 files changed, 45 insertions(+), 46 deletions(-) diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index a98b1d16f..c0f712966 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -263,25 +263,25 @@ MainWindow::initVlmcPreferences() QT_TRANSLATE_NOOP( "PreferenceWidget", "Select the cut/razor tool in the timeline" ), actionCut_mode ); //Setup VLMC Lang. Preferences... - VLMC_CREATE_PREFERENCE_LANGUAGE( "general/VLMCLang", "default", + VLMC_CREATE_PREFERENCE_LANGUAGE( "vlmc/VLMCLang", "default", QT_TRANSLATE_NOOP( "PreferenceWidget", "Language" ), QT_TRANSLATE_NOOP( "PreferenceWidget", "The VLMC's UI language" ) ); - SettingsManager::getInstance()->watchValue( "general/VLMCLang", + SettingsManager::getInstance()->watchValue( "vlmc/VLMCLang", LanguageHelper::getInstance(), SLOT( languageChanged( const QVariant& ) ), SettingsManager::Vlmc ); //Setup VLMC General Preferences... - VLMC_CREATE_PREFERENCE_BOOL( "general/ConfirmDeletion", true, + VLMC_CREATE_PREFERENCE_BOOL( "vlmc/ConfirmDeletion", true, QT_TRANSLATE_NOOP( "PreferenceWidget", "Confirm clip deletion"), QT_TRANSLATE_NOOP( "PreferenceWidget", "Ask for confirmation before deleting a clip from the timeline" ) ); - VLMC_CREATE_PREFERENCE_PATH( "general/DefaultProjectLocation", QDir::homePath(), + VLMC_CREATE_PREFERENCE_PATH( "vlmc/DefaultProjectLocation", QDir::homePath(), QT_TRANSLATE_NOOP( "PreferenceWidget", "Project default location" ), QT_TRANSLATE_NOOP( "PreferenceWidget", "The default location where to store projects folders" ) ); - VLMC_CREATE_PREFERENCE_PATH( "general/TempFolderLocation", QDir::tempPath() + "/VLMC/", + VLMC_CREATE_PREFERENCE_PATH( "vlmc/TempFolderLocation", QDir::tempPath() + "/VLMC/", QT_TRANSLATE_NOOP( "PreferenceWidget", "Temporary folder" ), QT_TRANSLATE_NOOP( "PreferenceWidget", "The temporary folder used by VLMC to process videos." ) ); @@ -519,7 +519,7 @@ void MainWindow::createGlobalPreferences() { m_globalPreferences = new Settings( SettingsManager::Vlmc, this ); - m_globalPreferences->addCategory( "general", QT_TRANSLATE_NOOP( "Settings", "General" ), SettingsManager::Vlmc, + m_globalPreferences->addCategory( "vlmc", QT_TRANSLATE_NOOP( "Settings", "General" ), SettingsManager::Vlmc, QIcon( ":/images/vlmc" ) ); m_globalPreferences->addCategory( "keyboard", QT_TRANSLATE_NOOP( "Settings", "Keyboard" ), SettingsManager::Vlmc, QIcon( ":/images/keyboard" ) ); @@ -564,18 +564,18 @@ void MainWindow::checkFolders() { QDir dirUtil; - if ( !dirUtil.exists( VLMC_GET_STRING( "general/DefaultProjectLocation" ) ) ) - dirUtil.mkdir( VLMC_GET_STRING( "general/DefaultProjectLocation" ) ); + if ( !dirUtil.exists( VLMC_GET_STRING( "vlmc/DefaultProjectLocation" ) ) ) + dirUtil.mkdir( VLMC_GET_STRING( "vlmc/DefaultProjectLocation" ) ); - if ( !dirUtil.exists( VLMC_GET_STRING( "general/TempFolderLocation" ) ) ) - dirUtil.mkdir( VLMC_GET_STRING( "general/TempFolderLocation" ) ); + if ( !dirUtil.exists( VLMC_GET_STRING( "vlmc/TempFolderLocation" ) ) ) + dirUtil.mkdir( VLMC_GET_STRING( "vlmc/TempFolderLocation" ) ); } void MainWindow::clearTemporaryFiles() { QDir dirUtil; - if( dirUtil.cd( VLMC_GET_STRING( "general/TempFolderLocation" ) ) ) + if( dirUtil.cd( VLMC_GET_STRING( "vlmc/TempFolderLocation" ) ) ) foreach ( const QString &file, dirUtil.entryList( QDir::Files ) ) dirUtil.remove( file ); } @@ -681,8 +681,8 @@ MainWindow::on_actionShare_On_Internet_triggered() return; checkFolders(); - QString fileName = VLMC_GET_STRING( "general/TempFolderLocation" ) + "/" + - VLMC_PROJECT_GET_STRING( "general/ProjectName" ) + + QString fileName = VLMC_GET_STRING( "vlmc/TempFolderLocation" ) + "/" + + VLMC_PROJECT_GET_STRING( "vlmc/ProjectName" ) + "-vlmc.mp4"; loadGlobalProxySettings(); diff --git a/src/Gui/export/RendererSettings.cpp b/src/Gui/export/RendererSettings.cpp index 0534acf6e..e66a0f22d 100644 --- a/src/Gui/export/RendererSettings.cpp +++ b/src/Gui/export/RendererSettings.cpp @@ -42,8 +42,8 @@ RendererSettings::RendererSettings( bool shareOnInternet ) m_ui.outputFileName->setVisible( false ); m_ui.outputFileNameButton->setVisible( false ); m_ui.outputFileName->setText( - VLMC_GET_STRING( "general/TempFolderLocation" ) + "/" + - VLMC_PROJECT_GET_STRING( "general/ProjectName" ) + "-vlmc.mp4" ); + VLMC_GET_STRING( "vlmc/TempFolderLocation" ) + "/" + + VLMC_PROJECT_GET_STRING( "vlmc/ProjectName" ) + "-vlmc.mp4" ); setWindowTitle( tr("Export Settings: Publish on Internet") ); } diff --git a/src/Gui/export/ShareOnInternet.cpp b/src/Gui/export/ShareOnInternet.cpp index 5d03d066a..f820b2ba8 100644 --- a/src/Gui/export/ShareOnInternet.cpp +++ b/src/Gui/export/ShareOnInternet.cpp @@ -46,7 +46,7 @@ ShareOnInternet::ShareOnInternet( QWidget* parent ) case YOUTUBE: m_ui.username->setText( VLMC_GET_STRING( "youtube/Username" ) ); m_ui.password->setText( VLMC_GET_STRING( "youtube/Password" ) ); - m_ui.title->setText( VLMC_PROJECT_GET_STRING( "general/ProjectName" ) ); + m_ui.title->setText( VLMC_PROJECT_GET_STRING( "vlmc/ProjectName" ) ); break; } } diff --git a/src/Gui/import/ImportController.cpp b/src/Gui/import/ImportController.cpp index cb1636e7a..117d420f1 100644 --- a/src/Gui/import/ImportController.cpp +++ b/src/Gui/import/ImportController.cpp @@ -43,7 +43,6 @@ #include #include #include -#include #include #include diff --git a/src/Gui/project/GuiProjectManager.cpp b/src/Gui/project/GuiProjectManager.cpp index 1b0ec74f9..a63f61b96 100644 --- a/src/Gui/project/GuiProjectManager.cpp +++ b/src/Gui/project/GuiProjectManager.cpp @@ -43,25 +43,25 @@ GUIProjectManager::GUIProjectManager() //Automatic save part : m_timer = new QTimer( this ); connect( m_timer, SIGNAL( timeout() ), this, SLOT( autoSaveRequired() ) ); - VLMC_CREATE_PREFERENCE_BOOL( "general/AutomaticBackup", false, + VLMC_CREATE_PREFERENCE_BOOL( "vlmc/AutomaticBackup", false, QT_TRANSLATE_NOOP( "PreferenceWidget", "Automatic save" ), QT_TRANSLATE_NOOP( "PreferenceWidget", "When this option is activated," "VLMC will automatically save your project " "at a specified interval" ) ); - SettingsManager::getInstance()->watchValue( "general/AutomaticBackup", this, + SettingsManager::getInstance()->watchValue( "vlmc/AutomaticBackup", this, SLOT( automaticSaveEnabledChanged(QVariant) ), SettingsManager::Vlmc, Qt::QueuedConnection ); - VLMC_CREATE_PREFERENCE_INT( "general/AutomaticBackupInterval", 5, + VLMC_CREATE_PREFERENCE_INT( "vlmc/AutomaticBackupInterval", 5, QT_TRANSLATE_NOOP( "PreferenceWidget", "Automatic save interval" ), QT_TRANSLATE_NOOP( "PreferenceWidget", "This is the interval that VLMC will wait " "between two automatic save" ) ); - SettingsManager::getInstance()->watchValue( "general/AutomaticBackupInterval", this, + SettingsManager::getInstance()->watchValue( "vlmc/AutomaticBackupInterval", this, SLOT( automaticSaveIntervalChanged(QVariant) ), SettingsManager::Vlmc, Qt::QueuedConnection ); - automaticSaveEnabledChanged( VLMC_GET_BOOL( "general/AutomaticBackup" ) ); - SettingsManager::getInstance()->watchValue( "general/ProjectName", this, + automaticSaveEnabledChanged( VLMC_GET_BOOL( "vlmc/AutomaticBackup" ) ); + SettingsManager::getInstance()->watchValue( "vlmc/ProjectName", this, SLOT(projectNameChanged(QVariant) ), SettingsManager::Project ); } @@ -121,9 +121,9 @@ GUIProjectManager::createNewProjectFile( bool saveAs ) { bool relocate = false; - QString defaultPath = VLMC_PROJECT_GET_STRING( "general/Workspace" ); + QString defaultPath = VLMC_PROJECT_GET_STRING( "vlmc/Workspace" ); if ( defaultPath.length() == 0 ) - defaultPath = VLMC_GET_STRING( "general/DefaultProjectLocation" ); + defaultPath = VLMC_GET_STRING( "vlmc/DefaultProjectLocation" ); QString outputFileName = QFileDialog::getSaveFileName( NULL, tr( "Enter the output file name" ), defaultPath, tr( "VLMC project file(*.vlmc)" ) ); @@ -141,7 +141,7 @@ GUIProjectManager::createNewProjectFile( bool saveAs ) outputFileName += ".vlmc"; m_projectFile = new QFile( outputFileName ); QFileInfo fInfo( outputFileName ); - SettingsManager::getInstance()->setValue( "general/Workspace", + SettingsManager::getInstance()->setValue( "vlmc/Workspace", fInfo.absolutePath(), SettingsManager::Project); appendToRecentProject( projectName() ); @@ -201,7 +201,7 @@ GUIProjectManager::automaticSaveEnabledChanged( const QVariant& val ) if ( enabled == true ) { - int interval = VLMC_GET_INT( "general/AutomaticBackupInterval" ); + int interval = VLMC_GET_INT( "vlmc/AutomaticBackupInterval" ); m_timer->start( interval * 1000 * 60 ); } else @@ -211,7 +211,7 @@ GUIProjectManager::automaticSaveEnabledChanged( const QVariant& val ) void GUIProjectManager::automaticSaveIntervalChanged( const QVariant& val ) { - bool enabled = VLMC_GET_BOOL( "general/AutomaticBackup" ); + bool enabled = VLMC_GET_BOOL( "vlmc/AutomaticBackup" ); if ( enabled == false ) return ; @@ -302,7 +302,7 @@ GUIProjectManager::loadProject() { QString fileName = QFileDialog::getOpenFileName( NULL, tr( "Please choose a project file" ), - VLMC_GET_STRING( "general/DefaultProjectLocation" ), + VLMC_GET_STRING( "vlmc/DefaultProjectLocation" ), tr( "VLMC project file(*.vlmc)" ) ); if ( fileName.length() <= 0 ) //If the user canceled. return ; diff --git a/src/Gui/timeline/TracksScene.cpp b/src/Gui/timeline/TracksScene.cpp index 306ab7f01..926eb545d 100644 --- a/src/Gui/timeline/TracksScene.cpp +++ b/src/Gui/timeline/TracksScene.cpp @@ -80,7 +80,7 @@ TracksScene::askRemoveSelectedItems() if ( tv->currentAction() != TracksView::None ) return ; - if ( VLMC_GET_BOOL( "general/ConfirmDeletion" ) == true ) + if ( VLMC_GET_BOOL( "vlmc/ConfirmDeletion" ) == true ) { QString message; if ( selectedItems().size() == 1 ) @@ -101,7 +101,7 @@ TracksScene::askRemoveSelectedItems() return ; if ( clicked == always ) { - SettingsManager::getInstance()->setValue( "general/ConfirmDeletion", + SettingsManager::getInstance()->setValue( "vlmc/ConfirmDeletion", false, SettingsManager::Vlmc ); } } diff --git a/src/Gui/wizard/GeneralPage.cpp b/src/Gui/wizard/GeneralPage.cpp index d1587d822..60292940a 100644 --- a/src/Gui/wizard/GeneralPage.cpp +++ b/src/Gui/wizard/GeneralPage.cpp @@ -81,7 +81,7 @@ GeneralPage::initializePage() ui.lineEditName->setText( projectName ); //fetching the global workspace path - QString workspacePath = VLMC_GET_STRING( "general/DefaultProjectLocation" ); + QString workspacePath = VLMC_GET_STRING( "vlmc/DefaultProjectLocation" ); ui.lineEditWorkspace->setText( workspacePath ); //Reinit description field diff --git a/src/Gui/wizard/ProjectWizard.cpp b/src/Gui/wizard/ProjectWizard.cpp index 2cd3bd2ef..e53ab6c06 100644 --- a/src/Gui/wizard/ProjectWizard.cpp +++ b/src/Gui/wizard/ProjectWizard.cpp @@ -100,9 +100,9 @@ ProjectWizard::accept() SettingsManager *sManager = SettingsManager::getInstance(); GUIProjectManager::getInstance()->newProject( field( "projectName" ).toString(), field( "projectPath" ).toString() ); //Save the project workspace - sManager->setValue( "general/Workspace", field( "projectPath" ), SettingsManager::Project ); + sManager->setValue( "vlmc/Workspace", field( "projectPath" ), SettingsManager::Project ); //And the default vlmc workspace - sManager->setValue( "general/DefaultProjectLocation", field( "workspace" ), SettingsManager::Vlmc ); + sManager->setValue( "vlmc/DefaultProjectLocation", field( "workspace" ), SettingsManager::Vlmc ); sManager->setValue( "video/VLMCOutputFPS", field( "fps" ), SettingsManager::Project ); sManager->setValue( "video/VideoProjectHeight", field( "height" ), SettingsManager::Project ); diff --git a/src/Gui/wizard/WelcomePage.cpp b/src/Gui/wizard/WelcomePage.cpp index e4c34aa0f..ab896047a 100644 --- a/src/Gui/wizard/WelcomePage.cpp +++ b/src/Gui/wizard/WelcomePage.cpp @@ -142,7 +142,7 @@ WelcomePage::loadProject() { QString projectPath = QFileDialog::getOpenFileName( NULL, tr( "Select a project file" ), - VLMC_GET_STRING( "general/DefaultProjectLocation" ), + VLMC_GET_STRING( "vlmc/DefaultProjectLocation" ), tr( "VLMC project file(*.vlmc)" ) ); if ( projectPath.isEmpty() ) return; diff --git a/src/Library/Library.cpp b/src/Library/Library.cpp index 37dc2631d..7311be1ee 100644 --- a/src/Library/Library.cpp +++ b/src/Library/Library.cpp @@ -65,7 +65,7 @@ Library::loadProject( const QDomElement& doc ) if ( mrl.startsWith( Workspace::workspacePrefix ) == true ) { //Transforming the workspace://[path] into [project-path]/[path] - QString projectPath = VLMC_PROJECT_GET_STRING( "general/Workspace" ); + QString projectPath = VLMC_PROJECT_GET_STRING( "vlmc/Workspace" ); mrl = projectPath + mrl.mid( Workspace::workspacePrefix.length() ); } Media* m = addMedia( mrl ); diff --git a/src/Library/MediaContainer.cpp b/src/Library/MediaContainer.cpp index 44f4a8bc9..a369f10f9 100644 --- a/src/Library/MediaContainer.cpp +++ b/src/Library/MediaContainer.cpp @@ -207,7 +207,7 @@ MediaContainer::load( const QDomElement &clips, MediaContainer *parentMC ) //Handle workspace stuff. if ( media.startsWith( Workspace::workspacePrefix ) == true ) - media = media.replace( Workspace::workspacePrefix, VLMC_PROJECT_GET_STRING( "general/Workspace" ) ); + media = media.replace( Workspace::workspacePrefix, VLMC_PROJECT_GET_STRING( "vlmc/Workspace" ) ); if ( m_medias.contains( media ) == true ) { Media* m = m_medias[media]; diff --git a/src/Main/guimain.cpp b/src/Main/guimain.cpp index 4a1bc9799..1899bb75c 100644 --- a/src/Main/guimain.cpp +++ b/src/Main/guimain.cpp @@ -70,7 +70,7 @@ VLMCmain( int argc, char **argv ) QSettings s; LanguageHelper::getInstance()->languageChanged( - s.value( "general/VLMCLang", "default" ) ); + s.value( "vlmc/VLMCLang", "default" ) ); #if defined( Q_WS_WIN ) diff --git a/src/Media/Transcoder.cpp b/src/Media/Transcoder.cpp index e46de3521..392d8af9d 100644 --- a/src/Media/Transcoder.cpp +++ b/src/Media/Transcoder.cpp @@ -43,7 +43,7 @@ Transcoder::Transcoder( Media* media ) : void Transcoder::transcodeToPs() { - QString outputDir = VLMC_PROJECT_GET_STRING( "general/Workspace" ); + QString outputDir = VLMC_PROJECT_GET_STRING( "vlmc/Workspace" ); LibVLCpp::Media *media = new LibVLCpp::Media( m_media->fileInfo()->absoluteFilePath() ); if ( outputDir.length() == 0 ) diff --git a/src/Project/ProjectManager.cpp b/src/Project/ProjectManager.cpp index 33e1d1084..23bc5d2a1 100644 --- a/src/Project/ProjectManager.cpp +++ b/src/Project/ProjectManager.cpp @@ -77,12 +77,12 @@ ProjectManager::ProjectManager() : m_projectFile( NULL ), m_needSave( false ) QT_TRANSLATE_NOOP("PreferenceWidget", "Number of audio channels" ), SettingValue::Clamped ); audioChannel->setLimits( 2, 2 ); - VLMC_CREATE_PROJECT_VAR( SettingValue::String, "general/ProjectName", unNamedProject, + VLMC_CREATE_PROJECT_VAR( SettingValue::String, "vlmc/ProjectName", unNamedProject, QT_TRANSLATE_NOOP( "PreferenceWidget", "Project name" ), QT_TRANSLATE_NOOP( "PreferenceWidget", "The project name" ), SettingValue::NotEmpty ); - VLMC_CREATE_PRIVATE_PROJECT_STRING( "general/Workspace", "" ); + VLMC_CREATE_PRIVATE_PROJECT_STRING( "vlmc/Workspace", "" ); //We have to wait for the library to be loaded before loading the workflow connect( Library::getInstance(), SIGNAL( projectLoaded() ), this, SLOT( loadWorkflow() ) ); @@ -163,7 +163,7 @@ ProjectManager::loadProject( const QString& fileName ) //Load settings first, as it contains some informations about the workspace. SettingsManager::getInstance()->load( root ); - SettingsManager::getInstance()->setValue( "general/Workspace", fInfo.absolutePath(), SettingsManager::Project ); + SettingsManager::getInstance()->setValue( "vlmc/Workspace", fInfo.absolutePath(), SettingsManager::Project ); Timeline::getInstance()->renderer()->loadProject( root ); Library::getInstance()->loadProject( root ); } diff --git a/src/Project/Workspace.cpp b/src/Project/Workspace.cpp index 4c1a27fd0..0ac07dc2a 100644 --- a/src/Project/Workspace.cpp +++ b/src/Project/Workspace.cpp @@ -53,7 +53,7 @@ Workspace::~Workspace() bool Workspace::copyToWorkspace( Media *media ) { - if ( VLMC_PROJECT_GET_STRING("general/Workspace").length() == 0 ) + if ( VLMC_PROJECT_GET_STRING("vlmc/Workspace").length() == 0 ) { setError( "There is no current workspace. Please create a project first."); return false; @@ -79,7 +79,7 @@ Workspace::copyToWorkspace( Media *media ) void Workspace::startCopyWorker( Media *media ) { - const QString &projectPath = VLMC_PROJECT_GET_STRING( "general/Workspace" ); + const QString &projectPath = VLMC_PROJECT_GET_STRING( "vlmc/Workspace" ); const QString dest = projectPath + '/' + media->fileInfo()->fileName(); if ( QFile::exists( dest ) == true ) @@ -144,7 +144,7 @@ Workspace::copyTerminated( Media *media, QString dest ) bool Workspace::isInProjectDir( const QFileInfo &fInfo ) { - const QString projectDir = VLMC_PROJECT_GET_STRING( "general/Workspace" ); + const QString projectDir = VLMC_PROJECT_GET_STRING( "vlmc/Workspace" ); return ( projectDir.length() > 0 && fInfo.absolutePath().startsWith( projectDir ) ); } @@ -166,7 +166,7 @@ Workspace::isInProjectDir(const Media *media) QString Workspace::pathInProjectDir( const Media *media ) { - const QString projectDir = VLMC_PROJECT_GET_STRING( "general/Workspace" ); + const QString projectDir = VLMC_PROJECT_GET_STRING( "vlmc/Workspace" ); return ( media->fileInfo()->absoluteFilePath().mid( projectDir.length() ) ); } -- GitLab