From 2dca04fe351891e0186c30cd6745ec080b81ebb8 Mon Sep 17 00:00:00 2001 From: Oscar Andreasson Date: Thu, 18 Jun 2015 21:27:32 -0700 Subject: [PATCH] Renamed .png files README.md: added Fixed images.qrc Fixed qmldir --- README.md | 16 +++++++++ .../{ => components}/BigForecastIcon.qml | 0 weatherinfo/{ => components}/ForecastIcon.qml | 0 weatherinfo/{ => components}/WeatherIcon.qml | 2 +- .../{ => icons}/weather-few-clouds.png | Bin weatherinfo/{ => icons}/weather-fog.png | Bin weatherinfo/{ => icons}/weather-haze.png | Bin weatherinfo/{ => icons}/weather-icy.png | Bin weatherinfo/{ => icons}/weather-overcast.png | Bin weatherinfo/{ => icons}/weather-showers.png | Bin weatherinfo/{ => icons}/weather-sleet.png | Bin weatherinfo/{ => icons}/weather-snow.png | Bin weatherinfo/{ => icons}/weather-storm.png | Bin .../weather-sunny-very-few-clouds.png | Bin weatherinfo/{ => icons}/weather-sunny.png | Bin .../{ => icons}/weather-thundershower.png | Bin weatherinfo/images.qrc | 34 ++++++++---------- weatherinfo/qmldir | 10 +++--- 18 files changed, 37 insertions(+), 25 deletions(-) create mode 100644 README.md rename weatherinfo/{ => components}/BigForecastIcon.qml (100%) rename weatherinfo/{ => components}/ForecastIcon.qml (100%) rename weatherinfo/{ => components}/WeatherIcon.qml (98%) rename weatherinfo/{ => icons}/weather-few-clouds.png (100%) rename weatherinfo/{ => icons}/weather-fog.png (100%) rename weatherinfo/{ => icons}/weather-haze.png (100%) rename weatherinfo/{ => icons}/weather-icy.png (100%) rename weatherinfo/{ => icons}/weather-overcast.png (100%) rename weatherinfo/{ => icons}/weather-showers.png (100%) rename weatherinfo/{ => icons}/weather-sleet.png (100%) rename weatherinfo/{ => icons}/weather-snow.png (100%) rename weatherinfo/{ => icons}/weather-storm.png (100%) rename weatherinfo/{ => icons}/weather-sunny-very-few-clouds.png (100%) rename weatherinfo/{ => icons}/weather-sunny.png (100%) rename weatherinfo/{ => icons}/weather-thundershower.png (100%) diff --git a/README.md b/README.md new file mode 100644 index 0000000..423cc29 --- /dev/null +++ b/README.md @@ -0,0 +1,16 @@ +QmlMirror +========= + +This is yet another Magic Mirror project I guess. It's designed to run behind +a 2 way mirror, letting light through the mirror and hence showing everything +bright through the mirror. + +Install instructions +-------------------- +1. Run qmake +2. Run make +3. Run make install + +Running instructions +-------------------- +1. qmlscene QmlMirror.qml diff --git a/weatherinfo/BigForecastIcon.qml b/weatherinfo/components/BigForecastIcon.qml similarity index 100% rename from weatherinfo/BigForecastIcon.qml rename to weatherinfo/components/BigForecastIcon.qml diff --git a/weatherinfo/ForecastIcon.qml b/weatherinfo/components/ForecastIcon.qml similarity index 100% rename from weatherinfo/ForecastIcon.qml rename to weatherinfo/components/ForecastIcon.qml diff --git a/weatherinfo/WeatherIcon.qml b/weatherinfo/components/WeatherIcon.qml similarity index 98% rename from weatherinfo/WeatherIcon.qml rename to weatherinfo/components/WeatherIcon.qml index beb1c7a..2a54eba 100644 --- a/weatherinfo/WeatherIcon.qml +++ b/weatherinfo/components/WeatherIcon.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import net.weatherinfo.weatherinfo 1.0 +import net.frozentux.weatherinfo 1.0 Item { id: container diff --git a/weatherinfo/weather-few-clouds.png b/weatherinfo/icons/weather-few-clouds.png similarity index 100% rename from weatherinfo/weather-few-clouds.png rename to weatherinfo/icons/weather-few-clouds.png diff --git a/weatherinfo/weather-fog.png b/weatherinfo/icons/weather-fog.png similarity index 100% rename from weatherinfo/weather-fog.png rename to weatherinfo/icons/weather-fog.png diff --git a/weatherinfo/weather-haze.png b/weatherinfo/icons/weather-haze.png similarity index 100% rename from weatherinfo/weather-haze.png rename to weatherinfo/icons/weather-haze.png diff --git a/weatherinfo/weather-icy.png b/weatherinfo/icons/weather-icy.png similarity index 100% rename from weatherinfo/weather-icy.png rename to weatherinfo/icons/weather-icy.png diff --git a/weatherinfo/weather-overcast.png b/weatherinfo/icons/weather-overcast.png similarity index 100% rename from weatherinfo/weather-overcast.png rename to weatherinfo/icons/weather-overcast.png diff --git a/weatherinfo/weather-showers.png b/weatherinfo/icons/weather-showers.png similarity index 100% rename from weatherinfo/weather-showers.png rename to weatherinfo/icons/weather-showers.png diff --git a/weatherinfo/weather-sleet.png b/weatherinfo/icons/weather-sleet.png similarity index 100% rename from weatherinfo/weather-sleet.png rename to weatherinfo/icons/weather-sleet.png diff --git a/weatherinfo/weather-snow.png b/weatherinfo/icons/weather-snow.png similarity index 100% rename from weatherinfo/weather-snow.png rename to weatherinfo/icons/weather-snow.png diff --git a/weatherinfo/weather-storm.png b/weatherinfo/icons/weather-storm.png similarity index 100% rename from weatherinfo/weather-storm.png rename to weatherinfo/icons/weather-storm.png diff --git a/weatherinfo/weather-sunny-very-few-clouds.png b/weatherinfo/icons/weather-sunny-very-few-clouds.png similarity index 100% rename from weatherinfo/weather-sunny-very-few-clouds.png rename to weatherinfo/icons/weather-sunny-very-few-clouds.png diff --git a/weatherinfo/weather-sunny.png b/weatherinfo/icons/weather-sunny.png similarity index 100% rename from weatherinfo/weather-sunny.png rename to weatherinfo/icons/weather-sunny.png diff --git a/weatherinfo/weather-thundershower.png b/weatherinfo/icons/weather-thundershower.png similarity index 100% rename from weatherinfo/weather-thundershower.png rename to weatherinfo/icons/weather-thundershower.png diff --git a/weatherinfo/images.qrc b/weatherinfo/images.qrc index 3e7a32c..a02d7a7 100644 --- a/weatherinfo/images.qrc +++ b/weatherinfo/images.qrc @@ -1,24 +1,20 @@ - - weather-few-clouds.png - weather-fog.png - weather-haze.png - weather-icy.png - weather-overcast.png - weather-showers.png - weather-sleet.png - weather-snow.png - weather-storm.png - weather-sunny.png - weather-sunny-very-few-clouds.png - weather-thundershower.png - - - BigForecastIcon.qml - ForecastIcon.qml - WeatherIcon.qml - + icons/weather-few-clouds.png + icons/weather-fog.png + icons/weather-haze.png + icons/weather-icy.png + icons/weather-overcast.png + icons/weather-showers.png + icons/weather-sleet.png + icons/weather-snow.png + icons/weather-storm.png + icons/weather-sunny.png + icons/weather-sunny-very-few-clouds.png + icons/weather-thundershower.png + components/BigForecastIcon.qml + components/ForecastIcon.qml + components/WeatherIcon.qml WeatherInfo.qml diff --git a/weatherinfo/qmldir b/weatherinfo/qmldir index e71f123..461fdc8 100644 --- a/weatherinfo/qmldir +++ b/weatherinfo/qmldir @@ -1,10 +1,10 @@ module net.frozentux.weatherinfo plugin WeatherData -plugin AppModel -WeatherInfo 1.0 qrc:///WeatherInfo.qml -BigForecastIcon 1.0 qrc:///components/BigForecastIcon.qml -ForecastIcon 1.0 qrc:///components/ForecastIcon.qml -WeatherIcon 1.0 qrc:///components/WeatherIcon.qml +classname AppModel +WeatherInfo 1.0 qrc:/WeatherInfo.qml +BigForecastIcon 1.0 qrc:/components/BigForecastIcon.qml +ForecastIcon 1.0 qrc:/components/ForecastIcon.qml +WeatherIcon 1.0 qrc:/components/WeatherIcon.qml weather-few-clouds.png 1.0 qrc:///icons/weather-few-clouds.png weather-fog.png 1.0 qrc:///icons/weather-fog.png weather-haze.png 1.0 qrc:///icons/weather-haze.png