From 230729d9abba2c261f427d1b0429d54389015128 Mon Sep 17 00:00:00 2001 From: crschnick Date: Sun, 21 Apr 2024 10:37:50 +0000 Subject: [PATCH] Fixes --- .../io/xpipe/app/issue/UserReportComp.java | 11 +++------- .../app/terminal/ExternalTerminalType.java | 20 +++++++++--------- dist/logo/ico/logo_40x40.png | Bin 0 -> 2496 bytes dist/logo/ico/logo_90x90.png | Bin 0 -> 6840 bytes dist/logo/logo.ico | Bin 117552 -> 157864 bytes 5 files changed, 13 insertions(+), 18 deletions(-) create mode 100644 dist/logo/ico/logo_40x40.png create mode 100644 dist/logo/ico/logo_90x90.png diff --git a/app/src/main/java/io/xpipe/app/issue/UserReportComp.java b/app/src/main/java/io/xpipe/app/issue/UserReportComp.java index a80836d6..aec1add5 100644 --- a/app/src/main/java/io/xpipe/app/issue/UserReportComp.java +++ b/app/src/main/java/io/xpipe/app/issue/UserReportComp.java @@ -1,5 +1,7 @@ package io.xpipe.app.issue; +import atlantafx.base.controls.Popover; +import atlantafx.base.controls.Spacer; import io.xpipe.app.comp.base.ButtonComp; import io.xpipe.app.comp.base.ListSelectorComp; import io.xpipe.app.comp.base.MarkdownComp; @@ -7,7 +9,6 @@ import io.xpipe.app.comp.base.TitledPaneComp; import io.xpipe.app.core.*; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.SimpleComp; - import javafx.beans.property.ListProperty; import javafx.beans.property.SimpleListProperty; import javafx.beans.property.SimpleStringProperty; @@ -22,15 +23,9 @@ import javafx.scene.control.TextField; import javafx.scene.layout.*; import javafx.stage.Stage; -import atlantafx.base.controls.Popover; -import atlantafx.base.controls.Spacer; - import java.nio.file.Files; import java.nio.file.Path; -import static atlantafx.base.theme.Styles.ACCENT; -import static atlantafx.base.theme.Styles.BUTTON_OUTLINED; - public class UserReportComp extends SimpleComp { private final StringProperty email = new SimpleStringProperty(); @@ -130,7 +125,7 @@ public class UserReportComp extends SimpleComp { event1.consume(); }); var sendButton = new ButtonComp(AppI18n.observable("sendReport"), null, this::send) - .apply(struc -> struc.get().getStyleClass().addAll(BUTTON_OUTLINED, ACCENT)) + .apply(struc -> struc.get().setDefaultButton(true)) .createRegion(); var spacer = new Region(); var agree = new Label("Note the issue reporter "); diff --git a/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java index fe7ab0c7..8ad5f611 100644 --- a/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java @@ -630,16 +630,16 @@ public interface ExternalTerminalType extends PrefsChoiceValue { @Override public TerminalInitFunction additionalInitCommands() { return TerminalInitFunction.of(sc -> { - if (sc.getShellDialect() == ShellDialects.ZSH) { - return "printf '\\eP$f{\"hook\": \"SourcedRcFileForWarp\", \"value\": { \"shell\": \"zsh\"}}\\x9c'"; - } - if (sc.getShellDialect() == ShellDialects.BASH) { - return "printf '\\eP$f{\"hook\": \"SourcedRcFileForWarp\", \"value\": { \"shell\": \"bash\"}}\\x9c'"; - } - if (sc.getShellDialect() == ShellDialects.FISH) { - return "printf '\\eP$f{\"hook\": \"SourcedRcFileForWarp\", \"value\": { \"shell\": \"fish\"}}\\x9c'"; - } - return null; + if (sc.getShellDialect() == ShellDialects.ZSH) { + return "printf '\\eP$f{\"hook\": \"SourcedRcFileForWarp\", \"value\": { \"shell\": \"zsh\"}}\\x9c'"; + } + if (sc.getShellDialect() == ShellDialects.BASH) { + return "printf '\\eP$f{\"hook\": \"SourcedRcFileForWarp\", \"value\": { \"shell\": \"bash\"}}\\x9c'"; + } + if (sc.getShellDialect() == ShellDialects.FISH) { + return "printf '\\eP$f{\"hook\": \"SourcedRcFileForWarp\", \"value\": { \"shell\": \"fish\"}}\\x9c'"; + } + return null; }); } }; diff --git a/dist/logo/ico/logo_40x40.png b/dist/logo/ico/logo_40x40.png new file mode 100644 index 0000000000000000000000000000000000000000..5a7b848ef0a705fd36ea7cd260b5da0dc4a683da GIT binary patch literal 2496 zcmV;x2|xCUP)QczPT2?lklSP&#=Dsd*AhD1y{)3J_e#Tl#y zr;pSSC7s&fBQi;+6Kxz5?GR%^0vLf|QDhg4Rt?QVK>;yRz_Kf^MfPz{|6uRkbM9S8 z&dhJ_xsN^PbH2ad@7#0l5@=S`$`BM_ZC5qcK(jOpqi100}%t2+{sj zR~TcHN96*gpxiYAjC*~)!J#47&7STaTTEQsk&==U%C{l(QdCrwo05{UXJvZ&PfR8g zA%s9N9!h(h4o<17uz@;b4B+bHGKlSnb`rINos+7y9~e*X>4pWF(?wSp_A8fbc+5Kx#pGKUgdlvpMSF z<9rkTr8AikB@#QdE@a;z@r7 z-5NM&-)Dh1wKX<6oK9zkAvZU7%QJa-FNcMN>D;PV$M7(AU%E8u4y8~EFotfo8zvt}h+{G#=)aqe8}YHdQO7EtuuojU@YzpD!o zpL~osiv_oRJ|Hy}$NhfPc6Q>#v(F+iDheQEGE*4?BV_WZn1}>PlE4@PrBu0q2$P9e z6B1S%XUwpqOa-R||MffH2@OW~^uTVn!xRw#&%^{A4hN1^R-#Fk@wC^6@{A1RE?h8~ zsf0{I5dttKg7Q!SP#!WmI%d8k%d#a@hVhx{otO{+A5BR?L}Vl+LJ)2;AtxsX@0XXu zv2!Of`}b2CL0>Wmb^5*yrnE56KoI0m7z=J;i3oGT`;9fMc=@Nr|sO z+yH>pYQ@plcBAFXFY%i*XD~Q2fP6M$tQ97l~-`BqXU1ft`X);otOA){9LO%1EP1Y)_(T*#g6ct80%#z$ZU(T}6d}0zWZQp48%n=cSTDln20s=59 z9R@Qe2*c84M`>{4CynK41T~0Px<|U!&B~BB&lNN%*zVfUO%g zfJzcTsUU*F!5CB9lY&l$I$iKnhoY)1%g8aCg$}Fw`r!8a1(y;@Li_#uc=db}M!a6Z zTveYTH8D|C3ZZ8X@JXWbO$8aKmuxHm{og(Hd5M~}HSj_#wEYI2 zOG-j!W~SbiyazPika*=n7VchRVj>m{4GFi8-M9hgg9mD7uQpvkyXF}-I*NtYuj9>q z`vm2t1mo(0f~s26)c>592gU*TjYj;wsv3k4)OU5`y|y;7LB?RVHQ>lwZy_u!Ygp5#y6WrD=XPUrO^wbQthEI@*00B+MT_*|qk$p3D5`=~ z*rVuSwHqJC@b|4-LGRuL0QhYU_{)|p*j!zW5uZ0+CML5Op~ z#q0;b0YK^#PhiF92>iEh;ZLhpp&0~@-v5dN_4yFr;=u8vN5$(Q;I#MoD=Of$aLNvh zJ3qW*2hw|PBkP3?*w-S?cK{$a+EBJ@7c4O``hjZ7lqpIGB+9`trLKkJ>dJ~Z(Q3ts z4?e)AGiTt}v`epli|3P*k(ZYz>_>PZc-ZOUUQ|%CcU4v6m+IVlE;1|({a3H(8nq4$ zV}Ds$$W0O77Y`n?Fa`;lABNgsYd6`9F}&W=ir&#tykIg3lQ#hLEn9|5ef^-6f+?nL zOBpPG)YcURLxO2W%6IVoH{aqPZEeUrT#h&P?!_Yx2f$^pUy|^P)2GqaKL8q7IST_0 z1;;V)kkYhZA?%yML6kTg0Dv)z1#8Rp!(LGV)Km*9dI-V#iV9roA5fR~Q|*PdUgRMq ztvVsW0xlYQ@BqL1{46|N+_XnWWA8^Fp{leL@)s8cNH-yP=F}-vwzrFJ4%8Kh`(tB4 zVKk5uG&iO)KV#TdSC4*=M}UCGgNpKUEMB}Arwa>#D`L`k3Bhk0Y}is;i{6nDT|C}! zx$rleO$;UOXau7kU50T-8W_camKNBZPH4+Sbrnhr3&AMG;?z|9>&1;IIB^n4OB0@} zx!r@ho;z5Vl!WYrIY=;@G2nJ%PwPc2a5<;);)HR+<8?8{lBNO#r8sxzJG^`ImTuPf zx3^=N!GITEdI^+L5JHfio{m#SBMQpO;LBYDe!b~s44-y(;?vGfp`A66k-G2#0MEpP zOBx<>b%b&$4Y;CrXb9UHZIfRHxWdNAfvV4N{Ma$|gAb(?lu|5Px)kU4@5j8R^Pv6x zI@N`CTrT`PElroCj4`mp8BMFRv(tr-l!Un(1rr_`_XK- zLY{S?b|VK*2609?BC?=EX%!l2n4wLHdR zF$eqk0UydWorn5R84@nUa|&G3h4X)S^UbnKfcr*mw>z%I#?H7pJTjINA0MA!G#WK) z$l$5=B_HaQHSI!yQ&6dojg3)TW25~-bMv+X2M$)M{c05{DJhYhPUq%C>zr&$Ol*q5 zV2o4#hS0fln#HHi#e(b#73#Qy;>F9|9?&=VP~zAhLv!$l#2@QB)X36mfVs50?>F z+-6(`ou@KSKcHbpLXb5=7P63qodiP?B!rMXkj}pJR$cFp?&_|(b!+Ja=bg`|KKI;n zZ{520Tc^&w)v2m5=z~1)zyl_$)jB;aEbL*1;qEmU`~v;_j79){0H+t$WoQjBRO_u3 zj+2^v+nr@N&Te#zK9Os2DqkHOe92_i*+S*!_ zm6vrC7ZNadB}0!-fqlT=C3`@xzA?cXK7cx-y`ZDe1KQtq2=JQH4yD zYw=(*WXPp;b+z2)Z@(>RZ||6zmX_8n?1O>mCleMHn)<{OPmYy^+(+0=y}dYl^Cs%L zd%%K2kkN?ShYZ2Epdbt}8v6~LAF!}rE)yp{xg6&ymy`)@!g}uUs-?q+M=_5-wq)$K z9or89n8SAqAV4Q3CcYgP7kAekqekg@KuRgqCIH4T4C;G&@JUfIjyE*GNx9VZ41Q=Dc5U_5pLq%cp@MK-u05@l-Xs5|a3+&BHcNgU^Vec!(Q?|a6{ zEAjF1u@MpB8<#xxSSSr3EoB(S1y*R|VKWRawYK6u<3d6)$j{Hy4s8R!xq(Q^NSmK?vJSH?WY;R>{WxELU zZ+>&nzU5CnJz-ElfTn}ezzS_`HXD{@=b*)El|d{O2gjkLr4`>_y$Xwi#jip_VAAWo zP)WE1OwWl|f-ERkf~=W=4D{I8*ukZxB@-@{mTdz79RSRoJ9lhMOw8C};o&|(R)YPn z(lRt#ESez;rPtxW*QKS1KYRq=S6mf?rNHeIWSKfXK^9)o#0iXuh`?>P4WDrT{r8Xe zfDR1}et*FO3nKV|_7}Fz>BRo3sy;y$N}JV+cg~*0imYrj_4cZU5n2e5JqZfH`2)8Fz91r zp&LG2G_mD1He$h{!+2-P6fBAz>DpJ&4#Q8f3?nMzCrEO#^h{vFIzpRj&lM&~L7R~g zkr*(*bnoKDi;V`W)jECR#EC%?U>cyxrKfJ(RPShOD|)~B5?p7eq>Kp+gyF8cVVE)n zy3kMnKsU?c<$?la*3{td)2G4TVDPSo1%38_60SlhOEsaLYExNVC_)#&{`G_jfydI) zrx`*+Llei38#jaotS^umhCyAAXsu2a+wn{=-Q9TTp@$F`7l)A0P?*hT6c-mGFE0;Q za?xH=*QOX{ApBetogT4B5U5fv2; zhSA@vGaCJd=-o@GTLrtNw^x}m$6<6t1QzpmYxpS?daw>JbvsLl1eU#CO6p?hMZ1LlxnHMxM>rkpPwI$Mq`l9VDK{vCo(y( zzQES8tTJe)6Vs+n^#bOPO##j@42DNV;iZ>f#@WI`yfNcG_;1|;_F5&J41@PCT);co z*&@JlU?r;!0;1M2$}R**n_D;Nbw-_D$53y#<#y825kEE1dOboTBgNh<1V950z~A2= zD_5?>*|apQ9y}P%Lk9u79owsGu_H+&_O4K$v4m^*Z`))#;SvMa#C+522TQ) z3ndK0AUZl4C;ss%9<^C<)ndiM&6~Y3Tg9uXDFr$WHcyAfNvO+*j()%%6&wsk zBm@pl88#KTa1)e+VPG&A@X-q|V8gG*qr9UN4{zEe2}>kYGDI+p40JiL3LfpLqhq|G zLnM8GEv%hiY94x|u5#S`iX&WWH@cBUl z1|a9vS8?*%HS9fgO74iYhCmK*@b+U7heV*`o{X6sR

=vY*kavn{BB%so~U9tuv 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 LvaflHpc(f+f~|V< delta 152 zcmZ2+k#oZ|_Id^eMg}$p0Ra%Lz>vYhz>vnkz#t(3;dgK{Fq{L5DJVerD}d_4_!t-* z93XrRCkBRpatsU&4NyJ@BZFEZ&;TF+nfD0D_RC~s&;as*T7e=EaUjLO05o^<#`(>1 To4YJEoSGN?+rH=@BU=^#;l~$(