Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/67 startup screen #91

Open
wants to merge 9 commits into
base: development
Choose a base branch
from
5 changes: 2 additions & 3 deletions doc/workflow/qpm_packages_installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@
To work with PPS 2.0 you need to install Font Awesome web fonts package manager, so:
* Download [qpm package manager](https://www.qpm.io/).
* Put qpm.exe in PPS project folder.
* Use `qpm install` in command line.
* To use FontAwesome you need to `import com.cutehacks.fontawesome 1.0` in `main.qml`.

* use `cd to ../PPS2/PPS` and then `qpm install` in command line.
* To use FontAwesome you need to `import com.cutehacks.fontawesome 1.0` in appropriate qml file.
1 change: 0 additions & 1 deletion pllug-presentation-system/pllug-presentation-system.pro
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ QML_IMPORT_PATH =
# Default rules for deployment.
include(deployment.pri)
include($$PWD/vendor/vendor.pri)

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ SOURCES += \
$$PWD/paragraph.cpp \
$$PWD/separator.cpp \
$$PWD/htmlimport.cpp \
$$PWD/presentationelementfactory.cpp
$$PWD/presentationelementfactory.cpp \
$$PWD/presentationmodel.cpp

HEADERS += \
$$PWD/presentation.h \
Expand All @@ -24,6 +25,7 @@ HEADERS += \
$$PWD/separator.h \
$$PWD/htmlimport.h \
$$PWD/abstractpresentationelementfactory.h \
$$PWD/presentationelementfactory.h
$$PWD/presentationelementfactory.h \
$$PWD/presentationmodel.h

INCLUDEPATH += $$PWD
Binary file not shown.
Binary file not shown.
5 changes: 5 additions & 0 deletions pllug-presentation-system/resources/qml.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,9 @@
<file alias="Page1.qml">qml/TestScreen/Page1.qml</file>
<file alias="Page1Form.ui.qml">qml/TestScreen/Page1Form.ui.qml</file>
</qresource>
<qresource prefix="/StartupScreen">
<file alias="MainToolbar.qml">qml/StartupScreen/MainToolbar.qml</file>
<file alias="RecentDelegateModel.qml">qml/StartupScreen/RecentDelegateModel.qml</file>
<file alias="RecentProject.qml">qml/StartupScreen/RecentProject.qml</file>
</qresource>
</RCC>
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.0
import com.cutehacks.fontawesome 1.0

ToolBar {

RowLayout {
anchors.fill: parent

ToolButton {
id: optionsMenuToolButton
anchors.left: parent.left
anchors.margins: 10

FAText{
font.pixelSize: 20
text: icons.ellipsis_v
anchors.centerIn: parent
}
}

ToolButton {
id: sideBarToolButton
anchors.left: optionsMenuToolButton.right
anchors.margins: 10


FAText{
font.pixelSize: 20
text: icons.bars
anchors.centerIn: parent
}
}
}
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import QtQuick 2.0

Item {
id: container

Rectangle {
id: recentDelegeteRectangle
anchors.fill: parent
anchors.leftMargin: 20
anchors.rightMargin: 20
anchors.bottomMargin: 20
anchors.topMargin: 20
border.width: 2
border.color: "black"
color: "white"

Rectangle
{
anchors.fill:parent
anchors.topMargin: 140
border.color: "black";
border.width: 2
Text {
id: presentationNameText
anchors.fill:parent
anchors.topMargin: 10
anchors.bottomMargin: 10

text: presentationName
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
}
Rectangle {
anchors.fill:parent
anchors.leftMargin: 2
anchors.rightMargin: 2
anchors.topMargin: 2
anchors.bottomMargin: 40

Image {
id: presentationImage
anchors.fill: parent
source: imageSrc
}
}
}

MouseArea {
id: mouseArea
anchors.fill: parent
hoverEnabled: true
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import QtQuick 2.6
import QtQuick.Controls 2.0

Flickable {
id: flickable
contentHeight: gridRectangle.height

Rectangle {
id: gridRectangle
width: flickable.width
height: flickable.height * 1.25
anchors.bottomMargin: 40

GridView {
id: gridView
anchors.fill: parent;
anchors.leftMargin: 10
anchors.rightMargin: 5
cellWidth: 220
cellHeight: 220
model: recentPresentationsModel

delegate: RecentDelegateModel {
width: GridView.view.cellWidth
height: GridView.view.cellHeight
}
}
}

ScrollBar.vertical: ScrollBar { }

// You should remove this ListModel when our model will be available
ListModel {
id: recentPresentationsModel

ListElement {
presentationName: "Presentation name1"
imageSrc: ""
}
ListElement {
presentationName: "Presentation name1"
imageSrc: ""
}
ListElement {
presentationName: "Presentation name1"
imageSrc: ""
}
ListElement {
presentationName: "Presentation name1"
imageSrc: ""
}
ListElement {
presentationName: "Presentation name1"
imageSrc: ""
}
ListElement {
presentationName: "Presentation name1"
imageSrc: ""
}
ListElement {
presentationName: "Presentation name1"
imageSrc: ""
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.0

GridMenu {

}

39 changes: 8 additions & 31 deletions pllug-presentation-system/resources/qml/main.qml
Original file line number Diff line number Diff line change
@@ -1,44 +1,21 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.0
import com.cutehacks.fontawesome 1.0

import "./TestScreen"

import "./StartupScreen"

ApplicationWindow {
visible: true
width: 640
id: window
width: 700
height: 480
title: qsTr("Hello World")

visible: true
title: "PLLUG Presentation System 2.0"

SwipeView {
id: swipeView
RecentProject {
id: gridMenu
anchors.fill: parent
currentIndex: tabBar.currentIndex

Page1 {
}

Page {
FAText {
text: icons.ambulance
anchors.centerIn: parent
font.pixelSize: 72
color: "steelblue"
}
}
}

footer: TabBar {
id: tabBar
currentIndex: swipeView.currentIndex
TabButton {
text: qsTr("First")
}
TabButton {
text: qsTr("Second")
}
}
header: MainToolbar { }
}