Commit 05e0cd20 authored by Ludovic Fauvet's avatar Ludovic Fauvet

Replace a franglish word used in some class/methods.

Categorie -> Category.
parent 5c4fef73
......@@ -419,10 +419,10 @@ void MainWindow::initializeDockWidgets( void )
void MainWindow::createGlobalPreferences()
{
m_globalPreferences = new Settings( SettingsManager::Vlmc, this );
m_globalPreferences->addCategorie( "general", SettingsManager::Vlmc,
m_globalPreferences->addCategory( "general", SettingsManager::Vlmc,
QIcon( ":/images/images/vlmc.png" ),
tr ( "VLMC settings" ) );
m_globalPreferences->addCategorie( "keyboard", SettingsManager::Vlmc,
m_globalPreferences->addCategory( "keyboard", SettingsManager::Vlmc,
QIcon( ":/images/keyboard" ),
tr( "Keyboard Settings" ) );
}
......@@ -430,13 +430,13 @@ void MainWindow::createGlobalPreferences()
void MainWindow::createProjectPreferences()
{
m_projectPreferences = new Settings( SettingsManager::Project, this );
m_projectPreferences->addCategorie( "general", SettingsManager::Project,
m_projectPreferences->addCategory( "general", SettingsManager::Project,
QIcon( ":/images/images/vlmc.png" ),
tr ( "Project settings" ) );
m_projectPreferences->addCategorie( "video", SettingsManager::Project,
m_projectPreferences->addCategory( "video", SettingsManager::Project,
QIcon( ":/images/images/video.png" ),
tr ( "Video settings" ) );
m_projectPreferences->addCategorie( "audio", SettingsManager::Project,
m_projectPreferences->addCategory( "audio", SettingsManager::Project,
QIcon( ":/images/images/audio.png" ),
tr ( "Audio settings" ) );
}
......
......@@ -23,14 +23,14 @@
#ifndef BOOLWIDGET_H
#define BOOLWIDGET_H
#include "ISettingsCategorieWidget.h"
#include "ISettingsCategoryWidget.h"
#include <stddef.h>
class SettingValue;
class QCheckBox;
class BoolWidget : public ISettingsCategorieWidget
class BoolWidget : public ISettingsCategoryWidget
{
public:
BoolWidget( SettingValue *s, QWidget *parent = NULL );
......
......@@ -23,14 +23,14 @@
#ifndef DOUBLEWIDGET_H
#define DOUBLEWIDGET_H
#include "ISettingsCategorieWidget.h"
#include "ISettingsCategoryWidget.h"
#include <stddef.h>
class SettingValue;
class QDoubleSpinBox;
class DoubleWidget : public ISettingsCategorieWidget
class DoubleWidget : public ISettingsCategoryWidget
{
public:
DoubleWidget( SettingValue *s, QWidget *parent = NULL );
......
......@@ -21,17 +21,17 @@
*****************************************************************************/
#ifndef ISETTINGSCATEGORIEWIDGET_H
#define ISETTINGSCATEGORIEWIDGET_H
#ifndef ISETTINGSCATEGORYWIDGET_H
#define ISETTINGSCATEGORYWIDGET_H
class QVariant;
class QWidget;
class ISettingsCategorieWidget
class ISettingsCategoryWidget
{
public:
virtual QWidget* widget() = 0;
virtual void save() = 0;
};
#endif // ISETTINGSCATEGORIEWIDGET_H
#endif // ISETTINGSCATEGORYWIDGET_H
......@@ -23,14 +23,14 @@
#ifndef INTWIDGET_H
#define INTWIDGET_H
#include "ISettingsCategorieWidget.h"
#include "ISettingsCategoryWidget.h"
#include <stddef.h>
class SettingValue;
class QSpinBox;
class IntWidget : public ISettingsCategorieWidget
class IntWidget : public ISettingsCategoryWidget
{
public:
IntWidget( SettingValue *s, QWidget *parent = NULL );
......
......@@ -23,13 +23,13 @@
#ifndef KEYBOARDSHORTCUT_H
#define KEYBOARDSHORTCUT_H
#include "ISettingsCategorieWidget.h"
#include "ISettingsCategoryWidget.h"
#include <stddef.h>
class KeyboardShortcutInput;
class SettingValue;
class KeyboardShortcut : public ISettingsCategorieWidget
class KeyboardShortcut : public ISettingsCategoryWidget
{
public:
KeyboardShortcut( SettingValue *s, QWidget *parent = NULL );
......
......@@ -23,14 +23,14 @@
#ifndef LANGUAGEWIDGET_H
#define LANGUAGEWIDGET_H
#include "ISettingsCategorieWidget.h"
#include "ISettingsCategoryWidget.h"
#include <stddef.h>
class SettingValue;
class QComboBox;
class LanguageWidget : public ISettingsCategorieWidget
class LanguageWidget : public ISettingsCategoryWidget
{
public:
LanguageWidget( SettingValue *s, QWidget *parent = NULL );
......
......@@ -22,7 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include "ISettingsCategorieWidget.h"
#include "ISettingsCategoryWidget.h"
#include "PreferenceWidget.h"
#include "SettingsManager.h"
......@@ -41,20 +41,20 @@
#include <QHashIterator>
#include <QEvent>
PreferenceWidget::PreferenceWidget( const QString &categorie, SettingsManager::Type type,
PreferenceWidget::PreferenceWidget( const QString &category, SettingsManager::Type type,
QWidget *parent ) :
QScrollArea( parent ),
m_categorie( categorie )
m_category( category )
{
QWidget *container = new QWidget( this );
SettingsManager::SettingHash settings =
SettingsManager::getInstance()->group( categorie, type );
SettingsManager::getInstance()->group( category, type );
QFormLayout *layout = new QFormLayout( container );
layout->setFieldGrowthPolicy( QFormLayout::AllNonFixedFieldsGrow );
foreach ( SettingValue* s, settings.values() )
{
ISettingsCategorieWidget *widget = widgetFactory( s );
ISettingsCategoryWidget *widget = widgetFactory( s );
QLabel *label = new QLabel( tr( s->name() ), this );
label->setToolTip( tr( s->description() ) );
m_labels.insert( s, label );
......@@ -66,10 +66,10 @@ PreferenceWidget::PreferenceWidget( const QString &categorie, SettingsManager::T
setWidget( container );
setWidgetResizable( true );
setFrameStyle( QFrame::NoFrame );
m_categorie[0] = m_categorie[0].toUpper();
m_category[0] = m_category[0].toUpper();
}
ISettingsCategorieWidget*
ISettingsCategoryWidget*
PreferenceWidget::widgetFactory( SettingValue *s )
{
switch ( s->type() )
......@@ -92,14 +92,14 @@ PreferenceWidget::widgetFactory( SettingValue *s )
void
PreferenceWidget::save()
{
foreach ( ISettingsCategorieWidget* w, m_settings )
foreach ( ISettingsCategoryWidget* w, m_settings )
w->save();
}
const QString&
PreferenceWidget::categorie() const
PreferenceWidget::category() const
{
return m_categorie;
return m_category;
}
void
......
......@@ -30,7 +30,7 @@
#include <QHash>
#include "SettingsManager.h"
class ISettingsCategorieWidget;
class ISettingsCategoryWidget;
class SettingValue;
class QLabel;
class QEvent;
......@@ -39,22 +39,22 @@ class PreferenceWidget : public QScrollArea
{
Q_OBJECT
public:
typedef QList<ISettingsCategorieWidget*> SettingsList;
PreferenceWidget( const QString& categorie, SettingsManager::Type type,
typedef QList<ISettingsCategoryWidget*> SettingsList;
PreferenceWidget( const QString& category, SettingsManager::Type type,
QWidget* parent = 0 );
virtual ~PreferenceWidget() {}
virtual void save();
const QString &categorie() const;
const QString &category() const;
protected:
void changeEvent( QEvent *e );
private:
ISettingsCategorieWidget *widgetFactory( SettingValue* s );
ISettingsCategoryWidget *widgetFactory( SettingValue* s );
void retranslateUi();
private:
QString m_categorie;
QString m_category;
SettingsList m_settings;
QHash<SettingValue*, QLabel*> m_labels;
};
......
......@@ -60,7 +60,7 @@ Settings::Settings( SettingsManager::Type type, QWidget* parent, Qt::WindowFlags
this, SLOT( switchWidget( int ) ) );
}
void Settings::addCategorie( const QString& name,
void Settings::addCategory( const QString& name,
SettingsManager::Type type,
const QIcon& icon,
const QString& label )
......@@ -136,7 +136,7 @@ void Settings::switchWidget( int index )
qobject_cast<PreferenceWidget*>( m_stackedLayout->widget( index ) );
Q_ASSERT( pWidget != NULL );
m_title->setText( pWidget->categorie() );
m_title->setText( pWidget->category() );
m_stackedLayout->setCurrentIndex( index );
}
......@@ -47,7 +47,7 @@ class Settings : public QDialog
public:
Settings( SettingsManager::Type type, QWidget* parent = 0, Qt::WindowFlags f = 0 );
void addCategorie( const QString& name,
void addCategory( const QString& name,
SettingsManager::Type type,
const QIcon& icon,
const QString& label );
......
......@@ -23,14 +23,14 @@
#ifndef STRINGWIDGET_H
#define STRINGWIDGET_H
#include "ISettingsCategorieWidget.h"
#include "ISettingsCategoryWidget.h"
#include <stddef.h>
class SettingValue;
class QLineEdit;
class StringWidget : public ISettingsCategorieWidget
class StringWidget : public ISettingsCategoryWidget
{
public:
StringWidget( SettingValue *s, QWidget *parent = NULL );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment