Skip to content

Commit

Permalink
Feature/1 initial tests (#6)
Browse files Browse the repository at this point in the history
closes #2 . Adding entities is possible now
closes #3 automatic updates of values
fixed crash when removing entity
  • Loading branch information
JonasJurczok authored Nov 29, 2018
1 parent fc4ad00 commit 0f3062c
Show file tree
Hide file tree
Showing 9 changed files with 366 additions and 138 deletions.
2 changes: 2 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
16.1.0
------------------
68 changes: 9 additions & 59 deletions locale/de/locale.cfg
Original file line number Diff line number Diff line change
@@ -1,62 +1,12 @@
[todo]
todo_list=Todo List
title_done=Status
title_task=Aufgabe
title_assignee=Zugewiesen an
title_edit=Bearbeiten
title_details=Details

minimize=Minimieren
add=Neue Aufgabe
add_assignee=Bearbeiter
add_task=Aufgabe
add_title=Neue Aufgabe anlegen
add_task_title=Titel
add_top=Oben hinzufügen

edit_title=Aufgabe ändern

persist=Speichern
[pmon]
title=PowerMon
add_monitor=Überwachung hinzufügen
add_monitor_name=Anzeigename
cancel=Abbrechen
update=Speichern
delete=Löschen
confirm_deletion=Wirklich löschen

import=Importieren
export=Exportieren

unassigned=Nicht zugewiesen
assign_self=Mir zuweisen
show_done=Zeige abgeschlossene Aufgaben
hide_done=Verberge abgeschlossene Aufgaben

tasks_available= __1__ Aufgaben verfügbar

created_by=Erstellt von
updated_by=Geändert von
noone=Niemand

add_subtask=Unteraufgabe erstellen
edit_subtask=Unteraufgabe bearbeiten
delete_subtask=Unteraufgabe löschen

[controls]
todolist-toggle-ui=Todo Liste minimieren/maximieren

[mod-setting-name]
todolist-show-button=Zeige "Todo List" Schalter.
todolist-show-log=Zeige debug Nachrichten im Chatfenster an.
todolist-window-height=Fensterhöhe
todolist-auto-assign=Auto-assign tasks
todolist-click-edit-task=Edit task on middle click
add=Speichern

[mod-setting-description]
todolist-show-button=Wenn aktiviert wird immer ein "Todo List" Schalter in der oberen linken Ecke angezeigt.\nWenn deaktiviert kann die Todo Liste nur über den Hotkey (standard shift+t) aufgerufen werden.
todolist-show-log=Wenn aktiviert werden debug Nachrichten des mods im Chatfenster angezeigt.\nAchtung: Es sind sehr viele Nachrichten.
todolist-window-height=Die Höhe des TodoList Fensters. Standard ist 600.
todolist-auto-assign=If there is only one player in the game, auto-assign the task to this player.
todolist-click-edit-task=If enabled the middle click will open the edit popup. Default on right click.
[technology-name]
pmon-power-monitoring=Power Monitoring

[string-mod-setting]
todolist-click-edit-task-right-button=Right button
todolist-click-edit-task-middle-button=Middle button
[item-name]
pmon-power-monitor=Power Monitor
68 changes: 9 additions & 59 deletions locale/en/locale.cfg
Original file line number Diff line number Diff line change
@@ -1,62 +1,12 @@
[todo]
todo_list=Todo List
title_done=Done
title_task=Task
title_assignee=Assignee
title_edit=Edit
title_details=Details

minimize=Minimize
add=Add new
add_assignee=Assignee
add_task=Task
add_title=Add new task
add_task_title=Title
add_top=Add to Top

edit_title=Edit task

persist=Save
[pmon]
title=PowerMon
add_monitor=Add monitor
add_monitor_name=Displayname
cancel=Cancel
update=Update
delete=Delete
confirm_deletion=Confirm deletion

import=import
export=export

unassigned=Unassigned
assign_self=Take
show_done=Show completed Tasks
hide_done=Hide completed Tasks

tasks_available=__1__ Tasks available

created_by=Created by
updated_by=Modified by
noone=No One

add_subtask=Create subtask
edit_subtask=Edit subtask
delete_subtask=Delete subtask

[controls]
todolist-toggle-ui=Min/maximize todo list

[mod-setting-name]
todolist-show-button=Show "Todo List" button.
todolist-show-log=Show debug log messages in the chat window.
todolist-window-height=Todo list window height
todolist-auto-assign=Auto-assign tasks
todolist-click-edit-task=Edit task on middle click
add=Save

[mod-setting-description]
todolist-show-button=If enabled will always show a "Todo List" button in the top left.\nIf disabled the todo list can only be accessed by its hotkey (default shift-t).
todolist-show-log=If enabled the mod will print debug messages to the chat window.\nAttention: there are a lot of them :)
todolist-window-height=The height of the todo list window. Default is 600.
todolist-auto-assign=If there is only one player in the game, auto-assign the task to this player.
todolist-click-edit-task=If enabled the middle click will open the edit popup. Default on right click.
[technology-name]
pmon-power-monitoring=Power Monitoring

[string-mod-setting]
todolist-click-edit-task-right-button=Right button
todolist-click-edit-task-middle-button=Middle button
[item-name]
pmon-power-monitor=Power Monitor
25 changes: 15 additions & 10 deletions src/control.lua
Original file line number Diff line number Diff line change
@@ -1,32 +1,37 @@

require "mod-gui"
require "todo/todo"
require "pmon/pmon"

-- when creating a new game, initialize data structure
script.on_init(todo.mod_init)
script.on_init(pmon.mod_init)

-- When a player is joining, create the UI for them
script.on_event(defines.events.on_player_created, function(event)
--[[script.on_event(defines.events.on_player_created, function(event)
local player = game.players[event.player_index]
todo.create_maximize_button(player)
end)
pmon.create_ui(player)
end)]]--

-- if the version of the mod or any other version changed
script.on_configuration_changed(function(_)
todo.mod_init()
pmon.mod_init()
end)

script.on_event(defines.events.on_gui_click, function(event)
todo.on_gui_click(event)
pmon.on_gui_click(event)
end)

script.on_event("todolist-toggle-ui", function(event)
local player = game.players[event.player_index]
todo.toggle_main_frame(player)
script.on_event(defines.events.on_tick, function(event)
pmon.on_tick(event)
end)

script.on_event(defines.events.on_player_selected_area, function(event)
pmon.on_player_selected_area(event)
end)

--[[
script.on_event(defines.events.on_runtime_mod_setting_changed, function(event)
local player = game.players[event.player_index]
local key = event.setting
todo.on_runtime_mod_setting_changed(player, key)
end)
]]--
11 changes: 2 additions & 9 deletions src/data.lua
Original file line number Diff line number Diff line change
@@ -1,9 +1,2 @@
require('todo.style')

local hotkey = {
type = "custom-input",
name = "todolist-toggle-ui",
key_sequence = "SHIFT + T",
consuming = "none",
}
data:extend({hotkey})
require('pmon.style')
require('pmon.prototypes')
Loading

0 comments on commit 0f3062c

Please sign in to comment.