*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#include <QApplication>
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define ADVANCED_PREFS_TEXT N_("Show advanced prefs over simple")
-#define ADVANCED_PREFS_LONGTEXT N_("Show advanced preferences and not simple" \
+#define ALWAYS_VIDEO_TEXT N_("Always show video area")
+#define ALWAYS_VIDEO_LONGTEXT N_("Start VLC with a cone image, and display it" \
+ " when there is no video track." )
+
+#define ADVANCED_PREFS_TEXT N_("Show advanced prefs over simple ones")
+#define ADVANCED_PREFS_LONGTEXT N_("Show advanced preferences and not simple " \
"preferences when opening the preferences " \
"dialog.")
-#define SYSTRAY_TEXT N_("Show a systray icon to control")
-#define SYSTRAY_LONGTEXT N_("Show in the taskbar, a systray icon" \
- "in order to control VLC for basic actions")
+#define SYSTRAY_TEXT N_("Systray icon")
+#define SYSTRAY_LONGTEXT N_("Show an icon in the systray " \
+ "allowing you to control VLC media player " \
+ "for basic actions")
+
+#define MINIMIZED_TEXT N_("Start VLC with only a systray icon")
+#define MINIMIZED_LONGTEXT N_("When you launch VLC with that option, " \
+ "VLC will start with just an icon in" \
+ "your taskbar")
+
+#define TITLE_TEXT N_("Show playing item name in window title")
+#define TITLE_LONGTEXT N_("Show the name of the song or video in the " \
+ "controler window title")
+
+#define FILEDIALOG_PATH_TEXT N_("Path to use in file dialog")
+
+#define NOTIFICATION_TEXT N_("Show notification popup on track change")
+#define NOTIFICATION_LONGTEXT N_( \
+ "Show a notification popup with the artist and track name when " \
+ "the current playlist item changes, when VLC is minimized or hidden." )
+
+#define ADVANCED_OPTIONS_TEXT N_("Advanced options")
+#define ADVANCED_OPTIONS_LONGTEXT N_("Show all the advanced options " \
+ "in the dialogs")
+
+#define OPACITY_TEXT N_("Windows opacity between 0.1 and 1.")
+#define OPACITY_LONGTEXT N_("Sets the windows opacity between 0.1 and 1 " \
+ "for main interface, playlist and extended panel." \
+ " This option only works with Windows and " \
+ "X11 with composite extensions.")
+
+#define SHOWFLAGS_TEXT N_("Define what columns to show in playlist window")
+#define SHOWFLAGS_LONGTEXT N_("Enter the sum of the options that you want: \n" \
+ "Title: 1; Duration: 2; Artist: 4; Genre: 8; " \
+ "Copyright: 16; Collection/album: 32; Rating: 256." )
+
+#define ERROR_TEXT N_("Show unimportant error and warnings dialogs" )
+#define MINIMAL_TEXT N_("Start in minimal view (menus hidden)." )
vlc_module_begin();
set_shortname( (char *)"Qt" );
add_submodule();
set_description( "Dialogs provider" );
set_capability( "dialogs provider", 51 );
- add_bool( "qt-always-video", VLC_FALSE, NULL, "FIXME", "FIXME",
- VLC_TRUE );
- add_bool( "qt-advanced-pref", VLC_FALSE, NULL, ADVANCED_PREFS_TEXT,
- ADVANCED_PREFS_LONGTEXT, VLC_FALSE );
+
+ add_bool( "qt-always-video", VLC_FALSE, NULL, ALWAYS_VIDEO_TEXT,
+ ALWAYS_VIDEO_LONGTEXT, VLC_TRUE );
add_bool( "qt-system-tray", VLC_TRUE, NULL, SYSTRAY_TEXT,
SYSTRAY_LONGTEXT, VLC_FALSE);
+ add_bool( "qt-start-minimized", VLC_FALSE, NULL, MINIMIZED_TEXT,
+ MINIMIZED_LONGTEXT, VLC_TRUE);
+ add_bool( "qt-minimal-view", VLC_FALSE, NULL, MINIMAL_TEXT,
+ MINIMAL_TEXT, VLC_TRUE );
+
+ add_bool( "qt-name-in-title", VLC_TRUE, NULL, TITLE_TEXT,
+ TITLE_LONGTEXT, VLC_FALSE );
+ add_string( "qt-filedialog-path", NULL, NULL, FILEDIALOG_PATH_TEXT,
+ FILEDIALOG_PATH_TEXT, VLC_TRUE);
+ change_autosave();
+ change_internal();
+
+ add_bool( "qt-notification", VLC_TRUE, NULL, NOTIFICATION_TEXT,
+ NOTIFICATION_LONGTEXT, VLC_FALSE );
+ add_float_with_range( "qt-opacity", 1., 0.1, 1., NULL, OPACITY_TEXT,
+ OPACITY_LONGTEXT, VLC_FALSE );
+
+ add_bool( "qt-adv-options", VLC_FALSE, NULL, ADVANCED_OPTIONS_TEXT,
+ ADVANCED_OPTIONS_LONGTEXT, VLC_TRUE );
+ add_bool( "qt-advanced-pref", VLC_FALSE, NULL, ADVANCED_PREFS_TEXT,
+ ADVANCED_PREFS_LONGTEXT, VLC_FALSE );
+ add_bool( "qt-error-dialogs", VLC_TRUE, NULL, ERROR_TEXT,
+ ERROR_TEXT, VLC_FALSE );
+
+ add_integer( "qt-pl-showflags",
+ VLC_META_ENGINE_ARTIST|VLC_META_ENGINE_TITLE|
+ VLC_META_ENGINE_DURATION|VLC_META_ENGINE_COLLECTION,
+ NULL, SHOWFLAGS_TEXT,
+ SHOWFLAGS_LONGTEXT, VLC_TRUE );
set_callbacks( OpenDialogs, Close );
vlc_module_end();
static int OpenDialogs( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t *)p_this;
- Open( p_this );
+ int val = Open( p_this );
+ if( val )
+ return val;
+
p_intf->pf_show_dialog = ShowDialog;
return VLC_SUCCESS;
}
char dummy[] = "";
char *argv[] = { dummy };
int argc = 1;
+
Q_INIT_RESOURCE( vlc );
+
+#ifndef WIN32
+ /* KLUDGE:
+ * disables icon theme use because that makes Cleanlooks style bug
+ * because it asks gconf for some settings that timeout because of threads
+ * see commits 21610 21622 21654 for reference */
+ QApplication::setDesktopSettingsAware(false);
+#endif
+
+ /* Start the QApplication here */
QApplication *app = new QApplication( argc, argv , true );
app->setWindowIcon( QIcon( QPixmap(vlc_xpm) ) );
p_intf->p_sys->p_app = app;
- // Initialize timers
+ // Initialize timers and the Dialog Provider
DialogsProvider::getInstance( p_intf );
- // Normal interface
+ // Create the normal interface
if( !p_intf->pf_show_dialog )
{
MainInterface *p_mi = new MainInterface( p_intf );
p_intf->p_sys->p_mi = p_mi;
p_mi->show();
}
-
- if( p_intf->pf_show_dialog )
+ else
+ /*if( p_intf->pf_show_dialog )*/
vlc_thread_ready( p_intf );
/* Start playing if needed */
playlist_Control( THEPL, PLAYLIST_AUTOPLAY, VLC_FALSE );
}
+ /* Explain to the core how to show a dialog :D */
p_intf->pf_show_dialog = ShowDialog;
+ /* Last settings */
app->setQuitOnLastWindowClosed( false );
+
+ /* Launch */
app->exec();
+
+ /* And quit */
MainInputManager::killInstance();
DialogsProvider::killInstance();
delete p_intf->p_sys->p_mi;
projects / vlc / blobdiff