diff options
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | project.conf | 2 | ||||
| -rw-r--r-- | src/QuickMedia.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/Matrix.cpp | 7 |
4 files changed, 11 insertions, 13 deletions
@@ -6,7 +6,7 @@ Config data, including manga progress is stored under `$HOME/.config/quickmedia` Cache is stored under `$HOME/.cache/quickmedia`. ## Usage ``` -usage: QuickMedia <plugin> [--use-system-mpv-config] [--dir <directory>] +usage: quickmedia <plugin> [--use-system-mpv-config] [--dir <directory>] OPTIONS: plugin The plugin to use. Should be either 4chan, manganelo, mangatown, mangadex, youtube, spotify, soundcloud, nyaa.si, matrix, file-manager or pipe --no-video Only play audio when playing a video. Disabled by default @@ -15,8 +15,8 @@ OPTIONS: --upscale-images-always Upscale manga pages using waifu2x-ncnn-vulkan, no matter what the original image resolution is. Disabled by default --dir Set the start directory when using file-manager EXAMPLES: - QuickMedia manganelo - QuickMedia --upscale-images-always manganelo + quickmedia manganelo + quickmedia --upscale-images-always manganelo ``` ## Installation If you are running arch linux then you can install QuickMedia from aur (https://aur.archlinux.org/packages/quickmedia-git/), otherwise you will need to use [sibs](https://git.dec05eba.com/sibs/) to build QuickMedia manually. diff --git a/project.conf b/project.conf index a5d1157..71df929 100644 --- a/project.conf +++ b/project.conf @@ -1,5 +1,5 @@ [package] -name = "QuickMedia" +name = "quickmedia" type = "executable" version = "1.0.0" platforms = ["posix"] diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index 7dfd8dc..c9a206e 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -446,7 +446,7 @@ namespace QuickMedia { } static void usage() { - fprintf(stderr, "usage: QuickMedia <plugin> [--no-video] [--use-system-mpv-config] [--dir <directory>]\n"); + fprintf(stderr, "usage: quickmedia <plugin> [--no-video] [--use-system-mpv-config] [--dir <directory>]\n"); fprintf(stderr, "OPTIONS:\n"); fprintf(stderr, " plugin The plugin to use. Should be either 4chan, manganelo, mangatown, mangadex, pornhub, youtube, spotify, soundcloud, nyaa.si, matrix, file-manager or pipe\n"); fprintf(stderr, " --no-video Only play audio when playing a video. Disabled by default\n"); @@ -455,8 +455,8 @@ namespace QuickMedia { fprintf(stderr, " --upscale-images-always Upscale manga pages using waifu2x-ncnn-vulkan, no matter what the original image resolution is. Disabled by default\n"); fprintf(stderr, " --dir Set the start directory when using file-manager\n"); fprintf(stderr, "EXAMPLES:\n"); - fprintf(stderr, " QuickMedia manganelo\n"); - fprintf(stderr, " QuickMedia --upscale-images-always manganelo\n"); + fprintf(stderr, " quickmedia manganelo\n"); + fprintf(stderr, " quickmedia --upscale-images-always manganelo\n"); } static bool is_manga_plugin(const char *plugin_name) { @@ -1917,7 +1917,7 @@ namespace QuickMedia { window_size.y = event.size.height; sf::FloatRect visible_area(0, 0, window_size.x, window_size.y); window.setView(sf::View(visible_area)); - } else if(event.type == sf::Event::KeyPressed && (event.key.code == sf::Keyboard::Escape || event.key.code == sf::Keyboard::Q)) { + } else if(event.type == sf::Event::KeyPressed && (event.key.code == sf::Keyboard::Escape || event.key.code == sf::Keyboard::Q || event.key.code == sf::Keyboard::Backspace)) { // To be able to close the video player while the video is loading current_page = previous_page; } @@ -5111,7 +5111,6 @@ namespace QuickMedia { add_body_item_unique_title(room_directory_body->items, "matrix.org"); add_body_item_unique_title(room_directory_body->items, "kde.org"); add_body_item_unique_title(room_directory_body->items, "librem.one"); - add_body_item_unique_title(room_directory_body->items, "grats.pw"); add_body_item_unique_title(room_directory_body->items, "maunium.net"); add_body_item_unique_title(room_directory_body->items, "halogen.city"); add_body_item_unique_title(room_directory_body->items, "gnome.org"); diff --git a/src/plugins/Matrix.cpp b/src/plugins/Matrix.cpp index 4ac4da1..ccae6ba 100644 --- a/src/plugins/Matrix.cpp +++ b/src/plugins/Matrix.cpp @@ -3745,12 +3745,11 @@ namespace QuickMedia { if(!avatar_url.empty()) avatar_url = get_thumbnail_url(homeserver, avatar_url); - if(!avatar_url.empty()) { + if(!avatar_url.empty()) room_body_item->thumbnail_url = std::move(avatar_url); - room_body_item->thumbnail_size = sf::Vector2i(32 * get_ui_scale(), 32 * get_ui_scale()); - room_body_item->thumbnail_mask_type = ThumbnailMaskType::CIRCLE; - } } + room_body_item->thumbnail_size = sf::Vector2i(32 * get_ui_scale(), 32 * get_ui_scale()); + room_body_item->thumbnail_mask_type = ThumbnailMaskType::CIRCLE; rooms.push_back(std::move(room_body_item)); } |