Add Nav and Media app to control bar.

Hardcoded:
nav: nav@0.1
media: media@0.1

Signed-off-by: Bocklage, Jens <Jens_Bocklage@mentor.com>

diff --git a/HomeScreen/resources/controlbarwidget.ui b/HomeScreen/resources/controlbarwidget.ui
index 49f8e40..07f9f01 100644 (file)
--- a/HomeScreen/resources/controlbarwidget.ui
+++ b/HomeScreen/resources/controlbarwidget.ui
@@ -85,7 +85,7 @@ border-image: url(:/images/transparency.png);</string>
    <widget class="QPushButton" name="pushButton_nav">
     <property name="geometry">
      <rect>
-      <x>110</x>
+      <x>160</x>
       <y>10</y>
       <width>40</width>
       <height>40</height>
@@ -112,6 +112,56 @@ border-image: url(:/images/transparency.png);</string>
      </size>
     </property>
    </widget>
+   <widget class="QPushButton" name="pushButton_empty">
+    <property name="geometry">
+     <rect>
+      <x>110</x>
+      <y>10</y>
+      <width>40</width>
+      <height>40</height>
+     </rect>
+    </property>
+    <property name="focusPolicy">
+     <enum>Qt::NoFocus</enum>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">background-image: url(:/images/transparency.png);
+border-image: url(:/images/transparency.png);</string>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+   </widget>
+   <widget class="QPushButton" name="pushButton_media">
+    <property name="geometry">
+     <rect>
+      <x>210</x>
+      <y>10</y>
+      <width>40</width>
+      <height>40</height>
+     </rect>
+    </property>
+    <property name="focusPolicy">
+     <enum>Qt::NoFocus</enum>
+    </property>
+    <property name="styleSheet">
+     <string notr="true">background-image: url(:/images/transparency.png);
+border-image: url(:/images/transparency.png);</string>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+    <property name="icon">
+     <iconset resource="homescreen.qrc">
+      <normaloff>:/icons/media_day.png</normaloff>:/icons/media_day.png</iconset>
+    </property>
+    <property name="iconSize">
+     <size>
+      <width>40</width>
+      <height>40</height>
+     </size>
+    </property>
+   </widget>
   </widget>
  </widget>
  <resources>

diff --git a/HomeScreen/resources/homescreen.qrc b/HomeScreen/resources/homescreen.qrc
index 03281bd..ae302d0 100644 (file)
--- a/HomeScreen/resources/homescreen.qrc
+++ b/HomeScreen/resources/homescreen.qrc
@@ -13,6 +13,8 @@
         <file alias="icons/settings_night.png">images/icons/Black/45.Settings.png</file>
         <file alias="icons/explore_day.png">images/icons/White/47.Explore.png</file>
         <file alias="icons/explore_night.png">images/icons/Black/47.Explore.png</file>
+        <file alias="icons/media_day.png">images/icons/White/21.Music.png</file>
+        <file alias="icons/media_night.png">images/icons/Black/21.Music.png</file>
         <file>translations/homescreen_de_DE.qm</file>
         <file>translations/homescreen_en_US.qm</file>
         <file>translations/homescreen_ja_JP.qm</file>

diff --git a/HomeScreen/src/controlbarwidget.cpp b/HomeScreen/src/controlbarwidget.cpp
index 486378b..bc78004 100644 (file)
--- a/HomeScreen/src/controlbarwidget.cpp
+++ b/HomeScreen/src/controlbarwidget.cpp
@@ -83,3 +83,8 @@ void ControlBarWidget::on_pushButton_nav_clicked()
 {
     mp_dBusInputEventProxy->hardKeyPressed(InputEvent::HARDKEY_NAV);
 }
+
+void ControlBarWidget::on_pushButton_media_clicked()
+{
+    mp_dBusInputEventProxy->hardKeyPressed(InputEvent::HARDKEY_MEDIA);
+}

diff --git a/HomeScreen/src/controlbarwidget.h b/HomeScreen/src/controlbarwidget.h
index e47d2ba..74067f8 100644 (file)
--- a/HomeScreen/src/controlbarwidget.h
+++ b/HomeScreen/src/controlbarwidget.h
@@ -44,6 +44,8 @@ private slots:
     void on_pushButton_settings_clicked();
     void on_pushButton_nav_clicked();
 
+    void on_pushButton_media_clicked();
+
 private:
     Ui::ControlBarWidget *mp_ui;
     org::agl::inputevent *mp_dBusInputEventProxy;

diff --git a/HomeScreen/src/homescreencontrolinterface.cpp b/HomeScreen/src/homescreencontrolinterface.cpp
index faf4b99..0c35b1c 100644 (file)
--- a/HomeScreen/src/homescreencontrolinterface.cpp
+++ b/HomeScreen/src/homescreencontrolinterface.cpp
@@ -44,7 +44,13 @@ void HomeScreenControlInterface::hardKeyPressed(int key)
     {
     case InputEvent::HARDKEY_NAV:
         qDebug("hardKeyPressed NAV key pressed!");
-        pid = mp_dBusAppFrameworkProxy->launchApp("demoapp");
+        pid = mp_dBusAppFrameworkProxy->launchApp("nav@0.1");
+        qDebug("pid: %d", pid);
+        newRequestsToBeVisibleApp(pid);
+        break;
+    case InputEvent::HARDKEY_MEDIA:
+        qDebug("hardKeyPressed MEDIA key pressed!");
+        pid = mp_dBusAppFrameworkProxy->launchApp("media@0.1");
         qDebug("pid: %d", pid);
         newRequestsToBeVisibleApp(pid);
         break;

diff --git a/InputEventManager/src/inputeventmanager.cpp b/InputEventManager/src/inputeventmanager.cpp
index a33fdbe..4ca473c 100644 (file)
--- a/InputEventManager/src/inputeventmanager.cpp
+++ b/InputEventManager/src/inputeventmanager.cpp
@@ -53,6 +53,10 @@ void InputEventManager::hardKeyPressed(int key)
         mp_dBusHomeScreenProxy->hardKeyPressed(key);
         qDebug("hardKeyPressed NAV key pressed!");
         break;
+    case InputEvent::HARDKEY_MEDIA:
+        mp_dBusHomeScreenProxy->hardKeyPressed(key);
+        qDebug("hardKeyPressed MEDIA key pressed!");
+        break;
     default:
         qDebug("hardKeyPressed %d", key);
         break;

diff --git a/WindowManager/src/windowmanager.cpp b/WindowManager/src/windowmanager.cpp
index 3c5c881..25d971a 100644 (file)
--- a/WindowManager/src/windowmanager.cpp
+++ b/WindowManager/src/windowmanager.cpp
@@ -349,7 +349,7 @@ void WindowManager::surfaceCallbackFunction_non_static(t_ilm_surface surface,
     if (ILM_NOTIFICATION_VISIBILITY & mask)
     {
         qDebug("ILM_NOTIFICATION_VISIBILITY");
-        surfaceVisibilityChanged(surface, surfaceProperties.visibility);
+        surfaceVisibilityChanged(surface, surfaceProperties->visibility);
     }
     if (ILM_NOTIFICATION_OPACITY & mask)
     {

diff --git a/interfaces/include/inputevent.hpp b/interfaces/include/inputevent.hpp
index 28418f6..ef269dd 100644 (file)
--- a/interfaces/include/inputevent.hpp
+++ b/interfaces/include/inputevent.hpp
@@ -21,7 +21,8 @@ namespace InputEvent {
     typedef enum HardKey
     {
         HARDKEY_UNDEFINED,
-        HARDKEY_NAV
+        HARDKEY_NAV,
+        HARDKEY_MEDIA
     } eHardKey;
 }