From a63172f66cf7b9f2f942bd6159244184edec45f1 Mon Sep 17 00:00:00 2001 From: hj615 Date: Mon, 1 Dec 2025 14:43:25 +0900 Subject: [PATCH] =?UTF-8?q?design:=20=ED=8C=8C=EC=9D=BC=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SmartAquaViewer/MainWindow.xaml | 2 +- .../Resources/Images/ListImage.png | Bin 1412 -> 163 bytes .../Resources/Images/add_folder.png | Bin 0 -> 1781 bytes .../Resources/Images/file_logo.png | Bin 0 -> 289 bytes SmartAquaViewer/SmartAquaViewer.csproj | 4 + SmartAquaViewer/View/FileListView.xaml | 102 +++++++++++------- SmartAquaViewer/View/MonitoringView.xaml | 22 ++-- 7 files changed, 79 insertions(+), 51 deletions(-) create mode 100644 SmartAquaViewer/Resources/Images/add_folder.png create mode 100644 SmartAquaViewer/Resources/Images/file_logo.png diff --git a/SmartAquaViewer/MainWindow.xaml b/SmartAquaViewer/MainWindow.xaml index 5358c03..7b198a2 100644 --- a/SmartAquaViewer/MainWindow.xaml +++ b/SmartAquaViewer/MainWindow.xaml @@ -20,7 +20,7 @@ - + diff --git a/SmartAquaViewer/Resources/Images/ListImage.png b/SmartAquaViewer/Resources/Images/ListImage.png index 648d86c00db65c6f6e227adf0b2d517e5d45336a..e9728ae58163b4ca6be23aa28be5aab318ca4655 100644 GIT binary patch delta 147 zcmZqSUd%W_qMnhNfq^0SO!g5V#aJBV?!>U}oXkrghb7(7*O7r?V?XzwL{=c5Ex;$l z6-fX8|9|Pt`FBCeOM?7@862M7NCR>>3p^r=85sBugD~Uq{1qucK}k;+#}JM4$q5TA n6YTx~bu!;rd2mU;76U`Ud^1%q$!uL7pehDWS3j3^P6W1J_Mp8@qn@+i#V;G{d|8-wtCx7S zOC7{CeFOzuYSF}}A7`iQj~{mY$^cY97VuGHPlcT}D)CuC@V6aY>%i*A10F)ON2^L^ z`A&Q{V$~MEkAIZh&h&-k!FRwEG>|G)Zt-6sX46IHH7d`*n1G(b@;aX&@+u3!bS(im zBWew4k*Gchl1l%=U zWCN-M)HonnG^aoNzzW$bGZf)XOwPczmxFNr!ey2#aeogG>HVA4kM5e&vKQjcl=E^e zeX7+JW+5-VJ`922zl^tKOK*eEKg*2T=dRBW+cYs}b8R|BaX?Jm zc*3UN>H&E1wPENFUS!_OW?cjyy|dXCMK^!^WhPNPFC`SMb({50*Uq>@mdcb z6akp{LHi@$u{fY6a=ZrSiCt>bSV#aw6W|FQ6Mu#dy=!|8tWsrmwMv-=w;ab-dQ$ptU3j4RVSGQ zlt&G~(!XRn&|V$};CW9!10cTdC|C?1Hxqg$6q+!`OOmmk)e{BmsIBk_zp6 z+ZG4b0sa`h1aCGC8=4E(l()%VDEbLp*bO3B60KI`fnHMUu-3j~OcYhjk zeMSc5mbS7@jKq&}awP)b@qZ--8Ac(gXM+jGZ^T(|_qPj(oJFARWzR0vu>ErHe9 zk`aqfXmT2Aw*3I2z8ZO-zZW6ZQh(;X?*5ezA2N46a329MP!cDrS2#5;J8yG0vw6!&bXnut|xB%mKxxV|>`{lE&>S4!Mf{cOsrJY!LtHRIjR16L@L zrYAa!jMI8kxXkHgm)wakxVWz&-q_#eZ1#}C>=6?(epAnHY*L*jN7Kj>jCLjKnthay zkrdQ=fFG!;N~ejDObL@qljre|^)xsn0IudN;p(iH5+-}BdxF&H2S3a#s2}q;NI&-A zPiE1V9z>yD5YS2;>5N%^eZ((8l0*|H^m7{_xB$>Q*7ub1bDRGG1y6|9^_Sa000000 LNkvXXu0mjf^}L!j diff --git a/SmartAquaViewer/Resources/Images/add_folder.png b/SmartAquaViewer/Resources/Images/add_folder.png new file mode 100644 index 0000000000000000000000000000000000000000..8c86c0c6c63dff423137a009ce44d7589854ad70 GIT binary patch literal 1781 zcmeAS@N?(olHy`uVBq!ia0vp^5g^RL3?$vW53m6##^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvNA9*2?zLuxB|uhkAl$;S_ zK#BH3XD^efM|*lQ1rOTx#soTq+__|8?seKock7iiV!GQeiETFG-OPKs_PhU^Gkcr) z@|h1?Y?)heZl?a9cfaRU>y^*6W@;4IkK6Ny{l|}AKiN6z)dET$BnafZv3vAjg7d<} zheDkqN|W7X`fQZiSl=zOkSg`@w0QWVbMo?p#%dS#)kzD^GHz8f;}hHIyeHmCsl;-^ zl$xse$8#oCxpBw#WlUB+?{?Uz?9!!^Nz0RcCQY0 zgZ&QS9Iqn`#TQ0-7J9C{Dd;*=>!HlM%?tN1UE7#swkYUlr342{)2UV5l}1LstJbY- zRg|6*5yj3tsp|Am8c)Vw|UYeA|sdcs7 zS^dzyPfiI3{5nLYt~zVraO0?w#0KR0`Zl6}&aO_dHbRtJ2PAbZgm`JgM$Vv3U5Zd#M3>#|`JLn!OCDNY3MPe$9G)qo}LK zH!K!!le+5Wylho*1JLk@KMVJ!Y`dM~w^HKxqmNx8pA!Dvu=BeA(Xu=9=;R2SlM+Q@ z?)cHjjr4epMCRA9@=*y{idGHk;2l)zAT2uU#EVYb+0}DDf0;cY``?s^-lJj?8|Rxa^fa8l=7N9}#dMQ)q+>@#Jotv-@F z?RM9*hp{txx8B;75FJ%~D}K^T(bh=z_ov>JoYxWyUwFD(Tz~(3`HimoL=%r$y$5Dz N22WQ%mvv4FO#qItRCoXY literal 0 HcmV?d00001 diff --git a/SmartAquaViewer/Resources/Images/file_logo.png b/SmartAquaViewer/Resources/Images/file_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..5b76cdd4a07d525ff8a8148153dc3dff3c1e72fd GIT binary patch literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^3P7yE!VDyH*`KZgQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`6$5-iT!Hj|yx_dz>z_bH+$BMN!3+xf-~V@rU!PFlzsG8iFi@DYz$3Dl zfr0NZ2s0kfUy%Y7Eb?@54AD5BoDfph$P~(EAW+uW%(B6O)9C=O&Vxry%Z?mvWz>7v zrgecSuu0%SgN7rAfx{F9PAKMPn7U&T2g6j0g*%v89x$oBU<$s#y2IxJ%LBK5t^l2c uM@?K3Apt+%o#^Ca;gOW^p77I+iQ(yT-vzbL&h-LqXYh3Ob6Mw<&;$U00dE@s literal 0 HcmV?d00001 diff --git a/SmartAquaViewer/SmartAquaViewer.csproj b/SmartAquaViewer/SmartAquaViewer.csproj index 6867d65..e2f8d82 100644 --- a/SmartAquaViewer/SmartAquaViewer.csproj +++ b/SmartAquaViewer/SmartAquaViewer.csproj @@ -20,11 +20,13 @@ + + @@ -72,6 +74,7 @@ + PreserveNewest @@ -81,6 +84,7 @@ + diff --git a/SmartAquaViewer/View/FileListView.xaml b/SmartAquaViewer/View/FileListView.xaml index c532093..c15089a 100644 --- a/SmartAquaViewer/View/FileListView.xaml +++ b/SmartAquaViewer/View/FileListView.xaml @@ -7,7 +7,7 @@ xmlns:vm="clr-namespace:SmartAquaViewer.ViewModel" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" mc:Ignorable="d" - d:DesignHeight="1040" d:DesignWidth="270"> + d:DesignHeight="1040" d:DesignWidth="260"> @@ -16,25 +16,38 @@ - + - - - @@ -54,33 +67,44 @@ - - - - - - - - - + + + + + + + + + + - - - - + + + + + + + + + + diff --git a/SmartAquaViewer/View/MonitoringView.xaml b/SmartAquaViewer/View/MonitoringView.xaml index 25e66bf..5d71e71 100644 --- a/SmartAquaViewer/View/MonitoringView.xaml +++ b/SmartAquaViewer/View/MonitoringView.xaml @@ -567,7 +567,7 @@ - + @@ -583,7 +583,7 @@ helper:ComboBoxHelper.SelectFirstOnItemsChange="True" IsEditable="False" IsTextSearchEnabled="False"/> - + @@ -598,7 +598,7 @@ DisplayMemberPath="Display"/> - + @@ -682,7 +682,7 @@ - + @@ -700,7 +700,7 @@ - + @@ -727,7 +727,7 @@ - + @@ -765,7 +765,7 @@ - + @@ -780,7 +780,7 @@ Style="{StaticResource ComboBoxStyle}"/> - + @@ -799,7 +799,7 @@ - + @@ -818,7 +818,7 @@ FontSize="18" FontFamily="{StaticResource SCDream3}" Foreground="White"/> - + @@ -833,7 +833,7 @@ Style="{StaticResource ComboBoxStyle}"/> - +