Commit 8be363f6 authored by Geoffroy Lacarriere's avatar Geoffroy Lacarriere

Add forgotten files

parent 86c57422
......@@ -43,6 +43,10 @@
#include "PreviewWidget.h"
#include "PreferenceWidget.h"
#include "ProjectPreferences.h"
//#include "AudioDebugSpectrum.h"
#include "AudioProjectPreferences.h"
#include "VideoProjectPreferences.h"
#include "VLMCPreferences.h"
MainWindow::MainWindow( QWidget *parent ) :
QMainWindow( parent ), m_renderer( NULL )
......@@ -184,20 +188,23 @@ void MainWindow::initializeDockWidgets( void )
QDockWidget::AllDockWidgetFeatures,
Qt::LeftDockWidgetArea );
setupLibrary();
// dockManager->addDockedWidget( new AudioDebugSpectrum( this ),
// tr( "AudioDebugSpectrum" ),
// Qt::AllDockWidgetAreas,
// QDockWidget::AllDockWidgetFeatures,
// Qt::BottomDockWidgetArea );
m_metaDataManager = MetaDataManager::getInstance();
}
void MainWindow::createGlobalPreferences()
{
m_globalPreferences = new Settings( );
m_globalPreferences->addWidget("Project",
new ProjectPreferences,
"images/vlmc.png",
"Project");
m_globalPreferences->addWidget("test",
new ProjectPreferences,
"images/vlmc.png",
"Truc");
m_globalPreferences->addWidget("VLMC",
new VLMCPreferences,
"../images/vlmc.png",
"VLMC settings");
////For debugging purpose
//m_globalPreferences->addWidget("Test",
// new QLabel("This is a test"),
......@@ -253,6 +260,22 @@ void MainWindow::on_actionNew_Project_triggered()
{
//TODO : clear the library, the timeline, and show the configuration box
//of the newly created project
m_projectPreferences = new Settings( );
m_projectPreferences->addWidget("Project",
new ProjectPreferences,
"../images/vlmc.png",
"Project settings");
m_projectPreferences->addWidget("Video",
new VideoProjectPreferences,
"../images/scalable/video.svg",
"Video settings");
m_projectPreferences->addWidget("Audio",
new AudioProjectPreferences,
"../images/scalable/audio.svg",
"Audio settings");
m_projectPreferences->build();
m_projectPreferences->show();
}
void MainWindow::on_actionOpen_Project_triggered()
......
......@@ -37,7 +37,6 @@
#include "ListViewMediaItem.h"
#include "Settings.h"
class MainWindow : public QMainWindow
{
Q_OBJECT
......@@ -61,7 +60,6 @@ private:
void createStatusBar();
void createGlobalPreferences();
Ui::MainWindow m_ui;
MetaDataManager* m_metaDataManager;
QSlider* m_zoomSlider;
......@@ -69,7 +67,8 @@ private:
PreviewWidget* m_clipPreview;
PreviewWidget* m_projectPreview;
WorkflowFileRenderer* m_renderer;
Settings* m_globalPreferences;
Settings* m_globalPreferences;
Settings* m_projectPreferences;
private slots:
void on_actionFullscreen_triggered( bool checked );
......
......@@ -16,7 +16,6 @@ ProjectPreferences::ProjectPreferences( QWidget* parent )
ProjectPreferences::~ProjectPreferences() { }
bool ProjectPreferences::load()
{
qDebug() << "Loading ProjectPreferences values";
......@@ -26,8 +25,6 @@ bool ProjectPreferences::load()
void ProjectPreferences::save( QSettings& settings )
{
settings.beginGroup( "Project" );
settings.setValue( "outputFPS", m_ui.outputFPS->text() );
settings.setValue( "previewFPS", m_ui.previewFPS->text() );
settings.setValue( "trackNb", m_ui.tracksNb->text() );
//settings.setValue( "outputFPS", m_ui.outputFPS->text() );
settings.endGroup();
}
......@@ -5,7 +5,8 @@ TEMPLATE = app
OBJECTS_DIR = build
MOC_DIR = build/moc
UI_DIR = build/ui
QMAKE_EXT_H = .h .hpp
QMAKE_EXT_H = .h \
.hpp
INCLUDEPATH = build/moc \
build/ui
QT += gui \
......@@ -54,7 +55,11 @@ SOURCES += src/main.cpp \
src/GUI/Settings.cpp \
src/GUI/Panel.cpp \
src/GUI/PreferenceWidget.cpp \
src/GUI/ProjectPreferences.cpp
src/GUI/ProjectPreferences.cpp \
src/GUI/AudioDebugSpectrum.cpp \
src/GUI/VideoProjectPreferences.cpp \
src/GUI/AudioProjectPreferences.cpp \
src/GUI/VLMCPreferences.cpp
HEADERS += src/GUI/MainWindow.h \
src/GUI/DockWidgetManager.h \
src/GUI/LibraryWidget.h \
......@@ -106,7 +111,12 @@ HEADERS += src/GUI/MainWindow.h \
src/GUI/WorkflowFileRendererDialog.h \
src/GUI/Settings.h \
src/GUI/Panel.h \
src/GUI/GraphicsTrack.hpp
src/GUI/GraphicsTrack.hpp \
src/GUI/AudioDebugSpectrum.h \
src/GUI/ProjectPreferences.h \
src/GUI/VideoProjectPreferences.h \
src/GUI/AudioProjectPreferences.h \
src/GUI/VLMCPreferences.h
FORMS += src/GUI/ui/MainWindow.ui \
src/GUI/ui/PreviewWidget.ui \
src/GUI/ui/LanguagePreferences.ui \
......@@ -117,7 +127,11 @@ FORMS += src/GUI/ui/MainWindow.ui \
src/GUI/ui/FileBrowser.ui \
src/GUI/ui/WorkflowFileRendererDialog.ui \
src/GUI/ui/ClipProperty.ui \
src/GUI/ui/ProjectPreferences.ui
src/GUI/ui/ProjectPreferences.ui \
src/GUI/AudioDebugSpectrum.ui \
src/GUI/ui/VideoProjectPreferences.ui \
src/GUI/ui/AudioProjectPreferences.ui \
src/GUI/ui/VLMCPreferences.ui
TRANSLATIONS = ts/vlmc_es.ts \
ts/vlmc_fr.ts \
ts/vlmc_sv.ts
......
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