Implemented proximity interface. v0.3.1
authorBocklage, Jens <Jens_Bocklage@mentor.com>
Wed, 5 Oct 2016 14:25:19 +0000 (16:25 +0200)
committerBocklage, Jens <Jens_Bocklage@mentor.com>
Wed, 5 Oct 2016 14:25:19 +0000 (16:25 +0200)
Signed-off-by: Bocklage, Jens <Jens_Bocklage@mentor.com>
46 files changed:
HomeScreen/README.md
HomeScreen/resources/applauncherwidget.ui
HomeScreen/resources/colorschemes/default/0.ini [deleted file]
HomeScreen/resources/colorschemes/default/0/0.ini [new file with mode: 0644]
HomeScreen/resources/colorschemes/default/0/1.ini [new file with mode: 0644]
HomeScreen/resources/colorschemes/default/1.ini [deleted file]
HomeScreen/resources/colorschemes/default/1/0.ini [new file with mode: 0644]
HomeScreen/resources/colorschemes/default/1/1.ini [new file with mode: 0644]
HomeScreen/resources/colorschemes/demo1/0.ini [deleted file]
HomeScreen/resources/colorschemes/demo1/0/0.ini [new file with mode: 0644]
HomeScreen/resources/colorschemes/demo1/0/1.ini [new file with mode: 0644]
HomeScreen/resources/colorschemes/demo1/1.ini [deleted file]
HomeScreen/resources/colorschemes/demo1/1/0.ini [new file with mode: 0644]
HomeScreen/resources/colorschemes/demo1/1/1.ini [new file with mode: 0644]
HomeScreen/resources/colorschemes/demo2/0.ini [deleted file]
HomeScreen/resources/colorschemes/demo2/0/0.ini [new file with mode: 0644]
HomeScreen/resources/colorschemes/demo2/0/1.ini [new file with mode: 0644]
HomeScreen/resources/colorschemes/demo2/1.ini [deleted file]
HomeScreen/resources/colorschemes/demo2/1/0.ini [new file with mode: 0644]
HomeScreen/resources/colorschemes/demo2/1/1.ini [new file with mode: 0644]
HomeScreen/resources/controlbarwidget.ui
HomeScreen/resources/mainwindow.ui
HomeScreen/resources/popupwidget.ui
HomeScreen/resources/settingswidget.ui
HomeScreen/resources/statusbarwidget.ui
HomeScreen/src/applauncherwidget.cpp
HomeScreen/src/controlbarwidget.cpp
HomeScreen/src/controlbarwidget.h
HomeScreen/src/layouthandler.cpp
HomeScreen/src/layouthandler.h
HomeScreen/src/mainwindow.cpp
HomeScreen/src/mainwindow.h
HomeScreen/src/popupwidget.cpp
HomeScreen/src/settingswidget.cpp
HomeScreen/src/settingswidget.h
HomeScreen/src/statusbarwidget.cpp
HomeScreenSimulator/README.md
HomeScreenSimulator/resources/mainwindow.ui
HomeScreenSimulator/src/main.cpp
HomeScreenSimulator/src/mainwindow.cpp
HomeScreenSimulator/src/mainwindow.h
README.md
interfaces/README.md
interfaces/include/proximity.hpp [new file with mode: 0644]
interfaces/interfaces.pro
interfaces/proximity.xml [new file with mode: 0644]

index 01deabb..e02682f 100644 (file)
@@ -9,6 +9,12 @@ https://gerrit.automotivelinux.org/gerrit/#/admin/projects/staging/HomeScreen
 AGL repo for bitbake recipe:
 https://gerrit.automotivelinux.org/gerrit/#/admin/projects/AGL/meta-agl-demo/recipes-demo-hmi/HomeScreen/HomeScreen_?.bb
 
+v0.3.1
+10/05/2016
+
+#new features
+- implemented proximity
+
 v0.3.0
 09/30/2016
 
index 7b93bc9..bff4034 100644 (file)
@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string>Form_AppLauncher</string>
   </property>
-  <widget class="QWidget" name="widget_Background" native="true">
+  <widget class="QWidget" name="widget_background" native="true">
    <property name="geometry">
     <rect>
      <x>0</x>
@@ -22,7 +22,7 @@
      <height>1800</height>
     </rect>
    </property>
-   <widget class="QWidget" name="widget_Home_Icon" native="true">
+   <widget class="QWidget" name="widget_homeIcon" native="true">
     <property name="geometry">
      <rect>
       <x>-40</x>
diff --git a/HomeScreen/resources/colorschemes/default/0.ini b/HomeScreen/resources/colorschemes/default/0.ini
deleted file mode 100644 (file)
index 1ff1da8..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-[ControlBarWidget]
-pushButton_Home=:/icons/home_day.png
-pushButton_Settings=:/icons/settings_day.png
-pushButton_Nav=:/icons/explore_day.png
-widget_Background=background-image: url(:/images/backgrounds/bg_green_day.png)
-
-[MainWindow]
-widget_Background="background-image: url(:/images/backgrounds/bg_blue_day.png);"
-widget_Home_Icon="border-image: url(:/icons/home_day.png) 0 0 0 0 stretch stretch;"
-
-[AppLauncherWidget]
-widget_Background="background-image: url(:/images/backgrounds/bg_blue_day.png);"
-widget_Home_Icon="border-image: url(:/icons/home_day.png) 0 0 0 0 stretch stretch;"
-
-[PopupWidget]
-label_Text="background-color: rgba(109, 109, 109, 0);         background-image: url(:/images/transparency.png);         border-image: url(:/images/transparency.png);"
-widget_Popup="QWidget {         border: 1px solid #D3D3D3;         border-radius: 8px;         background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255));         color: #333;         padding: 0px;         }          QWidget:on {         background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE);         }"
-
-[SettingsWidget]
-comboBoxLanguage="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
-comboBoxColorScheme="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
-widget_Background="background-image: url(:/images/backgrounds/bg_blue_day.png);"
-widget_Settings_Icon="border-image: url(:/icons/settings_day.png) 0 0 0 0 stretch stretch;"
-
-[StatusBarWidget]
-label_1="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
-label_1_icon="background-image: url(:/images/transparency.png);"
-label_2="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
-label_2_icon="background-image: url(:/images/transparency.png);"
-label_3="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
-label_3_icon="background-image: url(:/images/transparency.png);"
-label_4="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
-label_4_icon="background-image: url(:/images/transparency.png);"
-label_5="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
-label_5_icon="background-image: url(:/images/transparency.png);"
-widget=background-image: url(:/images/backgrounds/bg_stripes_day.png)
diff --git a/HomeScreen/resources/colorschemes/default/0/0.ini b/HomeScreen/resources/colorschemes/default/0/0.ini
new file mode 100644 (file)
index 0000000..967ea37
--- /dev/null
@@ -0,0 +1,40 @@
+[ControlBarWidget]
+pushButton_homeIcon_icon=:/icons/home_day.png
+pushButton_homeIcon_css="background-image: url(:/images/transparency.png);border-image: url(:/images/transparency.png);"
+pushButton_settingsIcon_icon=:/icons/settings_day.png
+pushButton_settingsIcon_css="background-image: url(:/images/transparency.png);border-image: url(:/images/transparency.png);"
+pushButton_navIcon_icon=:/icons/explore_day.png
+pushButton_navIcon_css="background-image: url(:/images/transparency.png);border-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_green_day.png)
+
+[MainWindow]
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_day.png);"
+widget_homeIcon_css="border-image: url(:/icons/home_day.png) 0 0 0 0 stretch stretch;"
+
+[AppLauncherWidget]
+common_css="QTableWidget {background-color: transparent;} QTableCornerButton::section {background-color: transparent;}"
+widget_Background="background-image: url(:/images/backgrounds/bg_blue_day.png);"
+widget_Home_Icon="border-image: url(:/icons/home_day.png) 0 0 0 0 stretch stretch;"
+
+[PopupWidget]
+label_text_css="background-color: rgba(109, 109, 109, 0);         background-image: url(:/images/transparency.png);         border-image: url(:/images/transparency.png);"
+widget_popup_css="QWidget {         border: 1px solid #D3D3D3;         border-radius: 8px;         background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255));         color: #333;         padding: 0px;         }          QWidget:on {         background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE);         }"
+
+[SettingsWidget]
+comboBox_language_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+comboBox_colorScheme_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_day.png);"
+widget_settingsIcon_css="border-image: url(:/icons/settings_day.png) 0 0 0 0 stretch stretch;"
+
+[StatusBarWidget]
+label_1_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_1_icon_css="background-image: url(:/images/transparency.png);"
+label_2_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_2_icon_css="background-image: url(:/images/transparency.png);"
+label_3_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_3_icon_css="background-image: url(:/images/transparency.png);"
+label_4_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_4_icon_css="background-image: url(:/images/transparency.png);"
+label_5_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_5_icon_css="background-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_stripes_day.png)
diff --git a/HomeScreen/resources/colorschemes/default/0/1.ini b/HomeScreen/resources/colorschemes/default/0/1.ini
new file mode 100644 (file)
index 0000000..6fd2532
--- /dev/null
@@ -0,0 +1,40 @@
+[ControlBarWidget]
+pushButton_homeIcon_icon=:/icons/home_night.png
+pushButton_homeIcon_css="background-image: url(:/images/transparency.png);border-image: url(:/images/transparency.png);"
+pushButton_settingsIcon_icon=:/icons/settings_night.png
+pushButton_settingsIcon_css="background-image: url(:/images/transparency.png);border-image: url(:/images/transparency.png);"
+pushButton_navIcon_icon=:/icons/explore_night.png
+pushButton_navIcon_css="background-image: url(:/images/transparency.png);border-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_green_night.png)
+
+[MainWindow]
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_night.png);"
+widget_homeIcon_css="border-image: url(:/icons/home_night.png) 0 0 0 0 stretch stretch;"
+
+[AppLauncherWidget]
+common_css="QTableWidget {background-color: transparent;} QTableCornerButton::section {background-color: transparent;}"
+widget_Background="background-image: url(:/images/backgrounds/bg_blue_night.png);"
+widget_Home_Icon="border-image: url(:/icons/home_night.png) 0 0 0 0 stretch stretch;"
+
+[PopupWidget]
+label_text_css="background-color: rgba(109, 109, 109, 0);         background-image: url(:/images/transparency.png);         border-image: url(:/images/transparency.png);"
+widget_popup_css="QWidget {         border: 1px solid #D3D3D3;         border-radius: 8px;         background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255));         color: #333;         padding: 0px;         }          QWidget:on {         background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE);         }"
+
+[SettingsWidget]
+comboBox_language_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+comboBox_colorScheme_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_night.png);"
+widget_settingsIcon_css="border-image: url(:/icons/settings_night.png) 0 0 0 0 stretch stretch;"
+
+[StatusBarWidget]
+label_1_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_1_icon_css="background-image: url(:/images/transparency.png);"
+label_2_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_2_icon_css="background-image: url(:/images/transparency.png);"
+label_3_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_3_icon_css="background-image: url(:/images/transparency.png);"
+label_4_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_4_icon_css="background-image: url(:/images/transparency.png);"
+label_5_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_5_icon_css="background-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_stripes_night.png)
diff --git a/HomeScreen/resources/colorschemes/default/1.ini b/HomeScreen/resources/colorschemes/default/1.ini
deleted file mode 100644 (file)
index e62d1e7..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-[ControlBarWidget]
-pushButton_Home=:/icons/home_night.png
-pushButton_Settings=:/icons/settings_night.png
-pushButton_Nav=:/icons/explore_night.png
-widget_Background=background-image: url(:/images/backgrounds/bg_green_night.png)
-
-[MainWindow]
-widget_Background="background-image: url(:/images/backgrounds/bg_blue_night.png);"
-widget_Home_Icon="border-image: url(:/icons/home_night.png) 0 0 0 0 stretch stretch;"
-
-[AppLauncherWidget]
-widget_Background="background-image: url(:/images/backgrounds/bg_blue_night.png);"
-widget_Home_Icon="border-image: url(:/icons/home_night.png) 0 0 0 0 stretch stretch;"
-
-[PopupWidget]
-label_Text="background-color: rgba(109, 109, 109, 0);         background-image: url(:/images/transparency.png);         border-image: url(:/images/transparency.png);"
-widget_Popup="QWidget {         border: 1px solid #D3D3D3;         border-radius: 8px;         background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255));         color: #333;         padding: 0px;         }          QWidget:on {         background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE);         }"
-
-[SettingsWidget]
-comboBoxLanguage="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
-comboBoxColorScheme="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
-widget_Background="background-image: url(:/images/backgrounds/bg_blue_night.png);"
-widget_Settings_Icon="border-image: url(:/icons/settings_night.png) 0 0 0 0 stretch stretch;"
-
-[StatusBarWidget]
-label_1="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
-label_1_icon="background-image: url(:/images/transparency.png);"
-label_2="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
-label_2_icon="background-image: url(:/images/transparency.png);"
-label_3="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
-label_3_icon="background-image: url(:/images/transparency.png);"
-label_4="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
-label_4_icon="background-image: url(:/images/transparency.png);"
-label_5="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
-label_5_icon="background-image: url(:/images/transparency.png);"
-widget=background-image: url(:/images/backgrounds/bg_stripes_night.png)
diff --git a/HomeScreen/resources/colorschemes/default/1/0.ini b/HomeScreen/resources/colorschemes/default/1/0.ini
new file mode 100644 (file)
index 0000000..8894e1f
--- /dev/null
@@ -0,0 +1,40 @@
+[ControlBarWidget]
+pushButton_homeIcon_icon=:/icons/home_day.png
+pushButton_homeIcon_css="background-image: url(:/images/transparency.png);"
+pushButton_settingsIcon_icon=:/icons/settings_day.png
+pushButton_settingsIcon_css="background-image: url(:/images/transparency.png);"
+pushButton_navIcon_icon=:/icons/explore_day.png
+pushButton_navIcon_css="background-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_green_day.png)
+
+[MainWindow]
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_day.png);"
+widget_homeIcon_css="border-image: url(:/icons/home_day.png) 0 0 0 0 stretch stretch;"
+
+[AppLauncherWidget]
+common_css="QTableWidget {background-color: transparent;} QTableCornerButton::section {background-color: transparent;}"
+widget_Background="background-image: url(:/images/backgrounds/bg_blue_day.png);"
+widget_Home_Icon="border-image: url(:/icons/home_day.png) 0 0 0 0 stretch stretch;"
+
+[PopupWidget]
+label_text_css="background-color: rgba(109, 109, 109, 0);         background-image: url(:/images/transparency.png);         border-image: url(:/images/transparency.png);"
+widget_popup_css="QWidget {         border: 1px solid #D3D3D3;         border-radius: 8px;         background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255));         color: #333;         padding: 0px;         }          QWidget:on {         background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE);         }"
+
+[SettingsWidget]
+comboBox_language_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+comboBox_colorScheme_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_day.png);"
+widget_settingsIcon_css="border-image: url(:/icons/settings_day.png) 0 0 0 0 stretch stretch;"
+
+[StatusBarWidget]
+label_1_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_1_icon_css="background-image: url(:/images/transparency.png);"
+label_2_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_2_icon_css="background-image: url(:/images/transparency.png);"
+label_3_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_3_icon_css="background-image: url(:/images/transparency.png);"
+label_4_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_4_icon_css="background-image: url(:/images/transparency.png);"
+label_5_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_5_icon_css="background-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_stripes_day.png)
diff --git a/HomeScreen/resources/colorschemes/default/1/1.ini b/HomeScreen/resources/colorschemes/default/1/1.ini
new file mode 100644 (file)
index 0000000..0117e84
--- /dev/null
@@ -0,0 +1,40 @@
+[ControlBarWidget]
+pushButton_homeIcon_icon=:/icons/home_night.png
+pushButton_homeIcon_css="background-image: url(:/images/transparency.png);"
+pushButton_settingsIcon_icon=:/icons/settings_night.png
+pushButton_settingsIcon_css="background-image: url(:/images/transparency.png);"
+pushButton_navIcon_icon=:/icons/explore_night.png
+pushButton_navIcon_css="background-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_green_night.png)
+
+[MainWindow]
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_night.png);"
+widget_homeIcon_css="border-image: url(:/icons/home_night.png) 0 0 0 0 stretch stretch;"
+
+[AppLauncherWidget]
+common_css="QTableWidget {background-color: transparent;} QTableCornerButton::section {background-color: transparent;}"
+widget_Background="background-image: url(:/images/backgrounds/bg_blue_night.png);"
+widget_Home_Icon="border-image: url(:/icons/home_night.png) 0 0 0 0 stretch stretch;"
+
+[PopupWidget]
+label_text_css="background-color: rgba(109, 109, 109, 0);         background-image: url(:/images/transparency.png);         border-image: url(:/images/transparency.png);"
+widget_popup_css="QWidget {         border: 1px solid #D3D3D3;         border-radius: 8px;         background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255));         color: #333;         padding: 0px;         }          QWidget:on {         background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE);         }"
+
+[SettingsWidget]
+comboBox_language_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+comboBox_colorScheme_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_night.png);"
+widget_settingsIcon_css="border-image: url(:/icons/settings_night.png) 0 0 0 0 stretch stretch;"
+
+[StatusBarWidget]
+label_1_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_1_icon_css="background-image: url(:/images/transparency.png);"
+label_2_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_2_icon_css="background-image: url(:/images/transparency.png);"
+label_3_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_3_icon_css="background-image: url(:/images/transparency.png);"
+label_4_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_4_icon_css="background-image: url(:/images/transparency.png);"
+label_5_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_5_icon_css="background-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_stripes_night.png)
diff --git a/HomeScreen/resources/colorschemes/demo1/0.ini b/HomeScreen/resources/colorschemes/demo1/0.ini
deleted file mode 100644 (file)
index 6b7fa03..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-[ControlBarWidget]
-pushButton_Home=:/icons/home_day.png
-pushButton_Settings=:/icons/settings_day.png
-widget_Background=background-image: url(:/images/backgrounds/bg_green_day.png)
-
-[MainWindow]
-widget_Background="background-image: url(:/images/backgrounds/bg_blue_day.png);"
-widget_Home_Icon="border-image: url(:/icons/home_day.png) 0 0 0 0 stretch stretch;"
-
-[PopupWidget]
-label_Text="background-color: rgba(255, 109, 109, 0);         background-image: url(:/images/transparency.png);         border-image: url(:/images/transparency.png);"
-widget_Popup="QWidget {         border: 1px solid #D3D3D3;         border-radius: 8px;         background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 242, 249, 255), stop:1 rgba(255, 255, 255, 255));         color: #333;         padding: 0px;         }          QWidget:on {         background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE);         }"
-
-[SettingsWidget]
-comboBoxLanguage="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 242, 249, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
-comboBoxColorScheme="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 242, 249, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
-widget_Background="background-image: url(:/images/backgrounds/bg_blue_day.png);"
-widget_Settings_Icon="border-image: url(:/icons/settings_day.png) 0 0 0 0 stretch stretch;"
-
-[StatusBarWidget]
-label_1="color: rgb(255, 238, 238); background-image: url(:/images/transparency.png);"
-label_1_icon="background-image: url(:/images/transparency.png);"
-label_2="color: rgb(255, 238, 238); background-image: url(:/images/transparency.png);"
-label_2_icon="background-image: url(:/images/transparency.png);"
-label_3="color: rgb(255, 238, 238); background-image: url(:/images/transparency.png);"
-label_3_icon="background-image: url(:/images/transparency.png);"
-label_4="color: rgb(255, 238, 238); background-image: url(:/images/transparency.png);"
-label_4_icon="background-image: url(:/images/transparency.png);"
-label_5="color: rgb(255, 238, 238); background-image: url(:/images/transparency.png);"
-label_5_icon="background-image: url(:/images/transparency.png);"
-widget=background-image: url(:/images/backgrounds/bg_stripes_day.png)
diff --git a/HomeScreen/resources/colorschemes/demo1/0/0.ini b/HomeScreen/resources/colorschemes/demo1/0/0.ini
new file mode 100644 (file)
index 0000000..967ea37
--- /dev/null
@@ -0,0 +1,40 @@
+[ControlBarWidget]
+pushButton_homeIcon_icon=:/icons/home_day.png
+pushButton_homeIcon_css="background-image: url(:/images/transparency.png);border-image: url(:/images/transparency.png);"
+pushButton_settingsIcon_icon=:/icons/settings_day.png
+pushButton_settingsIcon_css="background-image: url(:/images/transparency.png);border-image: url(:/images/transparency.png);"
+pushButton_navIcon_icon=:/icons/explore_day.png
+pushButton_navIcon_css="background-image: url(:/images/transparency.png);border-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_green_day.png)
+
+[MainWindow]
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_day.png);"
+widget_homeIcon_css="border-image: url(:/icons/home_day.png) 0 0 0 0 stretch stretch;"
+
+[AppLauncherWidget]
+common_css="QTableWidget {background-color: transparent;} QTableCornerButton::section {background-color: transparent;}"
+widget_Background="background-image: url(:/images/backgrounds/bg_blue_day.png);"
+widget_Home_Icon="border-image: url(:/icons/home_day.png) 0 0 0 0 stretch stretch;"
+
+[PopupWidget]
+label_text_css="background-color: rgba(109, 109, 109, 0);         background-image: url(:/images/transparency.png);         border-image: url(:/images/transparency.png);"
+widget_popup_css="QWidget {         border: 1px solid #D3D3D3;         border-radius: 8px;         background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255));         color: #333;         padding: 0px;         }          QWidget:on {         background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE);         }"
+
+[SettingsWidget]
+comboBox_language_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+comboBox_colorScheme_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_day.png);"
+widget_settingsIcon_css="border-image: url(:/icons/settings_day.png) 0 0 0 0 stretch stretch;"
+
+[StatusBarWidget]
+label_1_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_1_icon_css="background-image: url(:/images/transparency.png);"
+label_2_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_2_icon_css="background-image: url(:/images/transparency.png);"
+label_3_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_3_icon_css="background-image: url(:/images/transparency.png);"
+label_4_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_4_icon_css="background-image: url(:/images/transparency.png);"
+label_5_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_5_icon_css="background-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_stripes_day.png)
diff --git a/HomeScreen/resources/colorschemes/demo1/0/1.ini b/HomeScreen/resources/colorschemes/demo1/0/1.ini
new file mode 100644 (file)
index 0000000..6fd2532
--- /dev/null
@@ -0,0 +1,40 @@
+[ControlBarWidget]
+pushButton_homeIcon_icon=:/icons/home_night.png
+pushButton_homeIcon_css="background-image: url(:/images/transparency.png);border-image: url(:/images/transparency.png);"
+pushButton_settingsIcon_icon=:/icons/settings_night.png
+pushButton_settingsIcon_css="background-image: url(:/images/transparency.png);border-image: url(:/images/transparency.png);"
+pushButton_navIcon_icon=:/icons/explore_night.png
+pushButton_navIcon_css="background-image: url(:/images/transparency.png);border-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_green_night.png)
+
+[MainWindow]
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_night.png);"
+widget_homeIcon_css="border-image: url(:/icons/home_night.png) 0 0 0 0 stretch stretch;"
+
+[AppLauncherWidget]
+common_css="QTableWidget {background-color: transparent;} QTableCornerButton::section {background-color: transparent;}"
+widget_Background="background-image: url(:/images/backgrounds/bg_blue_night.png);"
+widget_Home_Icon="border-image: url(:/icons/home_night.png) 0 0 0 0 stretch stretch;"
+
+[PopupWidget]
+label_text_css="background-color: rgba(109, 109, 109, 0);         background-image: url(:/images/transparency.png);         border-image: url(:/images/transparency.png);"
+widget_popup_css="QWidget {         border: 1px solid #D3D3D3;         border-radius: 8px;         background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255));         color: #333;         padding: 0px;         }          QWidget:on {         background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE);         }"
+
+[SettingsWidget]
+comboBox_language_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+comboBox_colorScheme_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_night.png);"
+widget_settingsIcon_css="border-image: url(:/icons/settings_night.png) 0 0 0 0 stretch stretch;"
+
+[StatusBarWidget]
+label_1_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_1_icon_css="background-image: url(:/images/transparency.png);"
+label_2_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_2_icon_css="background-image: url(:/images/transparency.png);"
+label_3_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_3_icon_css="background-image: url(:/images/transparency.png);"
+label_4_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_4_icon_css="background-image: url(:/images/transparency.png);"
+label_5_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_5_icon_css="background-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_stripes_night.png)
diff --git a/HomeScreen/resources/colorschemes/demo1/1.ini b/HomeScreen/resources/colorschemes/demo1/1.ini
deleted file mode 100644 (file)
index df2788f..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-[ControlBarWidget]
-pushButton_Home=:/icons/home_night.png
-pushButton_Settings=:/icons/settings_night.png
-widget_Background=background-image: url(:/images/backgrounds/bg_green_night.png)
-
-[MainWindow]
-widget_Background="background-image: url(:/images/backgrounds/bg_blue_night.png);"
-widget_Home_Icon="border-image: url(:/icons/home_night.png) 0 0 0 0 stretch stretch;"
-
-[PopupWidget]
-label_Text="background-color: rgba(0, 109, 109, 0);         background-image: url(:/images/transparency.png);         border-image: url(:/images/transparency.png);"
-widget_Popup="QWidget {         border: 1px solid #D3D3D3;         border-radius: 8px;         background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255));         color: #333;         padding: 0px;         }          QWidget:on {         background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE);         }"
-
-[SettingsWidget]
-comboBoxLanguage="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 147, 151, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
-comboBoxColorScheme="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 147, 151, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
-widget_Background="background-image: url(:/images/backgrounds/bg_blue_night.png);"
-widget_Settings_Icon="border-image: url(:/icons/settings_night.png) 0 0 0 0 stretch stretch;"
-
-[StatusBarWidget]
-label_1="color: rgb(0, 177, 177); background-image: url(:/images/transparency.png);"
-label_1_icon="background-image: url(:/images/transparency.png);"
-label_2="color: rgb(0, 177, 177); background-image: url(:/images/transparency.png);"
-label_2_icon="background-image: url(:/images/transparency.png);"
-label_3="color: rgb(0, 177, 177); background-image: url(:/images/transparency.png);"
-label_3_icon="background-image: url(:/images/transparency.png);"
-label_4="color: rgb(0, 177, 177); background-image: url(:/images/transparency.png);"
-label_4_icon="background-image: url(:/images/transparency.png);"
-label_5="color: rgb(0, 177, 177); background-image: url(:/images/transparency.png);"
-label_5_icon="background-image: url(:/images/transparency.png);"
-widget=background-image: url(:/images/backgrounds/bg_stripes_night.png)
diff --git a/HomeScreen/resources/colorschemes/demo1/1/0.ini b/HomeScreen/resources/colorschemes/demo1/1/0.ini
new file mode 100644 (file)
index 0000000..8894e1f
--- /dev/null
@@ -0,0 +1,40 @@
+[ControlBarWidget]
+pushButton_homeIcon_icon=:/icons/home_day.png
+pushButton_homeIcon_css="background-image: url(:/images/transparency.png);"
+pushButton_settingsIcon_icon=:/icons/settings_day.png
+pushButton_settingsIcon_css="background-image: url(:/images/transparency.png);"
+pushButton_navIcon_icon=:/icons/explore_day.png
+pushButton_navIcon_css="background-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_green_day.png)
+
+[MainWindow]
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_day.png);"
+widget_homeIcon_css="border-image: url(:/icons/home_day.png) 0 0 0 0 stretch stretch;"
+
+[AppLauncherWidget]
+common_css="QTableWidget {background-color: transparent;} QTableCornerButton::section {background-color: transparent;}"
+widget_Background="background-image: url(:/images/backgrounds/bg_blue_day.png);"
+widget_Home_Icon="border-image: url(:/icons/home_day.png) 0 0 0 0 stretch stretch;"
+
+[PopupWidget]
+label_text_css="background-color: rgba(109, 109, 109, 0);         background-image: url(:/images/transparency.png);         border-image: url(:/images/transparency.png);"
+widget_popup_css="QWidget {         border: 1px solid #D3D3D3;         border-radius: 8px;         background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255));         color: #333;         padding: 0px;         }          QWidget:on {         background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE);         }"
+
+[SettingsWidget]
+comboBox_language_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+comboBox_colorScheme_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_day.png);"
+widget_settingsIcon_css="border-image: url(:/icons/settings_day.png) 0 0 0 0 stretch stretch;"
+
+[StatusBarWidget]
+label_1_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_1_icon_css="background-image: url(:/images/transparency.png);"
+label_2_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_2_icon_css="background-image: url(:/images/transparency.png);"
+label_3_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_3_icon_css="background-image: url(:/images/transparency.png);"
+label_4_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_4_icon_css="background-image: url(:/images/transparency.png);"
+label_5_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_5_icon_css="background-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_stripes_day.png)
diff --git a/HomeScreen/resources/colorschemes/demo1/1/1.ini b/HomeScreen/resources/colorschemes/demo1/1/1.ini
new file mode 100644 (file)
index 0000000..0117e84
--- /dev/null
@@ -0,0 +1,40 @@
+[ControlBarWidget]
+pushButton_homeIcon_icon=:/icons/home_night.png
+pushButton_homeIcon_css="background-image: url(:/images/transparency.png);"
+pushButton_settingsIcon_icon=:/icons/settings_night.png
+pushButton_settingsIcon_css="background-image: url(:/images/transparency.png);"
+pushButton_navIcon_icon=:/icons/explore_night.png
+pushButton_navIcon_css="background-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_green_night.png)
+
+[MainWindow]
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_night.png);"
+widget_homeIcon_css="border-image: url(:/icons/home_night.png) 0 0 0 0 stretch stretch;"
+
+[AppLauncherWidget]
+common_css="QTableWidget {background-color: transparent;} QTableCornerButton::section {background-color: transparent;}"
+widget_Background="background-image: url(:/images/backgrounds/bg_blue_night.png);"
+widget_Home_Icon="border-image: url(:/icons/home_night.png) 0 0 0 0 stretch stretch;"
+
+[PopupWidget]
+label_text_css="background-color: rgba(109, 109, 109, 0);         background-image: url(:/images/transparency.png);         border-image: url(:/images/transparency.png);"
+widget_popup_css="QWidget {         border: 1px solid #D3D3D3;         border-radius: 8px;         background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255));         color: #333;         padding: 0px;         }          QWidget:on {         background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE);         }"
+
+[SettingsWidget]
+comboBox_language_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+comboBox_colorScheme_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_night.png);"
+widget_settingsIcon_css="border-image: url(:/icons/settings_night.png) 0 0 0 0 stretch stretch;"
+
+[StatusBarWidget]
+label_1_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_1_icon_css="background-image: url(:/images/transparency.png);"
+label_2_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_2_icon_css="background-image: url(:/images/transparency.png);"
+label_3_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_3_icon_css="background-image: url(:/images/transparency.png);"
+label_4_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_4_icon_css="background-image: url(:/images/transparency.png);"
+label_5_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_5_icon_css="background-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_stripes_night.png)
diff --git a/HomeScreen/resources/colorschemes/demo2/0.ini b/HomeScreen/resources/colorschemes/demo2/0.ini
deleted file mode 100644 (file)
index 4796703..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-[ControlBarWidget]
-pushButton_Home=:/icons/home_day.png
-pushButton_Settings=:/icons/settings_day.png
-widget_Background=background-image: url(:/images/backgrounds/bg_green_day.png)
-
-[MainWindow]
-widget_Background="background-image: url(:/images/backgrounds/bg_blue_day.png);"
-widget_Home_Icon="border-image: url(:/icons/home_day.png) 0 0 0 0 stretch stretch;"
-
-[PopupWidget]
-label_Text="background-color: rgba(109, 255, 0, 0);         background-image: url(:/images/transparency.png);         border-image: url(:/images/transparency.png);"
-widget_Popup=""
-
-[SettingsWidget]
-comboBoxLanguage=""
-comboBoxColorScheme=""
-widget_Background="background-image: url(:/images/backgrounds/bg_blue_day.png);"
-widget_Settings_Icon="border-image: url(:/icons/settings_day.png) 0 0 0 0 stretch stretch;"
-
-[StatusBarWidget]
-label_1="color: rgb(238, 255, 0); background-image: url(:/images/transparency.png);"
-label_1_icon="background-image: url(:/images/transparency.png);"
-label_2="color: rgb(238, 255, 0); background-image: url(:/images/transparency.png);"
-label_2_icon="background-image: url(:/images/transparency.png);"
-label_3="color: rgb(238, 255, 0); background-image: url(:/images/transparency.png);"
-label_3_icon="background-image: url(:/images/transparency.png);"
-label_4="color: rgb(238, 255, 0); background-image: url(:/images/transparency.png);"
-label_4_icon="background-image: url(:/images/transparency.png);"
-label_5="color: rgb(238, 255, 0); background-image: url(:/images/transparency.png);"
-label_5_icon="background-image: url(:/images/transparency.png);"
-widget=background-image: url(:/images/backgrounds/bg_stripes_day.png)
diff --git a/HomeScreen/resources/colorschemes/demo2/0/0.ini b/HomeScreen/resources/colorschemes/demo2/0/0.ini
new file mode 100644 (file)
index 0000000..967ea37
--- /dev/null
@@ -0,0 +1,40 @@
+[ControlBarWidget]
+pushButton_homeIcon_icon=:/icons/home_day.png
+pushButton_homeIcon_css="background-image: url(:/images/transparency.png);border-image: url(:/images/transparency.png);"
+pushButton_settingsIcon_icon=:/icons/settings_day.png
+pushButton_settingsIcon_css="background-image: url(:/images/transparency.png);border-image: url(:/images/transparency.png);"
+pushButton_navIcon_icon=:/icons/explore_day.png
+pushButton_navIcon_css="background-image: url(:/images/transparency.png);border-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_green_day.png)
+
+[MainWindow]
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_day.png);"
+widget_homeIcon_css="border-image: url(:/icons/home_day.png) 0 0 0 0 stretch stretch;"
+
+[AppLauncherWidget]
+common_css="QTableWidget {background-color: transparent;} QTableCornerButton::section {background-color: transparent;}"
+widget_Background="background-image: url(:/images/backgrounds/bg_blue_day.png);"
+widget_Home_Icon="border-image: url(:/icons/home_day.png) 0 0 0 0 stretch stretch;"
+
+[PopupWidget]
+label_text_css="background-color: rgba(109, 109, 109, 0);         background-image: url(:/images/transparency.png);         border-image: url(:/images/transparency.png);"
+widget_popup_css="QWidget {         border: 1px solid #D3D3D3;         border-radius: 8px;         background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255));         color: #333;         padding: 0px;         }          QWidget:on {         background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE);         }"
+
+[SettingsWidget]
+comboBox_language_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+comboBox_colorScheme_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_day.png);"
+widget_settingsIcon_css="border-image: url(:/icons/settings_day.png) 0 0 0 0 stretch stretch;"
+
+[StatusBarWidget]
+label_1_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_1_icon_css="background-image: url(:/images/transparency.png);"
+label_2_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_2_icon_css="background-image: url(:/images/transparency.png);"
+label_3_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_3_icon_css="background-image: url(:/images/transparency.png);"
+label_4_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_4_icon_css="background-image: url(:/images/transparency.png);"
+label_5_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_5_icon_css="background-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_stripes_day.png)
diff --git a/HomeScreen/resources/colorschemes/demo2/0/1.ini b/HomeScreen/resources/colorschemes/demo2/0/1.ini
new file mode 100644 (file)
index 0000000..6fd2532
--- /dev/null
@@ -0,0 +1,40 @@
+[ControlBarWidget]
+pushButton_homeIcon_icon=:/icons/home_night.png
+pushButton_homeIcon_css="background-image: url(:/images/transparency.png);border-image: url(:/images/transparency.png);"
+pushButton_settingsIcon_icon=:/icons/settings_night.png
+pushButton_settingsIcon_css="background-image: url(:/images/transparency.png);border-image: url(:/images/transparency.png);"
+pushButton_navIcon_icon=:/icons/explore_night.png
+pushButton_navIcon_css="background-image: url(:/images/transparency.png);border-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_green_night.png)
+
+[MainWindow]
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_night.png);"
+widget_homeIcon_css="border-image: url(:/icons/home_night.png) 0 0 0 0 stretch stretch;"
+
+[AppLauncherWidget]
+common_css="QTableWidget {background-color: transparent;} QTableCornerButton::section {background-color: transparent;}"
+widget_Background="background-image: url(:/images/backgrounds/bg_blue_night.png);"
+widget_Home_Icon="border-image: url(:/icons/home_night.png) 0 0 0 0 stretch stretch;"
+
+[PopupWidget]
+label_text_css="background-color: rgba(109, 109, 109, 0);         background-image: url(:/images/transparency.png);         border-image: url(:/images/transparency.png);"
+widget_popup_css="QWidget {         border: 1px solid #D3D3D3;         border-radius: 8px;         background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255));         color: #333;         padding: 0px;         }          QWidget:on {         background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE);         }"
+
+[SettingsWidget]
+comboBox_language_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+comboBox_colorScheme_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_night.png);"
+widget_settingsIcon_css="border-image: url(:/icons/settings_night.png) 0 0 0 0 stretch stretch;"
+
+[StatusBarWidget]
+label_1_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_1_icon_css="background-image: url(:/images/transparency.png);"
+label_2_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_2_icon_css="background-image: url(:/images/transparency.png);"
+label_3_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_3_icon_css="background-image: url(:/images/transparency.png);"
+label_4_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_4_icon_css="background-image: url(:/images/transparency.png);"
+label_5_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_5_icon_css="background-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_stripes_night.png)
diff --git a/HomeScreen/resources/colorschemes/demo2/1.ini b/HomeScreen/resources/colorschemes/demo2/1.ini
deleted file mode 100644 (file)
index 3415c55..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-[ControlBarWidget]
-pushButton_Home=:/icons/home_night.png
-pushButton_Settings=:/icons/settings_night.png
-widget_Background=background-image: url(:/images/backgrounds/bg_green_night.png)
-
-[MainWindow]
-widget_Background="background-image: url(:/images/backgrounds/bg_blue_night.png);"
-widget_Home_Icon="border-image: url(:/icons/home_night.png) 0 0 0 0 stretch stretch;"
-
-[PopupWidget]
-label_Text="background-color: rgba(0, 109, 255, 0);         background-image: url(:/images/transparency.png);         border-image: url(:/images/transparency.png);"
-widget_Popup=""
-
-[SettingsWidget]
-comboBoxLanguage=""
-comboBoxColorScheme=""
-widget_Background="background-image: url(:/images/backgrounds/bg_blue_night.png);"
-widget_Settings_Icon="border-image: url(:/icons/settings_night.png) 0 0 0 0 stretch stretch;"
-
-[StatusBarWidget]
-label_1="color: rgb(177, 177, 255); background-image: url(:/images/transparency.png);"
-label_1_icon="background-image: url(:/images/transparency.png);"
-label_2="color: rgb(177, 177, 255); background-image: url(:/images/transparency.png);"
-label_2_icon="background-image: url(:/images/transparency.png);"
-label_3="color: rgb(177, 177, 255); background-image: url(:/images/transparency.png);"
-label_3_icon="background-image: url(:/images/transparency.png);"
-label_4="color: rgb(177, 177, 255); background-image: url(:/images/transparency.png);"
-label_4_icon="background-image: url(:/images/transparency.png);"
-label_5="color: rgb(177, 177, 255); background-image: url(:/images/transparency.png);"
-label_5_icon="background-image: url(:/images/transparency.png);"
-widget=background-image: url(:/images/backgrounds/bg_stripes_night.png)
diff --git a/HomeScreen/resources/colorschemes/demo2/1/0.ini b/HomeScreen/resources/colorschemes/demo2/1/0.ini
new file mode 100644 (file)
index 0000000..8894e1f
--- /dev/null
@@ -0,0 +1,40 @@
+[ControlBarWidget]
+pushButton_homeIcon_icon=:/icons/home_day.png
+pushButton_homeIcon_css="background-image: url(:/images/transparency.png);"
+pushButton_settingsIcon_icon=:/icons/settings_day.png
+pushButton_settingsIcon_css="background-image: url(:/images/transparency.png);"
+pushButton_navIcon_icon=:/icons/explore_day.png
+pushButton_navIcon_css="background-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_green_day.png)
+
+[MainWindow]
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_day.png);"
+widget_homeIcon_css="border-image: url(:/icons/home_day.png) 0 0 0 0 stretch stretch;"
+
+[AppLauncherWidget]
+common_css="QTableWidget {background-color: transparent;} QTableCornerButton::section {background-color: transparent;}"
+widget_Background="background-image: url(:/images/backgrounds/bg_blue_day.png);"
+widget_Home_Icon="border-image: url(:/icons/home_day.png) 0 0 0 0 stretch stretch;"
+
+[PopupWidget]
+label_text_css="background-color: rgba(109, 109, 109, 0);         background-image: url(:/images/transparency.png);         border-image: url(:/images/transparency.png);"
+widget_popup_css="QWidget {         border: 1px solid #D3D3D3;         border-radius: 8px;         background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255));         color: #333;         padding: 0px;         }          QWidget:on {         background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE);         }"
+
+[SettingsWidget]
+comboBox_language_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+comboBox_colorScheme_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(242, 242, 249, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_day.png);"
+widget_settingsIcon_css="border-image: url(:/icons/settings_day.png) 0 0 0 0 stretch stretch;"
+
+[StatusBarWidget]
+label_1_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_1_icon_css="background-image: url(:/images/transparency.png);"
+label_2_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_2_icon_css="background-image: url(:/images/transparency.png);"
+label_3_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_3_icon_css="background-image: url(:/images/transparency.png);"
+label_4_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_4_icon_css="background-image: url(:/images/transparency.png);"
+label_5_css="color: rgb(238, 238, 238); background-image: url(:/images/transparency.png);"
+label_5_icon_css="background-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_stripes_day.png)
diff --git a/HomeScreen/resources/colorschemes/demo2/1/1.ini b/HomeScreen/resources/colorschemes/demo2/1/1.ini
new file mode 100644 (file)
index 0000000..0117e84
--- /dev/null
@@ -0,0 +1,40 @@
+[ControlBarWidget]
+pushButton_homeIcon_icon=:/icons/home_night.png
+pushButton_homeIcon_css="background-image: url(:/images/transparency.png);"
+pushButton_settingsIcon_icon=:/icons/settings_night.png
+pushButton_settingsIcon_css="background-image: url(:/images/transparency.png);"
+pushButton_navIcon_icon=:/icons/explore_night.png
+pushButton_navIcon_css="background-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_green_night.png)
+
+[MainWindow]
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_night.png);"
+widget_homeIcon_css="border-image: url(:/icons/home_night.png) 0 0 0 0 stretch stretch;"
+
+[AppLauncherWidget]
+common_css="QTableWidget {background-color: transparent;} QTableCornerButton::section {background-color: transparent;}"
+widget_Background="background-image: url(:/images/backgrounds/bg_blue_night.png);"
+widget_Home_Icon="border-image: url(:/icons/home_night.png) 0 0 0 0 stretch stretch;"
+
+[PopupWidget]
+label_text_css="background-color: rgba(109, 109, 109, 0);         background-image: url(:/images/transparency.png);         border-image: url(:/images/transparency.png);"
+widget_popup_css="QWidget {         border: 1px solid #D3D3D3;         border-radius: 8px;         background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255));         color: #333;         padding: 0px;         }          QWidget:on {         background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE);         }"
+
+[SettingsWidget]
+comboBox_language_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+comboBox_colorScheme_css="QComboBox { border: 1px solid #D3D3D3; border-radius: 8px; background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(147, 147, 151, 255), stop:1 rgba(255, 255, 255, 255)); color: #333; padding: 0px; } QComboBox:on { background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1 #EEEEEE); } QComboBox::drop-down { border: 0px solid; border-radius: 0px; } QComboBox::down-arrow:on { }"
+widget_background_css="background-image: url(:/images/backgrounds/bg_blue_night.png);"
+widget_settingsIcon_css="border-image: url(:/icons/settings_night.png) 0 0 0 0 stretch stretch;"
+
+[StatusBarWidget]
+label_1_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_1_icon_css="background-image: url(:/images/transparency.png);"
+label_2_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_2_icon_css="background-image: url(:/images/transparency.png);"
+label_3_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_3_icon_css="background-image: url(:/images/transparency.png);"
+label_4_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_4_icon_css="background-image: url(:/images/transparency.png);"
+label_5_css="color: rgb(177, 177, 177); background-image: url(:/images/transparency.png);"
+label_5_icon_css="background-image: url(:/images/transparency.png);"
+widget_background_css=background-image: url(:/images/backgrounds/bg_stripes_night.png)
index 8cd0b3e..49f8e40 100644 (file)
@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <widget class="QWidget" name="widget_Background" native="true">
+  <widget class="QWidget" name="widget_background" native="true">
    <property name="geometry">
     <rect>
      <x>0</x>
@@ -22,7 +22,7 @@
      <height>60</height>
     </rect>
    </property>
-   <widget class="QPushButton" name="pushButton_Home">
+   <widget class="QPushButton" name="pushButton_home">
     <property name="geometry">
      <rect>
       <x>10</x>
@@ -52,7 +52,7 @@ border-image: url(:/images/transparency.png);</string>
      </size>
     </property>
    </widget>
-   <widget class="QPushButton" name="pushButton_Settings">
+   <widget class="QPushButton" name="pushButton_settings">
     <property name="geometry">
      <rect>
       <x>60</x>
@@ -82,7 +82,7 @@ border-image: url(:/images/transparency.png);</string>
      </size>
     </property>
    </widget>
-   <widget class="QPushButton" name="pushButton_Nav">
+   <widget class="QPushButton" name="pushButton_nav">
     <property name="geometry">
      <rect>
       <x>110</x>
index 7e9b4fa..473cc92 100644 (file)
@@ -20,7 +20,7 @@
    <string notr="true"/>
   </property>
   <widget class="QWidget" name="centralWidget">
-   <widget class="QWidget" name="widget_Background" native="true">
+   <widget class="QWidget" name="widget_background" native="true">
     <property name="geometry">
      <rect>
       <x>0</x>
@@ -36,7 +36,7 @@
      <string notr="true">background-image: url(:/images/backgrounds/bg_blue_day.png)
 </string>
     </property>
-    <widget class="QWidget" name="widget_Home_Icon" native="true">
+    <widget class="QWidget" name="widget_homeIcon" native="true">
      <property name="geometry">
       <rect>
        <x>-40</x>
index 4eb8a8b..d9c60ad 100644 (file)
@@ -16,7 +16,7 @@
   <property name="windowTitle">
    <string>Form_Popup</string>
   </property>
-  <widget class="QWidget" name="widget_Popup" native="true">
+  <widget class="QWidget" name="widget_popup" native="true">
    <property name="geometry">
     <rect>
      <x>350</x>
@@ -60,7 +60,7 @@ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #D5D5D5, stop: 1
      <string>OK</string>
     </property>
    </widget>
-   <widget class="QLabel" name="label_Text">
+   <widget class="QLabel" name="label_text">
     <property name="geometry">
      <rect>
       <x>10</x>
@@ -84,7 +84,7 @@ border-image: url(:/images/transparency.png);</string>
      <bool>true</bool>
     </property>
    </widget>
-   <widget class="QComboBox" name="comboBox">
+   <widget class="QComboBox" name="comboBox_choice">
     <property name="geometry">
      <rect>
       <x>90</x>
index 7b899f0..7dc8a75 100644 (file)
@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <widget class="QWidget" name="widget_Background" native="true">
+  <widget class="QWidget" name="widget_background" native="true">
    <property name="geometry">
     <rect>
      <x>0</x>
@@ -26,7 +26,7 @@
     <string notr="true">background-image: url(:/images/backgrounds/bg_blue_day.png);
 </string>
    </property>
-   <widget class="QComboBox" name="comboBoxLanguage">
+   <widget class="QComboBox" name="comboBox_language">
     <property name="geometry">
      <rect>
       <x>660</x>
@@ -63,7 +63,7 @@ QComboBox::down-arrow:on {
 </string>
     </property>
    </widget>
-   <widget class="QWidget" name="widget_Settings_Icon" native="true">
+   <widget class="QWidget" name="widget_settingsIcon" native="true">
     <property name="geometry">
      <rect>
       <x>-40</x>
@@ -77,7 +77,7 @@ QComboBox::down-arrow:on {
 </string>
     </property>
    </widget>
-   <widget class="QLabel" name="labelColorScheme">
+   <widget class="QLabel" name="label_colorScheme">
     <property name="geometry">
      <rect>
       <x>20</x>
@@ -95,7 +95,7 @@ QComboBox::down-arrow:on {
      <string>Color Scheme</string>
     </property>
    </widget>
-   <widget class="QLabel" name="labelLanguage">
+   <widget class="QLabel" name="label_language">
     <property name="geometry">
      <rect>
       <x>20</x>
@@ -113,7 +113,7 @@ QComboBox::down-arrow:on {
      <string>Language</string>
     </property>
    </widget>
-   <widget class="QComboBox" name="comboBoxColorScheme">
+   <widget class="QComboBox" name="comboBox_colorScheme">
     <property name="geometry">
      <rect>
       <x>660</x>
@@ -150,12 +150,6 @@ QComboBox::down-arrow:on {
 </string>
     </property>
    </widget>
-   <zorder>comboBoxLanguage</zorder>
-   <zorder>widget_Settings_Icon</zorder>
-   <zorder>labelLanguage</zorder>
-   <zorder>labelColorScheme</zorder>
-   <zorder>labelLanguage</zorder>
-   <zorder>comboBoxColorScheme</zorder>
   </widget>
  </widget>
  <resources/>
index 2fcd9c0..44fb7b2 100644 (file)
@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string/>
   </property>
-  <widget class="QWidget" name="widget" native="true">
+  <widget class="QWidget" name="widget_background" native="true">
    <property name="geometry">
     <rect>
      <x>0</x>
index 18c373b..69350db 100644 (file)
@@ -65,23 +65,24 @@ void AppLauncherWidget::updateColorScheme()
                           "/colorschemes/" +
                           settings.value("systemsettings/colorscheme", "default").toString() +
                           "/" +
+                          QString::number(settings.value("systemsettings/proximityobjectdetected", false).toBool()) +
+                          "/" +
                           QString::number(settings.value("systemsettings/daynightmode", SystemDayNight::DAYNIGHTMODE_DAY).toInt()) +
                           ".ini",
                           QSettings::IniFormat);
 
-    mp_ui->widget_Background->setStyleSheet(settings_cs.value("AppLauncherWidget/widget_Background").toString());
-    mp_ui->widget_Home_Icon->setStyleSheet(settings_cs.value("AppLauncherWidget/widget_Home_Icon").toString());
+    mp_ui->widget_background->setStyleSheet(settings_cs.value("AppLauncherWidget/widget_Background").toString());
+    mp_ui->widget_homeIcon->setStyleSheet(settings_cs.value("AppLauncherWidget/widget_Home_Icon").toString());
+
+    setStyleSheet(settings_cs.value("AppLauncherWidget/common_css").toString());
 }
 
 void AppLauncherWidget::populateAppList()
 {
-    setStyleSheet("QTableWidget {background-color: transparent;}"
-                  "QTableCornerButton::section {background-color: transparent;}");
-
     if (0 == mp_appTable)
     {
         mp_appTable = new QTableWidget(this);
-        QObject::connect(mp_appTable, SIGNAL(cellClicked(int, int)), this, SLOT(on_tableView_clicked(int, int)));
+        QObject::connect(mp_appTable, SIGNAL(cellClicked(int,int)), this, SLOT(on_tableView_clicked(int,int)));
     }
     else
     {
index cafbb7b..c061a4c 100644 (file)
@@ -47,32 +47,37 @@ void ControlBarWidget::updateColorScheme()
                           "/colorschemes/" +
                           settings.value("systemsettings/colorscheme", "default").toString() +
                           "/" +
+                          QString::number(settings.value("systemsettings/proximityobjectdetected", false).toBool()) +
+                          "/" +
                           QString::number(settings.value("systemsettings/daynightmode", SystemDayNight::DAYNIGHTMODE_DAY).toInt()) +
                           ".ini",
                           QSettings::IniFormat);
 
     QIcon icon;
-    mp_ui->widget_Background->setStyleSheet(settings_cs.value(QString("ControlBarWidget/widget_Background")).toString());
+    mp_ui->widget_background->setStyleSheet(settings_cs.value(QString("ControlBarWidget/widget_background_css")).toString());
 
-    icon.addFile(settings_cs.value(QString("ControlBarWidget/pushButton_Home")).toString(), QSize(), QIcon::Normal, QIcon::Off);
-    mp_ui->pushButton_Home->setIcon(icon);
-    icon.addFile(settings_cs.value(QString("ControlBarWidget/pushButton_Settings")).toString(), QSize(), QIcon::Normal, QIcon::Off);
-    mp_ui->pushButton_Settings->setIcon(icon);
-    icon.addFile(settings_cs.value(QString("ControlBarWidget/pushButton_Nav")).toString(), QSize(), QIcon::Normal, QIcon::Off);
-    mp_ui->pushButton_Nav->setIcon(icon);
+    icon.addFile(settings_cs.value(QString("ControlBarWidget/pushButton_homeIcon_icon")).toString(), QSize(), QIcon::Normal, QIcon::Off);
+    mp_ui->pushButton_home->setIcon(icon);
+    mp_ui->pushButton_home->setStyleSheet(settings_cs.value(QString("ControlBarWidget/pushButton_homeIcon_css")).toString());
+    icon.addFile(settings_cs.value(QString("ControlBarWidget/pushButton_settingsIcon_icon")).toString(), QSize(), QIcon::Normal, QIcon::Off);
+    mp_ui->pushButton_settings->setIcon(icon);
+    mp_ui->pushButton_settings->setStyleSheet(settings_cs.value(QString("ControlBarWidget/pushButton_settingsIcon_css")).toString());
+    icon.addFile(settings_cs.value(QString("ControlBarWidget/pushButton_navIcon_icon")).toString(), QSize(), QIcon::Normal, QIcon::Off);
+    mp_ui->pushButton_nav->setIcon(icon);
+    mp_ui->pushButton_nav->setStyleSheet(settings_cs.value(QString("ControlBarWidget/pushButton_navIcon_css")).toString());
 }
 
-void ControlBarWidget::on_pushButton_Settings_clicked()
+void ControlBarWidget::on_pushButton_home_clicked()
 {
-    settingsButtonPressed();
+    homeButtonPressed();
 }
 
-void ControlBarWidget::on_pushButton_Home_clicked()
+void ControlBarWidget::on_pushButton_settings_clicked()
 {
-    homeButtonPressed();
+    settingsButtonPressed();
 }
 
-void ControlBarWidget::on_pushButton_Nav_clicked()
+void ControlBarWidget::on_pushButton_nav_clicked()
 {
     mp_dBusInputEventProxy->hardKeyPressed(InputEvent::HARDKEY_NAV);
 }
index 89e505c..a8bd91c 100644 (file)
@@ -38,9 +38,9 @@ signals:
     void homeButtonPressed();
 
 private slots:
-    void on_pushButton_Settings_clicked();
-    void on_pushButton_Home_clicked();
-    void on_pushButton_Nav_clicked();
+    void on_pushButton_home_clicked();
+    void on_pushButton_settings_clicked();
+    void on_pushButton_nav_clicked();
 
 private:
     Ui::ControlBarWidget *mp_ui;
index a4d0f91..647bc79 100644 (file)
@@ -31,9 +31,9 @@ LayoutHandler::~LayoutHandler()
     delete mp_dBusWindowManagerProxy;
 }
 
-void LayoutHandler::setUpLayers()
+void LayoutHandler::setUpLayouts()
 {
-    qDebug("setUpLayers");
+    qDebug("setUpLayouts");
     QList<SimpleRect> surfaceAreas;
     SimpleRect surfaceArea;
 
index 62e4fb5..cc5b59b 100644 (file)
@@ -12,7 +12,7 @@ public:
     explicit LayoutHandler(QObject *parent = 0);
     ~LayoutHandler();
 
-    void setUpLayers();
+    void setUpLayouts();
 
 signals:
 
index 87558aa..31ba8d0 100644 (file)
@@ -28,6 +28,7 @@ MainWindow::MainWindow(QWidget *parent) :
     mp_popupWidget(0),
     mp_layoutHandler(new LayoutHandler()),
     mp_dBusDayNightModeProxy(0),
+    mp_proximityAdaptor(0),
     mp_homeScreenControlInterface(0)
 {
     // this has to be adopted to the system setup
@@ -37,10 +38,11 @@ MainWindow::MainWindow(QWidget *parent) :
                                                       0);
     QObject::connect(mp_dBusDayNightModeProxy, SIGNAL(dayNightMode(int)), this, SLOT(dayNightModeSlot(int)));
 
+    mp_proximityAdaptor = new ProximityAdaptor((QObject*)this);
+
     // dbus setup
     QDBusConnection dbus = QDBusConnection::sessionBus();
-
-    dbus.registerObject("/MainWindow", this);
+    dbus.registerObject("/Proximity", this);
     dbus.registerService("org.agl.homescreen");
 
     // no window decoration
@@ -89,17 +91,12 @@ MainWindow::MainWindow(QWidget *parent) :
 
     // apply color scheme
     updateColorScheme();
-    mp_statusBarWidget->updateColorScheme();
-    mp_controlBarWidget->updateColorScheme();
-    mp_settingsWidget->updateColorScheme();
-    mp_applauncherwidget->updateColorScheme();
-    mp_popupWidget->updateColorScheme();
 
     // this is only useful during development and will be removed later
     setWindowIcon(QIcon(":/icons/home_day.png"));
 
     mp_applauncherwidget->populateAppList();
-    mp_layoutHandler->setUpLayers();
+    mp_layoutHandler->setUpLayouts();
 
     mp_homeScreenControlInterface = new HomeScreenControlInterface(this);
     QObject::connect(mp_homeScreenControlInterface, SIGNAL(newRequestsToBeVisibleApp(int)), mp_layoutHandler, SLOT(makeMeVisible(int)));
@@ -120,6 +117,7 @@ MainWindow::~MainWindow()
     delete mp_settingsWidget;
     delete mp_controlBarWidget;
     delete mp_statusBarWidget;
+    delete mp_proximityAdaptor;
     delete mp_ui;
 }
 
@@ -131,12 +129,17 @@ void MainWindow::dayNightModeSlot(int mode)
     settings.sync();
 
     updateColorScheme();
+}
 
-    mp_statusBarWidget->updateColorScheme();
-    mp_controlBarWidget->updateColorScheme();
-    mp_settingsWidget->updateColorScheme();
-    mp_applauncherwidget->updateColorScheme();
-    mp_popupWidget->updateColorScheme();
+void MainWindow::setObjectDetected(bool detected)
+{
+    qDebug("setObjectDetected %s", detected ? "true" : "false");
+    QSettings settings;
+    settings.setValue("systemsettings/proximityobjectdetected", detected);
+    // make sure that everything is written to the settings file before continuing
+    settings.sync();
+
+    updateColorScheme();
 }
 
 void MainWindow::updateColorScheme()
@@ -146,12 +149,21 @@ void MainWindow::updateColorScheme()
                           "/colorschemes/" +
                           settings.value("systemsettings/colorscheme", "default").toString() +
                           "/" +
+                          QString::number(settings.value("systemsettings/proximityobjectdetected", false).toBool()) +
+                          "/" +
                           QString::number(settings.value("systemsettings/daynightmode", SystemDayNight::DAYNIGHTMODE_DAY).toInt()) +
                           ".ini",
                           QSettings::IniFormat);
 
-    mp_ui->widget_Background->setStyleSheet(settings_cs.value("MainWindow/widget_Background").toString());
-    mp_ui->widget_Home_Icon->setStyleSheet(settings_cs.value("MainWindow/widget_Home_Icon").toString());
+    mp_ui->widget_background->setStyleSheet(settings_cs.value("MainWindow/widget_background_css").toString());
+    mp_ui->widget_homeIcon->setStyleSheet(settings_cs.value("MainWindow/widget_homeIcon_css").toString());
+
+    // update children
+    mp_statusBarWidget->updateColorScheme();
+    mp_controlBarWidget->updateColorScheme();
+    mp_settingsWidget->updateColorScheme();
+    mp_applauncherwidget->updateColorScheme();
+    mp_popupWidget->updateColorScheme();
 }
 
 void MainWindow::changeEvent(QEvent* event)
index d94546a..4b41761 100644 (file)
@@ -19,6 +19,7 @@
 
 #include <QMainWindow>
 #include "daynightmode_proxy.h"
+#include "proximity_adapter.h"
 
 #include "homescreencontrolinterface.h"
 
@@ -47,6 +48,9 @@ public:
 public Q_SLOTS:
     void dayNightModeSlot(int mode);
 
+// from proximity_adapter.h
+public Q_SLOTS:
+    void setObjectDetected(bool detected);
 
 public slots:
     void updateColorScheme();
@@ -71,6 +75,8 @@ private:
 
     org::agl::daynightmode *mp_dBusDayNightModeProxy;
 
+    ProximityAdaptor *mp_proximityAdaptor;
+
     HomeScreenControlInterface *mp_homeScreenControlInterface;
 };
 
index 919bea0..e7226dd 100644 (file)
@@ -51,38 +51,40 @@ void PopupWidget::updateColorScheme()
                           "/colorschemes/" +
                           settings.value("systemsettings/colorscheme", "default").toString() +
                           "/" +
+                          QString::number(settings.value("systemsettings/proximityobjectdetected", false).toBool()) +
+                          "/" +
                           QString::number(settings.value("systemsettings/daynightmode", SystemDayNight::DAYNIGHTMODE_DAY).toInt()) +
                           ".ini",
                           QSettings::IniFormat);
 
-    mp_ui->widget_Popup->setStyleSheet(settings_cs.value(QString("PopupWidget/widget_Popup")).toString());
-    mp_ui->label_Text->setStyleSheet(settings_cs.value(QString("PopupWidget/label_Text")).toString());
+    mp_ui->widget_popup->setStyleSheet(settings_cs.value(QString("PopupWidget/widget_popup_css")).toString());
+    mp_ui->label_text->setStyleSheet(settings_cs.value(QString("PopupWidget/label_text_css")).toString());
 }
 
 void PopupWidget::showPopup(int /*type*/, const QString &text)
 {
     m_sendComboBoxChoice = false;
-    mp_ui->comboBox->hide();
+    mp_ui->comboBox_choice->hide();
     this->show();
     this->raise();
-    mp_ui->label_Text->setText(text);
+    mp_ui->label_text->setText(text);
 }
 
 void PopupWidget::showPopupComboBox(const QString &text, const QStringList &choices)
 {
     m_sendComboBoxChoice = true;
-    mp_ui->comboBox->addItems(choices);
-    mp_ui->comboBox->show();
+    mp_ui->comboBox_choice->addItems(choices);
+    mp_ui->comboBox_choice->show();
     this->show();
     this->raise();
-    mp_ui->label_Text->setText(text);
+    mp_ui->label_text->setText(text);
 }
 
 void PopupWidget::on_pushButton_OK_clicked()
 {
     if (m_sendComboBoxChoice)
     {
-        comboBoxResult(mp_ui->comboBox->currentText());
+        comboBoxResult(mp_ui->comboBox_choice->currentText());
         m_sendComboBoxChoice = false;
     }
     this->close();
index 9df4a1c..85e97cb 100644 (file)
@@ -34,17 +34,17 @@ SettingsWidget::SettingsWidget(QWidget *parent) :
 
     mp_ui->setupUi(this);
 
-    mp_ui->comboBoxLanguage->addItem(QString("English"), QVariant("homescreen_en_US.qm")); // TODO: make this configurable
-    mp_ui->comboBoxLanguage->addItem(QString("Deutsch"), QVariant("homescreen_de_DE.qm"));
-    mp_ui->comboBoxLanguage->addItem(QString("日本語"), QVariant("homescreen_ja_JP.qm"));
+    mp_ui->comboBox_language->addItem(QString("English"), QVariant("homescreen_en_US.qm")); // TODO: make this configurable
+    mp_ui->comboBox_language->addItem(QString("Deutsch"), QVariant("homescreen_de_DE.qm"));
+    mp_ui->comboBox_language->addItem(QString("日本語"), QVariant("homescreen_ja_JP.qm"));
 
-    mp_ui->comboBoxColorScheme->addItem(QString("Default"), QVariant("default")); // TODO: make this configurable
-    mp_ui->comboBoxColorScheme->addItem(QString("Demo 1"), QVariant("demo1"));
-    mp_ui->comboBoxColorScheme->addItem(QString("Demo 2"), QVariant("demo2"));
+    mp_ui->comboBox_colorScheme->addItem(QString("Default"), QVariant("default")); // TODO: make this configurable
+    mp_ui->comboBox_colorScheme->addItem(QString("Demo 1"), QVariant("demo1"));
+    mp_ui->comboBox_colorScheme->addItem(QString("Demo 2"), QVariant("demo2"));
 
     QSettings settings;
-    mp_ui->comboBoxLanguage->setCurrentIndex(settings.value("systemsettings/language", 0).toInt());
-    mp_ui->comboBoxColorScheme->setCurrentIndex(settings.value("systemsettings/colorschemeindex", 0).toInt());
+    mp_ui->comboBox_language->setCurrentIndex(settings.value("systemsettings/language", 0).toInt());
+    mp_ui->comboBox_colorScheme->setCurrentIndex(settings.value("systemsettings/colorschemeindex", 0).toInt());
 }
 
 SettingsWidget::~SettingsWidget()
@@ -60,14 +60,16 @@ void SettingsWidget::updateColorScheme()
                           "/colorschemes/" +
                           settings.value("systemsettings/colorscheme", "default").toString() +
                           "/" +
+                          QString::number(settings.value("systemsettings/proximityobjectdetected", false).toBool()) +
+                          "/" +
                           QString::number(settings.value("systemsettings/daynightmode", SystemDayNight::DAYNIGHTMODE_DAY).toInt()) +
                           ".ini",
                           QSettings::IniFormat);
 
-    mp_ui->widget_Background->setStyleSheet(settings_cs.value("SettingsWidget/widget_Background").toString());
-    mp_ui->comboBoxLanguage->setStyleSheet(settings_cs.value("SettingsWidget/comboBoxLanguage").toString());
-    mp_ui->comboBoxColorScheme->setStyleSheet(settings_cs.value("SettingsWidget/comboBoxColorScheme").toString());
-    mp_ui->widget_Settings_Icon->setStyleSheet(settings_cs.value("SettingsWidget/widget_Settings_Icon").toString());
+    mp_ui->widget_background->setStyleSheet(settings_cs.value("SettingsWidget/widget_background_css").toString());
+    mp_ui->comboBox_language->setStyleSheet(settings_cs.value("SettingsWidget/comboBox_language_css").toString());
+    mp_ui->comboBox_colorScheme->setStyleSheet(settings_cs.value("SettingsWidget/comboBox_colorScheme_css").toString());
+    mp_ui->widget_settingsIcon->setStyleSheet(settings_cs.value("SettingsWidget/widget_settingsIcon_css").toString());
 }
 
 void SettingsWidget::changeEvent(QEvent* event)
@@ -80,20 +82,20 @@ void SettingsWidget::changeEvent(QEvent* event)
     QWidget::changeEvent(event);
 }
 
-void SettingsWidget::on_comboBoxLanguage_currentIndexChanged(const QString &)
+void SettingsWidget::on_comboBox_language_currentIndexChanged(const QString &)
 {
     if (0 != mp_translator)
-        mp_translator->load(mp_ui->comboBoxLanguage->currentData().toString(), ":/translations");
+        mp_translator->load(mp_ui->comboBox_language->currentData().toString(), ":/translations");
 
     QSettings settings;
-    settings.setValue("systemsettings/language", mp_ui->comboBoxLanguage->currentIndex());
+    settings.setValue("systemsettings/language", mp_ui->comboBox_language->currentIndex());
 }
 
-void SettingsWidget::on_comboBoxColorScheme_currentIndexChanged(const QString &)
+void SettingsWidget::on_comboBox_colorScheme_currentIndexChanged(const QString &)
 {
     QSettings settings;
-    settings.setValue("systemsettings/colorscheme", mp_ui->comboBoxColorScheme->currentData().toString());
-    settings.setValue("systemsettings/colorschemeindex", mp_ui->comboBoxColorScheme->currentIndex());
+    settings.setValue("systemsettings/colorscheme", mp_ui->comboBox_colorScheme->currentData().toString());
+    settings.setValue("systemsettings/colorschemeindex", mp_ui->comboBox_colorScheme->currentIndex());
     // make sure that everything is written to the settings file before continuing
     settings.sync();
 
index e0b3fef..067d095 100644 (file)
@@ -39,8 +39,8 @@ protected:
     void changeEvent(QEvent* event);
 
 private slots:
-    void on_comboBoxLanguage_currentIndexChanged(const QString &);
-    void on_comboBoxColorScheme_currentIndexChanged(const QString &);
+    void on_comboBox_language_currentIndexChanged(const QString &);
+    void on_comboBox_colorScheme_currentIndexChanged(const QString &);
 
 signals:
     void colorSchemeChanged(void);
index 5628172..6097f8d 100644 (file)
@@ -47,26 +47,28 @@ void StatusBarWidget::updateColorScheme()
                           "/colorschemes/" +
                           settings.value("systemsettings/colorscheme", "default").toString() +
                           "/" +
+                          QString::number(settings.value("systemsettings/proximityobjectdetected", false).toBool()) +
+                          "/" +
                           QString::number(settings.value("systemsettings/daynightmode", SystemDayNight::DAYNIGHTMODE_DAY).toInt()) +
                           ".ini",
                           QSettings::IniFormat);
 
-    mp_ui->widget->setStyleSheet(settings_cs.value(QString("StatusBarWidget/widget")).toString());
-    mp_ui->label_1->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_1")).toString());
-    mp_ui->label_2->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_2")).toString());
-    mp_ui->label_3->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_3")).toString());
-    mp_ui->label_4->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_4")).toString());
-    mp_ui->label_5->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_5")).toString());
+    mp_ui->widget_background->setStyleSheet(settings_cs.value(QString("StatusBarWidget/widget_background_css")).toString());
+    mp_ui->label_1->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_1_css")).toString());
+    mp_ui->label_2->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_2_css")).toString());
+    mp_ui->label_3->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_3_css")).toString());
+    mp_ui->label_4->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_4_css")).toString());
+    mp_ui->label_5->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_5_css")).toString());
 
-    mp_ui->label_1_icon->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_1_icon")).toString()
+    mp_ui->label_1_icon->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_1_icon_css")).toString()
                                        + QString(" border-image: url(") + mp_statusbarIconURIs->value(1) + QString(") 0 0 0 0 stretch stretch;"));
-    mp_ui->label_2_icon->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_2_icon")).toString()
+    mp_ui->label_2_icon->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_2_icon_css")).toString()
                                        + QString(" border-image: url(") + mp_statusbarIconURIs->value(2) + QString(") 0 0 0 0 stretch stretch;"));
-    mp_ui->label_3_icon->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_3_icon")).toString()
+    mp_ui->label_3_icon->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_3_icon_css")).toString()
                                        + QString(" border-image: url(") + mp_statusbarIconURIs->value(3) + QString(") 0 0 0 0 stretch stretch;"));
-    mp_ui->label_4_icon->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_4_icon")).toString()
+    mp_ui->label_4_icon->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_4_icon_css")).toString()
                                        + QString(" border-image: url(") + mp_statusbarIconURIs->value(4) + QString(") 0 0 0 0 stretch stretch;"));
-    mp_ui->label_5_icon->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_5_icon")).toString()
+    mp_ui->label_5_icon->setStyleSheet(settings_cs.value(QString("StatusBarWidget/label_5_icon_css")).toString()
                                        + QString(" border-image: url(") + mp_statusbarIconURIs->value(5) + QString(") 0 0 0 0 stretch stretch;"));
 }
 
index 2f4bd17..d040de9 100644 (file)
@@ -9,6 +9,12 @@ https://gerrit.automotivelinux.org/gerrit/#/admin/projects/staging/HomeScreen
 AGL repo for bitbake recipe:
 https://gerrit.automotivelinux.org/gerrit/#/admin/projects/AGL/meta-agl-demo/recipes-demo-hmi/HomeScreen/HomeScreen_?.bb
 
+v0.3.1
+10/05/2016
+
+#new features
+- implemented proximity
+
 v0.3.0
 09/30/2016
 
index 1915a24..6c6e7d0 100644 (file)
       </widget>
      </widget>
     </widget>
+    <widget class="QWidget" name="tab_Proximity">
+     <attribute name="title">
+      <string>Proximity</string>
+     </attribute>
+     <widget class="QLabel" name="label_explanation">
+      <property name="geometry">
+       <rect>
+        <x>20</x>
+        <y>20</y>
+        <width>301</width>
+        <height>231</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wikipedia:&lt;/p&gt;&lt;p&gt;A proximity sensor is a sensor able to detect the presence of nearby objects without any physical contact.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;This info can be used to detect the hand of the user that wants to use the touch screen. So the HMI can change its look to provide for example larger push buttons.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      </property>
+      <property name="wordWrap">
+       <bool>true</bool>
+      </property>
+     </widget>
+     <widget class="QCheckBox" name="checkBox_ObjectDetected">
+      <property name="geometry">
+       <rect>
+        <x>100</x>
+        <y>300</y>
+        <width>151</width>
+        <height>22</height>
+       </rect>
+      </property>
+      <property name="text">
+       <string>object detected</string>
+      </property>
+     </widget>
+    </widget>
     <widget class="QWidget" name="tab_FutureFeatures">
      <attribute name="title">
       <string>Future features</string>
index 00c7ac2..b81b6cb 100644 (file)
@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
     QCoreApplication::setOrganizationDomain("LinuxFoundation");
     QCoreApplication::setOrganizationName("AutomotiveGradeLinux");
     QCoreApplication::setApplicationName("HomeScreenSimulator");
-    QCoreApplication::setApplicationVersion("0.3.0");
+    QCoreApplication::setApplicationVersion("0.3.1");
 
     MainWindow w;
     w.show();
index d670154..743c854 100644 (file)
@@ -22,7 +22,8 @@ MainWindow::MainWindow(QWidget *parent) :
     mp_ui(new Ui::MainWindow),
     mp_dBusDayNightModeAdapter(0),
     mp_dBusStatusBarProxy(0),
-    mp_dBusPopupProxy(0)
+    mp_dBusPopupProxy(0),
+    mp_dBusProximityProxy(0)
 {
     mp_ui->setupUi(this);
 
@@ -43,6 +44,10 @@ MainWindow::MainWindow(QWidget *parent) :
                                               "/Popup",
                                               QDBusConnection::sessionBus(),
                                               0);
+    mp_dBusProximityProxy = new org::agl::proximity("org.agl.homescreen",
+                                              "/Proximity",
+                                              QDBusConnection::sessionBus(),
+                                              0);
     QSettings settings;
     this->move(settings.value("homescreensimulator/pos").toPoint());
     mp_ui->radioButton_DayMode->setChecked(settings.value("homescreensimulator/daymode", true).toBool()); // if nothing is stored, use "true"
@@ -56,6 +61,7 @@ MainWindow::~MainWindow()
     settings.setValue("homescreensimulator/daymode", mp_ui->radioButton_DayMode->isChecked());
     settings.setValue("homescreensimulator/nightmode", mp_ui->radioButton_NightMode->isChecked());
 
+    delete mp_dBusProximityProxy;
     delete mp_dBusPopupProxy;
     delete mp_dBusStatusBarProxy;
 
@@ -159,3 +165,8 @@ void MainWindow::on_pushButton_comboBoxExample_clicked()
     choices.append("Item4");
     mp_dBusPopupProxy->showPopupComboBox("Make your choice!", choices);
 }
+
+void MainWindow::on_checkBox_ObjectDetected_clicked()
+{
+    mp_dBusProximityProxy->setObjectDetected(Qt::Checked == mp_ui->checkBox_ObjectDetected->checkState());
+}
index dd412a3..702a338 100644 (file)
@@ -23,6 +23,7 @@
 
 #include "statusbar_proxy.h"
 #include "popup_proxy.h"
+#include "proximity_proxy.h"
 
 namespace Ui {
 class MainWindow;
@@ -59,11 +60,14 @@ private slots:
 
     void on_pushButton_comboBoxExample_clicked();
 
+    void on_checkBox_ObjectDetected_clicked();
+
 private:
     Ui::MainWindow *mp_ui;
     DaynightmodeAdaptor *mp_dBusDayNightModeAdapter;
     org::agl::statusbar *mp_dBusStatusBarProxy;
     org::agl::popup *mp_dBusPopupProxy;
+    org::agl::proximity *mp_dBusProximityProxy;
 };
 
 #endif // MAINWINDOW_H
index 945957f..e02682f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,11 +1,7 @@
-This project contains:
+AGL Home Screen reference implementation
 
-HomeScreen: AGL Home Screen reference implementation
-HomeScreenSimulator: AGL Home Screen Simulator for development
-InputEventManager: AGL Input event manager
-interfaces: library with the D-Bus interfaces
-SampleAppTimeDate: AGL Sample Application for Home Screen Statusbar
-HomeScreenAppFrameworkBinderTizen: Binder for the TIZEN application framework
+
+Build with QtCreator 3.0.1
 
 AGL repo for source code:
 https://gerrit.automotivelinux.org/gerrit/#/admin/projects/staging/HomeScreen
@@ -13,96 +9,96 @@ https://gerrit.automotivelinux.org/gerrit/#/admin/projects/staging/HomeScreen
 AGL repo for bitbake recipe:
 https://gerrit.automotivelinux.org/gerrit/#/admin/projects/AGL/meta-agl-demo/recipes-demo-hmi/HomeScreen/HomeScreen_?.bb
 
-
-Instructions for running on porter board
-----------------------------------------
-
-Add "HomeScreen" to your image recipe.
-Right now, HomeScreen depends on the TIZEN application manager, because the HomeScreenAppFrameworkBinderTizen makes use of it.
-So also add this to your image recipe:
-"
-    tizen-platform-wrapper \
-    tizen-platform-config \
-    xdgmime \
-    libdlog \
-    dlogutil \
-    libiri \
-    \
-    smack \
-    libprivilege-control \
-    libslp-db-util \
-    \
-    vconf \
-    capi-base-common \
-    ail \
-    \
-    sensor \
-    libsf-common \
-    \
-    iniparser \
-    app-svc \
-    heynoti \
-    notification \
-    app-core-efl \
-    app-core-common \
-    capi-system-info \
-    \
-    pkgmgr-info \
-    librua \
-    bundle \
-    app-checker \
-    \
-    libcom-core \
-    privacy-manager-server \
-    pkgmgr \
-    pkgmgr-info \
-    pkgmgr-info-parser \
-    aul \
-    aul-test \
-    \
-    dlt-daemon \
-    dlt-daemon-systemd \
-    \
-    amhelloworld \
-    pkgmgr-first-setup-service \
-"
-
-
-All "HomeScreen" applications can be found in /opt/AGL/HomeScreen.
-
-Make sure, weston is using the IVI shell extension:
-
-/etc/xdg/weston/weston.ini:
-
-[core]
-shell=ivi-shell.so
-
-[ivi-shell]
-ivi-module=ivi-controller.so
-ivi-shell-user-interface=/usr/lib/weston/weston-ivi-shell-user-interface
-
-[output]
-name=HDMI-A-1
-transform=270
-
-
-
-If you want to use the TIZEN application manager to launch apps, you need to execute HomeScreen app with the user "aglglobalapp":
-
-Therefore you need to change the owner of the weston socket:
-
-chown aglglobalapp:aglglobalapp /tmp/wayland-0
-
-P.S.: the path may also something likle /run/user/0, depending on the XDG_RUNTIME_DIR.
-
-If not already stared, launch D-Bus:
-export `dbus-launch`
-
-Now you can start the HomeScreen apps:
-cd /opt/AGL/HomeScreen
-./WindowManager &
-./InputEventManager &
-./HomeScreenAppFrameworkBinderTizen &
-./HomeScreen &
+v0.3.1
+10/05/2016
+
+#new features
+- implemented proximity
+
+v0.3.0
+09/30/2016
+
+#new features
+- app launcher improved
+- added first popup combobox selection feature
+-- used for selecting layouts
+- implemented 3 layouts
+-- one app
+-- top on bottom
+-- side by side
+- first interaction with WindowManager
+
+v0.2.0
+08/05/2016
+
+#new features
+- app launcher implemented
+- input event manager used for new control bar "nav" button
+
+v0.1.1
+07/06/2016
+
+#changes
+- reworked D-Bus day/night mode handling
+
+#new features
+- color schemes implemented
+-- 3 color schemes as example added
+
+v0.1.0
+06/24/2016
+
+#changes
+- reworked status bar
+- reviewed D-Bus interfaces, now using signals instead of methods for day/night mode
+- created new home screen simulator app
+- license changed to Apache 2.0
+- put D-Bus introspections in one central place
+- disabled "only one instance allowed" for development
+
+v0.0.2
+06/13/2016
+
+#changes
+- created layout 1. Changed home screen app size to 1080x1920
+
+v0.0.1
+06/01/2016
+
+#new features
+- initial version
+- first implementation of home screen
+- fix HMI layout (will be configurable in the future)
+- dBus as IPC (may change in the future)
+- no interaction with application manager so far
+- multi-lanuage support
+- day/night mode support
+- initial status bar implementation (interface will be enhanced in the future)
+- initial control bar implementation
+- MPLv2.0 license
+- input device simulator for developer build (not functional right now)
+- system settings simulator for developer build (day/night mode switch functional right now)
+- using QSettings for local app setting storage (may change in the future)
+- first popup implementation (single popup support for now; multiple popup not defined; interface will change)
+- only one instance of the app allowed
+
+#TODOs
+- define and implement control bar D-Bus-interface
+- many settings have to be read from the system somewhere during app startup. This is not available right now
+- interaction with application manager
+-- done for TIZEN
+- interaction with wayland compositor
+-- first version of WindowManager implemented
+- define and implement input device event handler
+- replace my HMI design with the official AGL design (graphics/icons...)
+- implement example HMI layouts
+-- three layouts implemented
+- fix font issues on target
+- more documentation ;)
+- add animations (?)
+- much more...
+
+Thanks to Umar Irshad for his free iconset available here:
+https://dribbble.com/shots/1569128-Freebie-48-Bubbles-Iconset
 
 
index c669548..fd48615 100644 (file)
@@ -9,6 +9,12 @@ https://gerrit.automotivelinux.org/gerrit/#/admin/projects/staging/HomeScreen
 AGL repo for bitbake recipe:
 https://gerrit.automotivelinux.org/gerrit/#/admin/projects/AGL/meta-agl-demo/recipes-demo-hmi/HomeScreen/HomeScreen_?.bb
 
+v0.3.1
+10/05/2016
+
+#new features
+- implemented proximity
+
 v0.3.0
 09/30/2016
 
diff --git a/interfaces/include/proximity.hpp b/interfaces/include/proximity.hpp
new file mode 100644 (file)
index 0000000..d7708f9
--- /dev/null
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef PROXIMITY_H
+#define PROXIMITY_H
+
+
+#endif // PROXIMITY_H
+
index d776564..d2e1a19 100644 (file)
@@ -34,6 +34,7 @@ XMLSOURCES = \
     homescreen.xml \
     inputevent.xml \
     popup.xml \
+    proximity.xml \
     statusbar.xml \
     windowmanager.xml
 
diff --git a/interfaces/proximity.xml b/interfaces/proximity.xml
new file mode 100644 (file)
index 0000000..017425d
--- /dev/null
@@ -0,0 +1,21 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<!-- Copyright (C) 2016 Mentor Graphics Development (Deutschland) GmbH
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. -->
+<node>
+  <interface name="org.agl.proximity">
+    <method name="setObjectDetected">
+      <arg name="detected" type="b" direction="in"/>
+    </method>
+  </interface>
+</node>