Better look for weapon sets page
authorunc0rr
Fri, 31 Oct 2008 20:47:48 +0000
changeset 1455 7d0a4ecd8210
parent 1454 e58d3bbfc7af
child 1456 2539dd079be1
Better look for weapon sets page
QTfrontend/itemNum.cpp
QTfrontend/itemNum.h
QTfrontend/main.cpp
QTfrontend/res/ammopic.png
QTfrontend/res/infinity.png
QTfrontend/selectWeapon.cpp
QTfrontend/selectWeapon.h
--- a/QTfrontend/itemNum.cpp	Fri Oct 31 20:04:30 2008 +0000
+++ b/QTfrontend/itemNum.cpp	Fri Oct 31 20:47:48 2008 +0000
@@ -22,7 +22,7 @@
 #include <QPainter>
 
 ItemNum::ItemNum(const QImage& im, QWidget * parent, unsigned char min, unsigned char max) :
-  m_im(im), QWidget(parent), nonInteractive(false), minItems(min), maxItems(max), 
+  m_im(im), QFrame(parent), nonInteractive(false), minItems(min), maxItems(max),
   numItems(min+2 >= max ? min : min+2),
   infinityState(false)
 {
@@ -69,7 +69,7 @@
     painter.drawImage(target, QImage(":/res/infinity.png"));
   } else {
     for(int i=0; i<numItems; i++) {
-      QRect target(11 * i, i % 2, 25, 25);
+      QRect target(11 * i, i % 2, 25, 35);
       painter.drawImage(target, m_im);
     }
   }
--- a/QTfrontend/itemNum.h	Fri Oct 31 20:04:30 2008 +0000
+++ b/QTfrontend/itemNum.h	Fri Oct 31 20:47:48 2008 +0000
@@ -16,13 +16,13 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
  
-#include <QWidget>
+#include <QFrame>
 #include <QImage>
 
 #ifndef _ITEM_NUM_INCLUDED
 #define _ITEM_NUM_INCLUDED
 
-class ItemNum : public QWidget
+class ItemNum : public QFrame
 {
   Q_OBJECT
 
--- a/QTfrontend/main.cpp	Fri Oct 31 20:04:30 2008 +0000
+++ b/QTfrontend/main.cpp	Fri Oct 31 20:47:48 2008 +0000
@@ -217,7 +217,7 @@
 				"font: bold 14px;"
 				"padding: 2px;"
 				"}"
-			".QGroupBox,GameCFGWidget,TeamSelWidget{"
+			".QGroupBox,GameCFGWidget,TeamSelWidget,SelWeaponWidget{"
 				"background-image: url(\":/res/panelbg.png\");"
 				"background-position: bottom center;"
 				"background-repeat: repeat-x;"
Binary file QTfrontend/res/ammopic.png has changed
Binary file QTfrontend/res/infinity.png has changed
--- a/QTfrontend/selectWeapon.cpp	Fri Oct 31 20:04:30 2008 +0000
+++ b/QTfrontend/selectWeapon.cpp	Fri Oct 31 20:47:48 2008 +0000
@@ -71,7 +71,7 @@
 
 SelWeaponWidget::SelWeaponWidget(int numItems, QWidget* parent) :
   m_numItems(numItems),
-  QWidget(parent)
+  QFrame(parent)
 {
   wconf = new QSettings(cfgdir->absolutePath() + "/weapons.ini", QSettings::IniFormat, this);
 
--- a/QTfrontend/selectWeapon.h	Fri Oct 31 20:04:30 2008 +0000
+++ b/QTfrontend/selectWeapon.h	Fri Oct 31 20:47:48 2008 +0000
@@ -19,7 +19,7 @@
 #ifndef _SELECT_WEAPON_INCLUDED
 #define _SELECT_WEAPON_INCLUDED
 
-#include <QWidget>
+#include <QFrame>
 #include <map>
 
 class QGridLayout;
@@ -41,7 +41,7 @@
   WeaponItem* item;
 };
 
-class SelWeaponWidget : public QWidget
+class SelWeaponWidget : public QFrame
 {
   Q_OBJECT