mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-21 21:58:06 +00:00
Display hidden scrollbars in settings.
Add more feedback on quit reason. Fix link color in about. Fix window title based on the application name.
This commit is contained in:
parent
05c461ff7f
commit
e198f5f752
11 changed files with 31 additions and 13 deletions
|
|
@ -11,6 +11,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||
- File viewer in chats (Image/Animated Image/Video/Texts) with the option to export the file.
|
||||
- Accept/decline CLI commands.
|
||||
|
||||
### Fixed
|
||||
- Display hidden scrollbars.
|
||||
|
||||
## 5.0.8 - 2023-01-20
|
||||
|
||||
### Fixed
|
||||
|
|
|
|||
|
|
@ -224,8 +224,7 @@ void SingleApplicationPrivate::connectToPrimary (int msecs, char connectionType)
|
|||
|
||||
#ifdef Q_OS_UNIX
|
||||
void SingleApplicationPrivate::terminate (int signum) {
|
||||
Q_UNUSED(signum);
|
||||
SingleApplication::instance()->quit();
|
||||
SingleApplication::instance()->exit(signum);
|
||||
}
|
||||
#endif // ifdef Q_OS_UNIX
|
||||
|
||||
|
|
|
|||
|
|
@ -56,8 +56,7 @@ void SingleApplicationPrivate::startSecondary () {
|
|||
}
|
||||
|
||||
void SingleApplicationPrivate::terminate (int signum) {
|
||||
Q_UNUSED(signum)
|
||||
SingleApplication::instance()->quit();
|
||||
SingleApplication::instance()->exit(signum);
|
||||
}
|
||||
|
||||
SingleApplication::SingleApplication (int &argc, char *argv[], bool allowSecondary, Options options, int)
|
||||
|
|
|
|||
|
|
@ -91,8 +91,10 @@ SettingsModel::SettingsModel (QObject *parent) : QObject(parent) {
|
|||
emit vfsEncryptedChanged();
|
||||
if(mVfsUtils.needToDeleteUserData())
|
||||
Utils::deleteAllUserData();
|
||||
else
|
||||
else{
|
||||
qInfo() << "Exiting App from VFS settings";
|
||||
App::getInstance()->quit();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -18,9 +18,13 @@ Rectangle {
|
|||
spacing: 0
|
||||
|
||||
Flickable {
|
||||
ScrollBar.vertical: ForceScrollBar {
|
||||
id: scrollBar
|
||||
}
|
||||
id: flickable
|
||||
ScrollBar.vertical: ForceScrollBar {
|
||||
id: scrollBar
|
||||
contentSizeTarget: flickable.contentHeight
|
||||
sizeTarget: flickable.height
|
||||
Component.onCompleted: updatePolicy()
|
||||
}
|
||||
|
||||
Layout.fillHeight: true
|
||||
Layout.fillWidth: true
|
||||
|
|
|
|||
|
|
@ -279,7 +279,11 @@ ColumnLayout {
|
|||
Flickable {
|
||||
id: flick
|
||||
|
||||
ScrollBar.vertical: ForceScrollBar {}
|
||||
ScrollBar.vertical: ForceScrollBar {
|
||||
contentSizeTarget: flick.contentHeight
|
||||
sizeTarget: flick.height
|
||||
Component.onCompleted: updatePolicy()
|
||||
}
|
||||
|
||||
anchors.fill: parent
|
||||
boundsBehavior: Flickable.StopAtBounds
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ DialogPlus {
|
|||
color: AboutStyle.copyrightBlock.url.colorModel.color
|
||||
linkColor: AboutStyle.copyrightBlock.url.colorModel.color
|
||||
//: 'Help us translate %1' : %1 is the application name
|
||||
text: '<a href="'+ConstantsCpp.TranslationUrl+'" style="text-decoration:none;color:'+AboutStyle.copyrightBlock.url.color+'">'+qsTr('aboutTranslation').arg(applicationName)+'</a>'
|
||||
text: '<a href="'+ConstantsCpp.TranslationUrl+'" style="text-decoration:none;color:'+AboutStyle.copyrightBlock.url.colorModel.color+'">'+qsTr('aboutTranslation').arg(applicationName)+'</a>'
|
||||
textFormat: Text.RichText
|
||||
|
||||
width: parent.width
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ function handleActiveFocusItemChanged (activeFocusItem) {
|
|||
|
||||
function handleClosing (close) {
|
||||
if (Linphone.SettingsModel.exitOnClose) {
|
||||
console.info("Exiting App from MainWindow");
|
||||
Qt.quit()
|
||||
return
|
||||
}
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ ApplicationWindow {
|
|||
minimumHeight: MainWindowStyle.minimumHeight
|
||||
minimumWidth: MainWindowStyle.minimumWidth
|
||||
|
||||
title: Utils.capitalizeFirstLetter(Qt.application.name)
|
||||
title: Utils.capitalizeFirstLetter(applicationName)
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,10 @@ Item {
|
|||
context: Qt.ApplicationShortcut
|
||||
sequence: StandardKey.Quit
|
||||
|
||||
onActivated: Qt.quit()
|
||||
onActivated: {
|
||||
console.info("Exiting App from Menu");
|
||||
Qt.quit()
|
||||
}
|
||||
}
|
||||
|
||||
Shortcut {
|
||||
|
|
|
|||
|
|
@ -55,7 +55,10 @@ MenuBar {
|
|||
MenuItem {
|
||||
text: qsTr('quit')
|
||||
role: MenuItem.QuitRole
|
||||
onTriggered: Qt.quit()
|
||||
onTriggered: {
|
||||
console.info("Exiting App from Top Menu");
|
||||
Qt.quit()
|
||||
}
|
||||
shortcut: StandardKey.Quit
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue