Changeset 846 for trunk/tools/qtconfig/mainwindow.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/qtconfig/mainwindow.cpp (modified) (10 diffs)

trunk/tools/qtconfig/mainwindow.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -69 +69 @@
 #ifndef QT_NO_GSTREAMER
 #include <gst/gst.h>
+
+
 #include <phonon/phononnamespace.h>
 #endif
@@ -80 +82 @@
 // extern bool Q_CORE_EXPORT qt_resolve_symlinks;
 
-static const char *appearance_text =
+static const char *appearance_text =
 "<p><b><font size+=2>Appearance</font></b></p>"
 "<hr>"
@@ -94 +96 @@
 "the advanced palette editor."
 "<p>The Preview Window shows what the selected Style and colors look "
-"like.";
-
-static const char *font_text =
+"like.";
+
+static const char *font_text =
 "<p><b><font size+=2>Fonts</font></b></p>"
 "<hr>"
@@ -113 +115 @@
 "from the Mincho font.  Because the font substitutions are "
 "lists, you can also select multiple families, such as Song Ti (for "
-"use with Chinese text).";
-
-static const char *interface_text =
+"use with Chinese text).";
+
+static const char *interface_text =
 "<p><b><font size+=2>Interface</font></b></p>"
 "<hr>"
@@ -130 +132 @@
 "<p>XIM (Extended Input Methods) are used for entering characters in "
 "languages that have large character sets, for example, Chinese and "
-"Japanese.";
+"Japanese.";
 // ### What does the 'Enhanced support for languages written R2L do?
 
-static const char *printer_text =
+static const char *printer_text =
 "<p><b><font size+=2>Printer</font></b></p>"
 "<hr>"
@@ -144 +146 @@
 "<p>When using font embedding you can select additional directories where "
 "Qt should search for embeddable font files.  By default, the X "
-"server font path is used.";
-
-static const char *phonon_text =
+"server font path is used.";
+
+static const char *phonon_text =
 "<p><b><font size+=2>Phonon</font></b></p>"
 "<hr>"
 "<p>Use this tab to configure the Phonon GStreamer multimedia backend. "
 "<p>It is reccommended to leave all settings on \"Auto\" to let "
-"Phonon determine your settings automatically.";
+"Phonon determine your settings automatically.";
 
 static QColorGroup::ColorRole centralFromItem( int item )
@@ -388 +390 @@
     audiosinkCombo->setItemData(audiosinkCombo->findText(tr("aRts")),
                                 tr("Experimental aRts support for GStreamer."), Qt::ToolTipRole);
+
+
+
 #ifndef QT_NO_GSTREAMER
-    phononVersionLabel->setText(QLatin1String(Phonon::phononVersion()));
     if (gst_init_check(0, 0, 0)) {
         gchar *versionString = gst_version_string();
@@ -429 +433 @@
 #ifndef QT_NO_OPENGL
     videomodeCombo->addItem(tr("OpenGL"), QLatin1String("OpenGL"));
-    videomodeCombo->setItemData(videomodeCombo->findText(tr("OpenGL")), tr("Use OpenGL if avaiable"), Qt::ToolTipRole);
+    videomodeCombo->setItemData(videomodeCombo->findText(tr("OpenGL")), tr("Use OpenGL if avaiable"), Qt::ToolTipRole);
 #endif
     videomodeCombo->addItem(tr("Software"), QLatin1String("Software"));
@@ -1000 +1004 @@
     box.setText(tr("<h3>%1</h3>"
                    "<br/>Version %2"
-                   "<br/><br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).")
+                   "<br/><br/>Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).")
                    .arg(tr("Qt Configuration")).arg(QLatin1String(QT_VERSION_STR)));
     box.setWindowTitle(tr("Qt Configuration"));