[vlc-commits] Qt: open BRD

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Nov 10 01:14:50 2011 +0100| [fecd2c3750d1c28790a3b0d9de410ced2f88bda4] | committer: Jean-Baptiste Kempf

Qt: open BRD

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

 modules/gui/qt4/components/open_panels.cpp |   15 ++++++++
 modules/gui/qt4/components/open_panels.hpp |    3 +-
 modules/gui/qt4/ui/open_disk.ui            |   49 ++++++++++++++++------------
 3 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp
index 40ca3b0..cf9ebd1 100644
--- a/modules/gui/qt4/components/open_panels.cpp
+++ b/modules/gui/qt4/components/open_panels.cpp
@@ -436,6 +436,19 @@ void DiscOpenPanel::updateButtons()
         ui.diskOptionBox_2->show();
         ui.dvdsimple->setEnabled( true );
     }
+    if ( ui.bdRadioButton->isChecked() )
+    {
+        if( m_discType != BRD )
+        {
+            setDrive( psz_dvddiscpath );
+            m_discType = BRD;
+        }
+        ui.titleLabel->setText( qtr("Title") );
+        ui.chapterLabel->hide();
+        ui.chapterSpin->hide();
+        ui.diskOptionBox_2->hide();
+        ui.dvdsimple->setEnabled( true );
+    }
     else if ( ui.vcdRadioButton->isChecked() )
     {
         if( m_discType != Vcd )
@@ -500,6 +513,8 @@ void DiscOpenPanel::updateMRL()
                 mrl+= QString(":%1").arg( ui.chapterSpin->value() );
             }
         }
+    } else if ( ui.bdRadioButton->isChecked() ) {
+        mrl = "bluray://" LOCALHOST + discPath;
 
     /* VCD */
     } else if ( ui.vcdRadioButton->isChecked() ) {
diff --git a/modules/gui/qt4/components/open_panels.hpp b/modules/gui/qt4/components/open_panels.hpp
index 6d26855..a49f5ee 100644
--- a/modules/gui/qt4/components/open_panels.hpp
+++ b/modules/gui/qt4/components/open_panels.hpp
@@ -166,7 +166,8 @@ class DiscOpenPanel: public OpenPanel
         None,
         Dvd,
         Vcd,
-        Cdda
+        Cdda,
+        BRD
     };
 public:
     DiscOpenPanel( QWidget *, intf_thread_t * );
diff --git a/modules/gui/qt4/ui/open_disk.ui b/modules/gui/qt4/ui/open_disk.ui
index 57cb40a..2f00dc5 100644
--- a/modules/gui/qt4/ui/open_disk.ui
+++ b/modules/gui/qt4/ui/open_disk.ui
@@ -33,19 +33,6 @@
       <string>Disc Selection</string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <spacer>
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>16</width>
-          <height>25</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
       <item row="0" column="1">
        <widget class="QRadioButton" name="dvdRadioButton">
         <property name="layoutDirection">
@@ -73,13 +60,20 @@
        </spacer>
       </item>
       <item row="0" column="3">
+       <widget class="QRadioButton" name="bdRadioButton">
+        <property name="text">
+         <string>BluRay</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="5">
        <widget class="QRadioButton" name="audioCDRadioButton">
         <property name="text">
          <string>Audio CD</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="4">
+      <item row="0" column="6">
        <spacer>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -92,14 +86,14 @@
         </property>
        </spacer>
       </item>
-      <item row="0" column="5">
+      <item row="0" column="7">
        <widget class="QRadioButton" name="vcdRadioButton">
         <property name="text">
          <string>SVCD/VCD</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="6">
+      <item row="0" column="8">
        <spacer>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -112,24 +106,24 @@
         </property>
        </spacer>
       </item>
-      <item row="1" column="1" colspan="3">
+      <item row="1" column="1" colspan="4">
        <widget class="QCheckBox" name="dvdsimple">
         <property name="toolTip">
-         <string>Disable DVD Menus (for compatibility)</string>
+         <string>Disable Disc Menus</string>
         </property>
         <property name="text">
-         <string>No DVD menus</string>
+         <string>No disc menus</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="2" colspan="5">
+      <item row="2" column="3" colspan="6">
        <widget class="Line" name="line">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
-      <item row="3" column="0" colspan="7">
+      <item row="3" column="0" colspan="9">
        <layout class="QHBoxLayout" name="horizontalLayout_5">
         <item>
          <widget class="QLabel" name="deviceLabel">
@@ -179,6 +173,19 @@
         </item>
        </layout>
       </item>
+      <item row="0" column="4">
+       <spacer>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>16</width>
+          <height>25</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>