Skip to content
Permalink
Browse files

More style singleton

  • Loading branch information
martonborzak committed Jan 1, 2020
1 parent bf3acaa commit 6eb56e2cc9a41c3a14fb2dbe8b495212db4b0480
Showing with 56 additions and 16 deletions.
  1. +1 βˆ’0 basic_ui/ClosingScreen.qml
  2. +1 βˆ’0 basic_ui/ContextMenu.qml
  3. +1 βˆ’0 basic_ui/ContextMenuIcon.qml
  4. +1 βˆ’0 basic_ui/CustomButtonState.qml
  5. +1 βˆ’1 basic_ui/CustomImageLoader.qml
  6. +1 βˆ’0 basic_ui/MiniMediaPlayer.qml
  7. +1 βˆ’0 basic_ui/Notification.qml
  8. +1 βˆ’0 basic_ui/NotificationDrawer.qml
  9. +1 βˆ’0 basic_ui/Profiles.qml
  10. +1 βˆ’0 basic_ui/Tag.qml
  11. +1 βˆ’0 basic_ui/settings/Devices.qml
  12. +1 βˆ’0 basic_ui/settings/WifiNetworkListElement.qml
  13. +16 βˆ’15 components/ButtonBase.qml
  14. +1 βˆ’0 components/blind/ui/Button.qml
  15. +1 βˆ’0 components/blind/ui/Card.qml
  16. +1 βˆ’0 components/climate/ui/Button.qml
  17. +1 βˆ’0 components/climate/ui/Card.qml
  18. +1 βˆ’0 components/climate/ui/ContextMenu.qml
  19. +1 βˆ’0 components/light/ui/CardColor.qml
  20. +1 βˆ’0 components/light/ui/CardDimmable.qml
  21. +1 βˆ’0 components/light/ui/CardSwitch.qml
  22. +1 βˆ’0 components/media_player/ui/AlbumView.qml
  23. +1 βˆ’0 components/media_player/ui/Button.qml
  24. +1 βˆ’0 components/media_player/ui/Card.qml
  25. +1 βˆ’0 components/media_player/ui/CardHome.qml
  26. +1 βˆ’0 components/media_player/ui/CardPlaylists.qml
  27. +1 βˆ’0 components/media_player/ui/CardSearch.qml
  28. +1 βˆ’0 components/remote/ui/ir/Button.qml
  29. +1 βˆ’0 components/remote/ui/ir/Card.qml
  30. +1 βˆ’0 components/remote/ui/ir/CardButtons.qml
  31. +1 βˆ’0 components/remote/ui/ir/CardChannels.qml
  32. +1 βˆ’0 components/weather/ui/Button.qml
  33. +1 βˆ’0 components/weather/ui/Card.qml
  34. +7 βˆ’0 style.qml
  35. +1 βˆ’0 wifiSetup.qml
@@ -22,6 +22,7 @@

import QtQuick 2.11
import Launcher 1.0
import Style 1.0

Rectangle {
id: closingScreen
@@ -21,6 +21,7 @@
*****************************************************************************/

import QtQuick 2.11
import Style 1.0

Rectangle {
id: main
@@ -21,6 +21,7 @@
*****************************************************************************/

import QtQuick 2.11
import Style 1.0

Rectangle {
id: circleButton
@@ -21,6 +21,7 @@
*****************************************************************************/

import QtQuick 2.9
import Style 1.0

Rectangle {

@@ -71,4 +71,4 @@ Item {
}
}
}
}
}
@@ -23,6 +23,7 @@
import QtQuick 2.11
import QtQuick.Controls 2.5
import QtGraphicalEffects 1.0
import Style 1.0

import "qrc:/basic_ui" as BasicUI

@@ -23,6 +23,7 @@
import QtQuick 2.11
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import Style 1.0

import "qrc:/basic_ui" as BasicUI

@@ -23,6 +23,7 @@
import QtQuick 2.11
import QtQuick.Controls 2.5
import QtGraphicalEffects 1.0
import Style 1.0

import "qrc:/basic_ui" as BasicUI

@@ -22,6 +22,7 @@

import QtQuick 2.11
import QtQuick.Controls 2.5
import Style 1.0

Rectangle {
id: profiles
@@ -20,6 +20,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*****************************************************************************/
import QtQuick 2.0
import Style 1.0

Rectangle {
id: main
@@ -22,6 +22,7 @@

import QtQuick 2.11
import QtQuick.Controls 2.5
import Style 1.0

import "qrc:/basic_ui" as BasicUI

@@ -22,6 +22,7 @@

import QtQuick 2.11
import QtQuick.Controls 2.5
import Style 1.0

Rectangle {
id: element
@@ -76,17 +76,17 @@ Rectangle {
// LAYER MASK TO MASK EVERYTHING THAT IS INSIDE THE BUTTON
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

layer.enabled: true
layer.effect: OpacityMask {
maskSource: Item {
width: buttonContainer.width
height: buttonContainer.height
Rectangle {
anchors.fill: parent
radius: Style.cornerRadius
}
}
}
// layer.enabled: true
// layer.effect: OpacityMask {
// maskSource: Item {
// width: buttonContainer.width
// height: buttonContainer.height
// Rectangle {
// anchors.fill: parent
// radius: Style.cornerRadius
// }
// }
// }

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// STATES
@@ -186,10 +186,11 @@ Rectangle {
anchors.left: parent.left
anchors.leftMargin: 126
anchors.verticalCenter: parent.verticalCenter
font.family: "Open Sans"
font.weight: Font.Normal
font.pixelSize: 27
lineHeight: 1
// font.family: "Open Sans"
// font.weight: Font.Normal
// font.pixelSize: 27
// lineHeight: 1
font: Style.buttonFont
}

Text {
@@ -23,6 +23,7 @@
import QtQuick 2.11
import QtQuick.Controls 2.5
import QtGraphicalEffects 1.0
import Style 1.0

import Entity.Blind 1.0

@@ -23,6 +23,7 @@
import QtQuick 2.11
import QtQuick.Controls 2.5
import QtGraphicalEffects 1.0
import Style 1.0

import Entity.Blind 1.0

@@ -23,6 +23,7 @@
import QtQuick 2.11
//import QtQuick.Controls 2.5
//import QtGraphicalEffects 1.0
import Style 1.0

import "qrc:/scripts/helper.js" as JSHelper
import "qrc:/components" as Comp
@@ -22,6 +22,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtGraphicalEffects 1.0
import Style 1.0

import Entity.Climate 1.0

@@ -20,6 +20,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*****************************************************************************/
import QtQuick 2.11
import Style 1.0

Rectangle {
id: main
@@ -23,6 +23,7 @@
import QtQuick 2.11
import QtQuick.Controls 2.5
import QtGraphicalEffects 1.0
import Style 1.0

import "qrc:/basic_ui" as BasicUI

@@ -23,6 +23,7 @@
import QtQuick 2.11
import QtQuick.Controls 2.5
import QtGraphicalEffects 1.0
import Style 1.0

import "qrc:/basic_ui" as BasicUI

@@ -23,6 +23,7 @@
import QtQuick 2.11
import QtQuick.Controls 2.5
import QtGraphicalEffects 1.0
import Style 1.0

import "qrc:/basic_ui" as BasicUI

@@ -22,6 +22,7 @@

import QtQuick 2.12
import QtQuick.Controls 2.12
import Style 1.0

import MediaPlayerUtils 1.0

@@ -22,6 +22,7 @@
import QtQuick 2.12
import QtQuick.Controls 2.12
import QtGraphicalEffects 1.0
import Style 1.0

import "qrc:/scripts/helper.js" as JSHelper
import "qrc:/components" as Comp
@@ -21,6 +21,7 @@
*****************************************************************************/
import QtQuick 2.12
import QtQuick.Controls 2.12
import Style 1.0

import Entity.MediaPlayer 1.0

@@ -22,6 +22,7 @@

import QtQuick 2.0
import Entity.MediaPlayer 1.0
import Style 1.0

import "qrc:/basic_ui" as BasicUI

@@ -21,6 +21,7 @@
*****************************************************************************/
import QtQuick 2.12
import QtQuick.Controls 2.12
import Style 1.0

import "qrc:/basic_ui" as BasicUI

@@ -21,6 +21,7 @@
*****************************************************************************/
import QtQuick 2.12
import QtQuick.Controls 2.12
import Style 1.0

import "qrc:/basic_ui" as BasicUI

@@ -20,6 +20,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*****************************************************************************/
import QtQuick 2.11
import Style 1.0

import Entity.Remote 1.0

@@ -23,6 +23,7 @@
import QtQuick 2.11
import QtQuick.Controls 2.5
import QtGraphicalEffects 1.0
import Style 1.0

import Entity.Remote 1.0

@@ -20,6 +20,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*****************************************************************************/
import QtQuick 2.11
import Style 1.0

import Entity.Remote 1.0

@@ -21,6 +21,7 @@
*****************************************************************************/
import QtQuick 2.11
import QtGraphicalEffects 1.0
import Style 1.0

import Entity.Remote 1.0

@@ -22,6 +22,7 @@
import QtQuick 2.11
import QtQuick.Controls 2.5
import QtGraphicalEffects 1.0
import Style 1.0

import "qrc:/scripts/helper.js" as JSHelper
import "qrc:/basic_ui" as BasicUI
@@ -22,6 +22,7 @@
import QtQuick 2.11
import QtQuick.Controls 2.5
import QtGraphicalEffects 1.0
import Style 1.0

import "qrc:/basic_ui" as BasicUI

@@ -52,4 +52,11 @@ QtObject {
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// FONT STYLES
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

property font buttonFont: Qt.font({
family: "Open Sans",
weight: Font.Normal,
pixelSize: 27,
lineHeight: 1
})
}
@@ -23,6 +23,7 @@
import QtQuick 2.11
import QtQuick.Controls 2.5
import QtGraphicalEffects 1.0
import Style 1.0

import "qrc:/basic_ui" as BasicUI

0 comments on commit 6eb56e2

Please sign in to comment.
You can’t perform that action at this time.