From a1688f339b4471069d43d54fa1db7c8b211ae7fc Mon Sep 17 00:00:00 2001 From: dec05eba Date: Fri, 2 Apr 2021 04:42:06 +0200 Subject: QuickMedia -> quickmedia --- src/QuickMedia.cpp | 9 ++++----- src/plugins/Matrix.cpp | 7 +++---- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'src') 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 [--no-video] [--use-system-mpv-config] [--dir ]\n"); + fprintf(stderr, "usage: quickmedia [--no-video] [--use-system-mpv-config] [--dir ]\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)); } -- cgit v1.2.3