Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/plugins/accessible/widgets/simplewidgets.h

    r2 r561  
    22**
    33** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
    4 ** Contact: Qt Software Information (qt-info@nokia.com)
     4** All rights reserved.
     5** Contact: Nokia Corporation (qt-info@nokia.com)
    56**
    67** This file is part of the plugins of the Qt Toolkit.
     
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    23 ** In addition, as a special exception, Nokia gives you certain
    24 ** additional rights. These rights are described in the Nokia Qt LGPL
    25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
    26 ** package.
     24** In addition, as a special exception, Nokia gives you certain additional
     25** rights.  These rights are described in the Nokia Qt LGPL Exception
     26** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    2727**
    2828** GNU General Public License Usage
     
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you have questions regarding the use of this file, please contact
     37** Nokia at qt-info@nokia.com.
    3838** $QT_END_LICENSE$
    3939**
     
    4343#define SIMPLEWIDGETS_H
    4444
     45#include <QtCore/qcoreapplication.h>
    4546#include <QtGui/qaccessible2.h>
    4647#include <QtGui/qaccessiblewidget.h>
     
    5354class QLineEdit;
    5455class QToolButton;
     56class QProgressBar;
    5557
    56 class QAccessibleButton : public QAccessibleWidgetEx
     58class QAccessibleButton : public QAccessibleWidgetEx, public QAccessibleActionInterface
    5759{
     60    Q_ACCESSIBLE_OBJECT
     61    Q_DECLARE_TR_FUNCTIONS(QAccessibleButton)
    5862public:
    5963    QAccessibleButton(QWidget *w, Role r);
     
    6468    QString actionText(int action, Text text, int child) const;
    6569    bool doAction(int action, int child, const QVariantList &params);
     70
     71    // QAccessibleActionInterface
     72    int actionCount();
     73    void doAction(int actionIndex);
     74    QString description(int actionIndex);
     75    QString name(int actionIndex);
     76    QString localizedName(int actionIndex);
     77    QStringList keyBindings(int actionIndex);
    6678
    6779protected:
     
    100112#endif // QT_NO_TOOLBUTTON
    101113
    102 class QAccessibleDisplay : public QAccessibleWidgetEx
     114class QAccessibleDisplay : public QAccessibleWidgetEx, public QAccessibleImageInterface
    103115{
     116    Q_ACCESSIBLE_OBJECT
    104117public:
    105118    explicit QAccessibleDisplay(QWidget *w, Role role = StaticText);
     
    110123    Relation relationTo(int child, const QAccessibleInterface *other, int otherChild) const;
    111124    int navigate(RelationFlag, int entry, QAccessibleInterface **target) const;
     125
     126    // QAccessibleImageInterface
     127    QString imageDescription();
     128    QSize imageSize();
     129    QRect imagePosition(QAccessible2::CoordinateType coordType);
    112130};
    113131
     
    116134                            public QAccessibleSimpleEditableTextInterface
    117135{
     136    Q_ACCESSIBLE_OBJECT
    118137public:
    119138    explicit QAccessibleLineEdit(QWidget *o, const QString &name = QString());
     
    150169#endif // QT_NO_LINEEDIT
    151170
     171#ifndef QT_NO_PROGRESSBAR
     172class QAccessibleProgressBar : public QAccessibleDisplay, public QAccessibleValueInterface
     173{
     174    Q_ACCESSIBLE_OBJECT
     175public:
     176    explicit QAccessibleProgressBar(QWidget *o);
     177
     178    // QAccessibleValueInterface
     179    QVariant currentValue();
     180    QVariant maximumValue();
     181    QVariant minimumValue();
     182    inline void setCurrentValue(const QVariant &) {}
     183
     184protected:
     185    QProgressBar *progressBar() const;
     186};
     187#endif
     188
    152189#endif // QT_NO_ACCESSIBILITY
    153190
Note: See TracChangeset for help on using the changeset viewer.