X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreen%2FHomeScreen.pro;h=1ad42bf3a30f71c1dbb223073cafcc40b8d5840f;hb=79714c0aa8fc461d77b75d6c5dae6a1a7d726954;hp=01e5aced064ae1c7605b9ce39f78e4e9b9637fec;hpb=ca3605ea664834acdf712e691be8f0358b1c6b6f;p=staging%2FHomeScreen.git

diff --git a/HomeScreen/HomeScreen.pro b/HomeScreen/HomeScreen.pro
index 01e5ace..1ad42bf 100644
--- a/HomeScreen/HomeScreen.pro
+++ b/HomeScreen/HomeScreen.pro
@@ -12,51 +12,42 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#TODO: compile switches for ARM/x86 architecture
-
-QT       += core gui dbus
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-TARGET = HomeScreen
 TEMPLATE = app
+TARGET = HomeScreen
+QT = qml quick widgets dbus
+CONFIG += c++11
 
+include(../interfaces/interfaces.pri)
+include(../ivi_layermanagement_api.pri)
 
 SOURCES += \
     src/main.cpp \
     src/mainwindow.cpp \
-    $$OUT_PWD/daynightmode_adapter.cpp \        #generated dbus adapter
-    $$OUT_PWD/daynightmode_proxy.cpp \             #generated dbus proxy
-    $$OUT_PWD/popup_adapter.cpp \        #generated dbus adapter
-    $$OUT_PWD/popup_proxy.cpp \             #generated dbus proxy
-    $$OUT_PWD/statusbar_adapter.cpp \        #generated dbus adapter
-    $$OUT_PWD/statusbar_proxy.cpp \             #generated dbus proxy
     src/settingswidget.cpp \
     src/popupwidget.cpp \
     src/controlbarwidget.cpp \
-    src/statusbarwidget.cpp
+    src/statusbarwidget.cpp \
+    src/applauncher.cpp \
+    src/homescreencontrolinterface.cpp \
+    src/layouthandler.cpp
 
 HEADERS  += \
-    ../interfaces/daynightmode.h \
-    ../interfaces/popup.h \
     src/mainwindow.h \
-    $$OUT_PWD/daynightmode_adapter.h \      #generated dbus adapter
-    $$OUT_PWD/daynightmode_proxy.h \           #generated dbus proxy
-    $$OUT_PWD/popup_adapter.h \      #generated dbus adapter
-    $$OUT_PWD/popup_proxy.h \           #generated dbus proxy
-    $$OUT_PWD/statusbar_adapter.h \      #generated dbus adapter
-    $$OUT_PWD/statusbar_proxy.h \           #generated dbus proxy
     src/settingswidget.h \
     src/popupwidget.h \
     src/controlbarwidget.h \
-    src/statusbarwidget.h
+    src/statusbarwidget.h \
+    src/applauncher.h \
+    src/homescreencontrolinterface.h \
+    src/layouthandler.h
 
 FORMS    += \
     resources/mainwindow.ui \
     resources/settingswidget.ui \
     resources/popupwidget.ui \
     resources/controlbarwidget.ui \
-    resources/statusbarwidget.ui
+    resources/statusbarwidget.ui \
+    resources/applauncherwidget.ui
 
 TRANSLATIONS = \
     resources/translations/homescreen_en_US.ts \
@@ -64,74 +55,34 @@ TRANSLATIONS = \
     resources/translations/homescreen_ja_JP.ts
 
 OTHER_FILES += \
-    ../interfaces/daynightmode.xml \
-    ../interfaces/inputevent.xml \
-    ../interfaces/popup.xml \
-    ../interfaces/statusbar.xml \
     README.md
 
+
+HEADERS += \
+    src2/statusbarmodel.h \
+    src2/statusbarserver.h \
+    src2/applicationlauncher.h
+
+SOURCES += \
+    src2/statusbarmodel.cpp \
+    src2/statusbarserver.cpp \
+    src2/applicationlauncher.cpp
+
 RESOURCES += \
     resources/homescreen.qrc
 
-# remove generated files
-QMAKE_CLEAN += -r \
-    $$OUT_PWD/HomeScreen \
-    $$OUT_PWD/Makefile \
-    $$OUT_PWD/daynightmode_adapter.h \
-    $$OUT_PWD/daynightmode_adapter.cpp \
-    $$OUT_PWD/daynightmode_adapter.moc \
-    $$OUT_PWD/daynightmode_proxy.h \
-    $$OUT_PWD/daynightmode_proxy.cpp \
-    $$OUT_PWD/daynightmode_proxy.moc \
-    $$OUT_PWD/popup_adapter.h \
-    $$OUT_PWD/popup_adapter.cpp \
-    $$OUT_PWD/popup_adapter.moc \
-    $$OUT_PWD/popup_proxy.h \
-    $$OUT_PWD/popup_proxy.cpp \
-    $$OUT_PWD/popup_proxy.moc \
-    $$OUT_PWD/statusbar_adapter.h \
-    $$OUT_PWD/statusbar_adapter.cpp \
-    $$OUT_PWD/statusbar_adapter.moc \
-    $$OUT_PWD/statusbar_proxy.h \
-    $$OUT_PWD/statusbar_proxy.cpp \
-    $$OUT_PWD/statusbar_proxy.moc
+RESOURCES += \
+    qml/images/MediaPlayer/mediaplayer.qrc \
+    qml/images/MediaMusic/mediamusic.qrc \
+    qml/images/Weather/weather.qrc \
+    qml/images/Shortcut/shortcut.qrc \
+    qml/images/Status/status.qrc \
+    qml/images/images.qrc \
+    qml/qml.qrc
 
-# Create custom targets for generating dbus proxy and adapter
-# OE_QMAKE_PATH_EXTERNAL_HOST_BINS is only defined in the yocto environment
-isEmpty(OE_QMAKE_PATH_EXTERNAL_HOST_BINS){
-  OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "/"
-}
-# for daynightmode
-daynightmodegenerateadapter.target = $$OUT_PWD/daynightmode_adapter.cpp
-unix:daynightmodegenerateadapter.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -a daynightmode_adapter $$_PRO_FILE_PWD_/../interfaces/daynightmode.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/daynightmode_adapter.h -o $$OUT_PWD/daynightmode_adapter.moc"
-daynightmodegenerateproxy.target = $$OUT_PWD/daynightmode_proxy.cpp
-unix:daynightmodegenerateproxy.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -p daynightmode_proxy $$_PRO_FILE_PWD_/../interfaces/daynightmode.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/daynightmode_proxy.h -o $$OUT_PWD/daynightmode_proxy.moc"
-PRE_TARGETDEPS += \
-    $$OUT_PWD/daynightmode_adapter.cpp \
-    $$OUT_PWD/daynightmode_proxy.cpp
-QMAKE_EXTRA_TARGETS += \
-    daynightmodegenerateadapter \
-    daynightmodegenerateproxy
-# for popup
-popupgenerateadapter.target = $$OUT_PWD/popup_adapter.cpp
-unix:popupgenerateadapter.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -a popup_adapter $$_PRO_FILE_PWD_/../interfaces/popup.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/popup_adapter.h -o $$OUT_PWD/popup_adapter.moc"
-popupgenerateproxy.target = $$OUT_PWD/popup_proxy.cpp
-unix:popupgenerateproxy.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -p popup_proxy $$_PRO_FILE_PWD_/../interfaces/popup.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/popup_proxy.h -o $$OUT_PWD/popup_proxy.moc"
-PRE_TARGETDEPS += \
-    $$OUT_PWD/popup_adapter.cpp \
-    $$OUT_PWD/popup_proxy.cpp
-QMAKE_EXTRA_TARGETS += \
-    popupgenerateadapter \
-    popupgenerateproxy
-# for statusbar
-statusbargenerateadapter.target = $$OUT_PWD/statusbar_adapter.cpp
-unix:statusbargenerateadapter.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -a statusbar_adapter $$_PRO_FILE_PWD_/../interfaces/statusbar.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/statusbar_adapter.h -o $$OUT_PWD/statusbar_adapter.moc"
-statusbargenerateproxy.target = $$OUT_PWD/statusbar_proxy.cpp
-unix:statusbargenerateproxy.commands = "$(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)qdbusxml2cpp -m -p statusbar_proxy $$_PRO_FILE_PWD_/../interfaces/statusbar.xml; $(OE_QMAKE_PATH_EXTERNAL_HOST_BINS)moc $$OUT_PWD/statusbar_proxy.h -o $$OUT_PWD/statusbar_proxy.moc"
-PRE_TARGETDEPS += \
-    $$OUT_PWD/statusbar_adapter.cpp \
-    $$OUT_PWD/statusbar_proxy.cpp
-QMAKE_EXTRA_TARGETS += \
-    statusbargenerateadapter \
-    statusbargenerateproxy
 
+copydata.commands = $(COPY_DIR) $$PWD/resources/colorschemes $$OUT_PWD
+HomeScreen.depends = $(HomeScreen) copydata
+export(HomeScreen.depends)
+export(copydata.commands)
+QMAKE_EXTRA_TARGETS += HomeScreen copydata