Skip to content

Commit fb25273

Browse files
Rendering system rework
Reworked the rendering system and a lot of adjacent ones
1 parent b3a4df9 commit fb25273

File tree

77 files changed

+2586
-2250
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+2586
-2250
lines changed

resources/data/default_shortcuts.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
"ReloadApplication": "Ctrl+R",
2020
"AddBook": "Ctrl+N",
2121
"CreateHighlight": "H",
22-
"RemoveHighlight": "Backspace"
22+
"RemoveHighlight": "Backspace",
23+
"PageDown": "Space"
2324
}

src/adapters/CMakeLists.txt

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ add_library(adapters
99
interfaces/controllers/i_library_controller.hpp
1010
interfaces/controllers/i_user_controller.hpp
1111
interfaces/controllers/i_settings_controller.hpp
12-
interfaces/controllers/i_page_controller.hpp
13-
interfaces/controllers/i_book_controller.hpp
12+
interfaces/controllers/i_tools_controller.hpp
13+
14+
interfaces/controllers/i_opened_book_controller.hpp
1415
interfaces/controllers/i_app_info_controller.hpp
1516
interfaces/controllers/i_dictionary_controller.hpp
1617
interfaces/controllers/i_ai_tools_controller.hpp
@@ -22,6 +23,9 @@ add_library(adapters
2223
interfaces/persistance/i_dictionary_access.hpp
2324
interfaces/persistance/i_ai_tools_access.hpp
2425
interfaces/persistance/i_folder_storage_access.hpp
26+
interfaces/core/i_document_access.hpp
27+
interfaces/core/i_page_renderer.hpp
28+
interfaces/core/i_document_searcher.hpp
2529

2630
controllers/authentication_controller.cpp
2731
controllers/authentication_controller.hpp
@@ -35,18 +39,16 @@ add_library(adapters
3539
controllers/settings_controller.hpp
3640
controllers/app_info_controller.cpp
3741
controllers/app_info_controller.hpp
38-
controllers/book_controller.cpp
39-
controllers/book_controller.hpp
40-
controllers/page_controller.cpp
41-
controllers/page_controller.hpp
42+
controllers/opened_book_controller.cpp
43+
controllers/opened_book_controller.hpp
4244
controllers/dictionary_controller.cpp
4345
controllers/dictionary_controller.hpp
4446
controllers/ai_tools_controller.cpp
4547
controllers/ai_tools_controller.hpp
4648
controllers/folder_controller.hpp
4749
controllers/folder_controller.cpp
48-
controllers/external_book_controller.hpp
49-
controllers/external_book_controller.cpp
50+
controllers/external_opened_book_controller.hpp
51+
controllers/external_opened_book_controller.cpp
5052
controllers/tools_controller.hpp
5153
controllers/tools_controller.cpp
5254

@@ -97,6 +99,12 @@ add_library(adapters
9799
data_models/book_title_model/book_title_model.cpp
98100
data_models/book_title_model/book_title_proxy_model.hpp
99101
data_models/book_title_model/book_title_proxy_model.cpp
102+
data_models/toc_model/toc_item.hpp
103+
data_models/toc_model/toc_item.cpp
104+
data_models/toc_model/toc_model.hpp
105+
data_models/toc_model/toc_model.cpp
106+
data_models/toc_model/filtered_toc_model.hpp
107+
data_models/toc_model/filtered_toc_model.cpp
100108

101109
DTOs/login_dto.hpp
102110
DTOs/register_dto.hpp
@@ -106,7 +114,16 @@ add_library(adapters
106114
DTOs/rectf_dto.hpp
107115
DTOs/word_definition_dto.hpp
108116
DTOs/folder_dto.hpp
109-
interfaces/controllers/i_tools_controller.hpp
117+
118+
core/page_renderer.hpp
119+
core/page_renderer.cpp
120+
core/document_access.hpp
121+
core/document_access.cpp
122+
core/document_position.hpp
123+
core/document_searcher.hpp
124+
core/document_searcher.cpp
125+
core/document_search_options.cpp
126+
core/document_search_options.hpp
110127
)
111128

112129
target_compile_definitions(adapters PRIVATE ADAPTERS_LIBRARY)
@@ -116,8 +133,10 @@ target_include_directories(adapters
116133
${CMAKE_CURRENT_SOURCE_DIR}
117134
${CMAKE_CURRENT_SOURCE_DIR}/interfaces/persistance
118135
${CMAKE_CURRENT_SOURCE_DIR}/interfaces/controllers
136+
${CMAKE_CURRENT_SOURCE_DIR}/interfaces/core
119137
${CMAKE_CURRENT_SOURCE_DIR}/controllers
120138
${CMAKE_CURRENT_SOURCE_DIR}/gateways
139+
${CMAKE_CURRENT_SOURCE_DIR}/core
121140
${CMAKE_CURRENT_SOURCE_DIR}/DTOs
122141
${CMAKE_CURRENT_SOURCE_DIR}/data_models/library_model
123142
${CMAKE_CURRENT_SOURCE_DIR}/data_models/free_books_model
@@ -127,6 +146,7 @@ target_include_directories(adapters
127146
${CMAKE_CURRENT_SOURCE_DIR}/data_models/folders_model
128147
${CMAKE_CURRENT_SOURCE_DIR}/data_models/icon_model
129148
${CMAKE_CURRENT_SOURCE_DIR}/data_models/book_title_model
149+
${CMAKE_CURRENT_SOURCE_DIR}/data_models/toc_model
130150
${CMAKE_CURRENT_SOURCE_DIR}/data_models
131151
PRIVATE
132152
${DOMAIN_INCLUDES}

src/adapters/controllers/book_controller.cpp

Lines changed: 0 additions & 258 deletions
This file was deleted.

0 commit comments

Comments
 (0)