diff options
author | Frans Englich <frans.englich@nokia.com> | 2009-09-23 13:16:51 (GMT) |
---|---|---|
committer | Frans Englich <frans.englich@nokia.com> | 2009-09-23 13:16:51 (GMT) |
commit | 902ceabbca3cd3f3a06180aba64b0f81b3f1dba4 (patch) | |
tree | 64efeee683cd31c2a0f7511fecc3c124c91249fe /doc/src/diagrams | |
parent | 9161598b9cb374889ca6c69831c035c1eaa4d56e (diff) | |
parent | bbcef4e4b596324aeda80e0aa7d313c586454740 (diff) | |
download | Qt-902ceabbca3cd3f3a06180aba64b0f81b3f1dba4.zip Qt-902ceabbca3cd3f3a06180aba64b0f81b3f1dba4.tar.gz Qt-902ceabbca3cd3f3a06180aba64b0f81b3f1dba4.tar.bz2 |
Merge commit 'qt/4.6' into mmfphonon
Conflicts:
demos/embedded/fluidlauncher/config_s60/config.xml
demos/embedded/fluidlauncher/fluidlauncher.pro
src/corelib/io/io.pri
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qwidget_s60.cpp
src/s60installs/qt_libs.pro
Diffstat (limited to 'doc/src/diagrams')
-rwxr-xr-x | doc/src/diagrams/contentspropagation/customwidget.py | 40 | ||||
-rwxr-xr-x | doc/src/diagrams/contentspropagation/standardwidgets.py | 40 | ||||
-rw-r--r-- | doc/src/diagrams/dbus-examples.png | bin | 0 -> 19642 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-adding-toolbar-action1.png | bin | 14911 -> 0 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-adding-actions.txt (renamed from doc/src/diagrams/designer-adding-actions.txt) | 0 | ||||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-adding-dockwidget.txt (renamed from doc/src/diagrams/designer-adding-dockwidget.txt) | 0 | ||||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-adding-dockwidget1.png (renamed from doc/src/diagrams/designer-adding-dockwidget1.png) | bin | 8897 -> 8897 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-adding-dockwidget1.zip (renamed from doc/src/diagrams/designer-adding-dockwidget1.zip) | bin | 12252 -> 12252 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-adding-dynamic-property.png (renamed from doc/src/diagrams/designer-adding-dynamic-property.png) | bin | 9568 -> 9568 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-adding-menu-action1.png (renamed from doc/src/diagrams/designer-adding-menu-action1.png) | bin | 16173 -> 16173 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-adding-menu-action1.zip (renamed from doc/src/diagrams/designer-adding-menu-action1.zip) | bin | 19245 -> 19245 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-adding-menu-action2.zip (renamed from doc/src/diagrams/designer-adding-menu-action2.zip) | bin | 19587 -> 19587 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-adding-toolbar-action1.png | bin | 0 -> 21640 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-adding-toolbar-action1.zip (renamed from doc/src/diagrams/designer-adding-toolbar-action1.zip) | bin | 17515 -> 17515 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-adding-toolbar-action2.zip (renamed from doc/src/diagrams/designer-adding-toolbar-action2.zip) | bin | 15433 -> 15433 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-creating-dynamic-property.png (renamed from doc/src/diagrams/designer-creating-dynamic-property.png) | bin | 7561 -> 7561 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-creating-menu-entry1.png (renamed from doc/src/diagrams/designer-creating-menu-entry1.png) | bin | 9618 -> 9618 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-creating-menu-entry1.zip (renamed from doc/src/diagrams/designer-creating-menu-entry1.zip) | bin | 11753 -> 11753 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-creating-menu-entry2.png (renamed from doc/src/diagrams/designer-creating-menu-entry2.png) | bin | 9090 -> 9090 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-creating-menu-entry2.zip (renamed from doc/src/diagrams/designer-creating-menu-entry2.zip) | bin | 11709 -> 11709 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-creating-menu-entry3.png (renamed from doc/src/diagrams/designer-creating-menu-entry3.png) | bin | 5435 -> 5435 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-creating-menu-entry3.zip (renamed from doc/src/diagrams/designer-creating-menu-entry3.zip) | bin | 11520 -> 11520 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-creating-menu-entry4.png (renamed from doc/src/diagrams/designer-creating-menu-entry4.png) | bin | 10141 -> 10141 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-creating-menu-entry4.zip (renamed from doc/src/diagrams/designer-creating-menu-entry4.zip) | bin | 12473 -> 12473 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-creating-menu.txt (renamed from doc/src/diagrams/designer-creating-menu.txt) | 0 | ||||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-creating-menu1.png (renamed from doc/src/diagrams/designer-creating-menu1.png) | bin | 4733 -> 4733 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-creating-menu1.zip (renamed from doc/src/diagrams/designer-creating-menu1.zip) | bin | 5279 -> 5279 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-creating-menu2.png (renamed from doc/src/diagrams/designer-creating-menu2.png) | bin | 4296 -> 4296 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-creating-menu2.zip (renamed from doc/src/diagrams/designer-creating-menu2.zip) | bin | 5295 -> 5295 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-creating-menu3.png (renamed from doc/src/diagrams/designer-creating-menu3.png) | bin | 5053 -> 5053 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-creating-menu3.zip (renamed from doc/src/diagrams/designer-creating-menu3.zip) | bin | 6197 -> 6197 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-creating-menu4.png (renamed from doc/src/diagrams/designer-creating-menu4.png) | bin | 5274 -> 5274 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-creating-menubar.png (renamed from doc/src/diagrams/designer-creating-menubar.png) | bin | 7024 -> 7024 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-creating-menubar.zip (renamed from doc/src/diagrams/designer-creating-menubar.zip) | bin | 10485 -> 10485 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-edit-resource.zip (renamed from doc/src/diagrams/designer-edit-resource.zip) | bin | 11195 -> 11195 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-find-icon.zip (renamed from doc/src/diagrams/designer-find-icon.zip) | bin | 47820 -> 47820 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-form-layoutfunction-crop.png (renamed from doc/src/diagrams/designer-form-layoutfunction-crop.png) | bin | 5132 -> 5132 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-form-layoutfunction.png (renamed from doc/src/diagrams/designer-form-layoutfunction.png) | bin | 15912 -> 15912 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-form-layoutfunction.zip (renamed from doc/src/diagrams/designer-form-layoutfunction.zip) | bin | 21179 -> 21179 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-main-window.zip (renamed from doc/src/diagrams/designer-main-window.zip) | bin | 35959 -> 35959 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-mainwindow-actions.ui (renamed from doc/src/diagrams/designer-mainwindow-actions.ui) | 0 | ||||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-palette-brush-editor.zip (renamed from doc/src/diagrams/designer-palette-brush-editor.zip) | bin | 17703 -> 17703 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-palette-editor.zip (renamed from doc/src/diagrams/designer-palette-editor.zip) | bin | 30588 -> 30588 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-palette-gradient-editor.zip (renamed from doc/src/diagrams/designer-palette-gradient-editor.zip) | bin | 55456 -> 55456 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-palette-pattern-editor.zip (renamed from doc/src/diagrams/designer-palette-pattern-editor.zip) | bin | 15845 -> 15845 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-resource-editor.zip (renamed from doc/src/diagrams/designer-resource-editor.zip) | bin | 12287 -> 12287 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/designer-widget-box.zip (renamed from doc/src/diagrams/designer-widget-box.zip) | bin | 30530 -> 30530 bytes | |||
-rw-r--r-- | doc/src/diagrams/designer-manual/rgbController.ui | 212 | ||||
-rw-r--r-- | doc/src/diagrams/programs/easingcurve/main.cpp | 30 | ||||
-rw-r--r-- | doc/src/diagrams/programs/mdiarea.py | 40 | ||||
-rw-r--r-- | doc/src/diagrams/programs/qpen-dashpattern.py | 40 | ||||
-rw-r--r-- | doc/src/diagrams/qt-embedded-architecture.sk | 402 | ||||
-rw-r--r-- | doc/src/diagrams/qtopiacore/home-screen.png | bin | 0 -> 13969 bytes | |||
-rw-r--r-- | doc/src/diagrams/qtopiacore/qt-embedded-linux-architecture.sk | 303 |
54 files changed, 1092 insertions, 15 deletions
diff --git a/doc/src/diagrams/contentspropagation/customwidget.py b/doc/src/diagrams/contentspropagation/customwidget.py index 89e0b1b..4d37332 100755 --- a/doc/src/diagrams/contentspropagation/customwidget.py +++ b/doc/src/diagrams/contentspropagation/customwidget.py @@ -1,4 +1,44 @@ #!/usr/bin/env python +############################################################################# +## +## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +## All rights reserved. +## Contact: Nokia Corporation (qt-info@nokia.com) +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## No Commercial Usage +## This file contains pre-release code and may not be distributed. +## You may use this file in accordance with the terms and conditions +## contained in the Technology Preview License Agreement accompanying +## this package. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 2.1 requirements +## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## In addition, as a special exception, Nokia gives you certain additional +## rights. These rights are described in the Nokia Qt LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## If you have questions regarding the use of this file, please contact +## Nokia at qt-info@nokia.com. +## +## +## +## +## +## +## +## +## $QT_END_LICENSE$ +## +############################################################################# import os, sys from PyQt4.QtCore import * diff --git a/doc/src/diagrams/contentspropagation/standardwidgets.py b/doc/src/diagrams/contentspropagation/standardwidgets.py index 975287d..2284aa5 100755 --- a/doc/src/diagrams/contentspropagation/standardwidgets.py +++ b/doc/src/diagrams/contentspropagation/standardwidgets.py @@ -1,4 +1,44 @@ #!/usr/bin/env python +############################################################################# +## +## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +## All rights reserved. +## Contact: Nokia Corporation (qt-info@nokia.com) +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## No Commercial Usage +## This file contains pre-release code and may not be distributed. +## You may use this file in accordance with the terms and conditions +## contained in the Technology Preview License Agreement accompanying +## this package. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 2.1 requirements +## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## In addition, as a special exception, Nokia gives you certain additional +## rights. These rights are described in the Nokia Qt LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## If you have questions regarding the use of this file, please contact +## Nokia at qt-info@nokia.com. +## +## +## +## +## +## +## +## +## $QT_END_LICENSE$ +## +############################################################################# import os, sys from PyQt4.QtCore import * diff --git a/doc/src/diagrams/dbus-examples.png b/doc/src/diagrams/dbus-examples.png Binary files differnew file mode 100644 index 0000000..816a9ab --- /dev/null +++ b/doc/src/diagrams/dbus-examples.png diff --git a/doc/src/diagrams/designer-adding-toolbar-action1.png b/doc/src/diagrams/designer-adding-toolbar-action1.png Binary files differdeleted file mode 100644 index 6b82373..0000000 --- a/doc/src/diagrams/designer-adding-toolbar-action1.png +++ /dev/null diff --git a/doc/src/diagrams/designer-adding-actions.txt b/doc/src/diagrams/designer-manual/designer-adding-actions.txt index 4124ecc..4124ecc 100644 --- a/doc/src/diagrams/designer-adding-actions.txt +++ b/doc/src/diagrams/designer-manual/designer-adding-actions.txt diff --git a/doc/src/diagrams/designer-adding-dockwidget.txt b/doc/src/diagrams/designer-manual/designer-adding-dockwidget.txt index 97b4beb..97b4beb 100644 --- a/doc/src/diagrams/designer-adding-dockwidget.txt +++ b/doc/src/diagrams/designer-manual/designer-adding-dockwidget.txt diff --git a/doc/src/diagrams/designer-adding-dockwidget1.png b/doc/src/diagrams/designer-manual/designer-adding-dockwidget1.png Binary files differindex 960da83..960da83 100644 --- a/doc/src/diagrams/designer-adding-dockwidget1.png +++ b/doc/src/diagrams/designer-manual/designer-adding-dockwidget1.png diff --git a/doc/src/diagrams/designer-adding-dockwidget1.zip b/doc/src/diagrams/designer-manual/designer-adding-dockwidget1.zip Binary files differindex 0492df6..0492df6 100644 --- a/doc/src/diagrams/designer-adding-dockwidget1.zip +++ b/doc/src/diagrams/designer-manual/designer-adding-dockwidget1.zip diff --git a/doc/src/diagrams/designer-adding-dynamic-property.png b/doc/src/diagrams/designer-manual/designer-adding-dynamic-property.png Binary files differindex 8e81dd9..8e81dd9 100644 --- a/doc/src/diagrams/designer-adding-dynamic-property.png +++ b/doc/src/diagrams/designer-manual/designer-adding-dynamic-property.png diff --git a/doc/src/diagrams/designer-adding-menu-action1.png b/doc/src/diagrams/designer-manual/designer-adding-menu-action1.png Binary files differindex cde92d9..cde92d9 100644 --- a/doc/src/diagrams/designer-adding-menu-action1.png +++ b/doc/src/diagrams/designer-manual/designer-adding-menu-action1.png diff --git a/doc/src/diagrams/designer-adding-menu-action1.zip b/doc/src/diagrams/designer-manual/designer-adding-menu-action1.zip Binary files differindex 08395eb..08395eb 100644 --- a/doc/src/diagrams/designer-adding-menu-action1.zip +++ b/doc/src/diagrams/designer-manual/designer-adding-menu-action1.zip diff --git a/doc/src/diagrams/designer-adding-menu-action2.zip b/doc/src/diagrams/designer-manual/designer-adding-menu-action2.zip Binary files differindex ca1a5b3..ca1a5b3 100644 --- a/doc/src/diagrams/designer-adding-menu-action2.zip +++ b/doc/src/diagrams/designer-manual/designer-adding-menu-action2.zip diff --git a/doc/src/diagrams/designer-manual/designer-adding-toolbar-action1.png b/doc/src/diagrams/designer-manual/designer-adding-toolbar-action1.png Binary files differnew file mode 100644 index 0000000..4d28722 --- /dev/null +++ b/doc/src/diagrams/designer-manual/designer-adding-toolbar-action1.png diff --git a/doc/src/diagrams/designer-adding-toolbar-action1.zip b/doc/src/diagrams/designer-manual/designer-adding-toolbar-action1.zip Binary files differindex e673b3c..e673b3c 100644 --- a/doc/src/diagrams/designer-adding-toolbar-action1.zip +++ b/doc/src/diagrams/designer-manual/designer-adding-toolbar-action1.zip diff --git a/doc/src/diagrams/designer-adding-toolbar-action2.zip b/doc/src/diagrams/designer-manual/designer-adding-toolbar-action2.zip Binary files differindex 96a9d69..96a9d69 100644 --- a/doc/src/diagrams/designer-adding-toolbar-action2.zip +++ b/doc/src/diagrams/designer-manual/designer-adding-toolbar-action2.zip diff --git a/doc/src/diagrams/designer-creating-dynamic-property.png b/doc/src/diagrams/designer-manual/designer-creating-dynamic-property.png Binary files differindex 1c3d3ca..1c3d3ca 100644 --- a/doc/src/diagrams/designer-creating-dynamic-property.png +++ b/doc/src/diagrams/designer-manual/designer-creating-dynamic-property.png diff --git a/doc/src/diagrams/designer-creating-menu-entry1.png b/doc/src/diagrams/designer-manual/designer-creating-menu-entry1.png Binary files differindex 33aa0d6..33aa0d6 100644 --- a/doc/src/diagrams/designer-creating-menu-entry1.png +++ b/doc/src/diagrams/designer-manual/designer-creating-menu-entry1.png diff --git a/doc/src/diagrams/designer-creating-menu-entry1.zip b/doc/src/diagrams/designer-manual/designer-creating-menu-entry1.zip Binary files differindex f9e64c8..f9e64c8 100644 --- a/doc/src/diagrams/designer-creating-menu-entry1.zip +++ b/doc/src/diagrams/designer-manual/designer-creating-menu-entry1.zip diff --git a/doc/src/diagrams/designer-creating-menu-entry2.png b/doc/src/diagrams/designer-manual/designer-creating-menu-entry2.png Binary files differindex 8338d08..8338d08 100644 --- a/doc/src/diagrams/designer-creating-menu-entry2.png +++ b/doc/src/diagrams/designer-manual/designer-creating-menu-entry2.png diff --git a/doc/src/diagrams/designer-creating-menu-entry2.zip b/doc/src/diagrams/designer-manual/designer-creating-menu-entry2.zip Binary files differindex 67d81e4..67d81e4 100644 --- a/doc/src/diagrams/designer-creating-menu-entry2.zip +++ b/doc/src/diagrams/designer-manual/designer-creating-menu-entry2.zip diff --git a/doc/src/diagrams/designer-creating-menu-entry3.png b/doc/src/diagrams/designer-manual/designer-creating-menu-entry3.png Binary files differindex d242646..d242646 100644 --- a/doc/src/diagrams/designer-creating-menu-entry3.png +++ b/doc/src/diagrams/designer-manual/designer-creating-menu-entry3.png diff --git a/doc/src/diagrams/designer-creating-menu-entry3.zip b/doc/src/diagrams/designer-manual/designer-creating-menu-entry3.zip Binary files differindex d530186..d530186 100644 --- a/doc/src/diagrams/designer-creating-menu-entry3.zip +++ b/doc/src/diagrams/designer-manual/designer-creating-menu-entry3.zip diff --git a/doc/src/diagrams/designer-creating-menu-entry4.png b/doc/src/diagrams/designer-manual/designer-creating-menu-entry4.png Binary files differindex 07a49ba..07a49ba 100644 --- a/doc/src/diagrams/designer-creating-menu-entry4.png +++ b/doc/src/diagrams/designer-manual/designer-creating-menu-entry4.png diff --git a/doc/src/diagrams/designer-creating-menu-entry4.zip b/doc/src/diagrams/designer-manual/designer-creating-menu-entry4.zip Binary files differindex d800c31..d800c31 100644 --- a/doc/src/diagrams/designer-creating-menu-entry4.zip +++ b/doc/src/diagrams/designer-manual/designer-creating-menu-entry4.zip diff --git a/doc/src/diagrams/designer-creating-menu.txt b/doc/src/diagrams/designer-manual/designer-creating-menu.txt index b5b2934..b5b2934 100644 --- a/doc/src/diagrams/designer-creating-menu.txt +++ b/doc/src/diagrams/designer-manual/designer-creating-menu.txt diff --git a/doc/src/diagrams/designer-creating-menu1.png b/doc/src/diagrams/designer-manual/designer-creating-menu1.png Binary files differindex d92a88a..d92a88a 100644 --- a/doc/src/diagrams/designer-creating-menu1.png +++ b/doc/src/diagrams/designer-manual/designer-creating-menu1.png diff --git a/doc/src/diagrams/designer-creating-menu1.zip b/doc/src/diagrams/designer-manual/designer-creating-menu1.zip Binary files differindex 780b1ac..780b1ac 100644 --- a/doc/src/diagrams/designer-creating-menu1.zip +++ b/doc/src/diagrams/designer-manual/designer-creating-menu1.zip diff --git a/doc/src/diagrams/designer-creating-menu2.png b/doc/src/diagrams/designer-manual/designer-creating-menu2.png Binary files differindex 7be4891..7be4891 100644 --- a/doc/src/diagrams/designer-creating-menu2.png +++ b/doc/src/diagrams/designer-manual/designer-creating-menu2.png diff --git a/doc/src/diagrams/designer-creating-menu2.zip b/doc/src/diagrams/designer-manual/designer-creating-menu2.zip Binary files differindex 00664a6..00664a6 100644 --- a/doc/src/diagrams/designer-creating-menu2.zip +++ b/doc/src/diagrams/designer-manual/designer-creating-menu2.zip diff --git a/doc/src/diagrams/designer-creating-menu3.png b/doc/src/diagrams/designer-manual/designer-creating-menu3.png Binary files differindex c2f1beb..c2f1beb 100644 --- a/doc/src/diagrams/designer-creating-menu3.png +++ b/doc/src/diagrams/designer-manual/designer-creating-menu3.png diff --git a/doc/src/diagrams/designer-creating-menu3.zip b/doc/src/diagrams/designer-manual/designer-creating-menu3.zip Binary files differindex 76ecbe0..76ecbe0 100644 --- a/doc/src/diagrams/designer-creating-menu3.zip +++ b/doc/src/diagrams/designer-manual/designer-creating-menu3.zip diff --git a/doc/src/diagrams/designer-creating-menu4.png b/doc/src/diagrams/designer-manual/designer-creating-menu4.png Binary files differindex 3a3ab54..3a3ab54 100644 --- a/doc/src/diagrams/designer-creating-menu4.png +++ b/doc/src/diagrams/designer-manual/designer-creating-menu4.png diff --git a/doc/src/diagrams/designer-creating-menubar.png b/doc/src/diagrams/designer-manual/designer-creating-menubar.png Binary files differindex e8078e0..e8078e0 100644 --- a/doc/src/diagrams/designer-creating-menubar.png +++ b/doc/src/diagrams/designer-manual/designer-creating-menubar.png diff --git a/doc/src/diagrams/designer-creating-menubar.zip b/doc/src/diagrams/designer-manual/designer-creating-menubar.zip Binary files differindex bddbf0e..bddbf0e 100644 --- a/doc/src/diagrams/designer-creating-menubar.zip +++ b/doc/src/diagrams/designer-manual/designer-creating-menubar.zip diff --git a/doc/src/diagrams/designer-edit-resource.zip b/doc/src/diagrams/designer-manual/designer-edit-resource.zip Binary files differindex dc43d9e..dc43d9e 100644 --- a/doc/src/diagrams/designer-edit-resource.zip +++ b/doc/src/diagrams/designer-manual/designer-edit-resource.zip diff --git a/doc/src/diagrams/designer-find-icon.zip b/doc/src/diagrams/designer-manual/designer-find-icon.zip Binary files differindex e94abd9..e94abd9 100644 --- a/doc/src/diagrams/designer-find-icon.zip +++ b/doc/src/diagrams/designer-manual/designer-find-icon.zip diff --git a/doc/src/diagrams/designer-form-layoutfunction-crop.png b/doc/src/diagrams/designer-manual/designer-form-layoutfunction-crop.png Binary files differindex e8dd39f..e8dd39f 100644 --- a/doc/src/diagrams/designer-form-layoutfunction-crop.png +++ b/doc/src/diagrams/designer-manual/designer-form-layoutfunction-crop.png diff --git a/doc/src/diagrams/designer-form-layoutfunction.png b/doc/src/diagrams/designer-manual/designer-form-layoutfunction.png Binary files differindex 9101e89..9101e89 100644 --- a/doc/src/diagrams/designer-form-layoutfunction.png +++ b/doc/src/diagrams/designer-manual/designer-form-layoutfunction.png diff --git a/doc/src/diagrams/designer-form-layoutfunction.zip b/doc/src/diagrams/designer-manual/designer-form-layoutfunction.zip Binary files differindex fcce637..fcce637 100644 --- a/doc/src/diagrams/designer-form-layoutfunction.zip +++ b/doc/src/diagrams/designer-manual/designer-form-layoutfunction.zip diff --git a/doc/src/diagrams/designer-main-window.zip b/doc/src/diagrams/designer-manual/designer-main-window.zip Binary files differindex 69b7ee6..69b7ee6 100644 --- a/doc/src/diagrams/designer-main-window.zip +++ b/doc/src/diagrams/designer-manual/designer-main-window.zip diff --git a/doc/src/diagrams/designer-mainwindow-actions.ui b/doc/src/diagrams/designer-manual/designer-mainwindow-actions.ui index 593a2de..593a2de 100644 --- a/doc/src/diagrams/designer-mainwindow-actions.ui +++ b/doc/src/diagrams/designer-manual/designer-mainwindow-actions.ui diff --git a/doc/src/diagrams/designer-palette-brush-editor.zip b/doc/src/diagrams/designer-manual/designer-palette-brush-editor.zip Binary files differindex 698f271..698f271 100644 --- a/doc/src/diagrams/designer-palette-brush-editor.zip +++ b/doc/src/diagrams/designer-manual/designer-palette-brush-editor.zip diff --git a/doc/src/diagrams/designer-palette-editor.zip b/doc/src/diagrams/designer-manual/designer-palette-editor.zip Binary files differindex 96646ab..96646ab 100644 --- a/doc/src/diagrams/designer-palette-editor.zip +++ b/doc/src/diagrams/designer-manual/designer-palette-editor.zip diff --git a/doc/src/diagrams/designer-palette-gradient-editor.zip b/doc/src/diagrams/designer-manual/designer-palette-gradient-editor.zip Binary files differindex 4696516..4696516 100644 --- a/doc/src/diagrams/designer-palette-gradient-editor.zip +++ b/doc/src/diagrams/designer-manual/designer-palette-gradient-editor.zip diff --git a/doc/src/diagrams/designer-palette-pattern-editor.zip b/doc/src/diagrams/designer-manual/designer-palette-pattern-editor.zip Binary files differindex 7382bad..7382bad 100644 --- a/doc/src/diagrams/designer-palette-pattern-editor.zip +++ b/doc/src/diagrams/designer-manual/designer-palette-pattern-editor.zip diff --git a/doc/src/diagrams/designer-resource-editor.zip b/doc/src/diagrams/designer-manual/designer-resource-editor.zip Binary files differindex 2c11da4..2c11da4 100644 --- a/doc/src/diagrams/designer-resource-editor.zip +++ b/doc/src/diagrams/designer-manual/designer-resource-editor.zip diff --git a/doc/src/diagrams/designer-widget-box.zip b/doc/src/diagrams/designer-manual/designer-widget-box.zip Binary files differindex 7ba8f77..7ba8f77 100644 --- a/doc/src/diagrams/designer-widget-box.zip +++ b/doc/src/diagrams/designer-manual/designer-widget-box.zip diff --git a/doc/src/diagrams/designer-manual/rgbController.ui b/doc/src/diagrams/designer-manual/rgbController.ui new file mode 100644 index 0000000..37c839f --- /dev/null +++ b/doc/src/diagrams/designer-manual/rgbController.ui @@ -0,0 +1,212 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>Form</class> + <widget class="QWidget" name="Form"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>300</height> + </rect> + </property> + <property name="windowTitle"> + <string>RGB Controller</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>RED</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QSpinBox" name="spinBox"> + <property name="maximum"> + <number>255</number> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QSlider" name="verticalSlider"> + <property name="maximum"> + <number>255</number> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>GREEN</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QSpinBox" name="spinBox_2"> + <property name="maximum"> + <number>255</number> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QSlider" name="verticalSlider_2"> + <property name="maximum"> + <number>255</number> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>BLUE</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QSpinBox" name="spinBox_3"> + <property name="maximum"> + <number>255</number> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="QSlider" name="verticalSlider_3"> + <property name="maximum"> + <number>255</number> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + </layout> + </item> + </layout> + <zorder>label</zorder> + <zorder>label_2</zorder> + <zorder>label_3</zorder> + <zorder>spinBox</zorder> + <zorder>spinBox_2</zorder> + <zorder>spinBox_3</zorder> + <zorder>verticalSlider</zorder> + <zorder>verticalSlider_2</zorder> + <zorder>verticalSlider_3</zorder> + <zorder>verticalSlider</zorder> + </widget> + <resources/> + <connections> + <connection> + <sender>spinBox</sender> + <signal>valueChanged(int)</signal> + <receiver>verticalSlider</receiver> + <slot>setValue(int)</slot> + <hints> + <hint type="sourcelabel"> + <x>55</x> + <y>51</y> + </hint> + <hint type="destinationlabel"> + <x>53</x> + <y>233</y> + </hint> + </hints> + </connection> + <connection> + <sender>spinBox_2</sender> + <signal>valueChanged(int)</signal> + <receiver>verticalSlider_2</receiver> + <slot>setValue(int)</slot> + <hints> + <hint type="sourcelabel"> + <x>193</x> + <y>46</y> + </hint> + <hint type="destinationlabel"> + <x>186</x> + <y>105</y> + </hint> + </hints> + </connection> + <connection> + <sender>spinBox_3</sender> + <signal>valueChanged(int)</signal> + <receiver>verticalSlider_3</receiver> + <slot>setValue(int)</slot> + <hints> + <hint type="sourcelabel"> + <x>312</x> + <y>38</y> + </hint> + <hint type="destinationlabel"> + <x>312</x> + <y>132</y> + </hint> + </hints> + </connection> + <connection> + <sender>verticalSlider</sender> + <signal>valueChanged(int)</signal> + <receiver>spinBox</receiver> + <slot>setValue(int)</slot> + <hints> + <hint type="sourcelabel"> + <x>57</x> + <y>86</y> + </hint> + <hint type="destinationlabel"> + <x>73</x> + <y>46</y> + </hint> + </hints> + </connection> + <connection> + <sender>verticalSlider_2</sender> + <signal>valueChanged(int)</signal> + <receiver>spinBox_2</receiver> + <slot>setValue(int)</slot> + <hints> + <hint type="sourcelabel"> + <x>187</x> + <y>135</y> + </hint> + <hint type="destinationlabel"> + <x>212</x> + <y>44</y> + </hint> + </hints> + </connection> + <connection> + <sender>verticalSlider_3</sender> + <signal>valueChanged(int)</signal> + <receiver>spinBox_3</receiver> + <slot>setValue(int)</slot> + <hints> + <hint type="sourcelabel"> + <x>315</x> + <y>187</y> + </hint> + <hint type="destinationlabel"> + <x>349</x> + <y>50</y> + </hint> + </hints> + </connection> + </connections> +</ui> diff --git a/doc/src/diagrams/programs/easingcurve/main.cpp b/doc/src/diagrams/programs/easingcurve/main.cpp index a20f142..0b583e7 100644 --- a/doc/src/diagrams/programs/easingcurve/main.cpp +++ b/doc/src/diagrams/programs/easingcurve/main.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the examples of the Qt Toolkit. @@ -9,8 +10,8 @@ ** No Commercial Usage ** This file contains pre-release code and may not be distributed. ** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. +** contained in the Technology Preview License Agreement accompanying +** this package. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -20,21 +21,20 @@ ** ensure the GNU Lesser General Public License version 2.1 requirements ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. ** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/doc/src/diagrams/programs/mdiarea.py b/doc/src/diagrams/programs/mdiarea.py index c78659f..491e315 100644 --- a/doc/src/diagrams/programs/mdiarea.py +++ b/doc/src/diagrams/programs/mdiarea.py @@ -1,4 +1,44 @@ #!/usr/bin/env python +############################################################################# +## +## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +## All rights reserved. +## Contact: Nokia Corporation (qt-info@nokia.com) +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## No Commercial Usage +## This file contains pre-release code and may not be distributed. +## You may use this file in accordance with the terms and conditions +## contained in the Technology Preview License Agreement accompanying +## this package. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 2.1 requirements +## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## In addition, as a special exception, Nokia gives you certain additional +## rights. These rights are described in the Nokia Qt LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## If you have questions regarding the use of this file, please contact +## Nokia at qt-info@nokia.com. +## +## +## +## +## +## +## +## +## $QT_END_LICENSE$ +## +############################################################################# import sys from PyQt4.QtCore import SIGNAL diff --git a/doc/src/diagrams/programs/qpen-dashpattern.py b/doc/src/diagrams/programs/qpen-dashpattern.py index 095d51f..7535f48 100644 --- a/doc/src/diagrams/programs/qpen-dashpattern.py +++ b/doc/src/diagrams/programs/qpen-dashpattern.py @@ -1,4 +1,44 @@ #!/usr/bin/env python +############################################################################# +## +## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +## All rights reserved. +## Contact: Nokia Corporation (qt-info@nokia.com) +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## No Commercial Usage +## This file contains pre-release code and may not be distributed. +## You may use this file in accordance with the terms and conditions +## contained in the Technology Preview License Agreement accompanying +## this package. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 2.1 requirements +## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## In addition, as a special exception, Nokia gives you certain additional +## rights. These rights are described in the Nokia Qt LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## If you have questions regarding the use of this file, please contact +## Nokia at qt-info@nokia.com. +## +## +## +## +## +## +## +## +## $QT_END_LICENSE$ +## +############################################################################# import sys from PyQt4.QtCore import * diff --git a/doc/src/diagrams/qt-embedded-architecture.sk b/doc/src/diagrams/qt-embedded-architecture.sk new file mode 100644 index 0000000..1aba03b --- /dev/null +++ b/doc/src/diagrams/qt-embedded-architecture.sk @@ -0,0 +1,402 @@ +##Sketch 1 2 +document() +layout('A4',0) +layer('Layer 1',1,1,0,0,(0,0,0)) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(284.808,72.5,0) +bs(282.5,72.5,0) +bs(282.5,77.5,0) +bs(287.5,77.5,0) +bs(287.5,72.5,0) +bs(284.808,72.5,0) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(12.308,72.5,0) +bs(10,72.5,0) +bs(10,77.5,0) +bs(15,77.5,0) +bs(15,72.5,0) +bs(12.308,72.5,0) +gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgl(0,-1,0) +fp() +le() +lw(1) +lj(1) +b() +bs(148.669,72.5,0) +bs(12.5,72.5,0) +bs(12.5,75,0) +bs(285,75,0) +bs(285,72.5,0) +bs(148.669,72.5,0) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(94.808,32.5,0) +bs(92.5,32.5,0) +bs(92.5,37.5,0) +bs(97.5,37.5,0) +bs(97.5,32.5,0) +bs(94.808,32.5,0) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(284.808,32.5,0) +bs(282.5,32.5,0) +bs(282.5,37.5,0) +bs(287.5,37.5,0) +bs(287.5,32.5,0) +bs(284.808,32.5,0) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(284.808,112.5,0) +bs(282.5,112.5,0) +bs(282.5,117.5,0) +bs(287.5,117.5,0) +bs(287.5,112.5,0) +bs(284.808,112.5,0) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(12.308,32.5,0) +bs(10,32.5,0) +bs(10,37.5,0) +bs(15,37.5,0) +bs(15,32.5,0) +bs(12.308,32.5,0) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(202.308,32.5,0) +bs(200,32.5,0) +bs(200,37.5,0) +bs(205,37.5,0) +bs(205,32.5,0) +bs(202.308,32.5,0) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(12.308,112.5,0) +bs(10,112.5,0) +bs(10,117.5,0) +bs(15,117.5,0) +bs(15,112.5,0) +bs(12.308,112.5,0) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(94.808,60,0) +bs(92.5,60,0) +bs(92.5,65,0) +bs(97.5,65,0) +bs(97.5,60,0) +bs(94.808,60,0) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(284.808,60,0) +bs(282.5,60,0) +bs(282.5,65,0) +bs(287.5,65,0) +bs(287.5,60,0) +bs(284.808,60,0) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(284.808,150,0) +bs(282.5,150,0) +bs(282.5,155,0) +bs(287.5,155,0) +bs(287.5,150,0) +bs(284.808,150,0) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(284.808,100,0) +bs(282.5,100,0) +bs(282.5,105,0) +bs(287.5,105,0) +bs(287.5,100,0) +bs(284.808,100,0) +gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgl(0,-1,0) +fp() +le() +lw(1) +lj(1) +b() +bs(53.7255,32.5,0) +bs(12.5,32.5,0) +bs(12.5,35,0) +bs(95,35,0) +bs(95,32.5,0) +bs(53.7255,32.5,0) +gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgl(0,-1,0) +fp() +le() +lw(1) +lj(1) +b() +bs(243.725,32.5,0) +bs(202.5,32.5,0) +bs(202.5,35,0) +bs(285,35,0) +bs(285,32.5,0) +bs(243.725,32.5,0) +gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgl(0,-1,0) +fp() +le() +lw(1) +lj(1) +b() +bs(148.669,112.5,0) +bs(12.5,112.5,0) +bs(12.5,115,0) +bs(285,115,0) +bs(285,112.5,0) +bs(148.669,112.5,0) +gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgl(1,0,0) +fp() +le() +lw(1) +lj(1) +b() +bs(96.249,35,0) +bs(95,35,0) +bs(95,62.5,0) +bs(97.5,62.5,0) +bs(97.5,35,0) +bs(96.249,35,0) +gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgl(1,0,0) +fp() +le() +lw(1) +lj(1) +b() +bs(286.249,35,0) +bs(285,35,0) +bs(285,62.5,0) +bs(287.5,62.5,0) +bs(287.5,35,0) +bs(286.249,35,0) +gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgl(1,0,0) +fp() +le() +lw(1) +lj(1) +b() +bs(286.249,115,0) +bs(285,115,0) +bs(285,152.5,0) +bs(287.5,152.5,0) +bs(287.5,115,0) +bs(286.249,115,0) +gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgl(1,0,0) +fp() +le() +lw(1) +lj(1) +b() +bs(286.249,75,0) +bs(285,75,0) +bs(285,102.5,0) +bs(287.5,102.5,0) +bs(287.5,75,0) +bs(286.249,75,0) +gl([(0,(0.13,0.255,0.167)),(1,(0.165,0.362,0.168))]) +pgl(0,-1,0) +fp() +r(85,0,0,-30,10,65) +gl([(0,(0.542,0.544,0.197)),(1,(0.855,0.859,0.231))]) +pgl(0,-1,0) +fp() +r(85,0,0,-30,200,65) +fp((1,1,1)) +b() +bs(10,135,0) +bs(285,135,0) +bs(285,155,0) +bs(10,155,0) +bs(10,135,0) +bC() +fp((0.8,0.8,0.8)) +b() +bs(10,115,0) +bs(285,115,0) +bs(285,135,0) +bs(10,135,0) +bs(10,115,0) +bC() +fp((0.651,0.808,0.224)) +b() +bs(10,75,0) +bs(285,75,0) +bs(285,105,0) +bs(10,105,0) +bs(10,75,0) +bC() +fp((0,0,0)) +le() +lw(1) +Fn('Helvetica') +txt('Application Source Code',(81.47,141.384)) +fp((0,0,0)) +le() +lw(1) +Fn('Helvetica') +txt('Qt API',(129.824,121.384)) +fp((1,1,1)) +le() +lw(1) +Fn('Helvetica') +txt('Linux',(38.16,46.384)) +fp((0,0,0)) +le() +lw(1) +Fn('Helvetica') +txt('S60',(231.826,46.384)) +fp((1,1,1)) +Fn('Helvetica') +txt('Qt for Embedded Platforms',(74.804,85.126)) +G() +G() +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(189.808,32.5,0) +bs(187.5,32.5,0) +bs(187.5,37.5,0) +bs(192.5,37.5,0) +bs(192.5,32.5,0) +bs(189.808,32.5,0) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(189.808,60,0) +bs(187.5,60,0) +bs(187.5,65,0) +bs(192.5,65,0) +bs(192.5,60,0) +bs(189.808,60,0) +gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgl(1,0,0) +fp() +le() +lw(1) +lj(1) +b() +bs(191.249,35,0) +bs(190,35,0) +bs(190,62.5,0) +bs(192.5,62.5,0) +bs(192.5,35,0) +bs(191.249,35,0) +G_() +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(107.308,32.5,0) +bs(105,32.5,0) +bs(105,37.5,0) +bs(110,37.5,0) +bs(110,32.5,0) +bs(107.308,32.5,0) +gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgl(0,-1,0) +fp() +le() +lw(1) +lj(1) +b() +bs(148.725,32.5,0) +bs(107.5,32.5,0) +bs(107.5,35,0) +bs(190,35,0) +bs(190,32.5,0) +bs(148.725,32.5,0) +gl([(0,(0.384,0.491,0.805)),(1,(0.617,0.746,1))]) +pgl(0,-1,0) +fp() +r(85,0,0,-30,105,65) +fp((0,0,0)) +le() +lw(1) +Fn('Helvetica') +txt('Windows CE',(113.162,46.384)) +G_() +le() +lw(1) +r(277.5,0,0,-125,10,155) +guidelayer('Guide Lines',1,0,0,1,(0,0,1)) +grid((0,0,2.5,2.5),1,(0,0,1),'Grid') diff --git a/doc/src/diagrams/qtopiacore/home-screen.png b/doc/src/diagrams/qtopiacore/home-screen.png Binary files differnew file mode 100644 index 0000000..400c448 --- /dev/null +++ b/doc/src/diagrams/qtopiacore/home-screen.png diff --git a/doc/src/diagrams/qtopiacore/qt-embedded-linux-architecture.sk b/doc/src/diagrams/qtopiacore/qt-embedded-linux-architecture.sk new file mode 100644 index 0000000..3c00b17 --- /dev/null +++ b/doc/src/diagrams/qtopiacore/qt-embedded-linux-architecture.sk @@ -0,0 +1,303 @@ +##Sketch 1 2 +document() +layout('A4',0) +layer('Layer 1',1,1,0,0,(0,0,0)) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(284.808,72.5,0) +bs(282.5,72.5,0) +bs(282.5,77.5,0) +bs(287.5,77.5,0) +bs(287.5,72.5,0) +bs(284.808,72.5,0) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(12.308,72.5,0) +bs(10,72.5,0) +bs(10,77.5,0) +bs(15,77.5,0) +bs(15,72.5,0) +bs(12.308,72.5,0) +gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgl(0,-1,0) +fp() +le() +lw(1) +lj(1) +b() +bs(148.669,72.5,0) +bs(12.5,72.5,0) +bs(12.5,75,0) +bs(285,75,0) +bs(285,72.5,0) +bs(148.669,72.5,0) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(284.808,32.5,0) +bs(282.5,32.5,0) +bs(282.5,37.5,0) +bs(287.5,37.5,0) +bs(287.5,32.5,0) +bs(284.808,32.5,0) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(284.808,112.5,0) +bs(282.5,112.5,0) +bs(282.5,117.5,0) +bs(287.5,117.5,0) +bs(287.5,112.5,0) +bs(284.808,112.5,0) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(12.308,32.5,0) +bs(10,32.5,0) +bs(10,37.5,0) +bs(15,37.5,0) +bs(15,32.5,0) +bs(12.308,32.5,0) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(12.308,112.5,0) +bs(10,112.5,0) +bs(10,117.5,0) +bs(15,117.5,0) +bs(15,112.5,0) +bs(12.308,112.5,0) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(284.808,60,0) +bs(282.5,60,0) +bs(282.5,65,0) +bs(287.5,65,0) +bs(287.5,60,0) +bs(284.808,60,0) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(284.808,150,0) +bs(282.5,150,0) +bs(282.5,155,0) +bs(287.5,155,0) +bs(287.5,150,0) +bs(284.808,150,0) +gl([(0,(1,1,1)),(0.29,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgr(0.5,0.5,0) +fp() +le() +lw(1) +lj(1) +b() +bs(284.808,100,0) +bs(282.5,100,0) +bs(282.5,105,0) +bs(287.5,105,0) +bs(287.5,100,0) +bs(284.808,100,0) +gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgl(0,-1,0) +fp() +le() +lw(1) +lj(1) +b() +bs(148.669,32.5,0) +bs(12.5,32.5,0) +bs(12.5,35,0) +bs(285,35,0) +bs(285,32.5,0) +bs(148.669,32.5,0) +gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgl(0,-1,0) +fp() +le() +lw(1) +lj(1) +b() +bs(148.669,112.5,0) +bs(12.5,112.5,0) +bs(12.5,115,0) +bs(285,115,0) +bs(285,112.5,0) +bs(148.669,112.5,0) +gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgl(1,0,0) +fp() +le() +lw(1) +lj(1) +b() +bs(286.249,35,0) +bs(285,35,0) +bs(285,62.5,0) +bs(287.5,62.5,0) +bs(287.5,35,0) +bs(286.249,35,0) +gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgl(1,0,0) +fp() +le() +lw(1) +lj(1) +b() +bs(286.249,115,0) +bs(285,115,0) +bs(285,152.5,0) +bs(287.5,152.5,0) +bs(287.5,115,0) +bs(286.249,115,0) +gl([(0,(1,1,1)),(1,(0.396,0.396,0.396))]) +pgl(1,0,0) +fp() +le() +lw(1) +lj(1) +b() +bs(286.249,75,0) +bs(285,75,0) +bs(285,102.5,0) +bs(287.5,102.5,0) +bs(287.5,75,0) +bs(286.249,75,0) +gl([(0,(0,0,0)),(1,(0.362,0.362,0.362))]) +pgl(0,-1,0) +fp() +r(275,0,0,-30,10,65) +fp((1,1,1)) +b() +bs(10,135,0) +bs(285,135,0) +bs(285,155,0) +bs(10,155,0) +bs(10,135,0) +bC() +fp((0.8,0.8,0.8)) +b() +bs(10,115,0) +bs(285,115,0) +bs(285,135,0) +bs(10,135,0) +bs(10,115,0) +bC() +fp((0.651,0.808,0.224)) +b() +bs(10,75,0) +bs(285,75,0) +bs(285,105,0) +bs(10,105,0) +bs(10,75,0) +bC() +fp((0,0,0)) +le() +lw(1) +Fn('Helvetica') +txt('Application Source Code',(81.47,141.384)) +fp((0,0,0)) +le() +lw(1) +Fn('Helvetica') +txt('Qt API',(129.824,121.384)) +gl([(0,(0.248,0.248,0.248)),(1,(0.362,0.362,0.362))]) +pgl(0,-1,0) +fp() +le() +lw(0.5) +b() +bs(105,40,0) +bs(115,60,0) +bs(200,60,0) +bs(190,40,0) +bs(105,40,0) +bC() +fp((0.788,0.13,0.13)) +le() +lw(0.5) +b() +bs(190,40,0) +bs(200,60,0) +bs(280,60,0) +bs(280,40,0) +bs(190,40,0) +bC() +fp((1,1,1)) +le() +lw(1) +Fn('Helvetica') +txt('Framebuffer',(120,46.384)) +gl([(0,(0.248,0.248,0.248)),(1,(0.362,0.362,0.362))]) +pgl(0,-1,0) +fp() +le() +lw(0.5) +b() +bs(15,40,0) +bs(15,60,0) +bs(110,60,0) +bs(99.4444,40,0) +bs(15,40,0) +bC() +fp((1,1,1)) +le() +lw(1) +Fn('Helvetica') +txt('Linux Kernel',(25,46.384)) +G() +fp((1,1,1)) +le() +lw(1) +Fn('Helvetica') +Fs(8) +txt('Accelerated',(217.76,51.756)) +fp((1,1,1)) +le() +lw(1) +Fn('Helvetica') +Fs(8) +txt('Graphics',(222.876,42.6)) +G_() +fp((1,1,1)) +Fn('Helvetica') +txt('Qt for Embedded Linux',(85.802,86.934)) +le() +lw(1) +r(280,0,0,-125,7.5,157.5) +guidelayer('Guide Lines',1,0,0,1,(0,0,1)) +grid((0,0,2.5,2.5),1,(0,0,1),'Grid') |