# HG changeset patch # User displacer # Date 1196971321 0 # Node ID fb03a39a10ff4947409b7731240a5ed5ddea4a81 # Parent 1d592e3ae7aef56e9c2b62ef99f03b4b3c7e8bf2 more icons at weapon select diff -r 1d592e3ae7ae -r fb03a39a10ff QTfrontend/hedgewars.qrc --- a/QTfrontend/hedgewars.qrc Sun Dec 02 18:54:10 2007 +0000 +++ b/QTfrontend/hedgewars.qrc Thu Dec 06 20:02:01 2007 +0000 @@ -1,5 +1,6 @@ + ../share/hedgewars/Data/Graphics/AmmoMenu/Ammos.png res/hh25x25.png res/M2Round2.jpg res/botlevels/0.png diff -r 1d592e3ae7ae -r fb03a39a10ff QTfrontend/selectWeapon.cpp --- a/QTfrontend/selectWeapon.cpp Sun Dec 02 18:54:10 2007 +0000 +++ b/QTfrontend/selectWeapon.cpp Thu Dec 06 20:02:01 2007 +0000 @@ -17,17 +17,41 @@ */ #include "selectWeapon.h" +#include "weaponItem.h" #include #include +#include +#include -#include "weaponItem.h" +QImage getAmmoImage(int num) +{ + static QImage ammo(":Ammos.png"); + return ammo.copy(0, num*32, 32, 32); +} + +SelWeaponItem::SelWeaponItem(int num, QWidget* parent) : + QWidget(parent) +{ + QHBoxLayout* hbLayout = new QHBoxLayout(this); + + QLabel* lbl = new QLabel("1"); + lbl->setPixmap(QPixmap::fromImage(getAmmoImage(num))); + + hbLayout->addWidget(lbl); + WeaponItem* item=new WeaponItem(QImage(":/res/M2Round2.jpg"), this); + hbLayout->addWidget(item); +} SelWeaponWidget::SelWeaponWidget(QWidget* parent) : QWidget(parent) { pLayout=new QGridLayout(this); - - WeaponItem* item=new WeaponItem(QImage(":/res/M2Round2.jpg"), this); - pLayout->addWidget(item); + + int j=-1; + for(int i=0; i<19; ++i) { + if (i%4==0) ++j; + SelWeaponItem* swi = new SelWeaponItem(i, this); + pLayout->addWidget(swi, j, i%4); + } } diff -r 1d592e3ae7ae -r fb03a39a10ff QTfrontend/selectWeapon.h --- a/QTfrontend/selectWeapon.h Sun Dec 02 18:54:10 2007 +0000 +++ b/QTfrontend/selectWeapon.h Thu Dec 06 20:02:01 2007 +0000 @@ -23,6 +23,14 @@ class QGridLayout; +class SelWeaponItem : public QWidget +{ + Q_OBJECT + +public: + SelWeaponItem(int num, QWidget* parent=0); +}; + class SelWeaponWidget : public QWidget { Q_OBJECT