[vlmc-devel] commit: RendererSettings.ui: Fix Names and fps of some presets. ( Rohit Yadav )

[git at videolan.org]

vlmc | branch: master | Rohit Yadav <rohityadav89 at gmail.com> | Fri Sep 24 20:26:00 2010 +0530| [efe5dd3ecf895c39edc6ad12a794961b25643ff3] | committer: 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.

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=efe5dd3ecf895c39edc6ad12a794961b25643ff3
---

 src/Gui/export/RendererSettings.cpp |   23 +++++++++++------------
 src/Gui/export/RendererSettings.ui  |   20 ++++++++++----------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/Gui/export/RendererSettings.cpp b/src/Gui/export/RendererSettings.cpp
index ee68f68..cd554c9 100644
--- a/src/Gui/export/RendererSettings.cpp
+++ b/src/Gui/export/RendererSettings.cpp
@@ -20,18 +20,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "RendererSettings.h"
-
 #include "Media.h"
+#include "RendererSettings.h"
 #include "SettingsManager.h"
-
 #include "ui_RendererSettings.h"
 
-#include <QFileDialog>
-#include <QMessageBox>
 #include <QCompleter>
 #include <QDirModel>
+#include <QFileDialog>
 #include <QFileInfo>
+#include <QMessageBox>
 
 RendererSettings::RendererSettings( bool exportType )
 {
@@ -39,9 +37,10 @@ RendererSettings::RendererSettings( bool exportType )
 
     if( exportType )
     {
-        m_ui.outputFileName->setEnabled( false );
-        m_ui.outputFileNameButton->setEnabled( false );
-        m_ui.outputFileName->setText("Export to Web");
+        m_ui.outputLabel->setVisible( false );
+        m_ui.outputFileName->setVisible( false );
+        m_ui.outputFileNameButton->setVisible( false );
+        setWindowTitle( tr("Export Settings: Publish on Internet") );
     }
 
     m_ui.width->setValue( VLMC_PROJECT_GET_INT( "video/VideoProjectWidth" ) );
@@ -68,7 +67,7 @@ RendererSettings::selectOutputFileName()
 }
 
 void
-RendererSettings::setPreset( quint32 width, quint32 height, quint32 fps )
+RendererSettings::setPreset( quint32 width, quint32 height, double fps )
 {
     m_ui.width->setValue( width );
     m_ui.height->setValue( height );
@@ -88,10 +87,10 @@ RendererSettings::updateVideoPreset( int index )
         case VGA:   setPreset( 640, 480, 30);   break;
         case SVGA:  setPreset( 800, 600, 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 P720:  setPreset( 1280, 720, 30);  break;
-        case P1080: setPreset( 1920, 1080, 30); break;
+        case P720:  setPreset( 1280, 720, 29.97);  break;
+        case P1080: setPreset( 1920, 1080, 29.97); break;
         case Custom:
         default:
              m_ui.width->setEnabled( true );
diff --git a/src/Gui/export/RendererSettings.ui b/src/Gui/export/RendererSettings.ui
index 8ecd3c7..dcfaa08 100644
--- a/src/Gui/export/RendererSettings.ui
+++ b/src/Gui/export/RendererSettings.ui
@@ -11,13 +11,13 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Render settings</string>
+   <string>Export Settings</string>
   </property>
   <layout class="QFormLayout" name="formLayout">
    <item row="0" column="0">
-    <widget class="QLabel" name="label_8">
+    <widget class="QLabel" name="outputLabel">
      <property name="text">
-      <string>Output file</string>
+      <string>Output File</string>
      </property>
     </widget>
    </item>
@@ -111,14 +111,14 @@
    <item row="5" column="0">
     <widget class="QLabel" name="label_4">
      <property name="text">
-      <string>Video quality</string>
+      <string>Video Quality</string>
      </property>
     </widget>
    </item>
    <item row="6" column="0">
     <widget class="QLabel" name="label_5">
      <property name="text">
-      <string>Audio quality</string>
+      <string>Audio Quality</string>
      </property>
     </widget>
    </item>
@@ -141,7 +141,7 @@
    <item row="7" column="0">
     <widget class="QLabel" name="label_6">
      <property name="text">
-      <string>Video codec</string>
+      <string>Video Codec</string>
      </property>
     </widget>
    </item>
@@ -160,7 +160,7 @@
    <item row="8" column="0">
     <widget class="QLabel" name="label_7">
      <property name="text">
-      <string>Audio codec</string>
+      <string>Audio Codec</string>
      </property>
     </widget>
    </item>
@@ -247,7 +247,7 @@
      </item>
      <item>
       <property name="text">
-       <string>480p NTSC (720x480) - 30 fps</string>
+       <string>480p NTSC (720x480) - 29.97 fps</string>
       </property>
      </item>
      <item>
@@ -257,12 +257,12 @@
      </item>
      <item>
       <property name="text">
-       <string>720p (1280x720) - 30 fps</string>
+       <string>720p (1280x720) - 29.97 fps</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>1080p (1920x1080) - 30 fps</string>
+       <string>1080p (1920x1080) - 29.97 fps</string>
       </property>
      </item>
     </widget>