Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
3c9afa3d
Commit
3c9afa3d
authored
Apr 10, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(app): fix font size on miscellaneous components
parent
dd4b5859
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
167 additions
and
155 deletions
+167
-155
fr.ts
linphone-desktop/assets/languages/fr.ts
+1
-1
main.cpp
linphone-desktop/src/main.cpp
+1
-1
CheckBoxText.qml
linphone-desktop/ui/modules/Common/Form/CheckBoxText.qml
+1
-0
CheckBoxTextStyle.qml
...sktop/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml
+1
-0
MainWindowMenuBar.qml
linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml
+158
-151
AssistantAbstractViewStyle.qml
.../App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml
+1
-1
ContactsStyle.qml
linphone-desktop/ui/views/App/Styles/Main/ContactsStyle.qml
+1
-1
MainWindowMenuBarStyle.qml
...sktop/ui/views/App/Styles/Main/MainWindowMenuBarStyle.qml
+3
-0
No files found.
linphone-desktop/assets/languages/fr.ts
View file @
3c9afa3d
...
...
@@ -347,7 +347,7 @@ Url du serveur non configurée.</translation>
<
/message
>
<
message
>
<
source
>
codecStatus
<
/source
>
<
translation
>
s
tatus
<
/translation
>
<
translation
>
S
tatus
<
/translation
>
<
/message
>
<
/context
>
<
context
>
...
...
linphone-desktop/src/main.cpp
View file @
3c9afa3d
...
...
@@ -87,7 +87,7 @@ int main (int argc, char *argv[]) {
if
(
info
.
suffix
()
==
"ttf"
)
{
QString
path
=
info
.
absoluteFilePath
();
if
(
path
.
startsWith
(
":/assets/fonts/"
))
qDebug
()
<<
QFontDatabase
::
addApplicationFont
(
path
);
QFontDatabase
::
addApplicationFont
(
path
);
}
}
...
...
linphone-desktop/ui/modules/Common/Form/CheckBoxText.qml
View file @
3c9afa3d
...
...
@@ -30,6 +30,7 @@ CheckBox {
verticalAlignment
:
Text
.
AlignVCenter
}
font.pointSize
:
CheckBoxTextStyle
.
fontSize
hoverEnabled
:
true
indicator
:
Rectangle
{
...
...
linphone-desktop/ui/modules/Common/Styles/Form/CheckBoxTextStyle.qml
View file @
3c9afa3d
...
...
@@ -6,6 +6,7 @@ import Common 1.0
// =============================================================================
QtObject
{
property
int
fontSize
:
10
property
int
radius
:
3
property
int
size
:
18
...
...
linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml
View file @
3c9afa3d
...
...
@@ -7,160 +7,167 @@ import Linphone 1.0
import
App
.
Styles
1.0
// ============================================================================
// ============================================================================
MenuBar
{
id
:
container
MenuBar
{
id
:
container
// --------------------------------------------------------------------------
// --------------------------------------------------------------------------
property
bool
hide
:
false
// --------------------------------------------------------------------------
// Workaround to hide toolbar.
// Use private properties of MenuBar.
__contentItem.height
:
hide
?
0
:
MainWindowMenuBarStyle
.
height
__contentItem.transform
:
Scale
{
yScale
:
Number
(
!
hide
)
}
// --------------------------------------------------------------------------
style
:
MenuBarStyle
{
background
:
Rectangle
{
color
:
MainWindowMenuBarStyle
.
color
Rectangle
{
anchors.bottom
:
parent
.
bottom
color
:
MainWindowMenuBarStyle
.
separator
.
color
height
:
MainWindowMenuBarStyle
.
separator
.
height
width
:
parent
.
width
}
}
menuStyle
:
MenuStyle
{
frame
:
Item
{}
property
bool
hide
:
false
itemDelegate
{
background
:
Rectangle
{
color
:
(
styleData
.
selected
||
styleData
.
open
)
?
MainWindowMenuBarStyle
.
subMenu
.
color
.
selected
:
MainWindowMenuBarStyle
.
subMenu
.
color
.
normal
}
// --------------------------------------------------------------------------
label
:
Label
{
color
:
styleData
.
selected
?
MainWindowMenuBarStyle
.
subMenu
.
text
.
color
.
selected
:
MainWindowMenuBarStyle
.
subMenu
.
text
.
color
.
normal
text
:
styleData
.
text
}
// Workaround to hide toolbar.
// Use private properties of MenuBar.
shortcut
:
Label
{
color
:
styleData
.
selected
?
MainWindowMenuBarStyle
.
subMenu
.
text
.
color
.
selected
:
MainWindowMenuBarStyle
.
subMenu
.
text
.
color
.
normal
text
:
styleData
.
shortcut
}
}
}
itemDelegate
:
Item
{
implicitHeight
:
menuItem
.
height
+
MainWindowMenuBarStyle
.
separator
.
spacing
implicitWidth
:
menuItem
.
width
Item
{
id
:
menuItem
implicitHeight
:
text
.
height
+
MainWindowMenuBarStyle
.
menu
.
text
.
verticalMargins
*
2
implicitWidth
:
text
.
width
+
MainWindowMenuBarStyle
.
menu
.
text
.
horizontalMargins
*
2
Text
{
id
:
text
anchors.centerIn
:
parent
color
:
styleData
.
open
?
MainWindowMenuBarStyle
.
menu
.
text
.
color
.
selected
:
MainWindowMenuBarStyle
.
menu
.
text
.
color
.
normal
text
:
formatMnemonic
(
styleData
.
text
,
styleData
.
underlineMnemonic
)
}
Rectangle
{
anchors.bottom
:
parent
.
bottom
color
:
MainWindowMenuBarStyle
.
menu
.
indicator
.
color
visible
:
styleData
.
open
height
:
MainWindowMenuBarStyle
.
menu
.
indicator
.
height
width
:
parent
.
width
}
}
}
}
// --------------------------------------------------------------------------
Menu
{
title
:
qsTr
(
'
options
'
)
MenuItem
{
shortcut
:
'
Ctrl+P
'
text
:
qsTr
(
'
settings
'
)
onTriggered
:
{
var
window
=
App
.
getSettingsWindow
()
if
(
window
.
visibility
===
Window
.
Minimized
)
{
window
.
visibility
=
Window
.
AutomaticVisibility
}
else
{
window
.
setVisible
(
true
)
}
}
}
MenuSeparator
{}
MenuItem
{
shortcut
:
StandardKey
.
Quit
text
:
qsTr
(
'
quit
'
)
onTriggered
:
Qt
.
quit
()
}
}
Menu
{
title
:
qsTr
(
'
tools
'
)
MenuItem
{
text
:
qsTr
(
'
audioAssistant
'
)
}
MenuSeparator
{}
MenuItem
{
text
:
qsTr
(
'
importContacts
'
)
}
MenuItem
{
text
:
qsTr
(
'
exportContacts
'
)
}
}
Menu
{
title
:
qsTr
(
'
help
'
)
MenuItem
{
shortcut
:
StandardKey
.
HelpContents
text
:
qsTr
(
'
about
'
)
}
MenuSeparator
{}
MenuItem
{
text
:
qsTr
(
'
checkForUpdates
'
)
}
}
}
__contentItem.height
:
hide
?
0
:
MainWindowMenuBarStyle
.
height
__contentItem.transform
:
Scale
{
yScale
:
Number
(
!
hide
)
}
// --------------------------------------------------------------------------
style
:
MenuBarStyle
{
background
:
Rectangle
{
color
:
MainWindowMenuBarStyle
.
color
Rectangle
{
anchors.bottom
:
parent
.
bottom
color
:
MainWindowMenuBarStyle
.
separator
.
color
height
:
MainWindowMenuBarStyle
.
separator
.
height
width
:
parent
.
width
}
}
menuStyle
:
MenuStyle
{
id
:
menuStyle
font.pointSize
:
MainWindowMenuBarStyle
.
subMenu
.
text
.
fontSize
frame
:
Item
{}
itemDelegate
{
background
:
Rectangle
{
color
:
(
styleData
.
selected
||
styleData
.
open
)
?
MainWindowMenuBarStyle
.
subMenu
.
color
.
selected
:
MainWindowMenuBarStyle
.
subMenu
.
color
.
normal
}
label
:
Label
{
color
:
styleData
.
selected
?
MainWindowMenuBarStyle
.
subMenu
.
text
.
color
.
selected
:
MainWindowMenuBarStyle
.
subMenu
.
text
.
color
.
normal
font
:
menuStyle
.
font
text
:
styleData
.
text
}
shortcut
:
Label
{
color
:
styleData
.
selected
?
MainWindowMenuBarStyle
.
subMenu
.
text
.
color
.
selected
:
MainWindowMenuBarStyle
.
subMenu
.
text
.
color
.
normal
font
:
menuStyle
.
font
text
:
styleData
.
shortcut
}
}
}
itemDelegate
:
Item
{
implicitHeight
:
menuItem
.
height
+
MainWindowMenuBarStyle
.
separator
.
spacing
implicitWidth
:
menuItem
.
width
Item
{
id
:
menuItem
implicitHeight
:
text
.
height
+
MainWindowMenuBarStyle
.
menu
.
text
.
verticalMargins
*
2
implicitWidth
:
text
.
width
+
MainWindowMenuBarStyle
.
menu
.
text
.
horizontalMargins
*
2
Text
{
id
:
text
anchors.centerIn
:
parent
color
:
styleData
.
open
?
MainWindowMenuBarStyle
.
menu
.
text
.
color
.
selected
:
MainWindowMenuBarStyle
.
menu
.
text
.
color
.
normal
font.pointSize
:
MainWindowMenuBarStyle
.
menu
.
text
.
fontSize
text
:
formatMnemonic
(
styleData
.
text
,
styleData
.
underlineMnemonic
)
}
Rectangle
{
anchors.bottom
:
parent
.
bottom
color
:
MainWindowMenuBarStyle
.
menu
.
indicator
.
color
visible
:
styleData
.
open
height
:
MainWindowMenuBarStyle
.
menu
.
indicator
.
height
width
:
parent
.
width
}
}
}
}
// --------------------------------------------------------------------------
Menu
{
title
:
qsTr
(
'
options
'
)
MenuItem
{
shortcut
:
'
Ctrl+P
'
text
:
qsTr
(
'
settings
'
)
onTriggered
:
{
var
window
=
App
.
getSettingsWindow
()
if
(
window
.
visibility
===
Window
.
Minimized
)
{
window
.
visibility
=
Window
.
AutomaticVisibility
}
else
{
window
.
setVisible
(
true
)
}
}
}
MenuSeparator
{}
MenuItem
{
shortcut
:
StandardKey
.
Quit
text
:
qsTr
(
'
quit
'
)
onTriggered
:
Qt
.
quit
()
}
}
Menu
{
title
:
qsTr
(
'
tools
'
)
MenuItem
{
text
:
qsTr
(
'
audioAssistant
'
)
}
MenuSeparator
{}
MenuItem
{
text
:
qsTr
(
'
importContacts
'
)
}
MenuItem
{
text
:
qsTr
(
'
exportContacts
'
)
}
}
Menu
{
title
:
qsTr
(
'
help
'
)
MenuItem
{
shortcut
:
StandardKey
.
HelpContents
text
:
qsTr
(
'
about
'
)
}
MenuSeparator
{}
MenuItem
{
text
:
qsTr
(
'
checkForUpdates
'
)
}
}
}
linphone-desktop/ui/views/App/Styles/Main/Assistant/AssistantAbstractViewStyle.qml
View file @
3c9afa3d
...
...
@@ -20,7 +20,7 @@ QtObject {
property
QtObject
description
:
QtObject
{
property
color
color
:
Colors
.
g
property
int
fontSize
:
1
0
property
int
fontSize
:
1
1
}
property
QtObject
title
:
QtObject
{
...
...
linphone-desktop/ui/views/App/Styles/Main/ContactsStyle.qml
View file @
3c9afa3d
...
...
@@ -48,7 +48,7 @@ QtObject {
property
QtObject
username
:
QtObject
{
property
color
color
:
Colors
.
j
property
int
fontSize
:
9
property
int
fontSize
:
10
property
int
width
:
220
}
}
...
...
linphone-desktop/ui/views/App/Styles/Main/MainWindowMenuBarStyle.qml
View file @
3c9afa3d
...
...
@@ -11,6 +11,7 @@ QtObject {
property
QtObject
menu
:
QtObject
{
property
QtObject
text
:
QtObject
{
property
int
fontSize
:
10
property
int
horizontalMargins
:
9
property
int
verticalMargins
:
4
...
...
@@ -39,6 +40,8 @@ QtObject {
}
property
QtObject
text
:
QtObject
{
property
int
fontSize
:
10
property
QtObject
color
:
QtObject
{
property
color
selected
:
Colors
.
k
property
color
normal
:
Colors
.
b
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment