# HG changeset patch # User unc0rr # Date 1225486068 0 # Node ID 7d0a4ecd82102057e7b111750130375440d20204 # Parent e58d3bbfc7afb3590658916bb9522a125e13d43d Better look for weapon sets page diff -r e58d3bbfc7af -r 7d0a4ecd8210 QTfrontend/itemNum.cpp --- 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 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 +#include #include #ifndef _ITEM_NUM_INCLUDED #define _ITEM_NUM_INCLUDED -class ItemNum : public QWidget +class ItemNum : public QFrame { Q_OBJECT diff -r e58d3bbfc7af -r 7d0a4ecd8210 QTfrontend/main.cpp --- 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;" diff -r e58d3bbfc7af -r 7d0a4ecd8210 QTfrontend/res/ammopic.png Binary file QTfrontend/res/ammopic.png has changed diff -r e58d3bbfc7af -r 7d0a4ecd8210 QTfrontend/res/infinity.png Binary file QTfrontend/res/infinity.png has changed diff -r e58d3bbfc7af -r 7d0a4ecd8210 QTfrontend/selectWeapon.cpp --- 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); diff -r e58d3bbfc7af -r 7d0a4ecd8210 QTfrontend/selectWeapon.h --- 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 +#include #include class QGridLayout; @@ -41,7 +41,7 @@ WeaponItem* item; }; -class SelWeaponWidget : public QWidget +class SelWeaponWidget : public QFrame { Q_OBJECT