From: Jean-Baptiste Kempf Date: Sun, 15 Mar 2009 01:19:34 +0000 (+0100) Subject: Qt: various string fixes and consistencies in the ui X-Git-Tag: 1.0.0-pre1~93 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=5bdf4e1895617c0f086a3fc1001a5f28a0fc8911;p=vlc Qt: various string fixes and consistencies in the ui --- diff --git a/modules/gui/qt4/components/controller.hpp b/modules/gui/qt4/components/controller.hpp index 38919f2258..a8c145c0ec 100644 --- a/modules/gui/qt4/components/controller.hpp +++ b/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 #include -#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; diff --git a/modules/gui/qt4/components/controller_widget.cpp b/modules/gui/qt4/components/controller_widget.cpp index 1b907ffadf..26fdcfc6af 100644 --- a/modules/gui/qt4/components/controller_widget.cpp +++ b/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 */ diff --git a/modules/gui/qt4/components/controller_widget.hpp b/modules/gui/qt4/components/controller_widget.hpp index 22a3b43826..b43c1aeb33 100644 --- a/modules/gui/qt4/components/controller_widget.hpp +++ b/modules/gui/qt4/components/controller_widget.hpp @@ -34,8 +34,6 @@ #include #include -#define I_PLAY_TOOLTIP N_("Play\nIf the playlist is empty, open a media") - class QLabel; class QSpinBox; class QAbstractSlider; diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp index 6cb6ded810..4c2fcd3a5b 100644 --- a/modules/gui/qt4/components/open_panels.cpp +++ b/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 ); diff --git a/modules/gui/qt4/dialogs/convert.cpp b/modules/gui/qt4/dialogs/convert.cpp index 5a989ffddb..4ba8894ba1 100644 --- a/modules/gui/qt4/dialogs/convert.cpp +++ b/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; diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp index c8b57b02ee..5e37beffea 100644 --- a/modules/gui/qt4/menus.cpp +++ b/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() ), diff --git a/modules/gui/qt4/ui/open_capture.ui b/modules/gui/qt4/ui/open_capture.ui index a8a0a37268..722a46347c 100644 --- a/modules/gui/qt4/ui/open_capture.ui +++ b/modules/gui/qt4/ui/open_capture.ui @@ -1,8 +1,9 @@ - + + Jean-Baptiste Kempf OpenCapture - - + + 0 0 @@ -10,57 +11,57 @@ 134 - - - - - _("Capture mode") + + + + + _("Capture mode") - - - - + + + + 0 0 - - _("Select the capture device type") + + _("Select the capture device type") - - - + + + Qt::Horizontal - - - - _("Card Selection") + + + + _("Device Selection") - - - - _("Options") + + + + _("Options") - + - + Qt::Vertical - + QSizePolicy::MinimumExpanding - + 20 0 @@ -68,13 +69,13 @@ - - - - _("Access advanced options to tweak the device") + + + + _("Access advanced options to tweak the device") - - _("Advanced options...") + + _("Advanced options...") diff --git a/modules/gui/qt4/ui/open_disk.ui b/modules/gui/qt4/ui/open_disk.ui index ac42eaf622..864748115d 100644 --- a/modules/gui/qt4/ui/open_disk.ui +++ b/modules/gui/qt4/ui/open_disk.ui @@ -1,8 +1,9 @@ - + + Jean-Baptiste Kempf OpenDisk - - + + 0 0 @@ -10,34 +11,34 @@ 319 - + 500 0 - + Form - + - - - + + + 0 0 - - _("Disc Type Selection") + + _("Disc Selection") - - + + - + Qt::Horizontal - + 16 25 @@ -45,25 +46,25 @@ - - - + + + Qt::LeftToRight - + DVD - + true - + - + Qt::Horizontal - + 20 20 @@ -71,19 +72,19 @@ - - - - _("Audio CD") + + + + _("Audio CD") - + - + Qt::Horizontal - + 20 20 @@ -91,19 +92,19 @@ - - - + + + SVCD/VCD - + - + Qt::Horizontal - + 31 25 @@ -111,52 +112,52 @@ - - - - _("Disable DVD Menus (for compatibility)") + + + + _("Disable DVD Menus (for compatibility)") - - _("No DVD menus") + + _("No DVD menus") - - - + + + Qt::Horizontal - - + + - - - _("Disc device") + + + _("Disc device") - + deviceCombo - - - + + + 0 0 - + true - - - + + + 0 0 @@ -164,15 +165,15 @@ - - - + + + 0 0 - - _("Browse...") + + _("Browse...") @@ -182,49 +183,49 @@ - - - _("Starting Position") + + + _("Starting Position") - + - - - _("Title") + + + _("Title") - + titleSpin - - - + + + 0 0 - + false - + Qt::AlignRight - + 0 - - + + Qt::Horizontal - + QSizePolicy::Fixed - + 20 20 @@ -233,24 +234,24 @@ - - - _("Chapter") + + + _("Chapter") - + chapterSpin - - - + + + 0 0 - + Qt::AlignRight @@ -259,58 +260,52 @@ - - - _("Audio and Subtitles") + + + _("Audio and Subtitles") - - - - - _("Subtitles track") + + + + + _("Audio track") - - subtitlesSpin + + audioSpin - - - - + + + + 0 0 - - false - - + Qt::AlignRight - - - - + -1 - - 31 + + 10 - + -1 - - - + + + Qt::Horizontal - + QSizePolicy::Fixed - + 20 20 @@ -318,34 +313,40 @@ - - - - _("Audio track") + + + + _("Subtitles track") - - audioSpin + + subtitlesSpin - - - - + + + + 0 0 - + + false + + Qt::AlignRight - + + + + -1 - - 10 + + 31 - + -1 @@ -355,13 +356,13 @@ - + Qt::Vertical - + QSizePolicy::MinimumExpanding - + 181 0