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

Improve icons

Browse Source
This commit is contained in:
brunoherbelin
2020-09-30 23:21:43 +02:00
parent d4b014188e
commit e8a88fcbb9
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DeviceSource.cpp
View File

@@ -328,7 +328,8 @@ void DeviceSource::setDevice(const std::string &devicename)
Log::Info("Device %s selected its optimal config: %s %s %dx%d@%.1ffps", device_.c_str(), best.stream.c_str(), best.format.c_str(), best.width, best.height, fps); Log::Info("Device %s selected its optimal config: %s %s %dx%d@%.1ffps", device_.c_str(), best.stream.c_str(), best.format.c_str(), best.width, best.height, fps);
pipeline << " ! " << best.stream; pipeline << " ! " << best.stream;
pipeline << ",format=" << best.format; if (!best.format.empty())
pipeline << ",format=" << best.format;
pipeline << ",framerate=" << best.fps_numerator << "/" << best.fps_denominator; pipeline << ",framerate=" << best.fps_numerator << "/" << best.fps_denominator;
pipeline << ",width=" << best.width; pipeline << ",width=" << best.width;
pipeline << ",height=" << best.height; pipeline << ",height=" << best.height;
@@ -433,9 +434,6 @@ DeviceConfigSet Device::getDeviceConfigs(const std::string &src_description)
config.format = f; config.format = f;
break; break;
} }
// else keep f if it contains J (for JPEG) and not already JPG in config
else if ( (f.find("J") != std::string::npos) && (config.format.find("J") == std::string::npos ) )
config.format = f;
// default, take at least one if nothing yet in config // default, take at least one if nothing yet in config
else if ( config.format.empty() ) else if ( config.format.empty() )
config.format = f; config.format = f;

2
ImGuiVisitor.cpp
View File

@@ -317,7 +317,7 @@ void ImGuiVisitor::visit (MediaSource& s)
void ImGuiVisitor::visit (SessionSource& s) void ImGuiVisitor::visit (SessionSource& s)
{ {
ImGuiToolkit::Icon(4,9); ImGuiToolkit::Icon(3,16);
ImGui::SameLine(0, 10); ImGui::SameLine(0, 10);
ImGui::Text("Session File"); ImGui::Text("Session File");

12
UserInterfaceManager.cpp
View File

@@ -1919,10 +1919,10 @@ void Navigator::RenderNewPannel()
ImGui::SetCursorPosY(width_); ImGui::SetCursorPosY(width_);
ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN); ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
static const char* origin_names[4] = { ICON_FA_FILE " File", static const char* origin_names[4] = { ICON_FA_PHOTO_VIDEO " File",
ICON_FA_SITEMAP " Internal", ICON_FA_SYNC " Internal",
ICON_FA_COG " Generated", ICON_FA_COG " Generated",
ICON_FA_CUBES " External" ICON_FA_PLUG " External"
}; };
// TODO IMPLEMENT EXTERNAL SOURCES static const char* origin_names[3] = { ICON_FA_FILE " File", ICON_FA_SITEMAP " Internal", ICON_FA_PLUG " External" }; // TODO IMPLEMENT EXTERNAL SOURCES static const char* origin_names[3] = { ICON_FA_FILE " File", ICON_FA_SITEMAP " Internal", ICON_FA_PLUG " External" };
if (ImGui::Combo("Origin", &Settings::application.source.new_type, origin_names, IM_ARRAYSIZE(origin_names)) ) if (ImGui::Combo("Origin", &Settings::application.source.new_type, origin_names, IM_ARRAYSIZE(origin_names)) )
@@ -1934,7 +1934,7 @@ void Navigator::RenderNewPannel()
ImGui::SetCursorPosY(2.f * width_); ImGui::SetCursorPosY(2.f * width_);
// clic button to load file // clic button to load file
if ( ImGui::Button( ICON_FA_FILE_IMPORT " Open file", ImVec2(ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN, 0)) ) { if ( ImGui::Button( ICON_FA_FILE_EXPORT " Open file", ImVec2(ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN, 0)) ) {
// launch async call to file dialog and get its future. // launch async call to file dialog and get its future.
if (fileImportFileDialogs.empty()) { if (fileImportFileDialogs.empty()) {
fileImportFileDialogs.emplace_back( std::async(std::launch::async, ImportFileDialog, Settings::application.recentImport.path) ); fileImportFileDialogs.emplace_back( std::async(std::launch::async, ImportFileDialog, Settings::application.recentImport.path) );
@@ -2029,7 +2029,7 @@ void Navigator::RenderNewPannel()
// Indication // Indication
ImGui::SameLine(); ImGui::SameLine();
ImGuiToolkit::HelpMarker("Create a source generated algorithmically."); ImGuiToolkit::HelpMarker("Create a source with graphics generated algorithmically.");
// resolution (if pattern selected) // resolution (if pattern selected)
if (pattern_type > 0) { if (pattern_type > 0) {
@@ -2077,7 +2077,7 @@ void Navigator::RenderNewPannel()
// Indication // Indication
ImGui::SameLine(); ImGui::SameLine();
ImGuiToolkit::HelpMarker("Create a source images\nfrom external devices or network."); ImGuiToolkit::HelpMarker("Create a source with images from external devices or network.");
} }

BIN
rsc/images/icons.dds
View File

Binary file not shown.