Andre Bernet
006eee1411
Merge branch 'dvogonen/automatically_convert_settings_511' of https://github.com/opentx/opentx into next
...
Conflicts:
companion/src/main.cpp
2014-01-15 23:02:21 +01:00
Dvogonen
4f087a216f
Fixes #511 - Again :-)
2014-01-15 22:24:31 +01:00
Dvogonen
18a5883f66
Merge branch 'origin/next'
2014-01-15 22:06:10 +01:00
Dvogonen
9fd20a87fe
Fixes #511
2014-01-15 21:54:43 +01:00
Dvogonen
20ddf27fff
Merge branch 'origin/next'
2014-01-15 21:30:05 +01:00
Dvogonen
2f67344b81
Fixes #512
2014-01-15 21:13:57 +01:00
Dvogonen
78b28444e6
Example of optimized icons for actual resolution.
2014-01-15 20:46:53 +01:00
Andre Bernet
bea9c74243
Companion support for FAS offset, Persistent mAh and Altitude in top bar
2014-01-15 20:40:53 +01:00
Kjell Kernen
fb705d66df
New, flat icons for everything. Optimized for 32x32. Work needed to optimize for 16x16 used in menus.
2014-01-15 17:32:49 +01:00
Andre Bernet
ba9f55cb67
Merge was resolved the wrong way, files that should have been deleted were reinstated
2014-01-15 16:30:54 +01:00
Andre Bernet
f246c992c0
Merge branch 'next' of https://github.com/opentx/opentx into kilrah/FAS_Offset_compensation
2014-01-15 16:26:56 +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
Andre Bernet
06a2e757f1
Merge branch 'next' into kilrah/FAS_Offset_compensation
...
Conflicts:
companion/src/modeledit.ui
radio/src/translations/cz.h
radio/src/translations/de.h
radio/src/translations/fr.h
radio/src/translations/it.h
radio/src/translations/pl.h
radio/src/translations/pt.h
radio/src/translations/se.h
2014-01-15 16:02:32 +01:00
Andre Bernet
9b6c0e4fd1
Multiplex was collated to source
2014-01-15 14:41:54 +01:00
Bertrand Songis
691b52572f
Fixes in ExpoDialog. Some more code refactoring
2014-01-15 14:05:33 +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
Dvogonen
f11c961be4
Enlarged and moved icons
2014-01-15 08:28:11 +01:00
Bertrand Songis
0f0db5e1d3
Companion core in simu now understood: the stickMode was completely out,
...
and the Tx trims were shifted!
2014-01-14 22:44:10 +01:00
Bertrand Songis
d945052c82
Removes the core in companion simu, compiled on VC++. A compiler bug? I
...
don't get it...
2014-01-14 20:06:01 +01:00
Bertrand Songis
cedddfe8d2
EEPROM 'next' support. A lot of corrections.
2014-01-13 19:09:05 +01:00
Dvogonen
9cc9e115a4
Icons regenerated to correct font related problem.
2014-01-13 14:02:39 +01:00
Bertrand Songis
0b387a2467
[Companion] Assert on EEPROM import errors removed
2014-01-13 11:54:08 +01:00
Romolo Manfredini
9419f565aa
Merge origin/romolo/fix_and_improve_contributors_dialog_506 into romolo/fix_and_improve_contributors_dialog_506
2014-01-12 14:29:30 +01:00
Romolo Manfredini
f2c5e428d9
more space between sections
2014-01-12 10:49:37 +01:00
Dvogonen
bcf072708d
Corrected name of releae notes
2014-01-12 10:46:16 +01:00
Romolo Manfredini
a025d325dd
Contributor dialog fixed
2014-01-12 10:14:55 +01:00
Dvogonen
00779bc33a
Settled on 5 rows. Fixed minor bug that prevented the changelog of companion from diaplying.
2014-01-12 01:16:37 +01:00
Dvogonen
f7e1c6cb8b
Now formatted in 6 columns. Looks rather nice. Stripped http:// tags in donors text file to improve automatic formatting.
2014-01-11 22:33:01 +01:00
Dvogonen
817dea8f1e
Fetch donors and coders from files. Improved dialog appearance.
2014-01-11 00:54:45 +01:00
Bertrand Songis
7880d144f6
Issue #193 fixed (shift when importing Taranis EEPROM v215)
2014-01-10 11:43:10 +01:00
Bertrand Songis
cb6d13bf6a
Merge branch 'bsongis/Companion_ModelEdit_split' of github.com:bsongis/opentx into bsongis/Companion_ModelEdit_split
2014-01-09 19:44:00 +01:00
Bertrand Songis
e8d54d35f1
Sources shift when exporting EEPROM (Virtual and Lua inputs)
2014-01-09 19:47:18 +01:00
Bertrand Songis
9a2b668956
GvarsOfsNum (er9x) removed
2014-01-09 18:53:35 +01:00
Bertrand Songis
691d568b1a
FixOffset (from er9x) removed
2014-01-09 18:03:22 +01:00
Andre Bernet
3ade8707a7
Nicer module UI
2014-01-07 21:30:57 +01:00
Bertrand Songis
57f9489d81
EEPROM import bugfixing
2014-01-07 19:33:29 +01:00
Bertrand Songis
27f8be304a
The non active curves are not drawn in bold (pen width 2)
2014-01-07 18:03:50 +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
Bertrand Songis
5d3c827488
Merge remote-tracking branch 'origin/next' into bsongis/Companion_ModelEdit_split
2014-01-07 07:12:14 +01:00
Dvogonen
d0281da58d
The part where the old companion9x settings are automatically transferred to companion settings is done. Tested on Linux. Should work on Windows/OSX.
...
Now remains only to rename all the hundreds of seting references from companion9x to companion. This is blocked until Bertrand merges his reworked edit dialogs.
2014-01-07 02:10:50 +01:00
Dvogonen
893eb3c061
Fixed problem with language selection in dropbox.
2014-01-06 19:11:30 +01:00
Dvogonen
a646e240fb
Fixed last companion9x strings. Getting very close.
2014-01-06 18:21:30 +01:00
Dvogonen
57718d0100
Cleaning up graphics and about box
2014-01-06 15:15:14 +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
0494118089
Improved customized splash for burn dialog with OpenTX logo.
2014-01-06 01:31:16 +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
b3f1716f82
Merge pull request #509 from opentx/bsongis/Companion_crash_190
...
Fixes #190
2014-01-05 04:53:00 -08:00
Dvogonen
9b1f36c155
Mac Icon genereated online from vector image by iconverticons.com. I have no way of checking it. Hope it is acceptable.
...
Improved 48x48 png icon. Also generated online at iconverticons.com. They must use a good rendering machine. The result is better than from Gimp.
2014-01-05 13:37:36 +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
Andre Bernet