Changeset 846 for trunk/tools/qtconfig


Ignore:
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:
1 deleted
22 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/tools/qtconfig/colorbutton.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/qtconfig/colorbutton.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/qtconfig/main.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    4343#include "mainwindow.h"
    4444#include <QApplication>
     45#include <QLibraryInfo>
     46#include <QLocale>
     47#include <QTranslator>
    4548
    4649QT_USE_NAMESPACE
    … …  
    5154
    5255    QApplication app(argc, argv);
     56
     57    QTranslator translator;
     58    QTranslator qtTranslator;
     59    QString sysLocale = QLocale::system().name();
     60    QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
     61    if (translator.load(QLatin1String("qtconfig_") + sysLocale, resourceDir)
     62        && qtTranslator.load(QLatin1String("qt_") + sysLocale, resourceDir)) {
     63        app.installTranslator(&translator);
     64        app.installTranslator(&qtTranslator);
     65    }
     66
    5367    MainWindow mw;
    5468    mw.show();

  • trunk/tools/qtconfig/mainwindow.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    6969#ifndef QT_NO_GSTREAMER
    7070#include <gst/gst.h>
     71#endif
     72#ifdef HAVE_PHONON
    7173#include <phonon/phononnamespace.h>
    7274#endif
    … …  
    8082// extern bool Q_CORE_EXPORT qt_resolve_symlinks;
    8183
    82 static const char *appearance_text =
     84static const char *appearance_text = QT_TRANSLATE_NOOP("MainWindow",
    8385"<p><b><font size+=2>Appearance</font></b></p>"
    8486"<hr>"
    … …  
    9496"the advanced palette editor."
    9597"<p>The Preview Window shows what the selected Style and colors look "
    96 "like.";
    97 
    98 static const char *font_text =
     98"like.");
     99
     100static const char *font_text = QT_TRANSLATE_NOOP("MainWindow",
    99101"<p><b><font size+=2>Fonts</font></b></p>"
    100102"<hr>"
    … …  
    113115"from the Mincho font.  Because the font substitutions are "
    114116"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
     119static const char *interface_text = QT_TRANSLATE_NOOP("MainWindow",
    118120"<p><b><font size+=2>Interface</font></b></p>"
    119121"<hr>"
    … …  
    130132"<p>XIM (Extended Input Methods) are used for entering characters in "
    131133"languages that have large character sets, for example, Chinese and "
    132 "Japanese.";
     134"Japanese.");
    133135// ### What does the 'Enhanced support for languages written R2L do?
    134136
    135 static const char *printer_text =
     137static const char *printer_text = QT_TRANSLATE_NOOP("MainWindow",
    136138"<p><b><font size+=2>Printer</font></b></p>"
    137139"<hr>"
    … …  
    144146"<p>When using font embedding you can select additional directories where "
    145147"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
     150static const char *phonon_text = QT_TRANSLATE_NOOP("MainWindow",
    149151"<p><b><font size+=2>Phonon</font></b></p>"
    150152"<hr>"
    151153"<p>Use this tab to configure the Phonon GStreamer multimedia backend. "
    152154"<p>It is reccommended to leave all settings on \"Auto\" to let "
    153 "Phonon determine your settings automatically.";
     155"Phonon determine your settings automatically.");
    154156
    155157static QColorGroup::ColorRole centralFromItem( int item )
    … …  
    388390    audiosinkCombo->setItemData(audiosinkCombo->findText(tr("aRts")),
    389391                                tr("Experimental aRts support for GStreamer."), Qt::ToolTipRole);
     392#ifdef HAVE_PHONON
     393    phononVersionLabel->setText(QLatin1String(Phonon::phononVersion()));
     394#endif
    390395#ifndef QT_NO_GSTREAMER
    391     phononVersionLabel->setText(QLatin1String(Phonon::phononVersion()));
    392396    if (gst_init_check(0, 0, 0)) {
    393397        gchar *versionString = gst_version_string();
    … …  
    429433#ifndef QT_NO_OPENGL
    430434    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);
    432436#endif
    433437    videomodeCombo->addItem(tr("Software"), QLatin1String("Software"));
    … …  
    10001004    box.setText(tr("<h3>%1</h3>"
    10011005                   "<br/>Version %2"
    1002                    "<br/><br/>Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).")
     1006                   "<br/><br/>Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).")
    10031007                   .arg(tr("Qt Configuration")).arg(QLatin1String(QT_VERSION_STR)));
    10041008    box.setWindowTitle(tr("Qt Configuration"));

  • trunk/tools/qtconfig/mainwindow.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/qtconfig/mainwindowbase.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/qtconfig/mainwindowbase.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/qtconfig/mainwindowbase.ui

    r651 r846  
    33 <comment>*********************************************************************
    44**
    5 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     5** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    66** All rights reserved.
    77** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/qtconfig/paletteeditoradvanced.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)
    … …  
    183183
    184184QColorGroup::ColorRole PaletteEditorAdvanced::effectFromItem( int item )
     185
    185186{
    186187    switch( item ) {

  • trunk/tools/qtconfig/paletteeditoradvanced.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/qtconfig/paletteeditoradvancedbase.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/qtconfig/paletteeditoradvancedbase.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/qtconfig/paletteeditoradvancedbase.ui

    r651 r846  
    33  <comment>*********************************************************************
    44**
    5 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     5** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    66** All rights reserved.
    77** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/qtconfig/previewframe.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/qtconfig/previewframe.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/qtconfig/previewwidget.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/qtconfig/previewwidget.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/qtconfig/previewwidgetbase.cpp

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/qtconfig/previewwidgetbase.h

    r651 r846  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/qtconfig/previewwidgetbase.ui

    r651 r846  
    33  <comment>*********************************************************************
    44**
    5 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     5** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    66** All rights reserved.
    77** Contact: Nokia Corporation (qt-info@nokia.com)

  • trunk/tools/qtconfig/qtconfig.pro

    r2 r846  
    1010contains(QT_CONFIG, gstreamer):LIBS += $$QT_LIBS_GSTREAMER -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10
    1111contains(QT_CONFIG, gstreamer):QMAKE_CXXFLAGS += $$QT_CFLAGS_GSTREAMER
    12 contains(QT_CONFIG, gstreamer):QT += phonon
     12contains(QT_CONFIG, phonon) {
     13    QT += phonon
     14    DEFINES += HAVE_PHONON
     15}
    1316SOURCES        += colorbutton.cpp main.cpp previewframe.cpp previewwidget.cpp mainwindow.cpp paletteeditoradvanced.cpp \
    1417    mainwindowbase.cpp paletteeditoradvancedbase.cpp previewwidgetbase.cpp
Note: See TracChangeset for help on using the changeset viewer.