Skip to content
This repository has been archived by the owner on May 16, 2020. It is now read-only.

Commit

Permalink
dpi f
Browse files Browse the repository at this point in the history
  • Loading branch information
@alamminsalo
alamminsalo committed Feb 17, 2016
1 parent 6320cb5 commit 0a7958c
Show file tree
Hide file tree
Showing 19 changed files with 37 additions and 33 deletions.
2 changes: 1 addition & 1 deletion orion.pro.user → orion.pro.user.c67d438
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.6.0, 2016-02-09T21:17:04. -->
<!-- Written by QtCreator 3.6.0, 2016-02-13T16:06:52. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
Expand Down
4 changes: 2 additions & 2 deletions src/qml/PlayerView.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ Item {
Text {
id: _label
text: "No stream currently playing"
font.pixelSize: dp(40)
font.pointSize: dp(Styles.bigFont)
font.family: "Droid Sans"
color: Styles.iconColor
anchors.centerIn: parent
Expand All @@ -350,7 +350,7 @@ Item {
id: spinner
visible: false
anchors.centerIn: parent
iconSize: dp(100)
iconSize: dp(80)
}


Expand Down
8 changes: 4 additions & 4 deletions src/qml/SearchView.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Item {
selectionColor: Styles.purple
focus: true
selectByMouse: true
font.pixelSize: dp(Styles.titleFont.bigger)
font.pointSize: dp(Styles.titleFont.bigger)


verticalAlignment: Text.AlignVCenter
Expand All @@ -126,7 +126,7 @@ Item {
Icon {
id: _button
icon: "search"
iconSize: dp(20)
iconSize: dp(18)
anchors {
top: parent.top
bottom: parent.bottom
Expand All @@ -149,7 +149,7 @@ Item {

SpinnerIcon {
id: _spinner
iconSize: dp(20)
iconSize: dp(18)
anchors {
top: parent.top
bottom: parent.bottom
Expand Down Expand Up @@ -246,7 +246,7 @@ Item {
Text {
id: _label
text: "Search for channels"
font.pixelSize: dp(40)
font.pointSize: dp(Styles.bigFont)
font.family: "Droid Sans"
color: Styles.iconColor
anchors.centerIn: parent
Expand Down
6 changes: 3 additions & 3 deletions src/qml/components/Channel.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Rectangle {

SpinnerIcon {
id:_spinner
iconSize: dp(38)
iconSize: dp(30)
anchors.fill: parent
}

Expand Down Expand Up @@ -91,7 +91,7 @@ Rectangle {
id: favIcon
icon: "fav"
opacity: favourite ? 1 : 0
iconSize: dp(24)
iconSize: dp(20)
iconColor: Styles.purple
anchors {
top: container.top
Expand Down Expand Up @@ -129,7 +129,7 @@ Rectangle {
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
font.family: "Droid Sans"
font.pixelSize: dp(Styles.titleFont.smaller)
font.pointSize: dp(Styles.titleFont.smaller)
wrapMode: Text.WordWrap
renderType: Text.NativeRendering
}
Expand Down
1 change: 1 addition & 0 deletions src/qml/components/ChannelGrid.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ GridView {

id: root

highlightFollowsCurrentItem: false
cellHeight: dp(200)
maximumFlickVelocity: 800
cellWidth: cellHeight
Expand Down
4 changes: 2 additions & 2 deletions src/qml/components/ComboBox.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Rectangle {
anchors.centerIn: parent
color: Styles.textColor
font.family: "Droid Sans"
font.pixelSize: dp(Styles.titleFont.smaller)
font.pointSize: dp(Styles.titleFont.smaller)
font.bold: true
renderType: Text.NativeRendering
}
Expand Down Expand Up @@ -133,7 +133,7 @@ Rectangle {
anchors.centerIn: parent
color: Styles.textColor
font.family: "Droid Sans"
font.pixelSize: dp(Styles.titleFont.smaller)
font.pointSize: dp(Styles.titleFont.smaller)
renderType: Text.NativeRendering
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/qml/components/ContextMenu.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Menu {
Icon {
id: _icon
icon: styleData.text.split(";")[1]
iconSize: dp(16)
iconSize: dp(12)
iconColor: styleData.enabled ? Styles.iconColor : Styles.disabled
anchors {
top: parent.top
Expand All @@ -48,7 +48,7 @@ Menu {
id:_label
text: styleData.text.split(";")[0]
color: styleData.enabled ? Styles.textColor : Styles.disabled
font.pixelSize: dp(20)
font.pointSize: dp(Styles.titleFont.smaller)
verticalAlignment: Text.AlignVCenter
anchors {
top: _icon.top
Expand Down
2 changes: 1 addition & 1 deletion src/qml/components/Icon.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Rectangle {

Text {
anchors.centerIn: parent
font.pixelSize: iconSize ? iconSize : root.height
font.pointSize: iconSize ? iconSize : root.height
color: iconColor
font.family: "FontAwesome"
verticalAlignment: Text.AlignVCenter
Expand Down
4 changes: 2 additions & 2 deletions src/qml/components/Notification.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Window {
font.family: "Droid Sans"
wrapMode: Text.WordWrap
font.bold: true
font.pixelSize: Dpi.scale(Styles.titleFont.bigger)
font.pointSize: Dpi.scale(Styles.titleFont.bigger)
renderType: Text.NativeRendering
}

Expand All @@ -125,7 +125,7 @@ Window {
text: root.description
wrapMode: Text.WordWrap
color: Styles.textColor
font.pixelSize: Dpi.scale(Styles.titleFont.smaller)
font.pointSize: Dpi.scale(Styles.titleFont.smaller)
font.family: "Droid Sans"
renderType: Text.NativeRendering
}
Expand Down
4 changes: 2 additions & 2 deletions src/qml/components/OptionCheckbox.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Item {
Text {
font.family: "Droid Sans"
color: Styles.textColor
font.pixelSize: dp(Styles.titleFont.bigger)
font.pointSize: dp(Styles.titleFont.bigger)
text: root.text
anchors {
left: parent.left
Expand Down Expand Up @@ -49,7 +49,7 @@ Item {
Icon {
icon: "check"
anchors.fill: parent
iconSize: dp(24)
iconSize: dp(20)
visible: root.checked
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/qml/components/OptionCombo.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Item {
Text {
font.family: "Droid Sans"
color: Styles.textColor
font.pixelSize: dp(Styles.titleFont.bigger)
font.pointSize: dp(Styles.titleFont.bigger)
text: root.text
anchors {
left: parent.left
Expand Down
4 changes: 2 additions & 2 deletions src/qml/components/OptionTextInput.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Item {
Text {
font.family: "Droid Sans"
color: Styles.textColor
font.pixelSize: (Styles.titleFont.bigger)
font.pointSize: (Styles.titleFont.bigger)
text: root.text
anchors {
left: parent.left
Expand Down Expand Up @@ -57,7 +57,7 @@ Item {
selectionColor: Styles.purple
focus: true
selectByMouse: true
font.pixelSize: dp(Styles.titleFont.bigger)
font.pointSize: dp(Styles.titleFont.bigger)
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
inputMask: mask
Expand Down
2 changes: 1 addition & 1 deletion src/qml/components/PlayerHeader.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Item {
id: _text
anchors.centerIn: parent
color: Styles.textColor
font.pixelSize: dp(30)
font.pointSize: dp(Styles.bigFont)
text: root.text
font.family: "Droid Sans"
z: root.z + 1
Expand Down
2 changes: 1 addition & 1 deletion src/qml/components/PurpleButton.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Rectangle {
anchors.centerIn: parent
color: Styles.textColor
text: root.text
font.pixelSize: dp(Styles.button.size)
font.pointSize: dp(Styles.button.size)
renderType: Text.NativeRendering
}

Expand Down
4 changes: 2 additions & 2 deletions src/qml/components/Ribbon.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Rectangle {
property bool isSelected: false
property string iconStr
property int borderWidth: 6
property int iconSize: 20
property int iconSize: Styles.iconSize
property bool highlightOn: false
property bool iconRotated: false

Expand Down Expand Up @@ -74,7 +74,7 @@ Rectangle {
font.bold: true
font.family: "Droid Sans"
color: Styles.iconColor
font.pixelSize: dp(Styles.titleFont.bigger)
font.pointSize: dp(Styles.titleFont.bigger)
renderType: Text.NativeRendering
}

Expand Down
4 changes: 2 additions & 2 deletions src/qml/components/Tooltip.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Window {
SpinnerIcon {
id:_spinner
anchors.fill: parent
iconSize: dp(64)
iconSize: dp(60)
}

Image {
Expand Down Expand Up @@ -51,7 +51,7 @@ Window {
id: text
color: Styles.textColor
text: root.text
font.pixelSize: dp(Styles.titleFont.smaller)
font.pointSize: dp(Styles.titleFont.smaller)
font.family: "Droid Sans"
anchors{
bottom: parent.bottom
Expand Down
2 changes: 1 addition & 1 deletion src/qml/components/ViewHeader.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Rectangle {
}

color: Style.textColor
font.pixelSize: dp(30)
font.pointSize: dp(Style.bigFont)
text: root.text
font.family: "Droid Sans"
z: root.z + 1
Expand Down
2 changes: 1 addition & 1 deletion src/qml/style/Dpi.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Item {

function scale(val){
//return val;
return Math.ceil(val * 0.7)
return Math.ceil(val * 0.666)
}

}
Expand Down
9 changes: 6 additions & 3 deletions src/qml/styles.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,15 @@ var disabled = "#444444"

var white = "#ffffff"

var iconSize = 16

var titleFont = {
smaller: 18,
bigger: 22
smaller: 14,
bigger: 16
}

var bigFont = 22

var button = {
size: 22
size: 18
}

0 comments on commit 0a7958c

Please sign in to comment.