ntminer 5 years ago
parent
commit
d1d2aa17db

+ 12 - 12
src/AppViews0/MinerStudio/Views/Ucs/MinerClients.xaml

@@ -795,14 +795,14 @@
 									Width="12"
 									Height="14"
                                     Visibility="{Binding Data.MainCoinRejectPercentSortDirection,ConverterParameter=Ascending,Converter={StaticResource SortDirectionToVisibilityConverter},Source={StaticResource proxy}}"
-									Data="{StaticResource Icon_SortAscending}"
+									Data="{StaticResource Icon_SortNumberAscending}"
 									Fill="{Binding Data.IsSortByMainCoinRejectPercent,Source={StaticResource proxy},Converter={StaticResource BoolToBrushConverter}}"
 									Stretch="Fill" />
                                 <Path
 									Width="12"
 									Height="14"
                                     Visibility="{Binding Data.MainCoinRejectPercentSortDirection,ConverterParameter=Descending,Converter={StaticResource SortDirectionToVisibilityConverter},Source={StaticResource proxy}}"
-									Data="{StaticResource Icon_SortDescending}"
+									Data="{StaticResource Icon_SortNumberDescending}"
 									Fill="{Binding Data.IsSortByMainCoinRejectPercent,Source={StaticResource proxy},Converter={StaticResource BoolToBrushConverter}}"
 									Stretch="Fill" />
                             </WrapPanel>
@@ -830,14 +830,14 @@
 									Width="12"
 									Height="14"
                                     Visibility="{Binding Data.MainCoinPoolDelaySortDirection,ConverterParameter=Ascending,Converter={StaticResource SortDirectionToVisibilityConverter},Source={StaticResource proxy}}"
-									Data="{StaticResource Icon_SortAscending}"
+									Data="{StaticResource Icon_SortNumberAscending}"
 									Fill="{Binding Data.IsSortByMainCoinPoolDelay,Source={StaticResource proxy},Converter={StaticResource BoolToBrushConverter}}"
 									Stretch="Fill" />
                                 <Path
 									Width="12"
 									Height="14"
                                     Visibility="{Binding Data.MainCoinPoolDelaySortDirection,ConverterParameter=Descending,Converter={StaticResource SortDirectionToVisibilityConverter},Source={StaticResource proxy}}"
-									Data="{StaticResource Icon_SortDescending}"
+									Data="{StaticResource Icon_SortNumberDescending}"
 									Fill="{Binding Data.IsSortByMainCoinPoolDelay,Source={StaticResource proxy},Converter={StaticResource BoolToBrushConverter}}"
 									Stretch="Fill" />
                             </WrapPanel>
@@ -968,14 +968,14 @@
 									Width="12"
 									Height="14"
                                     Visibility="{Binding Data.DualCoinRejectPercentSortDirection,ConverterParameter=Ascending,Converter={StaticResource SortDirectionToVisibilityConverter},Source={StaticResource proxy}}"
-									Data="{StaticResource Icon_SortAscending}"
+									Data="{StaticResource Icon_SortNumberAscending}"
 									Fill="{Binding Data.IsSortByDualCoinRejectPercent,Source={StaticResource proxy},Converter={StaticResource BoolToBrushConverter}}"
 									Stretch="Fill" />
                                 <Path
 									Width="12"
 									Height="14"
                                     Visibility="{Binding Data.DualCoinRejectPercentSortDirection,ConverterParameter=Descending,Converter={StaticResource SortDirectionToVisibilityConverter},Source={StaticResource proxy}}"
-									Data="{StaticResource Icon_SortDescending}"
+									Data="{StaticResource Icon_SortNumberDescending}"
 									Fill="{Binding Data.IsSortByDualCoinRejectPercent,Source={StaticResource proxy},Converter={StaticResource BoolToBrushConverter}}"
 									Stretch="Fill" />
                             </WrapPanel>
@@ -1003,14 +1003,14 @@
 									Width="12"
 									Height="14"
                                     Visibility="{Binding Data.DualCoinPoolDelaySortDirection,ConverterParameter=Ascending,Converter={StaticResource SortDirectionToVisibilityConverter},Source={StaticResource proxy}}"
-									Data="{StaticResource Icon_SortAscending}"
+									Data="{StaticResource Icon_SortNumberAscending}"
 									Fill="{Binding Data.IsSortByDualCoinPoolDelay,Source={StaticResource proxy},Converter={StaticResource BoolToBrushConverter}}"
 									Stretch="Fill" />
                                 <Path
 									Width="12"
 									Height="14"
                                     Visibility="{Binding Data.DualCoinPoolDelaySortDirection,ConverterParameter=Descending,Converter={StaticResource SortDirectionToVisibilityConverter},Source={StaticResource proxy}}"
-									Data="{StaticResource Icon_SortDescending}"
+									Data="{StaticResource Icon_SortNumberDescending}"
 									Fill="{Binding Data.IsSortByDualCoinPoolDelay,Source={StaticResource proxy},Converter={StaticResource BoolToBrushConverter}}"
 									Stretch="Fill" />
                             </WrapPanel>
@@ -1292,14 +1292,14 @@
 									Width="12"
 									Height="14"
                                     Visibility="{Binding Data.KernelSelfRestartCountSortDirection,ConverterParameter=Ascending,Converter={StaticResource SortDirectionToVisibilityConverter},Source={StaticResource proxy}}"
-									Data="{StaticResource Icon_SortAscending}"
+									Data="{StaticResource Icon_SortNumberAscending}"
 									Fill="{Binding Data.IsSortByKernelSelfRestartCount,Source={StaticResource proxy},Converter={StaticResource BoolToBrushConverter}}"
 									Stretch="Fill" />
                                 <Path
 									Width="12"
 									Height="14"
                                     Visibility="{Binding Data.KernelSelfRestartCountSortDirection,ConverterParameter=Descending,Converter={StaticResource SortDirectionToVisibilityConverter},Source={StaticResource proxy}}"
-									Data="{StaticResource Icon_SortDescending}"
+									Data="{StaticResource Icon_SortNumberDescending}"
 									Fill="{Binding Data.IsSortByKernelSelfRestartCount,Source={StaticResource proxy},Converter={StaticResource BoolToBrushConverter}}"
 									Stretch="Fill" />
                             </WrapPanel>
@@ -2048,14 +2048,14 @@
 									Width="12"
 									Height="14"
                                     Visibility="{Binding Data.CpuTemperatureSortDirection,ConverterParameter=Ascending,Converter={StaticResource SortDirectionToVisibilityConverter},Source={StaticResource proxy}}"
-									Data="{StaticResource Icon_SortAscending}"
+									Data="{StaticResource Icon_SortNumberAscending}"
 									Fill="{Binding Data.IsSortByCpuTemperature,Source={StaticResource proxy},Converter={StaticResource BoolToBrushConverter}}"
 									Stretch="Fill" />
                                 <Path
 									Width="12"
 									Height="14"
                                     Visibility="{Binding Data.CpuTemperatureSortDirection,ConverterParameter=Descending,Converter={StaticResource SortDirectionToVisibilityConverter},Source={StaticResource proxy}}"
-									Data="{StaticResource Icon_SortDescending}"
+									Data="{StaticResource Icon_SortNumberDescending}"
 									Fill="{Binding Data.IsSortByCpuTemperature,Source={StaticResource proxy},Converter={StaticResource BoolToBrushConverter}}"
 									Stretch="Fill" />
                             </WrapPanel>

+ 2 - 0
src/NTMinerWpf/Styles/KbIcons.xaml

@@ -69,6 +69,8 @@
     <StreamGeometry x:Key="Icon_SortUp">M639.411571 32.553162a31.963123 31.963123 0 1 1 63.926245 0v958.893676a31.963123 31.963123 0 0 1-63.926245 0V32.553162z M646.827015 53.00956a31.963123 31.963123 0 1 1 49.095357-40.912797l320.270488 384.196733a31.963123 31.963123 0 0 1-49.095357 40.912797L646.827015 53.00956z</StreamGeometry>
     <StreamGeometry x:Key="Icon_SortAscending">M717.142857 233.142857h101.142857l-41.142857-124.571428-6.857143-26.857143q-1.142857-9.142857-1.142857-11.428572h-2.285714l-1.714286 11.428572q0 0.571429-2 10.285714t-4.285714 16.571429zM457.142857 822.857143q0 6.857143-5.714286 13.714286l-182.285714 182.285714q-5.714286 5.142857-13.142857 5.142857-6.857143 0-13.142857-5.142857L60 836q-8.571429-9.142857-4-20 4.571429-11.428571 17.142857-11.428571h109.714286V18.285714q0-8 5.142857-13.142857t13.142857-5.142857h109.714286q8 0 13.142857 5.142857t5.142857 13.142857v786.285715h109.714286q8 0 13.142857 5.142857t5.142857 13.142857z m477.714286 68v133.142857H601.142857v-51.428571l210.857143-302.285715q6.857143-10.285714 12-15.428571l6.285714-5.142857v-1.714286q-1.142857 0-3.714285 0.285714t-4.285715 0.285715q-6.857143 1.714286-17.142857 1.714285h-132.571428v65.714286H604v-130.857143h324v50.857143l-210.857143 302.857143q-3.428571 4.571429-12 14.857143l-6.285714 6.285714v1.142857l8-1.142857q5.142857-1.142857 17.142857-1.142857h141.714286v-68h69.142857z m50.857143-512.571429v60.571429h-164.571429V378.285714h42.857143l-26.857143-82.285714h-138.857143l-26.857143 82.285714h42.857143v60.571429H550.285714V378.285714h40L721.714286 0h92.571428l131.428572 378.285714h40z</StreamGeometry>
     <StreamGeometry x:Key="Icon_SortDescending">M717.165509 818.322483l101.15647 0-41.179387-124.562161-6.875422-26.843402q-1.170285-9.142848-1.170285-11.410274l-2.267426 0-1.682284 11.410274q0 0.585142-1.974855 10.313133t-4.315424 16.603412zM457.142912 822.857336q0 6.875422-5.705137 13.677701l-182.271818 182.271818q-5.705137 5.119995-13.165701 5.119995-6.875422 0-13.165701-5.119995l-182.85696-182.85696q-8.557706-9.142848-4.022853-19.96798 4.534853-11.410274 17.115411-11.410274l109.714176 0 0-786.284928q0-7.972563 5.119995-13.165701t13.165701-5.119995l109.714176 0q7.972563 0 13.165701 5.119995t5.119995 13.165701l0 786.284928 109.714176 0q7.972563 0 13.165701 5.119995t5.119995 13.165701zM985.745812 963.437767l0 60.562225-164.571264 0 0-60.562225 42.861671 0-26.843402-82.285632-138.825004 0-26.843402 82.285632 42.861671 0 0 60.562225-163.986122 0 0-60.562225 40.009103 0 131.437583-378.294479 92.598765 0 131.437583 378.294479 40.009103 0zM934.838434 305.737853l0 133.119867-333.677381 0 0-51.419377 210.870646-302.299126q6.875422-10.313133 11.995417-15.433127l6.290279-5.119995 0-1.682284q-1.170285 0-3.730282 0.292571t-4.315424 0.292571q-6.875422 1.682284-17.115411 1.682284l-132.534725 0 0 65.68222-68.534789 0 0-130.852441 324.022533 0 0 50.834235-210.870646 302.884269q-3.437711 4.534853-11.995417 14.847985l-6.290279 5.705137 0 1.682284 7.972563-1.682284q5.119995-0.585142 17.115411-0.585142l141.677573 0 0-68.022789 69.119931 0z</StreamGeometry>
+    <StreamGeometry x:Key="Icon_SortNumberAscending">M842.285714 750.285714q0-36-25.142857-66.285714t-58.857143-30.285714q-29.714286 0-47.428571 21.142857t-17.714286 53.714286 20.857143 54.285714 59.714286 21.714286q28.571429 0 48.571429-15.428571t20-38.857143zm-348.571429 72.571429q0 6.857143-5.714286 13.714286l-182.285714 182.285714q-5.714286 5.142857-13.142857 5.142857-6.857143 0-13.142857-5.142857l-182.857143-182.857143q-8.571429-9.142857-4-20 4.571429-11.428571 17.142857-11.428571l109.714286 0 0-786.285714q0-8 5.142857-13.142857t13.142857-5.142857l109.714286 0q8 0 13.142857 5.142857t5.142857 13.142857l0 786.285714 109.714286 0q8 0 13.142857 5.142857t5.142857 13.142857zm428.571429-39.428571q0 35.428571-7.428571 69.428571t-23.428571 65.142857-38.857143 54.571429-56.285714 37.428571-72.857143 14q-35.428571 0-61.714286-9.142857-13.714286-4.571429-24-8.571429l22.285714-64.571429q8.571429 4 17.714286 6.285714 21.142857 7.428571 42.857143 7.428571 48 0 76.857143-33.428571t38-83.142857l-1.142857 0q-12 13.142857-35.142857 21.142857t-48.285714 8q-60.571429 0-98.857143-40.857143t-38.285714-98.571429q0-60 41.142857-101.714286t103.428571-41.714286q70.285714 0 117.142857 54t46.857143 144.285714zm-17.142857-409.714286l0 65.142857-268 0 0-65.142857 95.428571 0 0-246.857143q0-4 2.857143-10.857143t2.857143-9.714286l0-9.142857-1.142857 0-4 6.857143q-4.571429 7.428571-14.857143 17.714286l-35.428571 33.142857-46.857143-49.142857 109.714286-105.714286 70.285714 0 0 373.714286 94.285714 0z</StreamGeometry>
+    <StreamGeometry x:Key="Icon_SortNumberDescending">M842.285714 165.142857q0-36-25.142857-66.285714t-58.857143-30.285714q-29.714286 0-47.428571 21.142857t-17.714286 53.714285 20.857143 54.285715 59.714286 21.714285q28.571429 0 48.571428-15.428571t20-38.857143zM493.714286 822.857143q0 6.857143-5.714286 13.714286l-182.285714 182.285714q-5.714286 5.142857-13.142857 5.142857-6.857143 0-13.142858-5.142857L96.571429 836q-8.571429-9.142857-4-20 4.571429-11.428571 17.142857-11.428571h109.714285V18.285714q0-8 5.142858-13.142857t13.142857-5.142857h109.714285q8 0 13.142858 5.142857t5.142857 13.142857v786.285715h109.714285q8 0 13.142858 5.142857t5.142857 13.142857z m411.428571 136v65.142857H637.142857v-65.142857h95.428572v-246.857143q0-4 0.285714-10.857143t0.285714-9.714286v-9.142857h-1.142857l-4 6.857143q-4.571429 7.428571-14.857143 17.714286l-35.428571 33.142857-46.857143-49.142857 109.714286-105.714286h70.285714v373.714286h94.285714z m17.142857-760.571429q0 35.428571-7.428571 69.428572t-23.428572 65.142857-38.857142 54.571428-56.285715 37.428572T723.428571 438.857143q-35.428571 0-61.714285-9.142857-13.714286-4.571429-24-8.571429l22.285714-64.571428q8.571429 4 17.714286 6.285714 21.142857 7.428571 42.857143 7.428571 48 0 76.857142-33.428571T835.428571 253.714286h-1.142857q-12 13.142857-35.142857 21.142857t-48.285714 8q-60.571429 0-98.857143-40.857143T613.714286 143.428571q0-60 41.142857-101.714285t103.428571-41.714286q70.285714 0 117.142857 54t46.857143 144.285714z</StreamGeometry>
     <StreamGeometry x:Key="Icon_VirtualMemory">M759 311H259v200h500V311z m-50 150H309V361h400v100z m245-167.5c2 0 4 0.1 6 0.4V132H64v161.8c2-0.2 4-0.4 6-0.4 27.6 0 50 22.4 50 50s-22.4 50-50 50c-2 0-4-0.1-6-0.4v499h245V727.3h50V892h601V393.1c-2 0.2-4 0.4-6 0.4-27.6 0-50-22.4-50-50s22.4-50 50-50z m-44-39.8c-33.1 16.3-56 50.4-56 89.8s22.9 73.5 56 89.8V842H745V677.3h-50V842h-62V677.3h-50V842h-62V677.3h-50V842h-62V677.3H259V842H114V433.3c33.1-16.3 56-50.4 56-89.8s-22.9-73.5-56-89.8V182h796v71.7z</StreamGeometry>
     <StreamGeometry x:Key="Icon_Property">M768 64 192 64C121.6 64 64 121.6 64 192l0 576c0 70.4 57.6 128 128 128l576 0c70.4 0 128-57.6 128-128L896 192C896 121.6 838.4 64 768 64zM288 704C270.08 704 256 689.92 256 672 256 654.08 270.08 640 288 640 305.92 640 320 654.08 320 672 320 689.92 305.92 704 288 704zM288 512C270.08 512 256 497.92 256 480 256 462.08 270.08 448 288 448 305.92 448 320 462.08 320 480 320 497.92 305.92 512 288 512zM288 320C270.08 320 256 305.92 256 288 256 270.08 270.08 256 288 256 305.92 256 320 270.08 320 288 320 305.92 305.92 320 288 320zM672 704l-256 0C398.08 704 384 689.92 384 672 384 654.08 398.08 640 416 640l256 0c17.92 0 32 14.08 32 32C704 689.92 689.92 704 672 704zM672 512l-256 0C398.08 512 384 497.92 384 480 384 462.08 398.08 448 416 448l256 0C689.92 448 704 462.08 704 480 704 497.92 689.92 512 672 512zM672 320l-256 0C398.08 320 384 305.92 384 288 384 270.08 398.08 256 416 256l256 0C689.92 256 704 270.08 704 288 704 305.92 689.92 320 672 320z</StreamGeometry>
     <StreamGeometry x:Key="Icon_WindowsProperty">M554.666667 682.666667v42.666666h85.333333v85.333334H384v-85.333334h85.333333v-42.666666H170.666667V213.333333h682.666666v469.333334h-298.666666z m0-85.333334h213.333333V298.666667H256v298.666666h298.666667z</StreamGeometry>