Commit 76a32e9f authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4 - add an option to close #1444

parent 6cf8fa76
......@@ -70,11 +70,14 @@ FileOpenPanel::FileOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
// Make this QFileDialog a child of tempWidget from the ui.
dialogBox = new FileOpenBox( ui.tempWidget, NULL,
qfu( EMPTY_STR( psz_filepath ) ? psz_filepath : p_intf->p_libvlc->psz_homedir ), fileTypes );
qfu( EMPTY_STR( psz_filepath ) ?
psz_filepath : p_intf->p_libvlc->psz_homedir ), fileTypes );
delete psz_filepath;
dialogBox->setFileMode( QFileDialog::ExistingFiles );
dialogBox->setAcceptMode( QFileDialog::AcceptOpen );
dialogBox->setViewMode( config_GetInt( p_intf, "qt-open-detail" ) ?
QFileDialog::Detail : QFileDialog::List );
/* We don't want to see a grip in the middle of the window, do we? */
dialogBox->setSizeGripEnabled( false );
......
......@@ -194,7 +194,8 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
bool b_systrayAvailable = QSystemTrayIcon::isSystemTrayAvailable();
if( config_GetInt( p_intf, "qt-start-minimized") )
{
if( b_systrayAvailable ){
if( b_systrayAvailable )
{
b_createSystray = true;
hide(); //FIXME BUG HERE
}
......@@ -442,7 +443,7 @@ inline void MainInterface::privacy()
/**
* Ask for the network policy on FIRST STARTUP
**/
if( config_GetInt( p_intf, "privacy-ask") )
if( config_GetInt( p_intf, "qt-privacy-ask") )
{
QList<ConfigControl *> controls;
if( privacyDialog( controls ) == QDialog::Accepted )
......@@ -454,7 +455,7 @@ inline void MainInterface::privacy()
c->doApply( p_intf );
}
config_PutInt( p_intf, "privacy-ask" , 0 );
config_PutInt( p_intf, "qt-privacy-ask" , 0 );
config_SaveConfigFile( p_intf, NULL );
}
}
......
......@@ -118,6 +118,8 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * );
#define PRIVACY_TEXT N_( "Ask for network policy at start" )
#define VIEWDETAIL_TEXT N_( "Show the opening dialog view in detail mode" )
vlc_module_begin();
set_shortname( (char *)"Qt" );
set_description( (char*)_("Qt interface") );
......@@ -177,8 +179,13 @@ vlc_module_begin();
SHOWFLAGS_LONGTEXT, VLC_TRUE );
change_autosave();
add_bool( "privacy-ask", VLC_TRUE, NULL, PRIVACY_TEXT, PRIVACY_TEXT,
add_bool( "qt-open-detail", VLC_FALSE, NULL, VIEWDETAIL_TEXT,
VIEWDETAIL_TEXT, VLC_FALSE );
add_bool( "qt-privacy-ask", VLC_TRUE, NULL, PRIVACY_TEXT, PRIVACY_TEXT,
VLC_FALSE );
set_callbacks( OpenDialogs, Close );
vlc_module_end();
......@@ -269,7 +276,7 @@ static void Init( intf_thread_t *p_intf )
* see commits 21610 21622 21654 for reference */
/* If you are under KDE, Xfce or e17, you should comment this line */
QApplication::setDesktopSettingsAware( false );
// QApplication::setDesktopSettingsAware( false );
#endif
/* Start the QApplication here */
......
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