fife-parpg: clients/editor/scripts/gui/mapeditor.py annotate

annotate clients/editor/scripts/gui/mapeditor.py @ 367:598547404022

* Initial support for closing maps: * Lots of cleanup functions has been added * TODO: Cameras are only removed when all maps are closed * TODO: Screen leaves traces when the last map is closed * Replaced pre/postMapRemove events with pre/postMapClosed * Fixed a bug in the Toolbar where it didn't properly handle removal of actions from an actiongroup

author	cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222
date	Thu, 29 Oct 2009 22:11:48 +0000
parents	ad5818097cd6
children	22222a900751

rev	line source
355 8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	1 # -- coding: utf-8 --
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	2
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	3 # ####################################################################
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	4 # Copyright (C) 2005-2009 by the FIFE team
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	5 # http://www.fifengine.de
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	6 # This file is part of FIFE.
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	7 #
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	8 # FIFE is free software; you can redistribute it and/or
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	9 # modify it under the terms of the GNU Lesser General Public
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	10 # License as published by the Free Software Foundation; either
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	11 # version 2.1 of the License, or (at your option) any later version.
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	12 #
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	13 # This library is distributed in the hope that it will be useful,
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	14 # but WITHOUT ANY WARRANTY; without even the implied warranty of
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	16 # Lesser General Public License for more details.
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	17 #
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	18 # You should have received a copy of the GNU Lesser General Public
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	19 # License along with this library; if not, write to the
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	20 # Free Software Foundation, Inc.,
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	21 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	22 # ####################################################################
8b125ec749d7 Started cleaning up the editor source code: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 318 diff changeset	23
255 51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	24 # MapEditor is a plugin for Fifedit. It allows for selection and visual editing of maps.
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	25
283 cad19fe699ee Screenshot function for editor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 260 diff changeset	26 import math, os, time
cad19fe699ee Screenshot function for editor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 260 diff changeset	27 from datetime import date
255 51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	28
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	29 import fife
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	30 import pychan
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	31 import pychan.widgets as widgets
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	32 import scripts
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	33 import scripts.events as events
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	34 import action
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	35 from toolbar import ToolBar
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	36 from menubar import Menu, MenuBar
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	37 from action import Action, ActionGroup
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	38 from scripts.mapcontroller import MapController
283 cad19fe699ee Screenshot function for editor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 260 diff changeset	39 import fife_utils
255 51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	40
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	41 states = (u'SELECTING', u'INSERTING', u'REMOVING', u'MOVING', u'OBJECTPICKER')
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	42 for s in states:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	43 globals()[s] = s
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	44 NOT_INITIALIZED = -9999999
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	45
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	46 class MapEditor:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	47 def __init__(self):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	48 self._ignoreToggles = False # A hack to avoid infinite recursion when toggling a button
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	49 self._controller = None
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	50 self._mode = SELECTING
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	51
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	52 self._editor = scripts.editor.getEditor()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	53 self._eventlistener = self._editor.getEventListener()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	54 self._statusbar = self._editor.getStatusBar()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	55 self._toolbar = self._editor.getToolBar()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	56 self._object = None
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	57 self._startDragPos = None
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	58 self._lastDragPos = None
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	59 self._lastDragPosExact = None
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	60
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	61 self._toolbox = self._editor.getToolbox()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	62
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	63 self._initToolbuttons()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	64
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	65 self._toolbox.show()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	66 self._instances = []
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	67
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	68 events.postMapShown.connect(self._mapChanged)
367 598547404022 * Initial support for closing maps: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 359 diff changeset	69 events.preMapClosed.connect(self._mapClosed)
255 51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	70 events.onObjectSelected.connect(self.setObject)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	71 self._undogroup = False
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	72
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	73 self._scrollX = 0
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	74 self._scrollY = 0
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	75
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	76 def _init(self):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	77 self._dragx = NOT_INITIALIZED
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	78 self._dragy = NOT_INITIALIZED
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	79
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	80 self._setMode(SELECTING)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	81
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	82 self._initToolbarbuttons()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	83
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	84 events.keyPressed.connect(self.keyPressed)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	85 events.keyReleased.connect(self.keyReleased)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	86
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	87 events.mousePressed.connect(self.mousePressed)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	88 events.mouseDragged.connect(self.mouseDragged)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	89 events.mouseReleased.connect(self.mouseReleased)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	90 events.mouseMoved.connect(self.mouseMoved)
257 f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	91 events.mouseEntered.connect(self.mouseEntered)
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	92 events.mouseExited.connect(self.mouseExited)
255 51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	93 events.mouseWheelMovedUp.connect(self.mouseWheelMovedUp)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	94 events.mouseWheelMovedDown.connect(self.mouseWheelMovedDown)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	95 events.onPump.connect(self.pump)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	96
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	97 def _clear(self):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	98 self._clearToolbarButtons()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	99
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	100 events.keyPressed.disconnect(self.keyPressed)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	101 events.keyReleased.disconnect(self.keyReleased)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	102
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	103 events.mousePressed.disconnect(self.mousePressed)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	104 events.mouseDragged.disconnect(self.mouseDragged)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	105 events.mouseReleased.disconnect(self.mouseReleased)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	106 events.mouseMoved.disconnect(self.mouseMoved)
257 f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	107 events.mouseExited.disconnect(self.mouseExited)
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	108 events.mouseEntered.disconnect(self.mouseEntered)
255 51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	109 events.mouseWheelMovedUp.disconnect(self.mouseWheelMovedUp)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	110 events.mouseWheelMovedDown.disconnect(self.mouseWheelMovedDown)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	111 events.onPump.disconnect(self.pump)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	112
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	113 def _mapChanged(self, sender, mapview):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	114 self.setController(mapview.getController())
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	115
367 598547404022 * Initial support for closing maps: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 359 diff changeset	116 def _mapClosed(self, sender, mapview):
598547404022 * Initial support for closing maps: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 359 diff changeset	117 self.setController(None)
598547404022 * Initial support for closing maps: cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 359 diff changeset	118
257 f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	119 def _setCursor(self):
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	120 engine = self._editor.getEngine()
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	121 cursor = engine.getCursor()
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	122
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	123 id = -1
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	124 if self._mode == SELECTING:
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	125 id = engine.getImagePool().addResourceFromFile("gui/icons/select_instance.png")
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	126 image = engine.getImagePool().getImage(id)
260 a0068e00f076 * Really fixed proper support for non-ascii filenames for FileBrowser cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 257 diff changeset	127 image.setXShift(-7)
a0068e00f076 * Really fixed proper support for non-ascii filenames for FileBrowser cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 257 diff changeset	128 image.setYShift(-7)
257 f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	129 elif self._mode == INSERTING:
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	130 id = engine.getImagePool().addResourceFromFile("gui/icons/add_instance.png")
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	131 image = engine.getImagePool().getImage(id)
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	132 image.setXShift(-2)
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	133 image.setYShift(-20)
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	134 elif self._mode == REMOVING:
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	135 id = engine.getImagePool().addResourceFromFile("gui/icons/erase_instance.png")
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	136 image = engine.getImagePool().getImage(id)
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	137 image.setXShift(-2)
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	138 image.setYShift(-19)
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	139 elif self._mode == MOVING:
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	140 id = engine.getImagePool().addResourceFromFile("gui/icons/move_instance.png")
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	141 image = engine.getImagePool().getImage(id)
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	142 image.setXShift(-11)
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	143 image.setYShift(-11)
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	144 elif self._mode == OBJECTPICKER:
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	145 id = engine.getImagePool().addResourceFromFile("gui/icons/objectpicker.png")
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	146 image = engine.getImagePool().getImage(id)
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	147 image.setXShift(-0)
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	148 image.setYShift(-22)
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	149
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	150 if id < 0:
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	151 self._resetCursor()
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	152 else:
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	153 cursor.set(fife.CURSOR_IMAGE, id)
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	154
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	155 def _resetCursor(self):
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	156 cursor = self._editor.getEngine().getCursor()
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	157 cursor.set(fife.CURSOR_NATIVE, fife.NC_ARROW)
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	158
255 51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	159 def setObject(self, object):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	160 self._object = object
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	161
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	162 def setController(self, controller):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	163 if self._controller is not None:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	164 self._clear()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	165
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	166 if controller is not None:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	167 self._init()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	168
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	169 self._controller = controller
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	170
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	171 def _initToolbuttons(self):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	172 self._selectAction = Action(text=u"Select", icon="gui/icons/select_instance.png", checkable=True)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	173 self._drawAction = Action(text=u"Draw", icon="gui/icons/add_instance.png", checkable=True)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	174 self._removeAction = Action(text=u"Remove", icon="gui/icons/erase_instance.png", checkable=True)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	175 self._moveAction = Action(text=u"Move", icon="gui/icons/move_instance.png", checkable=True)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	176 self._objectpickerAction = Action(text=u"Pick object", icon="gui/icons/objectpicker.png", checkable=True)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	177
318 e2ac8bb1a22c * Added tooltips and hotkey information for some buttons cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 317 diff changeset	178 self._selectAction.helptext = u"Select cells on layer (S)"
e2ac8bb1a22c * Added tooltips and hotkey information for some buttons cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 317 diff changeset	179 self._moveAction.helptext = u"Moves instances (M)"
e2ac8bb1a22c * Added tooltips and hotkey information for some buttons cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 317 diff changeset	180 self._drawAction.helptext = u"Adds new instances based on currently selected object (I)"
e2ac8bb1a22c * Added tooltips and hotkey information for some buttons cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 317 diff changeset	181 self._removeAction.helptext = u"Deletes instances (R)"
255 51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	182 self._objectpickerAction.helptext = u"Click an instance to set the current object to the one used by instance"
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	183
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	184 action.toggled.connect(self._buttonToggled, sender=self._selectAction)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	185 action.toggled.connect(self._buttonToggled, sender=self._moveAction)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	186 action.toggled.connect(self._buttonToggled, sender=self._drawAction)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	187 action.toggled.connect(self._buttonToggled, sender=self._removeAction)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	188 action.toggled.connect(self._buttonToggled, sender=self._objectpickerAction)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	189
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	190 self._toolgroup = ActionGroup(exclusive=True, name=u"Tool group")
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	191 self._toolgroup.addAction(self._selectAction)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	192 self._toolgroup.addAction(self._moveAction)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	193 self._toolgroup.addAction(self._drawAction)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	194 self._toolgroup.addAction(self._removeAction)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	195 self._toolgroup.addAction(self._objectpickerAction)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	196
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	197
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	198 self._toolbox.addAction(self._toolgroup)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	199 self._toolbox.adaptLayout()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	200
359 ad5818097cd6 * Some cleanups for Editor class to match new coding standards cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 355 diff changeset	201 self._editor._edit_menu.addAction(self._toolgroup)
255 51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	202
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	203 def _initToolbarbuttons(self):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	204 rotateLeftAction = Action(text=u"Rotate counterclockwise", icon="gui/icons/rotate_countercw.png")
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	205 rotateRightAction = Action(text=u"Rotate clockwise", icon="gui/icons/rotate_clockwise.png")
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	206 zoomInAction = Action(text=u"Zoom in", icon="gui/icons/zoom_in.png")
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	207 zoomOutAction = Action(text=u"Zoom out", icon="gui/icons/zoom_out.png")
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	208 zoomResetAction = Action(text=u"Reset zoom", icon="gui/icons/zoom_default.png")
283 cad19fe699ee Screenshot function for editor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 260 diff changeset	209 screenshotAction = Action(text=u"Take screenshot", icon="gui/icons/take_screenshot.png")
255 51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	210
318 e2ac8bb1a22c * Added tooltips and hotkey information for some buttons cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 317 diff changeset	211 rotateLeftAction.helptext = u"Rotate counterclockwise by 90 degrees"
e2ac8bb1a22c * Added tooltips and hotkey information for some buttons cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 317 diff changeset	212 rotateRightAction.helptext = u"Rotate clockwise by 90 degrees"
e2ac8bb1a22c * Added tooltips and hotkey information for some buttons cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 317 diff changeset	213 zoomInAction.helptext = u"Zoom in (CTRL + Mousewheel up)"
e2ac8bb1a22c * Added tooltips and hotkey information for some buttons cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 317 diff changeset	214 zoomOutAction.helptext = u"Zoom out (CTRL + Mousewheel down)"
e2ac8bb1a22c * Added tooltips and hotkey information for some buttons cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 317 diff changeset	215 zoomResetAction.helptext = u"Reset zoom to default level"
e2ac8bb1a22c * Added tooltips and hotkey information for some buttons cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 317 diff changeset	216 screenshotAction.helptext = u"Take screenshot (F7)"
e2ac8bb1a22c * Added tooltips and hotkey information for some buttons cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 317 diff changeset	217
255 51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	218 action.activated.connect(self.rotateCounterClockwise, sender=rotateLeftAction)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	219 action.activated.connect(self.rotateClockwise, sender=rotateRightAction)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	220 action.activated.connect(self.zoomIn, sender=zoomInAction)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	221 action.activated.connect(self.zoomOut, sender=zoomOutAction)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	222 action.activated.connect(self.resetZoom, sender=zoomResetAction)
283 cad19fe699ee Screenshot function for editor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 260 diff changeset	223 action.activated.connect(self.captureScreen, sender=screenshotAction)
255 51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	224
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	225 self._viewGroup = ActionGroup(name=u"View group")
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	226 self._viewGroup.addAction(rotateLeftAction)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	227 self._viewGroup.addAction(rotateRightAction)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	228 self._viewGroup.addAction(zoomInAction)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	229 self._viewGroup.addAction(zoomOutAction)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	230 self._viewGroup.addAction(zoomResetAction)
283 cad19fe699ee Screenshot function for editor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 260 diff changeset	231 self._viewGroup.addAction(screenshotAction)
255 51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	232
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	233 self._toolbar.addAction(self._viewGroup)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	234 self._toolbar.adaptLayout()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	235
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	236 def _clearToolbarButtons(self):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	237 self._toolbar.removeAction(self._viewGroup)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	238 self._toolbar.adaptLayout()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	239 self._viewGroup = None
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	240
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	241
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	242 def _setMode(self, mode):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	243 if (mode == INSERTING) and (not self._object):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	244 self._statusbar.setText(u'Please select object first')
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	245 mode = self._mode
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	246
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	247 self._ignoreToggles = True
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	248 # Update toolbox buttons
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	249 if (mode == INSERTING):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	250 self._drawAction.setChecked(True)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	251 elif mode == REMOVING:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	252 self._removeAction.setChecked(True)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	253 elif mode == MOVING:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	254 self._moveAction.setChecked(True)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	255 elif mode == OBJECTPICKER:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	256 self._objectpickerAction.setChecked(True)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	257 else:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	258 self._selectAction.setChecked(True)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	259 self._ignoreToggles = False
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	260
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	261 self._mode = mode
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	262 print "Entered mode " + mode
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	263 self._statusbar.setText(mode.replace('_', ' ').capitalize())
257 f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	264 self._setCursor()
255 51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	265
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	266 def _buttonToggled(self, sender, toggled):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	267 if self._controller is None: return
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	268 if self._ignoreToggles is True: return
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	269
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	270 mode = SELECTING
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	271
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	272 if toggled:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	273 if sender == self._selectAction:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	274 mode = SELECTING
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	275 elif sender == self._moveAction:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	276 mode = MOVING
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	277 elif sender == self._drawAction:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	278 mode = INSERTING
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	279 elif sender == self._removeAction:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	280 mode = REMOVING
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	281 elif sender == self._objectpickerAction:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	282 mode = OBJECTPICKER
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	283
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	284 self._setMode(mode)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	285
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	286 def mousePressed(self, sender, event):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	287 if event.isConsumedByWidgets():
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	288 return
317 a185aff39051 Fixes crashes when attempting to draw/move when no layers are active cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 283 diff changeset	289
a185aff39051 Fixes crashes when attempting to draw/move when no layers are active cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 283 diff changeset	290 if not self._controller._layer:
a185aff39051 Fixes crashes when attempting to draw/move when no layers are active cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 283 diff changeset	291 if self._controller.debug: print 'No layers active. Cancelling map action'
a185aff39051 Fixes crashes when attempting to draw/move when no layers are active cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 283 diff changeset	292 return
255 51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	293
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	294 realCoords = self._getRealCoords(sender, event)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	295
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	296 if event.getButton() == fife.MouseEvent.MIDDLE:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	297 self._dragx = realCoords[0]
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	298 self._dragy = realCoords[1]
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	299
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	300 else:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	301 if event.getButton() == fife.MouseEvent.RIGHT:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	302 self._controller.deselectSelection()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	303
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	304 if self._mode == SELECTING:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	305 if event.getButton() == fife.MouseEvent.LEFT:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	306 if self._eventlistener.shiftPressed:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	307 self._controller.deselectCell(realCoords[0], realCoords[1])
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	308 else:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	309 if self._eventlistener.controlPressed is False:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	310 self._controller.deselectSelection()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	311 self._controller.selectCell(realCoords[0], realCoords[1])
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	312
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	313 elif event.getButton() == fife.MouseEvent.RIGHT:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	314 self._controller.deselectSelection()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	315
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	316 elif self._mode == INSERTING:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	317 if event.getButton() == fife.MouseEvent.LEFT:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	318 self._controller.deselectSelection()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	319 self._controller.selectCell(realCoords[0], realCoords[1])
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	320 self._controller.getUndoManager().startGroup("Inserted instances")
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	321 self._undogroup = True
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	322
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	323 position = self._controller._camera.toMapCoordinates(fife.ScreenPoint(realCoords[0], realCoords[1]), False)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	324 position = self._controller._layer.getCellGrid().toLayerCoordinates(position)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	325
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	326 self._controller.selectCell(realCoords[0], realCoords[1])
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	327 self._controller.placeInstance(position, self._object)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	328
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	329 elif self._mode == REMOVING:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	330 if event.getButton() == fife.MouseEvent.LEFT:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	331 self._controller.deselectSelection()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	332 self._controller.selectCell(realCoords[0], realCoords[1])
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	333 self._controller.getUndoManager().startGroup("Removed instances")
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	334 self._undogroup = True
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	335
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	336 self._controller.removeInstances(self._controller.getInstancesFromSelection())
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	337
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	338 elif self._mode == MOVING:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	339 if event.getButton() == fife.MouseEvent.LEFT:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	340
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	341 position = self._controller._camera.toMapCoordinates(fife.ScreenPoint(realCoords[0], realCoords[1]), False)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	342
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	343 self._lastDragPos = self._controller._layer.getCellGrid().toLayerCoordinates(position)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	344 self._lastDragPosExact = self._controller._layer.getCellGrid().toExactLayerCoordinates(position)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	345
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	346 for loc in self._controller._selection:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	347 if loc.getLayerCoordinates() == self._lastDragPos:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	348 break
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	349 else:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	350 self._controller.deselectSelection()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	351 self._controller.selectCell(realCoords[0], realCoords[1])
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	352
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	353 self._instances = self._controller.getInstancesFromSelection()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	354
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	355 self._controller.getUndoManager().startGroup("Moved instances")
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	356 self._undogroup = True
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	357
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	358 elif self._mode == OBJECTPICKER:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	359 position = self._controller._camera.toMapCoordinates(fife.ScreenPoint(realCoords[0], realCoords[1]), False)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	360 exact = self._controller._layer.getCellGrid().toExactLayerCoordinates(position)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	361 instances = self._controller.getInstancesFromPosition(exact)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	362 if len(instances) >= 1:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	363 object = instances[0].getObject()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	364 if object.getId() != self._object.getId() or object.getNamespace() != self._object.getNamespace():
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	365 events.onObjectSelected.send(sender=self, object=object)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	366
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	367 def mouseDragged(self, sender, event):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	368 if event.isConsumedByWidgets():
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	369 return
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	370
317 a185aff39051 Fixes crashes when attempting to draw/move when no layers are active cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 283 diff changeset	371 if not self._controller._layer:
a185aff39051 Fixes crashes when attempting to draw/move when no layers are active cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 283 diff changeset	372 if self._controller.debug: print 'No layers active. Cancelling map action'
a185aff39051 Fixes crashes when attempting to draw/move when no layers are active cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 283 diff changeset	373 return
a185aff39051 Fixes crashes when attempting to draw/move when no layers are active cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 283 diff changeset	374
255 51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	375 realCoords = self._getRealCoords(sender, event)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	376
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	377 if event.getButton() == fife.MouseEvent.MIDDLE:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	378 self._scrollX = (self._dragx-realCoords[0])/10.0
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	379 self._scrollY = (self._dragy-realCoords[1])/10.0
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	380 else:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	381 if self._mode != SELECTING:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	382 self._controller.deselectSelection()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	383
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	384 if self._mode == SELECTING:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	385 if event.getButton() == fife.MouseEvent.LEFT:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	386 if self._eventlistener.shiftPressed:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	387 self._controller.deselectCell(realCoords[0], realCoords[1])
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	388 else:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	389 self._controller.selectCell(realCoords[0], realCoords[1])
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	390
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	391 elif self._mode == INSERTING:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	392 position = self._controller._camera.toMapCoordinates(fife.ScreenPoint(realCoords[0], realCoords[1]), False)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	393 position = self._controller._layer.getCellGrid().toLayerCoordinates(position)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	394
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	395 self._controller.selectCell(realCoords[0], realCoords[1])
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	396 self._controller.placeInstance(position, self._object)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	397
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	398 elif self._mode == REMOVING:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	399 self._controller.selectCell(realCoords[0], realCoords[1])
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	400 self._controller.removeInstances(self._controller.getInstancesFromSelection())
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	401
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	402 elif self._mode == MOVING:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	403 position = self._controller._camera.toMapCoordinates(fife.ScreenPoint(realCoords[0], realCoords[1]), False)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	404
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	405 positionExact = self._controller._layer.getCellGrid().toExactLayerCoordinates(position)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	406 position = self._controller._layer.getCellGrid().toLayerCoordinates(position)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	407
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	408 if self._eventlistener.shiftPressed:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	409 self._controller.moveInstances(self._instances, positionExact-self._lastDragPosExact, True)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	410 else:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	411 self._controller.moveInstances(self._instances, position-self._lastDragPos, False)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	412 self._lastDragPos = position
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	413 self._lastDragPosExact = positionExact
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	414
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	415 # Update selection
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	416 self._controller.deselectSelection()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	417
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	418 for i in self._instances:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	419 pos = i.getLocation().getMapCoordinates()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	420 pos = self._controller._camera.toScreenCoordinates(pos)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	421 self._controller.selectCell(pos.x, pos.y)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	422 elif self._mode == OBJECTPICKER:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	423 pass
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	424
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	425 def mouseReleased(self, sender, event):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	426 if event.isConsumedByWidgets():
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	427 return
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	428
317 a185aff39051 Fixes crashes when attempting to draw/move when no layers are active cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 283 diff changeset	429 if not self._controller._layer:
a185aff39051 Fixes crashes when attempting to draw/move when no layers are active cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 283 diff changeset	430 if self._controller.debug: print 'No layers active. Cancelling map action'
a185aff39051 Fixes crashes when attempting to draw/move when no layers are active cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 283 diff changeset	431 return
a185aff39051 Fixes crashes when attempting to draw/move when no layers are active cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 283 diff changeset	432
255 51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	433 if self._mode == SELECTING or self._mode == MOVING:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	434 instances = self._controller.getInstancesFromSelection()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	435 if len(instances) > 0:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	436 events.onInstancesSelected.send(sender=self, instances=instances)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	437
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	438 if event.getButton() == fife.MouseEvent.MIDDLE:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	439 self._scrollX = 0
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	440 self._scrollY = 0
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	441
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	442 realCoords = self._getRealCoords(sender, event)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	443
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	444 if self._undogroup:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	445 self._controller.getUndoManager().endGroup()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	446 self._undogroup = False
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	447
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	448 self._dragx = NOT_INITIALIZED
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	449 self._dragy = NOT_INITIALIZED
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	450
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	451 def mouseMoved(self, sender, event):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	452 pass
257 f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	453
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	454 def mouseEntered(self, sender, event):
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	455 self._setCursor()
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	456
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	457 def mouseExited(self, sender, event):
f2195628947b * Cursor will now respect image shift values when drawing the cursor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 255 diff changeset	458 self._resetCursor()
255 51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	459
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	460 def mouseWheelMovedUp(self, event):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	461 if self._eventlistener.controlPressed and self._controller._camera:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	462 self._controller._camera.setZoom(self._controller._camera.getZoom() * 1.10)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	463
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	464 def mouseWheelMovedDown(self, event):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	465 if self._eventlistener.controlPressed and self._controller._camera:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	466 self._controller._camera.setZoom(self._controller._camera.getZoom() / 1.10)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	467
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	468
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	469 def keyPressed(self, event):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	470 keyval = event.getKey().getValue()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	471 keystr = event.getKey().getAsString().lower()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	472
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	473 if keyval == fife.Key.LEFT:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	474 self._controller.moveCamera(50, 0)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	475 elif keyval == fife.Key.RIGHT:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	476 self._controller.moveCamera(-50, 0)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	477 elif keyval == fife.Key.UP:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	478 self._controller.moveCamera(0, 50)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	479 elif keyval == fife.Key.DOWN:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	480 self._controller.moveCamera(0, -50)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	481
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	482 elif keyval == fife.Key.INSERT:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	483 self._controller.fillSelection(self._object)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	484
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	485 elif keyval == fife.Key.DELETE:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	486 self._controller.clearSelection()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	487
283 cad19fe699ee Screenshot function for editor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 260 diff changeset	488 elif keyval == fife.Key.F7:
cad19fe699ee Screenshot function for editor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 260 diff changeset	489 self.captureScreen()
cad19fe699ee Screenshot function for editor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 260 diff changeset	490
255 51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	491 elif keystr == "s":
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	492 self._setMode(SELECTING)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	493
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	494 elif keystr == "i":
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	495 if self._mode != INSERTING:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	496 self._setMode(INSERTING)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	497 else:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	498 self._setMode(SELECTING)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	499
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	500 elif keystr == "r":
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	501 if self._mode != REMOVING:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	502 self._setMode(REMOVING)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	503 else:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	504 self._setMode(SELECTING)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	505
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	506 elif keystr == 'm':
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	507 if self._mode != MOVING:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	508 self._setMode(MOVING)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	509 else:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	510 self._setMode(SELECTING)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	511
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	512 elif keystr == 't':
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	513 gridrenderer = self._controller._camera.getRenderer('GridRenderer')
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	514 gridrenderer.setEnabled(not gridrenderer.isEnabled())
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	515
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	516 elif keystr == 'b':
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	517 blockrenderer = self._controller._camera.getRenderer('BlockingInfoRenderer')
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	518 blockrenderer.setEnabled(not blockrenderer.isEnabled())
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	519
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	520 elif keystr == 'z':
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	521 if self._eventlistener.controlPressed:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	522 if self._eventlistener.altPressed:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	523 if self._eventlistener.shiftPressed:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	524 self._controller.getUndoManager().previousBranch()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	525 else:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	526 self._controller.getUndoManager().nextBranch()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	527 else:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	528 if self._eventlistener.shiftPressed:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	529 self._controller.redo()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	530 else:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	531 self._controller.undo()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	532
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	533
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	534 def keyReleased(self, event):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	535 pass
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	536
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	537 def zoomIn(self, zoom=1.10):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	538 self._controller.setZoom(self._controller.getZoom()*zoom)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	539
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	540 def zoomOut(self, zoom=1.10):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	541 self._controller.setZoom(self._controller.getZoom()/zoom)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	542
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	543 def resetZoom(self):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	544 self._controller.setZoom(1)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	545
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	546 def rotateCounterClockwise(self):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	547 self._controller.rotateCounterClockwise()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	548
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	549 def rotateClockwise(self):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	550 self._controller.rotateClockwise()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	551
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	552 def _getRealCoords(self, sender, event):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	553 cw = sender
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	554 offsetX = event.getX()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	555 offsetY = event.getY()
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	556
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	557 parent = cw
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	558 while parent is not None:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	559 if isinstance(parent, widgets.Widget):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	560 offsetX += parent.x
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	561 offsetY += parent.y
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	562 parent = parent.parent
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	563 else:
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	564 break
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	565
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	566 return (offsetX, offsetY)
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	567
283 cad19fe699ee Screenshot function for editor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 260 diff changeset	568 def captureScreen(self):
cad19fe699ee Screenshot function for editor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 260 diff changeset	569 userDir = fife_utils.getUserDataDirectory("fife", "editor")
cad19fe699ee Screenshot function for editor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 260 diff changeset	570 t = userDir+"/screenshots"
cad19fe699ee Screenshot function for editor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 260 diff changeset	571 if not os.path.isdir(t):
cad19fe699ee Screenshot function for editor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 260 diff changeset	572 os.makedirs(t)
cad19fe699ee Screenshot function for editor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 260 diff changeset	573 t += "/screen-%s-%s.png" % (date.today().strftime('%Y-%m-%d'),
cad19fe699ee Screenshot function for editor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 260 diff changeset	574 time.strftime('%H-%M-%S'))
cad19fe699ee Screenshot function for editor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 260 diff changeset	575
cad19fe699ee Screenshot function for editor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 260 diff changeset	576 self._editor.getEngine().getRenderBackend().captureScreen(t)
cad19fe699ee Screenshot function for editor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 260 diff changeset	577 print "Saved screenshot to:", t
cad19fe699ee Screenshot function for editor cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: 260 diff changeset	578
255 51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	579 def pump(self):
51cc05d862f2 Merged editor_rewrite branch to trunk. cheesesucker@33b003aa-7bff-0310-803a-e67f0ece8222 parents: diff changeset	580 self._controller.moveCamera(self._scrollX, self._scrollY)

Mercurial > fife-parpg

annotate clients/editor/scripts/gui/mapeditor.py @ 367:598547404022