mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-17 11:28:07 +00:00
Increase max image size on GUI.
More customization on about, update checker and video. (SDK) Fix a crash when starting a core on an account that don't have a contact address. Fix typo in Readme
This commit is contained in:
parent
d0935af9b3
commit
09dbbd89cf
10 changed files with 48 additions and 16 deletions
|
|
@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||
- Missing SetThreadDescription entry point on Windows 7/8 (SDK update)
|
||||
- Add more margin on message's IMDN that was behind the icon menu in chats.
|
||||
- Remove JSON dependencies on unused Flexiapi.
|
||||
- Crash at startup about missing contact address on account (SDK fix)
|
||||
|
||||
## 5.0.2 - 2022-12-13
|
||||
|
||||
|
|
|
|||
|
|
@ -178,9 +178,10 @@ If a build for 64bits is needed, replace all `mingw32` by `mingw64`, `i686` by `
|
|||
- `pacman -Sy --needed base-devel mingw-w64-i686-toolchain`
|
||||
- `pacman -S python3-pip` in `MSYS2 MSYS` console
|
||||
- `python3 -m pip install pystache six` in `cmd`
|
||||
- In this order, add `C:\msys64\`, `C:\msys64\usr\bin` and `C:\msys64\mingw32\bin` in your PATH (the last one is needed by cmake to know where gcc is) to the PATH environement variable from windows advanced settings.
|
||||
- In this order, add `C:\msys64\mingw<N>\bin`, `C:\msys64\` and `C:\msys64\usr\bin` in your PATH environement variable from Windows advanced settings. Binaries from the msys folder (not from mingw32/64) doesn't fully support Windows Path and thus, they are to be avoided.
|
||||
*<N> is the version of MinGW32/64*
|
||||
|
||||
When building the SDK, it will install automatically from MSYS2 : `perl`, `yasm`, `gawk`, `bzip2`, `nasm, `sed`, `patch`, `pkg-config`, `gettext`, `glib2` and `intltool` (if needed)
|
||||
When building the SDK, it will install automatically from MSYS2 : `toolchain`, `python`, `doxygen`, `perl`, `yasm`, `gawk`, `bzip2`, `nasm`, `sed`, `patch`, `pkg-config`, `gettext`, `glib2`, `intltool` and `graphviz` (if needed)
|
||||
|
||||
- `git` : use MSYS2 : `pacman -S git` or [download](https://git-scm.com/download/win)
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ set(APP_LIBRARY app-library)
|
|||
set(APP_PLUGIN app-plugin)
|
||||
include(application_info.cmake)
|
||||
string(TIMESTAMP CURRENT_YEAR "%Y")
|
||||
if( "${CURRENT_YEAR}" STREQUAL "${APPLICATION_START_LICENCE}")
|
||||
if(NOT APPLICATION_START_LICENCE OR "${CURRENT_YEAR}" STREQUAL "${APPLICATION_START_LICENCE}")
|
||||
set(COPYRIGHT_RANGE_DATE "${APPLICATION_START_LICENCE}")
|
||||
else()
|
||||
set(COPYRIGHT_RANGE_DATE "${APPLICATION_START_LICENCE}-${CURRENT_YEAR}")
|
||||
|
|
@ -123,10 +123,18 @@ endif()
|
|||
set(CMAKE_INCLUDE_CURRENT_DIR ON)#useful for config.h
|
||||
|
||||
set(QT5_PACKAGES Core Gui Quick Widgets QuickControls2 Svg LinguistTools Concurrent Network Test Qml)
|
||||
|
||||
if(ENABLE_APP_WEBVIEW)
|
||||
list(APPEND QT5_PACKAGES WebView WebEngine WebEngineCore)
|
||||
add_definitions(-DENABLE_WEBVIEW)
|
||||
endif()
|
||||
if(ENABLE_UPDATE_CHECK)
|
||||
add_definitions(-DENABLE_UPDATE_CHECK)
|
||||
endif()
|
||||
if(ENABLE_VIDEO)
|
||||
add_definitions(-DENABLE_VIDEO)
|
||||
endif()
|
||||
|
||||
if (UNIX AND NOT APPLE)
|
||||
list(APPEND QT5_PACKAGES DBus)
|
||||
endif ()
|
||||
|
|
|
|||
|
|
@ -425,7 +425,11 @@ void App::initContentApp () {
|
|||
#else
|
||||
mEngine->rootContext()->setContextProperty("applicationLicence", "");
|
||||
#endif
|
||||
mEngine->rootContext()->setContextProperty("copyrightRangeDate", COPYRIGHT_RANGE_DATE);
|
||||
#ifdef COPYRIGHT_RANGE_DATE
|
||||
mEngine->rootContext()->setContextProperty("copyrightRangeDate", COPYRIGHT_RANGE_DATE);
|
||||
#else
|
||||
mEngine->rootContext()->setContextProperty("copyrightRangeDate", "");
|
||||
#endif
|
||||
mEngine->rootContext()->setContextProperty("Colors", mColorListModel->getQmlData());
|
||||
mEngine->rootContext()->setContextProperty("Images", mImageListModel->getQmlData());
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
#include <memory>
|
||||
|
||||
#include <QQuickFramebufferObject>
|
||||
#include <mediastreamer2/msogl.h>
|
||||
#include <QMutex>
|
||||
#include <QTimer>
|
||||
|
||||
|
|
|
|||
|
|
@ -225,7 +225,12 @@ void SettingsModel::setAssistantLogoutUrl (QString url) {
|
|||
}
|
||||
|
||||
bool SettingsModel::isCguAccepted () const{
|
||||
return !!mConfig->getInt(UiSection, "read_and_agree_terms_and_privacy", 0);
|
||||
#ifdef APPLICATION_VENDOR
|
||||
QString applicationVendor = APPLICATION_VENDOR;
|
||||
#else
|
||||
QString applicationVendor;
|
||||
#endif
|
||||
return !!mConfig->getInt(UiSection, "read_and_agree_terms_and_privacy", ( applicationVendor != "" && Constants::CguUrl != QString("") && Constants::PrivatePolicyUrl != QString("") ? 0 : 1));
|
||||
}
|
||||
|
||||
void SettingsModel::acceptCgu(const bool accept){
|
||||
|
|
@ -1525,7 +1530,13 @@ void SettingsModel::setExitOnClose (bool value) {
|
|||
}
|
||||
|
||||
bool SettingsModel::isCheckForUpdateEnabled() const{
|
||||
return !!mConfig->getInt(UiSection, "check_for_update_enabled", 1);
|
||||
#ifdef ENABLE_UPDATE_CHECK
|
||||
int enabled = 1;
|
||||
#else
|
||||
int enabled = 0;
|
||||
#endif
|
||||
return !!mConfig->getInt(UiSection, "check_for_update_enabled", enabled);
|
||||
|
||||
}
|
||||
|
||||
void SettingsModel::setCheckForUpdateEnabled(bool enable){
|
||||
|
|
@ -1533,8 +1544,14 @@ void SettingsModel::setCheckForUpdateEnabled(bool enable){
|
|||
emit checkForUpdateEnabledChanged();
|
||||
}
|
||||
|
||||
QString SettingsModel::getVersionCheckUrl() const{
|
||||
return Utils::coreStringToAppString(mConfig->getString("misc", "version_check_url_root", Constants::VersionCheckReleaseUrl));
|
||||
QString SettingsModel::getVersionCheckUrl(){
|
||||
auto url = mConfig->getString("misc", "version_check_url_root", "");
|
||||
if( url == "" ){
|
||||
url = Constants::VersionCheckReleaseUrl;
|
||||
if( url != "")
|
||||
mConfig->setString("misc", "version_check_url_root", url);
|
||||
}
|
||||
return Utils::coreStringToAppString(url);
|
||||
}
|
||||
|
||||
void SettingsModel::setVersionCheckUrl(const QString& url){
|
||||
|
|
|
|||
|
|
@ -573,7 +573,7 @@ public:
|
|||
bool isCheckForUpdateEnabled() const;
|
||||
void setCheckForUpdateEnabled(bool enable);
|
||||
|
||||
QString getVersionCheckUrl() const;
|
||||
QString getVersionCheckUrl();
|
||||
void setVersionCheckUrl(const QString& url);
|
||||
|
||||
VersionCheckType getVersionCheckType() const;
|
||||
|
|
|
|||
|
|
@ -82,8 +82,8 @@ public:
|
|||
static constexpr char DefaultAssistantLogoutUrl[] = "https://subscribe.linphone.org/logout";
|
||||
//--------------
|
||||
|
||||
// Max image size in bytes. (100Kb)
|
||||
static constexpr qint64 MaxImageSize = 102400;// In Bytes.
|
||||
// Max image size in bytes. (1Mb)
|
||||
static constexpr qint64 MaxImageSize = 1024000;// In Bytes.
|
||||
static constexpr qint64 FileSizeLimit = 524288000;// In Bytes.
|
||||
static constexpr int ThumbnailImageFileWidth = 100;
|
||||
static constexpr int ThumbnailImageFileHeight = 100;
|
||||
|
|
|
|||
|
|
@ -94,9 +94,11 @@ DialogPlus {
|
|||
color: AboutStyle.copyrightBlock.license.color
|
||||
elide: Text.ElideRight
|
||||
font.pointSize: AboutStyle.copyrightBlock.license.pointSize
|
||||
visible: applicationVendor != ''
|
||||
text: (applicationLicence? applicationLicence+'\n':'') +'\u00A9 '+ copyrightRangeDate +
|
||||
' ' + applicationVendor
|
||||
visible: applicationVendor || applicationLicence || copyrightRangeDate
|
||||
text: (applicationLicence? applicationLicence+'\n':'')
|
||||
+(copyrightRangeDate || applicationVendor ? '\u00A9 ': '')
|
||||
+ (copyrightRangeDate ? copyrightRangeDate : '')
|
||||
+ (applicationVendor ? ' ' + applicationVendor : '')
|
||||
|
||||
width: parent.width
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 27c02e232d7fd5facdcd21c2b15d558812ab4151
|
||||
Subproject commit 180d93a62aa9279e7d4c82ec4df50b45c4901927
|
||||
Loading…
Add table
Reference in a new issue