From d9f280bc9710cbb5fd87af06bda32802f56e5505 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Mon, 23 Nov 2015 11:35:47 +0000 Subject: [PATCH] * experiment with high-dpi icons --- source/net/filebot/resources/action.select.png | Bin 0 -> 261 bytes .../net/filebot/resources/action.select@2x.png | Bin 0 -> 425 bytes source/net/filebot/resources/arrow.down.png | Bin 180 -> 0 bytes .../net/filebot/resources/search.shooter@2x.png | Bin 0 -> 2234 bytes .../net/filebot/ui/subtitle/SimpleComboBox.java | 15 ++++++++++----- .../ui/subtitle/SubtitleAutoMatchDialog.java | 4 ++-- 6 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 source/net/filebot/resources/action.select.png create mode 100644 source/net/filebot/resources/action.select@2x.png delete mode 100644 source/net/filebot/resources/arrow.down.png create mode 100644 source/net/filebot/resources/search.shooter@2x.png diff --git a/source/net/filebot/resources/action.select.png b/source/net/filebot/resources/action.select.png new file mode 100644 index 0000000000000000000000000000000000000000..6e1c9174d512804731dccc4f3959406567a07d9f GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqY)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~w>Y<=iOHRiTR@>no-U3d5|@(`6j+Y@;WKzNDLdkC z)5M95jg5|aZ!Xl^Dhsj|)|IhwI`Xj@)`_*5&zF#xb@-^{Oc$B$#&%Z!ogUq8kKga| zbEag=4oOM7n!mrl{#|~)sZ@KRT1VyE)S9o~Hn+65Us4tn?6aRPUo+V}Y<=)C;aiQ3eJ^Gfx-C5R22vfByfsXI5?KY;-dC zz_#Il#G`-g|BVYb8yFOBGAj7A!GHrufB3k`fTLie(TCzqh93%yj0!eyHrTLvgMop; zpWjjPO6QuB4(vaF|M?27?qv~@oW=#4j0_7l83SoY19oX)W@{kUR#razv)%r`v7v!a z+skB^K32o+vD{a_9(|PC%OY9#@89_YM~<90aQNIAg(Ig=DV#Wa>cf+}`EA?h*OitW zKNXf_+R)h8=y<34zEWxI!-#5S$F}?X{~H%xwc)8i?-~+%w OW$<+Mb6Mw<&;$SlBD9qN literal 0 HcmV?d00001 diff --git a/source/net/filebot/resources/arrow.down.png b/source/net/filebot/resources/arrow.down.png deleted file mode 100644 index 3bc773450eb8d73ff92b380fa6d69e2b7980abd7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1n!3HFw&5r&6QY^(zo*^7SP{WbZ0pxQQctjR6 zFmMZjFyp1Wb$@_@@+GbjCBgY=CFO}lsSLh}$wm3OsVSL>3T~N2spa`a*~JPLTQe?I z0F`Qcx;Tb#%=A66Q1E~P1H(p{R;(_gvD%^j>M0D71~-eDzv6DALJ4i U<^At-9H@=K)78&qol`;+0FHk&xc~qF diff --git a/source/net/filebot/resources/search.shooter@2x.png b/source/net/filebot/resources/search.shooter@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c546c2105b0f8c38fd4e17af3db15cb9503bfa32 GIT binary patch literal 2234 zcmV;r2u1gaP)6@AN-rYZ1ur#GW z;`!&jx$n;Te%`s~+GJ82gaxu>EuA01rhqx0G-bk4?jf4pk z(Bk4SdwQZ$)0|b7?Xe>KJfYe^e6?^+BM1vwz8cu&)qxp%LnltPC`jGms~-TLB-_PaN1(866^wzh)@ z9gdMBZSI^LDIE?hrG&KGg>*UvAiKW%PDDZ>EovAx)%UguK-NV7h67jt#A%ukLI6k! zquMGfW!UFa$&)9Gn+gj#_t|FzYHK<1>Z=&RAe!9{(I{9J00|Q&kh^FR*^fK|nkJCa zCxqBDT;ACRMnIS*0RM`QFL1%#-Szd-)OBS=qhvq)Fbe27bB0h$3!0P|mW4Ap8N1sJ z!03k_Vsv34LensHoyPL=xR{ujYp zx3>d0lxa@h1kPdz4^;`5Re{hnH6UAhEXzV@8f}%8)RmPXZ8j3~@^FtGi~rf09xPplNQ4;^C&F#FA#FAgmnC}$sJ?uGuTTX+rSN2C zDu9r#x1{FhAHHk-`oM^c48k29Sm7{^q$EPk&D=0^CR1K{g>efO;2t{`&E@KIrfGv^ z5`cwe5LXQ5P^EY&0*jU6$2Du2(!0$h(I8=AvG(xge8+qsk8_I82|4RjniLe|2Cmx3&WKuD>SQUd5z zO8o#31@ZWBOYldf$Sx`2+c)22(ux&PM{@G9n~I9Qzw`a~@z>Pw-xprM)O7-ljkN9G zPvh3D99zGh;JI^s+g5)b8R0Nd!w`m2SW3ks#54eh5b7Vp0RS|Wm(%^@kEG9Mf&y$YF-W@|0H?=8>eQ)>Td;sJ4?KV^CPq_A zB>==LMf7T?VW_1AD;njWqecmUBTJW722P#2C(_mBNSQVbPeB2l)zvib-Als6iQKhj z4Mr$Ld`=EZDbi-lASpke*z|O)NQCd+eYflAYp;C?py%X>NNw%#0J%>;eX*+%0Ii1( zHQ7OzLO6nrjhwBhz~%8^DaGm4s|ovjiD)QvG?bQh zjMi32OS7IC0zex)aA?UAE>u;C?VyT;xIw`01;iP_ARUJf)Bepjm=`XfOcQ@i4b8iE z({uJL(LexUvmt<BW?Y4Z6Xy&;dtjes3Q1nd$D z1*}q#CP1h`e^P*DvmsqB#xGn*-m+yllagrp@=FdcUi^*p`HBhyf#$6-F>+pSuXWXi zgg$Xh5RXAb!1q8<^lzhsiG`FX!(hzZxlDZNC7ek~M7z7GDJ``eiHYYYuUqGT6hz9* znTo4b!9|Pw{Bi)Dz?mVYT?Q0vXy9ylIf1%5gr+fN)hhApojY9}Cr?VRQtFnaOSxu% z$NB}lAd8_1cox_W_y>p!gut*Y5^uSM)O+v6otepqj0|ieMyS~I^p1|Is!#s<#v8$K zARyZg98lNOonPu=z5S4080m#Sdm-WlW3v#}22eZ3k5{ex_Nj|z=(?$Qc3S@_DOn3} zvb5Azk)3_%sK2HN41_2Ks~_S5@DA_=pdo~*09R@%NQu9?niI>G5vZ-TOkI!sbl|{N zfVO@6RAGHR|DHa5NDXlN{yT0DK>A?rD=v!V3Kr!I{xqA*O_GXJp6~AuVboqUv7w+AxX@4n$%Fhc5emcE&ZMmVav}4CFBkmor zOAfSyQ>L&HvbSev|K`x+kEa4O@7@i7@5BjyaoYy0{{{X1AM)Ie6u&@X^8f$<07*qo IM6N<$f&>^e&;S4c literal 0 HcmV?d00001 diff --git a/source/net/filebot/ui/subtitle/SimpleComboBox.java b/source/net/filebot/ui/subtitle/SimpleComboBox.java index 2933c204..20e5c1a8 100644 --- a/source/net/filebot/ui/subtitle/SimpleComboBox.java +++ b/source/net/filebot/ui/subtitle/SimpleComboBox.java @@ -5,26 +5,31 @@ import static javax.swing.BorderFactory.*; import java.awt.Color; import java.awt.Rectangle; +import javax.swing.Icon; import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.plaf.basic.BasicComboBoxUI; import javax.swing.plaf.basic.BasicComboPopup; import javax.swing.plaf.basic.ComboPopup; -import net.filebot.ResourceManager; - public class SimpleComboBox extends JComboBox { - public SimpleComboBox() { - setUI(new SimpleComboBoxUI()); + public SimpleComboBox(Icon dropDownArrowIcon) { + setUI(new SimpleComboBoxUI(dropDownArrowIcon)); setBorder(createEmptyBorder()); } private static class SimpleComboBoxUI extends BasicComboBoxUI { + private final Icon dropDownArrowIcon; + + public SimpleComboBoxUI(Icon dropDownArrowIcon) { + this.dropDownArrowIcon = dropDownArrowIcon; + } + @Override protected JButton createArrowButton() { - JButton button = new JButton(ResourceManager.getIcon("arrow.down")); + JButton button = new JButton(dropDownArrowIcon); button.setContentAreaFilled(false); button.setBorderPainted(false); button.setFocusPainted(false); diff --git a/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java b/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java index 2039675c..9e1c1019 100644 --- a/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java +++ b/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java @@ -130,7 +130,7 @@ class SubtitleAutoMatchDialog extends JDialog { table.setAutoCreateRowSorter(true); table.setFillsViewportHeight(true); - JComboBox editor = new SimpleComboBox(); + JComboBox editor = new SimpleComboBox(ResourceManager.getIcon("action.select")); editor.setRenderer(new SubtitleOptionRenderer(true)); // disable selection @@ -361,7 +361,7 @@ class SubtitleAutoMatchDialog extends JDialog { private static class SubtitleMappingOptionRenderer extends DefaultTableCellRenderer { - private final JComboBox optionComboBox = new SimpleComboBox(); + private final JComboBox optionComboBox = new SimpleComboBox(ResourceManager.getIcon("action.select")); public SubtitleMappingOptionRenderer() { optionComboBox.setBackground(Color.white);