Changeset 846 for trunk/tools/qtconfig/mainwindow.cpp
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/tools/qtconfig/mainwindow.cpp
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation ([email protected]) … … 69 69 #ifndef QT_NO_GSTREAMER 70 70 #include <gst/gst.h> 71 72 71 73 #include <phonon/phononnamespace.h> 72 74 #endif … … 80 82 // extern bool Q_CORE_EXPORT qt_resolve_symlinks; 81 83 82 static const char *appearance_text = 84 static const char *appearance_text = 83 85 "<p><b><font size+=2>Appearance</font></b></p>" 84 86 "<hr>" … … 94 96 "the advanced palette editor." 95 97 "<p>The Preview Window shows what the selected Style and colors look " 96 "like." ;97 98 static const char *font_text = 98 "like."; 99 100 static const char *font_text = 99 101 "<p><b><font size+=2>Fonts</font></b></p>" 100 102 "<hr>" … … 113 115 "from the Mincho font. Because the font substitutions are " 114 116 "lists, you can also select multiple families, such as Song Ti (for " 115 "use with Chinese text)." ;116 117 static const char *interface_text = 117 "use with Chinese text)."; 118 119 static const char *interface_text = 118 120 "<p><b><font size+=2>Interface</font></b></p>" 119 121 "<hr>" … … 130 132 "<p>XIM (Extended Input Methods) are used for entering characters in " 131 133 "languages that have large character sets, for example, Chinese and " 132 "Japanese." ;134 "Japanese."; 133 135 // ### What does the 'Enhanced support for languages written R2L do? 134 136 135 static const char *printer_text = 137 static const char *printer_text = 136 138 "<p><b><font size+=2>Printer</font></b></p>" 137 139 "<hr>" … … 144 146 "<p>When using font embedding you can select additional directories where " 145 147 "Qt should search for embeddable font files. By default, the X " 146 "server font path is used." ;147 148 static const char *phonon_text = 148 "server font path is used."; 149 150 static const char *phonon_text = 149 151 "<p><b><font size+=2>Phonon</font></b></p>" 150 152 "<hr>" 151 153 "<p>Use this tab to configure the Phonon GStreamer multimedia backend. " 152 154 "<p>It is reccommended to leave all settings on \"Auto\" to let " 153 "Phonon determine your settings automatically." ;155 "Phonon determine your settings automatically."; 154 156 155 157 static QColorGroup::ColorRole centralFromItem( int item ) … … 388 390 audiosinkCombo->setItemData(audiosinkCombo->findText(tr("aRts")), 389 391 tr("Experimental aRts support for GStreamer."), Qt::ToolTipRole); 392 393 394 390 395 #ifndef QT_NO_GSTREAMER 391 phononVersionLabel->setText(QLatin1String(Phonon::phononVersion()));392 396 if (gst_init_check(0, 0, 0)) { 393 397 gchar *versionString = gst_version_string(); … … 429 433 #ifndef QT_NO_OPENGL 430 434 videomodeCombo->addItem(tr("OpenGL"), QLatin1String("OpenGL")); 431 videomodeCombo->setItemData(videomodeCombo->findText(tr("OpenGL")), tr("Use OpenGL if avai able"), Qt::ToolTipRole);435 videomodeCombo->setItemData(videomodeCombo->findText(tr("OpenGL")), tr("Use OpenGL if avaiable"), Qt::ToolTipRole); 432 436 #endif 433 437 videomodeCombo->addItem(tr("Software"), QLatin1String("Software")); … … 1000 1004 box.setText(tr("<h3>%1</h3>" 1001 1005 "<br/>Version %2" 1002 "<br/><br/>Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).")1006 "<br/><br/>Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).") 1003 1007 .arg(tr("Qt Configuration")).arg(QLatin1String(QT_VERSION_STR))); 1004 1008 box.setWindowTitle(tr("Qt Configuration"));
Note:
See TracChangeset
for help on using the changeset viewer.