From 4fde77b05ed2996428697e523d308a3631d9ff47 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Fri, 22 Mar 2019 18:22:07 +0400 Subject: [PATCH] * UI: added paste button to import from clipboard dialog; --- .../deckeditor/DeckImportClipboardDialog.form | 41 +++++++++++++----- .../deckeditor/DeckImportClipboardDialog.java | 39 ++++++++++++----- .../src/main/resources/buttons/copy_128.png | Bin 0 -> 1633 bytes .../src/main/resources/buttons/copy_24.png | Bin 0 -> 621 bytes .../src/main/resources/buttons/copy_32.png | Bin 0 -> 725 bytes .../src/main/resources/buttons/paste_128.png | Bin 0 -> 1680 bytes .../src/main/resources/buttons/paste_24.png | Bin 0 -> 598 bytes .../src/main/resources/buttons/paste_32.png | Bin 0 -> 687 bytes 8 files changed, 58 insertions(+), 22 deletions(-) create mode 100644 Mage.Client/src/main/resources/buttons/copy_128.png create mode 100644 Mage.Client/src/main/resources/buttons/copy_24.png create mode 100644 Mage.Client/src/main/resources/buttons/copy_32.png create mode 100644 Mage.Client/src/main/resources/buttons/paste_128.png create mode 100644 Mage.Client/src/main/resources/buttons/paste_24.png create mode 100644 Mage.Client/src/main/resources/buttons/paste_32.png diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckImportClipboardDialog.form b/Mage.Client/src/main/java/mage/client/deckeditor/DeckImportClipboardDialog.form index 8493fd14003..f86a4e1b6bd 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckImportClipboardDialog.form +++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckImportClipboardDialog.form @@ -1,8 +1,7 @@ -
+ - @@ -10,7 +9,6 @@ - @@ -30,7 +28,10 @@ - + + + + @@ -47,7 +48,7 @@ - + @@ -76,7 +77,7 @@ - + @@ -85,7 +86,8 @@ - + + @@ -94,11 +96,14 @@ - - - - - + + + + + + + + @@ -108,6 +113,7 @@ + @@ -121,6 +127,17 @@ + + + + + + + + + + + diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckImportClipboardDialog.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckImportClipboardDialog.java index 438c8954df6..e074de1341c 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckImportClipboardDialog.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckImportClipboardDialog.java @@ -108,8 +108,8 @@ public class DeckImportClipboardDialog extends MageDialog { panelCommands = new javax.swing.JPanel(); buttonOK = new javax.swing.JButton(); buttonCancel = new javax.swing.JButton(); + buttonPaste = new javax.swing.JButton(); - setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setTitle("Import from clipboard"); setMinimumSize(new java.awt.Dimension(400, 400)); @@ -118,9 +118,10 @@ public class DeckImportClipboardDialog extends MageDialog { panelData.setViewportView(editData); labelData.setLabelFor(editData); - labelData.setText("Paste deck in text format to import:"); + labelData.setText("Deck in text format to import:"); buttonOK.setText("Import"); + buttonOK.setToolTipText("Import deck from current text"); buttonOK.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { buttonOKActionPerformed(evt); @@ -134,23 +135,34 @@ public class DeckImportClipboardDialog extends MageDialog { } }); + buttonPaste.setIcon(new javax.swing.ImageIcon(getClass().getResource("/buttons/paste_24.png"))); // NOI18N + buttonPaste.setToolTipText("Paste text from clipboard"); + buttonPaste.addActionListener(new java.awt.event.ActionListener() { + public void actionPerformed(java.awt.event.ActionEvent evt) { + buttonPasteActionPerformed(evt); + } + }); + javax.swing.GroupLayout panelCommandsLayout = new javax.swing.GroupLayout(panelCommands); panelCommands.setLayout(panelCommandsLayout); panelCommandsLayout.setHorizontalGroup( panelCommandsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelCommandsLayout.createSequentialGroup() - .addGap(0, 146, Short.MAX_VALUE) + .addComponent(buttonPaste, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 128, Short.MAX_VALUE) .addComponent(buttonOK, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(buttonCancel, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)) ); panelCommandsLayout.setVerticalGroup( panelCommandsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelCommandsLayout.createSequentialGroup() - .addGap(0, 0, Short.MAX_VALUE) - .addGroup(panelCommandsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(buttonCancel, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE) - .addComponent(buttonOK, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE))) + .addGroup(panelCommandsLayout.createSequentialGroup() + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGroup(panelCommandsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelCommandsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) + .addComponent(buttonCancel, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE) + .addComponent(buttonOK, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addComponent(buttonPaste, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 30, javax.swing.GroupLayout.PREFERRED_SIZE))) ); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane()); @@ -160,7 +172,9 @@ public class DeckImportClipboardDialog extends MageDialog { .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup() .addContainerGap() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(panelCommands, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGroup(layout.createSequentialGroup() + .addGap(0, 0, 0) + .addComponent(panelCommands, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) .addComponent(panelData, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE) .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup() .addComponent(labelData) @@ -173,7 +187,7 @@ public class DeckImportClipboardDialog extends MageDialog { .addContainerGap() .addComponent(labelData) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(panelData, javax.swing.GroupLayout.DEFAULT_SIZE, 448, Short.MAX_VALUE) + .addComponent(panelData, javax.swing.GroupLayout.DEFAULT_SIZE, 440, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(panelCommands, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addContainerGap()) @@ -190,9 +204,14 @@ public class DeckImportClipboardDialog extends MageDialog { onOK(); }//GEN-LAST:event_buttonOKActionPerformed + private void buttonPasteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonPasteActionPerformed + onRefreshClipboard(); + }//GEN-LAST:event_buttonPasteActionPerformed + // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton buttonCancel; private javax.swing.JButton buttonOK; + private javax.swing.JButton buttonPaste; private javax.swing.JEditorPane editData; private javax.swing.JLabel labelData; private javax.swing.JPanel panelCommands; diff --git a/Mage.Client/src/main/resources/buttons/copy_128.png b/Mage.Client/src/main/resources/buttons/copy_128.png new file mode 100644 index 0000000000000000000000000000000000000000..cb3442c04c82253299c2489c452b67f5d07712a7 GIT binary patch literal 1633 zcmb_dX*3&H6n;re#1d32v5YO2L5r56G@(uqO;2iTELEb5ZYWK((nKZnv^q4FY76!UGzviCryWe^Dym!vM=iT@2b$^mCQdwUa z0D$x(-~;8#`bGp??)!1k19DNIdiez-1Y%yYjTMww9npdME)?Eh%7}d^EvW+$**!(B?ZkpDLv`)pXk)AGcITf5y;YpSvg3vGT+uP*F8IQgXve(I%#tRt=22M0 zjRKEui7VB8N$FGHJP^JMiL`uSrBNbg*zrT9iVnT*#HfzXjOSFpfoUw8gV1Ge&A?df zJ*SSAFy7YGG)!Z;EgQ(PNSDD2HcO|?eOvH$*&oLnW2WVbZau6_$@y|UYq!C0e#5nl^_3D& zk8wb@xpfeY=I9-JgnE3XwQb$m0VCw4jLUc# zv$d_IJ^?h_p^uUU*uv~b99sf7#vYgR3L0R`@#-nuYl(&j@c}fxBbeg^2Q- zXP*tOwN5?xa|hJV7ZPW|pye+HsLS{j8`&D~{4G4_t=h7@(1EP{m%f=05bqX*+)>6Dnr3Y=BM|CE|Pf2VEd>=97jKrw@GHMx`qc7HnFG9c)M<>K>_s zpEks%YFE~arh#53mf8ru@km=iy+S=ft;ei4F?j@WTb$BJ79a$0O5G&f0Vdiu;r7>) zdA{9=`Bmw!g@c@YR@#)_XhTf%p40_tlOEs>&ot2RPRf*ea!nG>jmN)%FG)i^MAW{m4nh~s}&aMP24y|0KFamYA8Bob3$YZgoN z(6ju={yEt&e0kJrTt>S%k8m7?I28@e3whSSV-Bkuh1{gGVw&mS_ZawQ8%?IZ88&V1 z>RP1vEq+onk5Wwm?&OdV7diRa23Jkf%I+F>yN(utF+SX+`2Pa$a6fb9)g7*F#d>f5 z>Q>?8;Ri5%PrJ6IZ2#-wB#({iko!s+B$ymO7_MgzJa%HGMem~8i6lT-(1&vvoQvR8 zL$rFkjfq=W$IhhY#F(cu!wKBIdTJ~z>O3toDQ13xQ zL8h9>KpF2;`q|Je@xBseRt##}4VzzlH7{?bA1p^zLF5m&KYZPpRWmM&T}oUTuw)Sj zH)bc>FMhiwePlu`>S{Ed^_o!~Z1Z7d<-AIdXZ_2dfB)f%{C8uhr|I=acigUzkk1I< M=S{-bdr{K<1`EB>T>t<8 literal 0 HcmV?d00001 diff --git a/Mage.Client/src/main/resources/buttons/copy_24.png b/Mage.Client/src/main/resources/buttons/copy_24.png new file mode 100644 index 0000000000000000000000000000000000000000..9a2920c9a180114e53221f7ee7d1556166dad702 GIT binary patch literal 621 zcmV-z0+RiSP)KlfP>dVHn51-{)d}s7nYq zsF*t<76TUA|G+^DIw)8X2NxH?&DAB%=1_1*5f>>G6pBL!D>XPoP_)=ZgPaACOFGLQvpVr24^%ecALthU7JpU$=E*%pMU*IgXR}Ja0xIj{uCrm=C@0bG>neAR&ONk|eU(>_OLc*ZV!& zwif}MCRuYF2fOzdE`Iy?d7k9WUoirdyTBxXTYYzl)Kt|4k~ROv`73YnVlu7id|K1_ zO_fsbnW37IOWrDD%#T8$aKZQed6G3}ZVs=#>I?uJsWehRcUw-P4n(Bn`~H1Z%>dBe zxGqQLB&h!cz#2(gL=FIG0{BkyR8&&z5w%*aX#msxceZW65s7|d(j_O>f55*19GzOa zWU>1m06=QLm*__uCROVlU}i}Kv^E$2I$*VWav8w#Aa5X`)9D;57KI24@m$3oucKc2)mup#;6?gd>1i?zo*qzZ&5f8&sP=Ytu00000NkvXX Hu0mjfVJQl? literal 0 HcmV?d00001 diff --git a/Mage.Client/src/main/resources/buttons/copy_32.png b/Mage.Client/src/main/resources/buttons/copy_32.png new file mode 100644 index 0000000000000000000000000000000000000000..9e8be51facab3671bca644760041038e1faed314 GIT binary patch literal 725 zcmV;`0xJE9P)7Op}pVikZaVj9-tk4Y;n`2jD}s;in8X z>Umx=GO^T#T*GG&KaO)k$_RmBm>S5@One|&6~J+vev&I@wk0CIfm799l9Qzn9plS) zC2y-BZu;Vic4fu}zZD;y8A3BV*xlV-_p3RM6Doilibxa57mnj#XY5h3V|=*}d7YBt z-efm`X68e!rM+tU3Vielz!HF|Vh8~J#imFswE@a~zXnn#0QUCwrU5(wzyicbE$`O_ zK(aL)4nHLM6~LSGK-3G+V`gh+wgzDM^q4Qh;qaXxJ)GH)cY&0s9O_hhdFHn(Q=mOQa2zuJQm6t zAYA~E6SY#$rEY+P2eXd=VC1hRJ^J!j0W$IEJb?L1o_{xl$2VQA4fFZ@nSl!gK++1& zp296xlSEFIS{ArK001@tyajNh*5N0U&3&zPXUvya!Wm?mZ!3M$rfGn#5?`j~Z2r`xkQL&~ zqnMJWWv+m%Jn1qeH`5Fgv_dS))zXy_YeobUH@`C*}7 zVa)B!0RR{#gBD@*&<8~!jrNzogxf}k$k@t^LK!6wmBcf~W?V*01^^b;9~1^^>udo) zdNFBVM&;CLCw6dRzsB{ye%vWb9CvN*h^Q^!LQbhTjyWx*9c8XLf29ybS01rRi;P{c z#IqfuxDHQx3nfI}nN3k`pQ|`d^Xx?WPiLL#tGhVZCi;ci;?ECHcQ`YWD@1eCkLISt z!&w{V)|RL0y=19Vux(CfDkBE{eoxn@wErAV6Ps{1l4Ti`;1xG(=-?avK(|JtS*F%I z{^kl56cogPqF<(<#e& z{^pYp+r?DccG{Mbgt04|)knQ78f3E6^PW>apeRP7xzTNUk7dOT!Ut$1p~66;>Ql7@za#AW&fy~uAP{Y9KD zImPol%T7*CzWW@Vyb3GaeaZIM#FMcH#dJ_VTix{?Eh??EXGt|h!N@c0py>y3CN#jmNl(g02nw*0^s1wB|Ck3U9vmRp=fp&+oT2X1fLC!rbG_%la{ zh}vT#OpSe6-^3S*L|0=iRc;$$-Y17FriV`vY=mljT8 z?4|!wZ*MONYWY4lSFC;U!VV`qxa+c`V;bIlr*l>05KCV;lTe<%M4;&P`e4wV5l|wV z^@pat!EiF5c;3wWRl$xMZnMJ>HzwHr@EIu^K7Y^P>Y@Va-oC!RA+$LUeb-EkwD0YC zC~G42{r(1%SJvEwC;JlbFT)NP3@{xL+oDhn%tg9_BxKM~(9_2|z?&8Tn0agOOi4O>cm0 z4r@kvgRhRRC_t78DkT1`C@T)2V1;wEq#Z89-`N|}70+*ut=Y$;!Uw`vlawHR=d2N7 zaTH&GjAw?gQvz4#y$CyKAH9?c=Qc2m@DsT8CK!1miKet#^&{>$Xuq+b60STIfN8X( z=5X5CQ)%IRWEni@%9@4=iX;GEy8Zs1rKH{ZBij7tJ?^EAm2t(KoT0u+)N*_C2w7Dh zbuf_h&~tWlVR2O21al-h9_dg!SX;Kl1;H5*HNR5~0}Ms_xQ{o47*j5SF$3NtG@uAs zCV#%_>JqVRI&N6F?C|Oub-uzef7mx>f2XCMx z2Ho`X_U{5Y5w$jP%KcJwu%_x3zkzl6tuG`rGF^ozdxZ+g3dL1>ZW!FV;a;ulFk+i+ zaS056hZ|Bw4zT<*?B7*qc!JVYUEtyMTSqLyq`Na|;LxKM+30hJk8Cn%1-_I~I%?6~ z?q^U`M5|8tfKTH%Xzk9Rh{Y5|Z){*x$mHRLHdJ(u z1_;<`bART2lf>G8(KBroO^h7?HylfMjoAAh+5B2v8urt53=`c*Hp$KSxlP;e{p|xq{sRsy@Sgwx literal 0 HcmV?d00001 diff --git a/Mage.Client/src/main/resources/buttons/paste_24.png b/Mage.Client/src/main/resources/buttons/paste_24.png new file mode 100644 index 0000000000000000000000000000000000000000..12ba4b619a0d2c5cfc481c800c4acf60f9091748 GIT binary patch literal 598 zcmV-c0;&CpP)KmAz{daTv$H-{*`TqC*4= zw!Y-Dltd8JL8LAsT3?D?bP@Ew5Emg04yCv{IykvxP#5VH#UJKcSsm(TBhKYsTR2`UzgJDbg>B*inCjMZwjjih)-jJ|lDcOAeK z$q4}0(u!5}CCPUHYV~^kK`J1Z%dLvYSX$#ag<-g_(P(_>_y5`gk`91%Ree5W-?ysz z5dd7*b>b3s#CR@Nm z*uSlS_Q>mwy^7p`lqt0MXZx)3Y~T`PzoUHJiAs0bE8-CC&7Dk3R}h|7wNh*^bfO3^N) z`eNp|NK?}^e>02B&^Eda~D!K#YK;~xP00C4=j0BSXoS-NTtX$LkvHUJ>;Q^sqh`I!j-ue%07 z;WEfn%j{L(vfhN#_s2`~GZR4&Y_;n> znyvz@WhPeutkm0+>7~;mzcyOaqayUzA;2NPfde$XhLX-F5{Y{NP%f8m_YFXjBMFj8 z07(D{!|-me0QMY#nLTpOtxMXdjwp)Cy#m;?1NnS@4!~T!eY9Ty?Ida}nO^?Y$r=Zp zYW6tr1`yyXy{*#eIsxEzM-<$iccMRl;Q@p}S5r48X?G_6`xbW1iB1Mv@TTsU{sI#e V?fXpF@)7_5002ovPDHLkV1i;OCqDoH literal 0 HcmV?d00001