From 726a8b16c52fe4608c89d740b47361a2b073ce01 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Thu, 21 Oct 2010 18:18:37 +0200 Subject: Doc: Corrected the name property as it was incorrectly declared. --- src/declarative/util/qdeclarativestateoperations.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index 8cb813c..d1d7822 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -648,7 +648,7 @@ void QDeclarativeStateChangeScript::setScript(const QDeclarativeScriptString &s) } /*! - \qmlproperty script StateChangeScript::script + \qmlproperty string StateChangeScript::name This property holds the name of the script. This name can be used by a ScriptAction to target a specific script. -- cgit v0.12 From 2a17ec1b2ef7164a9a5f4bd9b7e5854ed5884376 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Thu, 21 Oct 2010 18:22:09 +0200 Subject: Doc: Moved QFileSystemModel example code to the class documentation. Previously, the code showed how to use QDirModel and was included in the QDirModel class documentation, but it has since been changed to use QFileSystemModel instead. --- src/gui/dialogs/qfilesystemmodel.cpp | 45 +++++++++++++++++++++++++++--------- src/gui/itemviews/qdirmodel.cpp | 19 --------------- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp index 8a6190f..8a9f8ae 100644 --- a/src/gui/dialogs/qfilesystemmodel.cpp +++ b/src/gui/dialogs/qfilesystemmodel.cpp @@ -80,11 +80,43 @@ QT_BEGIN_NAMESPACE directories. In the simplest case, it can be used with a suitable display widget as part of a browser or filter. - QFileSystemModel will not fetch any files or directories until setRootPath + QFileSystemModel can be accessed using the standard interface provided by + QAbstractItemModel, but it also provides some convenience functions that are + specific to a directory model. + The fileInfo(), isDir(), name(), and path() functions provide information + about the underlying files and directories related to items in the model. + Directories can be created and removed using mkdir(), rmdir(). + + \note QFileSystemModel requires an instance of a GUI application. + + \section1 Example Usage + + A directory model that displays the contents of a default directory + is usually constructed with a parent object: + + \snippet doc/src/snippets/shareddirmodel/main.cpp 2 + + A tree view can be used to display the contents of the model + + \snippet doc/src/snippets/shareddirmodel/main.cpp 4 + + and the contents of a particular directory can be displayed by + setting the tree view's root index: + + \snippet doc/src/snippets/shareddirmodel/main.cpp 7 + + The view's root index can be used to control how much of a + hierarchical model is displayed. QDirModel provides a convenience + function that returns a suitable model index for a path to a + directory within the model. + + \section1 Caching and Performance + + QFileSystemModel will not fetch any files or directories until setRootPath() is called. This will prevent any unnecessary querying on the file system until that point such as listing the drives on Windows. - Unlike the QDirModel, QFileSystemModel uses a separate thread to populate + Unlike QDirModel, QFileSystemModel uses a separate thread to populate itself so it will not cause the main thread to hang as the file system is being queried. Calls to rowCount() will return 0 until the model populates a directory. @@ -92,15 +124,6 @@ QT_BEGIN_NAMESPACE QFileSystemModel keeps a cache with file information. The cache is automatically kept up to date using the QFileSystemWatcher. - QFileSystemModel can be accessed using the standard interface provided by - QAbstractItemModel, but it also provides some convenience functions that are - specific to a directory model. - The fileInfo(), isDir(), name(), and path() functions provide information - about the underlying files and directories related to items in the model. - Directories can be created and removed using mkdir(), rmdir(). - - \note QFileSystemModel requires an instance of a GUI application. - \sa {Model Classes} */ diff --git a/src/gui/itemviews/qdirmodel.cpp b/src/gui/itemviews/qdirmodel.cpp index 48599bc..cb6f81e 100644 --- a/src/gui/itemviews/qdirmodel.cpp +++ b/src/gui/itemviews/qdirmodel.cpp @@ -201,25 +201,6 @@ void QDirModelPrivate::invalidate() QDirModel keeps a cache with file information. The cache needs to be updated with refresh(). - A directory model that displays the contents of a default directory - is usually constructed with a parent object: - - \snippet doc/src/snippets/shareddirmodel/main.cpp 2 - - A tree view can be used to display the contents of the model - - \snippet doc/src/snippets/shareddirmodel/main.cpp 4 - - and the contents of a particular directory can be displayed by - setting the tree view's root index: - - \snippet doc/src/snippets/shareddirmodel/main.cpp 7 - - The view's root index can be used to control how much of a - hierarchical model is displayed. QDirModel provides a convenience - function that returns a suitable model index for a path to a - directory within the model. - QDirModel can be accessed using the standard interface provided by QAbstractItemModel, but it also provides some convenience functions that are specific to a directory model. The fileInfo() and isDir() -- cgit v0.12 From c29bc376c957867b57a6dd32549db6ae67be4f60 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Fri, 22 Oct 2010 15:56:23 +0200 Subject: Doc: Updated the Java trademark information. Checked with Legal. --- doc/src/legal/trademarks.qdoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/src/legal/trademarks.qdoc b/doc/src/legal/trademarks.qdoc index 42cb7a9..e69d57c 100644 --- a/doc/src/legal/trademarks.qdoc +++ b/doc/src/legal/trademarks.qdoc @@ -33,13 +33,13 @@ \brief Information about trademarks owned by Nokia and other organisations. Nokia, the Nokia logo, Qt, and the Qt logo are trademarks of Nokia -  Corporation and/or its subsidiaries in Finland and other countries. + Corporation and/or its subsidiaries in Finland and other countries. \list \o Intel, Intel Inside (logos), MMX and Pentium are \reg trademarks of Intel Corporation in the United States, other countries, or both. - \o Java and all Java-based trademarks are trademarks of Sun Microsystems, - Inc. in the United States, other countries, or both. + \o Oracle and Java are registered trademarks of Oracle and/or its affiliates. + Other names may be trademarks of their respective owners. \o Linux is a \reg trademark of Linus Torvalds in the United States, other countries or both. \o Mac, Mac OS and Macintosh are \reg trademarks of Apple Computer, Inc., -- cgit v0.12 From 928387618011af72e0011287e1002a9b51a6e51f Mon Sep 17 00:00:00 2001 From: David Boddie Date: Fri, 22 Oct 2010 15:57:36 +0200 Subject: Doc: Added Windows Vista to the trademark list. --- doc/src/legal/trademarks.qdoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/src/legal/trademarks.qdoc b/doc/src/legal/trademarks.qdoc index e69d57c..3bf783f 100644 --- a/doc/src/legal/trademarks.qdoc +++ b/doc/src/legal/trademarks.qdoc @@ -44,9 +44,9 @@ countries or both. \o Mac, Mac OS and Macintosh are \reg trademarks of Apple Computer, Inc., registered in the U.S. and other countries. - \o Microsoft, Windows, Windows NT, XP, Visual Studio and the Windows logo - are \reg trademarks of Microsoft Corporation in the United States, other - countries, or both. + \o Microsoft, Windows, Windows NT, XP, Windows Vista, Visual Studio and the + Windows logo are \reg trademarks of Microsoft Corporation in the United + States, other countries, or both. \o Motif is a registered trademark of The Open Group in the United States, other countries, or both. \o OpenGL is a \reg trademark of Silicon Graphics, Inc. in the United States -- cgit v0.12 From 9680a442876867ab779023e59e1092268eea74e4 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Fri, 29 Oct 2010 14:04:54 +0200 Subject: Doc: Fixed basic language. --- doc/src/index.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc index e42dfca..57fc18a 100644 --- a/doc/src/index.qdoc +++ b/doc/src/index.qdoc @@ -45,7 +45,7 @@
  • How to learn Qt
  • Tutorials
  • Examples
    • -
  • Whats new in Qt 4.7
    • +
  • What's new in Qt 4.7
    • -- cgit v0.12 From 6c796c75bfde7e79ec0802e0b7245283fc46d46e Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Mon, 1 Nov 2010 14:43:14 +0100 Subject: Doc: Fixing bug in sorting script for search results. Reviewed-by: Geir Vattekar --- doc/src/template/scripts/functions.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js index 47539d2..62bc535 100755 --- a/doc/src/template/scripts/functions.js +++ b/doc/src/template/scripts/functions.js @@ -105,17 +105,17 @@ function processNokiaData(response){ /* start a new list element */ full_li_element = ' Date: Tue, 2 Nov 2010 12:18:54 +0100 Subject: Doc: fixing style for search display and slim fit menus --- doc/src/template/style/style.css | 76 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 73 insertions(+), 3 deletions(-) diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css index 536b3c8..1e5c071 100755 --- a/doc/src/template/style/style.css +++ b/doc/src/template/style/style.css @@ -660,13 +660,31 @@ -webkit-box-shadow: 0 4px 6px 0 rgba(0,0,0,.2); -moz-box-shadow: 0 4px 6px 0 rgba(0,0,0,.2); box-shadow: 0 4px 6px 0 rgba(0,0,0,.2); + font-size: 11px; + } + + #resultdialog a + { + color: #00732f; } #resultdialog.active { display: block; - width:30%; } + .narrow #resultdialog { + width: 60%; + _width: 360px; + } + + .narrow #resultdialog.active { + right: 10px; + *left: auto; + _left: auto; + _right: -20px; + } + + #resultdialog #resultclose { float: right; } @@ -775,10 +793,11 @@ { float: left; text-indent: -10px; - margin-top: -5px; + /* margin-top: -5px;*/ margin-right: 15px; font-weight: bold; color: #B0ADAB; + font: 10px/1.2 Verdana; } .toolbuttons #print @@ -892,7 +911,6 @@ } .wrap .content h2 { - border-bottom:1px solid #DDDDDD; font:600 16px/1.2 Arial; margin-top:15px; width:100%; @@ -1658,6 +1676,58 @@ } /* end of creator spec*/ + .item { + float: left; + position: relative; + width: 100%; + overflow: hidden; + } + + + .item .primary { + margin-right: 220px; + position: relative; + } + + .item hr { + margin-left: -220px; + } + + .item .secondary { + float: right; + width: 200px; + position: relative; + } + + .item .cols { + clear: both; + display: block; + } + + .item .cols .col { + float: left; + margin-left: 1.5%; + } + + .item .cols .col.first { + margin-left: 0; + } + + .item .cols.two .col { + width: 45%; + } + + .item .box { + margin: 0 0 10px 0; + } + + .item .box h3 { + margin: 0 0 10px 0; + } + + .cols.unclear { + clear:none; + } } /* end of screen media */ -- cgit v0.12 From 1bf0fa453fa65c6d29696c0b56ebdcb99c384ad4 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Tue, 2 Nov 2010 12:39:37 +0100 Subject: Doc: fixing bugs in style --- doc/src/template/style/narrow.css | 1 + doc/src/template/style/style.css | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/src/template/style/narrow.css b/doc/src/template/style/narrow.css index c1e3f61..fbb0752 100644 --- a/doc/src/template/style/narrow.css +++ b/doc/src/template/style/narrow.css @@ -223,6 +223,7 @@ float: right; margin: 15px 40px 0 0; font-size: 11px; + position: relative; } .narrow #narrowmenu { diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css index 1e5c071..17665c0 100755 --- a/doc/src/template/style/style.css +++ b/doc/src/template/style/style.css @@ -101,7 +101,7 @@ } a { - color: #00732f; + color: #44a51c; text-decoration: none; } hr @@ -1297,6 +1297,10 @@ background-color: #E6E7E8; margin: 0; } + .small + { + font: normal 9px/1 Verdana; + } /* end footer elements */ @@ -1471,7 +1475,7 @@ } - .creator .header, .footer, .wrapper + .creator .header, .creator .footer, .creator .wrapper { max-width: 1500px; margin: 0px; -- cgit v0.12 From 663cef92a8ee7cf7675c235cafdb4c1aab7e0ef3 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Wed, 3 Nov 2010 10:17:55 +0100 Subject: Doc: Fixing columns to display all elements in lists - css3 --- doc/src/template/style/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css index 17665c0..faf17c8 100755 --- a/doc/src/template/style/style.css +++ b/doc/src/template/style/style.css @@ -101,7 +101,7 @@ } a { - color: #44a51c; + color: #00732F; text-decoration: none; } hr @@ -1008,7 +1008,7 @@ /*display:inline-block;*/ margin-left:10px; min-width:250px; - line-height: 1.2; + line-height: 1.5; min-width:100%; min-height:15px; } -- cgit v0.12 From 56d8cf4eb5385aa2d8ad3730c7ffa779a47622d8 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Wed, 3 Nov 2010 10:33:20 +0100 Subject: Doc: updating the template to support search feature better. --- tools/qdoc3/test/qt-html-templates.qdocconf | 34 ++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 47b1e5f..30a63c8 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -9,6 +9,7 @@ HTML.postheader = "
    \n" \ "
    \n" \ " Home
    \n" \ " Qt Reference Documentation\n" \ + "
    \n" \ "
    \n" \ "
      \n" \ "
    • Qt HOME
      • \n" \ @@ -26,6 +27,37 @@ HTML.postheader = "
      \n" \ " \n" \ "
    \n" \ "
    \n" \ + " \n" \ "
    \n" \ " \n" \ "
    \n" \ @@ -36,7 +68,7 @@ HTML.postheader = "
    \n" \ "
    \n" \ "
    \n" \ " Search index:
    \n" \ - "
    \n" \ + "
    \n" \ "
    \n" \ "
    \n" \ " \n" \ -- cgit v0.12 From 42ac542a913c78abbb18196b27dfbeee93c6a66f Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Wed, 3 Nov 2010 11:16:33 +0100 Subject: Doc: fixing style - tool buttons to bold. --- doc/src/template/style/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css index faf17c8..783178d 100755 --- a/doc/src/template/style/style.css +++ b/doc/src/template/style/style.css @@ -797,7 +797,7 @@ margin-right: 15px; font-weight: bold; color: #B0ADAB; - font: 10px/1.2 Verdana; + font: bold 10px/1.2 Verdana; } .toolbuttons #print -- cgit v0.12 From f23ec770df72e456a227f43a7d984bdb747f9043 Mon Sep 17 00:00:00 2001 From: Morten Engvoldsen Date: Wed, 3 Nov 2010 11:24:41 +0100 Subject: Doc: style tuning --- doc/src/template/style/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css index 783178d..16bc9ed 100755 --- a/doc/src/template/style/style.css +++ b/doc/src/template/style/style.css @@ -793,7 +793,7 @@ { float: left; text-indent: -10px; - /* margin-top: -5px;*/ + margin-top: -5px; margin-right: 15px; font-weight: bold; color: #B0ADAB; -- cgit v0.12 From 18b6067fa99004d1572e3d6b8fbc181729ad96be Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Wed, 3 Nov 2010 12:27:32 +0100 Subject: qdoc: Added next and previous links to top of pages. Task-number: QTBUG-14979 --- tools/qdoc3/htmlgenerator.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 7b719c8..fb04175 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1929,10 +1929,8 @@ void HtmlGenerator::generateHeader(const QString& title, } } -#if 0 // Removed for new doc format. MWS if (node && !node->links().empty()) - out() << "

    \n" << navigationLinks << "

    \n"; -#endif + out() << "

    \n" << navigationLinks << "

    \n"; } void HtmlGenerator::generateTitle(const QString& title, -- cgit v0.12