Skip to content

Commit

Permalink
Restructured QML imports and added AM interface
Browse files Browse the repository at this point in the history
* Renamed modules to imports
* Separated shared imports (needed by apps
and the system UI) and system imports, only
available to the system UI
* Moved the ApplicationManager logic from
the UI representation to its own model. The
idea is to separate UI from the logic

Change-Id: I455f0e1b4b9f9f97fe80a0dc85a355fb53bcd124
Reviewed-by: Dominik Holland <[email protected]>
  • Loading branch information
Nedim Hadzic committed Jul 25, 2016
1 parent 4b264d2 commit cb54780
Show file tree
Hide file tree
Showing 1,171 changed files with 232 additions and 222 deletions.
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ Application Manager

# Folder Structure

* modules - QML modules and assets to be imported (e.g. import controls 1.0)
* boards - visual ui tests for easier development
* imports - QML modules and assets to be imported (e.g. import controls 1.0)
* separated into 'shared' (availabe to apps and the system UI) and 'system'
* (available only to system UI) boards - visual ui tests for easier development
* apps - container for the different applications used within the system UI
* plugins - QML and other plugins needed for fully functional UI (e.g. reading the media from database)
* plugins - QML and other plugins needed for fully functional UI (e.g. reading
* the media from database)

Please note that am-dummyimports - the Application Manager dummy imports for running within
qmlscene/qmllive - have been moved to the application-manager repository.
Expand Down
6 changes: 3 additions & 3 deletions am-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@ applications:

runtimes:
qml:
importPaths: [ "modules" ]
importPaths: [ "imports/shared" ]

# ... as well as the SystemUI

ui:
fullscreen: yes
mainQml: "Main.qml"
importPaths: [ "modules" ]
importPaths: [ "imports/shared", "imports/system" ]
additionalConfiguration:
appStoreServerUrl: 'http://chaos.pelagicore.net:8080'
styleConfig: "auto"
windowIcon: "modules/assets/icons/active/[email protected]"
windowIcon: "imports/shared/assets/icons/active/[email protected]"

# development setup: no security

Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Loading

0 comments on commit cb54780

Please sign in to comment.