Mercurial Mercurial > oss > FCL > sf > mw > qt / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tools/qtconfig/mainwindow.cpp
changeset 30 5dc02b23752f
parent 18 2f34d5167611
equal deleted inserted replaced
29:b72c6db6890b 30:5dc02b23752f 
    66 
    66 
    67 #include <stdlib.h>
 
    67 #include <stdlib.h>
 
    68 
    68 
    69 #ifndef QT_NO_GSTREAMER
 
    69 #ifndef QT_NO_GSTREAMER
 
    70 #include <gst/gst.h>
 
    70 #include <gst/gst.h>
 
       
    71 #endif
 
       
    72 #ifdef HAVE_PHONON
 
    71 #include <phonon/phononnamespace.h>
 
    73 #include <phonon/phononnamespace.h>
 
    72 #endif
 
    74 #endif
 
    73 
    75 
    74 #include <QtGui/private/qt_x11_p.h>
 
    76 #include <QtGui/private/qt_x11_p.h>
 
    75 
    77 
   385     audiosinkCombo->setItemData(audiosinkCombo->findText(tr("Auto (default)")),
 
   387     audiosinkCombo->setItemData(audiosinkCombo->findText(tr("Auto (default)")),
 
   386                                 tr("Choose audio output automatically."), Qt::ToolTipRole);
 
   388                                 tr("Choose audio output automatically."), Qt::ToolTipRole);
 
   387     audiosinkCombo->addItem(tr("aRts"), QLatin1String("artssink"));
 
   389     audiosinkCombo->addItem(tr("aRts"), QLatin1String("artssink"));
 
   388     audiosinkCombo->setItemData(audiosinkCombo->findText(tr("aRts")),
 
   390     audiosinkCombo->setItemData(audiosinkCombo->findText(tr("aRts")),
 
   389                                 tr("Experimental aRts support for GStreamer."), Qt::ToolTipRole);
 
   391                                 tr("Experimental aRts support for GStreamer."), Qt::ToolTipRole);
 
       
   392 #ifdef HAVE_PHONON
 
       
   393     phononVersionLabel->setText(QLatin1String(Phonon::phononVersion()));
 
       
   394 #endif
 
   390 #ifndef QT_NO_GSTREAMER
 
   395 #ifndef QT_NO_GSTREAMER
 
   391     phononVersionLabel->setText(QLatin1String(Phonon::phononVersion()));
 
       
   392     if (gst_init_check(0, 0, 0)) {
 
   396     if (gst_init_check(0, 0, 0)) {
 
   393         gchar *versionString = gst_version_string();
 
   397         gchar *versionString = gst_version_string();
 
   394         gstversionLabel->setText(QLatin1String(versionString));
 
   398         gstversionLabel->setText(QLatin1String(versionString));
 
   395         g_free(versionString);
 
   399         g_free(versionString);
 
   396         GList* factoryList = gst_registry_get_feature_list(gst_registry_get_default (), GST_TYPE_ELEMENT_FACTORY);
 
   400         GList* factoryList = gst_registry_get_feature_list(gst_registry_get_default (), GST_TYPE_ELEMENT_FACTORY);
 
   426     videomodeCombo->addItem(tr("X11"), QLatin1String("X11"));
 
   430     videomodeCombo->addItem(tr("X11"), QLatin1String("X11"));
 
   427     videomodeCombo->setItemData(videomodeCombo->findText(tr("X11")), tr("Use X11 Overlays"), Qt::ToolTipRole);
 
   431     videomodeCombo->setItemData(videomodeCombo->findText(tr("X11")), tr("Use X11 Overlays"), Qt::ToolTipRole);
 
   428 #endif
 
   432 #endif
 
   429 #ifndef QT_NO_OPENGL
 
   433 #ifndef QT_NO_OPENGL
 
   430     videomodeCombo->addItem(tr("OpenGL"), QLatin1String("OpenGL"));
 
   434     videomodeCombo->addItem(tr("OpenGL"), QLatin1String("OpenGL"));
 
   431     videomodeCombo->setItemData(videomodeCombo->findText(tr("OpenGL")), tr("Use OpenGL if avaiable"), Qt::ToolTipRole);
 
   435     videomodeCombo->setItemData(videomodeCombo->findText(tr("OpenGL")), tr("Use OpenGL if available"), Qt::ToolTipRole);
 
   432 #endif
 
   436 #endif
 
   433     videomodeCombo->addItem(tr("Software"), QLatin1String("Software"));
 
   437     videomodeCombo->addItem(tr("Software"), QLatin1String("Software"));
 
   434     videomodeCombo->setItemData(videomodeCombo->findText(tr("Software")), tr("Use simple software rendering"), Qt::ToolTipRole);
 
   438     videomodeCombo->setItemData(videomodeCombo->findText(tr("Software")), tr("Use simple software rendering"), Qt::ToolTipRole);
 
   435 
   439 
   436     QString audioSink = settings.value(QLatin1String("audiosink"), QLatin1String("Auto")).toString();
 
   440     QString audioSink = settings.value(QLatin1String("audiosink"), QLatin1String("Auto")).toString();
FCL/sf/mw/qt