diff --git a/assets/languages/de.ts b/assets/languages/de.ts index cacb6a9a9..17b9d5c22 100644 --- a/assets/languages/de.ts +++ b/assets/languages/de.ts @@ -1531,10 +1531,6 @@ Server URL ist nicht konfiguriert. savedScreenshotsLabel Ordner für gespeicherter Screenshots - - savedVideosLabel - Ordner für gespeicherte Videos - languagesTitle Sprachen @@ -1575,6 +1571,10 @@ Server URL ist nicht konfiguriert. dataTitle UI-Daten + + savedCallsLabel + + SettingsVideo diff --git a/assets/languages/en.ts b/assets/languages/en.ts index dd33bcce4..bd34b8f17 100644 --- a/assets/languages/en.ts +++ b/assets/languages/en.ts @@ -1537,8 +1537,8 @@ your friend's SIP address or username. Saved screenshots folder - savedVideosLabel - Saved videos folder + savedCallsLabel + Saved calls folder languagesTitle diff --git a/assets/languages/fr_FR.ts b/assets/languages/fr_FR.ts index 38d9d570d..0bda250b7 100644 --- a/assets/languages/fr_FR.ts +++ b/assets/languages/fr_FR.ts @@ -1535,8 +1535,8 @@ Cliquez ici : <a href="%1">%1</a> Dossier des captures d'écran - savedVideosLabel - Dossier des captures vidéo + savedCallsLabel + Dossier des captures d'appels languagesTitle diff --git a/assets/languages/ja.ts b/assets/languages/ja.ts index 89d3ebd43..e67b86bbe 100644 --- a/assets/languages/ja.ts +++ b/assets/languages/ja.ts @@ -1531,10 +1531,6 @@ savedScreenshotsLabel スクリーンショットの保存先フォルダ - - savedVideosLabel - ビデオの保存先フォルダ - languagesTitle 言語 @@ -1575,6 +1571,10 @@ dataTitle + + savedCallsLabel + + SettingsVideo diff --git a/assets/languages/lt.ts b/assets/languages/lt.ts index 22a4a9652..535407a55 100644 --- a/assets/languages/lt.ts +++ b/assets/languages/lt.ts @@ -1533,10 +1533,6 @@ Tiesiog, įveskite savo draugo SIP adresą ar naudotojo vardą. savedScreenshotsLabel Įrašytų ekrano kopijų aplankas - - savedVideosLabel - Įrašytų vaizdo įrašų aplankas - languagesTitle Kalbos @@ -1577,6 +1573,10 @@ Tiesiog, įveskite savo draugo SIP adresą ar naudotojo vardą. dataTitle Naudotojo sąsajos duomenys + + savedCallsLabel + + SettingsVideo diff --git a/assets/languages/pt_BR.ts b/assets/languages/pt_BR.ts index 1150e25d8..90c2e1e66 100644 --- a/assets/languages/pt_BR.ts +++ b/assets/languages/pt_BR.ts @@ -1536,10 +1536,6 @@ o endereço SIP ou nome de usuário do seu amigo. savedScreenshotsLabel Salvar captura de tela na pasta - - savedVideosLabel - Salvar vídeos na pasta - languagesTitle Idiomas @@ -1580,6 +1576,10 @@ o endereço SIP ou nome de usuário do seu amigo. dataTitle Dados UI + + savedCallsLabel + + SettingsVideo diff --git a/assets/languages/ru.ts b/assets/languages/ru.ts index e95853a56..28c7c9921 100644 --- a/assets/languages/ru.ts +++ b/assets/languages/ru.ts @@ -1534,10 +1534,6 @@ savedScreenshotsLabel Папка для сохранения снимков - - savedVideosLabel - Папка для сохранения видео - languagesTitle Языки @@ -1578,6 +1574,10 @@ dataTitle Данные пользовательского интерфейса + + savedCallsLabel + + SettingsVideo diff --git a/assets/languages/sv.ts b/assets/languages/sv.ts index 001d257c4..50e927a4c 100644 --- a/assets/languages/sv.ts +++ b/assets/languages/sv.ts @@ -1533,10 +1533,6 @@ Klicka här: <a href="%1">%1</a> savedScreenshotsLabel - - savedVideosLabel - Mapp för sparade videoklipp - languagesTitle Språk @@ -1577,6 +1573,10 @@ Klicka här: <a href="%1">%1</a> dataTitle + + savedCallsLabel + + SettingsVideo diff --git a/assets/languages/tr.ts b/assets/languages/tr.ts index 5de66b9e1..b8ff869a9 100644 --- a/assets/languages/tr.ts +++ b/assets/languages/tr.ts @@ -1533,10 +1533,6 @@ arkadaşınızın SIP adresini veya kullanıcı adını girin. savedScreenshotsLabel Kaydedilen ekran görüntüleri klasörü - - savedVideosLabel - Kaydedilen videolar klasörü - languagesTitle Diller @@ -1577,6 +1573,10 @@ arkadaşınızın SIP adresini veya kullanıcı adını girin. dataTitle Kullanıcı Arayüzü Verisi + + savedCallsLabel + + SettingsVideo diff --git a/src/components/call/CallModel.cpp b/src/components/call/CallModel.cpp index 262cee53a..89973a986 100644 --- a/src/components/call/CallModel.cpp +++ b/src/components/call/CallModel.cpp @@ -94,7 +94,7 @@ void CallModel::setRecordFile (shared_ptr &callParams) { callParams->setRecordFile( Utils::appStringToCoreString( QStringLiteral("%1%2.mkv") - .arg(CoreManager::getInstance()->getSettingsModel()->getSavedVideosFolder()) + .arg(CoreManager::getInstance()->getSettingsModel()->getSavedCallsFolder()) .arg(QDateTime::currentDateTime().toString("yyyy-MM-dd_hh-mm-ss")) ) ); diff --git a/src/components/conference/ConferenceModel.cpp b/src/components/conference/ConferenceModel.cpp index ba751ccea..8d3638654 100644 --- a/src/components/conference/ConferenceModel.cpp +++ b/src/components/conference/ConferenceModel.cpp @@ -83,7 +83,7 @@ void ConferenceModel::startRecording () { coreManager->getCore()->startConferenceRecording( Utils::appStringToCoreString( QStringLiteral("%1%2.mkv") - .arg(coreManager->getSettingsModel()->getSavedVideosFolder()) + .arg(coreManager->getSettingsModel()->getSavedCallsFolder()) .arg(QDateTime::currentDateTime().toString("yyyy-MM-dd_hh-mm-ss")) ) ); diff --git a/src/components/settings/SettingsModel.cpp b/src/components/settings/SettingsModel.cpp index 34de65205..cae2d9de4 100644 --- a/src/components/settings/SettingsModel.cpp +++ b/src/components/settings/SettingsModel.cpp @@ -873,18 +873,22 @@ void SettingsModel::setSavedScreenshotsFolder (const QString &folder) { // ----------------------------------------------------------------------------- -QString SettingsModel::getSavedVideosFolder () const { +static inline string getLegacySavedCallsFolder (const shared_ptr &config) { + return config->getString(SettingsModel::UiSection, "saved_videos_folder", Paths::getCapturesDirPath()); +} + +QString SettingsModel::getSavedCallsFolder () const { return QDir::cleanPath( Utils::coreStringToAppString( - mConfig->getString(UiSection, "saved_videos_folder", Paths::getCapturesDirPath()) + mConfig->getString(UiSection, "saved_calls_folder", getLegacySavedCallsFolder(mConfig)) ) ) + QDir::separator(); } -void SettingsModel::setSavedVideosFolder (const QString &folder) { +void SettingsModel::setSavedCallsFolder (const QString &folder) { QString cleanedFolder = QDir::cleanPath(folder) + QDir::separator(); - mConfig->setString(UiSection, "saved_videos_folder", Utils::appStringToCoreString(cleanedFolder)); - emit savedVideosFolderChanged(cleanedFolder); + mConfig->setString(UiSection, "saved_calls_folder", Utils::appStringToCoreString(cleanedFolder)); + emit savedCallsFolderChanged(cleanedFolder); } // ----------------------------------------------------------------------------- diff --git a/src/components/settings/SettingsModel.hpp b/src/components/settings/SettingsModel.hpp index 2e6884c50..0bb483a30 100644 --- a/src/components/settings/SettingsModel.hpp +++ b/src/components/settings/SettingsModel.hpp @@ -144,7 +144,7 @@ class SettingsModel : public QObject { Q_PROPERTY(QString remoteProvisioning READ getRemoteProvisioning WRITE setRemoteProvisioning NOTIFY remoteProvisioningChanged); Q_PROPERTY(QString savedScreenshotsFolder READ getSavedScreenshotsFolder WRITE setSavedScreenshotsFolder NOTIFY savedScreenshotsFolderChanged); - Q_PROPERTY(QString savedVideosFolder READ getSavedVideosFolder WRITE setSavedVideosFolder NOTIFY savedVideosFolderChanged); + Q_PROPERTY(QString savedCallsFolder READ getSavedCallsFolder WRITE setSavedCallsFolder NOTIFY savedCallsFolderChanged); Q_PROPERTY(QString downloadFolder READ getDownloadFolder WRITE setDownloadFolder NOTIFY downloadFolderChanged); Q_PROPERTY(bool exitOnClose READ getExitOnClose WRITE setExitOnClose NOTIFY exitOnCloseChanged); @@ -354,8 +354,8 @@ public: QString getSavedScreenshotsFolder () const; void setSavedScreenshotsFolder (const QString &folder); - QString getSavedVideosFolder () const; - void setSavedVideosFolder (const QString &folder); + QString getSavedCallsFolder () const; + void setSavedCallsFolder (const QString &folder); QString getDownloadFolder () const; void setDownloadFolder (const QString &folder); @@ -486,7 +486,7 @@ signals: // UI. ----------------------------------------------------------------------- void savedScreenshotsFolderChanged (const QString &folder); - void savedVideosFolderChanged (const QString &folder); + void savedCallsFolderChanged (const QString &folder); void downloadFolderChanged (const QString &folder); void remoteProvisioningChanged (const QString &remoteProvisioning); diff --git a/ui/views/App/Settings/SettingsUi.qml b/ui/views/App/Settings/SettingsUi.qml index 8244caf74..34a680d14 100644 --- a/ui/views/App/Settings/SettingsUi.qml +++ b/ui/views/App/Settings/SettingsUi.qml @@ -80,13 +80,13 @@ TabContainer { visible: SettingsModel.callRecorderEnabled FormGroup { - label: qsTr('savedVideosLabel') + label: qsTr('savedCallsLabel') FileChooserButton { - selectedFile: SettingsModel.savedVideosFolder + selectedFile: SettingsModel.savedCallsFolder selectFolder: true - onAccepted: SettingsModel.savedVideosFolder = selectedFile + onAccepted: SettingsModel.savedCallsFolder = selectedFile } } }