bsongis
61224e7207
Merge remote-tracking branch 'origin/next' into bsongis/9XR-PRO_port
...
Conflicts:
companion/src/eeprominterface.cpp
companion/src/eeprominterface.h
companion/src/firmwares/opentx/opentxeeprom.cpp
companion/src/firmwares/opentx/opentxinterface.cpp
companion/src/firmwares/opentx/opentxinterface.h
companion/src/mdichild.cpp
radio/src/Makefile
2014-05-11 22:48:48 +02:00
Damjan Adamic
0fc8a5e2f2
Reenabled Ctrl+P shortcut for "print model"
2014-05-04 18:08:55 +02:00
Kjell Kernen
ad9b32beba
Removed the functional change I made for #874 .
...
Introduced the term Radio Backup File to describe the eprom files that are uploaded from the radio.
The terms Radio, Tx and TX were used intermittently. I changed them all to Radio (naturally not in contexts having anything with the actual radio transmitting circuit).
2014-04-04 17:32:35 +02:00
Kjell Kernen
8059daccaf
Merge branch 'origin/next'
...
Conflicts:
companion/src/CMakeLists.txt
companion/src/apppreferencesdialog.ui
companion/src/companion.qrc
companion/src/mdichild.cpp
2014-03-31 10:22:23 +02:00
Andre Bernet
01912356bf
A megaton of non-OpenTX UI elements and relations removed in general settings
2014-03-23 13:07:32 +01:00
Kjell Kernen
0a867bcc22
Merge branch 'origin/next'
...
Conflicts:
companion/src/mdichild.cpp
2014-03-03 17:54:43 +01:00
bsongis
a18953f6a2
Merge remote-tracking branch 'origin/next' into bsongis/9XR-PRO_port
...
Conflicts:
companion/src/avroutputdialog.cpp
companion/src/burnconfigdialog.cpp
companion/src/eeprominterface.cpp
companion/src/eeprominterface.h
companion/src/firmwares/opentx/opentxinterface.cpp
companion/src/helpers.cpp
radio/src/gui/menu_general.cpp
radio/src/opentx.cpp
2014-03-03 16:41:41 +01:00
Kjell Kernen
9dfffbf641
Changed logics for opening model edit windows. Double clicking an empty slot always opens wizard. Clicking en existing always opens model edit. By using right click menu either can be specified.
2014-03-03 16:30:01 +01:00
bsongis
bf7919bd8d
Issue #731 - Conversion issues (Inputs) fixed
2014-03-03 12:24:42 +01:00
Kjell Kernen
672e5f8088
Wizard fully functional on GUI level. Right click on model slot to test.
...
No functionality whatsoever on the logical level! Completely harmless to run.
2014-03-02 13:30:08 +01:00
Bertrand Songis
439cabe83c
Another code reduction. Settings are now stored in "OpenTX/Companion",
...
instead of "companion/companion"
2014-01-20 16:50:06 +01:00
Romolo Manfredini
0d394ca7c6
References to companion9x were still present
2014-01-20 14:42:22 +01:00
Romolo Manfredini
97de97c84e
Small code cleanup
2014-01-20 12:26:50 +01:00
Romolo Manfredini
fad6211789
Remove duplicated code
2014-01-20 00:56:14 +01:00
Romolo Manfredini
a3a698181e
Further work in themes for the ui and some further bug fix.
2014-01-19 22:49:26 +01:00
Bertrand Songis
e7dc6644c7
Merge remote-tracking branch 'origin/dvogonen/rename_companion_485' into next
...
Conflicts:
companion/src/CMakeLists.txt
companion/src/main.cpp
companion/src/modeledit.cpp
companion/src/xsimulatordialog.cpp
2014-01-15 16:09:17 +01:00
Dvogonen
a646e240fb
Fixed last companion9x strings. Getting very close.
2014-01-06 18:21:30 +01:00
Dvogonen
e5ad887be9
companion9x renamed Companion
2014-01-05 02:23:06 +01:00
root
ee1b51b214
9XR support n companion, still not finished
2013-12-21 15:45:05 +01:00
Bertrand Songis
b802bc5db2
ModelEdit window splitted (one file per tab). Templates/Wizard still have to be re-introduced, but in a menu instead of a Model tab
2013-12-19 19:19:44 +01:00
Bertrand Songis
2f8f2df3c7
Companion build on Linux
2013-12-02 18:47:43 +01:00
bsongis