Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
plfiorini committed Oct 28, 2018
2 parents 8b4c22c + d654178 commit 4857b37
Show file tree
Hide file tree
Showing 192 changed files with 8,077 additions and 3,665 deletions.
39 changes: 39 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
version: '{build}'
pull_requests:
do_not_increment_build_number: true
configuration: Release
branches:
except:
- /^(?i:continuous)$/
skip_tags: true
environment:
matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
QT_PROFILE: msvc2015
QTDIR: C:\Qt\5.10.1\msvc2015
QBS_PROFILE: MSVC2015-x86
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
QT_PROFILE: msvc2017_64
QTDIR: C:\Qt\5.10.1\msvc2017_64
QBS_PROFILE: MSVC2017-x86_x64
init:
- set PATH=%QTDIR%\bin;%PATH%
install:
- choco install -y qbs --version 1.11.0
before_build:
- qbs setup-toolchains --detect
- qbs setup-qt %QTDIR%\bin\qmake.exe appveyor-qt5
- qbs config profiles.appveyor-qt5.baseProfile %QBS_PROFILE%
- qbs config defaultProfile appveyor-qt5
- qbs config preferences.qbsSearchPaths %cd%/fluid/qbs/shared
build_script:
- git submodule update --init --recursive
- qbs -d build --all-products config:release project.autotestEnabled:false project.useSystemQbsShared:false project.deploymentEnabled:false project.withDocumentation:false
- dir build\release\install-root
notifications:
- provider: Slack
incoming_webhook: https://hooks.slack.com/services/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
channel: '#events'
on_build_success: true
on_build_failure: true
on_build_status_changed: true
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
.gitmodules export-ignore
.travis export-ignore
.travis.yml export-ignore
.mailmap export-ignore
14 changes: 14 additions & 0 deletions .travis/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ set -e

source /usr/local/share/liri-travis/functions

# Install packages
travis_start "install_packages"
msg "Install packages..."
sudo apt-get install -y desktop-file-utils appstream-util
travis_end "install_packages"

# Configure qbs
travis_start "qbs_setup"
msg "Setup qbs..."
Expand All @@ -26,3 +32,11 @@ qbs -d build -j $(nproc) --all-products profile:travis-qt5 \
projects.Fluid.useSystemQbsShared:false \
projects.Fluid.deploymentEnabled:true
travis_end "build"

# Validate desktop file and appdata
for filename in $(find . -type f -name "*.desktop"); do
desktop-file-validate $filename
done
for filename in $(find . -type f -name "*.appdata.xml"); do
appstream-util validate-relax --nonet $filename
done
2 changes: 1 addition & 1 deletion .travis/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ openssl aes-256-cbc -K $encrypted_a841ddf051d0_key -iv $encrypted_a841ddf051d0_i
chmod 600 /tmp/github_deploy_key_liri_ci
eval "$(ssh-agent -s)"
ssh-add /tmp/github_deploy_key_liri_ci
rsync -crvz --rsh="ssh" --delete-after --delete-excluded build/default/fluid-online-doc.*/qdoc_html/ $DEPLOY_USER@$DEPLOY_HOST:$TRAVIS_BRANCH
rsync -crvz --rsh="ssh" --delete-after --delete-excluded build/default/fluid-offline-doc.*/qdoc_html/ $DEPLOY_USER@$DEPLOY_HOST:$TRAVIS_BRANCH
scp $filename $DEPLOY_USER@$DEPLOY_HOST:$TRAVIS_BRANCH/$destfilename
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
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-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=develop)](https://travis-ci.org/lirios/fluid)
Expand Down
1 change: 0 additions & 1 deletion doc/doc.qbs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ Project {
condition: project.withDocumentation && !qbs.targetOS.contains("android")

references: [
"online.qbs",
"offline.qbs",
]
}
67 changes: 0 additions & 67 deletions doc/fluid-online.qdocconf

This file was deleted.

68 changes: 65 additions & 3 deletions doc/offline.qbs
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,63 @@ Product {
])

files: [
"config/*.qdocconf",
"src/*.qdoc",
"config/fluid-project.qdocconf",
"config/macros.qdocconf",
"src/controls/Action.qdoc",
"src/controls/AlertDialog.qdoc",
"src/controls/AppBar.qdoc",
"src/controls/AppToolBar.qdoc",
"src/controls/ApplicationWindow.qdoc",
"src/controls/BodyLabel.qdoc",
"src/controls/BottomSheet.qdoc",
"src/controls/BottomSheetGrid.qdoc",
"src/controls/BottomSheetList.qodc",
"src/controls/CaptionLabel.qdoc",
"src/controls/Card.qdoc",
"src/controls/Chip.qdoc",
"src/controls/CircleImage.qdoc",
"src/controls/DatePickerDialog.qdoc",
"src/controls/DateTimePickerDialog.qdoc",
"src/controls/DialogLabel.qdoc",
"src/controls/DisplayLabel.qdoc",
"src/controls/FloatingActionButton.qdoc",
"src/controls/HeadlineLabel.qdoc",
"src/controls/Icon.qdoc",
"src/controls/InputDialog.qdoc",
"src/controls/ListItem.qdoc",
"src/controls/Loadable.qdoc",
"src/controls/NavigationDrawer.qdoc",
"src/controls/NavigationListView.qdoc",
"src/controls/NoiseBackground.qdoc",
"src/controls/OverlayView.qdoc",
"src/controls/Page.qdoc",
"src/controls/PageSidebar.qdoc",
"src/controls/PageStack.qdoc",
"src/controls/Placeholder.qdoc",
"src/controls/Ripple.qdoc",
"src/controls/SearchBar.qdoc",
"src/controls/Showable.qdoc",
"src/controls/Sidebar.qdoc",
"src/controls/SmoothFadeImage.qdoc",
"src/controls/SmoothFadeLoader.qdoc",
"src/controls/SnackBar.qdoc",
"src/controls/Subheader.qdoc",
"src/controls/SubheadingLabel.qdoc",
"src/controls/Tab.qdoc",
"src/controls/TabbedPage.qdoc",
"src/controls/ThinDivider.qdoc",
"src/controls/TimePickerDialog.qdoc",
"src/controls/TitleLabel.qdoc",
"src/controls/ToolButton.qdoc",
"src/controls/Units.qdoc",
"src/controls/Wave.qdoc",
"src/deployment.qdoc",
"src/fluidcontrols-qmltypes.qdoc",
"src/fluidcore-qmltypes.qdoc",
"src/fluideffects-qmltypes.qdoc",
"src/fluidlayouts-qmltypes.qdoc",
"src/fluidtemplates-qmltypes.qdoc",
"src/index.qdoc",
]

Group {
Expand All @@ -28,7 +83,14 @@ Product {
Group {
name: "Style"
prefix: "template/style/"
files: "**"
files: [
"base.css",
"liri.css",
"liri.eot",
"liri.svg",
"liri.ttf",
"liri.woff",
]
}

Group {
Expand Down
40 changes: 0 additions & 40 deletions doc/online.qbs

This file was deleted.

62 changes: 62 additions & 0 deletions doc/src/controls/Action.qdoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/****************************************************************************
* This file is part of Fluid.
*
* Copyright (C) 2018 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
* Copyright (C) 2018 Michael Spencer <sonrisesoftware@gmail.com>
*
* $BEGIN_LICENSE:FDL$
*
* Permission is granted to copy, distribute and/or modify this document
* under the terms of the GNU Free Documentation License, Version 1.3
* or any later version published by the Free Software Foundation;
* with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
* A copy of the license is included in the section entitled "GNU
* Free Documentation License".
*
* $END_LICENSE$
***************************************************************************/

/*!
\qmltype Action
\inqmlmodule Fluid.Controls
\ingroup fluidcontrols

\brief Represents an action shown in an action bar, context menu, or list.

One of the most common uses of actions is displaying actions in the action bar of a page
using the \l Page::actions property. See the example for \l Page for more details.

Actions may contain \l text, an \l icon, a \l toolTip and a \l shortcut.

\snippet fluidcontrols-action.qml action
*/

/*!
\qmlproperty string Fluid.Controls::Action::toolTip

The tool tip displayed for the action.
*/

/*!
\qmlproperty bool Fluid.Controls::Action::visible

Set to \c false to hide the action in the UI.

This property is \c true by default.
*/

/*!
\qmlproperty bool Fluid.Controls::Action::hasDividerAfter

Set to \c true to display a divider after the control bound to this action.

This property is \c false by default.
*/

/*!
\qmlproperty bool Fluid.Controls::Action::hoverAnimation

Set to \c true to rotate the icon 90 degrees on mouseover.

This property is \c false by default.
*/
41 changes: 41 additions & 0 deletions doc/src/controls/AlertDialog.qdoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/****************************************************************************
* This file is part of Fluid.
*
* Copyright (C) 2018 Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
*
* $BEGIN_LICENSE:FDL$
*
* Permission is granted to copy, distribute and/or modify this document
* under the terms of the GNU Free Documentation License, Version 1.3
* or any later version published by the Free Software Foundation;
* with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
* A copy of the license is included in the section entitled "GNU
* Free Documentation License".
*
* $END_LICENSE$
***************************************************************************/

/*!
\qmltype AlertDialog
\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.

\snippet fluidcontrols-alertdialog.qml file

For more information you can read the
\l{https://material.io/guidelines/components/dialogs.html}{Material Design guidelines}.
*/

/*!
\qmlproperty string Fluid.Controls::AlertDialog::text

Informative text to display.
*/
Loading

0 comments on commit 4857b37

Please sign in to comment.