Browse Source

chatgui: postChatSetting в хедер, chat_core_get_inst include, chat→chatserver

topo_upd
Evgeny 2 months ago
parent
commit
9d797c91eb
  1. 2
      tools/chatgui/src/audiodevicesettingspage.cpp
  2. 1
      tools/chatgui/src/invitedialog.cpp
  3. 6
      tools/chatgui/src/storagesettingspage.cpp
  4. 2
      tools/chatgui/src/storagesettingspage.h

2
tools/chatgui/src/audiodevicesettingspage.cpp

@ -215,7 +215,7 @@ void AudioDeviceSettingsPage::applyAndSave() {
/* also update [chat] config section + live apply for headless-compat settings */ /* also update [chat] config section + live apply for headless-compat settings */
if (!m_configPath.isEmpty()) { if (!m_configPath.isEmpty()) {
auto postChat = [](const QString& path, const char* name, int val) { auto postChat = [](const QString& path, const char* name, int val) {
config_update_option(path, "chat", name, QString::number(val), CONFIG_UPDATE_REPLACE); config_update_option(path, "chatserver", name, QString::number(val), CONFIG_UPDATE_REPLACE);
QByteArray v = QByteArray::number(val); QByteArray v = QByteArray::number(val);
size_t nlen = strlen(name), vlen = (size_t)v.size(), total = nlen + 1 + vlen + 1; size_t nlen = strlen(name), vlen = (size_t)v.size(), total = nlen + 1 + vlen + 1;
if (total > 256) return; if (total > 256) return;

1
tools/chatgui/src/invitedialog.cpp

@ -6,6 +6,7 @@
#include "../transport/gui_bridge.h" #include "../transport/gui_bridge.h"
#include "../db/db_manager.h" #include "../db/db_manager.h"
extern "C" { extern "C" {
#include "chat/chat_core.h"
#include "chat/chat_sync.h" #include "chat/chat_sync.h"
#include "transport_layer/secure_channel.h" #include "transport_layer/secure_channel.h"
} }

6
tools/chatgui/src/storagesettingspage.cpp

@ -23,10 +23,8 @@ static void saveUiStateInt(const char* key, int val) {
gui_bridge_post_uasync_fn(chat_core_save_ui_state_trampoline, arg); gui_bridge_post_uasync_fn(chat_core_save_ui_state_trampoline, arg);
} }
static void postChatSetting(const QString& configPath, const char* name, int val) { void postChatSetting(const QString& configPath, const char* name, int val) {
/* persist to config file */ config_update_option(configPath, "chatserver", name, QString::number(val), CONFIG_UPDATE_REPLACE);
config_update_option(configPath, "chat", name, QString::number(val), CONFIG_UPDATE_REPLACE);
/* apply on-the-fly via bridge */
QByteArray v = QByteArray::number(val); QByteArray v = QByteArray::number(val);
size_t nlen = strlen(name), vlen = (size_t)v.size(), total = nlen + 1 + vlen + 1; size_t nlen = strlen(name), vlen = (size_t)v.size(), total = nlen + 1 + vlen + 1;
if (total > 256) return; if (total > 256) return;

2
tools/chatgui/src/storagesettingspage.h

@ -6,6 +6,8 @@ class DbManager;
class QCheckBox; class QCheckBox;
class QSpinBox; class QSpinBox;
void postChatSetting(const QString& configPath, const char* name, int val);
class StorageSettingsPage : public QWidget { class StorageSettingsPage : public QWidget {
Q_OBJECT Q_OBJECT
public: public:

Loading…
Cancel
Save