Ignore:
Timestamp:
May 3, 2011, 4:49:08 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

vendor: Imported qt-everywhere-opensource-src-4.7.2 from Nokia (excluding doc/html and doc/qch dirs generated from doc/src, and imports and templates dirs which are emtpy).

Location:
branches/vendor/nokia/qt/current/demos/qtdemo
Files:
1 added
45 edited

Legend:

Unmodified
Added
Removed

  • branches/vendor/nokia/qt/current/demos/qtdemo/colors.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/colors.h

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/demoitem.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/demoitem.h

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/demoitemanimation.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/demoitemanimation.h

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/demoscene.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/demoscene.h

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/demotextitem.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/demotextitem.h

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/dockitem.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/dockitem.h

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/examplecontent.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
    … …  
    8080{
    8181    QByteArray ba = MenuManager::instance()->getHtml(this->name);
     82
     83
    8284
    8385    QDomDocument exampleDoc;
    84     exampleDoc.setContent(ba, false);
     86    if (!exampleDoc.setContent(ba, false, &errorMsg, &errorLine, &errorColumn)) {
     87        qDebug() << errorMsg << errorLine << errorColumn;
     88    }
    8589
    8690    QDomNodeList paragraphs = exampleDoc.elementsByTagName("p");
    8791    if (paragraphs.length() < 1 && Colors::verbose)
    88         qDebug() << "- ExampleContent::loadDescription(): Could not load description:" << MenuManager::instance()->info[this->name]["docfile"];
    89     QString description = Colors::contentColor + QLatin1String("Could not load description. Ensure that the documentation for Qt is built.");
     92        qDebug() << "- ExampleContent::loadDescription(): Could not load description:"
     93                 << MenuManager::instance()->info[this->name]["docfile"];
     94    QString description = Colors::contentColor + QLatin1String("");
     95    //QLatin1String("Could not load description. Ensure that the documentation for Qt is built."); // QTBUG-12522: If there is no description why show an error to the user when qDebug above communications the issue (if it is indeed an issue at all) when demos are built?
    9096    for (int p = 0; p < int(paragraphs.length()); ++p) {
    9197        description = this->extractTextFromParagraph(paragraphs.item(p));
    … …  
    100106{
    101107    return (!text.contains("[") &&
    102         text.indexOf(QRegExp(QString("(In )?((The|This) )?(%1 )?.*(tutorial|example|demo|application)").arg(this->name), Qt::CaseInsensitive)) != -1);
     108        text.indexOf(QRegExp(QString("(In )?((The|This) )?(%1 )?.*(tutorial|example|demo|application)").arg(this->name),
     109                             Qt::CaseInsensitive)) != -1);
    103110}
    104111

  • branches/vendor/nokia/qt/current/demos/qtdemo/examplecontent.h

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/guide.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/guide.h

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/guidecircle.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/guidecircle.h

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/guideline.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/guideline.h

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/headingitem.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/headingitem.h

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/imageitem.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/imageitem.h

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/itemcircleanimation.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/itemcircleanimation.h

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
    … …  
    6262    virtual ~ItemCircleAnimation();
    6363
    64     // overidden methods:
     64    // overidden methods:
    6565    QRectF boundingRect() const;
    6666    void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0);

  • branches/vendor/nokia/qt/current/demos/qtdemo/letteritem.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/letteritem.h

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/main.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/mainwindow.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
    … …  
    267267    if (Colors::showFps){
    268268        this->fpsLabel = new DemoTextItem(QString("FPS: --"), Colors::buttonFont(), Qt::white, -1, this->scene, 0, DemoTextItem::DYNAMIC_TEXT);
    269         this->fpsLabel->setZValue(100);
     269        this->fpsLabel->setZValue(100);
    270270        this->fpsLabel->setPos(Colors::stageStartX, 600 - QFontMetricsF(Colors::buttonFont()).height() - 5);
    271271    }
    272272
    273     this->companyLogo = new ImageItem(QImage(":/images/trolltech-logo.png"), 1000, 1000, this->scene, 0, true, 0.5f);
    274     this->qtLogo = new ImageItem(QImage(":/images/qtlogo_small.png"), 1000, 1000, this->scene, 0, true, 0.5f);
     273    this->mainSceneRoot = new QGraphicsWidget();
     274    this->scene->addItem(mainSceneRoot);
     275    this->companyLogo = new ImageItem(QImage(":/images/trolltech-logo.png"), 1000, 1000, this->scene, mainSceneRoot, true, 0.5f);
     276    this->qtLogo = new ImageItem(QImage(":/images/qtlogo_small.png"), 1000, 1000, this->scene, mainSceneRoot, true, 0.5f);
    275277    this->companyLogo->setZValue(100);
    276278    this->qtLogo->setZValue(100);
    … …  
    377379        QApplication::quit();
    378380    }
    379     else if (event->key() == Qt::Key_1){
     381    else if (event->key() == Qt::Key_1){
    380382            QString s("");
    381383            s += "Rendering system: ";
    … …  
    387389            s += "\nAdapt: ";
    388390            s += Colors::noAdapt ? "off" : "on";
    389             s += "\nAdaption occured: ";
     391            s += "\nAdaption occured: ";
    390392            s += Colors::adapted ? "yes" : "no";
    391393            s += "\nOpenGL version: ";
    … …  
    416418            QMessageBox::information(0, QString("Current configuration"), s);
    417419    }
     420
    418421}
    419422

  • branches/vendor/nokia/qt/current/demos/qtdemo/mainwindow.h

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
    … …  
    6363
    6464    QGraphicsScene *scene;
     65
     66
    6567    bool loop;
    6668
    … …  
    7375
    7476protected:
    75     // Overidden methods:
     77    // Overidden methods:
    7678    void showEvent(QShowEvent *event);
    7779    void keyPressEvent(QKeyEvent *event);

  • branches/vendor/nokia/qt/current/demos/qtdemo/menucontent.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/menucontent.h

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/menumanager.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
    … …  
    153153        this->launchExample(this->currentInfo);
    154154        break;
     155
     156
     157
    155158    case DOCUMENTATION:
    156159        this->showDocInAssistant(this->currentInfo);
    … …  
    170173        this->score->queueMovie(this->currentInfo + " -buttons -out", Score::NEW_ANIMATION_ONLY);
    171174        this->score->queueMovie("back -out", Score::ONLY_IF_VISIBLE);
     175
     176
    172177        // book-keeping:
    173178        this->currentMenuCode = ROOT;
    … …  
    192197        this->score->queueMovie(this->currentMenuButtons + " -out", Score::FROM_START, Score::LOCK_ITEMS);
    193198        this->score->queueMovie(this->currentInfo + " -out");
     199
     200
    194201        // book-keeping:
    195202        this->currentMenuCode = MENU1;
    … …  
    209216        this->score->queueMovie(this->currentInfo + " -out", Score::NEW_ANIMATION_ONLY);
    210217        this->score->queueMovie(this->currentInfo + " -buttons -out", Score::NEW_ANIMATION_ONLY);
     218
     219
    211220        // book-keeping:
    212221        this->currentMenuCode = MENU2;
    … …  
    243252            this->score->queueMovie(this->currentInfo + " -out", Score::NEW_ANIMATION_ONLY);
    244253            this->score->queueMovie(this->currentInfo + " -buttons -out", Score::NEW_ANIMATION_ONLY);
     254
     255
    245256            // book-keeping:
    246257            this->currentMenuCode = MENU1;
    … …  
    303314    // was started to activate assistant and bring it to front:
    304315    QTextStream str(&this->assistantProcess);
    305     str << "SetSource " << url << QLatin1Char('\0') << endl;
     316    str << "SetSource " << url << QLatin1Char('\') << endl;
    306317}
    307318
    … …  
    344355}
    345356
     357
     358
     359
     360
     361
     362
     363
     364
     365
     366
     367
     368
     369
     370
     371
     372
     373
     374
     375
     376
     377
     378
     379
     380
     381
     382
     383
     384
     385
     386
     387
     388
     389
     390
     391
     392
     393
     394
     395
     396
    346397void MenuManager::exampleFinished()
    347398{
    … …  
    386437        level2MenuNode = level2MenuNode.nextSibling();
    387438    }
     439
     440
     441
     442
     443
     444
     445
     446
     447
     448
     449
     450
     451
     452
     453
     454
     455
     456
     457
     458
     459
     460
     461
     462
     463
     464
     465
     466
     467
     468
     469
     470
     471
    388472}
    389473
    … …  
    393477    if (this->info.contains(name))
    394478        qWarning() << "__WARNING: MenuManager::readInfoAboutExample: Demo/example with name"
    395                     << name << "appears twize in the xml-file!__";
     479                    << name << "appears twie in the xml-file!__";
    396480
    397481    this->info[name]["filename"] = example.attribute("filename");
    … …  
    400484    this->info[name]["changedirectory"] = example.attribute("changedirectory");
    401485    this->info[name]["image"] = example.attribute("image");
     486
    402487}
    403488
    … …  
    434519    dir.cd(fileName);
    435520
     521
    436522    QFile unixFile(dir.path() + "/" + fileName);
    437523    if (unixFile.exists()) return unixFile.fileName();
    … …  
    455541
    456542    if (category == "demos")
    457         return this->helpRootUrl + "demos-" + fileName + ".html";
     543        return this->helpRootUrl + "demos-" + fileName + ".html";
    458544    else
    459545        return this->helpRootUrl + dirName.replace("/", "-") + "-" + fileName + ".html";
    … …  
    475561    QString category = this->info[name]["category"];
    476562    QString fileName = this->info[name]["filename"];
     563
     564
     565
    477566
    478567    if (imageName.isEmpty()){
    … …  
    494583    QString name = el.attribute("name");
    495584    createMenu(el, MENU1);
    496     createInfo(new MenuContentItem(el, this->window->scene, 0), name + " -info");
     585    createInfo(new MenuContentItem(el, this->window->scene, ), name + " -info");
    497586
    498587    Movie *menuButtonsIn = this->score->insertMovie(name + " -buttons");
    … …  
    506595    QString name = el.attribute("name");
    507596    createMenu(el, MENU2);
    508     createInfo(new MenuContentItem(el, this->window->scene, 0), name + " -info");
     597    createInfo(new MenuContentItem(el, this->window->scene, ), name + " -info");
    509598}
    510599
    … …  
    512601{
    513602    QString name = el.attribute("name");
    514     createInfo(new ExampleContent(name, this->window->scene, 0), name);
     603    createInfo(new ExampleContent(name, this->window->scene, ), name);
    515604
    516605    Movie *infoButtonsIn = this->score->insertMovie(name + " -buttons");
    … …  
    519608    if (el.attribute("executable") != "false")
    520609        createLowRightLeafButton("Launch", 405, LAUNCH, infoButtonsIn, infoButtonsOut, 0);
     610
     611
    521612}
    522613
    … …  
    547638            // create normal menu button
    548639            QString label = currentNode.toElement().attribute("name");
    549             item = new TextButton(label, TextButton::LEFT, type, this->window->scene, 0);
     640            item = new TextButton(label, TextButton::LEFT, type, this->window->scene, );
    550641            currentNode = currentNode.nextSibling();
    551642
    … …  
    647738    Movie *movieIn, Movie *movieOut, Movie *movieShake, const QString &menuString)
    648739{
    649     TextButton *button = new TextButton(label, TextButton::RIGHT, type, this->window->scene, 0, TextButton::PANEL);
     740    TextButton *button = new TextButton(label, TextButton::RIGHT, type, this->window->scene, , TextButton::PANEL);
    650741    if (!menuString.isNull())
    651742        button->setMenuString(menuString);
    … …  
    689780void MenuManager::createLowRightButton(const QString &label, BUTTON_TYPE type, Movie *movieIn, Movie *movieOut, Movie * /*movieShake*/)
    690781{
    691     TextButton *item = new TextButton(label, TextButton::RIGHT, type, this->window->scene, 0, TextButton::PANEL);
     782    TextButton *item = new TextButton(label, TextButton::RIGHT, type, this->window->scene, , TextButton::PANEL);
    692783    item->setRecursiveVisible(false);
    693784    item->setZValue(10);
    … …  
    716807void MenuManager::createLowRightLeafButton(const QString &label, int xOffset, BUTTON_TYPE type, Movie *movieIn, Movie *movieOut, Movie * /*movieShake*/)
    717808{
    718     TextButton *item = new TextButton(label, TextButton::RIGHT, type, this->window->scene, 0, TextButton::PANEL);
     809    TextButton *item = new TextButton(label, TextButton::RIGHT, type, this->window->scene, , TextButton::PANEL);
    719810    item->setRecursiveVisible(false);
    720811    item->setZValue(10);
    … …  
    832923    float yOffset = 450.0f;
    833924
    834     this->upButton = new TextButton("", TextButton::LEFT, MenuManager::UP, this->window->scene, 0, TextButton::UP);
     925    this->upButton = new TextButton("", TextButton::LEFT, MenuManager::UP, this->window->scene, , TextButton::UP);
    835926    this->upButton->prepare();
    836927    this->upButton->setPos(xOffset, yOffset);
    837928    this->upButton->setState(TextButton::DISABLED);
    838929
    839     this->downButton = new TextButton("", TextButton::LEFT, MenuManager::DOWN, this->window->scene, 0, TextButton::DOWN);
     930    this->downButton = new TextButton("", TextButton::LEFT, MenuManager::DOWN, this->window->scene, , TextButton::DOWN);
    840931    this->downButton->prepare();
    841932    this->downButton->setPos(xOffset + 10 + this->downButton->sceneBoundingRect().width(), yOffset);

  • branches/vendor/nokia/qt/current/demos/qtdemo/menumanager.h

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
    … …  
    4646#include <QtXml>
    4747#include <QtHelp/QHelpEngineCore>
     48
     49
     50
    4851
    4952#include "score.h"
    … …  
    6265
    6366public:
    64     enum BUTTON_TYPE {ROOT, MENU1, MENU2, LAUNCH, DOCUMENTATION, QUIT, FULLSCREEN, UP, DOWN, BACK};
     67    enum BUTTON_TYPE {ROOT, MENU1, MENU2, LAUNCH, DOCUMENTATION, QUIT, FULLSCREEN, UP, DOWN, BACK};
    6568
    6669    // singleton pattern:
    … …  
    8487    int currentMenuCode;
    8588
     89
     90
     91
     92
     93
    8694private slots:
    8795    void exampleFinished();
    8896    void exampleError(QProcess::ProcessError error);
     97
     98
    8999
    90100private:
    … …  
    101111    void showDocInAssistant(const QString &docFile);
    102112    void launchExample(const QString &uniqueName);
     113
    103114
    104115    void createMenu(const QDomElement &category, BUTTON_TYPE type);
    … …  
    129140    TextButton *upButton;
    130141    TextButton *downButton;
     142
    131143};
    132144

  • branches/vendor/nokia/qt/current/demos/qtdemo/qtdemo.pro

    r556 r844  
    1 CONFIG += assistant help x11inc
     1CONFIG += help x11inc
    22TARGET = qtdemo
    33DEMO_DESTDIR = $$QT_BUILD_TREE
    44isEmpty(DEMO_DESTDIR):DEMO_DESTDIR=../..
    55DESTDIR = $$DEMO_DESTDIR/bin
    6 OBJECTS_DIR = .obj
    7 MOC_DIR = .moc
    86INSTALLS += target sources
    97
    … …  
    1412    DEFINES += QT_OPENGL_SUPPORT
    1513    QT += opengl
     14
     15
     16
     17
    1618}
    1719
    … …  
    7779sources.path = $$[QT_INSTALL_DEMOS]/qtdemo
    7880
     81
     82

  • branches/vendor/nokia/qt/current/demos/qtdemo/qtdemo.qrc

    r2 r844  
    1 <!DOCTYPE RCC><RCC version="1.0">
    2 <qresource prefix="/">
    3    <file>xml/examples.xml</file>
    4    <file>images/qtlogo_small.png</file>
    5    <file>images/trolltech-logo.png</file>
    6    <file>images/demobg.png</file>
    7 </qresource>
     1<RCC>
     2    <qresource prefix="/">
     3        <file>xml/examples.xml</file>
     4        <file>images/qtlogo_small.png</file>
     5        <file>images/trolltech-logo.png</file>
     6        <file>images/demobg.png</file>
     7    </qresource>
     8    <qresource prefix="/qml" lang="qml">
     9        <file>qmlShell.qml</file>
     10    </qresource>
    811</RCC>

  • branches/vendor/nokia/qt/current/demos/qtdemo/qtdemo.rc

    r649 r844  
    1919            VALUE "FileDescription", "Qt Examples and Demos"
    2020            VALUE "FileVersion", "1.0.0.0"
    21             VALUE "LegalCopyright", "Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)."
     21            VALUE "LegalCopyright", "Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies)."
    2222            VALUE "InternalName", "qtdemo"
    2323            VALUE "OriginalFilename", "qtdemo.exe"

  • branches/vendor/nokia/qt/current/demos/qtdemo/scanitem.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/scanitem.h

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/score.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/score.h

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/textbutton.cpp

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])

  • branches/vendor/nokia/qt/current/demos/qtdemo/textbutton.h

    r649 r844  
    11/****************************************************************************
    22**
    3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
     3** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
    44** All rights reserved.
    55** Contact: Nokia Corporation ([email protected])
    … …  
    6262    virtual ~TextButton();
    6363
    64     // overidden methods:
     64    // overidden methods:
    6565    virtual QRectF boundingRect() const;
    6666    virtual void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = 0){};

  • branches/vendor/nokia/qt/current/demos/qtdemo/xml/examples.xml

    r767 r844  
    22<categories name="Qt Examples and Demos">
    33  <demos dirname="." docname="demos" name="Demonstrations">
     4
     5
    46    <example filename="affine" name="Affine Transformations" />
    5     <example filename="arthurplugin" name="Arthur Plugin" executable="false" />
    67    <example filename="composition" name="Composition Modes" />
    78    <example filename="gradients" name="Gradients" />
    89    <example filename="pathstroke" name="Path Stroking" />
     10
     11
     12
     13
     14
     15
     16
     17
     18
     19
     20
     21
    922    <example filename="deform" name="Vector Deformation" />
    1023    <example filename="books" name="Books" />
    … …  
    1225    <example filename="spreadsheet" name="Spreadsheet" />
    1326    <example filename="sqlbrowser" name="SQL Browser" />
    14     <example filename="textedit" name="Text Edit" />
    15     <example filename="chip" name="40000 Chips" />
    16     <example filename="embeddeddialogs" name="Embedded Dialogs" />
    17     <example filename="interview" name="Interview" />
    18     <example filename="browser" name="Browser" />
    19     <example filename="qmediaplayer" name="Media Player" />
    20     <example filename="boxes" name="Boxes" />
    21     <example filename="sub-attaq" name="Sub-attaq" />
    22     <example filename="spectrum" name="Spectrum Analyzer" />
     27    <example filename="arthurplugin" name="Arthur Plugin" executable="false" />
     28
    2329  </demos>
    2430  <category dirname="animation" name="Animation Framework">
    … …  
    3541    <example filename="runfunction" name="Run Function" executable="false"/>
    3642    <example filename="wordcount" name="Word Count" executable="false" />
     43
     44
     45
     46
     47
     48
     49
    3750  </category>
    3851  <category dirname="designer" name="Qt Designer">
    … …  
    116129    <example filename="menus" name="Menus" />
    117130    <example filename="recentfiles" name="Recent Files" />
     131
     132
     133
     134
     135
     136
     137
     138
     139
     140
    118141  </category>
    119142  <category dirname="network" name="Networking">
Note: See TracChangeset for help on using the changeset viewer.