mainwindow: update environment variable http_proxy to qt_http_proxy
update the proxy variable http_proxy to be more qt specific.
Note: use http_proxy may cause matrix_gui not able to launch.
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
update the proxy variable http_proxy to be more qt specific.
Note: use http_proxy may cause matrix_gui not able to launch.
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
thermostat_demo_qt5.desktop: add WinType as null
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
Makefile.build: replace qmake2 with qmake
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
add thermostat_demo_qt5.desktop for QT5
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
fix crash problems and update the openweathermap URLs
mainwindow.cpp:
- add default proxy setting
- replace QList iterator with QList index
forecastdatawidget.cpp: add boundary check at ::updateData()
openweathermapdataengine.cpp: use the latset URLs from openweathermap.com
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
mainwindow.cpp:
- add default proxy setting
- replace QList iterator with QList index
forecastdatawidget.cpp: add boundary check at ::updateData()
openweathermapdataengine.cpp: use the latset URLs from openweathermap.com
Signed-off-by: Eric Ruei <e-ruei1@ti.com>
Update to support both Qt 4 and Qt 5
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
Rename SDK Makefile back to Makefile.build
* This insures that Qt users will have qmake generate "Makefile" instead of
App-Makefile which is the expected/default behavior.
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
* This insures that Qt users will have qmake generate "Makefile" instead of
App-Makefile which is the expected/default behavior.
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
Fix make clean issue
* Insure qmake is ran even when doing a clean to insure App-Makefile exist.
Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
* Insure qmake is ran even when doing a clean to insure App-Makefile exist.
Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
Remove obsolete make targets
* Remove make targets calls that no longer exist.
* Also place error statements in a single location.
Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
* Remove make targets calls that no longer exist.
* Also place error statements in a single location.
Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
Update Makefile
* Update Makefile to throw an error if destination directory doesn't exist.
* By default only build release version
* Rename Makefile.build to Makefile
* Have qmake generate App-Makefile as the makefile name.
Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
* Update Makefile to throw an error if destination directory doesn't exist.
* By default only build release version
* Rename Makefile.build to Makefile
* Have qmake generate App-Makefile as the makefile name.
Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
openweathermapdataengine.cpp: Fix error: taking address of temporary
* Fix the error error: taking address of temporary [-fpermissive] by no longer
trying to get an address of a temporary string.
* This string is not being modified or stored so need reason to pass the string
by reference.
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
* Fix the error error: taking address of temporary [-fpermissive] by no longer
trying to get an address of a temporary string.
* This string is not being modified or stored so need reason to pass the string
by reference.
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
Revert "settingscreen: Added a button to the bottom of the network tab to invoke the SDK wifi setup gui"
This reverts commit a47b4ac2d359a62a965f49c4fd05a8fca9e633e3.
This reverts commit a47b4ac2d359a62a965f49c4fd05a8fca9e633e3.
settingscreen: Added a button to the bottom of the network tab to invoke the SDK wifi setup gui
* Same script that is called from matrix
* Same script that is called from matrix
webdata: Removed code for autoconfiguration of proxy.
* By default no proxy will be used and if desired a proxy can be configured through the settings page
* By default no proxy will be used and if desired a proxy can be configured through the settings page
.project: Added Code Composer project
ThermostatDemo.pro.user: .pro.user files are specific to a machine and should
not be tracked
not be tracked
all files: removed debug output
Merge branch 'master' of gitorious.org:thermostat-demo/thermostat-demo
desktop: added description config so it is displayed
Merge branch 'master' of gitorious.org:thermostat-demo/thermostat-demo
thermostat-demo: Remove reference to unused image source
* The images from Oxygen Icon Theme were never used. Therefore, removing the
reference to this image set from the IMAGE-LICENSE file.
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
* The images from Oxygen Icon Theme were never used. Therefore, removing the
reference to this image set from the IMAGE-LICENSE file.
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
Merge branch 'master' of git://gitorious.org/thermostat-demo/thermostat-demo
thermostat-demo: Add license information
* Add license information for the images, library and api that were used.
* Add license file for the thermostat demo.
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
* Add license information for the images, library and api that were used.
* Add license file for the thermostat demo.
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
README: removed possible contributions section, they have been implemented
README: removed possible contributions section, they have been implemented
thermostat-demo: Add initial Makefile.build file
* This file is used to build the thermostat demo from within the TI AMSDK
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
* This file is used to build the thermostat demo from within the TI AMSDK
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
thermostat-demo: Add initial Makefile.build file
* This file is used to build the thermostat demo from within the TI AMSDK
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
* This file is used to build the thermostat demo from within the TI AMSDK
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
thermostat-demo: Tweak Directory
* Move source files into the root directory
* Remove duplicate Matrix description file.
* Remove binary file
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
* Move source files into the root directory
* Remove duplicate Matrix description file.
* Remove binary file
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
thermostat-demo: Tweak Directory
* Move source files into the root directory
* Remove duplicate Matrix description file.
* Remove binary file
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
* Move source files into the root directory
* Remove duplicate Matrix description file.
* Remove binary file
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
images: updated art assets to avoid license conflicts
images: updated art assets to avoid license conflicts
settingscreen: removed remote acces port configuration, did not like
to connect on user defined ports
to connect on user defined ports
settingscreen: removed remote acces port configuration, did not like
to connect on user defined ports
to connect on user defined ports
desc_thermostat_demo: added matrix description page
thermostat_demo: configured to display desc page
thermostat: folder to be placed in /usr/share/matrix-gui-2.0/apps/
thermostat_demo: configured to display desc page
thermostat: folder to be placed in /usr/share/matrix-gui-2.0/apps/
desc_thermostat_demo: added matrix description page
thermostat_demo: configured to display desc page
thermostat: folder to be placed in /usr/share/matrix-gui-2.0/apps/
thermostat_demo: configured to display desc page
thermostat: folder to be placed in /usr/share/matrix-gui-2.0/apps/
remoteaccessmanager: extensive changes to remote access api to allow for
web access.
web access.
remoteaccessmanager: extensive changes to remote access api to allow for
web access.
web access.
remoteaccessmanager: added http server to handle remote access
settingscreen: added port config for remote access manager
remote: folder containing resources for remoteaccessmanager
settingscreen: added port config for remote access manager
remote: folder containing resources for remoteaccessmanager
remoteaccessmanager: added http server to handle remote access
settingscreen: added port config for remote access manager
remote: folder containing resources for remoteaccessmanager
settingscreen: added port config for remote access manager
remote: folder containing resources for remoteaccessmanager
Merge branch 'newschedule'
Merge branch 'newschedule'
openweathermapdataengine: slightly changed parsing code to work with API 2.11
openweathermapdataengine: slightly changed parsing code to work with API 2.11
openweatherdatamap: updated API version to 2.1
openweatherdatamap: updated API version to 2.1
conf: configuration is automatically handled internally on first run
conf: configuration is automatically handled internally on first run
mainwindow: now generates random data if city changes and update fails
weatherwidget: added weatherdata* getter function
weatherwidget: added weatherdata* getter function
mainwindow: now generates random data if city changes and update fails
weatherwidget: added weatherdata* getter function
weatherwidget: added weatherdata* getter function
globalsettings: added proper return values for load and save
globalsettings: added proper return values for load and save
weatherwidget: changed status reporting to indicate when cached data is from
cache: new default cache data for openweathermapdataengine
openweathermapdataengine: adds retrieval date to cache data
mainwindow: modified signals so cache data doesn't appear to come from web
cache: new default cache data for openweathermapdataengine
openweathermapdataengine: adds retrieval date to cache data
mainwindow: modified signals so cache data doesn't appear to come from web
weatherwidget: changed status reporting to indicate when cached data is from
cache: new default cache data for openweathermapdataengine
openweathermapdataengine: adds retrieval date to cache data
mainwindow: modified signals so cache data doesn't appear to come from web
cache: new default cache data for openweathermapdataengine
openweathermapdataengine: adds retrieval date to cache data
mainwindow: modified signals so cache data doesn't appear to come from web
schedulepoint: fixed bug that allowed points to move past temp and pos bounds
schedulepoint: fixed bug that allowed points to move past temp and pos bounds
schedulepoint: column movement operates off of deltas now
* once reenabled a row will continue to move with it's associated column
* once reenabled a row will continue to move with it's associated column
schedulepoint: column movement operates off of deltas now
* once reenabled a row will continue to move with it's associated column
* once reenabled a row will continue to move with it's associated column
schedulescreen: fixed bug that caused crash after adjusting settings
utilities: small change to formatting of 24h time format
utilities: small change to formatting of 24h time format
schedulescreen: fixed bug that caused crash after adjusting settings
utilities: small change to formatting of 24h time format
utilities: small change to formatting of 24h time format
schedulescreen: modified default times for schedulepoints to better reflect a normal schedule
schedulescreen: modified default times for schedulepoints to better reflect a normal schedule
schedulescreen: removed old code from the schedule screen
schedulescreen: removed old code from the schedule screen
schedulescreen: changed time scaling to run from 12:00AM to 11:45PM
* full time range available for day
*fixed bug that caused disabled rows to change with column
schedulepoint: adapted code to properly display new time values
utilities: formatHourString function to return only hour values
* full time range available for day
*fixed bug that caused disabled rows to change with column
schedulepoint: adapted code to properly display new time values
utilities: formatHourString function to return only hour values
schedulescreen: changed time scaling to run from 12:00AM to 11:45PM
* full time range available for day
*fixed bug that caused disabled rows to change with column
schedulepoint: adapted code to properly display new time values
utilities: formatHourString function to return only hour values
* full time range available for day
*fixed bug that caused disabled rows to change with column
schedulepoint: adapted code to properly display new time values
utilities: formatHourString function to return only hour values
schedulescreen: implemented column based select and movement
webdata: removed unnecessary debug output
webdata: removed unnecessary debug output
schedulescreen: implemented column based select and movement
webdata: removed unnecessary debug output
webdata: removed unnecessary debug output
webdata: improved documentation
wundergrounddataengine: added cache flag setting
wundergrounddataengine: added cache flag setting
webdata: improved documentation
wundergrounddataengine: added cache flag setting
wundergrounddataengine: added cache flag setting
webdata: allowed for automatic proxy selection based on internal/external TI
weatherdata: added flag to mark as cached data
settingscreen: add code to allow for displaying correct proxy after autoconf
weatherdata: added flag to mark as cached data
settingscreen: add code to allow for displaying correct proxy after autoconf
webdata: allowed for automatic proxy selection based on internal/external TI
weatherdata: added flag to mark as cached data
settingscreen: add code to allow for displaying correct proxy after autoconf
weatherdata: added flag to mark as cached data
settingscreen: add code to allow for displaying correct proxy after autoconf
schedulescreen: added code to handle setting changes on units
settingscreen: removed unnecessary code.
settingscreen: removed unnecessary code.
schedulescreen: added code to handle setting changes on units
settingscreen: removed unnecessary code.
settingscreen: removed unnecessary code.
main: added better window sizing code
main: added better window sizing code
openweathermapdataengine: added bettererror checking for failure of API
openweathermapdataengine: added bettererror checking for failure of API
openweathermapdataengine: fixed merge error
openweathermapdataengine: fixed merge error
Merge branch 'master' of ssh://github.com/dgerlach/Thermostat-Demo
Conflicts:
ThermostatDemoSource/webdata.cpp
ThermostatDemoSource/webdata.h
ThermostatDemoSource/webdataengine/openweathermapdataengine.cpp
ThermostatDemoSource/webdataengine/webdataengine.cpp
ThermostatDemoSource/webdataengine/webdataengine.h
Conflicts:
ThermostatDemoSource/webdata.cpp
ThermostatDemoSource/webdata.h
ThermostatDemoSource/webdataengine/openweathermapdataengine.cpp
ThermostatDemoSource/webdataengine/webdataengine.cpp
ThermostatDemoSource/webdataengine/webdataengine.h
Merge branch 'master' of ssh://github.com/dgerlach/Thermostat-Demo
Conflicts:
ThermostatDemoSource/webdata.cpp
ThermostatDemoSource/webdata.h
ThermostatDemoSource/webdataengine/openweathermapdataengine.cpp
ThermostatDemoSource/webdataengine/webdataengine.cpp
ThermostatDemoSource/webdataengine/webdataengine.h
Conflicts:
ThermostatDemoSource/webdata.cpp
ThermostatDemoSource/webdata.h
ThermostatDemoSource/webdataengine/openweathermapdataengine.cpp
ThermostatDemoSource/webdataengine/webdataengine.cpp
ThermostatDemoSource/webdataengine/webdataengine.h
schedulescreen: modified sizing to all derive from pointArea QRect
schedulescreen: modified sizing to all derive from pointArea QRect
openweathermapdataengine: added better error checking on cache read
openweathermapdataengine: added better error checking on cache read
schedulescreen: can disable weeks now like by clicking day label
schedulescreen: can disable weeks now like by clicking day label
schedulepoint: no longer controlled by arrows, controlled by dragging
* up and down for temp left and right for time
* up and down for temp left and right for time
schedulepoint: no longer controlled by arrows, controlled by dragging
* up and down for temp left and right for time
* up and down for temp left and right for time
openweatherdatamapengine: removed debug output
openweatherdatamapengine: removed debug output
schedulescreen: recoded schedule display for uniform scaling on diff displays
* background now generated on fixed calculated grid
schedulepoint: changes to remove absolute coordinates
* background now generated on fixed calculated grid
schedulepoint: changes to remove absolute coordinates
schedulescreen: recoded schedule display for uniform scaling on diff displays
* background now generated on fixed calculated grid
schedulepoint: changes to remove absolute coordinates
* background now generated on fixed calculated grid
schedulepoint: changes to remove absolute coordinates
settingscreen: added license string display to general setting section
settingscreen: added license string display to general setting section
webdata: can now select an "engine" to pull webdata from different api
* webdataengine member takes derviced class that implements api retrieval
* defined in source for compile
webdataengine: abstract class that defines skeleton for a web api retrieval class
openweathermapdataengine: concrete webdataengine to pull from opendatamap.org
*added cache.dat for initial cached data
wundergrounddataengine: concrete webdataengine to pull from wunderground.com
* webdataengine member takes derviced class that implements api retrieval
* defined in source for compile
webdataengine: abstract class that defines skeleton for a web api retrieval class
openweathermapdataengine: concrete webdataengine to pull from opendatamap.org
*added cache.dat for initial cached data
wundergrounddataengine: concrete webdataengine to pull from wunderground.com
webdata: can now select an "engine" to pull webdata from different api
* webdataengine member takes derviced class that implements api retrieval
* defined in source for compile
webdataengine: abstract class that defines skeleton for a web api retrieval class
openweathermapdataengine: concrete webdataengine to pull from opendatamap.org
*added cache.dat for initial cached data
wundergrounddataengine: concrete webdataengine to pull from wunderground.com
* webdataengine member takes derviced class that implements api retrieval
* defined in source for compile
webdataengine: abstract class that defines skeleton for a web api retrieval class
openweathermapdataengine: concrete webdataengine to pull from opendatamap.org
*added cache.dat for initial cached data
wundergrounddataengine: concrete webdataengine to pull from wunderground.com
webdata: can now select an "engine" to pull webdata from different api
* webdataengine member takes derviced class that implements api retrieval
* defined in source for compile
webdataengine: abstract class that defines skeleton for a web api retrieval class
openweathermapdataengine: concrete webdataengine to pull from opendatamap.org
wundergrounddataengine: concrete webdataengineto pull from wunderground.com
* webdataengine member takes derviced class that implements api retrieval
* defined in source for compile
webdataengine: abstract class that defines skeleton for a web api retrieval class
openweathermapdataengine: concrete webdataengine to pull from opendatamap.org
wundergrounddataengine: concrete webdataengineto pull from wunderground.com
webdata: can now select an "engine" to pull webdata from different api
* webdataengine member takes derviced class that implements api retrieval
* defined in source for compile
webdataengine: abstract class that defines skeleton for a web api retrieval class
openweathermapdataengine: concrete webdataengine to pull from opendatamap.org
wundergrounddataengine: concrete webdataengineto pull from wunderground.com
* webdataengine member takes derviced class that implements api retrieval
* defined in source for compile
webdataengine: abstract class that defines skeleton for a web api retrieval class
openweathermapdataengine: concrete webdataengine to pull from opendatamap.org
wundergrounddataengine: concrete webdataengineto pull from wunderground.com
forecastdatawidget: fixed a layout bug that caused the weather widget to render too large