Skip to content

Commit

Permalink
fixed links, fixed #37: disable Edit mod when multiple selected
Browse files Browse the repository at this point in the history
  • Loading branch information
ewerybody committed Aug 10, 2015
1 parent 9a02961 commit 5466cc0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
4 changes: 2 additions & 2 deletions doc/a2DO.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
a2DO:
in flight:
* create hotkey control which writes hotkeys.ahk inlcude
* finish adding scoped hotkeys
* borrow scope selection and hotkey getter from aA?
* add multiple hotkey user functionality
* check for hotkey conflicts before submit
* allow multiple hotkeys in edit mode
* disable Edit mod when multiple selected
* create dev config page
* author name (get user name by default), script editor, github handle?, jsonIndent ...
* implement available scripts browse function
Expand All @@ -20,12 +18,14 @@ in flight:
* create check control which writes inlcudes: variables.ahk/inlcude.ahk

a2DONE:
* disable Edit mod when multiple selected
* add element > include uses available scipts list
* make windowsettings use db
* resolve settingsChanged bug a2 loads old includes before saving is finished
* EditCtrls: unify "element" and "data" to cfg
* added QComboBox to be handled by EditCtrl automatically
* hotkey stuff
* finish adding scoped hotkeys
* implement hotkey data in change loop
* save as little user prefs as possible
if nothing set: take it from cfg
Expand Down
11 changes: 5 additions & 6 deletions ui/a2ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@

class URLs(object):
def __init__(self):
self.a2 = 'https://github.com/ewerybody/a2#description'
self.a2 = 'https://github.com/ewerybody/a2'
self.help = self.a2 + '#description'
self.ahk = 'http://ahkscript.org'
self.ahksend = 'http://ahkscript.org/docs/commands/Send.htm'
self.helpEditCtrl = self.a2 + '/wiki/EditCtrls'
Expand Down Expand Up @@ -84,7 +85,7 @@ def setupUi(self):
self.ui.actionEdit_module.setShortcut("Ctrl+E")
self.ui.actionDisable_all_modules.triggered.connect(self.modDisableAll)
self.ui.actionExplore_to.triggered.connect(self.exploreMod)
self.ui.actionAbout_a2.triggered.connect(partial(self.surfTo, self.urls.a2))
self.ui.actionAbout_a2.triggered.connect(partial(self.surfTo, self.urls.help))
self.ui.actionAbout_Autohotkey.triggered.connect(partial(self.surfTo, self.urls.ahk))
self.ui.actionExplore_to_a2_dir.triggered.connect(self.exploreA2)

Expand Down Expand Up @@ -249,12 +250,10 @@ def editMod(self):
On Cancel the in-edit config is discarded and drawMod called which draws the
UI unchanged.
"""
if self.mod is None:
if len(self.selectedMod) != 1 or self.selectedMod[0] == 'a2':
return

log.debug('editing: %s' % self.mod.name)

self.controls = []

if self.tempConfig is None:
self.tempConfig = deepcopy(self.mod.config)

Expand Down

0 comments on commit 5466cc0

Please sign in to comment.