From 08a5338e9be62a728e0f3ae53812b92df7939a70 Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 18 Aug 2009 12:21:37 +0200 Subject: [PATCH] PhaseButton added --- cockatrice/cockatrice.pro | 96 ++++++++++++++++++++++++++++------ cockatrice/src/phasebutton.cpp | 39 ++++++++++++++ cockatrice/src/phasebutton.h | 16 ++++++ 3 files changed, 135 insertions(+), 16 deletions(-) create mode 100644 cockatrice/src/phasebutton.cpp create mode 100644 cockatrice/src/phasebutton.h diff --git a/cockatrice/cockatrice.pro b/cockatrice/cockatrice.pro index 9e96ca1a..1233dc2f 100644 --- a/cockatrice/cockatrice.pro +++ b/cockatrice/cockatrice.pro @@ -1,7 +1,3 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Sa Sep 6 14:27:18 2008 -###################################################################### - TEMPLATE = app TARGET = DEPENDPATH += . src @@ -9,16 +5,84 @@ INCLUDEPATH += . src MOC_DIR = build OBJECTS_DIR = build RESOURCES = cockatrice.qrc -# CONFIG += qt debug - QT += network svg -#QT += opengl -#QTPLUGIN += qjpeg - -# Input -HEADERS += src/counter.h src/gameselector.h src/dlg_creategame.h src/dlg_connect.h src/gamesmodel.h src/client.h src/window_main.h src/servergame.h src/servereventdata.h src/zonelist.h src/cardzone.h src/player.h src/cardlist.h src/carditem.h src/tablezone.h src/handzone.h src/playerlist.h src/game.h src/carddatabase.h src/gameview.h src/decklistmodel.h src/dlg_startgame.h src/cardinfowidget.h src/messagelogwidget.h src/serverzonecard.h src/zoneviewzone.h src/zoneviewwidget.h src/pilezone.h src/carddragitem.h src/zoneviewlayout.h src/playerarea.h src/carddatabasemodel.h src/window_deckeditor.h src/decklist.h setsmodel.h src/window_sets.h src/abstractgraphicsitem.h src/dlg_settings.h src/phasestoolbar.h -SOURCES += src/counter.cpp src/gameselector.cpp src/dlg_creategame.cpp src/dlg_connect.cpp src/client.cpp src/main.cpp src/window_main.cpp src/servereventdata.cpp src/gamesmodel.cpp src/player.cpp src/cardzone.cpp src/zonelist.cpp src/cardlist.cpp src/carditem.cpp src/tablezone.cpp src/handzone.cpp src/playerlist.cpp src/game.cpp src/carddatabase.cpp src/gameview.cpp src/decklistmodel.cpp src/dlg_startgame.cpp src/cardinfowidget.cpp src/messagelogwidget.cpp src/zoneviewzone.cpp src/zoneviewwidget.cpp src/pilezone.cpp src/carddragitem.cpp src/zoneviewlayout.cpp src/playerarea.cpp src/carddatabasemodel.cpp src/window_deckeditor.cpp src/decklist.cpp src/setsmodel.cpp src/window_sets.cpp src/abstractgraphicsitem.cpp src/dlg_settings.cpp src/phasestoolbar.cpp -TRANSLATIONS += \ - translations/cockatrice_de.ts \ - translations/cockatrice_en.ts - +HEADERS += src/counter.h \ + src/gameselector.h \ + src/dlg_creategame.h \ + src/dlg_connect.h \ + src/gamesmodel.h \ + src/client.h \ + src/window_main.h \ + src/servergame.h \ + src/servereventdata.h \ + src/zonelist.h \ + src/cardzone.h \ + src/player.h \ + src/cardlist.h \ + src/carditem.h \ + src/tablezone.h \ + src/handzone.h \ + src/playerlist.h \ + src/game.h \ + src/carddatabase.h \ + src/gameview.h \ + src/decklistmodel.h \ + src/dlg_startgame.h \ + src/cardinfowidget.h \ + src/messagelogwidget.h \ + src/serverzonecard.h \ + src/zoneviewzone.h \ + src/zoneviewwidget.h \ + src/pilezone.h \ + src/carddragitem.h \ + src/zoneviewlayout.h \ + src/playerarea.h \ + src/carddatabasemodel.h \ + src/window_deckeditor.h \ + src/decklist.h \ + setsmodel.h \ + src/window_sets.h \ + src/abstractgraphicsitem.h \ + src/dlg_settings.h \ + src/phasestoolbar.h \ + src/phasebutton.h +SOURCES += src/counter.cpp \ + src/gameselector.cpp \ + src/dlg_creategame.cpp \ + src/dlg_connect.cpp \ + src/client.cpp \ + src/main.cpp \ + src/window_main.cpp \ + src/servereventdata.cpp \ + src/gamesmodel.cpp \ + src/player.cpp \ + src/cardzone.cpp \ + src/zonelist.cpp \ + src/cardlist.cpp \ + src/carditem.cpp \ + src/tablezone.cpp \ + src/handzone.cpp \ + src/playerlist.cpp \ + src/game.cpp \ + src/carddatabase.cpp \ + src/gameview.cpp \ + src/decklistmodel.cpp \ + src/dlg_startgame.cpp \ + src/cardinfowidget.cpp \ + src/messagelogwidget.cpp \ + src/zoneviewzone.cpp \ + src/zoneviewwidget.cpp \ + src/pilezone.cpp \ + src/carddragitem.cpp \ + src/zoneviewlayout.cpp \ + src/playerarea.cpp \ + src/carddatabasemodel.cpp \ + src/window_deckeditor.cpp \ + src/decklist.cpp \ + src/setsmodel.cpp \ + src/window_sets.cpp \ + src/abstractgraphicsitem.cpp \ + src/dlg_settings.cpp \ + src/phasestoolbar.cpp \ + src/phasebutton.cpp +TRANSLATIONS += translations/cockatrice_de.ts translations/cockatrice_en.ts diff --git a/cockatrice/src/phasebutton.cpp b/cockatrice/src/phasebutton.cpp new file mode 100644 index 00000000..fcd347ed --- /dev/null +++ b/cockatrice/src/phasebutton.cpp @@ -0,0 +1,39 @@ +#include "phasebutton.h" +#include +#include +// +PhaseButton::PhaseButton(QIcon icon, QString name ) + : QPushButton(icon,name) +{ + +} + +//PhaseButton::PhaseButton( ) + //: QPushButton() +//{ + // +//} + +void PhaseButton::update() +{ + QPushButton::update(); +} + +void PhaseButton::paintEvent(QPaintEvent *event) +{ + QPushButton::paintEvent(event); + if(isChecked()) + { + QPainter painter(this); + int height = size().height(); + int width = size().width(); + QPen pen; + pen.setWidth(3); + pen.setColor(QColor::fromRgb(180,0,0)); + painter.setPen(pen); + painter.drawRect(3,3, width-7, height-7); + } + + +} +// diff --git a/cockatrice/src/phasebutton.h b/cockatrice/src/phasebutton.h new file mode 100644 index 00000000..fc7e586a --- /dev/null +++ b/cockatrice/src/phasebutton.h @@ -0,0 +1,16 @@ +#ifndef PHASEBUTTON_H +#define PHASEBUTTON_H +// +#include +// +class PhaseButton : public QPushButton +{ +Q_OBJECT +public: + PhaseButton(); + PhaseButton(QIcon, QString); + void update(); + void paintEvent(QPaintEvent *event); + +}; +#endif