From c4115a247a16fcbb96cc26d19117282860f74a38 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 26 Sep 2013 10:38:58 +0200 Subject: Rename QML JumpLink/Destination to JumpListLink/Destination Change-Id: If7e761e435e75c218f50c50f8940428bb8c14a23 Reviewed-by: Ivan Vizir Reviewed-by: Friedemann Kleint --- src/imports/winextras/JumpDestination.qml | 67 ------------------- src/imports/winextras/JumpLink.qml | 94 --------------------------- src/imports/winextras/JumpListDestination.qml | 67 +++++++++++++++++++ src/imports/winextras/JumpListLink.qml | 94 +++++++++++++++++++++++++++ src/imports/winextras/qmldir | 4 +- src/imports/winextras/winextras.pro | 8 +-- 6 files changed, 167 insertions(+), 167 deletions(-) delete mode 100644 src/imports/winextras/JumpDestination.qml delete mode 100644 src/imports/winextras/JumpLink.qml create mode 100644 src/imports/winextras/JumpListDestination.qml create mode 100644 src/imports/winextras/JumpListLink.qml (limited to 'src') diff --git a/src/imports/winextras/JumpDestination.qml b/src/imports/winextras/JumpDestination.qml deleted file mode 100644 index b06d57b..0000000 --- a/src/imports/winextras/JumpDestination.qml +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** - ** - ** Copyright (C) 2013 Ivan Vizir - ** Contact: http://www.qt-project.org/legal - ** - ** This file is part of the QtWinExtras module of the Qt Toolkit. - ** - ** $QT_BEGIN_LICENSE:LGPL$ - ** Commercial License Usage - ** Licensees holding valid commercial Qt licenses may use this file in - ** accordance with the commercial license agreement provided with the - ** Software or, alternatively, in accordance with the terms contained in - ** a written agreement between you and Digia. For licensing terms and - ** conditions see http://qt.digia.com/licensing. For further information - ** use the contact form at http://qt.digia.com/contact-us. - ** - ** 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, Digia gives you certain additional - ** rights. These rights are described in the Digia Qt LGPL Exception - ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - ** - ** 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. - ** - ** - ** $QT_END_LICENSE$ - ** - ****************************************************************************/ - -import QtWinExtras 1.0 - -/*! - \qmltype JumpDestination - \inherits JumpListItem - \inqmlmodule QtWinExtras - - \brief Represents a file that can be edited or viewed by an application. - - \since QtWinExtras 1.0 - - The JumpDestination type contains a path to a file that users can select - from a Jump List to view or edit it with an application. - - */ - -JumpListItem { - __jumpListItemType: JumpListItem.ItemTypeDestination - - /*! - \qmlproperty string JumpDestination::filePath - - The path to the file. - */ - property string filePath -} diff --git a/src/imports/winextras/JumpLink.qml b/src/imports/winextras/JumpLink.qml deleted file mode 100644 index 119266c..0000000 --- a/src/imports/winextras/JumpLink.qml +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** - ** - ** Copyright (C) 2013 Ivan Vizir - ** Contact: http://www.qt-project.org/legal - ** - ** This file is part of the QtWinExtras module of the Qt Toolkit. - ** - ** $QT_BEGIN_LICENSE:LGPL$ - ** Commercial License Usage - ** Licensees holding valid commercial Qt licenses may use this file in - ** accordance with the commercial license agreement provided with the - ** Software or, alternatively, in accordance with the terms contained in - ** a written agreement between you and Digia. For licensing terms and - ** conditions see http://qt.digia.com/licensing. For further information - ** use the contact form at http://qt.digia.com/contact-us. - ** - ** 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, Digia gives you certain additional - ** rights. These rights are described in the Digia Qt LGPL Exception - ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - ** - ** 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. - ** - ** - ** $QT_END_LICENSE$ - ** - ****************************************************************************/ - -import QtWinExtras 1.0 - -/*! - \qmltype JumpLink - \inherits JumpListItem - \inqmlmodule QtWinExtras - - \brief Represents a command to execute an application. - - \since QtWinExtras 1.0 - - The JumpLink type represents a command to execute an application. - - */ - -JumpListItem { - __jumpListItemType: JumpListItem.ItemTypeLink - - /*! - \qmlproperty string JumpLink::iconPath - - The path to a link icon. - */ - property string iconPath - - /*! - \qmlproperty string JumpLink::executablePath - - The path to an executable file. - */ - property string executablePath - - /*! - \qmlproperty string JumpLink::arguments - - Command-line arguments. - */ - property string arguments - - /*! - \qmlproperty string JumpLink::description - - The description of the link. - */ - property string description - - /*! - \qmlproperty string JumpLink::title - - The title of the link. - */ - property string title -} diff --git a/src/imports/winextras/JumpListDestination.qml b/src/imports/winextras/JumpListDestination.qml new file mode 100644 index 0000000..846028a --- /dev/null +++ b/src/imports/winextras/JumpListDestination.qml @@ -0,0 +1,67 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Ivan Vizir + ** Contact: http://www.qt-project.org/legal + ** + ** This file is part of the QtWinExtras module of the Qt Toolkit. + ** + ** $QT_BEGIN_LICENSE:LGPL$ + ** Commercial License Usage + ** Licensees holding valid commercial Qt licenses may use this file in + ** accordance with the commercial license agreement provided with the + ** Software or, alternatively, in accordance with the terms contained in + ** a written agreement between you and Digia. For licensing terms and + ** conditions see http://qt.digia.com/licensing. For further information + ** use the contact form at http://qt.digia.com/contact-us. + ** + ** 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, Digia gives you certain additional + ** rights. These rights are described in the Digia Qt LGPL Exception + ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. + ** + ** 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. + ** + ** + ** $QT_END_LICENSE$ + ** + ****************************************************************************/ + +import QtWinExtras 1.0 + +/*! + \qmltype JumpListDestination + \inherits JumpListItem + \inqmlmodule QtWinExtras + + \brief Represents a file that can be edited or viewed by an application. + + \since QtWinExtras 1.0 + + The JumpListDestination type contains a path to a file that users can select + from a Jump List to view or edit it with an application. + + */ + +JumpListItem { + __jumpListItemType: JumpListItem.ItemTypeDestination + + /*! + \qmlproperty string JumpListDestination::filePath + + The path to the file. + */ + property string filePath +} diff --git a/src/imports/winextras/JumpListLink.qml b/src/imports/winextras/JumpListLink.qml new file mode 100644 index 0000000..cb7fd80 --- /dev/null +++ b/src/imports/winextras/JumpListLink.qml @@ -0,0 +1,94 @@ +/**************************************************************************** + ** + ** Copyright (C) 2013 Ivan Vizir + ** Contact: http://www.qt-project.org/legal + ** + ** This file is part of the QtWinExtras module of the Qt Toolkit. + ** + ** $QT_BEGIN_LICENSE:LGPL$ + ** Commercial License Usage + ** Licensees holding valid commercial Qt licenses may use this file in + ** accordance with the commercial license agreement provided with the + ** Software or, alternatively, in accordance with the terms contained in + ** a written agreement between you and Digia. For licensing terms and + ** conditions see http://qt.digia.com/licensing. For further information + ** use the contact form at http://qt.digia.com/contact-us. + ** + ** 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, Digia gives you certain additional + ** rights. These rights are described in the Digia Qt LGPL Exception + ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. + ** + ** 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. + ** + ** + ** $QT_END_LICENSE$ + ** + ****************************************************************************/ + +import QtWinExtras 1.0 + +/*! + \qmltype JumpListLink + \inherits JumpListItem + \inqmlmodule QtWinExtras + + \brief Represents a command to execute an application. + + \since QtWinExtras 1.0 + + The JumpListLink type represents a command to execute an application. + + */ + +JumpListItem { + __jumpListItemType: JumpListItem.ItemTypeLink + + /*! + \qmlproperty string JumpListLink::iconPath + + The path to a link icon. + */ + property string iconPath + + /*! + \qmlproperty string JumpListLink::executablePath + + The path to an executable file. + */ + property string executablePath + + /*! + \qmlproperty string JumpListLink::arguments + + Command-line arguments. + */ + property string arguments + + /*! + \qmlproperty string JumpListLink::description + + The description of the link. + */ + property string description + + /*! + \qmlproperty string JumpListLink::title + + The title of the link. + */ + property string title +} diff --git a/src/imports/winextras/qmldir b/src/imports/winextras/qmldir index d488e01..bcba196 100644 --- a/src/imports/winextras/qmldir +++ b/src/imports/winextras/qmldir @@ -1,5 +1,5 @@ module QtWinExtras plugin qml_winextras -JumpLink 1.0 JumpLink.qml -JumpDestination 1.0 JumpDestination.qml +JumpListLink 1.0 JumpListLink.qml +JumpListDestination 1.0 JumpListDestination.qml JumpListSeparator 1.0 JumpListSeparator.qml diff --git a/src/imports/winextras/winextras.pro b/src/imports/winextras/winextras.pro index 0f574f4..869c622 100644 --- a/src/imports/winextras/winextras.pro +++ b/src/imports/winextras/winextras.pro @@ -6,8 +6,8 @@ IMPORT_VERSION = 1.0 QT += qml quick winextras winextras-private QML_FILES += \ - JumpLink.qml \ - JumpDestination.qml \ + JumpListLink.qml \ + JumpListDestination.qml \ JumpListSeparator.qml HEADERS += \ @@ -34,8 +34,8 @@ SOURCES += \ OTHER_FILES += \ qmldir \ - JumpLink.qml \ - JumpDestination.qml \ + JumpListLink.qml \ + JumpListDestination.qml \ JumpListSeparator.qml load(qml_plugin) -- cgit v1.2.3