From 64ad73c9f9c32334e117ff4fc6c930f981ec07db Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Thu, 21 Feb 2019 18:18:52 -0800
Subject: [PATCH] Qt: Add placeholders, minor revamps

---
 res/{chip-names-4.txt => exe4/chip-names.txt} |   0
 res/exe4/placeholder.png                      | Bin 0 -> 483 bytes
 res/{chip-names-5.txt => exe5/chip-names.txt} |   0
 res/exe5/placeholder.png                      | Bin 0 -> 475 bytes
 res/{chip-names-6.txt => exe6/chip-names.txt} |   0
 res/exe6/placeholder.png                      | Bin 0 -> 476 bytes
 src/platform/qt/BattleChipView.cpp            |  16 ++++++++++++++--
 src/platform/qt/BattleChipView.ui             |   4 ++--
 src/platform/qt/resources.qrc                 |   9 ++++++---
 9 files changed, 22 insertions(+), 7 deletions(-)
 rename res/{chip-names-4.txt => exe4/chip-names.txt} (100%)
 create mode 100644 res/exe4/placeholder.png
 rename res/{chip-names-5.txt => exe5/chip-names.txt} (100%)
 create mode 100644 res/exe5/placeholder.png
 rename res/{chip-names-6.txt => exe6/chip-names.txt} (100%)
 create mode 100644 res/exe6/placeholder.png

diff --git a/res/chip-names-4.txt b/res/exe4/chip-names.txt
similarity index 100%
rename from res/chip-names-4.txt
rename to res/exe4/chip-names.txt
diff --git a/res/exe4/placeholder.png b/res/exe4/placeholder.png
new file mode 100644
index 0000000000000000000000000000000000000000..f057bb2492d68c79ce533643aaee068278c11ed7
GIT binary patch
literal 483
zcmV<90UZ8`P)<h;3K|Lk000e1NJLTq001}u001xu0{{R3a|=m90000jP)t-s00008
z8FMi)F*;h-Qd(nUoZf45gp@)Ml$4ykwY|O8_uhmM-rnB#wL<^@{~@$&E&u=laY;l$
zR7i=P)`6~rAPfaipaYvH@c*CtXmMkd0?zA_CBu^zL7jO$j8T3IEq7s<We%rg#?5Ud
ztoez3S@SD<Qw@6mC*u7eN9a9(7XcV*Di8>|uP87m5D2<6)s*kkDKPX9OTb#_3c3x%
zE8q#HBc<aC!7`viY^kkspFPA58^PW%XB9SU1VgmeGt9MF00A#*q(jdzm6As~s5(f<
z)JRvZDnpX#TGIjIEvQs1at1R`k}lLZN6s8xQ{2PPmb+Tz<)B`}67t67*bgj=LAS=b
zVtXjiUBp|C7e6?;0c5KTX-C(cBRBaPx(0K0IbzP`6L%L!!dOfux`(aR;R&#S*g^Ts
zS;6oWVuNFru$CMQ-;_&;Iy}#F2ZIXtt=5uooa3>Bfnget?fv)|mXgmP&S2cZFoQ9!
zU>SVbLy1Kx1&nnqhrCcq2_ve1iUJKS;Ly<bz!KIICh6xmymY3vJ4t!X=~kSey;yIA
Z%s<t9MwiY1YPtXb002ovPDHLkV1koY(?|dS

literal 0
HcmV?d00001

diff --git a/res/chip-names-5.txt b/res/exe5/chip-names.txt
similarity index 100%
rename from res/chip-names-5.txt
rename to res/exe5/chip-names.txt
diff --git a/res/exe5/placeholder.png b/res/exe5/placeholder.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f3e1094d790168d9aaa0b9e196a1d10b7071d2e
GIT binary patch
literal 475
zcmV<10VMv3P)<h;3K|Lk000e1NJLTq001}u001xu0{{R3a|=m90000jP)t-s00008
z8FMi)F*;h-Qd(nUoZf45gp@)Ml$4ykwY|O8_uhmM-rnB#wL<^@{~@$&E&u=lX-Pyu
zR7i=n*6WgkAPfayE&|R7y#M2FBBB8kpw8@>{@Awrc?i{7wSA0YUh_{@p_d{<kw{!E
ztIn#Q7_sVCR_Q0`KSTc+`p?j}aAz`w92y)!5oKM8){YOwij;*C>$Gj6G57~9R%DGK
zVU8EX_a1mrMP`#4n<G@J$n<SvGN}*Us0KET$-F|hc+{AqN$}crywJdX)R=Qw?Hu-v
z86FdO?r`52Bfwl1Yb^`QwaGLls0<01b(V$aw*fmNF4iG*0)*Y>8Xw3u?ghRZ^Eu>s
z+6bG2lHb)bq6E)M`E$gzdLDYxSaL%+7G8|f2>_L~F@*bb#D!wK5zic`tc}MpKgr1{
z_cT^GxU4AjTR$T{GvP4ixaQ~KzG;#QVKR6C9l-k*hT~{%NCA=qTyky3p6YidFvi;2
zr2DGxVJsmN-#;vdFy3KSGJtWMe}EIYusKt=tM?6c$u+mRk?sDWy|FF_%^$v+Nj+2L
R&XNEC002ovPDHLkV1mLO)nfnv

literal 0
HcmV?d00001

diff --git a/res/chip-names-6.txt b/res/exe6/chip-names.txt
similarity index 100%
rename from res/chip-names-6.txt
rename to res/exe6/chip-names.txt
diff --git a/res/exe6/placeholder.png b/res/exe6/placeholder.png
new file mode 100644
index 0000000000000000000000000000000000000000..7873bb227f646c31efbc299850301fe5bb83c0ed
GIT binary patch
literal 476
zcmV<20VDp2P)<h;3K|Lk000e1NJLTq001}u001xu0{{R3a|=m90000jP)t-s00008
z8FMi)F*;h-Qd(nUoZf45gp@)Ml$4ykwY|O8_uhmM-rnB#wL<^@{~@$&E&u=lYDq*v
zR7i=n){Cx#APfdz1T7>A@Bg@m%DohDB&X3VbAJ9-L?_P863jLz^%cUX#&AeRTzpo<
zil10z#jh;UEeP8XwjpdoXrW<h2{|-5g7~O9EC^E<TfG$|O<Sy69d#*HOA}#xE;^LD
zR8>?W6{Lxj*g#HpFeXZAt<<-ae$f^&k)uQprIxsOY8g3BtSZ1(W*Dz>PQ;IR6rCgo
z)BMbd&J{U@@rjTVopbt?N=>2h2;0et)<<fqu{HnY9z%$*^oS>m!+Bj(7$Zw!f%C)|
zS@-C|$YYN)XxhZw;_BkW$Yvb<Ma6T41$-l`9^b*h$+$}Nk#(XD!w(W~05ydeIlEWQ
z5c<fJXq)OCnH?oj;p!hCxV$TI1VX-7ultTu|4{NgI!EVYo*e-OCmBZ}9DH@Idjg!2
zsq<Vz_J0PL=XvI^`#o)bC>6{O!}<rfkP|qSZIAt{@ssObb0bT3=wGa#3e6u$N=W(Y
SwhT%D0000<MNUMnLSTZ2@XpTw

literal 0
HcmV?d00001

diff --git a/src/platform/qt/BattleChipView.cpp b/src/platform/qt/BattleChipView.cpp
index c6d6578d4..e05785f4f 100644
--- a/src/platform/qt/BattleChipView.cpp
+++ b/src/platform/qt/BattleChipView.cpp
@@ -11,6 +11,7 @@
 
 #include <QtAlgorithms>
 #include <QFile>
+#include <QFontMetrics>
 #include <QResource>
 #include <QStringList>
 
@@ -32,6 +33,13 @@ BattleChipView::BattleChipView(std::shared_ptr<CoreController> controller, QWidg
 	core->getGameCode(core, title);
 	QString qtitle(title);
 
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
+	int size = QFontMetrics(QFont()).height() / ((int) ceil(devicePixelRatioF()) * 16);
+#else
+	int size = QFontMetrics(QFont()).height() / (devicePixelRatio() * 16);
+#endif
+	m_ui.chipList->setGridSize(m_ui.chipList->gridSize() * size);
+	m_ui.chipList->setIconSize(m_ui.chipList->iconSize() * size);
 
 	connect(m_ui.chipId, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), m_ui.inserted, [this]() {
 		m_ui.inserted->setChecked(Qt::Unchecked);
@@ -124,7 +132,11 @@ void BattleChipView::addChip() {
 	}
 	QListWidgetItem* add = new QListWidgetItem(m_chipIdToName[insertedChip]);
 	add->setData(Qt::UserRole, insertedChip);
-	add->setIcon(QIcon(QString(":/res/exe%1/%2.png").arg(m_flavor).arg(insertedChip, 3, 10, QLatin1Char('0'))));
+	QString path = QString(":/res/exe%1/%2.png").arg(m_flavor).arg(insertedChip, 3, 10, QLatin1Char('0'));
+	if (!QFile(path).exists()) {
+		path = QString(":/res/exe%1/placeholder.png").arg(m_flavor);
+	}
+	add->setIcon(QIcon(path));
 	m_ui.chipList->addItem(add);
 }
 
@@ -143,7 +155,7 @@ void BattleChipView::loadChipNames(int flavor) {
 	}
 	m_flavor = flavor;
 
-	QFile file(QString(":/res/chip-names-%1.txt").arg(flavor));
+	QFile file(QString(":/res/exe%1/chip-names.txt").arg(flavor));
 	file.open(QIODevice::ReadOnly | QIODevice::Text);
 	int id = 0;
 	while (true) {
diff --git a/src/platform/qt/BattleChipView.ui b/src/platform/qt/BattleChipView.ui
index 14ce62c55..10e8000d8 100644
--- a/src/platform/qt/BattleChipView.ui
+++ b/src/platform/qt/BattleChipView.ui
@@ -151,8 +151,8 @@
      </property>
      <property name="gridSize">
       <size>
-       <width>160</width>
-       <height>128</height>
+       <width>80</width>
+       <height>72</height>
       </size>
      </property>
      <property name="viewMode">
diff --git a/src/platform/qt/resources.qrc b/src/platform/qt/resources.qrc
index ea08c5e39..990203809 100644
--- a/src/platform/qt/resources.qrc
+++ b/src/platform/qt/resources.qrc
@@ -4,8 +4,11 @@
      <file>../../../res/keymap.qpic</file>
      <file>../../../res/patrons.txt</file>
      <file>../../../res/no-cam.png</file>
-     <file>../../../res/chip-names-4.txt</file>
-     <file>../../../res/chip-names-5.txt</file>
-     <file>../../../res/chip-names-6.txt</file>
+     <file>../../../res/exe4/chip-names.txt</file>
+     <file>../../../res/exe4/placeholder.png</file>
+     <file>../../../res/exe5/chip-names.txt</file>
+     <file>../../../res/exe5/placeholder.png</file>
+     <file>../../../res/exe6/chip-names.txt</file>
+     <file>../../../res/exe6/placeholder.png</file>
  </qresource>
  </RCC>