Qt4- SImple Prefs: Subtitles and TextTitles.

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 320d1f089d3e471166ac52dde2963a833336407d..96bbbdef8af1743f2e9e30fc6d00f8b83897d426 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -100,12 +100,25 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
         case SPrefs ## name:        \
         {                           \
             Ui::SPrefs ## name ui;  \
-            ui.setupUi( this );
+            ui.setupUi( panel );
 
 #define END_SPREFS_CAT      \
             break;          \
         }
-
+    QVBoxLayout *panel_layout = new QVBoxLayout();
+    QString head;
+    QWidget *panel = new QWidget();
+// Title Label
+        QLabel *panel_label = new QLabel;
+        QFont labelFont = QApplication::font( static_cast<QWidget*>(0) );
+        labelFont.setPointSize( labelFont.pointSize() + 4 );
+        labelFont.setBold( true );
+        panel_label->setFont( labelFont );
+    
+        // Title <hr>
+        QFrame *title_line = new QFrame;
+        title_line->setFrameShape(QFrame::HLine);
+        title_line->setFrameShadow(QFrame::Sunken);
 
     switch( number )
     {
@@ -165,6 +178,12 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
         START_SPREFS_CAT( Hotkeys );
         END_SPREFS_CAT;
         }
+  panel_layout->addWidget(panel_label);
+       panel_layout->addWidget(title_line);
+       panel_layout->addWidget( panel );
+
+       this->setLayout(panel_layout);
+
 }
 
 void SPrefsPanel::apply()

diff --git a/modules/gui/qt4/dialogs/prefs_dialog.cpp b/modules/gui/qt4/dialogs/prefs_dialog.cpp
index 054e107ee08969fe9de9af4ca87c6139e0b49bfe..ce6ce20f8b519f94fd2b00fb7f824164a1b0949b 100644 (file)
--- a/modules/gui/qt4/dialogs/prefs_dialog.cpp
+++ b/modules/gui/qt4/dialogs/prefs_dialog.cpp
@@ -52,7 +52,6 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
      main_panel_l = new QHBoxLayout;
      main_panel->setLayout( main_panel_l );
 
-
      // Choice for types
      types = new QGroupBox( "Show settings" );
      QHBoxLayout *types_l = new QHBoxLayout(0);
@@ -62,20 +61,6 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
      types->setLayout(types_l);
      small->setChecked( true );
 
-     // Title Label
-     QLabel *panel_label = new QLabel;
-     QFont labelFont = QApplication::font( static_cast<QWidget*>(0) );
-     labelFont.setPointSize( labelFont.pointSize() + 4 ); 
-     labelFont.setBold( true );
-     panel_label->setFont( labelFont );
-
-     // Title <hr>
-     QFrame *title_line = new QFrame;
-     title_line->setFrameShape(QFrame::HLine);
-     title_line->setFrameShadow(QFrame::Sunken);
-
-     QScrollArea *scrollArea = new QScrollArea;
-
      advanced_tree = NULL;
      simple_tree = NULL;
      simple_panel = NULL;
@@ -84,9 +69,7 @@ PrefsDialog::PrefsDialog( intf_thread_t *_p_intf ) : QVLCFrame( _p_intf )
      main_layout->addWidget( tree_panel, 0, 0, 3, 1 );
      main_layout->addWidget( types, 3, 0, 1, 1 );
 
-     main_layout->addWidget( panel_label, 0, 1, 1, 1 );
-     main_layout->addWidget( title_line, 1, 1, 1, 1 );
-     main_layout->addWidget( main_panel, 2, 1, 2, 1 );
+     main_layout->addWidget( main_panel, 0, 1, 4, 1 );
 
      main_layout->setColumnMinimumWidth( 0, 200 );
      main_layout->setColumnStretch( 0, 1 );
@@ -186,6 +169,7 @@ void PrefsDialog::changeSimplePanel( QListWidgetItem *item )
     }
     main_panel_l->addWidget( simple_panel );
     simple_panel->show();
+//    panel_label->setText(qtr("Test"));
 }
 
 void PrefsDialog::changePanel( QTreeWidgetItem *item )

diff --git a/modules/gui/qt4/dialogs/prefs_dialog.hpp b/modules/gui/qt4/dialogs/prefs_dialog.hpp
index cc67f0a2a58ea427de854780dcdd15f290084f84..35a234f03c4567abfab74c9c574a6302d727b8f5 100644 (file)
--- a/modules/gui/qt4/dialogs/prefs_dialog.hpp
+++ b/modules/gui/qt4/dialogs/prefs_dialog.hpp
@@ -41,6 +41,7 @@ class QWidget;
 class QCheckBox;
 class QListWidget;
 class QListWidgetItem;
+class QLabel;
 
 class PrefsDialog : public QVLCFrame
 {
@@ -74,6 +75,8 @@ private:
 
     QGridLayout *main_layout;
 
+//    QLabel *panel_label;
+
     static PrefsDialog *instance;
 private slots:
      void changePanel( QTreeWidgetItem *);

diff --git a/modules/gui/qt4/ui/sprefs_subtitles.ui b/modules/gui/qt4/ui/sprefs_subtitles.ui
index aea9da11502deffc785afa80a9eb3766337a0bca..12703b4f714637300a72a139d39245a44f18c80f 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_subtitles.ui
+++ b/modules/gui/qt4/ui/sprefs_subtitles.ui
@@ -1,28 +1,88 @@
 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>SPrefsSubtitles</class>
  <widget class="QWidget" name="SPrefsSubtitles" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>548</width>
-    <height>306</height>
+    <width>427</width>
+    <height>359</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" >
+  <layout class="QVBoxLayout" >
    <property name="margin" >
     <number>9</number>
    </property>
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="2" column="0" colspan="2" >
+   <item>
+    <widget class="QGroupBox" name="groupBox_3" >
+     <property name="title" >
+      <string>On Scrren Display</string>
+     </property>
+     <layout class="QVBoxLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QCheckBox" name="checkBox" >
+        <property name="text" >
+         <string>Enable OSD</string>
+        </property>
+        <property name="checked" >
+         <bool>true</bool>
+        </property>
+        <property name="tristate" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="title" >
+      <string>Subtitles languages</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label" >
+        <property name="text" >
+         <string>Subtitles preferred language</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QComboBox" name="encoding" />
+      </item>
+      <item row="0" column="1" >
+       <widget class="QLineEdit" name="preferredLanguage" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>Default Encoding</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
       <string>Display Settings</string>
@@ -84,29 +144,8 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="1" >
-    <widget class="QComboBox" name="encoding" />
-   </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="label_2" >
-     <property name="text" >
-      <string>Default Encoding</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
-      <string>Subtitles preferred language</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" >
-    <widget class="QLineEdit" name="preferredLanguage" />
-   </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <resources/>
  <connections/>
 </ui>