Skip to content

GitLab

Commit 9eefcff5 authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen
Browse files
Options

Removing all preferences widgets

parent 87d38694
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 1223 deletions
src/CMakeLists.txt
View file @ 9eefcff5
......@@ -25,7 +25,6 @@ SET(VLMC_SRCS
Gui/ClipProperty.cpp
Gui/DockWidgetManager.cpp
Gui/FileInfoListModel.cpp
Gui/LanguagePreferences.cpp
Gui/LCDTimecode.cpp
Gui/MainWindow.cpp
Gui/PreviewRuler.cpp
......@@ -44,15 +43,10 @@ SET(VLMC_SRCS
Gui/library/MediaListViewController.cpp
Gui/library/StackViewController.cpp
Gui/library/StackViewNavController.cpp
Gui/settings/AudioProjectPreferences.cpp
Gui/settings/KeyboardShortcut.cpp
Gui/settings/KeyboardShortcutInput.cpp
Gui/settings/Panel.cpp
Gui/settings/PreferenceWidget.cpp
Gui/settings/ProjectPreferences.cpp
Gui/settings/Settings.cpp
Gui/settings/VideoProjectPreferences.cpp
Gui/settings/VLMCPreferences.cpp
Gui/timeline/AbstractGraphicsMediaItem.cpp
Gui/timeline/GraphicsAudioItem.cpp
Gui/timeline/GraphicsCursorItem.cpp
......@@ -118,7 +112,6 @@ SET (VLMC_HDRS
Gui/import/ImportController.h
Gui/import/ImportMediaCellView.h
Gui/import/ImportMediaListController.h
Gui/LanguagePreferences.h
Gui/LCDTimecode.h
Gui/library/ClipListViewController.h
Gui/library/ListViewController.h
......@@ -131,12 +124,10 @@ SET (VLMC_HDRS
Gui/MainWindow.h
Gui/PreviewRuler.h
Gui/PreviewWidget.h
Gui/settings/KeyboardShortcut.h
Gui/settings/KeyboardShortcutInput.h
Gui/settings/Panel.h
Gui/settings/PreferenceWidget.h
Gui/settings/Settings.h
Gui/settings/VLMCPreferences.h
Gui/TagWidget.h
Gui/timeline/AbstractGraphicsMediaItem.h
Gui/timeline/GraphicsAudioItem.h
......@@ -184,11 +175,6 @@ SET(VLMC_UIS
Gui/library/StackViewNavController.ui
Gui/library/ui/MediaCellView.ui
Gui/library/ui/StackViewNavController.ui
Gui/settings/ui/AudioProjectPreferences.ui
Gui/settings/ui/LanguagePreferences.ui
Gui/settings/ui/ProjectPreferences.ui
Gui/settings/ui/VideoProjectPreferences.ui
Gui/settings/ui/VLMCPreferences.ui
Gui/ui/About.ui
Gui/ui/ClipProperty.ui
Gui/ui/FileBrowser.ui
......
src/Gui/LanguagePreferences.cpp deleted 100644 → 0
View file @ 87d38694
/*****************************************************************************
* Preferences.cpp: Preferences window
*****************************************************************************
* Copyright (C) 2008-2010 VideoLAN
*
* Authors: Christophe Courtaut <christophe.courtaut@gmail.com>
* Clement CHAVANCE <kinder@vlmc.org>
* Hugo Beauzee-Luyssen <beauze.h@gmail.com>
* Ludovic Fauvet <etix@l0cal.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "SettingsManager.h"
#include "LanguagePreferences.h"
#include "ui_LanguagePreferences.h"
#include "SettingValue.h"
#include <QVariant>
#include <QDir>
#include <QLocale>
QTranslator* LanguagePreferences::m_currentLang = NULL;
LanguagePreferences::LanguagePreferences( QWidget *parent )
: PreferenceWidget( parent ),
m_type( SettingsManager::Vlmc )
{
m_ui.setupUi( this );
QDir dir( ":/ts/", "*.qm", QDir::Name | QDir::IgnoreCase, QDir::Files );
foreach ( const QString& tsFileName, dir.entryList() )
{
QString countryCode;
int localePos = tsFileName.lastIndexOf( TS_PREFIX );
int extPos = tsFileName.lastIndexOf( ".qm" );
if ( localePos < 0 || extPos < 0 || localePos > extPos )
{
qWarning() << "Invalid translation file:" << tsFileName;
continue ;
}
localePos += qstrlen( TS_PREFIX );
countryCode = tsFileName.mid( localePos, extPos - localePos );
QLocale locale( countryCode );
// Check if the country code is valid ISO 639
if ( locale.language() == QLocale::C )
{
qWarning() << "Invalid locale for file:" << tsFileName;
continue;
}
m_ui.comboBoxLanguage->addItem( QString( "%1 (%2)" ).arg(
QLocale::languageToString( locale.language() ),
QLocale::countryToString( locale.country() ) ), countryCode );
}
m_ui.comboBoxLanguage->addItem( "English (UnitedStates)", "en_US" );
// Sort the combobox
m_ui.comboBoxLanguage->model()->sort( 0 );
}
LanguagePreferences::~LanguagePreferences() {}
void LanguagePreferences::load()
{
QString lang = VLMC_GET_STRING( "general/VLMCLang" );
int idx = m_ui.comboBoxLanguage->findData( lang );
if ( idx != -1 )
m_ui.comboBoxLanguage->setCurrentIndex( idx );
return ;
}
void LanguagePreferences::save()
{
SettingsManager* setMan = SettingsManager::getInstance();
QVariant lang = m_ui.comboBoxLanguage->itemData( m_ui.comboBoxLanguage->currentIndex() );
setMan->setImmediateValue( "global/VLMCLang", lang, m_type );
changeLang( lang.toString() );
}
void LanguagePreferences::changeLang( QString langValue )
{
if ( m_currentLang != NULL )
{
qApp->removeTranslator( m_currentLang );
delete m_currentLang;
m_currentLang = NULL;
}
if ( !langValue.isEmpty() )
{
m_currentLang = new QTranslator();
m_currentLang->load( TS_PREFIX + langValue, ":/ts/" );
qApp->installTranslator( m_currentLang );
}
}
void LanguagePreferences::changeEvent( QEvent *e )
{
QWidget::changeEvent( e );
switch ( e->type() )
{
case QEvent::LanguageChange:
m_ui.retranslateUi( this );
break;
default:
break;
}
}
src/Gui/LanguagePreferences.h deleted 100644 → 0
View file @ 87d38694
/*****************************************************************************
* Preferences.h: Preferences window
*****************************************************************************
* Copyright (C) 2008-2010 VideoLAN
*
* Authors: Christophe Courtaut <christophe.courtaut@gmail.com>
* Clement CHAVANCE <kinder@vlmc.org>
* Hugo Beauzee-Luyssen <beauze.h@gmail.com>
* Ludovic Fauvet <etix@l0cal.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef PREFERENCES_H
#define PREFERENCES_H
#include "PreferenceWidget.h"
#include "SettingsManager.h"
#include "ui_LanguagePreferences.h"
#include <QTranslator>
#include <QtDebug>
#define TS_PREFIX "vlmc_"
class LanguagePreferences : public PreferenceWidget
{
Q_OBJECT
public:
LanguagePreferences( QWidget* parent = 0 );
~LanguagePreferences();
void load();
void save();
void changeLang(QString lang);
protected:
virtual void changeEvent( QEvent *e );
private:
Ui::LanguagePreferences m_ui;
static QTranslator* m_currentLang;
SettingsManager::Type m_type;
};
#endif // PREFERENCES_H
src/Gui/MainWindow.cpp
View file @ 9eefcff5
......@@ -35,7 +35,6 @@
#include "Library.h"
#include "About.h"
#include "ProjectManager.h"
#include "KeyboardShortcut.h"
#include "VlmcDebug.h"
#include "MainWorkflow.h"
......@@ -56,11 +55,6 @@
/* Settings / Preferences */
#include "ProjectManager.h"
#include "ProjectWizard.h"
#include "ProjectPreferences.h"
#include "VLMCPreferences.h"
#include "AudioProjectPreferences.h"
#include "VideoProjectPreferences.h"
#include "LanguagePreferences.h"
#include "Settings.h"
#include "SettingsManager.h"
......@@ -343,35 +337,35 @@ void MainWindow::initializeDockWidgets( void )
void MainWindow::createGlobalPreferences()
{
m_globalPreferences = new Settings( this );
m_globalPreferences->addWidget( tr ( "VLMC" ),
new VLMCPreferences( m_globalPreferences ),
QIcon( ":/images/images/vlmc.png" ),
tr ( "VLMC settings" ) );
m_globalPreferences->addWidget( tr ("Language preferences" ),
new LanguagePreferences( m_globalPreferences ),
QIcon( ":/images/images/vlmc.png" ),
tr ( "Language settings" ) );
m_globalPreferences->addWidget( tr ("Keyboard" ),
new KeyboardShortcut( m_globalPreferences ),
QIcon( ":/images/keyboard" ),
tr( "Keyboard Settings" ) );
// m_globalPreferences->addWidget( tr ( "VLMC" ),
// new VLMCPreferences( m_globalPreferences ),
// QIcon( ":/images/images/vlmc.png" ),
// tr ( "VLMC settings" ) );
// m_globalPreferences->addWidget( tr ("Language preferences" ),
// new LanguagePreferences( m_globalPreferences ),
// QIcon( ":/images/images/vlmc.png" ),
// tr ( "Language settings" ) );
// m_globalPreferences->addWidget( tr ("Keyboard" ),
// new KeyboardShortcut( m_globalPreferences ),
// QIcon( ":/images/keyboard" ),
// tr( "Keyboard Settings" ) );
}
void MainWindow::createProjectPreferences()
{
m_projectPreferences = new Settings( this );
m_projectPreferences->addWidget( tr( "Project" ),
new ProjectPreferences,
QIcon( ":/images/images/vlmc.png" ),
tr ( "Project settings" ) );
m_projectPreferences->addWidget( tr ( "Video" ),
new VideoProjectPreferences,
QIcon( ":/images/images/video.png" ),
tr ( "Video settings" ) );
m_projectPreferences->addWidget( tr ( "Audio" ),
new AudioProjectPreferences,
QIcon( ":/images/images/audio.png" ),
tr ( "Audio settings" ) );
// m_projectPreferences->addWidget( tr( "Project" ),
// new ProjectPreferences,
// QIcon( ":/images/images/vlmc.png" ),
// tr ( "Project settings" ) );
// m_projectPreferences->addWidget( tr ( "Video" ),
// new VideoProjectPreferences,
// QIcon( ":/images/images/video.png" ),
// tr ( "Video settings" ) );
// m_projectPreferences->addWidget( tr ( "Audio" ),
// new AudioProjectPreferences,
// QIcon( ":/images/images/audio.png" ),
// tr ( "Audio settings" ) );
}
......
src/Gui/settings/AudioProjectPreferences.cpp deleted 100644 → 0
View file @ 87d38694
/*****************************************************************************
* AudioProjectPreferences.cpp: VLMC Audio project preferences class
*****************************************************************************
* Copyright (C) 2008-2010 VideoLAN
*
* Authors: Geoffroy Lacarriere <geoffroylaca@gmail.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <QDebug>
#include "AudioProjectPreferences.h"
AudioProjectPreferences::AudioProjectPreferences( QWidget *parent )
: PreferenceWidget( parent ),
m_type( SettingsManager::Project )
{
m_ui.setupUi( this );
}
AudioProjectPreferences::~AudioProjectPreferences() { }
void AudioProjectPreferences::load()
{
int sampleRate = VLMC_PROJECT_GET_INT( "audio/AudioSampleRate" );
m_ui.SampleRate->setValue( sampleRate );
return ;
}
void AudioProjectPreferences::save()
{
SettingsManager* setMan = SettingsManager::getInstance();
QVariant sampleRate( m_ui.SampleRate->value() );
setMan->setImmediateValue( "audio/AudioSampleRate", sampleRate, m_type );
return ;
}
void AudioProjectPreferences::changeEvent( QEvent *e )
{
QWidget::changeEvent( e );
switch ( e->type() )
{
case QEvent::LanguageChange:
m_ui.retranslateUi( this );
break;
default:
break;
}
}
src/Gui/settings/AudioProjectPreferences.h deleted 100644 → 0
View file @ 87d38694
/*****************************************************************************
* AudioProjectPreferences.h: VLMC Audio project preferences class
*****************************************************************************
* Copyright (C) 2008-2010 VideoLAN
*
* Authors: Geoffroy Lacarriere <geoffroylaca@gmail.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef AUDIOPROJECTPREFERENCES_H
#define AUDIOPROJECTPREFERENCES_H
#include "PreferenceWidget.h"
#include "SettingsManager.h"
#include "ui_AudioProjectPreferences.h"
class QWidget;
class AudioProjectPreferences : public PreferenceWidget
{
//Q_OBJECT
public:
AudioProjectPreferences( QWidget *parent = 0 );
~AudioProjectPreferences();
void load();
void save();
protected:
virtual void changeEvent( QEvent *e );
private:
Ui::AudioProjectPreferences m_ui;
const SettingsManager::Type m_type;
};
#endif // AUDIOPROJECTPREFERENCES_H
src/Gui/settings/KeyboardShortcut.cpp deleted 100644 → 0
View file @ 87d38694
/*****************************************************************************
* KeyboardShortcut.cpp: Keyboard shortcut preferences
*****************************************************************************
* Copyright (C) 2008-2010 VideoLAN
*
* Authors: Hugo Beauzee-Luyssen <hugo@vlmc.org>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "KeyboardShortcut.h"
#include "KeyboardShortcutInput.h"
#include "SettingsManager.h"
#include <QtDebug>
KeyboardShortcut::KeyboardShortcut( QWidget* parent )
: PreferenceWidget( parent ),
m_type( SettingsManager::Vlmc )
{
m_layout = new QFormLayout( this );
const QHash<QString, QVariant> shortcutGroup = SettingsManager::getInstance()->group( "keyboard", SettingsManager::Vlmc );
Q_ASSERT( !shortcutGroup.size() == 0 );
QHash<QString, QVariant>::const_iterator it = shortcutGroup.begin();
QHash<QString, QVariant>::const_iterator ite = shortcutGroup.end();
while ( it != ite )
{
m_keySeq[it.key()] = new QKeySequence( it.value().toString() );
KeyboardShortcutInput* ksi = new KeyboardShortcutInput( it.key(), m_keySeq[it.key()]->toString(), this );
m_layout->addRow( it.key(), ksi );
connect( ksi, SIGNAL( changed( const QString&, const QString& ) ),
this, SLOT( shortcutUpdated( const QString&, const QString& ) ) );
++it;
}
setLayout( m_layout );
}
KeyboardShortcut::~KeyboardShortcut()
{
}
void KeyboardShortcut::load()
{
}
void KeyboardShortcut::save()
{
}
void KeyboardShortcut::shortcutUpdated( const QString& name, const QString& value )
{
SettingsManager::getInstance()->setImmediateValue( name, value, m_type );
}
src/Gui/settings/KeyboardShortcut.h deleted 100644 → 0
View file @ 87d38694
/*****************************************************************************
* KeyboardShortcut.h: Keyboard shortcut preferences
*****************************************************************************
* Copyright (C) 2008-2010 VideoLAN
*
* Authors: Hugo Beauzee-Luyssen <hugo@vlmc.org>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifndef KEYBOARDSHORTCUT_H
#define KEYBOARDSHORTCUT_H
#include "PreferenceWidget.h"
#include "SettingsManager.h"
#include <QFormLayout>
#include <QHash>
#include <QString>
class QKeySequence;
class QWidget;
class KeyboardShortcut : public PreferenceWidget
{
Q_OBJECT
public:
KeyboardShortcut( QWidget* parent = 0 );
virtual ~KeyboardShortcut();
void load();
void save();
private slots:
void shortcutUpdated( const QString& name, const QString& value );
private:
QFormLayout* m_layout;
QHash<QString, QKeySequence*> m_keySeq;
const SettingsManager::Type m_type;
};
#endif // KEYBOARDSHORTCUT_H
src/Gui/settings/ProjectPreferences.cpp deleted 100644 → 0
View file @ 87d38694
/*****************************************************************************
* ProjectPreferences.cpp: VLMC project preferences class
*****************************************************************************
* Copyright (C) 2008-2010 VideoLAN
*
* Authors: Clement CHAVANCE <kinder@vlmc.org>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "ProjectPreferences.h"
#include "PreferenceWidget.h"
#include "SettingsManager.h"
#include "ProjectManager.h"
#include <QWidget>
ProjectPreferences::ProjectPreferences( QWidget* parent )
: PreferenceWidget( parent ),
m_type( SettingsManager::Project )
{
m_ui.setupUi( this );
}
ProjectPreferences::~ProjectPreferences() { }
void ProjectPreferences::load()
{
QString Name = VLMC_PROJECT_GET_STRING( "general/ProjectName" );
m_ui.ProjectNameLineEdit->setText( Name );
}
void ProjectPreferences::save()
{
SettingsManager* settMan = SettingsManager::getInstance();
QVariant name( m_ui.ProjectNameLineEdit->text() );
settMan->setImmediateValue( "general/ProjectName", name, m_type );
}
void ProjectPreferences::changeEvent( QEvent *e )
{
QWidget::changeEvent( e );
switch ( e->type() )
{
case QEvent::LanguageChange:
m_ui.retranslateUi( this );
break;
default:
break;
}
}