Doc: rearrange tables with overflow

Task-number: QTBUG-46475
Change-Id: Id599b2eb0dee0c003475c094ad61700150e37e65
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
This commit is contained in:
Nico Vertriest 2015-06-10 09:49:29 +02:00
parent dc6191ccb4
commit e1b7c55a43
7 changed files with 29 additions and 22 deletions

View File

@ -46,7 +46,8 @@ int main(int argc, char *argv[])
QApplication app(argc, argv); QApplication app(argc, argv);
QWidget window; QWidget window;
window.resize(320, 240); window.resize(320, 240);
window.setWindowTitle(QApplication::translate("childwidget", "Child widget")); window.setWindowTitle
(QApplication::translate("childwidget", "Child widget"));
window.show(); window.show();
//! [create, position and show] //! [create, position and show]

View File

@ -874,7 +874,7 @@
The following table lists the HTML tags supported by Qt's The following table lists the HTML tags supported by Qt's
\l{Rich Text Processing}{rich text} engine: \l{Rich Text Processing}{rich text} engine:
\table \table 70%
\header \li Tag \header \li Tag
\li Description \li Description
\li Comment \li Comment

View File

@ -218,7 +218,7 @@ static void qt_debug_path(const QPainterPath &path)
Below is a code snippet that shows how a QPainterPath object can Below is a code snippet that shows how a QPainterPath object can
be used: be used:
\table 100% \table 70%
\row \row
\li \inlineimage qpainterpath-construction.png \li \inlineimage qpainterpath-construction.png
\li \li

View File

@ -468,7 +468,7 @@ QString QNetworkSession::errorString() const
The following property keys are guaranteed to be specified on all platforms: The following property keys are guaranteed to be specified on all platforms:
\table \table 80%
\header \header
\li Key \li Description \li Key \li Description
\row \row

View File

@ -360,7 +360,8 @@ QSpinBox::down-button { height: 10px }
//! [59] //! [59]
/* implicitly sets the size of down-button to the size of spindown.png */ // implicitly sets the size of down-button to the
// size of spindown.png
QSpinBox::down-button { image: url(:/images/spindown.png) } QSpinBox::down-button { image: url(:/images/spindown.png) }
//! [59] //! [59]
@ -489,7 +490,8 @@ QDialog { etch-disabled-text: 1 }
QLabel { border-color: red } /* red red red red */ QLabel { border-color: red } /* red red red red */
QLabel { border-color: red blue } /* red blue red blue */ QLabel { border-color: red blue } /* red blue red blue */
QLabel { border-color: red blue green } /* red blue green blue */ QLabel { border-color: red blue green } /* red blue green blue */
QLabel { border-color: red blue green yellow } /* red blue green yellow */ QLabel { border-color: red blue green yellow }
/* red blue green yellow */
//! [82] //! [82]
@ -522,7 +524,8 @@ QTextEdit {
/* linear gradient from white to green */ /* linear gradient from white to green */
QTextEdit { QTextEdit {
background: qlineargradient(x1:0, y1:0, x2:1, y2:1, background: qlineargradient(x1:0, y1:0, x2:1, y2:1,
stop:0 white, stop: 0.4 rgba(10, 20, 30, 40), stop:1 rgb(0, 200, 230, 200)) stop:0 white, stop: 0.4 rgba(10, 20, 30, 40),
stop:1 rgb(0, 200, 230, 200))
} }
@ -549,7 +552,8 @@ QTextEdit {
QMessageBox { QMessageBox {
dialogbuttonbox-buttons-have-icons: true; dialogbuttonbox-buttons-have-icons: true;
dialog-ok-icon: url(ok.svg); dialog-ok-icon: url(ok.svg);
dialog-cancel-icon: url(cancel.png), url(grayed_cancel.png) disabled; dialog-cancel-icon: url(cancel.png),
url(grayed_cancel.png) disabled;
} }
//! [86] //! [86]

View File

@ -354,7 +354,7 @@
the above code indicates, we need to supply more information when obtaining the above code indicates, we need to supply more information when obtaining
a model index. a model index.
\table \table 70%
\row \li \inlineimage modelview-tablemodel.png \row \li \inlineimage modelview-tablemodel.png
\li \b{Rows and columns} \li \b{Rows and columns}
@ -386,7 +386,7 @@
\snippet code/doc_src_model-view-programming.cpp 3 \snippet code/doc_src_model-view-programming.cpp 3
\table \table 70%
\row \li \inlineimage modelview-treemodel.png \row \li \inlineimage modelview-treemodel.png
\li \b{Parents, rows, and columns} \li \b{Parents, rows, and columns}
@ -417,7 +417,7 @@
\snippet code/doc_src_model-view-programming.cpp 6 \snippet code/doc_src_model-view-programming.cpp 6
\table \table 70%
\row \li \inlineimage modelview-roles.png \row \li \inlineimage modelview-roles.png
\li \b{Item roles} \li \b{Item roles}
@ -902,7 +902,7 @@
The table below highlights the differences between current item and The table below highlights the differences between current item and
selected items. selected items.
\table \table 70%
\header \header
\li Current Item \li Current Item
\li Selected Items \li Selected Items
@ -1557,7 +1557,7 @@
of items. The selection mode works in the same way for all of the of items. The selection mode works in the same way for all of the
above widgets. above widgets.
\table \table 70%
\row \row
\li \image selection-single.png \li \image selection-single.png
\li \b{Single item selections:} \li \b{Single item selections:}
@ -1957,7 +1957,7 @@
To provide read-only access to data provided by a model, the following functions To provide read-only access to data provided by a model, the following functions
\e{must} be implemented in the model's subclass: \e{must} be implemented in the model's subclass:
\table 90% \table 70%
\row \li \l{QAbstractItemModel::flags()}{flags()} \row \li \l{QAbstractItemModel::flags()}{flags()}
\li Used by other components to obtain information about each item provided by \li Used by other components to obtain information about each item provided by
the model. In many models, the combination of flags should include the model. In many models, the combination of flags should include
@ -1982,7 +1982,7 @@
Additionally, the following functions \e{must} be implemented in direct subclasses Additionally, the following functions \e{must} be implemented in direct subclasses
of QAbstractTableModel and QAbstractItemModel: of QAbstractTableModel and QAbstractItemModel:
\table 90% \table 70%
\row \li \l{QAbstractItemModel::columnCount()}{columnCount()} \row \li \l{QAbstractItemModel::columnCount()}{columnCount()}
\li Provides the number of columns of data exposed by the model. List models do not \li Provides the number of columns of data exposed by the model. List models do not
provide this function because it is already implemented in QAbstractListModel. provide this function because it is already implemented in QAbstractListModel.
@ -1994,7 +1994,7 @@
functions to allow rows and columns to be inserted and removed. To enable functions to allow rows and columns to be inserted and removed. To enable
editing, the following functions must be implemented correctly: editing, the following functions must be implemented correctly:
\table 90% \table 70%
\row \li \l{QAbstractItemModel::flags()}{flags()} \row \li \l{QAbstractItemModel::flags()}{flags()}
\li Must return an appropriate combination of flags for each item. In particular, \li Must return an appropriate combination of flags for each item. In particular,
the value returned by this function must include \l{Qt::ItemIsEditable} in the value returned by this function must include \l{Qt::ItemIsEditable} in
@ -2024,7 +2024,7 @@
ensure that the appropriate functions are called to notify attached views and ensure that the appropriate functions are called to notify attached views and
delegates: delegates:
\table 90% \table 70%
\row \li \l{QAbstractItemModel::insertRows()}{insertRows()} \row \li \l{QAbstractItemModel::insertRows()}{insertRows()}
\li Used to add new rows and items of data to all types of model. \li Used to add new rows and items of data to all types of model.
Implementations must call Implementations must call
@ -2119,7 +2119,7 @@
structure, it is up to each model subclass to create its own model indexes structure, it is up to each model subclass to create its own model indexes
by providing implementations of the following functions: by providing implementations of the following functions:
\table 90% \table 70%
\row \li \l{QAbstractItemModel::index()}{index()} \row \li \l{QAbstractItemModel::index()}{index()}
\li Given a model index for a parent item, this function allows views and delegates \li Given a model index for a parent item, this function allows views and delegates
to access children of that item. If no valid child item - corresponding to the to access children of that item. If no valid child item - corresponding to the
@ -2164,7 +2164,7 @@
The following types are used to store information about The following types are used to store information about
each item as it is streamed into a QByteArray and stored in a QMimeData object: each item as it is streamed into a QByteArray and stored in a QMimeData object:
\table 90% \table 70%
\header \li Description \li Type \header \li Description \li Type
\row \li Row \li int \row \li Row \li int
\row \li Column \li int \row \li Column \li int
@ -2180,7 +2180,7 @@
export items of data in specialized formats by reimplementing the following export items of data in specialized formats by reimplementing the following
function: function:
\table 90% \table 70%
\row \li \l{QAbstractItemModel::mimeData()}{mimeData()} \row \li \l{QAbstractItemModel::mimeData()}{mimeData()}
\li This function can be reimplemented to return data in formats other \li This function can be reimplemented to return data in formats other
than the default \c{application/x-qabstractitemmodeldatalist} internal than the default \c{application/x-qabstractitemmodeldatalist} internal
@ -2215,7 +2215,7 @@
To take advantage of QAbstractItemModel's default implementation for the built-in To take advantage of QAbstractItemModel's default implementation for the built-in
MIME type, new models must provide reimplementations of the following functions: MIME type, new models must provide reimplementations of the following functions:
\table 90% \table 70%
\row \li \l{QAbstractItemModel::insertRows()}{insertRows()} \row \li \l{QAbstractItemModel::insertRows()}{insertRows()}
\li {1, 2} These functions enable the model to automatically insert new data using \li {1, 2} These functions enable the model to automatically insert new data using
the existing implementation provided by QAbstractItemModel::dropMimeData(). the existing implementation provided by QAbstractItemModel::dropMimeData().
@ -2228,7 +2228,7 @@
To accept other forms of data, these functions must be reimplemented: To accept other forms of data, these functions must be reimplemented:
\table 90% \table 70%
\row \li \l{QAbstractItemModel::supportedDropActions()}{supportedDropActions()} \row \li \l{QAbstractItemModel::supportedDropActions()}{supportedDropActions()}
\li Used to return a combination of \l{Qt::DropActions}{drop actions}, \li Used to return a combination of \l{Qt::DropActions}{drop actions},
indicating the types of drag and drop operations that the model accepts. indicating the types of drag and drop operations that the model accepts.

View File

@ -160,6 +160,7 @@
\table \table
\row \row
\li \snippet tutorials/widgets/childwidget/main.cpp main program \li \snippet tutorials/widgets/childwidget/main.cpp main program
\row
\li \inlineimage widgets-tutorial-childwidget.png \li \inlineimage widgets-tutorial-childwidget.png
\endtable \endtable
\enddiv \enddiv
@ -182,6 +183,7 @@
\table \table
\row \row
\li \snippet tutorials/widgets/windowlayout/main.cpp main program \li \snippet tutorials/widgets/windowlayout/main.cpp main program
\row
\li \inlineimage widgets-tutorial-windowlayout.png \li \inlineimage widgets-tutorial-windowlayout.png
\endtable \endtable
\enddiv \enddiv