Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Device layout editor #1930

Open
wants to merge 52 commits into
base: dev
Choose a base branch
from
Open

Device layout editor #1930

wants to merge 52 commits into from

Conversation

xQwexx
Copy link
Contributor

@xQwexx xQwexx commented Mar 12, 2020 •
edited
Loading

Enable multiple device controlling, it work in multiple layout handling
Adding device layout editor
But the physical device handling not ready yet, firstly the device loading from dlls needs to merge.

List any issues that this PR fixes: fixes # , etc...
Fixes: #1871 #1844 #1033 #1587 #1027
because it updates the text of the keys, the language layouts not needed anymore:
#16 #1251 #1422

Known issues/To do:

Not compatible the appdata, so first save it before running this.

@xQwexx
Dynamical layout json files scanning
871c295
@xQwexx
Minor code cleaning in the LayoutManager
0368726
@xQwexx
Refactor to enable multiple device layouts
5774fa4
@xQwexx
Enable to move deviceKeys and some fixes
3d9c281
@xQwexx
Merge branch 'dev' of https://github.com/antonpup/Aurora into feature…
0db80c5 
…/multiple-device-layout

# Conflicts:
#	Project-Aurora/Project-Aurora/App.xaml.cs
#	Project-Aurora/Project-Aurora/Controls/KeySequence.xaml.cs
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Corsair_strafe_mk2_logo.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Roccat_Kone_Pure_logo.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Roccat_Kone_Pure_outline.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/corsair_strafe_mk2.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/ducky_one_2_rgb_tkl.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/ducky_shine_7.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/masterkeys_mk730.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/corsair_strafe_mk2_left_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/corsair_strafe_mk2_right_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/ducky_shine_7_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/masterkeys_mk730_bottom_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/masterkeys_mk730_left_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/masterkeys_mk730_right_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/roccat_kone_pure_features.json
#	Project-Aurora/Project-Aurora/Devices/CoolerMaster/CoolerMasterDevice.cs
#	Project-Aurora/Project-Aurora/EffectsEngine/EffectLayer.cs
#	Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOBombLayerHandler.cs
#	Project-Aurora/Project-Aurora/Profiles/CSGO/Layers/CSGOKillsIndicatorLayerHandler.cs
#	Project-Aurora/Project-Aurora/Profiles/LeagueOfLegends/LoLProfile.cs
#	Project-Aurora/Project-Aurora/Profiles/Minecraft/MinecraftProfile.cs
#	Project-Aurora/Project-Aurora/Project-Aurora.csproj
#	Project-Aurora/Project-Aurora/Settings/KeyboardLayoutManager.cs
@xQwexx
enable loading old profiles, Keycap control refactor
e5ff467
@xQwexx
Add control to edit DeviceKeycapConf
026602c 
Save edited layouts
@xQwexx xQwexx changed the title Rewrite device layout handling Device layout editor May 6, 2020
xQwexx added 2 commits May 6, 2020 12:58
@xQwexx
Merge branch 'dev' of https://github.com/antonpup/Aurora into feature…
89f32ed 
…/multiple-device-layout

# Conflicts:
#	Project-Aurora/Project-Aurora/Profiles/Skype/SkypeProfile.cs
#	Project-Aurora/Project-Aurora/Project-Aurora.csproj
@xQwexx
Merge branch 'dev' into feature/multiple-device-layout
133e30b
@Bluscream
Copy link

O M G

@Tyberious
Copy link
Contributor

I am digging this, keep up the good work. This should make it easier to add ram and fans etc once you refine the interface.

@xQwexx
Not found directory fix
0e81fa2
@xQwexx
Merge branch 'dev' of https://github.com/antonpup/Aurora into feature…
92169cb 
…/multiple-device-layout

# Conflicts:
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/Uniwill2ND_35X_1.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/Uniwill2ND_35X_2.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/Uniwill2P1_550_BR.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/Uniwill2P1_550_JP.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/Uniwill2P1_550_UK.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/Uniwill2P1_550_US.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/Uniwill2P2_650_BR.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/Uniwill2P2_650_JP.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/Uniwill2P2_650_UK.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/Uniwill2P2_650_US.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/keyboard101_numpad_right_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/keyboard102_numpad_right_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/keyboard21_numpad_left_bottom_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/keyboard21br_numpad_left_bottom_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/keyboard21jp_numpad_left_bottom_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/keyboard21us_numpad_right_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/keyboard22br_numpad_left_bottom_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/keyboard22jp_numpad_left_bottom_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/keyboard22us_numpad_right_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/keyboard22usuk_numpad_left_bottom_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/keyboard_numpad_left_bottom_features.json
#	Project-Aurora/Project-Aurora/Project-Aurora.csproj
#	Project-Aurora/Project-Aurora/Settings/KeyboardLayoutManager.cs
@xQwexx
Enable separate japan layout editing, convert physical layout Types t…
c9ef9dc 
…o enum
@xQwexx
Merge branch 'dev' of https://github.com/antonpup/Aurora into feature…
fa19307 
…/multiple-device-layout

# Conflicts:
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/logitech_g513.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/logitech_g815.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/logitech_g815_features.json
#	Project-Aurora/Project-Aurora/Devices/YeeLight/YeeLightDevice.cs
#	Project-Aurora/Project-Aurora/Project-Aurora.csproj
#	Project-Aurora/Project-Aurora/Settings/KeyboardLayoutManager.cs
@xQwexx
All current bug fix + Merge branch 'dev' 'Asus Change'
338c626 
# Conflicts:
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Asus_logo.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/asus_strix_scope.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/asus_strix_flare_features.json
#	Project-Aurora/Project-Aurora/Project-Aurora.csproj
#	Project-Aurora/Project-Aurora/Settings/KeyboardLayoutManager.cs
@xQwexx
Merge branch 'dev' of https://github.com/antonpup/Aurora into feature…
c650efa 
…/multiple-device-layout
@xQwexx
small fix
dfeb64e
@xQwexx
Fix exception when device layout offset was negative
1a3825f
@Bluscream
Copy link

Bluscream commented May 19, 2020 •
edited
Loading

Just wait with merging from dev to your fork until the review is passed, otherwise you'll spend your whole life updating your fork :P

@xQwexx
Fix device selection, update visualname change, refactor deviceLayout
d918127
@xQwexx
Update no device selected box
8baa6de
@xQwexx
Fix layout not applying the colors
79fcb62
@xQwexx
Bug fixes, add keyboard physical layout detection, Fix bitmap lock ex…
5398227 
…ception
@xQwexx
Fix keyselection selection
ed93d28
@xQwexx
Optimizing the DevicePresenter, fix other bugs
35dcb6b
@xQwexx
Resize freeform thumbs
e35314b
@xQwexx
Merge branch 'dev' of https://github.com/xQwexx/Aurora into feature/m…
0ef421d 
…ultiple-device-layout

# Conflicts:
#	Project-Aurora/Project-Aurora/ConfigUI.xaml.cs
#	Project-Aurora/Project-Aurora/Controls/KeySequence.xaml
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Logi_G502_dpi.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Logi_g900_dpi.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Omen_zone_0.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Omen_zone_1.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Omen_zone_2.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Omen_zone_3.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Razer_Mamba_TE.psd
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Razer_Mamba_TE_L1.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Razer_Mamba_TE_L2.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Razer_Mamba_TE_L3.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Razer_Mamba_TE_L4.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Razer_Mamba_TE_L5.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Razer_Mamba_TE_L6.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Razer_Mamba_TE_L7.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Razer_Mamba_TE_Logo.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Razer_Mamba_TE_R1.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Razer_Mamba_TE_R2.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Razer_Mamba_TE_R3.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Razer_Mamba_TE_R4.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Razer_Mamba_TE_R5.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Razer_Mamba_TE_R6.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Razer_Mamba_TE_R7.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Razer_Mamba_TE_Scroll_Wheel.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/Razer_Mamba_TE_outline.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/omen_outpost_outline.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/omen_outpost_plus_photon_outline.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/omen_photon_outline.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/omen_photon_scrollwheel.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/omen_sequencer_logo.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/omen_vector_essentials_outline.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/omen_vector_logo.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Images/omen_vector_outline.png
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/cooler_master_sk650.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/hyperx_alloy_elite_rgb.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/omen_four_zone.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Keyboard/omen_sequencer.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/cooler_master_sk650_bottom_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/cooler_master_sk650_left_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/cooler_master_sk650_right_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/cooler_master_sk650_top_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/hyperx_alloy_elite_rgb_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/omen_four_zone_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/omen_outpost_plus_photon_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/omen_photon_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/omen_sequencer_bottom_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/omen_sequencer_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/omen_sequencer_right_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/omen_vector_essentials_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/omen_vector_features.json
#	Project-Aurora/Project-Aurora/DeviceLayouts/Mouse/razer_mamba_te_features.json
#	Project-Aurora/Project-Aurora/Devices/Asus/AsusDevice.cs
#	Project-Aurora/Project-Aurora/Devices/Asus/AuraSyncKeyboardDevice.cs
#	Project-Aurora/Project-Aurora/Devices/CoolerMaster/CoolerMasterDevice.cs
#	Project-Aurora/Project-Aurora/Devices/DeviceKeys.cs
#	Project-Aurora/Project-Aurora/Devices/DeviceManager.cs
#	Project-Aurora/Project-Aurora/Devices/Drevo/DrevoDevice.cs
#	Project-Aurora/Project-Aurora/Devices/Dualshock4/Dualshock4Device.cs
#	Project-Aurora/Project-Aurora/Devices/Logitech/LogitechDevice.cs
#	Project-Aurora/Project-Aurora/Devices/NZXT/NZXTDevice.cs
#	Project-Aurora/Project-Aurora/Devices/RGBNet/AbstractRGBNetDevice.cs
#	Project-Aurora/Project-Aurora/Devices/RGBNet/AuroraRGBNetBrush.cs
#	Project-Aurora/Project-Aurora/Devices/Razer/RazerDevice.cs
#	Project-Aurora/Project-Aurora/Devices/Vulcan/Vulcan.cs
#	Project-Aurora/Project-Aurora/Devices/Wooting/WootingDevice.cs
#	Project-Aurora/Project-Aurora/Devices/YeeLight/YeeLightDevice.cs
#	Project-Aurora/Project-Aurora/Profiles/ATS/Control_ATS.xaml
#	Project-Aurora/Project-Aurora/Profiles/Battlefield1/Control_Battlefield1.xaml
#	Project-Aurora/Project-Aurora/Profiles/Blade and Soul/Control_BnS.xaml
#	Project-Aurora/Project-Aurora/Profiles/CSGO/Control_CSGO.xaml
#	Project-Aurora/Project-Aurora/Profiles/DOOM/Control_DOOM.xaml
#	Project-Aurora/Project-Aurora/Profiles/Desktop/Control_Desktop.xaml
#	Project-Aurora/Project-Aurora/Profiles/DiscoDodgeball/Control_DiscoDodgeball.xaml
#	Project-Aurora/Project-Aurora/Profiles/Dota 2/Control_Dota2.xaml
#	Project-Aurora/Project-Aurora/Profiles/DyingLight/Control_DyingLight.xaml
#	Project-Aurora/Project-Aurora/Profiles/EliteDangerous/Control_EliteDangerous.xaml
#	Project-Aurora/Project-Aurora/Profiles/Factorio/Control_Factorio.xaml
#	Project-Aurora/Project-Aurora/Profiles/GTA5/Control_GTA5.xaml
#	Project-Aurora/Project-Aurora/Profiles/LeagueOfLegends/Control_LoL.xaml
#	Project-Aurora/Project-Aurora/Profiles/Move or Die/Control_MoD.xaml
#	Project-Aurora/Project-Aurora/Profiles/Overwatch/Control_Overwatch.xaml
#	Project-Aurora/Project-Aurora/Profiles/Payday 2/Control_PD2.xaml
#	Project-Aurora/Project-Aurora/Profiles/QuantumConumdrum/Control_QuantumConumdrum.xaml
#	Project-Aurora/Project-Aurora/Profiles/Serious Sam 3/Control_SSam3.xaml
#	Project-Aurora/Project-Aurora/Profiles/ShadowOfMordor/Control_ShadowOfMordor.xaml
#	Project-Aurora/Project-Aurora/Profiles/Witcher3/Control_Witcher3.xaml
#	Project-Aurora/Project-Aurora/Profiles/XCOM/Control_XCOM.xaml
#	Project-Aurora/Project-Aurora/Project-Aurora.csproj
#	Project-Aurora/Project-Aurora/Settings/Configuration.cs
#	Project-Aurora/Project-Aurora/Settings/Control_Settings.xaml
#	Project-Aurora/Project-Aurora/Settings/Control_Settings.xaml.cs
#	Project-Aurora/Project-Aurora/Settings/KeyboardLayoutManager.cs
#	Project-Aurora/Project-Aurora/Settings/Layers/Control_RazerLayer.xaml
#	Project-Aurora/Project-Aurora/Utils/EnumUtils.cs
#	Project-Aurora/Project-Aurora/kb_layouts/Extra Features/logitech_g502_features.json
#	Project-Aurora/Project-Aurora/kb_layouts/Extra Features/logitech_g900_features.json
xQwexx added 25 commits June 12, 2021 04:10
@xQwexx
Add OpenRGB multi device support
fa95f4b
@xQwexx
Add Cointainer Wrapper, Fix 0 index for Keyboard, and other bug fixes
1575f43
@xQwexx
Fix async not working proberly, One openRGB device just one layout
cf5b478
@xQwexx
Add invisible background json flag and some performance optimalization
052c007
@xQwexx
Fix selection Key Layout, finalizing the Control_Keys
9bc3135
@xQwexx
Small editor improvement
bd4b410
@xQwexx
Add Steelseries rival 650 layout and disable keycap dragging
d0b496d
@xQwexx
The custom layout stores in the appdata
6549283
@xQwexx
Enable Keycap dragging
8ad7e6c
@xQwexx
Replace corsair sdk support
b282273
@xQwexx
Add not existing keyboard keys
4a080f4
@xQwexx
Fix Razer Sdk init fail, missed index
e2919c6
@xQwexx
Fix custom device layouts are not displayed in the drop down
60da8ba
@xQwexx
Fix old way of serrializate keyboard
538e161
@xQwexx
Add +/- and auto devicename discovery
c36b6e9
@xQwexx
Set active layoutname after you save it
4f461bc
@xQwexx
Fix for antonpup#2320
02c3cf7
@xQwexx
Add corsair sdk suppport
9c7dae3
@xQwexx
Remove CorairRGB.NET dependency
bcee7fd
@xQwexx
Fix update flash not happening
35fe7b1
@xQwexx
Fix corsair detection
3c66632
@xQwexx
Fix ghosting device layout bug
fae2c2d
@xQwexx
Fix Corsair key mapping
faae773
@xQwexx
Fix some device layout bugs
d03a8a7
@xQwexx
Update Colore version
ee7c448
@boehs
Copy link

boehs commented Jul 30, 2021

I hope @diogotr7 considers merging, this is very nice, and goodness knows we need a big of a refactor to spark some light in this project

@Aytackydln Aytackydln mentioned this pull request Dec 22, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@xQwexx @Bluscream @Tyberious @boehs