Qt: various string fixes and consistencies in the ui

modules/gui/qt4/components/controller.hpp

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _CONTROLLER_H_
-#define _CONTROLLER_H_
+#ifndef QVLC_CONTROLLER_H_
+#define QVLC_CONTROLLER_H_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -33,14 +33,13 @@
 #include <QFrame>
 #include <QString>
 
-#define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a medium")
-
 #define MAIN_TB1_DEFAULT "64;39;64;38;65"
 #define MAIN_TB2_DEFAULT "0-2;64;3;1;4;64;7;10;9;64-4;37;65;35-4"
 #define ADV_TB_DEFAULT "12;11;13;14"
 #define INPT_TB_DEFAULT "5-1;15-1;33;6-1"
 #define FSC_TB_DEFAULT "0-2;64;3;1;4;64;37;64;38;64;8;65;35-4;34"
 
+#define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a medium")
 
 class QPixmap;
 class QLabel;

modules/gui/qt4/components/controller_widget.cpp

@@ -26,6 +26,7 @@
 #endif
 
 #include "controller_widget.hpp"
+#include "controller.hpp"
 
 #include "input_manager.hpp"         /* Get notification of Volume Change */
 #include "util/input_slider.hpp"     /* SoundSlider */

modules/gui/qt4/components/controller_widget.hpp

@@ -34,8 +34,6 @@
 #include <QFrame>
 #include <QToolButton>
 
-#define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a media")
-
 class QLabel;
 class QSpinBox;
 class QAbstractSlider;

modules/gui/qt4/components/open_panels.cpp

@@ -996,8 +996,8 @@ void CaptureOpenPanel::initialize()
      * Screen *
      **********/
     addModuleAndLayouts( SCREEN_DEVICE, screen, "Desktop" );
-    QLabel *screenLabel = new QLabel( "This option will open your own "
-            "desktop in order to save or stream it.");
+    QLabel *screenLabel = new QLabel( "Your display will will be "
+            "opened and played in order to stream or save it." );
     screenLabel->setWordWrap( true );
     screenDevLayout->addWidget( screenLabel, 0, 0 );
 

modules/gui/qt4/dialogs/convert.cpp

@@ -54,7 +54,7 @@ ConvertDialog::ConvertDialog( QWidget *parent, intf_thread_t *_p_intf,
     QGroupBox *destBox = new QGroupBox( qtr( "Destination" ) );
     QGridLayout *destLayout = new QGridLayout( destBox );
 
-    QLabel *destLabel = new QLabel( qtr( "Target file:" ) );
+    QLabel *destLabel = new QLabel( qtr( "Destination file:" ) );
     destLayout->addWidget( destLabel, 0, 0);
 
     fileLine = new QLineEdit;

modules/gui/qt4/menus.cpp

@@ -305,7 +305,7 @@ QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent )
         ":/folder-grey", SLOT( PLOpenDir() ), "Ctrl+F" );
     addDPStaticEntry( menu, qtr( "Open &Disc..." ),
         ":/disc", SLOT( openDiscDialog() ), "Ctrl+D" );
-    addDPStaticEntry( menu, qtr( "Open &Network..." ),
+    addDPStaticEntry( menu, qtr( "Open &Network Stream..." ),
         ":/network", SLOT( openNetDialog() ), "Ctrl+N" );
     addDPStaticEntry( menu, qtr( "Open &Capture Device..." ),
         ":/capture-card", SLOT( openCaptureDialog() ),

modules/gui/qt4/ui/open_capture.ui

-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <author>Jean-Baptiste Kempf</author>
  <class>OpenCapture</class>
- <widget class="QWidget" name="OpenCapture" >
-  <property name="geometry" >
+ <widget class="QWidget" name="OpenCapture">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -10,57 +11,57 @@
     <height>134</height>
    </rect>
   </property>
-  <layout class="QGridLayout" >
-   <item row="0" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
-      <string>_("Capture mode")</string>
+  <layout class="QGridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>_(&quot;Capture mode&quot;)</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="2" colspan="2" >
-    <widget class="QComboBox" name="deviceCombo" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+   <item row="0" column="2" colspan="2">
+    <widget class="QComboBox" name="deviceCombo">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="toolTip" >
-      <string>_("Select the capture device type")</string>
+     <property name="toolTip">
+      <string>_(&quot;Select the capture device type&quot;)</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="4" >
-    <widget class="Line" name="line" >
-     <property name="orientation" >
+   <item row="1" column="0" colspan="4">
+    <widget class="Line" name="line">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
     </widget>
    </item>
-   <item row="2" column="0" colspan="4" >
-    <widget class="QGroupBox" name="cardBox" >
-     <property name="title" >
-      <string>_("Card Selection")</string>
+   <item row="2" column="0" colspan="4">
+    <widget class="QGroupBox" name="cardBox">
+     <property name="title">
+      <string>_(&quot;Device Selection&quot;)</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="4" >
-    <widget class="QGroupBox" name="optionsBox" >
-     <property name="title" >
-      <string>_("Options")</string>
+   <item row="3" column="0" colspan="4">
+    <widget class="QGroupBox" name="optionsBox">
+     <property name="title">
+      <string>_(&quot;Options&quot;)</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="0" colspan="4" >
+   <item row="5" column="0" colspan="4">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::MinimumExpanding</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>0</height>
@@ -68,13 +69,13 @@
      </property>
     </spacer>
    </item>
-   <item row="4" column="3" >
-    <widget class="QPushButton" name="advancedButton" >
-     <property name="toolTip" >
-      <string>_("Access advanced options to tweak the device")</string>
+   <item row="4" column="3">
+    <widget class="QPushButton" name="advancedButton">
+     <property name="toolTip">
+      <string>_(&quot;Access advanced options to tweak the device&quot;)</string>
      </property>
-     <property name="text" >
-      <string>_("Advanced options...")</string>
+     <property name="text">
+      <string>_(&quot;Advanced options...&quot;)</string>
      </property>
     </widget>
    </item>