From 69fa0ef1a241ae9609936def65f3168fee7e260e Mon Sep 17 00:00:00 2001 From: Colin Noga Date: Wed, 23 Nov 2011 08:08:33 -0600 Subject: Icons for the animation picker --- Resources/Anm/.DS_Store | Bin 0 -> 6148 bytes Resources/Anm/Door.png | Bin 0 -> 2492 bytes Resources/Anm/Fall.png | Bin 0 -> 1764 bytes Resources/Anm/Jump.png | Bin 0 -> 1718 bytes Resources/Anm/JumpSand.png | Bin 0 -> 2081 bytes Resources/Anm/JumpSnow.png | Bin 0 -> 2038 bytes Resources/Anm/Ladder.png | Bin 0 -> 1806 bytes Resources/Anm/LadderLeft.png | Bin 0 -> 1852 bytes Resources/Anm/LadderRight.png | Bin 0 -> 1868 bytes Resources/Anm/Pipe.png | Bin 0 -> 1686 bytes Resources/Anm/Run.png | Bin 0 -> 1665 bytes Resources/Anm/RunSand.png | Bin 0 -> 2009 bytes Resources/Anm/RunSnow.png | Bin 0 -> 1975 bytes Resources/Anm/SpinJump.png | Bin 0 -> 1475 bytes Resources/Anm/Swim.png | Bin 0 -> 1614 bytes Resources/Anm/Walk.png | Bin 0 -> 1815 bytes Resources/Anm/WalkIce.png | Bin 0 -> 1692 bytes Resources/Anm/WalkSand.png | Bin 0 -> 2106 bytes Resources/Anm/WalkSnow.png | Bin 0 -> 2082 bytes .../Anm/mario_sprite_sheet_by_shadefalcon-d36dco9.png | Bin 0 -> 252112 bytes Resources/SecretKeyArrow.png | Bin 0 -> 1458 bytes src/editorui/paths.py | 18 +++++++++++++----- 22 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 Resources/Anm/.DS_Store create mode 100644 Resources/Anm/Door.png create mode 100644 Resources/Anm/Fall.png create mode 100644 Resources/Anm/Jump.png create mode 100644 Resources/Anm/JumpSand.png create mode 100644 Resources/Anm/JumpSnow.png create mode 100644 Resources/Anm/Ladder.png create mode 100644 Resources/Anm/LadderLeft.png create mode 100644 Resources/Anm/LadderRight.png create mode 100644 Resources/Anm/Pipe.png create mode 100644 Resources/Anm/Run.png create mode 100644 Resources/Anm/RunSand.png create mode 100644 Resources/Anm/RunSnow.png create mode 100644 Resources/Anm/SpinJump.png create mode 100644 Resources/Anm/Swim.png create mode 100644 Resources/Anm/Walk.png create mode 100644 Resources/Anm/WalkIce.png create mode 100644 Resources/Anm/WalkSand.png create mode 100644 Resources/Anm/WalkSnow.png create mode 100644 Resources/Anm/mario_sprite_sheet_by_shadefalcon-d36dco9.png create mode 100644 Resources/SecretKeyArrow.png diff --git a/Resources/Anm/.DS_Store b/Resources/Anm/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/Resources/Anm/.DS_Store differ diff --git a/Resources/Anm/Door.png b/Resources/Anm/Door.png new file mode 100644 index 0000000..443f750 Binary files /dev/null and b/Resources/Anm/Door.png differ diff --git a/Resources/Anm/Fall.png b/Resources/Anm/Fall.png new file mode 100644 index 0000000..ca434b6 Binary files /dev/null and b/Resources/Anm/Fall.png differ diff --git a/Resources/Anm/Jump.png b/Resources/Anm/Jump.png new file mode 100644 index 0000000..adc12eb Binary files /dev/null and b/Resources/Anm/Jump.png differ diff --git a/Resources/Anm/JumpSand.png b/Resources/Anm/JumpSand.png new file mode 100644 index 0000000..4ddfc66 Binary files /dev/null and b/Resources/Anm/JumpSand.png differ diff --git a/Resources/Anm/JumpSnow.png b/Resources/Anm/JumpSnow.png new file mode 100644 index 0000000..5398c45 Binary files /dev/null and b/Resources/Anm/JumpSnow.png differ diff --git a/Resources/Anm/Ladder.png b/Resources/Anm/Ladder.png new file mode 100644 index 0000000..daac27a Binary files /dev/null and b/Resources/Anm/Ladder.png differ diff --git a/Resources/Anm/LadderLeft.png b/Resources/Anm/LadderLeft.png new file mode 100644 index 0000000..9507828 Binary files /dev/null and b/Resources/Anm/LadderLeft.png differ diff --git a/Resources/Anm/LadderRight.png b/Resources/Anm/LadderRight.png new file mode 100644 index 0000000..4b249f9 Binary files /dev/null and b/Resources/Anm/LadderRight.png differ diff --git a/Resources/Anm/Pipe.png b/Resources/Anm/Pipe.png new file mode 100644 index 0000000..bd2f3e3 Binary files /dev/null and b/Resources/Anm/Pipe.png differ diff --git a/Resources/Anm/Run.png b/Resources/Anm/Run.png new file mode 100644 index 0000000..f2b06ad Binary files /dev/null and b/Resources/Anm/Run.png differ diff --git a/Resources/Anm/RunSand.png b/Resources/Anm/RunSand.png new file mode 100644 index 0000000..29a0dfc Binary files /dev/null and b/Resources/Anm/RunSand.png differ diff --git a/Resources/Anm/RunSnow.png b/Resources/Anm/RunSnow.png new file mode 100644 index 0000000..82b1a3a Binary files /dev/null and b/Resources/Anm/RunSnow.png differ diff --git a/Resources/Anm/SpinJump.png b/Resources/Anm/SpinJump.png new file mode 100644 index 0000000..e4f1ebe Binary files /dev/null and b/Resources/Anm/SpinJump.png differ diff --git a/Resources/Anm/Swim.png b/Resources/Anm/Swim.png new file mode 100644 index 0000000..aae1aef Binary files /dev/null and b/Resources/Anm/Swim.png differ diff --git a/Resources/Anm/Walk.png b/Resources/Anm/Walk.png new file mode 100644 index 0000000..2d22a02 Binary files /dev/null and b/Resources/Anm/Walk.png differ diff --git a/Resources/Anm/WalkIce.png b/Resources/Anm/WalkIce.png new file mode 100644 index 0000000..8e29bfb Binary files /dev/null and b/Resources/Anm/WalkIce.png differ diff --git a/Resources/Anm/WalkSand.png b/Resources/Anm/WalkSand.png new file mode 100644 index 0000000..dc90baa Binary files /dev/null and b/Resources/Anm/WalkSand.png differ diff --git a/Resources/Anm/WalkSnow.png b/Resources/Anm/WalkSnow.png new file mode 100644 index 0000000..999fdb0 Binary files /dev/null and b/Resources/Anm/WalkSnow.png 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 Binary files /dev/null and b/Resources/Anm/mario_sprite_sheet_by_shadefalcon-d36dco9.png differ diff --git a/Resources/SecretKeyArrow.png b/Resources/SecretKeyArrow.png new file mode 100644 index 0000000..c6b9686 Binary files /dev/null and b/Resources/SecretKeyArrow.png 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) -- cgit v1.2.3