summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Noga <Tempus@Spectrum-Song.local>2011-11-23 08:08:33 -0600
committerColin Noga <Tempus@Spectrum-Song.local>2011-11-23 08:08:33 -0600
commit69fa0ef1a241ae9609936def65f3168fee7e260e (patch)
tree25d133a9707d60382ff9fea947bdfe430aa4f46b
parent0c68efbbcfeb63ea3196d9f16769ed0621a5dfa9 (diff)
downloadkoopatlas-69fa0ef1a241ae9609936def65f3168fee7e260e.tar.gz
koopatlas-69fa0ef1a241ae9609936def65f3168fee7e260e.zip
Icons for the animation picker
-rw-r--r--Resources/Anm/.DS_Storebin0 -> 6148 bytes
-rw-r--r--Resources/Anm/Door.pngbin0 -> 2492 bytes
-rw-r--r--Resources/Anm/Fall.pngbin0 -> 1764 bytes
-rw-r--r--Resources/Anm/Jump.pngbin0 -> 1718 bytes
-rw-r--r--Resources/Anm/JumpSand.pngbin0 -> 2081 bytes
-rw-r--r--Resources/Anm/JumpSnow.pngbin0 -> 2038 bytes
-rw-r--r--Resources/Anm/Ladder.pngbin0 -> 1806 bytes
-rw-r--r--Resources/Anm/LadderLeft.pngbin0 -> 1852 bytes
-rw-r--r--Resources/Anm/LadderRight.pngbin0 -> 1868 bytes
-rw-r--r--Resources/Anm/Pipe.pngbin0 -> 1686 bytes
-rw-r--r--Resources/Anm/Run.pngbin0 -> 1665 bytes
-rw-r--r--Resources/Anm/RunSand.pngbin0 -> 2009 bytes
-rw-r--r--Resources/Anm/RunSnow.pngbin0 -> 1975 bytes
-rw-r--r--Resources/Anm/SpinJump.pngbin0 -> 1475 bytes
-rw-r--r--Resources/Anm/Swim.pngbin0 -> 1614 bytes
-rw-r--r--Resources/Anm/Walk.pngbin0 -> 1815 bytes
-rw-r--r--Resources/Anm/WalkIce.pngbin0 -> 1692 bytes
-rw-r--r--Resources/Anm/WalkSand.pngbin0 -> 2106 bytes
-rw-r--r--Resources/Anm/WalkSnow.pngbin0 -> 2082 bytes
-rw-r--r--Resources/Anm/mario_sprite_sheet_by_shadefalcon-d36dco9.pngbin0 -> 252112 bytes
-rw-r--r--Resources/SecretKeyArrow.pngbin0 -> 1458 bytes
-rw-r--r--src/editorui/paths.py18
22 files changed, 13 insertions, 5 deletions
diff --git a/Resources/Anm/.DS_Store b/Resources/Anm/.DS_Store
new file mode 100644
index 0000000..5008ddf
--- /dev/null
+++ b/Resources/Anm/.DS_Store
Binary files differ
diff --git a/Resources/Anm/Door.png b/Resources/Anm/Door.png
new file mode 100644
index 0000000..443f750
--- /dev/null
+++ b/Resources/Anm/Door.png
Binary files differ
diff --git a/Resources/Anm/Fall.png b/Resources/Anm/Fall.png
new file mode 100644
index 0000000..ca434b6
--- /dev/null
+++ b/Resources/Anm/Fall.png
Binary files differ
diff --git a/Resources/Anm/Jump.png b/Resources/Anm/Jump.png
new file mode 100644
index 0000000..adc12eb
--- /dev/null
+++ b/Resources/Anm/Jump.png
Binary files differ
diff --git a/Resources/Anm/JumpSand.png b/Resources/Anm/JumpSand.png
new file mode 100644
index 0000000..4ddfc66
--- /dev/null
+++ b/Resources/Anm/JumpSand.png
Binary files differ
diff --git a/Resources/Anm/JumpSnow.png b/Resources/Anm/JumpSnow.png
new file mode 100644
index 0000000..5398c45
--- /dev/null
+++ b/Resources/Anm/JumpSnow.png
Binary files differ
diff --git a/Resources/Anm/Ladder.png b/Resources/Anm/Ladder.png
new file mode 100644
index 0000000..daac27a
--- /dev/null
+++ b/Resources/Anm/Ladder.png
Binary files differ
diff --git a/Resources/Anm/LadderLeft.png b/Resources/Anm/LadderLeft.png
new file mode 100644
index 0000000..9507828
--- /dev/null
+++ b/Resources/Anm/LadderLeft.png
Binary files differ
diff --git a/Resources/Anm/LadderRight.png b/Resources/Anm/LadderRight.png
new file mode 100644
index 0000000..4b249f9
--- /dev/null
+++ b/Resources/Anm/LadderRight.png
Binary files differ
diff --git a/Resources/Anm/Pipe.png b/Resources/Anm/Pipe.png
new file mode 100644
index 0000000..bd2f3e3
--- /dev/null
+++ b/Resources/Anm/Pipe.png
Binary files differ
diff --git a/Resources/Anm/Run.png b/Resources/Anm/Run.png
new file mode 100644
index 0000000..f2b06ad
--- /dev/null
+++ b/Resources/Anm/Run.png
Binary files differ
diff --git a/Resources/Anm/RunSand.png b/Resources/Anm/RunSand.png
new file mode 100644
index 0000000..29a0dfc
--- /dev/null
+++ b/Resources/Anm/RunSand.png
Binary files differ
diff --git a/Resources/Anm/RunSnow.png b/Resources/Anm/RunSnow.png
new file mode 100644
index 0000000..82b1a3a
--- /dev/null
+++ b/Resources/Anm/RunSnow.png
Binary files differ
diff --git a/Resources/Anm/SpinJump.png b/Resources/Anm/SpinJump.png
new file mode 100644
index 0000000..e4f1ebe
--- /dev/null
+++ b/Resources/Anm/SpinJump.png
Binary files differ
diff --git a/Resources/Anm/Swim.png b/Resources/Anm/Swim.png
new file mode 100644
index 0000000..aae1aef
--- /dev/null
+++ b/Resources/Anm/Swim.png
Binary files differ
diff --git a/Resources/Anm/Walk.png b/Resources/Anm/Walk.png
new file mode 100644
index 0000000..2d22a02
--- /dev/null
+++ b/Resources/Anm/Walk.png
Binary files differ
diff --git a/Resources/Anm/WalkIce.png b/Resources/Anm/WalkIce.png
new file mode 100644
index 0000000..8e29bfb
--- /dev/null
+++ b/Resources/Anm/WalkIce.png
Binary files differ
diff --git a/Resources/Anm/WalkSand.png b/Resources/Anm/WalkSand.png
new file mode 100644
index 0000000..dc90baa
--- /dev/null
+++ b/Resources/Anm/WalkSand.png
Binary files differ
diff --git a/Resources/Anm/WalkSnow.png b/Resources/Anm/WalkSnow.png
new file mode 100644
index 0000000..999fdb0
--- /dev/null
+++ b/Resources/Anm/WalkSnow.png
Binary files differ
diff --git a/Resources/Anm/mario_sprite_sheet_by_shadefalcon-d36dco9.png b/Resources/Anm/mario_sprite_sheet_by_shadefalcon-d36dco9.png
new file mode 100644
index 0000000..0b33bf7
--- /dev/null
+++ b/Resources/Anm/mario_sprite_sheet_by_shadefalcon-d36dco9.png
Binary files differ
diff --git a/Resources/SecretKeyArrow.png b/Resources/SecretKeyArrow.png
new file mode 100644
index 0000000..c6b9686
--- /dev/null
+++ b/Resources/SecretKeyArrow.png
Binary files differ
diff --git a/src/editorui/paths.py b/src/editorui/paths.py
index 7e3d484..d7a59be 100644
--- a/src/editorui/paths.py
+++ b/src/editorui/paths.py
@@ -267,13 +267,14 @@ class KPEditorPath(QtGui.QGraphicsLineItem):
self._pathRef = pathRef
+ TopLayout = QtGui.QGridLayout()
Layout = QtGui.QGridLayout()
# Make an exclusive button group for our animations.
AnimationList = ["Walk", "WalkSand", "WalkSnow", "WalkIce",
"Jump", "JumpSand", "JumpSnow", "SpinJump",
- "Ladder", "LeftLadder", "RightLadder", "Ivy",
- "Swim", "Roll", "Pipe", "Door"]
+ "Ladder", "LadderLeft", "LadderRight", "Fall",
+ "Swim", "Run", "Pipe", "Door"]
self.ExclusiveButtons = QtGui.QButtonGroup()
@@ -281,18 +282,24 @@ class KPEditorPath(QtGui.QGraphicsLineItem):
j = 1
id = 0
for anim in AnimationList:
- newButton = QtGui.QPushButton(QtGui.QIcon("Resources/Anm" + anim), anim)
+ newButton = QtGui.QPushButton(QtGui.QIcon("Resources/Anm/" + anim), "")
newButton.setCheckable(True)
+ newButton.setIconSize(QtCore.QSize(38, 38))
+ newButton.setToolTip(anim)
self.ExclusiveButtons.addButton(newButton, id)
Layout.addWidget(newButton, j, i)
+ if id == 0:
+ newButton.setChecked(True)
+
id += 1
i += 1
if i == 4:
i = 0
j += 1
+
# Movement Speed Spin Box
self.moveSpeedSpinner = QtGui.QDoubleSpinBox()
@@ -302,14 +309,14 @@ class KPEditorPath(QtGui.QGraphicsLineItem):
self.moveSpeedSpinner.setSingleStep(0.05)
self.moveSpeedSpinner.setValue(1.0)
- Layout.addWidget(self.moveSpeedSpinner, 0, 0)
+ TopLayout.addWidget(self.moveSpeedSpinner, 0, 0)
# Layer Combo Box
self.linkedLayer = QtGui.QComboBox(self)
self.linkedLayer.setModel(KP.map.layerModel)
- Layout.addWidget(self.linkedLayer, 0, 1, 1, 3)
+ TopLayout.addWidget(self.linkedLayer, 0, 1, 1, 3)
# Connections
@@ -319,6 +326,7 @@ class KPEditorPath(QtGui.QGraphicsLineItem):
self.linkedLayer.currentIndexChanged.connect(self.updateLinkLayer)
# Layout
+ Layout.addLayout(TopLayout, 0, 0, 1, 4)
self.setLayout(Layout)