Skip to content
Merged

data #47

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ target_include_directories(Habbit PRIVATE src)
target_include_directories(HabbitWinWidget PRIVATE src)

qt_add_resources(APP_RESOURCES assets/resources.qrc)
target_sources(Habbit PRIVATE ${APP_RESOURCES})
qt_add_resources(THEMES themes/themes.qrc)
target_sources(Habbit PRIVATE ${APP_RESOURCES} ${THEMES})

target_link_libraries(Habbit PRIVATE Qt6::Widgets Qt6::Sql)
target_link_libraries(HabbitWinWidget PRIVATE Qt6::Widgets Qt6::Sql)
6 changes: 6 additions & 0 deletions assets/icons/blue/calendar.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions assets/icons/blue/event.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions assets/icons/blue/habit.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions assets/icons/blue/home.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions assets/icons/blue/pomodoro.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions assets/icons/blue/setting.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions assets/icons/blue/timeline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 14 additions & 1 deletion assets/resources.qrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<RCC>
<qresource prefix="/assets">
<file>icons/default/</file>
<file>images/logo.png</file>
<file>images/add.png</file>
<file>images/delete.png</file>
Expand All @@ -11,6 +10,20 @@
<file>images/backward.png</file>
<file>images/active.png</file>
<file>images/inactive.png</file>
<file>icons/default/calendar.svg</file>
<file>icons/default/event.svg</file>
<file>icons/default/habit.svg</file>
<file>icons/default/home.svg</file>
<file>icons/default/pomodoro.svg</file>
<file>icons/default/setting.svg</file>
<file>icons/default/timeline.svg</file>
<file>icons/blue/calendar.svg</file>
<file>icons/blue/event.svg</file>
<file>icons/blue/habit.svg</file>
<file>icons/blue/home.svg</file>
<file>icons/blue/pomodoro.svg</file>
<file>icons/blue/setting.svg</file>
<file>icons/blue/timeline.svg</file>
<file>json_style/</file>
</qresource>
<qresource prefix="/config">
Expand Down
46 changes: 46 additions & 0 deletions assets/themes/blue.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"normal": {
"background": "#f0f9ff",
"border": "1.5px solid #91d5ff",
"border_radius": "8",
"text_color": "#0000FF",
"font_size": "16",
"font_family": "Arial",
"padding_vertical": "0",
"padding_horizontal": "12",
"hover_background": "#cceeff",
"icons": {
"home": ":/assets/icons/blue/home.svg",
"habit": ":/assets/icons/blue/habit.svg",
"event": ":/assets/icons/blue/event.svg",
"pomodoro": ":/assets/icons/blue/pomodoro.svg",
"timeline": ":/assets/icons/blue/timeline.svg",
"calendar": ":/assets/icons/blue/calendar.svg",
"settings": ":/assets/icons/blue/setting.svg"
},
"icon_width": "24",
"icon_height": "24"
},
"selected": {
"background": "#1890ff",
"border": "2px solid #096dd9",
"border_radius": "8",
"text_color": "#ffffff",
"font_size": "18",
"font_family": "Arial",
"padding_vertical": "0",
"padding_horizontal": "12",
"hover_background": "#096dd9",
"icons": {
"home": ":/assets/icons/blue/home.svg",
"habit": ":/assets/icons/blue/habit.svg",
"event": ":/assets/icons/blue/event.svg",
"pomodoro": ":/assets/icons/blue/pomodoro.svg",
"timeline": ":/assets/icons/blue/timeline.svg",
"calendar": ":/assets/icons/blue/calendar.svg",
"settings": ":/assets/icons/blue/setting.svg"
},
"icon_width": "28",
"icon_height": "28"
}
}
30 changes: 15 additions & 15 deletions assets/themes/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
"background": "#e6f4ff",
"border": "1.5px solid #1890ff",
"border_radius": "8",
"text_color": "#1890ff",
"text_color": "#ff005c",
"font_size": "16",
"font_family": "Arial",
"padding_vertical": "0",
"padding_horizontal": "12",
"hover_background": "#bae0ff",
"icons": {
"home": ":assets/icons/default/home.svg",
"habit": ":assets/icons/default/habit.svg",
"event": ":assets/icons/default/event.svg",
"pomodoro": ":assets/icons/default/pomodoro.svg",
"timeline": ":assets/icons/default/timeline.svg",
"calendar": ":assets/icons/default/calendar.svg",
"settings": ":assets/icons/default/setting.svg"
"home": ":/assets/icons/default/home.svg",
"habit": ":/assets/icons/default/habit.svg",
"event": ":/assets/icons/default/event.svg",
"pomodoro": ":/assets/icons/default/pomodoro.svg",
"timeline": ":/assets/icons/default/timeline.svg",
"calendar": ":/assets/icons/default/calendar.svg",
"settings": ":/assets/icons/default/setting.svg"
},
"icon_width": "24",
"icon_height": "24"
Expand All @@ -32,13 +32,13 @@
"padding_horizontal": "12",
"hover_background": "#096dd9",
"icons": {
"home": ":assets/icons/default/home.svg",
"habit": ":assets/icons/default/habit.svg",
"event": ":assets/icons/default/event.svg",
"pomodoro": ":assets/icons/default/pomodoro.svg",
"timeline": ":assets/icons/default/timeline.svg",
"calendar": ":assets/icons/default/calendar.svg",
"settings": ":assets/icons/default/setting.svg"
"home": ":/assets/icons/default/home.svg",
"habit": ":/assets/icons/default/habit.svg",
"event": ":/assets/icons/default/event.svg",
"pomodoro": ":/assets/icons/default/pomodoro.svg",
"timeline": ":/assets/icons/default/timeline.svg",
"calendar": ":/assets/icons/default/calendar.svg",
"settings": ":/assets/icons/default/setting.svg"
},
"icon_width": "28",
"icon_height": "28"
Expand Down
7 changes: 7 additions & 0 deletions assets/themes/themes.qrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<RCC>
<qresource prefix="/themes">
<file>blue.json</file>
<file>default.json</file>
<file>themes.json</file>
</qresource>
</RCC>
Loading