mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Add toggled state on button.

Browse source 
- Refit texts in search bars.
- Fix title text in conversation's devices window
- Fix burger button view (stay selected)
This commit is contained in:
Julien Wadel 2021-11-29 12:19:22 +01:00
parent 427fd742de
commit 0a69ec4f14
24 changed files with 217 additions and 370 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
linphone-app/assets/languages/da.ts
View file

@ -884,25 +884,6 @@ Server url ikke konfigureret.</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CreateAppSipAccount</name>
<message>
<source>createAppSipAccountDescription</source>
<translation>Hvordan vil du oprette din konto?</translation>
</message>
<message>
<source>createAppSipAccountTitle</source>
<translation>OPRET EN %1 KONTO</translation>
</message>
<message>
<source>withPhoneNumber</source>
<translation>MED ET TELEFONNUMMER</translation>
</message>
<message>
<source>withEmailAddress</source>
<translation>MED EN E-MAILADRESSE</translation>
</message>
</context>
<context>
<name>CreateAppSipAccountWithEmail</name>
<message>
@ -1632,6 +1613,14 @@ Klik her: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<translation>Afleveret</translation>
</message>
</context>
<context>
<name>ParticipantsDevices</name>
<message>
<source>conversationDevicesTitle</source>
<extracomment>&apos;Conversation&apos;s devices&apos; : Title of window that show all devices</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ParticipantsView</name>
<message>

27
linphone-app/assets/languages/de.ts
View file

@ -884,25 +884,6 @@ Server URL ist nicht konfiguriert.</translation>
<translation>Nachrichten durchsuchen</translation>
</message>
</context>
<context>
<name>CreateAppSipAccount</name>
<message>
<source>createAppSipAccountDescription</source>
<translation>Wie würden Sie gerne Ihr Konto erstellen?</translation>
</message>
<message>
<source>createAppSipAccountTitle</source>
<translation>ERSTELLE EIN %1 KONTO</translation>
</message>
<message>
<source>withPhoneNumber</source>
<translation>MIT EINER TELEFONNUMMER</translation>
</message>
<message>
<source>withEmailAddress</source>
<translation>MIT EINER E-MAIL-ADRESSE</translation>
</message>
</context>
<context>
<name>CreateAppSipAccountWithEmail</name>
<message>
@ -1632,6 +1613,14 @@ Klicken Sie hier: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<translation>Zugestellt</translation>
</message>
</context>
<context>
<name>ParticipantsDevices</name>
<message>
<source>conversationDevicesTitle</source>
<extracomment>&apos;Conversation&apos;s devices&apos; : Title of window that show all devices</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ParticipantsView</name>
<message>

27
linphone-app/assets/languages/en.ts
View file

@ -884,25 +884,6 @@ Server URL not configured.</translation>
<translation>Search messages</translation>
</message>
</context>
<context>
<name>CreateAppSipAccount</name>
<message>
<source>createAppSipAccountDescription</source>
<translation>How would you like to create your account?</translation>
</message>
<message>
<source>createAppSipAccountTitle</source>
<translation>CREATE A %1 ACCOUNT</translation>
</message>
<message>
<source>withPhoneNumber</source>
<translation>WITH A PHONE NUMBER</translation>
</message>
<message>
<source>withEmailAddress</source>
<translation>WITH AN EMAIL ADDRESS</translation>
</message>
</context>
<context>
<name>CreateAppSipAccountWithEmail</name>
<message>
@ -1632,6 +1613,14 @@ Click here: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<translation>Delivered</translation>
</message>
</context>
<context>
<name>ParticipantsDevices</name>
<message>
<source>conversationDevicesTitle</source>
<extracomment>&apos;Conversation&apos;s devices&apos; : Title of window that show all devices</extracomment>
<translation>Conversation&apos;s devices</translation>
</message>
</context>
<context>
<name>ParticipantsView</name>
<message>

27
linphone-app/assets/languages/es.ts
View file

@ -884,25 +884,6 @@ URL del servidor no configurada.</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CreateAppSipAccount</name>
<message>
<source>createAppSipAccountDescription</source>
<translation>¿Cómo prefieres crear tu cuenta?</translation>
</message>
<message>
<source>createAppSipAccountTitle</source>
<translation>CREAR UNA CUENTA %1</translation>
</message>
<message>
<source>withPhoneNumber</source>
<translation>CON UN NÚMERO DE TELÉFONO</translation>
</message>
<message>
<source>withEmailAddress</source>
<translation>CON UN CORREO ELECTRÓNICO</translation>
</message>
</context>
<context>
<name>CreateAppSipAccountWithEmail</name>
<message>
@ -1632,6 +1613,14 @@ Haga clic aquí: &lt;a href=&quot;%1&quot;&gt;%1 &lt;/a&gt;
<translation>Enviado</translation>
</message>
</context>
<context>
<name>ParticipantsDevices</name>
<message>
<source>conversationDevicesTitle</source>
<extracomment>&apos;Conversation&apos;s devices&apos; : Title of window that show all devices</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ParticipantsView</name>
<message>

27
linphone-app/assets/languages/fr_FR.ts
View file

@ -884,25 +884,6 @@ URL du serveur non configurée.</translation>
<translation>Rechercher dans les messages</translation>
</message>
</context>
<context>
<name>CreateAppSipAccount</name>
<message>
<source>createAppSipAccountDescription</source>
<translation>Comment souhaitez-vous créer votre compte ?</translation>
</message>
<message>
<source>createAppSipAccountTitle</source>
<translation>CRÉER UN COMPTE %1</translation>
</message>
<message>
<source>withPhoneNumber</source>
<translation>AVEC UN NUMÉRO DE TÉLÉPHONE</translation>
</message>
<message>
<source>withEmailAddress</source>
<translation>AVEC UNE ADRESSE EMAIL</translation>
</message>
</context>
<context>
<name>CreateAppSipAccountWithEmail</name>
<message>
@ -1632,6 +1613,14 @@ Cliquez ici : &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<translation>Délivré</translation>
</message>
</context>
<context>
<name>ParticipantsDevices</name>
<message>
<source>conversationDevicesTitle</source>
<extracomment>&apos;Conversation&apos;s devices&apos; : Title of window that show all devices</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ParticipantsView</name>
<message>

27
linphone-app/assets/languages/hu.ts
View file

@ -879,25 +879,6 @@ A kiszolgáló URL-je nincs konfigurálva.</translation>
<translation>Üzenetek keresése</translation>
</message>
</context>
<context>
<name>CreateAppSipAccount</name>
<message>
<source>createAppSipAccountDescription</source>
<translation>Hogyan szeretné létrehozni a fiókját?</translation>
</message>
<message>
<source>createAppSipAccountTitle</source>
<translation>%1 fiók létrehozása</translation>
</message>
<message>
<source>withPhoneNumber</source>
<translation>Telefonszámmal</translation>
</message>
<message>
<source>withEmailAddress</source>
<translation>E-mail címmel</translation>
</message>
</context>
<context>
<name>CreateAppSipAccountWithEmail</name>
<message>
@ -1622,6 +1603,14 @@ Kattintson ide: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<translation>Kézbesítve</translation>
</message>
</context>
<context>
<name>ParticipantsDevices</name>
<message>
<source>conversationDevicesTitle</source>
<extracomment>&apos;Conversation&apos;s devices&apos; : Title of window that show all devices</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ParticipantsView</name>
<message>

27
linphone-app/assets/languages/it.ts
View file

@ -884,25 +884,6 @@ URL del server non configurato.</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CreateAppSipAccount</name>
<message>
<source>createAppSipAccountDescription</source>
<translation>Come ti piacerebbe creare il tuo account?</translation>
</message>
<message>
<source>createAppSipAccountTitle</source>
<translation>CREA UN ACCOUNT %1</translation>
</message>
<message>
<source>withPhoneNumber</source>
<translation>CON UN NUMERO DI TELEFONO</translation>
</message>
<message>
<source>withEmailAddress</source>
<translation>CON UN INDIRIZZO E-MAIL</translation>
</message>
</context>
<context>
<name>CreateAppSipAccountWithEmail</name>
<message>
@ -1632,6 +1613,14 @@ Clicca: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<translation>Consegnato</translation>
</message>
</context>
<context>
<name>ParticipantsDevices</name>
<message>
<source>conversationDevicesTitle</source>
<extracomment>&apos;Conversation&apos;s devices&apos; : Title of window that show all devices</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ParticipantsView</name>
<message>

27
linphone-app/assets/languages/ja.ts
View file

@ -879,25 +879,6 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CreateAppSipAccount</name>
<message>
<source>createAppSipAccountDescription</source>
<translation>どのようにアカウントを作成しますか？</translation>
</message>
<message>
<source>createAppSipAccountTitle</source>
<translation>%1アカウントを作成する</translation>
</message>
<message>
<source>withPhoneNumber</source>
<translation>電話番号を利用</translation>
</message>
<message>
<source>withEmailAddress</source>
<translation>メールアドレスを利用</translation>
</message>
</context>
<context>
<name>CreateAppSipAccountWithEmail</name>
<message>
@ -1622,6 +1603,14 @@
<translation>配信済</translation>
</message>
</context>
<context>
<name>ParticipantsDevices</name>
<message>
<source>conversationDevicesTitle</source>
<extracomment>&apos;Conversation&apos;s devices&apos; : Title of window that show all devices</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ParticipantsView</name>
<message>

27
linphone-app/assets/languages/lt.ts
View file

@ -889,25 +889,6 @@ Nesukonfigūruotas serverio url.</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CreateAppSipAccount</name>
<message>
<source>createAppSipAccountDescription</source>
<translation>Kaip norėtumėte susikurti savo paskyrą?</translation>
</message>
<message>
<source>createAppSipAccountTitle</source>
<translation>SUSIKURTI %1 PASKYRĄ</translation>
</message>
<message>
<source>withPhoneNumber</source>
<translation>NAUDOJANT TELEFONO NUMERĮ</translation>
</message>
<message>
<source>withEmailAddress</source>
<translation>NAUDOJANT EL. PAŠTO ADRESĄ</translation>
</message>
</context>
<context>
<name>CreateAppSipAccountWithEmail</name>
<message>
@ -1642,6 +1623,14 @@ Spustelėkite čia: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<translation>Pristatyta</translation>
</message>
</context>
<context>
<name>ParticipantsDevices</name>
<message>
<source>conversationDevicesTitle</source>
<extracomment>&apos;Conversation&apos;s devices&apos; : Title of window that show all devices</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ParticipantsView</name>
<message>

27
linphone-app/assets/languages/pt_BR.ts
View file

@ -884,25 +884,6 @@ URL do servidor não configurado.</translation>
<translation>Pesquisar mensagens</translation>
</message>
</context>
<context>
<name>CreateAppSipAccount</name>
<message>
<source>createAppSipAccountDescription</source>
<translation>Como você gostaria de criar sua conta?</translation>
</message>
<message>
<source>createAppSipAccountTitle</source>
<translation>CRIAR UMA CONTA %1</translation>
</message>
<message>
<source>withPhoneNumber</source>
<translation>COM UM NÚMERO DE TELEFONE</translation>
</message>
<message>
<source>withEmailAddress</source>
<translation>COM UM ENDEREÇO DE E-MAIL</translation>
</message>
</context>
<context>
<name>CreateAppSipAccountWithEmail</name>
<message>
@ -1632,6 +1613,14 @@ Clique aqui: &lt;a href=&quot;%1&quot;&gt;%1 &lt;/a&gt;
<translation>Entregue</translation>
</message>
</context>
<context>
<name>ParticipantsDevices</name>
<message>
<source>conversationDevicesTitle</source>
<extracomment>&apos;Conversation&apos;s devices&apos; : Title of window that show all devices</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ParticipantsView</name>
<message>

27
linphone-app/assets/languages/ru.ts
View file

@ -889,25 +889,6 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CreateAppSipAccount</name>
<message>
<source>createAppSipAccountDescription</source>
<translation>Как бы вы хотели создать аккаунт?</translation>
</message>
<message>
<source>createAppSipAccountTitle</source>
<translation>СОЗДАТЬ АККАУНТ %1</translation>
</message>
<message>
<source>withPhoneNumber</source>
<translation>С ПОМОЩЬЮ НОМЕРА ТЕЛЕФОНА</translation>
</message>
<message>
<source>withEmailAddress</source>
<translation>С ПОМОЩЬЮ EMAIL</translation>
</message>
</context>
<context>
<name>CreateAppSipAccountWithEmail</name>
<message>
@ -1642,6 +1623,14 @@
<translation>Доставлено</translation>
</message>
</context>
<context>
<name>ParticipantsDevices</name>
<message>
<source>conversationDevicesTitle</source>
<extracomment>&apos;Conversation&apos;s devices&apos; : Title of window that show all devices</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ParticipantsView</name>
<message>

27
linphone-app/assets/languages/sv.ts
View file

@ -884,25 +884,6 @@ Serverwebbadressen är inte konfigurerad.</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CreateAppSipAccount</name>
<message>
<source>createAppSipAccountDescription</source>
<translation>Hur vill du skapa ditt konto?</translation>
</message>
<message>
<source>createAppSipAccountTitle</source>
<translation>SKAPA ETT %1-KONTO</translation>
</message>
<message>
<source>withPhoneNumber</source>
<translation>MED ETT TELEFONNUMMER</translation>
</message>
<message>
<source>withEmailAddress</source>
<translation>MED E-POSTADRESS</translation>
</message>
</context>
<context>
<name>CreateAppSipAccountWithEmail</name>
<message>
@ -1632,6 +1613,14 @@ Klicka här: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<translation>Levererad</translation>
</message>
</context>
<context>
<name>ParticipantsDevices</name>
<message>
<source>conversationDevicesTitle</source>
<extracomment>&apos;Conversation&apos;s devices&apos; : Title of window that show all devices</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ParticipantsView</name>
<message>

27
linphone-app/assets/languages/tr.ts
View file

@ -879,25 +879,6 @@ Sunucu url&apos;si yapılandırılmadı.</translation>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CreateAppSipAccount</name>
<message>
<source>createAppSipAccountDescription</source>
<translation>Hesabınızı nasıl oluşturmak istersiniz?</translation>
</message>
<message>
<source>createAppSipAccountTitle</source>
<translation>%1 HESABI OLUŞTUR</translation>
</message>
<message>
<source>withPhoneNumber</source>
<translation>TELEFON NUMARASIYLA</translation>
</message>
<message>
<source>withEmailAddress</source>
<translation>E-POSTA ADRESİYLE</translation>
</message>
</context>
<context>
<name>CreateAppSipAccountWithEmail</name>
<message>
@ -1622,6 +1603,14 @@ Buraya tıklayın: &lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;
<translation>İletildi</translation>
</message>
</context>
<context>
<name>ParticipantsDevices</name>
<message>
<source>conversationDevicesTitle</source>
<extracomment>&apos;Conversation&apos;s devices&apos; : Title of window that show all devices</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ParticipantsView</name>
<message>

27
linphone-app/assets/languages/uk.ts
View file

@ -889,25 +889,6 @@
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>CreateAppSipAccount</name>
<message>
<source>createAppSipAccountDescription</source>
<translation>Як би ви воліли створити обліківку?</translation>
</message>
<message>
<source>createAppSipAccountTitle</source>
<translation>СТВОРИТИ ОБЛІКІВКУ %1</translation>
</message>
<message>
<source>withPhoneNumber</source>
<translation>ЗА ДОПОМОГОЮ НОМЕРУ ТЕЛЕФОНУ</translation>
</message>
<message>
<source>withEmailAddress</source>
<translation>ЗА ДОПОМОГОЮ EMAIL</translation>
</message>
</context>
<context>
<name>CreateAppSipAccountWithEmail</name>
<message>
@ -1642,6 +1623,14 @@
<translation>Доставлено</translation>
</message>
</context>
<context>
<name>ParticipantsDevices</name>
<message>
<source>conversationDevicesTitle</source>
<extracomment>&apos;Conversation&apos;s devices&apos; : Title of window that show all devices</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ParticipantsView</name>
<message>

27
linphone-app/assets/languages/zh_CN.ts
View file

@ -879,25 +879,6 @@
<translation>查找信息</translation>
</message>
</context>
<context>
<name>CreateAppSipAccount</name>
<message>
<source>createAppSipAccountDescription</source>
<translation>您想要如何创建账户？</translation>
</message>
<message>
<source>createAppSipAccountTitle</source>
<translation>创建一个 %1 账户</translation>
</message>
<message>
<source>withPhoneNumber</source>
<translation>用手机号码</translation>
</message>
<message>
<source>withEmailAddress</source>
<translation>用电子邮箱地址</translation>
</message>
</context>
<context>
<name>CreateAppSipAccountWithEmail</name>
<message>
@ -1622,6 +1603,14 @@
<translation>已送达</translation>
</message>
</context>
<context>
<name>ParticipantsDevices</name>
<message>
<source>conversationDevicesTitle</source>
<extracomment>&apos;Conversation&apos;s devices&apos; : Title of window that show all devices</extracomment>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ParticipantsView</name>
<message>

14
linphone-app/ui/modules/Common/Form/ActionButton.qml
View file

@ -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

1
linphone-app/ui/modules/Linphone/Styles/Timeline/TimelineStyle.qml
View file

@ -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
}
}

12
linphone-app/ui/modules/Linphone/Timeline/Timeline.qml
View file

@ -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
}
}

3
linphone-app/ui/views/App/Main/Conversation.qml
View file

@ -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
}
}

4
linphone-app/ui/views/App/Main/Dialogs/ParticipantsDevices.qml
View file

@ -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

3
linphone-app/ui/views/App/Main/MainWindow.qml
View file

@ -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
}

142
linphone-app/ui/views/App/Main/MainWindowMenuBar.qml
View file

@ -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()
}
}
}

1
linphone-app/ui/views/App/Styles/Main/ConversationStyle.qml
View file

@ -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

2
linphone-app/ui/views/App/Styles/Main/MainWindowStyle.qml
View file

@ -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
}