Commit Graph
52 Commits
Author SHA1 Message Date
Andre Bernet ae3f207140 Add support for Dutch language 2014-04-06 10:23:09 +02:00
Kjell Kernen 31a5fc2e63 Wizard merged with next.
Wizard turned off by hard coding.
Fixes #897
2014-03-31 13:28:19 +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
Bertrand Songis 3a26790b7f Update CMakeLists.txt 2014-03-29 20:40:57 +01:00
Bertrand Songis 42727e6e19 Visual C++ Compilation 2014-03-29 11:47:58 +01:00
Bertrand Songis 71fb790248 Dependencies updated 2014-03-29 10:33:05 +01:00
Kjell Kernen 8d85ca9bcb Added visual information about the need to hold the trims while booting to use USB.
I have a strong feeling that without this information, this will be the most common question going forward.
2014-03-26 23:22:34 +01:00
Bertrand Songis f1aeecaf9a Update CMakeLists.txt 2014-03-17 07:27:06 +01:00
bsongis d4acb9a8d0 Issue #698 fixed - Quick & dirty for now. I will switch everything to
CMake later
2014-03-16 21:57:11 +01:00
bsongis c59b0afa39 Qt4.8.5 required 2014-03-16 21:57:11 +01:00
bsongis e0582cd398 Some refactoring in the new Wizard 2014-03-14 14:54:45 +01:00
bsongis b6982a310f Version changed to 1.99 for nightly builds 2014-03-06 09:40:41 +01:00
Kjell Kernen b347b6f9c5 Wizard data broken out into separate files. 2014-03-03 14:40:02 +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
mhotar a12e615a30 CMakeLists for en.h 2014-02-27 23:13:39 +01:00
Kjell Kernen d57697460b Cleaned tabs from code. The ones in mainwindow.cpp are mine. The rest come from other contributors. 2014-02-26 15:23:42 +01:00
Bertrand Songis 08245aade9 Simulator updated with last Kjell improvements 2014-02-21 07:40:50 +01:00
Kjell Kernen 58d8a99511 Merge branch 'origin/next'
Conflicts:
	companion/src/eeprominterface.cpp
	companion/src/firmwares/opentx/opentxinterface.cpp
	companion/src/mainwindow.cpp
	companion/src/simulatordialog.cpp
	companion/src/xsimulatordialog.cpp
2014-02-20 21:37:51 +01:00
Kjell Kernen de3e0e802f Merge pull request #703 from opentx/bsongis/standalone_simu
Bsongis/standalone simu
2014-02-20 21:18:14 +01:00
Bertrand Songis a05a88cc89 Link error when no SDL on VC++ 2014-02-20 21:07:31 +01:00
Kjell Kernen 681a4f436c Forgot the updated CMakeLists.txt file 2014-02-20 20:36:02 +01:00
Bertrand Songis 067c4ee0db Another TODO removed 2014-02-20 13:18:18 +01:00
Bertrand Songis a14848fc7f One TODO less ... 2014-02-20 13:01:22 +01:00
Bertrand Songis e0a03f6728 Simu renamed to simulator, in the same directory as companion 2014-02-20 12:11:10 +01:00
Bertrand Songis a93ea1faa1 Compilation problem on VC++ 2014-02-20 07:22:36 +01:00
Jacek Drewniak e607dea888 changes in translation of Companion and adding Finish transaltion RAW file 2014-02-15 10:06:29 +01:00
Bertrand Songis 0d76f2461a Issue #515 fixed. Standalone Qt based simu added. xsimulatordialog and
simulatordialog merged
2014-02-14 18:34:01 +01:00
Andre Bernet a76484a7eb Merge branch 'next' into bsongis/Lua_interpreter_171 2014-02-11 18:21:18 +01:00
Kjell Kernen eedc5ea68f Profiles can now be added and removed in a proper way. 2014-02-11 08:37:07 +01:00
Bertrand Songis d374453c8f Lua now uses our fake FatFS when running in simu 2014-02-10 12:15:24 +01:00
Bertrand Songis 330234df01 Lua interpreter now running inside companion! 2014-02-10 10:31:14 +01:00
Kjell Kernen d9f97016e2 Two new dialogs defined. 2014-02-05 17:44:49 +01:00
Jacek Drewniak e44c49f189 Translation of Companion + changes in core files to make translation file aviable 2014-01-31 19:47:04 +01:00
Dvogonen 8b33ba4576 Merge branch 'origin/next' 2014-01-24 09:13:45 +01:00
Dvogonen 0dcf67cd8e Added icons in in the outstanding Linux sizes. 2014-01-23 20:31:12 +01:00
Bertrand Songis 08da268aff All .lbm files removed 2014-01-23 20:14:08 +01:00
Dvogonen 9ec25ed189 Merge branch 'origin/next'
Conflicts:
	companion/src/contributorsdialog.cpp
2014-01-19 20:33:11 +01:00
Romolo Manfredini 0c0662711e Revert to old renderer 2014-01-19 08:10:28 +01:00
Dvogonen 2f67344b81 Fixes #512 2014-01-15 21:13:57 +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
Bertrand Songis 888895b60b Corrections on Curves in MixerDialog and ExpoDialog (introduction of
CurveGroup to share code)
2014-01-15 11:50:00 +01:00
Romolo Manfredini a025d325dd Contributor dialog fixed 2014-01-12 10:14:55 +01:00
Bertrand Songis 3b59d07724 Support of current EEPROM inside Companion. Some more code around
EEPROMS export removed (needed to be fixed, so I preferred to remove in
the same commit).
2014-01-07 17:57:42 +01:00
Dvogonen a86ab46bb1 And now the infernal Linux install path should be correct. I hope... 2014-01-06 01:48:45 +01:00
Dvogonen c2d220e94b Fixed Linux desktop file, which was badly broken. Added more and better icons to propper locations. 2014-01-06 01:29:53 +01:00
Andre Bernet 7a5154305b Fix mac paths - app icon still needs updating 2014-01-05 12:51:30 +01:00
Andre Bernet d65b74269b More renaming. Just for the life of me can't get the translations to be recognised. Also, while a clean install will use the new app folders, the nsi scripts are currently configured to retrieve the install folder from registry if present. Might want to think about whether we want to remove this or not. 2014-01-05 12:13:38 +01:00
Dvogonen e5ad887be9 companion9x renamed Companion 2014-01-05 02:23:06 +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
romoloman 44c6ed07f5 Fixed linux packager 2013-12-10 12:42:36 +01:00