diff options
Diffstat (limited to 'HomeScreen')
36 files changed, 612 insertions, 298 deletions
diff --git a/HomeScreen/README.md b/HomeScreen/README.md index 01deabb..e02682f 100644 --- a/HomeScreen/README.md +++ b/HomeScreen/README.md @@ -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/HomeScreen/resources/applauncherwidget.ui b/HomeScreen/resources/applauncherwidget.ui index 7b93bc9..bff4034 100644 --- a/HomeScreen/resources/applauncherwidget.ui +++ b/HomeScreen/resources/applauncherwidget.ui @@ -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 index 1ff1da8..0000000 --- a/HomeScreen/resources/colorschemes/default/0.ini +++ /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 index 0000000..967ea37 --- /dev/null +++ b/HomeScreen/resources/colorschemes/default/0/0.ini @@ -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 index 0000000..6fd2532 --- /dev/null +++ b/HomeScreen/resources/colorschemes/default/0/1.ini @@ -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 index e62d1e7..0000000 --- a/HomeScreen/resources/colorschemes/default/1.ini +++ /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 index 0000000..8894e1f --- /dev/null +++ b/HomeScreen/resources/colorschemes/default/1/0.ini @@ -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 index 0000000..0117e84 --- /dev/null +++ b/HomeScreen/resources/colorschemes/default/1/1.ini @@ -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 index 6b7fa03..0000000 --- a/HomeScreen/resources/colorschemes/demo1/0.ini +++ /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 index 0000000..967ea37 --- /dev/null +++ b/HomeScreen/resources/colorschemes/demo1/0/0.ini @@ -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 index 0000000..6fd2532 --- /dev/null +++ b/HomeScreen/resources/colorschemes/demo1/0/1.ini @@ -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 index df2788f..0000000 --- a/HomeScreen/resources/colorschemes/demo1/1.ini +++ /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 index 0000000..8894e1f --- /dev/null +++ b/HomeScreen/resources/colorschemes/demo1/1/0.ini @@ -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 index 0000000..0117e84 --- /dev/null +++ b/HomeScreen/resources/colorschemes/demo1/1/1.ini @@ -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 index 4796703..0000000 --- a/HomeScreen/resources/colorschemes/demo2/0.ini +++ /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 index 0000000..967ea37 --- /dev/null +++ b/HomeScreen/resources/colorschemes/demo2/0/0.ini @@ -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 index 0000000..6fd2532 --- /dev/null +++ b/HomeScreen/resources/colorschemes/demo2/0/1.ini @@ -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 index 3415c55..0000000 --- a/HomeScreen/resources/colorschemes/demo2/1.ini +++ /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 index 0000000..8894e1f --- /dev/null +++ b/HomeScreen/resources/colorschemes/demo2/1/0.ini @@ -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 index 0000000..0117e84 --- /dev/null +++ b/HomeScreen/resources/colorschemes/demo2/1/1.ini @@ -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/controlbarwidget.ui b/HomeScreen/resources/controlbarwidget.ui index 8cd0b3e..49f8e40 100644 --- a/HomeScreen/resources/controlbarwidget.ui +++ b/HomeScreen/resources/controlbarwidget.ui @@ -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> diff --git a/HomeScreen/resources/mainwindow.ui b/HomeScreen/resources/mainwindow.ui index 7e9b4fa..473cc92 100644 --- a/HomeScreen/resources/mainwindow.ui +++ b/HomeScreen/resources/mainwindow.ui @@ -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> diff --git a/HomeScreen/resources/popupwidget.ui b/HomeScreen/resources/popupwidget.ui index 4eb8a8b..d9c60ad 100644 --- a/HomeScreen/resources/popupwidget.ui +++ b/HomeScreen/resources/popupwidget.ui @@ -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> diff --git a/HomeScreen/resources/settingswidget.ui b/HomeScreen/resources/settingswidget.ui index 7b899f0..7dc8a75 100644 --- a/HomeScreen/resources/settingswidget.ui +++ b/HomeScreen/resources/settingswidget.ui @@ -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/> diff --git a/HomeScreen/resources/statusbarwidget.ui b/HomeScreen/resources/statusbarwidget.ui index 2fcd9c0..44fb7b2 100644 --- a/HomeScreen/resources/statusbarwidget.ui +++ b/HomeScreen/resources/statusbarwidget.ui @@ -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> diff --git a/HomeScreen/src/applauncherwidget.cpp b/HomeScreen/src/applauncherwidget.cpp index 18c373b..69350db 100644 --- a/HomeScreen/src/applauncherwidget.cpp +++ b/HomeScreen/src/applauncherwidget.cpp @@ -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 { diff --git a/HomeScreen/src/controlbarwidget.cpp b/HomeScreen/src/controlbarwidget.cpp index cafbb7b..c061a4c 100644 --- a/HomeScreen/src/controlbarwidget.cpp +++ b/HomeScreen/src/controlbarwidget.cpp @@ -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); } diff --git a/HomeScreen/src/controlbarwidget.h b/HomeScreen/src/controlbarwidget.h index 89e505c..a8bd91c 100644 --- a/HomeScreen/src/controlbarwidget.h +++ b/HomeScreen/src/controlbarwidget.h @@ -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; diff --git a/HomeScreen/src/layouthandler.cpp b/HomeScreen/src/layouthandler.cpp index a4d0f91..647bc79 100644 --- a/HomeScreen/src/layouthandler.cpp +++ b/HomeScreen/src/layouthandler.cpp @@ -31,9 +31,9 @@ LayoutHandler::~LayoutHandler() delete mp_dBusWindowManagerProxy; } -void LayoutHandler::setUpLayers() +void LayoutHandler::setUpLayouts() { - qDebug("setUpLayers"); + qDebug("setUpLayouts"); QList<SimpleRect> surfaceAreas; SimpleRect surfaceArea; diff --git a/HomeScreen/src/layouthandler.h b/HomeScreen/src/layouthandler.h index 62e4fb5..cc5b59b 100644 --- a/HomeScreen/src/layouthandler.h +++ b/HomeScreen/src/layouthandler.h @@ -12,7 +12,7 @@ public: explicit LayoutHandler(QObject *parent = 0); ~LayoutHandler(); - void setUpLayers(); + void setUpLayouts(); signals: diff --git a/HomeScreen/src/mainwindow.cpp b/HomeScreen/src/mainwindow.cpp index 87558aa..31ba8d0 100644 --- a/HomeScreen/src/mainwindow.cpp +++ b/HomeScreen/src/mainwindow.cpp @@ -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) diff --git a/HomeScreen/src/mainwindow.h b/HomeScreen/src/mainwindow.h index d94546a..4b41761 100644 --- a/HomeScreen/src/mainwindow.h +++ b/HomeScreen/src/mainwindow.h @@ -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; }; diff --git a/HomeScreen/src/popupwidget.cpp b/HomeScreen/src/popupwidget.cpp index 919bea0..e7226dd 100644 --- a/HomeScreen/src/popupwidget.cpp +++ b/HomeScreen/src/popupwidget.cpp @@ -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(); diff --git a/HomeScreen/src/settingswidget.cpp b/HomeScreen/src/settingswidget.cpp index 9df4a1c..85e97cb 100644 --- a/HomeScreen/src/settingswidget.cpp +++ b/HomeScreen/src/settingswidget.cpp @@ -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(); diff --git a/HomeScreen/src/settingswidget.h b/HomeScreen/src/settingswidget.h index e0b3fef..067d095 100644 --- a/HomeScreen/src/settingswidget.h +++ b/HomeScreen/src/settingswidget.h @@ -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); diff --git a/HomeScreen/src/statusbarwidget.cpp b/HomeScreen/src/statusbarwidget.cpp index 5628172..6097f8d 100644 --- a/HomeScreen/src/statusbarwidget.cpp +++ b/HomeScreen/src/statusbarwidget.cpp @@ -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;")); } |