Skip to content

Commit

Permalink
Release/2.12.0 (#261)
Browse files Browse the repository at this point in the history
* Added code for the new extension store

* Test

* Turned Mnemonic off for all controls supporting it (#158) (#159)

Co-authored-by: Develeon64 <software@develeon.de>

* Feature/check if a instance of macro deck is already running and show main window if (#162)

* First non-working test

* Switched pipe process spawn to STAThread (#161)

* Added SynchronizationContext to prevent thread issues in the ui

* Added SynchronizationContext to prevent thread issues in the ui

* Fixed: tray icon was shown multiple times when Macro Deck was started while running

Co-authored-by: RecklessBoon <16234384+RecklessBoon@users.noreply.github.com>

* Fixed: main Window not shown

* Fixed #155 (#163)

* Fixed #145 (#164)

* Added syntax highlighting

* Syntax highlight improvements (#165)

* syntax highlighting whole words
allow returns in Cottle
readable colours

* renamed variables

* Added option to turn on/off blank line trimming
Added auto complete
Added highlighting for variables

* Feature/template editor syntax highlighting (#166)

* Added syntax highlighting

* Syntax highlight improvements (#165)

* syntax highlighting whole words
allow returns in Cottle
readable colours

* renamed variables

* Added option to turn on/off blank line trimming
Added auto complete
Added highlighting for variables

Co-authored-by: Will <54237626+PhoenixWyllow@users.noreply.github.com>

* Added option to turn on/off blank line trimming

* Updated the plugin api

* Feature/offline plugin installation (#173)

* Feature/offline plugin installation (#168)

* Adds feature to install plugin from zip

- Extracted code that installs from zip to separate func
- Enhanced Manifest to create itself from a file
- Added GUI for picking and installing local zip
  - Needs UI improvement, but it works for now

* Improves manual plugin install GUI

* Added ExtensionManifest

Co-authored-by: RecklessBoon <16234384+RecklessBoon@users.noreply.github.com>

* Update Spanish.xml (#172)

* Feature/extension store (#174)

* Fixed: plugin and extension manifest was not loaded

* Fixed the url for the updater

* Re-added the check of the md5 hash of downloaded extensions

* Feature/extension store (#176)

* Fixed: plugin and extension manifest was not loaded

* Fixed the url for the updater

* Re-added the check of the md5 hash of downloaded extensions

* Fixed download counter

* Added Guid (#177)

* Feature/icon pack rewrite (#179)

* Begin of the rewrite of the icon system
Added converter for old icon packs

* Fixed GIFs

* Added local websocket server for usb connections in the future
Now sending the IconBase64 directly in the button object again

* Added message box

* Added backup for the new icon pack format

* Icon packs can be configured in the extension manager

* Added icon pack export

* Added icon pack import

* Added icon packs to the extension store

* Added icon packs to the extension store

* Fixed missing icon when button state = on

* Fixed installation for icon packs from the extension store

* Fixed installation for icon packs from the extension store

* Fixed ExtensionIcon for icon packs

* Removed plugin and icon pack selection in the initial setup; Added download count for icon packs; changed version to 2.9.0

* Fixed error when searching for extension updates

* Fixed bug that prevented the Extension Store from load (#181)

* Fixed bug that prevented the Extension Store from load (#183)

* Update templates (#184)

* Update bug_report.md

* Update issue templates

* Changed translation files to json

* Update README.md

* Update Crowdin configuration file

* Update Crowdin configuration file

* Update Crowdin configuration file

* Delete crowdin.yml

* Improved the design of the extension manager and added missing translations

* Improved the design of the extension manager and added missing translations (#186)

* Improved the ui of the button editor

* Removed untranslated strings

* Update README.md

* Update README.md

* Added save varible to file action

* Added Hungarian translation by @maketrue

* Update English.json (POEditor.com)

* Update Finnish.json (POEditor.com)

* Update French.json (POEditor.com)

* Update German.json (POEditor.com)

* Update Italian.json (POEditor.com)

* Update Korean.json (POEditor.com)

* Update Portuguese.json (POEditor.com)

* Update Russian.json (POEditor.com)

* Update Spanish.json (POEditor.com)

* Update Turkish.json (POEditor.com)

* Update Hungarian.json (POEditor.com)

* Added "Polish" translation by @kali

* Added translation support for Save variable to file action

* Updated translation files

* Fixed duplicate icon pack after icon pack update

* Fixes missing Author issue (#196)

* Replaced WebView2 with CefSharp (#197)

Co-authored-by: Manuel Mayer <suchbyte@hotmail.com>

* Fixed error label positition when resize

* Fixed error label positition when resize

* Updated version

* Fixed crash if Microsoft Visual C++ Redistributable is not installed

* Release/2.10.1 (#215)

* Fixed #145

* Update bug_report.md

* Update issue templates

* Update README.md

* Update Spanish.json

* Feature/button background color (#217)

* Fixed #145

* Update bug_report.md

* Update issue templates

* Update README.md

* Release/2.10.1 (#205)

* Added code for the new extension store

* Test

* Turned Mnemonic off for all controls supporting it (#158) (#159)

Co-authored-by: Develeon64 <software@develeon.de>

* Feature/check if a instance of macro deck is already running and show main window if (#162)

* First non-working test

* Switched pipe process spawn to STAThread (#161)

* Added SynchronizationContext to prevent thread issues in the ui

* Added SynchronizationContext to prevent thread issues in the ui

* Fixed: tray icon was shown multiple times when Macro Deck was started while running

Co-authored-by: RecklessBoon <16234384+RecklessBoon@users.noreply.github.com>

* Fixed: main Window not shown

* Fixed #155 (#163)

* Fixed #145 (#164)

* Added syntax highlighting

* Syntax highlight improvements (#165)

* syntax highlighting whole words
allow returns in Cottle
readable colours

* renamed variables

* Added option to turn on/off blank line trimming
Added auto complete
Added highlighting for variables

* Feature/template editor syntax highlighting (#166)

* Added syntax highlighting

* Syntax highlight improvements (#165)

* syntax highlighting whole words
allow returns in Cottle
readable colours

* renamed variables

* Added option to turn on/off blank line trimming
Added auto complete
Added highlighting for variables

Co-authored-by: Will <54237626+PhoenixWyllow@users.noreply.github.com>

* Added option to turn on/off blank line trimming

* Updated the plugin api

* Feature/offline plugin installation (#173)

* Feature/offline plugin installation (#168)

* Adds feature to install plugin from zip

- Extracted code that installs from zip to separate func
- Enhanced Manifest to create itself from a file
- Added GUI for picking and installing local zip
  - Needs UI improvement, but it works for now

* Improves manual plugin install GUI

* Added ExtensionManifest

Co-authored-by: RecklessBoon <16234384+RecklessBoon@users.noreply.github.com>

* Update Spanish.xml (#172)

* Feature/extension store (#174)

* Fixed: plugin and extension manifest was not loaded

* Fixed the url for the updater

* Re-added the check of the md5 hash of downloaded extensions

* Feature/extension store (#176)

* Fixed: plugin and extension manifest was not loaded

* Fixed the url for the updater

* Re-added the check of the md5 hash of downloaded extensions

* Fixed download counter

* Added Guid (#177)

* Feature/icon pack rewrite (#179)

* Begin of the rewrite of the icon system
Added converter for old icon packs

* Fixed GIFs

* Added local websocket server for usb connections in the future
Now sending the IconBase64 directly in the button object again

* Added message box

* Added backup for the new icon pack format

* Icon packs can be configured in the extension manager

* Added icon pack export

* Added icon pack import

* Added icon packs to the extension store

* Added icon packs to the extension store

* Fixed missing icon when button state = on

* Fixed installation for icon packs from the extension store

* Fixed installation for icon packs from the extension store

* Fixed ExtensionIcon for icon packs

* Removed plugin and icon pack selection in the initial setup; Added download count for icon packs; changed version to 2.9.0

* Fixed error when searching for extension updates

* Fixed bug that prevented the Extension Store from load (#181)

* Fixed bug that prevented the Extension Store from load (#183)

* Update templates (#184)

* Update bug_report.md

* Update issue templates

* Changed translation files to json

* Update README.md

* Update Crowdin configuration file

* Update Crowdin configuration file

* Update Crowdin configuration file

* Delete crowdin.yml

* Improved the design of the extension manager and added missing translations

* Improved the design of the extension manager and added missing translations (#186)

* Improved the ui of the button editor

* Removed untranslated strings

* Update README.md

* Update README.md

* Added save varible to file action

* Added Hungarian translation by @maketrue

* Update English.json (POEditor.com)

* Update Finnish.json (POEditor.com)

* Update French.json (POEditor.com)

* Update German.json (POEditor.com)

* Update Italian.json (POEditor.com)

* Update Korean.json (POEditor.com)

* Update Portuguese.json (POEditor.com)

* Update Russian.json (POEditor.com)

* Update Spanish.json (POEditor.com)

* Update Turkish.json (POEditor.com)

* Update Hungarian.json (POEditor.com)

* Added "Polish" translation by @kali

* Added translation support for Save variable to file action

* Updated translation files

* Fixed duplicate icon pack after icon pack update

* Fixes missing Author issue (#196)

* Replaced WebView2 with CefSharp (#197)

Co-authored-by: Manuel Mayer <suchbyte@hotmail.com>

* Fixed error label positition when resize

* Fixed error label positition when resize

* Updated version

* Fixed crash if Microsoft Visual C++ Redistributable is not installed

Co-authored-by: Develeon64 <software@develeon.de>
Co-authored-by: RecklessBoon <16234384+RecklessBoon@users.noreply.github.com>
Co-authored-by: Will <54237626+PhoenixWyllow@users.noreply.github.com>
Co-authored-by: l69lAnthony <91178943+l69lAnthony@users.noreply.github.com>
Co-authored-by: Manuel Mayer <suchbyte@hotmail.com>

* Update Spanish.json (#207)

* Added ability to select button background color (#208)

Co-authored-by: Develeon64 <software@develeon.de>
Co-authored-by: RecklessBoon <16234384+RecklessBoon@users.noreply.github.com>
Co-authored-by: Will <54237626+PhoenixWyllow@users.noreply.github.com>
Co-authored-by: l69lAnthony <91178943+l69lAnthony@users.noreply.github.com>
Co-authored-by: Manuel Mayer <suchbyte@hotmail.com>
Co-authored-by: ysaxa <102462519+ysaxa@users.noreply.github.com>

* Feature/hidpi improvement (#228)

* Changed AutoScaleMode to Dpi
Installed Microsoft.Win32.Registry library

* Changed project version

* Fixed #233
Added ReadVariableFromFileAction

* Updated translations

* Updated licenses

* Only user created variables visible in ReadVariableFromFile configurator

* Release 2.10.3-beta (#237)

* Update bug_report.md

* Update issue templates

* Develop (#235)

* Added code for the new extension store

* Test

* Turned Mnemonic off for all controls supporting it (#158) (#159)

Co-authored-by: Develeon64 <software@develeon.de>

* Feature/check if a instance of macro deck is already running and show main window if (#162)

* First non-working test

* Switched pipe process spawn to STAThread (#161)

* Added SynchronizationContext to prevent thread issues in the ui

* Added SynchronizationContext to prevent thread issues in the ui

* Fixed: tray icon was shown multiple times when Macro Deck was started while running

Co-authored-by: RecklessBoon <16234384+RecklessBoon@users.noreply.github.com>

* Fixed: main Window not shown

* Fixed #155 (#163)

* Fixed #145 (#164)

* Added syntax highlighting

* Syntax highlight improvements (#165)

* syntax highlighting whole words
allow returns in Cottle
readable colours

* renamed variables

* Added option to turn on/off blank line trimming
Added auto complete
Added highlighting for variables

* Feature/template editor syntax highlighting (#166)

* Added syntax highlighting

* Syntax highlight improvements (#165)

* syntax highlighting whole words
allow returns in Cottle
readable colours

* renamed variables

* Added option to turn on/off blank line trimming
Added auto complete
Added highlighting for variables

Co-authored-by: Will <54237626+PhoenixWyllow@users.noreply.github.com>

* Added option to turn on/off blank line trimming

* Updated the plugin api

* Feature/offline plugin installation (#173)

* Feature/offline plugin installation (#168)

* Adds feature to install plugin from zip

- Extracted code that installs from zip to separate func
- Enhanced Manifest to create itself from a file
- Added GUI for picking and installing local zip
  - Needs UI improvement, but it works for now

* Improves manual plugin install GUI

* Added ExtensionManifest

Co-authored-by: RecklessBoon <16234384+RecklessBoon@users.noreply.github.com>

* Update Spanish.xml (#172)

* Feature/extension store (#174)

* Fixed: plugin and extension manifest was not loaded

* Fixed the url for the updater

* Re-added the check of the md5 hash of downloaded extensions

* Feature/extension store (#176)

* Fixed: plugin and extension manifest was not loaded

* Fixed the url for the updater

* Re-added the check of the md5 hash of downloaded extensions

* Fixed download counter

* Added Guid (#177)

* Feature/icon pack rewrite (#179)

* Begin of the rewrite of the icon system
Added converter for old icon packs

* Fixed GIFs

* Added local websocket server for usb connections in the future
Now sending the IconBase64 directly in the button object again

* Added message box

* Added backup for the new icon pack format

* Icon packs can be configured in the extension manager

* Added icon pack export

* Added icon pack import

* Added icon packs to the extension store

* Added icon packs to the extension store

* Fixed missing icon when button state = on

* Fixed installation for icon packs from the extension store

* Fixed installation for icon packs from the extension store

* Fixed ExtensionIcon for icon packs

* Removed plugin and icon pack selection in the initial setup; Added download count for icon packs; changed version to 2.9.0

* Fixed error when searching for extension updates

* Fixed bug that prevented the Extension Store from load (#181)

* Fixed bug that prevented the Extension Store from load (#183)

* Update templates (#184)

* Update bug_report.md

* Update issue templates

* Changed translation files to json

* Update README.md

* Update Crowdin configuration file

* Update Crowdin configuration file

* Update Crowdin configuration file

* Delete crowdin.yml

* Improved the design of the extension manager and added missing translations

* Improved the design of the extension manager and added missing translations (#186)

* Improved the ui of the button editor

* Removed untranslated strings

* Update README.md

* Update README.md

* Added save varible to file action

* Added Hungarian translation by @maketrue

* Update English.json (POEditor.com)

* Update Finnish.json (POEditor.com)

* Update French.json (POEditor.com)

* Update German.json (POEditor.com)

* Update Italian.json (POEditor.com)

* Update Korean.json (POEditor.com)

* Update Portuguese.json (POEditor.com)

* Update Russian.json (POEditor.com)

* Update Spanish.json (POEditor.com)

* Update Turkish.json (POEditor.com)

* Update Hungarian.json (POEditor.com)

* Added "Polish" translation by @kali

* Added translation support for Save variable to file action

* Updated translation files

* Fixed duplicate icon pack after icon pack update

* Fixes missing Author issue (#196)

* Replaced WebView2 with CefSharp (#197)

Co-authored-by: Manuel Mayer <suchbyte@hotmail.com>

* Fixed error label positition when resize

* Fixed error label positition when resize

* Updated version

* Fixed crash if Microsoft Visual C++ Redistributable is not installed

* Release/2.10.1 (#215)

* Fixed #145

* Update bug_report.md

* Update issue templates

* Update README.md

* Update Spanish.json

* Feature/button background color (#217)

* Fixed #145

* Update bug_report.md

* Update issue templates

* Update README.md

* Release/2.10.1 (#205)

* Added code for the new extension store

* Test

* Turned Mnemonic off for all controls supporting it (#158) (#159)

Co-authored-by: Develeon64 <software@develeon.de>

* Feature/check if a instance of macro deck is already running and show main window if (#162)

* First non-working test

* Switched pipe process spawn to STAThread (#161)

* Added SynchronizationContext to prevent thread issues in the ui

* Added SynchronizationContext to prevent thread issues in the ui

* Fixed: tray icon was shown multiple times when Macro Deck was started while running

Co-authored-by: RecklessBoon <16234384+RecklessBoon@users.noreply.github.com>

* Fixed: main Window not shown

* Fixed #155 (#163)

* Fixed #145 (#164)

* Added syntax highlighting

* Syntax highlight improvements (#165)

* syntax highlighting whole words
allow returns in Cottle
readable colours

* renamed variables

* Added option to turn on/off blank line trimming
Added auto complete
Added highlighting for variables

* Feature/template editor syntax highlighting (#166)

* Added syntax highlighting

* Syntax highlight improvements (#165)

* syntax highlighting whole words
allow returns in Cottle
readable colours

* renamed variables

* Added option to turn on/off blank line trimming
Added auto complete
Added highlighting for variables

Co-authored-by: Will <54237626+PhoenixWyllow@users.noreply.github.com>

* Added option to turn on/off blank line trimming

* Updated the plugin api

* Feature/offline plugin installation (#173)

* Feature/offline plugin installation (#168)

* Adds feature to install plugin from zip

- Extracted code that installs from zip to separate func
- Enhanced Manifest to create itself from a file
- Added GUI for picking and installing local zip
  - Needs UI improvement, but it works for now

* Improves manual plugin install GUI

* Added ExtensionManifest

Co-authored-by: RecklessBoon <16234384+RecklessBoon@users.noreply.github.com>

* Update Spanish.xml (#172)

* Feature/extension store (#174)

* Fixed: plugin and extension manifest was not loaded

* Fixed the url for the updater

* Re-added the check of the md5 hash of downloaded extensions

* Feature/extension store (#176)

* Fixed: plugin and extension manifest was not loaded

* Fixed the url for the updater

* Re-added the check of the md5 hash of downloaded extensions

* Fixed download counter

* Added Guid (#177)

* Feature/icon pack rewrite (#179)

* Begin of the rewrite of the icon system
Added converter for old icon packs

* Fixed GIFs

* Added local websocket server for usb connections in the future
Now sending the IconBase64 directly in the button object again

* Added message box

* Added backup for the new icon pack format

* Icon packs can be configured in the extension manager

* Added icon pack export

* Added icon pack import

* Added icon packs to the extension store

* Added icon packs to the extension store

* Fixed missing icon when button state = on

* Fixed installation for icon packs from the extension store

* Fixed installation for icon packs from the extension store

* Fixed ExtensionIcon for icon packs

* Removed plugin and icon pack selection in the initial setup; Added download count for icon packs; changed version to 2.9.0

* Fixed error when searching for extension updates

* Fixed bug that prevented the Extension Store from load (#181)

* Fixed bug that prevented the Extension Store from load (#183)

* Update templates (#184)

* Update bug_report.md

* Update issue templates

* Changed translation files to json

* Update README.md

* Update Crowdin configuration file

* Update Crowdin configuration file

* Update Crowdin configuration file

* Delete crowdin.yml

* Improved the design of the extension manager and added missing translations

* Improved the design of the extension manager and added missing translations (#186)

* Improved the ui of the button editor

* Removed untranslated strings

* Update README.md

* Update README.md

* Added save varible to file action

* Added Hungarian translation by @maketrue

* Update English.json (POEditor.com)

* Update Finnish.json (POEditor.com)

* Update French.json (POEditor.com)

* Update German.json (POEditor.com)

* Update Italian.json (POEditor.com)

* Update Korean.json (POEditor.com)

* Update Portuguese.json (POEditor.com)

* Update Russian.json (POEditor.com)

* Update Spanish.json (POEditor.com)

* Update Turkish.json (POEditor.com)

* Update Hungarian.json (POEditor.com)

* Added "Polish" translation by @kali

* Added translation support for Save variable to file action

* Updated translation files

* Fixed duplicate icon pack after icon pack update

* Fixes missing Author issue (#196)

* Replaced WebView2 with CefSharp (#197)

Co-authored-by: Manuel Mayer <suchbyte@hotmail.com>

* Fixed error label positition when resize

* Fixed error label positition when resize

* Updated version

* Fixed crash if Microsoft Visual C++ Redistributable is not installed

Co-authored-by: Develeon64 <software@develeon.de>
Co-authored-by: RecklessBoon <16234384+RecklessBoon@users.noreply.github.com>
Co-authored-by: Will <54237626+PhoenixWyllow@users.noreply.github.com>
Co-authored-by: l69lAnthony <91178943+l69lAnthony@users.noreply.github.com>
Co-authored-by: Manuel Mayer <suchbyte@hotmail.com>

* Update Spanish.json (#207)

* Added ability to select button background color (#208)

Co-authored-by: Develeon64 <software@develeon.de>
Co-authored-by: RecklessBoon <16234384+RecklessBoon@users.noreply.github.com>
Co-authored-by: Will <54237626+PhoenixWyllow@users.noreply.github.com>
Co-authored-by: l69lAnthony <91178943+l69lAnthony@users.noreply.github.com>
Co-authored-by: Manuel Mayer <suchbyte@hotmail.com>
Co-authored-by: ysaxa <102462519+ysaxa@users.noreply.github.com>

* Feature/hidpi improvement (#228)

* Changed AutoScaleMode to Dpi
Installed Microsoft.Win32.Registry library

* Changed project version

* Fixed #233
Added ReadVariableFromFileAction

* Updated translations

* Updated licenses

* Only user created variables visible in ReadVariableFromFile configurator

Co-authored-by: Develeon64 <software@develeon.de>
Co-authored-by: RecklessBoon <16234384+RecklessBoon@users.noreply.github.com>
Co-authored-by: Will <54237626+PhoenixWyllow@users.noreply.github.com>
Co-authored-by: l69lAnthony <91178943+l69lAnthony@users.noreply.github.com>
Co-authored-by: Manuel Mayer <suchbyte@hotmail.com>
Co-authored-by: ysaxa <102462519+ysaxa@users.noreply.github.com>

Co-authored-by: Develeon64 <software@develeon.de>
Co-authored-by: RecklessBoon <16234384+RecklessBoon@users.noreply.github.com>
Co-authored-by: Will <54237626+PhoenixWyllow@users.noreply.github.com>
Co-authored-by: l69lAnthony <91178943+l69lAnthony@users.noreply.github.com>
Co-authored-by: Manuel Mayer <suchbyte@hotmail.com>
Co-authored-by: ysaxa <102462519+ysaxa@users.noreply.github.com>

* Fixed variables not saving; Improved ui (#242)

* Made IconPacksLoaded public set

* Add start parameters to the restart function

* Optimized Ui

* Moved internal plugins to a new folder

* Feature/device plugin (#243)

* Added set profile action

* Added strings for the device plugin

* Feature/device plugin (#244)

* Added set profile action

* Added strings for the device plugin

* Added "Where executed" option to the Set Profile action

* Added set brightness action

* Updated api version to 33 because of IconManager.IconPacksLoaded

* Enabled button background color (#245)

* Optimized variables
Added donation button

* Improved performance

* 2.11.1

* Fixed the change variable value action

* Rewrote the Extension Store Downloader (#251)

* Added missing translation strings

* Added change background color action

* Updated translation files

* Variable filters are now saved

* Improved server performance

* Added Chinese

* Update Chinese.json (POEditor.com)

* Update Dutch.json (POEditor.com)

* Update English.json (POEditor.com)

* Update Filipino.json (POEditor.com)

* Update Finnish.json (POEditor.com)

* Update French.json (POEditor.com)

* Update German.json (POEditor.com)

* Update Hungarian.json (POEditor.com)

* Update Italian.json (POEditor.com)

* Update Japanese.json (POEditor.com)

* Update Korean.json (POEditor.com)

* Update Polish.json (POEditor.com)

* Update Portuguese.json (POEditor.com)

* Update Russian.json (POEditor.com)

* Update Spanish.json (POEditor.com)

* Update Turkish.json (POEditor.com)

* Fixed wrong translations

* Fixed typo

* Added new connection request dialogue + shortened the shown version string

* Disabled the Beta channel by default

* Disabled the Beta channel by default

* Updated version

* Updated version

* Develop (#260)

* Added adb manager (#258)

* Fixed Cottle code disappears #257

* Added MacroDeck.OnMacroDeckLoaded
Added VariableManager.GetVariables(MacroDeckPlugin macroDeckPlugin)
Added VariableManager.GetVariable(MacroDeckPlugin macroDeckPlugin, string variableName)
Added notification system

* Added notifications

* Fixed crash when main window is closed with the notification list open

Co-authored-by: Develeon64 <software@develeon.de>
Co-authored-by: RecklessBoon <16234384+RecklessBoon@users.noreply.github.com>
Co-authored-by: Will <54237626+PhoenixWyllow@users.noreply.github.com>
Co-authored-by: l69lAnthony <91178943+l69lAnthony@users.noreply.github.com>
Co-authored-by: Manuel Mayer <suchbyte@hotmail.com>
Co-authored-by: ysaxa <102462519+ysaxa@users.noreply.github.com>
  • Loading branch information
7 people authored Jul 13, 2022
1 parent fed4f5e commit 486adbe
Show file tree
Hide file tree
Showing 152 changed files with 10,789 additions and 723 deletions.
56 changes: 43 additions & 13 deletions ActionButton/ActionButton.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ public void UpdateHotkey()

public void UpdateBindingState()
{
if (!String.IsNullOrWhiteSpace(this.StateBindingVariable))
if (!string.IsNullOrWhiteSpace(this.StateBindingVariable))
{
Variables.Variable variable = Variables.VariableManager.Variables.Find(v => v.Name.Equals(this.StateBindingVariable));
Variables.Variable variable = Variables.VariableManager.ListVariables.ToList().Find(v => v.Name.Equals(this.StateBindingVariable));
if (variable != null)
{
this.UpdateBindingState(variable);
Expand Down Expand Up @@ -132,9 +132,15 @@ private void UpdateBindingState(Variables.Variable variable)
public event EventHandler IconChanged;

private bool _state = false;
private string _iconOff = string.Empty;
private string _iconOn = string.Empty;
private Color _backgroundColorOff = Color.FromArgb(35, 35, 35);
private Color _backgroundColorOn = Color.FromArgb(35, 35, 35);


public bool State
{
get { return _state; }
get => _state;
set
{
if (_state == value) return;
Expand All @@ -147,12 +153,9 @@ public bool State
}
}

private string _iconOff = string.Empty;
public string IconOff {
get
{
return this._iconOff;
}
get => this._iconOff;

set
{
this._iconOff = value;
Expand All @@ -162,13 +165,10 @@ public string IconOff {
}
}
}
private string _iconOn = string.Empty;

public string IconOn
{
get
{
return this._iconOn;
}
get => this._iconOn;
set
{
this._iconOn = value;
Expand All @@ -179,6 +179,36 @@ public string IconOn
}
}

public Color BackColorOff
{
get => this._backgroundColorOff;
set
{
if (this._backgroundColorOff == value) return;
this._backgroundColorOff = value;
MacroDeckServer.UpdateState(this);
if (StateChanged != null)
{
StateChanged(this, EventArgs.Empty);
}
}
}

public Color BackColorOn
{
get => this._backgroundColorOn;
set
{
if (this._backgroundColorOn == value) return;
this._backgroundColorOn = value;
MacroDeckServer.UpdateState(this);
if (StateChanged != null)
{
StateChanged(this, EventArgs.Empty);
}
}
}

public ButtonLabel LabelOff { get; set; } = new ButtonLabel();
public ButtonLabel LabelOn { get; set; } = new ButtonLabel();
public Color BackColorOff = Color.FromArgb(35, 35, 35);
Expand Down
6 changes: 2 additions & 4 deletions ActionButton/ConditionAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,14 @@ private void UpdateConfiguration()

public override string Description => "";

public override string DisplayName { get; set; }

public ActionConfigControl GetActionConfigurator(ActionConfigurator actionConfigurator) { return null; }

public override void Trigger(string clientId, ActionButton actionButton) {
bool result = false;
string conditionValue2 = this.ConditionValue2.ToString();
Variables.Variable variable = Variables.VariableManager.Variables.Find(v => v.Name.Equals(this._conditionValue1Source));
Variable variable = VariableManager.ListVariables.ToList().Find(v => v.Name.Equals(this._conditionValue1Source));

foreach (Variables.Variable v in Variables.VariableManager.Variables)
foreach (Variable v in VariableManager.ListVariables)
{
if (conditionValue2.ToLower().Contains("{" + v.Name.ToLower() + "}"))
{
Expand Down
3 changes: 3 additions & 0 deletions Backup/BackupManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using SuchByte.MacroDeck.Language;
using SuchByte.MacroDeck.Logging;
using SuchByte.MacroDeck.Utils;
using SuchByte.MacroDeck.Variables;
using System;
using System.Collections.Generic;
using System.Diagnostics;
Expand Down Expand Up @@ -217,6 +218,7 @@ public static void CreateBackup()
{
if (BackupInProgress) return;
BackupInProgress = true;
VariableManager.Close();
string backupFileName = string.Format("backup_{0}.zip", DateTime.Now.ToString("yy-MM-dd_HH-mm-ss"));
MacroDeckLogger.Info("Sarting creation of backup: " + backupFileName);

Expand Down Expand Up @@ -270,6 +272,7 @@ public static void CreateBackup()
}
} finally
{
VariableManager.Initialize();
BackupInProgress = false;
}
}
Expand Down
7 changes: 2 additions & 5 deletions Configuration/Configuration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,8 @@ public bool AutoStart { get
[JsonProperty("Update.Auto")]
public bool AutoUpdates { get; set; } = true;

[JsonProperty("Update.Channel.Dev")]
public bool UpdateDevVersions { get; set; } = false;

[JsonProperty("Update.Channel.Beta")]
public bool UpdateBetaVersions { get; set; } = true;
[JsonProperty("Update.InstallBeta")]
public bool UpdateBetaVersions { get; set; } = false;

[JsonProperty("Connection.Host.Address")]
public string Host_Address { get; set; }
Expand Down
39 changes: 17 additions & 22 deletions Device/DeviceManager.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
using Newtonsoft.Json;
using SuchByte.MacroDeck.GUI.Dialogs;
using SuchByte.MacroDeck.Logging;
using SuchByte.MacroDeck.Profiles;
using SuchByte.MacroDeck.Server;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Windows.Forms;

Expand Down Expand Up @@ -184,7 +186,7 @@ public static bool RequestConnection(MacroDeckClient macroDeckClient)
mainForm = form;
}
}
if (mainForm != null)
if (mainForm != null && mainForm.IsHandleCreated && !mainForm.IsDisposed)
{
mainForm.Invoke(new Action(() =>
{
Expand All @@ -201,6 +203,7 @@ public static bool RequestConnection(MacroDeckClient macroDeckClient)
{
ClientId = macroDeckClient.ClientId,
DisplayName = "Client " + macroDeckClient.ClientId,
ProfileId = ProfileManager.Profiles.FirstOrDefault().ProfileId,
};
AddKnownDevice(macroDeckDevice);
macroDeckDevice.ClientId = macroDeckClient.ClientId;
Expand All @@ -227,35 +230,27 @@ public static bool RequestConnection(MacroDeckClient macroDeckClient)

private static bool ShowConnectionDialog(MacroDeckClient macroDeckClient)
{
using (var msgBox = new GUI.CustomControls.MessageBox())
System.Media.SystemSounds.Exclamation.Play();
using var newConnectionDialog = new NewConnectionDialog(macroDeckClient);
if (newConnectionDialog.ShowDialog() == DialogResult.Yes)
{
System.Media.SystemSounds.Exclamation.Play();
if (msgBox.ShowDialog(Language.LanguageManager.Strings.NewConnection, String.Format(Language.LanguageManager.Strings.XIsAnUnknownDevice, macroDeckClient.ClientId), MessageBoxButtons.YesNo) == DialogResult.Yes)
return true;
}
else
{
macroDeckClient?.SocketConnection?.Close();
if (newConnectionDialog.Blocked)
{
MacroDeckDevice macroDeckDevice = new MacroDeckDevice
{
ClientId = macroDeckClient.ClientId,
DisplayName = "Client " + macroDeckClient.ClientId,
ProfileId = ProfileManager.Profiles[0].ProfileId
Blocked = true
};
DeviceManager.AddKnownDevice(macroDeckDevice);
return true;
}
else
{
macroDeckClient.SocketConnection.Close();
if (msgBox.ShowDialog(Language.LanguageManager.Strings.BlockConnection, String.Format(Language.LanguageManager.Strings.ShouldMacroDeckBlockConnectionsFromX, macroDeckClient.ClientId), MessageBoxButtons.YesNo) == DialogResult.Yes)
{
MacroDeckDevice macroDeckDevice = new MacroDeckDevice
{
ClientId = macroDeckClient.ClientId,
DisplayName = "Client " + macroDeckClient.ClientId,
Blocked = true
};
DeviceManager.AddKnownDevice(macroDeckDevice);
}
return false;
AddKnownDevice(macroDeckDevice);
}
return false;

}
}

Expand Down
3 changes: 1 addition & 2 deletions Device/DeviceType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ namespace SuchByte.MacroDeck.Device
public enum DeviceType
{
Unknown,
Macro_Deck_DIY_OLED_6_V1,
WebPackageManager,
Web,
Android,
iOS,
StreamDeck,
}
}
12 changes: 12 additions & 0 deletions Enums/AdbDeviceConnectionState.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Text;

namespace SuchByte.MacroDeck.Enums
{
public enum AdbDeviceConnectionState
{
CONNECTED,
DISCONNECTED
}
}
87 changes: 87 additions & 0 deletions ExtensionStore/ExtensionStoreHelper.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
<<<<<<< HEAD
using SuchByte.MacroDeck.GUI.CustomControls;
using SuchByte.MacroDeck.GUI.Dialogs;
using SuchByte.MacroDeck.GUI.MainWindowViews;
using SuchByte.MacroDeck.Icons;
using SuchByte.MacroDeck.Language;
using SuchByte.MacroDeck.Logging;
using SuchByte.MacroDeck.Model;
using SuchByte.MacroDeck.Notifications;
=======
using SuchByte.MacroDeck.GUI.Dialogs;
using SuchByte.MacroDeck.Icons;
using SuchByte.MacroDeck.Model;
>>>>>>> origin/main
using SuchByte.MacroDeck.Plugins;
using System;
using System.Collections.Generic;
Expand All @@ -16,6 +27,15 @@ public class ExtensionStoreHelper

private static ExtensionStoreDownloader extensionStoreDownloader;

<<<<<<< HEAD
public static event EventHandler OnInstallationFinished;

private static string _updateNotification;

private static bool _updateCheckRunning = false;

=======
>>>>>>> origin/main
public static void InstallPluginById(string packageId)
{
InstallPackages(new List<ExtensionStoreDownloaderPackageInfoModel> { new ExtensionStoreDownloaderPackageInfoModel() { PackageId = packageId, ExtensionType = ExtensionType.Plugin } });
Expand All @@ -40,7 +60,15 @@ public static void InstallPackages(List<ExtensionStoreDownloaderPackageInfoModel
{
Owner = MacroDeck.MainWindow,
};
<<<<<<< HEAD
extensionStoreDownloader.ShowDialog();
if (OnInstallationFinished != null)
{
OnInstallationFinished(null, EventArgs.Empty);
}
=======
extensionStoreDownloader.Show();
>>>>>>> origin/main
}));
}

Expand All @@ -51,6 +79,11 @@ public static string GetPackageId(MacroDeckPlugin macroDeckPlugin)

public static void SearchUpdatesAsync()
{
<<<<<<< HEAD
if (_updateCheckRunning) return;
_updateCheckRunning = true;
=======
>>>>>>> origin/main
PluginManager.PluginsUpdateAvailable.Clear();
IconManager.IconPacksUpdateAvailable.Clear();
Task.Run(() =>
Expand All @@ -68,14 +101,68 @@ public static void SearchUpdatesAsync()
IconManager.SearchUpdate(iconPack);
}

<<<<<<< HEAD
if (NotificationManager.GetNotification(_updateNotification) == null && (PluginManager.PluginsUpdateAvailable.Count + IconManager.IconPacksUpdateAvailable.Count) > 0)
{
var btnOpenExtensionManager = new ButtonPrimary()
{
AutoSize = true,
Text = LanguageManager.Strings.OpenExtensionManager
};
btnOpenExtensionManager.Click += (sender, e) =>
{
MacroDeck.MainWindow?.SetView(new ExtensionsView());
};
var btnUpdateAll = new ButtonPrimary()
{
AutoSize = true,
Text = LanguageManager.Strings.UpdateAll,
};
btnUpdateAll.Click += (sender, e) =>
{
NotificationManager.RemoveNotification(_updateNotification);
UpdateAllPackages();
};
_updateNotification = NotificationManager.SystemNotification("Extension Store", LanguageManager.Strings.UpdatesAvailable, true, icon: Properties.Resources.Macro_Deck_2021_update, controls: new List<System.Windows.Forms.Control>() { btnOpenExtensionManager, btnUpdateAll });
}

_updateCheckRunning = false;

=======
>>>>>>> origin/main
if (OnUpdateCheckFinished != null)
{
OnUpdateCheckFinished(null, EventArgs.Empty);
}
});
}

<<<<<<< HEAD
public static void UpdateAllPackages()
{
List<ExtensionStoreDownloaderPackageInfoModel> packages = new List<ExtensionStoreDownloaderPackageInfoModel>();
foreach (var updatePlugin in PluginManager.PluginsUpdateAvailable)
{
if (PluginManager.UpdatedPlugins.Contains(updatePlugin)) continue;
packages.Add(new ExtensionStoreDownloaderPackageInfoModel()
{
ExtensionType = ExtensionType.Plugin,
PackageId = ExtensionStoreHelper.GetPackageId(updatePlugin)
});
}
foreach (var updateIconPack in IconManager.IconPacksUpdateAvailable)
{
packages.Add(new ExtensionStoreDownloaderPackageInfoModel()
{
ExtensionType = ExtensionType.IconPack,
PackageId = updateIconPack.PackageId,
});
}
InstallPackages(packages);
}
=======

>>>>>>> origin/main

public static string InstalledIconPacksAsString
{
Expand Down
Loading

0 comments on commit 486adbe

Please sign in to comment.