eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-12 02:40:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup UI

Browse Source 
Ensure icons are dedicated to one single thing.
This commit is contained in:
Bruno Herbelin
2022-01-02 19:54:48 +01:00
parent 61e89286bc
commit 7547d1179d
5 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FrameBuffer.cpp
View File

@@ -322,7 +322,7 @@ void FrameBuffer::checkFramebufferStatus()
break; break;
case GL_FRAMEBUFFER_COMPLETE: case GL_FRAMEBUFFER_COMPLETE:
#ifndef NDEBUG #ifndef NDEBUG
Log::Info("Framebuffer created %d x %d.", width(), height()); g_print("Framebuffer created %d x %d\n", width(), height());
#endif #endif
break; break;
} }

4
Log.cpp
View File

@@ -79,7 +79,7 @@ struct AppLog
// window // window
ImGui::SameLine(0, 0); ImGui::SameLine(0, 0);
static bool numbering = true; static bool numbering = true;
ImGuiToolkit::ButtonToggle( ICON_FA_SORT_NUMERIC_DOWN, &numbering ); ImGuiToolkit::ButtonIconToggle(4, 12, 4, 12, &numbering );
ImGui::SameLine(); ImGui::SameLine();
bool clear = ImGui::Button( ICON_FA_BACKSPACE " Clear"); bool clear = ImGui::Button( ICON_FA_BACKSPACE " Clear");
ImGui::SameLine(); ImGui::SameLine();
@@ -176,7 +176,7 @@ void Log::Info(const char* fmt, ...)
void Log::ShowLogWindow(bool* p_open) void Log::ShowLogWindow(bool* p_open)
{ {
ImGui::SetNextWindowSize(ImVec2(700, 600), ImGuiCond_FirstUseEver); ImGui::SetNextWindowSize(ImVec2(700, 600), ImGuiCond_FirstUseEver);
logs.Draw( ICON_FA_LIST_UL " Logs", p_open); logs.Draw( IMGUI_TITLE_LOGS, p_open);
} }
void Log::Notify(const char* fmt, ...) void Log::Notify(const char* fmt, ...)

34
UserInterfaceManager.cpp
View File

@@ -953,7 +953,7 @@ void UserInterface::showMenuFile()
ImGui::MenuItem( ICON_FA_LEVEL_DOWN_ALT " Save on exit", nullptr, &Settings::application.recentSessions.save_on_exit); ImGui::MenuItem( ICON_FA_LEVEL_DOWN_ALT " Save on exit", nullptr, &Settings::application.recentSessions.save_on_exit);
ImGui::Separator(); ImGui::Separator();
if (ImGui::MenuItem( MENU_HELP, SHORTCUT_HELP)) if (ImGui::MenuItem( IMGUI_TITLE_HELP, SHORTCUT_HELP))
Settings::application.widget.help = true; Settings::application.widget.help = true;
if (ImGui::MenuItem( MENU_QUIT, SHORTCUT_QUIT)) if (ImGui::MenuItem( MENU_QUIT, SHORTCUT_QUIT))
Rendering::manager().close(); Rendering::manager().close();
@@ -2351,6 +2351,9 @@ void HelperToolbox::Render()
ImGui::SetColumnWidth(0, width_column0); ImGui::SetColumnWidth(0, width_column0);
ImGui::PushTextWrapPos(width_window ); ImGui::PushTextWrapPos(width_window );
ImGuiToolkit::PushFont(ImGuiToolkit::FONT_BOLD); ImGui::Text(ICON_FA_PHOTO_VIDEO " File"); ImGui::PopFont();
ImGui::NextColumn();
ImGui::NextColumn();
ImGuiToolkit::Icon(ICON_SOURCE_VIDEO); ImGui::SameLine(0, IMGUI_SAME_LINE);ImGui::Text("Video"); ImGui::NextColumn(); ImGuiToolkit::Icon(ICON_SOURCE_VIDEO); ImGui::SameLine(0, IMGUI_SAME_LINE);ImGui::Text("Video"); ImGui::NextColumn();
ImGui::Text ("Video file (*.mpg, *mov, *.avi, etc.)."); ImGui::Text ("Video file (*.mpg, *mov, *.avi, etc.).");
ImGui::NextColumn(); ImGui::NextColumn();
@@ -2360,8 +2363,16 @@ void HelperToolbox::Render()
ImGuiToolkit::Icon(ICON_SOURCE_SESSION); ImGui::SameLine(0, IMGUI_SAME_LINE);ImGui::Text("Session"); ImGui::NextColumn(); ImGuiToolkit::Icon(ICON_SOURCE_SESSION); ImGui::SameLine(0, IMGUI_SAME_LINE);ImGui::Text("Session"); ImGui::NextColumn();
ImGui::Text ("Render a session (*.mix) as a source."); ImGui::Text ("Render a session (*.mix) as a source.");
ImGui::NextColumn(); ImGui::NextColumn();
ImGui::Separator();
ImGuiToolkit::PushFont(ImGuiToolkit::FONT_BOLD); ImGui::Text(ICON_FA_SORT_NUMERIC_DOWN " Sequence"); ImGui::PopFont();
ImGui::NextColumn();
ImGui::NextColumn();
ImGuiToolkit::Icon(ICON_SOURCE_SEQUENCE); ImGui::SameLine(0, IMGUI_SAME_LINE);ImGui::Text("Sequence"); ImGui::NextColumn(); ImGuiToolkit::Icon(ICON_SOURCE_SEQUENCE); ImGui::SameLine(0, IMGUI_SAME_LINE);ImGui::Text("Sequence"); ImGui::NextColumn();
ImGui::Text ("Serie of images (*.jpg, *.png, etc.) numbered sequentially."); ImGui::Text ("Set of images numbered sequentially (*.jpg, *.png, etc.).");
ImGui::NextColumn();
ImGui::Separator();
ImGuiToolkit::PushFont(ImGuiToolkit::FONT_BOLD); ImGui::Text(ICON_FA_PLUG " Connected"); ImGui::PopFont();
ImGui::NextColumn();
ImGui::NextColumn(); ImGui::NextColumn();
ImGuiToolkit::Icon(ICON_SOURCE_DEVICE); ImGui::SameLine(0, IMGUI_SAME_LINE);ImGui::Text("Device"); ImGui::NextColumn(); ImGuiToolkit::Icon(ICON_SOURCE_DEVICE); ImGui::SameLine(0, IMGUI_SAME_LINE);ImGui::Text("Device"); ImGui::NextColumn();
ImGui::Text ("Connected webcam or frame grabber."); ImGui::Text ("Connected webcam or frame grabber.");
@@ -2372,9 +2383,20 @@ void HelperToolbox::Render()
ImGuiToolkit::Icon(ICON_SOURCE_NETWORK); ImGui::SameLine(0, IMGUI_SAME_LINE);ImGui::Text("Network"); ImGui::NextColumn(); ImGuiToolkit::Icon(ICON_SOURCE_NETWORK); ImGui::SameLine(0, IMGUI_SAME_LINE);ImGui::Text("Network"); ImGui::NextColumn();
ImGui::Text ("Connected stream from another vimix in the local network (shared output stream)."); ImGui::Text ("Connected stream from another vimix in the local network (shared output stream).");
ImGui::NextColumn(); ImGui::NextColumn();
ImGui::Separator();
ImGuiToolkit::PushFont(ImGuiToolkit::FONT_BOLD); ImGui::Text(ICON_FA_COG " Generated"); ImGui::PopFont();
ImGui::NextColumn();
ImGui::NextColumn();
ImGuiToolkit::Icon(ICON_SOURCE_PATTERN); ImGui::SameLine(0, IMGUI_SAME_LINE);ImGui::Text("Pattern"); ImGui::NextColumn(); ImGuiToolkit::Icon(ICON_SOURCE_PATTERN); ImGui::SameLine(0, IMGUI_SAME_LINE);ImGui::Text("Pattern"); ImGui::NextColumn();
ImGui::Text ("Algorithmically generated source; colors, grids, test patterns, timers..."); ImGui::Text ("Algorithmically generated source; colors, grids, test patterns, timers...");
ImGui::NextColumn(); ImGui::NextColumn();
ImGuiToolkit::Icon(ICON_SOURCE_GSTREAMER); ImGui::SameLine(0, IMGUI_SAME_LINE);ImGui::Text("GStreamer"); ImGui::NextColumn();
ImGui::Text ("Custom gstreamer pipeline, as described in command line for gst-launch-1.0 (without the target sink).");
ImGui::NextColumn();
ImGui::Separator();
ImGuiToolkit::PushFont(ImGuiToolkit::FONT_BOLD); ImGui::Text(ICON_FA_SYNC " Internal"); ImGui::PopFont();
ImGui::NextColumn();
ImGui::NextColumn();
ImGuiToolkit::Icon(ICON_SOURCE_RENDER); ImGui::SameLine(0, IMGUI_SAME_LINE);ImGui::Text("Rendering"); ImGui::NextColumn(); ImGuiToolkit::Icon(ICON_SOURCE_RENDER); ImGui::SameLine(0, IMGUI_SAME_LINE);ImGui::Text("Rendering"); ImGui::NextColumn();
ImGui::Text ("Loopback the rendering output as a source."); ImGui::Text ("Loopback the rendering output as a source.");
ImGui::NextColumn(); ImGui::NextColumn();
@@ -2388,7 +2410,7 @@ void HelperToolbox::Render()
ImGui::PopTextWrapPos(); ImGui::PopTextWrapPos();
} }
if (ImGui::CollapsingHeader("Keyboard shortcuts")) if (ImGui::CollapsingHeader("Keyboard shortcuts", ImGuiTreeNodeFlags_DefaultOpen))
{ {
ImGui::Columns(2, "keyscolumns", false); // 4-ways, with border ImGui::Columns(2, "keyscolumns", false); // 4-ways, with border
ImGui::SetColumnWidth(0, width_column0); ImGui::SetColumnWidth(0, width_column0);
@@ -2461,8 +2483,10 @@ void HelperToolbox::Render()
ImGui::Text(ICON_FA_ARROW_LEFT ICON_FA_ARROW_UP ICON_FA_ARROW_DOWN ICON_FA_ARROW_RIGHT ); ImGui::NextColumn(); ImGui::Text(ICON_FA_ARROW_LEFT ICON_FA_ARROW_UP ICON_FA_ARROW_DOWN ICON_FA_ARROW_RIGHT ); ImGui::NextColumn();
ImGui::Text("Move the source in the canvas"); ImGui::NextColumn(); ImGui::Text("Move the source in the canvas"); ImGui::NextColumn();
ImGui::Separator(); ImGui::Separator();
ImGui::Text(SHORTCUT_LOGS); ImGui::NextColumn();
ImGui::Text(IMGUI_TITLE_LOGS); ImGui::NextColumn();
ImGui::Text(SHORTCUT_HELP); ImGui::NextColumn(); ImGui::Text(SHORTCUT_HELP); ImGui::NextColumn();
ImGui::Text(MENU_HELP " window"); ImGui::NextColumn(); ImGui::Text(IMGUI_TITLE_HELP " window"); ImGui::NextColumn();
ImGui::Text(SHORTCUT_QUIT); ImGui::NextColumn(); ImGui::Text(SHORTCUT_QUIT); ImGui::NextColumn();
ImGui::Text(MENU_QUIT); ImGui::NextColumn(); ImGui::Text(MENU_QUIT); ImGui::NextColumn();
@@ -4366,7 +4390,7 @@ void Navigator::RenderNewPannel()
setNewMedia(MEDIA_RECENT); setNewMedia(MEDIA_RECENT);
} }
// Mode MEDIA_RECORDING : recent recordings // Mode MEDIA_RECORDING : recent recordings
if (ImGui::Selectable( ICON_FA_LIST_UL IMGUI_LABEL_RECENT_RECORDS) ) { if (ImGui::Selectable( ICON_FA_LIST IMGUI_LABEL_RECENT_RECORDS) ) {
setNewMedia(MEDIA_RECORDING); setNewMedia(MEDIA_RECORDING);
} }
// Mode MEDIA_FOLDER : known folders // Mode MEDIA_FOLDER : known folders

4
UserInterfaceManager.h
View File

@@ -26,8 +26,8 @@
#define SHORTCUT_SAVE_FILE CTRL_MOD "S" #define SHORTCUT_SAVE_FILE CTRL_MOD "S"
#define MENU_SAVEAS_FILE ICON_FA_FILE_DOWNLOAD " Save as" #define MENU_SAVEAS_FILE ICON_FA_FILE_DOWNLOAD " Save as"
#define SHORTCUT_SAVEAS_FILE CTRL_MOD "Shift+S" #define SHORTCUT_SAVEAS_FILE CTRL_MOD "Shift+S"
#define MENU_HELP ICON_FA_LIFE_RING " Help"
#define SHORTCUT_HELP CTRL_MOD "H" #define SHORTCUT_HELP CTRL_MOD "H"
#define SHORTCUT_LOGS CTRL_MOD "L"
#define MENU_QUIT ICON_FA_POWER_OFF " Quit" #define MENU_QUIT ICON_FA_POWER_OFF " Quit"
#define SHORTCUT_QUIT CTRL_MOD "Q" #define SHORTCUT_QUIT CTRL_MOD "Q"
#define MENU_CUT ICON_FA_CUT " Cut" #define MENU_CUT ICON_FA_CUT " Cut"
@@ -38,7 +38,7 @@
#define SHORTCUT_DELETE "Del" #define SHORTCUT_DELETE "Del"
#define MENU_PASTE ICON_FA_PASTE " Paste" #define MENU_PASTE ICON_FA_PASTE " Paste"
#define SHORTCUT_PASTE CTRL_MOD "V" #define SHORTCUT_PASTE CTRL_MOD "V"
#define MENU_SELECTALL ICON_FA_LIST " Select all" #define MENU_SELECTALL ICON_FA_TH_LIST " Select all"
#define SHORTCUT_SELECTALL CTRL_MOD "A" #define SHORTCUT_SELECTALL CTRL_MOD "A"
#define MENU_UNDO ICON_FA_UNDO " Undo" #define MENU_UNDO ICON_FA_UNDO " Undo"
#define SHORTCUT_UNDO CTRL_MOD "Z" #define SHORTCUT_UNDO CTRL_MOD "Z"

2
defines.h
View File

@@ -66,7 +66,7 @@
#define IMGUI_TITLE_MAINWINDOW ICON_FA_CIRCLE_NOTCH " vimix" #define IMGUI_TITLE_MAINWINDOW ICON_FA_CIRCLE_NOTCH " vimix"
#define IMGUI_TITLE_MEDIAPLAYER ICON_FA_PLAY_CIRCLE " Player" #define IMGUI_TITLE_MEDIAPLAYER ICON_FA_PLAY_CIRCLE " Player"
#define IMGUI_TITLE_TIMER ICON_FA_CLOCK " Timer" #define IMGUI_TITLE_TIMER ICON_FA_CLOCK " Timer"
#define IMGUI_TITLE_LOGS ICON_FA_LIST " Logs" #define IMGUI_TITLE_LOGS ICON_FA_LIST_UL " Logs"
#define IMGUI_TITLE_HELP ICON_FA_LIFE_RING " Help" #define IMGUI_TITLE_HELP ICON_FA_LIFE_RING " Help"
#define IMGUI_TITLE_TOOLBOX ICON_FA_HAMSA " Guru Toolbox" #define IMGUI_TITLE_TOOLBOX ICON_FA_HAMSA " Guru Toolbox"
#define IMGUI_TITLE_SHADEREDITOR ICON_FA_CODE " Code Editor" #define IMGUI_TITLE_SHADEREDITOR ICON_FA_CODE " Code Editor"