- Fix layout on options page
- New ammo icon for selecting weapon scheme widget
- Don't spread WeaponItems over the SelWeaponWidget
--- a/QTfrontend/hedgewars.qrc Sun Jan 20 12:43:36 2008 +0000
+++ b/QTfrontend/hedgewars.qrc Sun Jan 20 12:50:26 2008 +0000
@@ -2,7 +2,7 @@
<qresource>
<file alias="Ammos.png">../share/hedgewars/Data/Graphics/AmmoMenu/Ammos.png</file>
<file>res/hh25x25.png</file>
- <file>res/M2Round2.jpg</file>
+ <file>res/ammopic.png</file>
<file>res/infinity.png</file>
<file>res/botlevels/0.png</file>
<file>res/botlevels/1.png</file>
--- a/QTfrontend/pages.cpp Sun Jan 20 12:43:36 2008 +0000
+++ b/QTfrontend/pages.cpp Sun Jan 20 12:50:26 2008 +0000
@@ -289,8 +289,9 @@
pageLayout->setColumnStretch(2, 100);
pageLayout->setRowStretch(0, 0);
pageLayout->setRowStretch(1, 0);
- pageLayout->setRowStretch(2, 100);
- pageLayout->setRowStretch(3, 0);
+ pageLayout->setRowStretch(2, 0);
+ pageLayout->setRowStretch(3, 100);
+ pageLayout->setRowStretch(4, 0);
groupBox = new QGroupBox(this);
groupBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
@@ -304,7 +305,7 @@
CBTeamName = new QComboBox(groupBox);
GBTlayout->addWidget(CBTeamName, 0, 1);
- BtnEditTeam = addButton("Edit team", GBTlayout, 0, 2);
+ BtnEditTeam = addButton("Edit team", GBTlayout, 0, 2);
AGGroupBox = new QGroupBox(this);
AGGroupBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
Binary file QTfrontend/res/M2Round2.jpg has changed
--- a/QTfrontend/selectWeapon.cpp Sun Jan 20 12:43:36 2008 +0000
+++ b/QTfrontend/selectWeapon.cpp Sun Jan 20 12:50:26 2008 +0000
@@ -47,7 +47,7 @@
lbl->setGeometry(0, 0, 30, 30);
hbLayout->addWidget(lbl);
- item=new WeaponItem(QImage(":/res/hh25x25.png"), this);
+ item=new WeaponItem(QImage(":/res/ammopic.png"), this);
item->setItemsNum(wNum);
item->setInfinityState(true);
hbLayout->addWidget(item);
@@ -93,8 +93,9 @@
++k;
}
+ pLayout->setRowStretch(5, 100);
m_name = new QLineEdit(this);
- pLayout->addWidget(m_name, i, 0, 1, 4);
+ pLayout->addWidget(m_name, i, 0, 1, 5);
}
void SelWeaponWidget::setWeapons(const QString& ammo)