diff --git a/linphone-app/assets/languages/da.ts b/linphone-app/assets/languages/da.ts
index 725060821..173ea0ce3 100644
--- a/linphone-app/assets/languages/da.ts
+++ b/linphone-app/assets/languages/da.ts
@@ -884,25 +884,6 @@ Server url ikke konfigureret.
-
- CreateAppSipAccount
-
- createAppSipAccountDescription
- Hvordan vil du oprette din konto?
-
-
- createAppSipAccountTitle
- OPRET EN %1 KONTO
-
-
- withPhoneNumber
- MED ET TELEFONNUMMER
-
-
- withEmailAddress
- MED EN E-MAILADRESSE
-
-
CreateAppSipAccountWithEmail
@@ -1632,6 +1613,14 @@ Klik her: <a href="%1">%1</a>
Afleveret
+
+ ParticipantsDevices
+
+ conversationDevicesTitle
+ 'Conversation's devices' : Title of window that show all devices
+
+
+
ParticipantsView
diff --git a/linphone-app/assets/languages/de.ts b/linphone-app/assets/languages/de.ts
index 548718759..257d71936 100644
--- a/linphone-app/assets/languages/de.ts
+++ b/linphone-app/assets/languages/de.ts
@@ -884,25 +884,6 @@ Server URL ist nicht konfiguriert.
Nachrichten durchsuchen
-
- CreateAppSipAccount
-
- createAppSipAccountDescription
- Wie würden Sie gerne Ihr Konto erstellen?
-
-
- createAppSipAccountTitle
- ERSTELLE EIN %1 KONTO
-
-
- withPhoneNumber
- MIT EINER TELEFONNUMMER
-
-
- withEmailAddress
- MIT EINER E-MAIL-ADRESSE
-
-
CreateAppSipAccountWithEmail
@@ -1632,6 +1613,14 @@ Klicken Sie hier: <a href="%1">%1</a>
Zugestellt
+
+ ParticipantsDevices
+
+ conversationDevicesTitle
+ 'Conversation's devices' : Title of window that show all devices
+
+
+
ParticipantsView
diff --git a/linphone-app/assets/languages/en.ts b/linphone-app/assets/languages/en.ts
index 239227920..6222ebca1 100644
--- a/linphone-app/assets/languages/en.ts
+++ b/linphone-app/assets/languages/en.ts
@@ -884,25 +884,6 @@ Server URL not configured.
Search messages
-
- CreateAppSipAccount
-
- createAppSipAccountDescription
- How would you like to create your account?
-
-
- createAppSipAccountTitle
- CREATE A %1 ACCOUNT
-
-
- withPhoneNumber
- WITH A PHONE NUMBER
-
-
- withEmailAddress
- WITH AN EMAIL ADDRESS
-
-
CreateAppSipAccountWithEmail
@@ -1632,6 +1613,14 @@ Click here: <a href="%1">%1</a>
Delivered
+
+ ParticipantsDevices
+
+ conversationDevicesTitle
+ 'Conversation's devices' : Title of window that show all devices
+ Conversation's devices
+
+
ParticipantsView
diff --git a/linphone-app/assets/languages/es.ts b/linphone-app/assets/languages/es.ts
index e17264236..5d8d2b1f8 100644
--- a/linphone-app/assets/languages/es.ts
+++ b/linphone-app/assets/languages/es.ts
@@ -884,25 +884,6 @@ URL del servidor no configurada.
-
- CreateAppSipAccount
-
- createAppSipAccountDescription
- ¿Cómo prefieres crear tu cuenta?
-
-
- createAppSipAccountTitle
- CREAR UNA CUENTA %1
-
-
- withPhoneNumber
- CON UN NÚMERO DE TELÉFONO
-
-
- withEmailAddress
- CON UN CORREO ELECTRÓNICO
-
-
CreateAppSipAccountWithEmail
@@ -1632,6 +1613,14 @@ Haga clic aquí: <a href="%1">%1 </a>
Enviado
+
+ ParticipantsDevices
+
+ conversationDevicesTitle
+ 'Conversation's devices' : Title of window that show all devices
+
+
+
ParticipantsView
diff --git a/linphone-app/assets/languages/fr_FR.ts b/linphone-app/assets/languages/fr_FR.ts
index bf235a595..62471ee49 100644
--- a/linphone-app/assets/languages/fr_FR.ts
+++ b/linphone-app/assets/languages/fr_FR.ts
@@ -884,25 +884,6 @@ URL du serveur non configurée.
Rechercher dans les messages
-
- CreateAppSipAccount
-
- createAppSipAccountDescription
- Comment souhaitez-vous créer votre compte ?
-
-
- createAppSipAccountTitle
- CRÉER UN COMPTE %1
-
-
- withPhoneNumber
- AVEC UN NUMÉRO DE TÉLÉPHONE
-
-
- withEmailAddress
- AVEC UNE ADRESSE EMAIL
-
-
CreateAppSipAccountWithEmail
@@ -1632,6 +1613,14 @@ Cliquez ici : <a href="%1">%1</a>
Délivré
+
+ ParticipantsDevices
+
+ conversationDevicesTitle
+ 'Conversation's devices' : Title of window that show all devices
+
+
+
ParticipantsView
diff --git a/linphone-app/assets/languages/hu.ts b/linphone-app/assets/languages/hu.ts
index 1034a0db9..b0a79fe50 100644
--- a/linphone-app/assets/languages/hu.ts
+++ b/linphone-app/assets/languages/hu.ts
@@ -879,25 +879,6 @@ A kiszolgáló URL-je nincs konfigurálva.
Üzenetek keresése
-
- CreateAppSipAccount
-
- createAppSipAccountDescription
- Hogyan szeretné létrehozni a fiókját?
-
-
- createAppSipAccountTitle
- %1 fiók létrehozása
-
-
- withPhoneNumber
- Telefonszámmal
-
-
- withEmailAddress
- E-mail címmel
-
-
CreateAppSipAccountWithEmail
@@ -1622,6 +1603,14 @@ Kattintson ide: <a href="%1">%1</a>
Kézbesítve
+
+ ParticipantsDevices
+
+ conversationDevicesTitle
+ 'Conversation's devices' : Title of window that show all devices
+
+
+
ParticipantsView
diff --git a/linphone-app/assets/languages/it.ts b/linphone-app/assets/languages/it.ts
index fbbcbe073..e2368adfa 100644
--- a/linphone-app/assets/languages/it.ts
+++ b/linphone-app/assets/languages/it.ts
@@ -884,25 +884,6 @@ URL del server non configurato.
-
- CreateAppSipAccount
-
- createAppSipAccountDescription
- Come ti piacerebbe creare il tuo account?
-
-
- createAppSipAccountTitle
- CREA UN ACCOUNT %1
-
-
- withPhoneNumber
- CON UN NUMERO DI TELEFONO
-
-
- withEmailAddress
- CON UN INDIRIZZO E-MAIL
-
-
CreateAppSipAccountWithEmail
@@ -1632,6 +1613,14 @@ Clicca: <a href="%1">%1</a>
Consegnato
+
+ ParticipantsDevices
+
+ conversationDevicesTitle
+ 'Conversation's devices' : Title of window that show all devices
+
+
+
ParticipantsView
diff --git a/linphone-app/assets/languages/ja.ts b/linphone-app/assets/languages/ja.ts
index 567c838db..22023ba8c 100644
--- a/linphone-app/assets/languages/ja.ts
+++ b/linphone-app/assets/languages/ja.ts
@@ -879,25 +879,6 @@
-
- CreateAppSipAccount
-
- createAppSipAccountDescription
- どのようにアカウントを作成しますか?
-
-
- createAppSipAccountTitle
- %1アカウントを作成する
-
-
- withPhoneNumber
- 電話番号を利用
-
-
- withEmailAddress
- メールアドレスを利用
-
-
CreateAppSipAccountWithEmail
@@ -1622,6 +1603,14 @@
配信済
+
+ ParticipantsDevices
+
+ conversationDevicesTitle
+ 'Conversation's devices' : Title of window that show all devices
+
+
+
ParticipantsView
diff --git a/linphone-app/assets/languages/lt.ts b/linphone-app/assets/languages/lt.ts
index 169e5f1d5..f5ca889ad 100644
--- a/linphone-app/assets/languages/lt.ts
+++ b/linphone-app/assets/languages/lt.ts
@@ -889,25 +889,6 @@ Nesukonfigūruotas serverio url.
-
- CreateAppSipAccount
-
- createAppSipAccountDescription
- Kaip norėtumėte susikurti savo paskyrą?
-
-
- createAppSipAccountTitle
- SUSIKURTI %1 PASKYRĄ
-
-
- withPhoneNumber
- NAUDOJANT TELEFONO NUMERĮ
-
-
- withEmailAddress
- NAUDOJANT EL. PAŠTO ADRESĄ
-
-
CreateAppSipAccountWithEmail
@@ -1642,6 +1623,14 @@ Spustelėkite čia: <a href="%1">%1</a>
Pristatyta
+
+ ParticipantsDevices
+
+ conversationDevicesTitle
+ 'Conversation's devices' : Title of window that show all devices
+
+
+
ParticipantsView
diff --git a/linphone-app/assets/languages/pt_BR.ts b/linphone-app/assets/languages/pt_BR.ts
index 0f47a9160..40b9ea2d7 100644
--- a/linphone-app/assets/languages/pt_BR.ts
+++ b/linphone-app/assets/languages/pt_BR.ts
@@ -884,25 +884,6 @@ URL do servidor não configurado.
Pesquisar mensagens
-
- CreateAppSipAccount
-
- createAppSipAccountDescription
- Como você gostaria de criar sua conta?
-
-
- createAppSipAccountTitle
- CRIAR UMA CONTA %1
-
-
- withPhoneNumber
- COM UM NÚMERO DE TELEFONE
-
-
- withEmailAddress
- COM UM ENDEREÇO DE E-MAIL
-
-
CreateAppSipAccountWithEmail
@@ -1632,6 +1613,14 @@ Clique aqui: <a href="%1">%1 </a>
Entregue
+
+ ParticipantsDevices
+
+ conversationDevicesTitle
+ 'Conversation's devices' : Title of window that show all devices
+
+
+
ParticipantsView
diff --git a/linphone-app/assets/languages/ru.ts b/linphone-app/assets/languages/ru.ts
index 0b3b59722..4324a3a22 100644
--- a/linphone-app/assets/languages/ru.ts
+++ b/linphone-app/assets/languages/ru.ts
@@ -889,25 +889,6 @@
-
- CreateAppSipAccount
-
- createAppSipAccountDescription
- Как бы вы хотели создать аккаунт?
-
-
- createAppSipAccountTitle
- СОЗДАТЬ АККАУНТ %1
-
-
- withPhoneNumber
- С ПОМОЩЬЮ НОМЕРА ТЕЛЕФОНА
-
-
- withEmailAddress
- С ПОМОЩЬЮ EMAIL
-
-
CreateAppSipAccountWithEmail
@@ -1642,6 +1623,14 @@
Доставлено
+
+ ParticipantsDevices
+
+ conversationDevicesTitle
+ 'Conversation's devices' : Title of window that show all devices
+
+
+
ParticipantsView
diff --git a/linphone-app/assets/languages/sv.ts b/linphone-app/assets/languages/sv.ts
index 1283eabb2..138025074 100644
--- a/linphone-app/assets/languages/sv.ts
+++ b/linphone-app/assets/languages/sv.ts
@@ -884,25 +884,6 @@ Serverwebbadressen är inte konfigurerad.
-
- CreateAppSipAccount
-
- createAppSipAccountDescription
- Hur vill du skapa ditt konto?
-
-
- createAppSipAccountTitle
- SKAPA ETT %1-KONTO
-
-
- withPhoneNumber
- MED ETT TELEFONNUMMER
-
-
- withEmailAddress
- MED E-POSTADRESS
-
-
CreateAppSipAccountWithEmail
@@ -1632,6 +1613,14 @@ Klicka här: <a href="%1">%1</a>
Levererad
+
+ ParticipantsDevices
+
+ conversationDevicesTitle
+ 'Conversation's devices' : Title of window that show all devices
+
+
+
ParticipantsView
diff --git a/linphone-app/assets/languages/tr.ts b/linphone-app/assets/languages/tr.ts
index 5ff2d50b6..adaa2b34b 100644
--- a/linphone-app/assets/languages/tr.ts
+++ b/linphone-app/assets/languages/tr.ts
@@ -879,25 +879,6 @@ Sunucu url'si yapılandırılmadı.
-
- CreateAppSipAccount
-
- createAppSipAccountDescription
- Hesabınızı nasıl oluşturmak istersiniz?
-
-
- createAppSipAccountTitle
- %1 HESABI OLUŞTUR
-
-
- withPhoneNumber
- TELEFON NUMARASIYLA
-
-
- withEmailAddress
- E-POSTA ADRESİYLE
-
-
CreateAppSipAccountWithEmail
@@ -1622,6 +1603,14 @@ Buraya tıklayın: <a href="%1">%1</a>
İletildi
+
+ ParticipantsDevices
+
+ conversationDevicesTitle
+ 'Conversation's devices' : Title of window that show all devices
+
+
+
ParticipantsView
diff --git a/linphone-app/assets/languages/uk.ts b/linphone-app/assets/languages/uk.ts
index 67e240aef..1bc9e4602 100644
--- a/linphone-app/assets/languages/uk.ts
+++ b/linphone-app/assets/languages/uk.ts
@@ -889,25 +889,6 @@
-
- CreateAppSipAccount
-
- createAppSipAccountDescription
- Як би ви воліли створити обліківку?
-
-
- createAppSipAccountTitle
- СТВОРИТИ ОБЛІКІВКУ %1
-
-
- withPhoneNumber
- ЗА ДОПОМОГОЮ НОМЕРУ ТЕЛЕФОНУ
-
-
- withEmailAddress
- ЗА ДОПОМОГОЮ EMAIL
-
-
CreateAppSipAccountWithEmail
@@ -1642,6 +1623,14 @@
Доставлено
+
+ ParticipantsDevices
+
+ conversationDevicesTitle
+ 'Conversation's devices' : Title of window that show all devices
+
+
+
ParticipantsView
diff --git a/linphone-app/assets/languages/zh_CN.ts b/linphone-app/assets/languages/zh_CN.ts
index 11553c069..d671c14a1 100644
--- a/linphone-app/assets/languages/zh_CN.ts
+++ b/linphone-app/assets/languages/zh_CN.ts
@@ -879,25 +879,6 @@
查找信息
-
- CreateAppSipAccount
-
- createAppSipAccountDescription
- 您想要如何创建账户?
-
-
- createAppSipAccountTitle
- 创建一个 %1 账户
-
-
- withPhoneNumber
- 用手机号码
-
-
- withEmailAddress
- 用电子邮箱地址
-
-
CreateAppSipAccountWithEmail
@@ -1622,6 +1603,14 @@
已送达
+
+ ParticipantsDevices
+
+ conversationDevicesTitle
+ 'Conversation's devices' : Title of window that show all devices
+
+
+
ParticipantsView
diff --git a/linphone-app/ui/modules/Common/Form/ActionButton.qml b/linphone-app/ui/modules/Common/Form/ActionButton.qml
index de5f4558f..3467b78c3 100644
--- a/linphone-app/ui/modules/Common/Form/ActionButton.qml
+++ b/linphone-app/ui/modules/Common/Form/ActionButton.qml
@@ -34,6 +34,7 @@ Item {
property bool enabled: true
property bool updating: false
property bool useStates: true
+ property bool toggled: false
//property bool autoIcon : false // hovered/pressed : use an automatic layer instead of specific icon image
property int iconSize : colorSet ? colorSet.iconSize : 0
property int iconHeight: colorSet.iconHeight ? colorSet.iconHeight : 0
@@ -79,13 +80,13 @@ Item {
signal clicked(real x, real y)
// ---------------------------------------------------------------------------
-
+
function _getIcon () {
if(isCustom)
return wrappedButton.icon
if(wrappedButton.icon == '')
return wrappedButton.icon;
- if (wrappedButton.updating) {
+ if (wrappedButton.updating || wrappedButton.toggled) {
return wrappedButton.icon + '_updating'
}
@@ -109,7 +110,7 @@ Item {
if(isCustom){
if(wrappedButton.icon == '')
return wrappedButton.colorSet.backgroundNormalColor
- if (wrappedButton.updating)
+ if (wrappedButton.updating || wrappedButton.toggled)
return wrappedButton.colorSet.backgroundUpdatingColor
if (!useStates)
return wrappedButton.colorSet.backgroundNormalColor
@@ -124,7 +125,7 @@ Item {
if(isCustom){
if(wrappedButton.icon == '')
return wrappedButton.colorSet.foregroundNormalColor
- if (wrappedButton.updating)
+ if (wrappedButton.updating || wrappedButton.toggled)
return wrappedButton.colorSet.foregroundUpdatingColor
if (!useStates)
return wrappedButton.colorSet.foregroundNormalColor
@@ -139,7 +140,7 @@ Item {
if(isCustom){
if(wrappedButton.icon == '')
return wrappedButton.backgroundHiddenPartNormalColor
- if (wrappedButton.updating)
+ if (wrappedButton.updating || wrappedButton.toggled)
return wrappedButton.backgroundHiddenPartUpdatingColor
if (!useStates)
return wrappedButton.backgroundHiddenPartNormalColor
@@ -154,7 +155,7 @@ Item {
if(isCustom){
if(wrappedButton.icon == '')
return wrappedButton.foregroundHiddenPartNormalColor
- if (wrappedButton.updating)
+ if (wrappedButton.updating || wrappedButton.toggled)
return wrappedButton.foregroundHiddenPartUpdatingColor
if (!useStates)
return wrappedButton.foregroundHiddenPartNormalColor
@@ -190,7 +191,6 @@ Item {
}
}
hoverEnabled: !wrappedButton.updating//|| wrappedButton.autoIcon
-
onClicked: !wrappedButton.updating && wrappedButton.enabled && wrappedButton.clicked(pressX, pressY)
Rectangle{
id: foregroundColor
diff --git a/linphone-app/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml b/linphone-app/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml
index 8939e51b2..1b7d35c47 100644
--- a/linphone-app/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml
+++ b/linphone-app/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml
@@ -62,5 +62,6 @@ QtObject {
property QtObject searchField: QtObject {
property color color: ColorsList.add(sectionName+'_searchField', 'c').color
property color borderColor: ColorsList.add(sectionName+'_searchField_border', 'border').color
+ property int pointSize: Units.dp * 9
}
}
diff --git a/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml b/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml
index 0a1d1df8c..dab3b44a1 100644
--- a/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml
+++ b/linphone-app/ui/modules/Linphone/Timeline/Timeline.qml
@@ -253,11 +253,12 @@ Rectangle {
TextField {
id:searchBar
- anchors {
- fill: parent
- margins: 7
- }
- width: parent.width - 14
+ anchors.fill: parent
+ anchors.rightMargin: 7
+ anchors.leftMargin: 7
+ anchors.topMargin: 5
+ anchors.bottomMargin: 5
+ width: parent.width - 14
icon: 'search_custom'
iconSize: 30
overwriteColor: TimelineStyle.searchField.color
@@ -265,6 +266,7 @@ Rectangle {
placeholderText: qsTr('timelineSearchPlaceholderText')
onTextChanged: timeline.model.filterText = text
+ font.pointSize: TimelineStyle.searchField.pointSize
}
}
diff --git a/linphone-app/ui/views/App/Main/Conversation.qml b/linphone-app/ui/views/App/Main/Conversation.qml
index 5086b3075..0f804277f 100644
--- a/linphone-app/ui/views/App/Main/Conversation.qml
+++ b/linphone-app/ui/views/App/Main/Conversation.qml
@@ -498,7 +498,7 @@ ColumnLayout {
id:searchBar
anchors {
fill: parent
- margins: 1
+ margins: 0
}
width: parent.width-14
icon: 'close_custom'
@@ -512,6 +512,7 @@ ColumnLayout {
searchView.visible = false
chatRoomProxyModel.filterText = ''
}
+ font.pointSize: ConversationStyle.filters.pointSize
}
}
diff --git a/linphone-app/ui/views/App/Main/Dialogs/ParticipantsDevices.qml b/linphone-app/ui/views/App/Main/Dialogs/ParticipantsDevices.qml
index 8e7965873..4a942b52d 100644
--- a/linphone-app/ui/views/App/Main/Dialogs/ParticipantsDevices.qml
+++ b/linphone-app/ui/views/App/Main/Dialogs/ParticipantsDevices.qml
@@ -20,8 +20,8 @@ DialogPlus {
id:dialog
buttons: []
flat : true
-
- title: "Conversation's devices"
+ //: 'Conversation's devices' : Title of window that show all devices
+ title: qsTr('conversationDevicesTitle')
showCloseCross:true
diff --git a/linphone-app/ui/views/App/Main/MainWindow.qml b/linphone-app/ui/views/App/Main/MainWindow.qml
index 0102a7267..2e8d774ed 100644
--- a/linphone-app/ui/views/App/Main/MainWindow.qml
+++ b/linphone-app/ui/views/App/Main/MainWindow.qml
@@ -232,7 +232,8 @@ ApplicationWindow {
colorSet: MainWindowStyle.buttons.burgerMenu
visible: Qt.platform.os !== 'osx'
- onClicked: menuBar.open()
+ toggled: menuBar.isOpenned
+ onClicked: toggled ? menuBar.close() : menuBar.open()// a bit useless as Menu will depopup on losing focus but this code is kept for giving idea
MainWindowMenuBar {
id: menuBar
}
diff --git a/linphone-app/ui/views/App/Main/MainWindowMenuBar.qml b/linphone-app/ui/views/App/Main/MainWindowMenuBar.qml
index 0cea881f1..b88e8db53 100644
--- a/linphone-app/ui/views/App/Main/MainWindowMenuBar.qml
+++ b/linphone-app/ui/views/App/Main/MainWindowMenuBar.qml
@@ -10,73 +10,77 @@ import Utils 1.0
Item {
id:menuParent
- function open () {
- menu.popup()
- }
-
- // ---------------------------------------------------------------------------
- // Shortcuts.
- // ---------------------------------------------------------------------------
-
- Shortcut {
- id: settingsShortcut
-
- sequence: 'Ctrl+P'
-
- onActivated: App.smartShowWindow(App.getSettingsWindow())
- }
-
- Shortcut {
- id: quitShortcut
-
- context: Qt.ApplicationShortcut
- sequence: StandardKey.Quit
-
- onActivated: Qt.quit()
- }
-
- Shortcut {
- id: aboutShortcut
-
- sequence: StandardKey.HelpContents
-
- onActivated: {
- window.detachVirtualWindow()
- window.attachVirtualWindow(Qt.resolvedUrl('Dialogs/About.qml'))
- }
- }
-
- // ---------------------------------------------------------------------------
- // Menu.
- // ---------------------------------------------------------------------------
-
- Menu {
- id: menu
- title: qsTr('settings')
-
- MenuItem {
- text: qsTr('settings')
-
- onTriggered: settingsShortcut.onActivated()
- }
-
- MenuItem {
- //: 'Check for updates' : Item menu for checking updates
- text: qsTr('checkForUpdates')
-
- onTriggered: App.checkForUpdates(true)
- }
-
- MenuItem {
- text: qsTr('about')
-
- onTriggered: aboutShortcut.onActivated()
- }
-
- MenuItem {
- text: qsTr('quit')
-
- onTriggered: quitShortcut.onActivated()
- }
- }
+ property bool isOpenned: menu.visible
+ function open () {
+ menu.popup()
+ }
+ function close(){
+ menu.close()
+ }
+
+ // ---------------------------------------------------------------------------
+ // Shortcuts.
+ // ---------------------------------------------------------------------------
+
+ Shortcut {
+ id: settingsShortcut
+
+ sequence: 'Ctrl+P'
+
+ onActivated: App.smartShowWindow(App.getSettingsWindow())
+ }
+
+ Shortcut {
+ id: quitShortcut
+
+ context: Qt.ApplicationShortcut
+ sequence: StandardKey.Quit
+
+ onActivated: Qt.quit()
+ }
+
+ Shortcut {
+ id: aboutShortcut
+
+ sequence: StandardKey.HelpContents
+
+ onActivated: {
+ window.detachVirtualWindow()
+ window.attachVirtualWindow(Qt.resolvedUrl('Dialogs/About.qml'))
+ }
+ }
+
+ // ---------------------------------------------------------------------------
+ // Menu.
+ // ---------------------------------------------------------------------------
+
+ Menu {
+ id: menu
+ title: qsTr('settings')
+
+ MenuItem {
+ text: qsTr('settings')
+
+ onTriggered: settingsShortcut.onActivated()
+ }
+
+ MenuItem {
+ //: 'Check for updates' : Item menu for checking updates
+ text: qsTr('checkForUpdates')
+
+ onTriggered: App.checkForUpdates(true)
+ }
+
+ MenuItem {
+ text: qsTr('about')
+
+ onTriggered: aboutShortcut.onActivated()
+ }
+
+ MenuItem {
+ text: qsTr('quit')
+
+ onTriggered: quitShortcut.onActivated()
+ }
+ }
}
diff --git a/linphone-app/ui/views/App/Styles/Main/ConversationStyle.qml b/linphone-app/ui/views/App/Styles/Main/ConversationStyle.qml
index 5dba895f1..9a273f2d1 100644
--- a/linphone-app/ui/views/App/Styles/Main/ConversationStyle.qml
+++ b/linphone-app/ui/views/App/Styles/Main/ConversationStyle.qml
@@ -157,6 +157,7 @@ QtObject {
property color iconColor: ColorsList.add(sectionName+'_filters_icon', 'c').color
property int height: 51
property int leftMargin: 40
+ property int pointSize: Units.dp * 9
property QtObject border: QtObject {
property color color: ColorsList.add(sectionName+'_filters_border', 'g10').color
diff --git a/linphone-app/ui/views/App/Styles/Main/MainWindowStyle.qml b/linphone-app/ui/views/App/Styles/Main/MainWindowStyle.qml
index b22ee0efb..6d4e1befa 100644
--- a/linphone-app/ui/views/App/Styles/Main/MainWindowStyle.qml
+++ b/linphone-app/ui/views/App/Styles/Main/MainWindowStyle.qml
@@ -104,9 +104,11 @@ QtObject {
property string name : 'burgerMenu'
property string icon : 'burger_menu_custom'
property color backgroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_n', icon, 'me_n_b_bg').color
+ property color backgroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_u', icon, 'me_p_b_bg').color
property color backgroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_h', icon, 'me_h_b_bg').color
property color backgroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_bg_p', icon, 'me_p_b_bg').color
property color foregroundNormalColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_n', icon, 'me_n_b_fg').color
+ property color foregroundUpdatingColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_u', icon, 'me_p_b_fg').color
property color foregroundHoveredColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_h', icon, 'me_h_b_fg').color
property color foregroundPressedColor : ColorsList.addImageColor(sectionName+'_'+name+'_fg_p', icon, 'me_p_b_fg').color
}