Permalink
Browse files

qrc: Update script

  • Loading branch information...
3unjee committed Nov 1, 2018
1 parent 1d63e0c commit 5e762452322dc80f1e86d20cb228b5e5be4d8c0c
@@ -73,7 +73,7 @@ Or the console:
1\. Generate the qrc file:

cd dist
sh qrc.sh <deploy | clean>
sh qrc.sh <qt4 | qt5 | clean> <win32 | osx | linux> [deploy]

2\. Build MotionBox:

@@ -125,9 +125,9 @@ cd dist

if [ "$3" = "deploy" ]; then

sh qrc.sh $QT_SELECT deploy
sh qrc.sh $QT_SELECT $2 deploy
else
sh qrc.sh $QT_SELECT
sh qrc.sh $QT_SELECT $2
fi

echo ""
@@ -2166,6 +2166,17 @@ Item

//---------------------------------------------------------------------------------------------

function updateColor()
{
if (wall.isActive)
{
window.color = st.window_color;
}
else window.color = "black";
}

//---------------------------------------------------------------------------------------------

function updateScreenDim()
{
if (window.isActive && panelTracks.isExpanded == false && player.isPlaying)
@@ -32,17 +32,7 @@ PageAboutText
// Events
//---------------------------------------------------------------------------------------------

Component.onCompleted:
{
applyColor();
Component.onCompleted: scrollArea.value = panelApplication.pCreditsValue

scrollArea.value = panelApplication.pCreditsValue;
}

Component.onDestruction:
{
restoreColor();

panelApplication.pCreditsValue = scrollArea.value;
}
Component.onDestruction: panelApplication.pCreditsValue = scrollArea.value
}
@@ -34,17 +34,10 @@ PageAboutText

Component.onCompleted:
{
applyColor();

scrollArea.value = panelApplication.pMessageValue;

online.loadMessage();
}

Component.onDestruction:
{
restoreColor();

panelApplication.pMessageValue = scrollArea.value;
}
Component.onDestruction: panelApplication.pMessageValue = scrollArea.value
}
@@ -45,24 +45,6 @@ Item

anchors.fill: parent

//---------------------------------------------------------------------------------------------
// Functions
//---------------------------------------------------------------------------------------------

function applyColor()
{
panelApplication.pAnimate = true;

panelApplication.color = st.pageAboutText_color;
}

function restoreColor()
{
panelApplication.pAnimate = false;

panelApplication.color = st.panel_color;
}

//---------------------------------------------------------------------------------------------
// Childs
//---------------------------------------------------------------------------------------------
@@ -35,6 +35,8 @@ Item

st.applyStyle(index);

gui.updateColor();

local.style = index;
}

@@ -34,8 +34,6 @@ Panel
//---------------------------------------------------------------------------------------------
// Private

property bool pAnimate: false

property int pMessageValue: 0
property int pCreditsValue: 0

@@ -113,18 +111,6 @@ Panel

onActiveFocusChanged: if (activeFocus) loader.item.forceActiveFocus()

//---------------------------------------------------------------------------------------------
// Animations
//---------------------------------------------------------------------------------------------

Behavior on color
{
ColorAnimation
{
duration: (pAnimate) ? st.ms500 : 0
}
}

//---------------------------------------------------------------------------------------------
// Keys
//---------------------------------------------------------------------------------------------
@@ -245,14 +245,7 @@ Item
// Events
//-------------------------------------------------------------------------------------

onIsActiveChanged:
{
if (isActive)
{
window.color = st.window_color;
}
else window.color = "black";
}
onIsActiveChanged: gui.updateColor()

onIsExposedChanged: local.macro = isExposed

@@ -102,11 +102,6 @@ Style
property int sliderStream_intervalA: 10000
property int sliderStream_intervalB: 30000

//---------------------------------------------------------------------------------------------
// PageAboutText

property color pageAboutText_color: "#323232"

//---------------------------------------------------------------------------------------------
// ComponentDiscover

@@ -17,13 +17,15 @@ content="../content"
# Syntax
#--------------------------------------------------------------------------------------------------

if [ $# != 1 -a $# != 2 ] \
if [ $# != 2 -a $# != 3 ] \
|| \
[ $1 != "qt4" -a $1 != "qt5" -a $1 != "clean" ] \
|| \
[ $# = 2 -a "$2" != "deploy" ]; then
[ $2 != "win32" -a $2 != "osx" -a $2 != "linux" ] \
|| \
[ $# = 3 -a "$3" != "deploy" ]; then

echo "Usage: qrc <qt4 | qt5 | clean> [deploy]"
echo "Usage: qrc <qt4 | qt5 | clean> <win32 | osx | linux> [deploy]"

exit 1
fi
@@ -32,7 +34,7 @@ fi
# Clean
#--------------------------------------------------------------------------------------------------

if [ $1 = "clean" ] || [ "$2" = "deploy" ]; then
if [ $1 = "clean" ] || [ "$3" = "deploy" ]; then

echo "CLEANING"

@@ -63,7 +65,7 @@ cp "$content"/*.qml qrc
# Content
#--------------------------------------------------------------------------------------------------

if [ "$2" = "deploy" ]; then
if [ "$3" = "deploy" ]; then

echo "COPYING pictures"

@@ -82,9 +84,16 @@ echo ""
# Deployer
#--------------------------------------------------------------------------------------------------

if [ $1 = "qt4" ]; then
if [ $1 = "qt5" ]; then

if [ $2 = "win32" ]; then

"$Sky"/deploy/deployer qrc 1.1 MotionBox.qrc
version=2.11
else
version=2.7
fi
else
"$Sky"/deploy/deployer qrc 2.7 MotionBox.qrc
version=1.1
fi

"$Sky"/deploy/deployer qrc $version MotionBox.qrc

0 comments on commit 5e76245

Please sign in to comment.