# HG changeset patch # User Wuzzy # Date 1462378465 -7200 # Node ID ffe6e1344ebd3826f1b261da690cc2137ff257b7 # Parent d85d273cb3aacb08d3978d04ab331c1839b760ad Team editor: Make bot icons and graves more visible in closed drop-down lists, smaller botlevel images diff -r d85d273cb3aa -r ffe6e1344ebd QTfrontend/hedgewars.qrc --- a/QTfrontend/hedgewars.qrc Wed May 04 14:09:54 2016 +0300 +++ b/QTfrontend/hedgewars.qrc Wed May 04 18:14:25 2016 +0200 @@ -22,6 +22,12 @@ res/botlevels/3.png res/botlevels/4.png res/botlevels/5.png + res/botlevels/small0.png + res/botlevels/small1.png + res/botlevels/small2.png + res/botlevels/small3.png + res/botlevels/small4.png + res/botlevels/small5.png res/botlevels/net0.png res/botlevels/net1.png res/botlevels/net2.png diff -r d85d273cb3aa -r ffe6e1344ebd QTfrontend/res/botlevels/small0.png Binary file QTfrontend/res/botlevels/small0.png has changed diff -r d85d273cb3aa -r ffe6e1344ebd QTfrontend/res/botlevels/small1.png Binary file QTfrontend/res/botlevels/small1.png has changed diff -r d85d273cb3aa -r ffe6e1344ebd QTfrontend/res/botlevels/small1.xcf Binary file QTfrontend/res/botlevels/small1.xcf has changed diff -r d85d273cb3aa -r ffe6e1344ebd QTfrontend/res/botlevels/small2.png Binary file QTfrontend/res/botlevels/small2.png has changed diff -r d85d273cb3aa -r ffe6e1344ebd QTfrontend/res/botlevels/small2.xcf Binary file QTfrontend/res/botlevels/small2.xcf has changed diff -r d85d273cb3aa -r ffe6e1344ebd QTfrontend/res/botlevels/small3.png Binary file QTfrontend/res/botlevels/small3.png has changed diff -r d85d273cb3aa -r ffe6e1344ebd QTfrontend/res/botlevels/small3.xcf Binary file QTfrontend/res/botlevels/small3.xcf has changed diff -r d85d273cb3aa -r ffe6e1344ebd QTfrontend/res/botlevels/small4.png Binary file QTfrontend/res/botlevels/small4.png has changed diff -r d85d273cb3aa -r ffe6e1344ebd QTfrontend/res/botlevels/small4.xcf Binary file QTfrontend/res/botlevels/small4.xcf has changed diff -r d85d273cb3aa -r ffe6e1344ebd QTfrontend/res/botlevels/small5.png Binary file QTfrontend/res/botlevels/small5.png has changed diff -r d85d273cb3aa -r ffe6e1344ebd QTfrontend/res/botlevels/small5.xcf Binary file QTfrontend/res/botlevels/small5.xcf has changed diff -r d85d273cb3aa -r ffe6e1344ebd QTfrontend/ui/page/pageeditteam.cpp --- a/QTfrontend/ui/page/pageeditteam.cpp Wed May 04 14:09:54 2016 +0300 +++ b/QTfrontend/ui/page/pageeditteam.cpp Wed May 04 18:14:25 2016 +0200 @@ -100,7 +100,7 @@ tmpLabel->setText(QLabel::tr("Name")); GBTLayout->addWidget(tmpLabel, 0, 0); tmpLabel = new QLabel(GBoxTeam); - tmpLabel->setText(QLabel::tr("Type")); + tmpLabel->setText(QLabel::tr("Player")); GBTLayout->addWidget(tmpLabel, 1, 0); tmpLabel = new QLabel(GBoxTeam); tmpLabel->setText(QLabel::tr("Grave")); @@ -118,19 +118,21 @@ vbox2->addWidget(GBoxTeam); CBTeamLvl = new QComboBox(GBoxTeam); - CBTeamLvl->setIconSize(QSize(48, 48)); - CBTeamLvl->addItem(QIcon(":/res/botlevels/0.png"), QComboBox::tr("Human")); + CBTeamLvl->setIconSize(QSize(32, 32)); + CBTeamLvl->addItem(QIcon(":/res/botlevels/small0.png"), QComboBox::tr("Human")); for(int i = 5; i > 0; i--) CBTeamLvl->addItem( - QIcon(QString(":/res/botlevels/%1.png").arg(6 - i)), - QString("%1 %2").arg(QComboBox::tr("Level")).arg(i) + QIcon(QString(":/res/botlevels/small%1.png").arg(6 - i)), + QComboBox::tr("Computer (Level %1)").arg(i) ); + CBTeamLvl->setFixedHeight(38); GBTLayout->addWidget(CBTeamLvl, 1, 1); CBGrave = new QComboBox(GBoxTeam); CBGrave->setMaxCount(65535); CBGrave->setMaxVisibleItems(20); CBGrave->setIconSize(QSize(32, 32)); + CBGrave->setFixedHeight(44); GBTLayout->addWidget(CBGrave, 2, 1); CBFlag = new QComboBox(GBoxTeam); @@ -153,6 +155,7 @@ GBoxFort->setTitle(QGroupBox::tr("Fort")); QGridLayout * GBFLayout = new QGridLayout(GBoxFort); CBFort = new QComboBox(GBoxFort); + CBFort->setMaxVisibleItems(25); CBFort->setMaxCount(65535); GBFLayout->addWidget(CBFort, 0, 0); FortPreview = new SquareLabel(GBoxFort);