Merge branch 'release/0.10.0'

lirios · Mar 11, 2017 · 9e3158c · 9e3158c
2 parents 145bef0 + 9cc6753
commit 9e3158c
Show file tree

Hide file tree

Showing 140 changed files with 11,726 additions and 1,886 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ build/
 material-design-icons/
 icons/
 *.user
+*.qmlc
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ set(CMAKE_AUTORCC ON)
 set(APPLE_SUPPRESS_X11_WARNING ON)
 
 # Set version
-set(PROJECT_VERSION "0.9.0")
+set(PROJECT_VERSION "0.10.0")
 set(PROJECT_VERSION_MAJOR 0)
 set(PROJECT_SOVERSION 0)
 
@@ -49,7 +49,7 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 # Find Qt5
-set(REQUIRED_QT_VERSION "5.7.0")
+set(REQUIRED_QT_VERSION "5.8.0")
 find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED COMPONENTS
              Svg Gui Qml Quick QuickTest QuickControls2)
 
@@ -69,6 +69,7 @@ add_subdirectory(controls)
 add_subdirectory(core)
 add_subdirectory(demo)
 add_subdirectory(effects)
+add_subdirectory(layouts)
 add_subdirectory(src)
 add_subdirectory(tests)
 add_subdirectory(material)

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ Fluid
 
 [![ZenHub.io](https://img.shields.io/badge/supercharged%20by-zenhub.io-blue.svg)](https://zenhub.io)
 
-[![License](https://img.shields.io/badge/license-MPL2%2B-blue.svg)](https://www.mozilla.org/en-US/MPL/2.0/)
+[![License](https://img.shields.io/badge/license-MPL2-blue.svg)](https://www.mozilla.org/en-US/MPL/2.0/)
 [![GitHub release](https://img.shields.io/github/release/lirios/fluid.svg)](https://github.com/lirios/fluid)
 [![Build Status](https://travis-ci.org/lirios/fluid.svg?branch=master)](https://travis-ci.org/lirios/fluid)
 [![GitHub issues](https://img.shields.io/github/issues/lirios/fluid.svg)](https://github.com/lirios/fluid/issues)
@@ -13,7 +13,7 @@ Fluid is a collection of cross-platform QtQuick components for building fluid an
 
 ## Dependencies
 
-Qt >= 5.7.0 with at least the following modules is required:
+Qt >= 5.8.0 with at least the following modules is required:
 
  * [qtbase](http://code.qt.io/cgit/qt/qtbase.git)
  * [qtdeclarative](http://code.qt.io/cgit/qt/qtdeclarative.git)
@@ -58,19 +58,30 @@ Run the icon script located here:
 ./scripts/fetch_icons.sh
 ```
 
-In your project file, include the fluid.pri file:  
-  `include(path/to/fluid.pri)`
+In your project file, include the `fluid.pri` file:  
+```qmake
+include(path/to/fluid.pri)
+```
 
 Then, in your `main.cpp` file or wherever you set up a `QQmlApplicationEngine`:
-* add this include directive :  
-`#include "iconthemeimageprovider.h"`  
-* add the resources files to your `QQmlApplicationEngine` import paths :  
-`engine.addImportPath(QStringLiteral("qrc:/"));`
-* register fluid's image providers to the engine :
-`engine.addImageProvider(QLatin1String("fluidicons"), new IconsImageProvider());`
-`engine.addImageProvider(QLatin1String("fluidicontheme"), new IconThemeImageProvider());`
+* add this include directive:
+```cpp
+#include "iconsimageprovider.h"
+#include "iconthemeimageprovider.h"
+```
+* add the resources files to your `QQmlApplicationEngine` import paths:
+```cpp
+engine.addImportPath(QLatin1String("qrc:/"));
+```
+* register fluid's image providers to the engine:
+```cpp
+engine.addImageProvider(QLatin1String("fluidicons"), new IconsImageProvider());
+engine.addImageProvider(QLatin1String("fluidicontheme"), new IconThemeImageProvider());
+```
 * and after that you can load your qml file:  
-`engine.load(QUrl(QStringLiteral("qrc:/main.qml")));`
+```cpp
+engine.load(QUrl(QLatin1String("qrc:/main.qml")));
+```
 
 ## Licensing
 

diff --git a/controls/+material/BaseListItem.qml b/controls/+material/BaseListItem.qml
@@ -1,7 +1,7 @@
 /*
  * This file is part of Fluid.
  *
- * Copyright (C) 2016 Michael Spencer <sonrisesoftware@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
  *
  * $BEGIN_LICENSE:MPL2$
  *

diff --git a/controls/+material/BodyLabel.qml b/controls/+material/BodyLabel.qml
@@ -1,7 +1,7 @@
 /*
  * This file is part of Fluid.
  *
- * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
  *
  * $BEGIN_LICENSE:MPL2$
  *

diff --git a/controls/+material/CaptionLabel.qml b/controls/+material/CaptionLabel.qml
@@ -1,7 +1,7 @@
 /*
  * This file is part of Fluid.
  *
- * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
  *
  * $BEGIN_LICENSE:MPL2$
  *

diff --git a/controls/+material/DialogLabel.qml b/controls/+material/DialogLabel.qml
@@ -0,0 +1,23 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.0
+import QtQuick.Controls.Material 2.0
+import Fluid.Core 1.0 as FluidCore
+
+Label {
+   font.pixelSize: FluidCore.Device.isMobile ? 18 : 17
+   color: Material.secondaryTextColor
+}
diff --git a/controls/+material/DisplayLabel.qml b/controls/+material/DisplayLabel.qml
@@ -1,7 +1,7 @@
 /*
  * This file is part of Fluid.
  *
- * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
  *
  * $BEGIN_LICENSE:MPL2$
  *

diff --git a/controls/+material/HeadlineLabel.qml b/controls/+material/HeadlineLabel.qml
@@ -1,7 +1,7 @@
 /*
  * This file is part of Fluid.
  *
- * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
  *
  * $BEGIN_LICENSE:MPL2$
  *

diff --git a/controls/+material/SubheadingLabel.qml b/controls/+material/SubheadingLabel.qml
@@ -1,7 +1,7 @@
 /*
  * This file is part of Fluid.
  *
- * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
  *
  * $BEGIN_LICENSE:MPL2$
  *

diff --git a/controls/+material/ThinDivider.qml b/controls/+material/ThinDivider.qml
@@ -1,7 +1,7 @@
 /*
  * This file is part of Fluid.
  *
- * Copyright (C) 2016 Michael Spencer <sonrisesoftware@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
  *
  * $BEGIN_LICENSE:MPL2$
  *

diff --git a/controls/+material/TitleLabel.qml b/controls/+material/TitleLabel.qml
@@ -1,7 +1,7 @@
 /*
  * This file is part of Fluid.
  *
- * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
  *
  * $BEGIN_LICENSE:MPL2$
  *

diff --git a/controls/Action.qml b/controls/Action.qml
@@ -1,8 +1,8 @@
 /*
  * This file is part of Fluid.
  *
- * Copyright (C) 2016 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
- * Copyright (C) 2016 Michael Spencer <sonrisesoftware@gmail.com>
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ * Copyright (C) 2017 Michael Spencer <sonrisesoftware@gmail.com>
  *
  * $BEGIN_LICENSE:MPL2$
  *
@@ -61,9 +61,11 @@ Object {
     property string text
 
     /*!
-       The tooltip displayed for the action.
+       The tool tip displayed for the action.
      */
-    property string tooltip
+    property string toolTip
+
+    property string tooltip: toolTip
 
     /*!
        Set to \c false to hide the action in the UI.

diff --git a/controls/AlertDialog.qml b/controls/AlertDialog.qml
@@ -0,0 +1,59 @@
+/*
+ * This file is part of Fluid.
+ *
+ * Copyright (C) 2017 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
+ *
+ * $BEGIN_LICENSE:MPL2$
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * $END_LICENSE$
+ */
+
+import QtQuick 2.0
+import QtQuick.Controls 2.1
+import Fluid.Controls 1.0 as FluidControls
+
+/*!
+    \qmltype Dialog
+    \inqmlmodule Fluid.Controls
+    \ingroup fluidcontrols
+
+    \brief Alert dialogs are urgent interruptions to inform the user about a situation.
+
+    An alert dialog is used to interrupt the user's workflow to inform them about
+    a situation that requires their acknowledgement.
+
+    Most alert don't need a title and they summarize a decision in a sentence or two
+    by either asking a question or making a statement related to the action buttons.
+*/
+Dialog {
+    default property alias content: dialogContent.data
+
+    property alias text: dialogLabel.text
+
+    x: (parent.width - width) / 2
+    y: (parent.height - height) / 2
+
+    focus: true
+    modal: true
+
+    Column {
+        id: dialogContent
+        anchors {
+            left: parent.left
+            top: parent.top
+        }
+        spacing: FluidControls.Units.smallSpacing
+        width: parent.width
+
+        FluidControls.DialogLabel {
+            id: dialogLabel
+            wrapMode: Text.Wrap
+            width: parent.width
+            visible: text !== ""
+        }
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ build/ @@
     material-design-icons/
     icons/
     *.user
+    *.qmlc