diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/QuickMedia.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/FileManager.cpp | 16 | ||||
| -rw-r--r-- | src/plugins/Matrix.cpp | 2 |
3 files changed, 17 insertions, 9 deletions
diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index 1df8e6e..13450e3 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -1317,7 +1317,7 @@ namespace QuickMedia { auto file_manager_page = std::make_unique<FileManagerPage>(this, fm_mime_type, file_selection_handler); if(!file_manager_page->set_current_directory(file_manager_start_dir)) fprintf(stderr, "Warning: Invalid directory provided with --dir\n"); - auto file_manager_body = create_body(); + auto file_manager_body = create_body(false, true); BodyItems body_items; file_manager_page->get_files_in_directory(body_items); file_manager_body->set_items(std::move(body_items)); @@ -4833,7 +4833,7 @@ namespace QuickMedia { std::filesystem::path &fm_dir = file_manager_start_dir; auto file_manager_page = std::make_unique<FileManagerPage>(this, (FileManagerMimeType)(FILE_MANAGER_MIME_TYPE_IMAGE|FILE_MANAGER_MIME_TYPE_VIDEO)); file_manager_page->set_current_directory(fm_dir.string()); - auto file_manager_body = create_body(); + auto file_manager_body = create_body(false, true); BodyItems body_items; file_manager_page->get_files_in_directory(body_items); file_manager_body->set_items(std::move(body_items)); @@ -7401,7 +7401,7 @@ namespace QuickMedia { std::filesystem::path &fm_dir = file_manager_start_dir; auto file_manager_page = std::make_unique<FileManagerPage>(this); file_manager_page->set_current_directory(fm_dir.string()); - auto file_manager_body = create_body(); + auto file_manager_body = create_body(false, true); BodyItems body_items; file_manager_page->get_files_in_directory(body_items); file_manager_body->set_items(std::move(body_items)); @@ -8239,7 +8239,7 @@ namespace QuickMedia { auto file_manager_page = std::make_unique<FileManagerPage>(this); file_manager_page->set_current_directory(file_manager_start_dir); - auto file_manager_body = create_body(); + auto file_manager_body = create_body(false, true); BodyItems body_items; file_manager_page->get_files_in_directory(body_items); file_manager_body->set_items(std::move(body_items)); diff --git a/src/plugins/FileManager.cpp b/src/plugins/FileManager.cpp index 45c61bf..6f16b0a 100644 --- a/src/plugins/FileManager.cpp +++ b/src/plugins/FileManager.cpp @@ -54,7 +54,7 @@ namespace QuickMedia { return result; set_last_accessed_dir(current_dir); - auto body = create_body(); + auto body = create_body(false, true); body->set_items(std::move(result_items)); result_tabs.push_back(Tab{std::move(body), nullptr, nullptr}); return PluginResult::OK; @@ -86,6 +86,9 @@ namespace QuickMedia { if(current_dir != "/") { auto parent_item = BodyItem::create("Go to parent directory"); parent_item->url = ".."; + parent_item->thumbnail_is_local = true; + parent_item->thumbnail_url = get_resource_loader_root_path() + std::string("images/folder.png"); + parent_item->thumbnail_size = mgl::vec2i(64, 64); result_items.push_back(std::move(parent_item)); } @@ -104,6 +107,8 @@ namespace QuickMedia { file_mime_type = FILE_MANAGER_MIME_TYPE_IMAGE; else if(is_video_ext(ext)) file_mime_type = FILE_MANAGER_MIME_TYPE_VIDEO; + else if(is_music_ext(ext)) + file_mime_type = FILE_MANAGER_MIME_TYPE_AUDIO; } if(is_regular_file && !(mime_type & file_mime_type)) @@ -116,12 +121,15 @@ namespace QuickMedia { body_item->thumbnail_url = p.first.path().string(); } else { body_item->thumbnail_is_local = true; - if(is_regular_file) { + if(file_mime_type == FILE_MANAGER_MIME_TYPE_AUDIO) { + body_item->thumbnail_url = get_resource_loader_root_path() + std::string("images/audio.png"); + body_item->thumbnail_size = mgl::vec2i(64, 64); + } else if(is_regular_file) { body_item->thumbnail_url = get_resource_loader_root_path() + std::string("images/file.png"); - body_item->thumbnail_size = mgl::vec2i(18, 24); + body_item->thumbnail_size = mgl::vec2i(64, 64); } else { body_item->thumbnail_url = get_resource_loader_root_path() + std::string("images/folder.png"); - body_item->thumbnail_size = mgl::vec2i(24, 22); + body_item->thumbnail_size = mgl::vec2i(64, 64); } } diff --git a/src/plugins/Matrix.cpp b/src/plugins/Matrix.cpp index c59a819..127a664 100644 --- a/src/plugins/Matrix.cpp +++ b/src/plugins/Matrix.cpp @@ -1295,7 +1295,7 @@ namespace QuickMedia { return std::vector<Tab>{}; }; - auto file_manager_body = create_body(); + auto file_manager_body = create_body(false, true); auto file_manager_page = std::make_unique<FileManagerPage>(program, FILE_MANAGER_MIME_TYPE_IMAGE, std::move(submit_handler)); file_manager_page->set_current_directory(get_home_dir().data); BodyItems body_items; |