bsongis
220e9f3e97
Merge remote-tracking branch 'origin/next' into TaranisPlus
...
Conflicts:
companion/src/generaledit.cpp
companion/src/generaledit.ui
radio/src/gui/menu_general.cpp
2014-05-11 14:41:03 +02:00
bsongis
3a2e9e7c2e
Fixes #1074
2014-05-10 23:30:28 +02:00
Damjan Adamic
61addd3d4e
Merge branch 'next'
2014-05-05 22:13:24 +02:00
Damjan Adamic
8787dd05cd
Many improvements of print dialog. Some minor changes in mixes and inputs formatting.
2014-05-04 10:37:49 +02:00
Damjan Adamic
88e7ad4b8c
Better display of inputs with assigned name
2014-04-30 23:16:49 +02:00
Damjan Adamic
1a6906bbb3
Input name missing from mixer sources
2014-04-30 22:58:54 +02:00
bsongis
e2cfaf6742
Fixes #1031
2014-04-30 16:12:53 +02:00
Damjan Adamic
926ad88b73
Hided "popup enabled" checkbox for FM>0. They have taken precious space and severely limited width of GVAR names filed.
2014-04-29 20:06:25 +02:00
Damjan Adamic
8baa2b3887
Bug: setting gvar to "same as flight mode X" caused endless loop if X > current flight mode
2014-04-29 19:59:24 +02:00
Andre Bernet
91c84dbb65
Color slider for backlight SF in companion
2014-04-29 16:16:07 +02:00
bsongis
08284a69e6
Switches constants properly defined in Companion
2014-04-29 08:55:19 +02:00
Damjan Adamic
a6ad130df7
Reverted commit 8c5fc3a01f (which prevented moving second mixer to the first line)
2014-04-21 12:22:25 +02:00
Damjan Adamic
27600ba37e
Cosmetic changes
2014-04-20 22:12:55 +02:00
Damjan Adamic
fc92ad3a86
Prevent drag&drop between inputs and mixers
2014-04-20 21:29:08 +02:00
Damjan Adamic
65521d96d4
Code refactoring
...
Added documentation
2014-04-20 19:06:55 +02:00
Damjan Adamic
b70586bd9f
Reverted to original code (both work)
2014-04-20 18:31:54 +02:00
Damjan Adamic
a8c828f105
Corrected list items width (long items were wrapping)
...
Refactored inputs tab, same system as mixes tab (grouping of lines)
Fixed incorrect spacing for first list item
2014-04-20 18:27:28 +02:00
Damjan Adamic
0e7b420b71
Code cleanup
2014-04-20 15:40:40 +02:00
Damjan Adamic
95e7f7915b
Better implementation, spacing now correct, drag&drop working.
...
Inputs tab still needs spaces converted to
2014-04-20 14:22:54 +02:00
Damjan Adamic
3df9fcb67a
Working, but drawing is not perfect
2014-04-20 13:21:28 +02:00
bsongis
50a73a3af5
Each ModelEdit window now has its own FirmwareInterface (it means that
...
we could open 2 ModelEdit windows on different firmwares)
2014-04-18 16:55:53 +02:00
bsongis
c5ac19a054
Refactoring FirmwareInterface / EepromInterface
2014-04-18 16:27:27 +02:00
Andre Bernet
e312454aca
Translation/typo cleanup part 7
2014-04-16 09:43:40 +02:00
bsongis
f6d1b0c46f
Cosmetics
2014-04-16 07:39:34 +02:00
bsongis
f47cd81108
ExtraChannels Capacity removed
2014-04-16 07:27:39 +02:00
Bertrand Songis
6823fbdc5a
Merge pull request #976 from projectkk2glider/companion_mixes_tab_highlights
...
Two visual enhancements to mixes tab in companion
2014-04-16 07:23:36 +02:00
Damjan Adamic
6354b83a0d
Fixes suggested by Bertrand. ExtraChannels not yet removed
2014-04-15 19:12:29 +02:00
Andre Bernet
e11821b342
Translation/typo cleanup part 5
2014-04-15 18:50:28 +02:00
Andre Bernet
5402dd7ad9
Translation/typo cleanup part 4
2014-04-15 18:17:01 +02:00
Andre Bernet
2daf4323ca
Translation/typo cleanup part 2
2014-04-15 15:38:02 +02:00
Andre Bernet
38f8025221
Translation/typo cleanup part 1
2014-04-15 15:19:39 +02:00
Andre Bernet
8c5fc3a01f
Fix "Move up a mix will not move higher than the current topmost line entry"
2014-04-14 23:15:52 +02:00
Damjan Adamic
52954b1be4
* Added space between channels in mixers tab, amount defined by MIX_ROW_HEIGHT_INCREASE
...
* Added highlighting of selected channel when used as source in other channels (Ctrl+T or context menu->Toogle highlight)
* Added leading zero to channel name for ch_number < 10 (better alignment for CH1 to CH9)
2014-04-14 22:00:39 +02:00
Andre Bernet
b7cc3a5ef2
GVAR popups only for Taranis...
2014-04-14 19:20:46 +02:00
bsongis
b605dd94eb
Fixes #968
2014-04-14 13:31:09 +02:00
Andre Bernet
da23a6cf6c
GVAR popup enable checkboxes in companion
2014-04-10 23:48:06 +02:00
bsongis
ed3bc66ea1
Many little differences in logical switches (telemetry sources) between
...
Companion and the FW (especially on 9x stock board)
2014-04-10 12:35:58 +02:00
Andre Bernet
5c4e921899
Compilation error when PHONON not present
2014-04-09 12:58:48 +02:00
bsongis
a72df4ca16
Fixes #951
2014-04-08 10:00:07 +02:00
Andre Bernet
9f5ce8f0a6
Refresh incomplete after SF paste, fix #941
2014-04-06 23:18:17 +02:00
Andre Bernet
b4ae7e232f
Fix #940
2014-04-06 13:55:30 +02:00
bsongis
1751a1a06c
Duplicated code removed
2014-04-05 08:28:06 +02:00
bsongis
d2a99aadd5
Small code refactoring
2014-04-04 08:04:53 +02:00
Andre Bernet
573e8600e3
Merge branch 'kilrah/667_extended_limits' into next
...
Conflicts:
companion/src/modeledit/modeledit.cpp
2014-04-03 21:22:15 +02:00
Andre Bernet
144952f46d
Include DR/Expo was still showing for Taranis
2014-04-03 21:10:36 +02:00
Andre Bernet
a1277a7af0
Match companion tab order to firmware
2014-04-03 21:06:57 +02:00
Andre Bernet
c65b26ec69
Firmware/companion string consistency
2014-04-03 21:04:36 +02:00
Andre Bernet
0075f20ae4
Module/protocol combinations were wrong in companion
2014-04-03 20:35:57 +02:00
Andre Bernet
821a4b9289
Module/protocol combinations were wrong in companion
2014-04-03 20:32:14 +02:00
Bertrand Songis
0789bb83b1
Include DR/Expo should be hidden in MixerDialog on Taranis
2014-04-03 12:26:34 +02:00
bsongis