#include <QDate>
#include "qt4.hpp"
-#include <vlc_os_specific.h>
#include "dialogs_provider.hpp"
#include "input_manager.hpp"
#include "main_interface.hpp"
"can distort the audio, since it uses " \
"software amplification." )
+#define SAVEVOL_TEXT N_( "Automatically save the volume on exit" )
+
#define BLING_TEXT N_( "Use non native buttons and volume slider" )
#define PRIVACY_TEXT N_( "Ask for network policy at start" )
add_bool( "qt-volume-complete", VLC_FALSE, NULL, COMPLETEVOL_TEXT,
COMPLETEVOL_LONGTEXT, VLC_TRUE );
+ add_bool( "qt-autosave-volume", VLC_FALSE, NULL, SAVEVOL_TEXT,
+ SAVEVOL_TEXT, VLC_TRUE );
add_string( "qt-filedialog-path", NULL, NULL, FILEDIALOG_PATH_TEXT,
FILEDIALOG_PATH_TEXT, VLC_TRUE );
change_autosave();
p_intf->b_dead = VLC_TRUE;
vlc_mutex_unlock( &p_intf->object_lock );
- if( p_intf->pf_show_dialog )
+ if( p_intf->p_sys->b_isDialogProvider )
{
+ DialogEvent *event = new DialogEvent( INTF_DIALOG_EXIT, 0, NULL );
+ QApplication::postEvent( THEDP, static_cast<QEvent*>(event) );
+
vlc_thread_join( p_intf );
}
* see commits 21610 21622 21654 for reference */
/* If you don't have a gconftool-2 binary, you should comment this line */
-// QApplication::setDesktopSettingsAware( false );
+ if( strcmp( qVersion(), "4.4.0" ) < 0 ) /* fixed in Qt 4.4.0 */
+ QApplication::setDesktopSettingsAware( false );
#endif
/* Start the QApplication here */
p_intf->p_sys->p_mi = p_mi;
/* We don't show it because it is done in the MainInterface constructor
p_mi->show(); */
+ p_intf->p_sys->b_isDialogProvider = false;
}
else
{
vlc_thread_ready( p_intf );
+ p_intf->p_sys->b_isDialogProvider = true;
}
#if !defined( WIN32 )
QString path = QString( QT4LOCALEDIR );
#else
- QString path = QString( QString(system_VLCPath()) + DIR_SEP +
+ QString path = QString( QString(config_GetDataDir()) + DIR_SEP +
"locale" + DIR_SEP );
#endif
// files depending on locale
/* Start playing if needed */
if( !p_intf->pf_show_dialog && p_intf->b_play )
{
- playlist_Control( THEPL, PLAYLIST_AUTOPLAY, VLC_FALSE );
+ playlist_Control( THEPL, PLAYLIST_PLAY, VLC_FALSE );
}
/* Explain to the core how to show a dialog :D */
- //p_intf->pf_show_dialog = ShowDialog;
+ p_intf->pf_show_dialog = ShowDialog;
/* Last settings */
app->setQuitOnLastWindowClosed( false );
{
int interval = config_GetInt( p_intf, "qt-updates-days" );
QSettings settings( "vlc", "vlc-qt-interface" );
- if( QDate::currentDate() > settings.value( "updatedate" ).toDate().addDays( interval ) )
+ if( QDate::currentDate() >
+ settings.value( "updatedate" ).toDate().addDays( interval ) )
{
msg_Dbg( p_intf, "Someone said I need to check updates" );
/* The constructor of the update Dialog will do the 1st request */
/* Destroy first the main interface because it is connected to some slots
in the MainInputManager */
- if( p_intf->p_sys->p_mi ) delete p_intf->p_sys->p_mi;
+ delete p_intf->p_sys->p_mi;
/* Destroy then other windows, because some are connected to some slots
in the MainInputManager */
config_PutPsz( p_intf, "qt-filedialog-path", p_intf->p_sys->psz_filepath );
free( psz_path );
-
}
/*****************************************************************************