diff --git a/examples/xlsx/demo/doc/images/xlsx_demo.png b/examples/xlsx/demo/doc/images/xlsx_demo.png index 954e0eb..0876c00 100644 Binary files a/examples/xlsx/demo/doc/images/xlsx_demo.png and b/examples/xlsx/demo/doc/images/xlsx_demo.png differ diff --git a/examples/xlsx/demo/doc/images/xlsx_demo_fonts.png b/examples/xlsx/demo/doc/images/xlsx_demo_fonts.png new file mode 100644 index 0000000..8b0bb22 Binary files /dev/null and b/examples/xlsx/demo/doc/images/xlsx_demo_fonts.png differ diff --git a/examples/xlsx/demo/doc/images/xlsx_demo_formulas.png b/examples/xlsx/demo/doc/images/xlsx_demo_formulas.png new file mode 100644 index 0000000..f8e3609 Binary files /dev/null and b/examples/xlsx/demo/doc/images/xlsx_demo_formulas.png differ diff --git a/examples/xlsx/demo/doc/images/xlsx_demo_grouping.png b/examples/xlsx/demo/doc/images/xlsx_demo_grouping.png new file mode 100644 index 0000000..9b60fd0 Binary files /dev/null and b/examples/xlsx/demo/doc/images/xlsx_demo_grouping.png differ diff --git a/examples/xlsx/demo/doc/images/xlsx_demo_merging.png b/examples/xlsx/demo/doc/images/xlsx_demo_merging.png new file mode 100644 index 0000000..ae58b1a Binary files /dev/null and b/examples/xlsx/demo/doc/images/xlsx_demo_merging.png differ diff --git a/examples/xlsx/demo/doc/src/demo.qdoc b/examples/xlsx/demo/doc/src/demo.qdoc index 4970286..f6e0061 100644 --- a/examples/xlsx/demo/doc/src/demo.qdoc +++ b/examples/xlsx/demo/doc/src/demo.qdoc @@ -1,8 +1,12 @@ /*! \example demo - \title Xlsx Demo + \title Qt Xlsx Demo \brief This is a demo which is used to show features of the library \ingroup qtxlsx-examples \image xlsx_demo.png + \image xlsx_demo_fonts.png + \image xlsx_demo_formulas.png + \image xlsx_demo_merging.png + \image xlsx_demo_grouping.png */ diff --git a/examples/xlsx/demo/main.cpp b/examples/xlsx/demo/main.cpp index 2dad0fd..eac6d4e 100644 --- a/examples/xlsx/demo/main.cpp +++ b/examples/xlsx/demo/main.cpp @@ -289,8 +289,8 @@ int main() xlsx.saveAs("Book1.xlsx"); //Make sure that read/write works well. - Document xlsx2("Book1.xlsx"); - xlsx2.saveAs("Book2.xlsx"); + Document xlsx2("demo.xlsx"); + xlsx2.saveAs("demo2.xlsx"); return 0; } diff --git a/examples/xlsx/documentproperty/doc/images/doc_property.png b/examples/xlsx/documentproperty/doc/images/doc_property.png new file mode 100644 index 0000000..bd449c6 Binary files /dev/null and b/examples/xlsx/documentproperty/doc/images/doc_property.png differ diff --git a/examples/xlsx/documentproperty/doc/src/documentproperty.qdoc b/examples/xlsx/documentproperty/doc/src/documentproperty.qdoc index e04aa90..d4f7671 100644 --- a/examples/xlsx/documentproperty/doc/src/documentproperty.qdoc +++ b/examples/xlsx/documentproperty/doc/src/documentproperty.qdoc @@ -1,11 +1,11 @@ /*! - \title Qt Xlsx Examples - Document Properties \example documentproperty - \title Xlsx DocProperties Example + \title Document Properties Example \brief This is a simplest xlsx examples. + \image doc_property.png + \ingroup qtxlsx-examples - This example demonstrates how to generate a - .xlsx file with Qt Xlsx Library. + This example demonstrates how to set the document properties. */ diff --git a/examples/xlsx/extractdata/doc/src/extractdata.qdoc b/examples/xlsx/extractdata/doc/src/extractdata.qdoc index 662e6c6..563cd59 100644 --- a/examples/xlsx/extractdata/doc/src/extractdata.qdoc +++ b/examples/xlsx/extractdata/doc/src/extractdata.qdoc @@ -9,8 +9,8 @@ This creates a new instance of the all important Document class which gives you access to the Excel workbook and worksheets. - \snippet hello/main.cpp 0 + \snippet extractdata/main.cpp 0 Extracts data from current worksheet. - \snippet hello/main.cpp 1 + \snippet extractdata/main.cpp 1 */ diff --git a/examples/xlsx/hello/doc/images/hello.png b/examples/xlsx/hello/doc/images/hello.png index 8c1a862..294bba5 100644 Binary files a/examples/xlsx/hello/doc/images/hello.png and b/examples/xlsx/hello/doc/images/hello.png differ diff --git a/examples/xlsx/hello/doc/src/hello.qdoc b/examples/xlsx/hello/doc/src/hello.qdoc index c35fba9..008947b 100644 --- a/examples/xlsx/hello/doc/src/hello.qdoc +++ b/examples/xlsx/hello/doc/src/hello.qdoc @@ -1,20 +1,22 @@ /*! \example hello - \title Xlsx Hello Example - \brief This is a simplest xlsx examples. + \title Hello QtXlsx Example + \brief This is a simplest Qt Xlsx example. \ingroup qtxlsx-examples - This example demonstrates how to generate a - simplest .xlsx file with Qt Xlsx Library. + This example demonstrates how to create a new + .xlsx file containing some basic data and calculations + with Qt Xlsx Library. So lets see how this is achieved. \image hello.png - Create an object of the class QXlsx::Document. + This creates a new instance of the all important Document + class which gives you access to the Excel workbook and worksheets. \snippet hello/main.cpp 0 - Set the cells of worksheet. + A default worksheet have been created by Document. Let's start + by adding some basic data. \snippet hello/main.cpp 1 - Save it. + Now save the file and all its components. \snippet hello/main.cpp 2 - */ diff --git a/examples/xlsx/xlsx.pro b/examples/xlsx/xlsx.pro index b337552..c58c88f 100644 --- a/examples/xlsx/xlsx.pro +++ b/examples/xlsx/xlsx.pro @@ -1,5 +1,7 @@ TEMPLATE = subdirs -SUBDIRS = hello style \ +SUBDIRS = hello \ + extractdata \ + style \ documentproperty \ image \ mergecells \ diff --git a/src/xlsx/doc/src/qtxlsx-index.qdoc b/src/xlsx/doc/src/qtxlsx-index.qdoc index e5f4c53..a46b3b5 100644 --- a/src/xlsx/doc/src/qtxlsx-index.qdoc +++ b/src/xlsx/doc/src/qtxlsx-index.qdoc @@ -32,8 +32,8 @@ Microsoft Excel and can be used in any platform that Qt5 supported. The library can be used to \list - \li Generate a new .xlsx file from scratch - \li Extract data from an existing .xlsx file + \li \l{Hello QtXlsx Example}{Generate a new .xlsx file from scratch} + \li \l{Extract Data Example}{Extract data from an existing .xlsx file} \li Edit an existing .xlsx file \endlist