Commit 190e7875 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

[Qt] remove trailing spaces, set a default filter and add a LONGTEXT

parent 6b468738
......@@ -38,7 +38,6 @@
#include <QToolButton>
#include <QButtonGroup>
#include <QVBoxLayout>
#include <QSettings>
#include <QtAlgorithms>
......
......@@ -651,7 +651,7 @@ void DialogsProvider::loadSubtitlesFile()
**/
void DialogsProvider::playMRL( const QString &mrl )
{
input_item_t *p_input = input_item_New( p_intf,
input_item_t *p_input = input_item_New( p_intf,
qtu( mrl ), NULL );
playlist_AddInput( THEPL, p_input, PLAYLIST_GO,
PLAYLIST_END, true, pl_Unlocked );
......
......@@ -153,7 +153,7 @@ void InputManager::addCallbacks()
var_AddCallback( p_input, "state", ItemStateChanged, this );
/* src/input/es-out.c:552 */
var_AddCallback( p_input, "spu-es", ChangeSPU, this );
/* emit UpdateStatus so that main_interface updates controls
/* emit UpdateStatus so that main_interface updates controls
* if there is new videotracks (mpeg-ts)*/
var_AddCallback( p_input, "video-es", ItemStateChanged, this );
/* src/input/es-out.c: */
......
......@@ -133,12 +133,13 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
* Menu Bar and Status Bar
**************************/
QVLCMenu::createMenuBar( this, p_intf, visualSelectorEnabled );
/* StatusBar Creation */
createStatusBar();
/* Recents menu updates */
CONNECT( RecentsMRL::getInstance( p_intf ), updated(), this, updateRecentsMenu() );
CONNECT( RecentsMRL::getInstance( p_intf ), updated(),
this, updateRecentsMenu() );
/********************
* Input Manager *
......
......@@ -117,7 +117,7 @@ private:
static int CreateChoicesMenu( QMenu *,const char *, vlc_object_t *, bool );
static QMenu *recentsMenu;
public slots:
static void updateRecents( intf_thread_t * );
static void updateRecents( intf_thread_t * );
};
class MenuFunc : public QObject
......
......@@ -125,7 +125,10 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * );
#define PRIVACY_TEXT N_( "Ask for network policy at start" )
#define RECENTPLAY_TEXT N_( "Save the recently played items in the menu" )
#define RECENTPLAY_FILTER_TEXT N_( "List of words separated by | to filter" )
#define RECENTPLAY_FILTER_LONGTEXT N_( "Regular expression used to filter " \
"the recent items played in the player" )
#define SLIDERCOL_TEXT N_( "Define the colors of the volume slider " )
#define SLIDERCOL_LONGTEXT N_( "Define the colors of the volume slider\n" \
......@@ -195,6 +198,11 @@ vlc_module_begin();
change_autosave();
change_internal();
add_bool( "qt-recentplay", true, NULL, RECENTPLAY_TEXT,
RECENTPLAY_TEXT, false );
add_string( "qt-recentplay-filter", "xxx|porn", NULL,
RECENTPLAY_FILTER_TEXT, RECENTPLAY_FILTER_LONGTEXT, false );
add_bool( "qt-adv-options", false, NULL, ADVANCED_OPTIONS_TEXT,
ADVANCED_OPTIONS_LONGTEXT, true );
add_bool( "qt-advanced-pref", false, NULL, ADVANCED_PREFS_TEXT,
......@@ -213,10 +221,6 @@ vlc_module_begin();
add_bool( "qt-privacy-ask", true, NULL, PRIVACY_TEXT, PRIVACY_TEXT,
false );
add_bool( "qt-recentplay", true, NULL, RECENTPLAY_TEXT,
RECENTPLAY_TEXT, false );
add_string( "qt-recentplay-filter", NULL, NULL,
RECENTPLAY_FILTER_TEXT, RECENTPLAY_FILTER_TEXT, false );
change_internal();
set_callbacks( OpenDialogs, Close );
......
......@@ -37,7 +37,7 @@ RecentsMRL::RecentsMRL( intf_thread_t *_p_intf ) : p_intf( _p_intf )
{
stack = new QList<QString>;
signalMapper = new QSignalMapper(this);
isActive = config_GetInt( p_intf, "qt-recentplay" );
filter = new QRegExp(
qfu( config_GetPsz( p_intf, "qt-recentplay-filter" ) ),
......@@ -57,7 +57,7 @@ void RecentsMRL::addRecent( const QString &mrl )
{
if ( !isActive || filter->indexIn( mrl ) >= 0 )
return;
if( stack->contains( mrl ) )
{
stack->removeOne( mrl );
......@@ -90,7 +90,7 @@ QList<QString> RecentsMRL::recents()
void RecentsMRL::load()
{
QStringList list;
getSettings()->beginGroup( "RecentsMRL" );
list = getSettings()->value( "list" ).toStringList();
getSettings()->endGroup();
......
......@@ -56,7 +56,7 @@ public:
virtual ~RecentsMRL();
void addRecent( const QString & );
QList<QString> recents();
QList<QString> recents();
QSignalMapper *signalMapper;
private:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment