mirror of
https://github.com/kunkundi/crossdesk.git
synced 2026-03-22 07:37:29 +08:00
[feat] add configurable file transfer save path in settings window, refs #63
This commit is contained in:
@@ -74,6 +74,15 @@ int ConfigCenter::Load() {
|
|||||||
enable_minimize_to_tray_ = ini_.GetBoolValue(
|
enable_minimize_to_tray_ = ini_.GetBoolValue(
|
||||||
section_, "enable_minimize_to_tray", enable_minimize_to_tray_);
|
section_, "enable_minimize_to_tray", enable_minimize_to_tray_);
|
||||||
|
|
||||||
|
const char* file_transfer_save_path_value =
|
||||||
|
ini_.GetValue(section_, "file_transfer_save_path", nullptr);
|
||||||
|
if (file_transfer_save_path_value != nullptr &&
|
||||||
|
strlen(file_transfer_save_path_value) > 0) {
|
||||||
|
file_transfer_save_path_ = file_transfer_save_path_value;
|
||||||
|
} else {
|
||||||
|
file_transfer_save_path_ = "";
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -104,6 +113,9 @@ int ConfigCenter::Save() {
|
|||||||
ini_.SetBoolValue(section_, "enable_minimize_to_tray",
|
ini_.SetBoolValue(section_, "enable_minimize_to_tray",
|
||||||
enable_minimize_to_tray_);
|
enable_minimize_to_tray_);
|
||||||
|
|
||||||
|
ini_.SetValue(section_, "file_transfer_save_path",
|
||||||
|
file_transfer_save_path_.c_str());
|
||||||
|
|
||||||
SI_Error rc = ini_.SaveFile(config_path_.c_str());
|
SI_Error rc = ini_.SaveFile(config_path_.c_str());
|
||||||
if (rc < 0) {
|
if (rc < 0) {
|
||||||
return -1;
|
return -1;
|
||||||
@@ -358,4 +370,19 @@ bool ConfigCenter::IsMinimizeToTray() const { return enable_minimize_to_tray_; }
|
|||||||
bool ConfigCenter::IsEnableAutostart() const { return enable_autostart_; }
|
bool ConfigCenter::IsEnableAutostart() const { return enable_autostart_; }
|
||||||
|
|
||||||
bool ConfigCenter::IsEnableDaemon() const { return enable_daemon_; }
|
bool ConfigCenter::IsEnableDaemon() const { return enable_daemon_; }
|
||||||
|
|
||||||
|
int ConfigCenter::SetFileTransferSavePath(const std::string& path) {
|
||||||
|
file_transfer_save_path_ = path;
|
||||||
|
ini_.SetValue(section_, "file_transfer_save_path",
|
||||||
|
file_transfer_save_path_.c_str());
|
||||||
|
SI_Error rc = ini_.SaveFile(config_path_.c_str());
|
||||||
|
if (rc < 0) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string ConfigCenter::GetFileTransferSavePath() const {
|
||||||
|
return file_transfer_save_path_;
|
||||||
|
}
|
||||||
} // namespace crossdesk
|
} // namespace crossdesk
|
||||||
@@ -39,6 +39,7 @@ class ConfigCenter {
|
|||||||
int SetMinimizeToTray(bool enable_minimize_to_tray);
|
int SetMinimizeToTray(bool enable_minimize_to_tray);
|
||||||
int SetAutostart(bool enable_autostart);
|
int SetAutostart(bool enable_autostart);
|
||||||
int SetDaemon(bool enable_daemon);
|
int SetDaemon(bool enable_daemon);
|
||||||
|
int SetFileTransferSavePath(const std::string& path);
|
||||||
|
|
||||||
// read config
|
// read config
|
||||||
|
|
||||||
@@ -59,6 +60,7 @@ class ConfigCenter {
|
|||||||
bool IsMinimizeToTray() const;
|
bool IsMinimizeToTray() const;
|
||||||
bool IsEnableAutostart() const;
|
bool IsEnableAutostart() const;
|
||||||
bool IsEnableDaemon() const;
|
bool IsEnableDaemon() const;
|
||||||
|
std::string GetFileTransferSavePath() const;
|
||||||
|
|
||||||
int Load();
|
int Load();
|
||||||
int Save();
|
int Save();
|
||||||
@@ -85,6 +87,7 @@ class ConfigCenter {
|
|||||||
bool enable_minimize_to_tray_ = false;
|
bool enable_minimize_to_tray_ = false;
|
||||||
bool enable_autostart_ = false;
|
bool enable_autostart_ = false;
|
||||||
bool enable_daemon_ = false;
|
bool enable_daemon_ = false;
|
||||||
|
std::string file_transfer_save_path_ = "";
|
||||||
};
|
};
|
||||||
} // namespace crossdesk
|
} // namespace crossdesk
|
||||||
#endif
|
#endif
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -198,6 +198,13 @@ static std::vector<std::string> file_transfer = {
|
|||||||
reinterpret_cast<const char*>(u8"文件传输:"), "File Transfer:"};
|
reinterpret_cast<const char*>(u8"文件传输:"), "File Transfer:"};
|
||||||
static std::vector<std::string> connection_status = {
|
static std::vector<std::string> connection_status = {
|
||||||
reinterpret_cast<const char*>(u8"连接状态:"), "Connection Status:"};
|
reinterpret_cast<const char*>(u8"连接状态:"), "Connection Status:"};
|
||||||
|
static std::vector<std::string> file_transfer_save_path = {
|
||||||
|
reinterpret_cast<const char*>(u8"文件接收保存路径:"),
|
||||||
|
"File Transfer Save Path:"};
|
||||||
|
static std::vector<std::string> browse = {
|
||||||
|
reinterpret_cast<const char*>(u8"浏览"), "Browse"};
|
||||||
|
static std::vector<std::string> default_desktop = {
|
||||||
|
reinterpret_cast<const char*>(u8"桌面"), "Desktop"};
|
||||||
|
|
||||||
#if _WIN32
|
#if _WIN32
|
||||||
static std::vector<std::string> minimize_to_tray = {
|
static std::vector<std::string> minimize_to_tray = {
|
||||||
|
|||||||
@@ -492,6 +492,16 @@ int Render::LoadSettingsFromCacheFile() {
|
|||||||
enable_daemon_ = config_center_->IsEnableDaemon();
|
enable_daemon_ = config_center_->IsEnableDaemon();
|
||||||
enable_minimize_to_tray_ = config_center_->IsMinimizeToTray();
|
enable_minimize_to_tray_ = config_center_->IsMinimizeToTray();
|
||||||
|
|
||||||
|
// File transfer save path
|
||||||
|
{
|
||||||
|
std::string saved_path = config_center_->GetFileTransferSavePath();
|
||||||
|
strncpy(file_transfer_save_path_buf_, saved_path.c_str(),
|
||||||
|
sizeof(file_transfer_save_path_buf_) - 1);
|
||||||
|
file_transfer_save_path_buf_[sizeof(file_transfer_save_path_buf_) - 1] =
|
||||||
|
'\0';
|
||||||
|
file_transfer_save_path_last_ = saved_path;
|
||||||
|
}
|
||||||
|
|
||||||
language_button_value_last_ = language_button_value_;
|
language_button_value_last_ = language_button_value_;
|
||||||
video_quality_button_value_last_ = video_quality_button_value_;
|
video_quality_button_value_last_ = video_quality_button_value_;
|
||||||
video_encode_format_button_value_last_ = video_encode_format_button_value_;
|
video_encode_format_button_value_last_ = video_encode_format_button_value_;
|
||||||
|
|||||||
@@ -646,6 +646,8 @@ class Render {
|
|||||||
bool enable_daemon_last_ = false;
|
bool enable_daemon_last_ = false;
|
||||||
bool enable_minimize_to_tray_ = false;
|
bool enable_minimize_to_tray_ = false;
|
||||||
bool enable_minimize_to_tray_last_ = false;
|
bool enable_minimize_to_tray_last_ = false;
|
||||||
|
char file_transfer_save_path_buf_[512] = "";
|
||||||
|
std::string file_transfer_save_path_last_ = "";
|
||||||
char signal_server_ip_self_[256] = "";
|
char signal_server_ip_self_[256] = "";
|
||||||
char signal_server_port_self_[6] = "";
|
char signal_server_port_self_[6] = "";
|
||||||
char coturn_server_port_self_[6] = "";
|
char coturn_server_port_self_[6] = "";
|
||||||
|
|||||||
@@ -321,6 +321,14 @@ void Render::OnReceiveDataBufferCb(const char* data, size_t size,
|
|||||||
std::string remote_user_id = std::string(user_id, user_id_size);
|
std::string remote_user_id = std::string(user_id, user_id_size);
|
||||||
|
|
||||||
static FileReceiver receiver;
|
static FileReceiver receiver;
|
||||||
|
// Update output directory from config
|
||||||
|
std::string configured_path =
|
||||||
|
render->config_center_->GetFileTransferSavePath();
|
||||||
|
if (!configured_path.empty()) {
|
||||||
|
receiver.SetOutputDir(std::filesystem::u8path(configured_path));
|
||||||
|
} else if (receiver.OutputDir().empty()) {
|
||||||
|
receiver = FileReceiver(); // re-init with default desktop path
|
||||||
|
}
|
||||||
receiver.SetOnSendAck([render,
|
receiver.SetOnSendAck([render,
|
||||||
remote_user_id](const FileTransferAck& ack) -> int {
|
remote_user_id](const FileTransferAck& ack) -> int {
|
||||||
bool is_server_sending = remote_user_id.rfind("C-", 0) != 0;
|
bool is_server_sending = remote_user_id.rfind("C-", 0) != 0;
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ int Render::FileTransferWindow(
|
|||||||
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 3.0f);
|
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 3.0f);
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
|
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
|
||||||
ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 0.9f));
|
ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 0.9f));
|
||||||
ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
|
ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0.0f, 0.0f, 0.0f, 0.3f));
|
||||||
ImGui::PushStyleColor(ImGuiCol_TitleBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
|
ImGui::PushStyleColor(ImGuiCol_TitleBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
|
||||||
ImGui::PushStyleColor(ImGuiCol_TitleBgActive, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
|
ImGui::PushStyleColor(ImGuiCol_TitleBgActive, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
#include "localization.h"
|
#include "localization.h"
|
||||||
#include "rd_log.h"
|
#include "rd_log.h"
|
||||||
#include "render.h"
|
#include "render.h"
|
||||||
|
#include "tinyfiledialogs.h"
|
||||||
|
|
||||||
namespace crossdesk {
|
namespace crossdesk {
|
||||||
|
|
||||||
@@ -15,28 +16,28 @@ int Render::SettingWindow() {
|
|||||||
!defined(__arm__) && USE_CUDA) || \
|
!defined(__arm__) && USE_CUDA) || \
|
||||||
defined(__APPLE__))
|
defined(__APPLE__))
|
||||||
ImGui::SetNextWindowPos(
|
ImGui::SetNextWindowPos(
|
||||||
ImVec2(io.DisplaySize.x * 0.343f, io.DisplaySize.y * 0.07f));
|
ImVec2(io.DisplaySize.x * 0.343f, io.DisplaySize.y * 0.05f));
|
||||||
ImGui::SetNextWindowSize(
|
ImGui::SetNextWindowSize(
|
||||||
ImVec2(io.DisplaySize.x * 0.315f, io.DisplaySize.y * 0.85f));
|
ImVec2(io.DisplaySize.x * 0.315f, io.DisplaySize.y * 0.9f));
|
||||||
#else
|
#else
|
||||||
ImGui::SetNextWindowPos(
|
ImGui::SetNextWindowPos(
|
||||||
ImVec2(io.DisplaySize.x * 0.343f, io.DisplaySize.y * 0.1f));
|
ImVec2(io.DisplaySize.x * 0.343f, io.DisplaySize.y * 0.08f));
|
||||||
ImGui::SetNextWindowSize(
|
ImGui::SetNextWindowSize(
|
||||||
ImVec2(io.DisplaySize.x * 0.315f, io.DisplaySize.y * 0.8f));
|
ImVec2(io.DisplaySize.x * 0.315f, io.DisplaySize.y * 0.85f));
|
||||||
#endif
|
#endif
|
||||||
} else {
|
} else {
|
||||||
#if (((defined(_WIN32) || defined(__linux__)) && !defined(__aarch64__) && \
|
#if (((defined(_WIN32) || defined(__linux__)) && !defined(__aarch64__) && \
|
||||||
!defined(__arm__) && USE_CUDA) || \
|
!defined(__arm__) && USE_CUDA) || \
|
||||||
defined(__APPLE__))
|
defined(__APPLE__))
|
||||||
ImGui::SetNextWindowPos(
|
ImGui::SetNextWindowPos(
|
||||||
ImVec2(io.DisplaySize.x * 0.297f, io.DisplaySize.y * 0.07f));
|
ImVec2(io.DisplaySize.x * 0.297f, io.DisplaySize.y * 0.05f));
|
||||||
ImGui::SetNextWindowSize(
|
ImGui::SetNextWindowSize(
|
||||||
ImVec2(io.DisplaySize.x * 0.407f, io.DisplaySize.y * 0.85f));
|
ImVec2(io.DisplaySize.x * 0.407f, io.DisplaySize.y * 0.9f));
|
||||||
#else
|
#else
|
||||||
ImGui::SetNextWindowPos(
|
ImGui::SetNextWindowPos(
|
||||||
ImVec2(io.DisplaySize.x * 0.297f, io.DisplaySize.y * 0.1f));
|
ImVec2(io.DisplaySize.x * 0.297f, io.DisplaySize.y * 0.08f));
|
||||||
ImGui::SetNextWindowSize(
|
ImGui::SetNextWindowSize(
|
||||||
ImVec2(io.DisplaySize.x * 0.407f, io.DisplaySize.y * 0.8f));
|
ImVec2(io.DisplaySize.x * 0.407f, io.DisplaySize.y * 0.85f));
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -351,6 +352,62 @@ int Render::SettingWindow() {
|
|||||||
&enable_minimize_to_tray_);
|
&enable_minimize_to_tray_);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
ImGui::Separator();
|
||||||
|
|
||||||
|
{
|
||||||
|
settings_items_offset += settings_items_padding;
|
||||||
|
ImGui::SetCursorPosY(settings_items_offset);
|
||||||
|
ImGui::AlignTextToFramePadding();
|
||||||
|
ImGui::Text(
|
||||||
|
"%s",
|
||||||
|
localization::file_transfer_save_path[localization_language_index_]
|
||||||
|
.c_str());
|
||||||
|
ImGui::SameLine();
|
||||||
|
if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
|
||||||
|
ImGui::SetCursorPosX(title_bar_button_width_ * 2.8f);
|
||||||
|
} else {
|
||||||
|
ImGui::SetCursorPosX(title_bar_button_width_ * 4.3f);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string display_path =
|
||||||
|
strlen(file_transfer_save_path_buf_) > 0
|
||||||
|
? file_transfer_save_path_buf_
|
||||||
|
: localization::default_desktop[localization_language_index_];
|
||||||
|
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
|
||||||
|
ImGui::PushStyleColor(ImGuiCol_ButtonHovered,
|
||||||
|
ImVec4(0.95f, 0.95f, 0.95f, 1.0f));
|
||||||
|
ImGui::PushStyleColor(ImGuiCol_ButtonActive,
|
||||||
|
ImVec4(0.9f, 0.9f, 0.9f, 1.0f));
|
||||||
|
ImGui::PushFont(main_windows_system_chinese_font_);
|
||||||
|
if (ImGui::Button(display_path.c_str(),
|
||||||
|
ImVec2(title_bar_button_width_ * 2.0f, 0))) {
|
||||||
|
const char* folder =
|
||||||
|
tinyfd_selectFolderDialog(localization::file_transfer_save_path
|
||||||
|
[localization_language_index_]
|
||||||
|
.c_str(),
|
||||||
|
strlen(file_transfer_save_path_buf_) > 0
|
||||||
|
? file_transfer_save_path_buf_
|
||||||
|
: nullptr);
|
||||||
|
if (folder) {
|
||||||
|
strncpy(file_transfer_save_path_buf_, folder,
|
||||||
|
sizeof(file_transfer_save_path_buf_) - 1);
|
||||||
|
file_transfer_save_path_buf_[sizeof(file_transfer_save_path_buf_) -
|
||||||
|
1] = '\0';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (ImGui::IsItemHovered() &&
|
||||||
|
strlen(file_transfer_save_path_buf_) > 0) {
|
||||||
|
ImGui::BeginTooltip();
|
||||||
|
ImGui::SetWindowFontScale(0.5f);
|
||||||
|
ImGui::Text("%s", file_transfer_save_path_buf_);
|
||||||
|
ImGui::SetWindowFontScale(1.0f);
|
||||||
|
ImGui::EndTooltip();
|
||||||
|
}
|
||||||
|
ImGui::PopFont();
|
||||||
|
ImGui::PopStyleColor(3);
|
||||||
|
}
|
||||||
|
|
||||||
if (stream_window_inited_) {
|
if (stream_window_inited_) {
|
||||||
ImGui::EndDisabled();
|
ImGui::EndDisabled();
|
||||||
}
|
}
|
||||||
@@ -469,6 +526,10 @@ int Render::SettingWindow() {
|
|||||||
enable_minimize_to_tray_last_ = enable_minimize_to_tray_;
|
enable_minimize_to_tray_last_ = enable_minimize_to_tray_;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// File transfer save path
|
||||||
|
config_center_->SetFileTransferSavePath(file_transfer_save_path_buf_);
|
||||||
|
file_transfer_save_path_last_ = file_transfer_save_path_buf_;
|
||||||
|
|
||||||
settings_window_pos_reset_ = true;
|
settings_window_pos_reset_ = true;
|
||||||
|
|
||||||
// Recreate peer instance
|
// Recreate peer instance
|
||||||
@@ -516,6 +577,13 @@ int Render::SettingWindow() {
|
|||||||
enable_turn_ = enable_turn_last_;
|
enable_turn_ = enable_turn_last_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Restore file transfer save path
|
||||||
|
strncpy(file_transfer_save_path_buf_,
|
||||||
|
file_transfer_save_path_last_.c_str(),
|
||||||
|
sizeof(file_transfer_save_path_buf_) - 1);
|
||||||
|
file_transfer_save_path_buf_[sizeof(file_transfer_save_path_buf_) - 1] =
|
||||||
|
'\0';
|
||||||
|
|
||||||
settings_window_pos_reset_ = true;
|
settings_window_pos_reset_ = true;
|
||||||
}
|
}
|
||||||
ImGui::SetWindowFontScale(0.5f);
|
ImGui::SetWindowFontScale(0.5f);
|
||||||
|
|||||||
@@ -97,6 +97,14 @@ class FileReceiver {
|
|||||||
|
|
||||||
const std::filesystem::path& OutputDir() const { return output_dir_; }
|
const std::filesystem::path& OutputDir() const { return output_dir_; }
|
||||||
|
|
||||||
|
void SetOutputDir(const std::filesystem::path& dir) {
|
||||||
|
output_dir_ = dir;
|
||||||
|
if (!output_dir_.empty()) {
|
||||||
|
std::error_code ec;
|
||||||
|
std::filesystem::create_directories(output_dir_, ec);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static std::filesystem::path GetDefaultDesktopPath();
|
static std::filesystem::path GetDefaultDesktopPath();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user