From c45bd1d77c96aa5858b82049b61c97f211440b07 Mon Sep 17 00:00:00 2001 From: ProfDrLuigi Date: Sun, 26 Apr 2020 11:32:17 +0200 Subject: [PATCH 01/14] Fixed status color in darkmode --- Sources/WCChatController.m | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Sources/WCChatController.m b/Sources/WCChatController.m index dffb2e21..28302c88 100644 --- a/Sources/WCChatController.m +++ b/Sources/WCChatController.m @@ -2615,7 +2615,7 @@ - (NSView *)tableView:(NSTableView *)tableView //if(row != [tableView selectedRow]) cellView.nickTextField.textColor = [WCUser colorForColor:[user color] idleTint:[user isIdle]]; //else - // cellView.nickTextField.textColor = [NSColor whiteColor]; + // cellView.nickTextField.textColor = [NSColor whiteColor]; [cellView.nickTextField setAllowsEditingTextAttributes:YES]; @@ -2639,11 +2639,12 @@ - (NSView *)tableView:(NSTableView *)tableView cellView.statusTextField.toolTip = [user status]; cellView.statusTextField.stringValue = [user status]; + NSString *osxMode = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"]; if (osxMode == nil) { cellView.statusTextField.textColor = [NSColor colorWithCalibratedRed:153.0/255.0 green:153.0/255.0 blue:153.0/255.0 alpha:1.0]; //Light mode } else { - cellView.statusTextField.textColor = [NSColor colorWithCalibratedRed:197.0/255.0 green:197.0/255.0 blue:197.0/255.0 alpha:1.0]; //Dark mode + cellView.statusTextField.textColor = [NSColor colorWithCalibratedRed:130.0/255.0 green:130.0/255.0 blue:130.0/255.0 alpha:0.7 ] ; //Dark mode } cellView.imageView.image = [user iconWithIdleTint:YES]; From 35942e35ecc62b802756e546ea36f805073dc928 Mon Sep 17 00:00:00 2001 From: ProfDrLuigi Date: Sun, 26 Apr 2020 12:04:48 +0200 Subject: [PATCH 02/14] Added white label for "black" user accounts in Pulldown Menu in dark mode. --- .../LabelWhite.dataset/Contents.json | 13 +++++++++++++ .../LabelWhite.dataset/LabelWhite.tiff | Bin 0 -> 20752 bytes Sources/WCAccountsController.m | 14 +++++++++++--- de.lproj/Localizable.strings | Bin 101756 -> 101836 bytes en.lproj/Localizable.strings | Bin 96342 -> 96422 bytes fr.lproj/Localizable.strings | Bin 99740 -> 99820 bytes 6 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 Assets.xcassets/LabelWhite.dataset/Contents.json create mode 100644 Assets.xcassets/LabelWhite.dataset/LabelWhite.tiff diff --git a/Assets.xcassets/LabelWhite.dataset/Contents.json b/Assets.xcassets/LabelWhite.dataset/Contents.json new file mode 100644 index 00000000..5c8ab266 --- /dev/null +++ b/Assets.xcassets/LabelWhite.dataset/Contents.json @@ -0,0 +1,13 @@ +{ + "data" : [ + { + "filename" : "LabelWhite.tiff", + "idiom" : "universal", + "universal-type-identifier" : "public.tiff" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Assets.xcassets/LabelWhite.dataset/LabelWhite.tiff b/Assets.xcassets/LabelWhite.dataset/LabelWhite.tiff new file mode 100644 index 0000000000000000000000000000000000000000..a9c69a17e67b36a811678a4606f22ff9949906a8 GIT binary patch literal 20752 zcmeHPd010N*PnZ{kr0-!iHaI_TtZ0LBYRkd2m*pyTMfx2M6#LO09yB2ZPnJg;l5j~ z+E=UArPjJzYqjo6t6fm5xV6PvwN)$c%nb0nu-+vjO%sq3?Z_b=Kb7tn^^PDS_ zfnERr7vKw?13IKI_(K(qdT=3)+0i&fLm9@wXf1pQ#+WTM4r!iMPhkw^Wry)?p;2$Y z78>dAWW{42VO;>jGCbyqb+ys{Sb&|Lh!z@+B?7Ppfso>3Vv6>GbOyc$O(9MN>9Q$# zh<1$xAb#&uwRNnbAE%lC3jl5|02%k74&(#$kMry@0O6k2XSz~fLGX*J^rYTYr8n@! zqR1$IgiNkb>ky|W0OBZdlq4!fB97yWM3NY>BsK;lrPdkbifV%7R}d<-E;;CzPxl4! z)ym|c@>p4v%pfJI)VZULM9Jv>rHawjibQ2lY6>T*PEw~eXbDozuhVLDCP`g#kQ|LK zfiz+ZgZLDLtWFNH7&b^&#Fy%g1V1)1PM{FQB=F-CBSmpBQPFXI_~Iy0qA)5!D2f(D zi6l{RlGu2DO9@KhKq|?otdtaIX15FnTggFHBx#Tcg|)S{k+sp0dZS7xN=$@m#6q!H z01*PyC><%U6X;CA7A00anS@DUR2xXOUdKmzad@|x^}kiZHBao|8iisCNf#a zovrq2wH*#^BC~3s3tC*-W>{-aQ|TxJAuJ|Ldb3eMWYxf_wE7jgEeVb;ks1j(sW+DD z^_rA_3dkg3`yQb?*B1VxAFHkDvazRWiAs1ALqT>WH%J_I9Hnu`skq|?z zhD>JP{RP#TdW9M7gBI0F2UXj3e?fJjQ4P;9xyBBItao&X4%ECbRIb_t<9rl#IN8n& z>Xa%WMz-amy@8GyjhZ@b405B1Kzk`U$hw(q$CFJH>O<{GiClrssT2j;ScEc3*oNC` zmaS(?H}$_=K#P96?teW-Z55$wzccN3l|>bW`fDX7eI;2dHxlV87!xmXW>}QA?bTj; zlF;Jsw(DTwwp|`;z_wdX3)JqOuv|ivT6hb=3s7jg0ox8@TZjKK(SC~mWAzqw&Osb< ztJ7UhcRAz%hrrJ0a=ObQ4>$yNMwioF4tc;Kurs=x?sCWj4uPG~<#d-r9&iZkj4r3U z9P)reU}tnW-Q|!690EI|%jqtMJm3)68C_0yIphI{z|QD$y2~LCI0SY^m(yJidB7pC zGrFAaa>xS?ft}IibeBUOa0u*-E~mR3@_<8NXLLE;<&Xy)0z0G2=`M#n;1JjuT~2p7 z=p>B&6rbz-&tmN~RdUHjZz5z9s`b{bAJM z)+e>6!YG-$#Y|MEP5_p8bE9}Di?%z3?A*3ZdqB0>R1GVP>IHL6QQ@>~7#OgW1rI51 zE)Z5$LWu^}Op1fGa8@o{WaEgT1Or20ZNxkRm8UOAb(g+oA}z z+eIPBXpL563Mg(3M$~4SG-?H5D$^98?S!=%he638+YA0!R3k6bZY-9{s5cwhu$X!( zZO?jAW|biAmK;2&!%c1`^*Mx&Frxf7$N(sJt_94ofDs2t^0X>GeEfgUp9Yh9+gu%# z^V@P{CRN+(g(=sNrE*mpl)Hk^XiAAXGS8G-Dl4!aS}s<08!)>{ZycSjQLC(Xiic(L zxmGruIZH`Y%FWav%B~@dWC!pvE4wY+wL(Q@o7y>-XVIULV-vtGpub*+e9b2H26!=> z2>Vltqk+fS3tVmmb^N`+cZJJd)gDgmzz8%DwTtl7CW^M~HkdIF3zhp%;i%xmb&!WP z2Wp{T2yA`?cS14n2Uzph%|8Jym5Mw}DueBxfjiX#$_WsQHD3Xf0oTRFh3&#+v$;H1 zjw{dCgUj{s_4oGn_4fAXajDYsur%7&n47Dso4cE*ySt~4ySuv&s@#1nU3f2}pm{&w zxj^H&G%N_cU#7G|?_YN94QOxw2wQ@^FaENd5fr{uDvVSDHR9K8lMkIUUw@DtK6lNVAJ02{{>R_m-+tu6jfZ8G zHB;)>?)d!T%}4P$<*M4L^VjV>da3a-58ybomQLBkVlrYW69PqEbZEiIAa90v;w&Fz z!GYp4P0=A0SB;ZqOG|terkMMoOk@BnEcW18XvFGH%B+ELByr7V!e3hu-fBYgW#m*e zZ5~Jkzdi9kI^dNhr}Gz`EpX2*n)v94{>)SPWX{;r8@4@aTzg7-Z*TpXZR6MP4whXR z`{|tV^FAB@wD8fs!av3>`|5{BH~&1=v-uk;@&c)aD2FwMLeB%F10{S#L`OXzzA#on znuI?SMZs$f`1}Kc55ypf`azWt&&@4R>-0E0;I;4_45e`o8a#y0ItdSWHoR-#Q7%`Q z46>4J^a2ZDiZ>tSdLz1}KqZeZS}u)qg4`lL-zs>?Cr@E8!k00u2;!ra@QVqMo(ySC zEongfCP@2KR3jQkJJQDp4TQ8mqE!~U4~4PNX^2*8bxMdqHXD>$C87^Q`mGu>I@)Ok zke*VbCTbyl9?~HivsMjh^fut5CFJnBp;J4YBotMUj)Huyv9uVz&C!$KXEC@cJG#P- zCgB+iu|TRfjG|5*euSbYAAT+(fuBp%Y6y}P6v3}x$c;+)jS8(nt{Vk_WzMJ<@OmMS zo?=_7zZKfy{*FXzYmq+~K&=_(ccPWo+Ow6XUj^St;F}liy;feuLI8HY34s6QR$j;o z7@d;=*m25kK7J@(>^`5NCKQp#p|&|Lcx+X4%=%r@|c%JeBw4Y7@y0zwFFrt8T*_CNjWres9X%NEecb~dKb=8$5DX&V->_m35Bh>M__u67PzXxFVDK7H zz=KK)|IV!iW57f(1xyF;fq7sNSPs^J^90#Yt1#ks4fE(a0XabMG zQ+PMAFgMH_>x}ilLb2YM7)!uXuq>HXB=nt;E)2Td+^C z1K2U_4E7Cn6}yf7iao(;I2ZT9yWwHD5Kq9<@qD}#e-&5ZBk|GrWc*!x0lo_V5Z{3x zz>nh>@CN)Y{t$lJ$Cc(s3#18X2{b9KkT!%?Ni)*M(WcSrX{%_PXuD}gY3FDSw0pEa z=uEmdolh6g`_gmi1L+F-NcuSX4EiGa2lO5E!}N3XtMn%NbA}rufYF;FVdOCeF;t9N z#uP?9V=ZGl;|Svd;|AjqlgadBhBM=txy-@L5zN<_Gnh-6o0{0BQ>^1D&>{IL;?57+aC!CYaDdmjdOyn%!Y~mc@e9L*@>gpQgn&>*fRqZ;# zb%E)Td$-@+ zz1<_-^W2s01DK&(po|Ua`HZdM)mCsyE&{uD81P(%xtKF#06+(e+u? z=aPUcNEg%yHVUpr`b8E*PKw+a`Li%YI7B#0cvSd2DmF?JwI=F{$V=2uG)c5u^sBg+ zSRr04J|FECogFA7_l)6n8s5Bz}1OlK4vr zJ_$t$GZMZ?WF%%Jj!)c^_=hA;LQ1wue(5XdTitg<-&;xHNkr0`r0dB+$@1it$qgy| zl;J5WQW{bNQ{}0vQm>^2rzz9crZuMbOdpZ{VfxP*Q5nXJ?HP}y66sj!{!ChCPUf`C zlUZI_1G5%oeV-kat;*h*-INoX^LozyTt;qw?yTHPdEN39dF%6<`o;Gf+wX8bH@_r* zQU0}pUIoU2-7;L(Pc}#PZU4~zy8b&0L1A9uoWk#l!iz>0eL8?SplHD20XK_9#bb(( zmUx#8E7?%;s5GN=X6coI5d+Nw50-h94J}(=_P9K=e0F)mAmN~~gN_gGGFUx$*AUi_ zvLS1SJbWeVm3gn+7#cft%Fv6ihQC_(>ao|lyry~Wvtb^?(W%*_F3c$*MW3+f}Jm^;P%OQuQMB{Smn% zmXCN`U0A)Yx>-}M*{pTZ4%dF7^U_u84(q$?>-1*~y$w?g4I?EZ=Z$PK<{Q_VFw?81 zU8E0unL1&PFu!TOT9Z<Um*z%diY zTpgP}cI7y1T*bJ9lZ8 zoZ>#kIOWpRzEhXKMSn~E*2%Y{-(L9k^J&UyUrvvjUO)ZW48@Eu-x0mD;GO1oE8jgi zGj8Ux_n7bL-n%#}b=C*7d9z2)zCK4bXUAOr+-Y-vn>TFUvHF<$!_1BNM)Sto9}fNS^nWt{ zvul%J)5^_$o2P#SJ~DrFXUp&{7q{kbJ-97l+oq30KVGukd;7E<*p5*}uxK6W2JvojbQ~ z-MV@6=8YE$WHvT7-o1PG+O=yP|3{jY3jycOowK$&ex5&n{`m3Z9m}lTFR5Z}b^L^o zW5zo9)jmwhb8`%{x4{@9HvohD?SMhExV61_cINAXZ{ Date: Sun, 26 Apr 2020 12:06:35 +0200 Subject: [PATCH 03/14] Update WCAccountsController.m --- Sources/WCAccountsController.m | 1 - 1 file changed, 1 deletion(-) diff --git a/Sources/WCAccountsController.m b/Sources/WCAccountsController.m index 9bd4743a..b182df76 100644 --- a/Sources/WCAccountsController.m +++ b/Sources/WCAccountsController.m @@ -1024,7 +1024,6 @@ - (id)init { [popUpButtonCell setControlSize:NSSmallControlSize]; [popUpButtonCell setBordered:NO]; [popUpButtonCell setFont:[NSFont smallSystemFont]]; - //LUIGI NSString *osxMode = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"]; From 0fa719ecdfdd0fa824b0d1e50b383151ef6fdc74 Mon Sep 17 00:00:00 2001 From: Luigi <45099401+ProfDrLuigi@users.noreply.github.com> Date: Sun, 26 Apr 2020 12:08:10 +0200 Subject: [PATCH 04/14] Added white label for "black" user accounts in Pulldown Menu in dark mode. --- Sources/WCAccountsController.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/WCAccountsController.m b/Sources/WCAccountsController.m index b182df76..301f5729 100644 --- a/Sources/WCAccountsController.m +++ b/Sources/WCAccountsController.m @@ -1030,10 +1030,10 @@ - (id)init { if([[setting objectForKey:WCAccountFieldNameKey] isEqualToString:@"wired.account.color"]) { if (osxMode == nil) { [popUpButtonCell addItem:[NSMenuItem itemWithTitle:NSLS(@"Black", @"Account color") - image:[NSImage imageNamed:@"LabelBlack"]]]; //Light mode + image:[NSImage imageNamed:@"LabelBlack"]]]; //Light mode } else { [popUpButtonCell addItem:[NSMenuItem itemWithTitle:NSLS(@"White", @"Account color") - image:[NSImage imageNamed:@"LabelWhite"]]]; //Dark mode + image:[NSImage imageNamed:@"LabelWhite"]]]; //Dark mode } [popUpButtonCell addItem:[NSMenuItem itemWithTitle:NSLS(@"Red", @"Account color") image:[NSImage imageNamed:@"LabelRed"]]]; From 35e70ffea4b0d041b0883af97fd09c04d3d782f3 Mon Sep 17 00:00:00 2001 From: ProfDrLuigi Date: Sun, 26 Apr 2020 12:32:30 +0200 Subject: [PATCH 05/14] Replaced some german strings with english strings --- en.lproj/PublicChat.xib | 77 ++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/en.lproj/PublicChat.xib b/en.lproj/PublicChat.xib index ab0bf9a1..a100e9f1 100755 --- a/en.lproj/PublicChat.xib +++ b/en.lproj/PublicChat.xib @@ -1,9 +1,9 @@ - + - - + + @@ -77,7 +77,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -137,20 +137,19 @@ - + - + - @@ -165,7 +164,7 @@ - + @@ -179,7 +178,7 @@ - + @@ -200,7 +199,7 @@ - + @@ -225,7 +224,7 @@ - + @@ -250,7 +249,7 @@ - + @@ -259,7 +258,7 @@ - + @@ -302,7 +301,7 @@ - +