Commit efe5dd3e authored by Rohit Yadav's avatar Rohit Yadav

RendererSettings.ui: Fix Names and fps of some presets.

RendererSettings.cpp: Apply Hackings on #includes, hide output label, textedit and button
when export is done to temp. folder and change window title, fix presets fps, make 'fps' double.
parent e2819b71
...@@ -20,18 +20,16 @@ ...@@ -20,18 +20,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#include "RendererSettings.h"
#include "Media.h" #include "Media.h"
#include "RendererSettings.h"
#include "SettingsManager.h" #include "SettingsManager.h"
#include "ui_RendererSettings.h" #include "ui_RendererSettings.h"
#include <QFileDialog>
#include <QMessageBox>
#include <QCompleter> #include <QCompleter>
#include <QDirModel> #include <QDirModel>
#include <QFileDialog>
#include <QFileInfo> #include <QFileInfo>
#include <QMessageBox>
RendererSettings::RendererSettings( bool exportType ) RendererSettings::RendererSettings( bool exportType )
{ {
...@@ -39,9 +37,10 @@ RendererSettings::RendererSettings( bool exportType ) ...@@ -39,9 +37,10 @@ RendererSettings::RendererSettings( bool exportType )
if( exportType ) if( exportType )
{ {
m_ui.outputFileName->setEnabled( false ); m_ui.outputLabel->setVisible( false );
m_ui.outputFileNameButton->setEnabled( false ); m_ui.outputFileName->setVisible( false );
m_ui.outputFileName->setText("Export to Web"); m_ui.outputFileNameButton->setVisible( false );
setWindowTitle( tr("Export Settings: Publish on Internet") );
} }
m_ui.width->setValue( VLMC_PROJECT_GET_INT( "video/VideoProjectWidth" ) ); m_ui.width->setValue( VLMC_PROJECT_GET_INT( "video/VideoProjectWidth" ) );
...@@ -68,7 +67,7 @@ RendererSettings::selectOutputFileName() ...@@ -68,7 +67,7 @@ RendererSettings::selectOutputFileName()
} }
void void
RendererSettings::setPreset( quint32 width, quint32 height, quint32 fps ) RendererSettings::setPreset( quint32 width, quint32 height, double fps )
{ {
m_ui.width->setValue( width ); m_ui.width->setValue( width );
m_ui.height->setValue( height ); m_ui.height->setValue( height );
...@@ -88,10 +87,10 @@ RendererSettings::updateVideoPreset( int index ) ...@@ -88,10 +87,10 @@ RendererSettings::updateVideoPreset( int index )
case VGA: setPreset( 640, 480, 30); break; case VGA: setPreset( 640, 480, 30); break;
case SVGA: setPreset( 800, 600, 30); break; case SVGA: setPreset( 800, 600, 30); break;
case XVGA: setPreset( 1024, 768, 30); break; case XVGA: setPreset( 1024, 768, 30); break;
case P480: setPreset( 720, 480, 30); break; case P480: setPreset( 720, 480, 29.97); break;
case P576: setPreset( 720, 576, 25); break; case P576: setPreset( 720, 576, 25); break;
case P720: setPreset( 1280, 720, 30); break; case P720: setPreset( 1280, 720, 29.97); break;
case P1080: setPreset( 1920, 1080, 30); break; case P1080: setPreset( 1920, 1080, 29.97); break;
case Custom: case Custom:
default: default:
m_ui.width->setEnabled( true ); m_ui.width->setEnabled( true );
......
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Render settings</string> <string>Export Settings</string>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="outputLabel">
<property name="text"> <property name="text">
<string>Output file</string> <string>Output File</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -111,14 +111,14 @@ ...@@ -111,14 +111,14 @@
<item row="5" column="0"> <item row="5" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
<string>Video quality</string> <string>Video Quality</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0"> <item row="6" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>Audio quality</string> <string>Audio Quality</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
<item row="7" column="0"> <item row="7" column="0">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>Video codec</string> <string>Video Codec</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
<item row="8" column="0"> <item row="8" column="0">
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_7">
<property name="text"> <property name="text">
<string>Audio codec</string> <string>Audio Codec</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -247,7 +247,7 @@ ...@@ -247,7 +247,7 @@
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>480p NTSC (720x480) - 30 fps</string> <string>480p NTSC (720x480) - 29.97 fps</string>
</property> </property>
</item> </item>
<item> <item>
...@@ -257,12 +257,12 @@ ...@@ -257,12 +257,12 @@
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>720p (1280x720) - 30 fps</string> <string>720p (1280x720) - 29.97 fps</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>1080p (1920x1080) - 30 fps</string> <string>1080p (1920x1080) - 29.97 fps</string>
</property> </property>
</item> </item>
</widget> </widget>
......
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