Skip to content

Commit

Permalink
Push new Version, also Add fix for potential Plugin crash
Browse files Browse the repository at this point in the history
  • Loading branch information
CMDR-WDX authored Jan 22, 2023
1 parent 8d0c626 commit 0d8aed2
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 5 deletions.
10 changes: 9 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,12 @@ The Version check is the only time the plugins does a Web-Call. And all it does
Because EDMC does not keep track of Missions the plugin will read through the last 2 weeks of logs on startup
and collect all Mission-Events.

Also, when doing an Update-Check the `version`-File is read.
Also, when doing an Update-Check the `version`-File is read.


## Integrations
This plugins features integrations. You can think of them as Plugins for this Plugin.

### edmcoverlay (Linux)
This integration add the option to send data to edmcoverlay. When you pick up new missions you will get the current stack as an overlay.
Thank you @pan-mroku for the Pull Request.
3 changes: 1 addition & 2 deletions massacre/integrations/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
from massacre.integrations.integration import Integration
import myNotebook as nb

from massacre.integrations.example import ExampleIntegration
from massacre.integrations.overlay.integration import OverlayIntegration

__INTEGRATION_CONSTRUCTORS = [ExampleIntegration, OverlayIntegration]
__INTEGRATION_CONSTRUCTORS = [OverlayIntegration]
"""
Put all Integration Classes in here
"""
Expand Down
9 changes: 8 additions & 1 deletion massacre/ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,15 @@ def rebuild_settings(self, config: Configuration):
self.update_ui()

def set_frame(self, frame: tk.Frame):
# New EDMC Update seems to break frame.grid_size. It returned 0 for EDMC-PVPBot (where I reused the code from here)
# So it will probably also return 0 here. Someone on the latest version should maybe check it.

# Check if it is 0 and set it to 1. Should probably look into this further at some point.
cspan = frame.grid_size()[1]
if cspan < 1:
cspan = 1
self.__frame = tk.Frame(frame)
self.__frame.grid(column=0, columnspan=frame.grid_size()[1], sticky=tk.W)
self.__frame.grid(column=0, columnspan=cspan, sticky=tk.W)
self.__frame.bind("<<Refresh>>", lambda _: self.update_ui())
self.update_ui()

Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.3
2.0.4

0 comments on commit 0d8aed2

Please sign in to comment.