Commit a3e91f8c authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen

Merge branch 'chouquette_sound_workflow' into chouquette_refactor_clipworkflow

parents ad732f4c a49aabb0
......@@ -10,12 +10,18 @@ French:
Clément CHAVANCE <kinder@vlmc.org>
Christophe Courtaut <kri5@vlmc.org>
Italian:
Massimo Fierro <massimo.fierro@gmail.com>
Japanese:
wwwcfe <wwwcfe@yahoo.co.jp>
Spanish:
Christophe Courtaut <kri5@vlmc.org>
Slovak:
Marián Hikaník <podnety@mojepreklady.net>
Swedish:
Daniel Nylander <po@danielnylander.se>
......@@ -8,53 +8,53 @@ FORMS += ui/About.ui \
ui/transcode.ui \
ui/WorkflowFileRendererDialog.ui
HEADERS += About.h \
AbstractGraphicsMediaItem.h \
timeline/AbstractGraphicsMediaItem.h \
ClickableLabel.h \
ClipProperty.h \
DockWidgetManager.h \
FileInfoListModel.h \
GraphicsAudioItem.h \
GraphicsCursorItem.h \
GraphicsMovieItem.h \
GraphicsTrack.hpp \
ImportMediaCellView.h \
ImportMediaListController.h \
timeline/GraphicsAudioItem.h \
timeline/GraphicsCursorItem.h \
timeline/GraphicsMovieItem.h \
timeline/GraphicsTrack.hpp \
import/ImportMediaCellView.h \
import/ImportMediaListController.h \
LanguagePreferences.h \
LCDTimecode.h \
MainWindow.h \
PreviewRuler.h \
PreviewWidget.h \
TagWidget.h \
Timeline.h \
TracksControls.h \
TracksRuler.h \
TracksScene.h \
TracksView.h \
timeline/Timeline.h \
timeline/TracksControls.h \
timeline/TracksRuler.h \
timeline/TracksScene.h \
timeline/TracksView.h \
UndoStack.h \
WorkflowFileRendererDialog.h \
AudioSpectrumDrawer.h
SOURCES += About.cpp \
AbstractGraphicsMediaItem.cpp \
timeline/AbstractGraphicsMediaItem.cpp \
ClickableLabel.cpp \
ClipProperty.cpp \
DockWidgetManager.cpp \
FileInfoListModel.cpp \
GraphicsAudioItem.cpp \
GraphicsCursorItem.cpp \
GraphicsMovieItem.cpp \
ImportMediaCellView.cpp \
ImportMediaListController.cpp \
timeline/GraphicsAudioItem.cpp \
timeline/GraphicsCursorItem.cpp \
timeline/GraphicsMovieItem.cpp \
import/ImportMediaCellView.cpp \
import/ImportMediaListController.cpp \
LanguagePreferences.cpp \
LCDTimecode.cpp \
MainWindow.cpp \
PreviewRuler.cpp \
PreviewWidget.cpp \
TagWidget.cpp \
Timeline.cpp \
TracksControls.cpp \
TracksRuler.cpp \
TracksScene.cpp \
TracksView.cpp \
timeline/Timeline.cpp \
timeline/TracksControls.cpp \
timeline/TracksRuler.cpp \
timeline/TracksScene.cpp \
timeline/TracksView.cpp \
UndoStack.cpp \
WorkflowFileRendererDialog.cpp \
AudioSpectrumDrawer.cpp
......@@ -26,19 +26,35 @@
#include "LanguagePreferences.h"
#include "ui_LanguagePreferences.h"
#include <QDir>
QTranslator* LanguagePreferences::m_currentLang = NULL;
LanguagePreferences::LanguagePreferences( QWidget *parent )
: PreferenceWidget( parent )
{
m_ui.setupUi( this );
m_ui.comboBoxLanguage->addItem( tr( "Czech" ), "cs" );
m_ui.comboBoxLanguage->addItem( tr( "English" ), "en" );
m_ui.comboBoxLanguage->addItem( tr( "French" ), "fr" );
m_ui.comboBoxLanguage->addItem( tr( "Japanese" ), "jp" );
m_ui.comboBoxLanguage->addItem( tr( "Spanish" ), "es" );
m_ui.comboBoxLanguage->addItem( tr( "Swedish" ), "sv" );
m_ui.comboBoxLanguage->addItem( tr( "Brazilian Portugese" ), "pt_BR" );
QDir dir( "ts/", "*.ts", QDir::Name | QDir::IgnoreCase, QDir::Files );
QStringList tss = dir.entryList();
foreach ( const QString& tsFileName, tss )
{
QString localeStr;
int localePos = tsFileName.lastIndexOf( "vlmc_");
int dotPos = tsFileName.lastIndexOf( ".ts" );
if ( localePos < 0 || dotPos < 0 )
{
qWarning() << "Invalid translation file:" << tsFileName;
continue ;
}
localePos += 5;
localeStr = tsFileName.mid( localePos, dotPos - localePos );
QLocale locale( localeStr );
m_ui.comboBoxLanguage->addItem( QLocale::countryToString( locale.country() ) + " / "
+ QLocale::languageToString( locale.language() ), localeStr );
}
m_ui.comboBoxLanguage->addItem( "UnitedStates / English", "en" );
}
LanguagePreferences::~LanguagePreferences() {}
......
......@@ -21,52 +21,48 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <QLabel>
#include <QSizePolicy>
#include <QPalette>
#include <QDockWidget>
#include <QFileDialog>
#include <QSlider>
#include <QUndoView>
#include <QMessageBox>
#include <QDesktopServices>
#include <QUrl>
#include <QSettings>
#include <QStringList>
#include "MainWindow.h"
#include "Library.h"
#include "Timeline.h"
#include "TracksView.h"
#include "About.h"
#include "DockWidgetManager.h"
#include "ImportController.h"
#include "ProjectManager.h"
#include "KeyboardShortcut.h"
#include "VlmcDebug.h"
#include "MainWorkflow.h"
#include "WorkflowFileRenderer.h"
#include "WorkflowRenderer.h"
#include "ClipRenderer.h"
#include "EffectsEngine.h"
/* Widgets */
#include "DockWidgetManager.h"
#include "UndoStack.h"
#include "ClipProperty.h"
#include "PreviewWidget.h"
#include "MediaLibraryWidget.h"
#include "timeline/Timeline.h"
#include "timeline/TracksView.h"
#include "ImportController.h"
/* Settings / Preferences */
#include "ProjectManager.h"
#include "ProjectWizard.h"
#include "PreferenceWidget.h"
#include "ProjectPreferences.h"
#include "ProjectManager.h"
#include "VLMCPreferences.h"
#include "VLMCSettingsDefault.h"
#include "AudioProjectPreferences.h"
#include "VideoProjectPreferences.h"
#include "VLMCSettingsDefault.h"
#include "ProjectSettingsDefault.h"
#include "VLMCPreferences.h"
#include "Import.h"
#include "MediaLibraryWidget.h"
#include "LanguagePreferences.h"
#include "ProjectManager.h"
#include "KeyboardShortcut.h"
#include "Settings.h"
#include "SettingValue.h"
#include "SettingsManager.h"
#include "VlmcDebug.h"
MainWindow::MainWindow( QWidget *parent ) :
QMainWindow( parent ), m_renderer( NULL )
......
......@@ -35,9 +35,7 @@
const int Panel::M_ICON_HEIGHT = 64;
Panel::Panel( QWidget* parent )
: QWidget( parent ),
m_layout( 0 )
Panel::Panel( QWidget* parent ) : QWidget( parent )
{
m_layout = new QVBoxLayout( this );
m_buttons = new QButtonGroup( this );
......@@ -48,16 +46,10 @@ Panel::Panel( QWidget* parent )
m_layout->insertSpacerItem( 1, new QSpacerItem( 1, 1, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
connect( m_buttons, SIGNAL( buttonPressed(int) ),
this, SLOT( switchPanel(int) ) );
this, SIGNAL( changePanel(int) ) );
setSizePolicy( QSizePolicy::Expanding,
QSizePolicy::Expanding );
setLayout( m_layout );
}
Panel::~Panel()
{
}
void Panel::addButton( const QString& label,
......@@ -86,12 +78,6 @@ void Panel::addButton( const QString& label,
void Panel::showEvent( QShowEvent *event )
{
// Reset the selection when the dialog is shown.
if ( !event->spontaneous() &&
!m_buttons->buttons().isEmpty() )
if ( !event->spontaneous() && !m_buttons->buttons().isEmpty() )
m_buttons->buttons().first()->setChecked( true );
}
void Panel::switchPanel( int index )
{
emit changePanel( index );
}
......@@ -34,25 +34,23 @@ class Panel : public QWidget
{
Q_OBJECT
Q_DISABLE_COPY( Panel )
public:
Panel( QWidget* parent = 0 );
virtual ~Panel();
void addButton( const QString& label,
const QIcon& icon,
int index );
public:
Panel( QWidget* parent = 0 );
virtual ~Panel() { }
private:
virtual void showEvent( QShowEvent * );
QVBoxLayout* m_layout;
QButtonGroup* m_buttons;
static const int M_ICON_HEIGHT;
void addButton( const QString& label,
const QIcon& icon,
int index );
private slots:
void switchPanel( int index );
private:
virtual void showEvent( QShowEvent * );
QVBoxLayout* m_layout;
QButtonGroup* m_buttons;
static const int M_ICON_HEIGHT;
signals:
void changePanel( int index );
signals:
void changePanel( int index );
};
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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