diff --git a/examples/code_fragments/ui/board.py b/examples/code_fragments/ui/board.py
deleted file mode 100644
index 6717d72911f1c3fba5490fc5dfb2738324157e4b..0000000000000000000000000000000000000000
--- a/examples/code_fragments/ui/board.py
+++ /dev/null
@@ -1,345 +0,0 @@
-#!/usr/bin/python
-
-# tetris.py
-
-import sys
-import random
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-class Board(QtWidgets.QFrame):
- BoardWidth = 10
- BoardHeight = 22
- Speed = 300
- messageToStatusBar = QtCore.pyqtSignal(str)
-
- def __init__(self, parent=None):
- QtWidgets.QFrame.__init__(self, parent)
- self.resize(180, 380)
- self.setMinimumHeight(380)
- self.setMinimumWidth(180)
- self.timer = QtCore.QBasicTimer()
- self.isWaitingAfterLine = False
- self.curPiece = Shape()
- self.nextPiece = Shape()
- self.curX = 0
- self.curY = 0
- self.numLinesRemoved = 0
- self.board = []
-
- self.setFocusPolicy(QtCore.Qt.StrongFocus)
- self.isStarted = False
- self.isPaused = False
- self.clearBoard()
-
- self.nextPiece.setRandomShape()
-
-
- def shapeAt(self, x, y):
- return self.board[(y * Board.BoardWidth) + x]
-
- def setShapeAt(self, x, y, shape):
- self.board[(y * Board.BoardWidth) + x] = shape
-
- def squareWidth(self):
- return self.contentsRect().width() / Board.BoardWidth
-
- def squareHeight(self):
- return self.contentsRect().height() / Board.BoardHeight
-
- def start(self):
- if self.isPaused:
- return
-
- self.isStarted = True
- self.isWaitingAfterLine = False
- self.numLinesRemoved = 0
- self.clearBoard()
-
- self.messageToStatusBar.emit(str(self.numLinesRemoved))
-
- self.newPiece()
- self.timer.start(Board.Speed, self)
-
- def pause(self):
- if not self.isStarted:
- return
-
- self.isPaused = not self.isPaused
- if self.isPaused:
- self.timer.stop()
- self.messageToStatusBar.emit("paused")
- else:
- self.timer.start(Board.Speed, self)
- self.messageToStatusBar.emit(str(self.numLinesRemoved))
- self.update()
-
- def paintEvent(self, event):
- painter = QtGui.QPainter(self)
- rect = self.contentsRect()
-
- boardTop = rect.bottom() - Board.BoardHeight * self.squareHeight()
-
- for i in range(Board.BoardHeight):
- for j in range(Board.BoardWidth):
- shape = self.shapeAt(j, Board.BoardHeight - i - 1)
- if shape != Tetrominoes.NoShape:
- self.drawSquare(painter,
- rect.left() + j * self.squareWidth(),
- boardTop + i * self.squareHeight(), shape)
-
- if self.curPiece.shape() != Tetrominoes.NoShape:
- for i in range(4):
- x = self.curX + self.curPiece.x(i)
- y = self.curY - self.curPiece.y(i)
- self.drawSquare(painter, rect.left() + x * self.squareWidth(),
- boardTop + (Board.BoardHeight - y - 1) * self.squareHeight(),
- self.curPiece.shape())
-
- def keyPressEvent(self, event):
- if not self.isStarted or self.curPiece.shape() == Tetrominoes.NoShape:
- QtWidgets.QWidget.keyPressEvent(self, event)
- return
-
- key = event.key()
- if key == QtCore.Qt.Key_P:
- self.pause()
- return
- if self.isPaused:
- return
- elif key == QtCore.Qt.Key_Left:
- self.tryMove(self.curPiece, self.curX - 1, self.curY)
- elif key == QtCore.Qt.Key_Right:
- self.tryMove(self.curPiece, self.curX + 1, self.curY)
- elif key == QtCore.Qt.Key_Down:
- self.tryMove(self.curPiece.rotatedRight(), self.curX, self.curY)
- elif key == QtCore.Qt.Key_Up:
- self.tryMove(self.curPiece.rotatedLeft(), self.curX, self.curY)
- elif key == QtCore.Qt.Key_Space:
- self.dropDown()
- elif key == QtCore.Qt.Key_D:
- self.oneLineDown()
- else:
- QtWidgets.QWidget.keyPressEvent(self, event)
-
- def timerEvent(self, event):
- if event.timerId() == self.timer.timerId():
- if self.isWaitingAfterLine:
- self.isWaitingAfterLine = False
- self.newPiece()
- else:
- self.oneLineDown()
- else:
- QtGui.QFrame.timerEvent(self, event)
-
- def clearBoard(self):
- for i in range(Board.BoardHeight * Board.BoardWidth):
- self.board.append(Tetrominoes.NoShape)
-
- def dropDown(self):
- newY = self.curY
- while newY > 0:
- if not self.tryMove(self.curPiece, self.curX, newY - 1):
- break
- newY -= 1
-
- self.pieceDropped()
-
- def oneLineDown(self):
- if not self.tryMove(self.curPiece, self.curX, self.curY - 1):
- self.pieceDropped()
-
- def pieceDropped(self):
- for i in range(4):
- x = self.curX + self.curPiece.x(i)
- y = self.curY - self.curPiece.y(i)
- self.setShapeAt(x, y, self.curPiece.shape())
-
- self.removeFullLines()
-
- if not self.isWaitingAfterLine:
- self.newPiece()
-
- def removeFullLines(self):
- numFullLines = 0
-
- rowsToRemove = []
-
- for i in range(Board.BoardHeight):
- n = 0
- for j in range(Board.BoardWidth):
- if not self.shapeAt(j, i) == Tetrominoes.NoShape:
- n = n + 1
-
- if n == 10:
- rowsToRemove.append(i)
-
- rowsToRemove.reverse()
-
- for m in rowsToRemove:
- for k in range(m, Board.BoardHeight):
- for l in range(Board.BoardWidth):
- self.setShapeAt(l, k, self.shapeAt(l, k + 1))
-
- numFullLines = numFullLines + len(rowsToRemove)
-
- if numFullLines > 0:
- self.numLinesRemoved = self.numLinesRemoved + numFullLines
- self.messageToStatusBar.emit(str(self.LinesRemoved))
- self.isWaitingAfterLine = True
- self.curPiece.setShape(Tetrominoes.NoShape)
- self.update()
-
- def newPiece(self):
- self.curPiece = self.nextPiece
- self.nextPiece.setRandomShape()
- self.curX = Board.BoardWidth / 2 + 1
- self.curY = Board.BoardHeight - 1 + self.curPiece.minY()
-
- if not self.tryMove(self.curPiece, self.curX, self.curY):
- self.curPiece.setShape(Tetrominoes.NoShape)
- self.timer.stop()
- self.isStarted = False
- self.messageToStatusBar.emit("Game over")
-
- def tryMove(self, newPiece, newX, newY):
- for i in range(4):
- x = newX + newPiece.x(i)
- y = newY - newPiece.y(i)
- if x < 0 or x >= Board.BoardWidth or y < 0 or y >= Board.BoardHeight:
- return False
- if self.shapeAt(x, y) != Tetrominoes.NoShape:
- return False
-
- self.curPiece = newPiece
- self.curX = newX
- self.curY = newY
- self.update()
- return True
-
- def drawSquare(self, painter, x, y, shape):
- colorTable = [0x000000, 0xCC6666, 0x66CC66, 0x6666CC,
- 0xCCCC66, 0xCC66CC, 0x66CCCC, 0xDAAA00]
-
- color = QtGui.QColor(colorTable[shape])
- painter.fillRect(x + 1, y + 1, self.squareWidth() - 2,
- self.squareHeight() - 2, color)
-
- painter.setPen(color.lighter())
- painter.drawLine(x, y + self.squareHeight() - 1, x, y)
- painter.drawLine(x, y, x + self.squareWidth() - 1, y)
-
- painter.setPen(color.darker())
- painter.drawLine(x + 1, y + self.squareHeight() - 1,
- x + self.squareWidth() - 1, y + self.squareHeight() - 1)
- painter.drawLine(x + self.squareWidth() - 1,
- y + self.squareHeight() - 1, x + self.squareWidth() - 1, y + 1)
-
-
-class Tetrominoes(object):
- NoShape = 0
- ZShape = 1
- SShape = 2
- LineShape = 3
- TShape = 4
- SquareShape = 5
- LShape = 6
- MirroredLShape = 7
-
-
-class Shape(object):
- coordsTable = (
- ((0, 0), (0, 0), (0, 0), (0, 0)),
- ((0, -1), (0, 0), (-1, 0), (-1, 1)),
- ((0, -1), (0, 0), (1, 0), (1, 1)),
- ((0, -1), (0, 0), (0, 1), (0, 2)),
- ((-1, 0), (0, 0), (1, 0), (0, 1)),
- ((0, 0), (1, 0), (0, 1), (1, 1)),
- ((-1, -1), (0, -1), (0, 0), (0, 1)),
- ((1, -1), (0, -1), (0, 0), (0, 1))
- )
-
- def __init__(self):
- self.coords = [[0,0] for i in range(4)]
- self.pieceShape = Tetrominoes.NoShape
-
- self.setShape(Tetrominoes.NoShape)
-
- def shape(self):
- return self.pieceShape
-
- def setShape(self, shape):
- table = Shape.coordsTable[shape]
- for i in range(4):
- for j in range(2):
- self.coords[i][j] = table[i][j]
-
- self.pieceShape = shape
-
- def setRandomShape(self):
- self.setShape(random.randint(1, 7))
-
- def x(self, index):
- return self.coords[index][0]
-
- def y(self, index):
- return self.coords[index][1]
-
- def setX(self, index, x):
- self.coords[index][0] = x
-
- def setY(self, index, y):
- self.coords[index][1] = y
-
- def minX(self):
- m = self.coords[0][0]
- for i in range(4):
- m = min(m, self.coords[i][0])
-
- return m
-
- def maxX(self):
- m = self.coords[0][0]
- for i in range(4):
- m = max(m, self.coords[i][0])
-
- return m
-
- def minY(self):
- m = self.coords[0][1]
- for i in range(4):
- m = min(m, self.coords[i][1])
-
- return m
-
- def maxY(self):
- m = self.coords[0][1]
- for i in range(4):
- m = max(m, self.coords[i][1])
-
- return m
-
- def rotatedLeft(self):
- if self.pieceShape == Tetrominoes.SquareShape:
- return self
-
- result = Shape()
- result.pieceShape = self.pieceShape
- for i in range(4):
- result.setX(i, self.y(i))
- result.setY(i, -self.x(i))
-
- return result
-
- def rotatedRight(self):
- if self.pieceShape == Tetrominoes.SquareShape:
- return self
-
- result = Shape()
- result.pieceShape = self.pieceShape
- for i in range(4):
- result.setX(i, -self.y(i))
- result.setY(i, self.x(i))
-
- return result
-
-
diff --git a/examples/code_fragments/ui/widget_example.py b/examples/code_fragments/ui/widget_example.py
index ced1d02fa6b3422b41016a8fd8487c3f6479810b..ae9f73be7523df9149056ed8538d30e3100bce7b 100644
--- a/examples/code_fragments/ui/widget_example.py
+++ b/examples/code_fragments/ui/widget_example.py
@@ -19,23 +19,24 @@
from ost import gui
-from PyQt5 import QtCore, QtGui
-from board import Board
+from PyQt5 import QtCore, QtGui, QtWidgets
#Get Panels (Class which manages widgets)
panels=gui.GostyApp.Instance().perspective.panels
#Create Widget
-tetris=Board()
+my_awesome_widget = QtWidgets.QWidget()
+layout = QtWidgets.QVBoxLayout()
+layout.addWidget(QtWidgets.QPushButton('I dont do anything'))
+layout.addWidget(QtWidgets.QPushButton('I do even less'))
+my_awesome_widget.setLayout(layout)
#Wrap widget to Qt Widget
-wid=gui.Widget(tetris)
+wid=gui.Widget(my_awesome_widget)
#Add Widget to widget pool
-panels.AddWidgetToPool("Break Widget",wid)
+panels.AddWidgetToPool("Widget that doesnt do a thing", wid)
#Add Widget to right panel
panels.AddWidget(gui.PanelPosition.RIGHT_PANEL,wid,False)
-#Fun can start..
-tetris.start()