From 55967ad27ceedcd1c7161e25b9f6787c59b3eb92 Mon Sep 17 00:00:00 2001 From: Bruno Herbelin Date: Sat, 24 Dec 2022 00:51:20 +0100 Subject: [PATCH] Changed icon of output window --- src/ImGuiVisitor.cpp | 2 +- src/UserInterfaceManager.cpp | 14 +++++++------- src/UserInterfaceManager.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ImGuiVisitor.cpp b/src/ImGuiVisitor.cpp index 95518f6..ec024a8 100644 --- a/src/ImGuiVisitor.cpp +++ b/src/ImGuiVisitor.cpp @@ -696,7 +696,7 @@ void ImGuiVisitor::visit (RenderSource& s) if (ImGuiToolkit::IconButton(ICON_FA_PLAY_CIRCLE, "Open in Player")) UserInterface::manager().showSourceEditor(&s); ImGui::SameLine(); - if (ImGuiToolkit::IconButton(ICON_FA_DESKTOP, "Show Output")) + if (ImGuiToolkit::IconButton(ICON_FA_WINDOW_MAXIMIZE, "Show Output")) Settings::application.widget.preview = true; ImGui::SetCursorPos(pos); diff --git a/src/UserInterfaceManager.cpp b/src/UserInterfaceManager.cpp index 1fee076..2fa534a 100644 --- a/src/UserInterfaceManager.cpp +++ b/src/UserInterfaceManager.cpp @@ -1696,13 +1696,13 @@ void HelperToolbox::Render() ImGui::SetColumnWidth(0, width_column0); ImGui::PushTextWrapPos(width_window ); - ImGui::Text(ICON_FA_DESKTOP " Output"); ImGui::NextColumn(); + ImGui::Text(IMGUI_TITLE_PREVIEW); ImGui::NextColumn(); ImGui::Text ("Preview the output displayed in the rendering window. Control video recording and sharing to other vimix in local network."); ImGui::NextColumn(); - ImGui::Text(ICON_FA_PLAY_CIRCLE " Player"); ImGui::NextColumn(); + ImGui::Text(IMGUI_TITLE_MEDIAPLAYER); ImGui::NextColumn(); ImGui::Text ("Play, pause, rewind videos or dynamic sources. Control play duration, speed and synchronize multiple videos."); ImGui::NextColumn(); - ImGui::Text(ICON_FA_CLOCK " Timer"); ImGui::NextColumn(); + ImGui::Text(IMGUI_TITLE_TIMER); ImGui::NextColumn(); ImGui::Text ("Keep track of time with a stopwatch or a metronome (Ableton Link)."); ImGui::NextColumn(); ImGui::Text(ICON_FA_HAND_PAPER " Inputs"); ImGui::NextColumn(); @@ -1885,7 +1885,7 @@ void HelperToolbox::Render() ImGui::Text(ICON_FA_EXPAND_ALT " " TOOLTIP_FULLSCREEN "main window"); ImGui::NextColumn(); ImGui::Separator(); ImGui::Text(SHORTCUT_OUTPUT); ImGui::NextColumn(); - ImGui::Text(ICON_FA_DESKTOP " " TOOLTIP_OUTPUT "window"); ImGui::NextColumn(); + ImGui::Text(ICON_FA_WINDOW_MAXIMIZE " " TOOLTIP_OUTPUT "window"); ImGui::NextColumn(); ImGui::Text(SHORTCUT_PLAYER); ImGui::NextColumn(); ImGui::Text(ICON_FA_PLAY_CIRCLE " " TOOLTIP_PLAYER "window" ); ImGui::NextColumn(); ImGui::Text(SHORTCUT_TIMER); ImGui::NextColumn(); @@ -1897,7 +1897,7 @@ void HelperToolbox::Render() ImGui::Text(SHORTCUT_NOTE); ImGui::NextColumn(); ImGui::Text(ICON_FA_STICKY_NOTE " " TOOLTIP_NOTE); ImGui::NextColumn(); ImGui::Text("ESC"); ImGui::NextColumn(); - ImGui::Text(ICON_FA_WINDOW_MINIMIZE " Hide / " ICON_FA_WINDOW_MAXIMIZE " Show windows"); ImGui::NextColumn(); + ImGui::Text(ICON_FA_TOGGLE_OFF " Hide / " ICON_FA_TOGGLE_ON " Show windows"); ImGui::NextColumn(); ImGui::Separator(); ImGui::Text(SHORTCUT_NEW_FILE); ImGui::NextColumn(); ImGui::Text(MENU_NEW_FILE " session"); ImGui::NextColumn(); @@ -6341,7 +6341,7 @@ void Navigator::Render() tooltip = {TOOLTIP_FULLSCREEN, SHORTCUT_FULLSCREEN}; ImGui::SetCursorPos(pos + ImVec2(width_ * 0.5f, style.WindowPadding.y)); - if ( ImGuiToolkit::IconButton( WorkspaceWindow::clear() ? ICON_FA_WINDOW_MAXIMIZE : ICON_FA_WINDOW_MINIMIZE ) ) + if ( ImGuiToolkit::IconButton( WorkspaceWindow::clear() ? ICON_FA_TOGGLE_OFF : ICON_FA_TOGGLE_ON ) ) WorkspaceWindow::toggleClearRestoreWorkspace(); if (ImGui::IsItemHovered()) tooltip = { WorkspaceWindow::clear() ? TOOLTIP_SHOW : TOOLTIP_HIDE, SHORTCUT_HIDE}; @@ -7811,7 +7811,7 @@ void Navigator::RenderMainPannelVimix() ImGuiToolkit::PushFont(ImGuiToolkit::FONT_LARGE); ImGui::SameLine(0, 0.5f * ImGui::GetTextLineHeight()); - if ( ImGuiToolkit::IconButton( ICON_FA_DESKTOP ) ) + if ( ImGuiToolkit::IconButton( ICON_FA_WINDOW_MAXIMIZE ) ) UserInterface::manager().outputcontrol.setVisible(!Settings::application.widget.preview); if (ImGui::IsItemHovered()) tooltip_ = { TOOLTIP_OUTPUT, SHORTCUT_OUTPUT}; diff --git a/src/UserInterfaceManager.h b/src/UserInterfaceManager.h index 55e5561..de26e9b 100644 --- a/src/UserInterfaceManager.h +++ b/src/UserInterfaceManager.h @@ -28,7 +28,7 @@ #define IMGUI_TITLE_HELP ICON_FA_LIFE_RING " Help" #define IMGUI_TITLE_TOOLBOX ICON_FA_HAMSA " Guru Toolbox" #define IMGUI_TITLE_SHADEREDITOR ICON_FA_CODE " Shader Editor" -#define IMGUI_TITLE_PREVIEW ICON_FA_DESKTOP " Output" +#define IMGUI_TITLE_PREVIEW ICON_FA_WINDOW_MAXIMIZE " Output" #define MENU_NEW_FILE ICON_FA_FILE " New" #define SHORTCUT_NEW_FILE CTRL_MOD "W"