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

Improve Insert panel terminilogy

Browse Source
This commit is contained in:
Bruno Herbelin
2023-08-13 09:33:18 +02:00
parent 09dbc5c84e
commit 64a7fef7c1
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/UserInterfaceManager.cpp
View File

@@ -3230,7 +3230,7 @@ void Navigator::RenderNewPannel()
static DialogToolkit::OpenMediaDialog fileimportdialog("Open Media"); static DialogToolkit::OpenMediaDialog fileimportdialog("Open Media");
static DialogToolkit::OpenFolderDialog folderimportdialog("Select Folder"); static DialogToolkit::OpenFolderDialog folderimportdialog("Select Folder");
ImGui::Text("Load media file:"); ImGui::Text("Load media or session file:");
// clic button to load file // clic button to load file
if ( ImGui::Button( ICON_FA_FOLDER_OPEN " Open", ImVec2(ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN, 0)) ) if ( ImGui::Button( ICON_FA_FOLDER_OPEN " Open", ImVec2(ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN, 0)) )
@@ -3241,7 +3241,7 @@ void Navigator::RenderNewPannel()
ICON_FA_CARET_RIGHT " Video (*.mpg, *mov, *.avi, etc.)\n" ICON_FA_CARET_RIGHT " Video (*.mpg, *mov, *.avi, etc.)\n"
ICON_FA_CARET_RIGHT " Image (*.jpg, *.png, etc.)\n" ICON_FA_CARET_RIGHT " Image (*.jpg, *.png, etc.)\n"
ICON_FA_CARET_RIGHT " Vector graphics (*.svg)\n" ICON_FA_CARET_RIGHT " Vector graphics (*.svg)\n"
ICON_FA_CARET_RIGHT " vimix session (*.mix)\n" ICON_FA_CARET_RIGHT " Vimix session (*.mix)\n"
"\nNB: Equivalent to dropping the file in the workspace"); "\nNB: Equivalent to dropping the file in the workspace");
// get media file if dialog finished // get media file if dialog finished
@@ -3430,7 +3430,7 @@ void Navigator::RenderNewPannel()
static MultiFileRecorder _video_recorder; static MultiFileRecorder _video_recorder;
static int _fps = 25; static int _fps = 25;
ImGui::Text("Load image sequence:"); ImGui::Text("Create image sequence:");
// clic button to load file // clic button to load file
if ( ImGui::Button( ICON_FA_FOLDER_OPEN " Open multiple", ImVec2(ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN, 0)) ) { if ( ImGui::Button( ICON_FA_FOLDER_OPEN " Open multiple", ImVec2(ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN, 0)) ) {
@@ -3441,9 +3441,10 @@ void Navigator::RenderNewPannel()
// Indication // Indication
ImGui::SameLine(); ImGui::SameLine();
ImGuiToolkit::HelpToolTip("Create a source displaying a sequence of images (PNG, JPG, TIF);\n" ImGuiToolkit::HelpToolTip("Create a source displaying a sequence of images;\n"
ICON_FA_CARET_RIGHT " files numbered consecutively\n" ICON_FA_CARET_RIGHT " files numbered consecutively\n"
ICON_FA_CARET_RIGHT " create a video from many images\n"); ICON_FA_CARET_RIGHT " create a video from many images\n"
"Supports PNG, JPG or TIF.");
// return from thread for folder openning // return from thread for folder openning
if (_selectImagesDialog.closed()) { if (_selectImagesDialog.closed()) {
@@ -3591,7 +3592,8 @@ void Navigator::RenderNewPannel()
// Indication // Indication
ImGui::SameLine(); ImGui::SameLine();
ImGuiToolkit::HelpToolTip("Create a source with graphics generated algorithmically."); ImGuiToolkit::HelpToolTip("Create a source with graphics generated algorithmically.\n"
"Custom gstreamer pipelines are also possible.");
if (custom_pipeline) { if (custom_pipeline) {
static std::vector< std::pair< std::string, std::string> > _examples = { {"Videotest", "videotestsrc horizontal-speed=1 ! video/x-raw, width=640, height=480 " }, static std::vector< std::pair< std::string, std::string> > _examples = { {"Videotest", "videotestsrc horizontal-speed=1 ! video/x-raw, width=640, height=480 " },
@@ -3656,7 +3658,7 @@ void Navigator::RenderNewPannel()
// External source creator // External source creator
else if (Settings::application.source.new_type == SOURCE_CONNECTED){ else if (Settings::application.source.new_type == SOURCE_CONNECTED){
ImGui::Text("Connect device or stream:"); ImGui::Text("Input device or stream:");
ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN); ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
if (ImGui::BeginCombo("##External", "Select ")) if (ImGui::BeginCombo("##External", "Select "))

2
src/defines.h
View File

@@ -204,7 +204,7 @@
#define SHORTCUT_FULLSCREEN CTRL_MOD "F" #define SHORTCUT_FULLSCREEN CTRL_MOD "F"
#define TOOLTIP_MAIN "Main menu " #define TOOLTIP_MAIN "Main menu "
#define SHORTCUT_MAIN "HOME" #define SHORTCUT_MAIN "HOME"
#define TOOLTIP_NEW_SOURCE "New source " #define TOOLTIP_NEW_SOURCE "Insert "
#define SHORTCUT_NEW_SOURCE "INS" #define SHORTCUT_NEW_SOURCE "INS"
#define TOOLTIP_HIDE "Hide windows " #define TOOLTIP_HIDE "Hide windows "
#define TOOLTIP_SHOW "Show windows " #define TOOLTIP_SHOW "Show windows "