diff --git a/SourceGit.Console/App.axaml b/SourceGit.Console/App.axaml new file mode 100644 index 0000000000..715feb5767 --- /dev/null +++ b/SourceGit.Console/App.axaml @@ -0,0 +1,9 @@ + + + + + diff --git a/SourceGit.Console/App.axaml.cs b/SourceGit.Console/App.axaml.cs new file mode 100644 index 0000000000..ebca355d4a --- /dev/null +++ b/SourceGit.Console/App.axaml.cs @@ -0,0 +1,17 @@ +using Avalonia; +using Avalonia.Controls.ApplicationLifetimes; +using Avalonia.Markup.Xaml; +using SourceGit; + +namespace SourceGit.Console +{ + public partial class App : SourceGit.App + { + public override void Initialize() + { + AvaloniaXamlLoader.Load(this); + } + + + } +} diff --git a/SourceGit.Console/Program.cs b/SourceGit.Console/Program.cs new file mode 100644 index 0000000000..09898652b4 --- /dev/null +++ b/SourceGit.Console/Program.cs @@ -0,0 +1,22 @@ +using Avalonia; +using Consolonia; + +namespace SourceGit.Console +{ + public static class Program + { + private static void Main(string[] args) + { + BuildAvaloniaApp() + .StartWithConsoleLifetime(args); + } + + public static AppBuilder BuildAvaloniaApp() + { + return AppBuilder.Configure() + .UseConsolonia() + .UseAutoDetectedConsole() + .LogToException(); + } + } +} \ No newline at end of file diff --git a/SourceGit.Console/SourceGit.Console.csproj b/SourceGit.Console/SourceGit.Console.csproj new file mode 100644 index 0000000000..c7ed0b023a --- /dev/null +++ b/SourceGit.Console/SourceGit.Console.csproj @@ -0,0 +1,18 @@ + + + + Exe + net9.0 + enable + enable + + + + + + + + + + + diff --git a/SourceGit.slnx b/SourceGit.slnx index f5734479e2..0d5cc9b699 100644 --- a/SourceGit.slnx +++ b/SourceGit.slnx @@ -1,69 +1,74 @@ + - - - - - - + + + + + + - + - + - + + - - + + - - + + + - - - + + + + - + - - - - + + + + - + + - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/src/App.axaml b/src/App.axaml index 9b8b4686ff..5e69b9e3bf 100644 --- a/src/App.axaml +++ b/src/App.axaml @@ -1,5 +1,6 @@ M683 85l213 213v598a42 42 0 01-42 42H170A43 43 0 01128 896V128C128 104 147 85 170 85H683zm-213 384H341v85h128v128h85v-128h128v-85h-128V341h-85v128z M949 727l-217-231a33 33 0 00-48 0 33 33 0 000 48l157 172H389a35 35 0 00-35 35c0 19 16 34 35 34h452l-160 179a34 34 0 005 54c14 10 33 7 45-5l219-237a33 33 0 000-49zM719 196h131c-24-91-95-160-185-185v131c0 27 25 54 54 54zM129 846l1-747s-7-37 36-33h359v52s-7 76 32 133a191 191 0 00146 84h91v126h66v-191H719a126 126 0 01-127-127V0H155c-51 0-91 40-91 91v767c0 51 40 91 91 91h193v-66H155c0-0-26 4-26-36z M416 832H128V128h384v192C512 355 541 384 576 384L768 384v32c0 19 13 32 32 32S832 435 832 416v-64c0-6 0-19-6-25l-256-256c-6-6-19-6-25-6H128A64 64 0 0064 128v704C64 867 93 896 129 896h288c19 0 32-13 32-32S435 832 416 832zM576 172 722 320H576V172zM736 512C614 512 512 614 512 736S614 960 736 960s224-102 224-224S858 512 736 512zM576 736C576 646 646 576 736 576c32 0 58 6 83 26l-218 218c-19-26-26-51-26-83zm160 160c-32 0-64-13-96-32l224-224c19 26 32 58 32 96 0 90-70 160-160 160z - M896 320c0-19-6-32-19-45l-192-192c-13-13-26-19-45-19H192c-38 0-64 26-64 64v768c0 38 26 64 64 64h640c38 0 64-26 64-64V320zm-256 384H384c-19 0-32-13-32-32s13-32 32-32h256c19 0 32 13 32 32s-13 32-32 32zm166-384H640V128l192 192h-26z - M599 425 599 657 425 832 425 425 192 192 832 192Z - M853 267H514c-4 0-6-2-9-4l-38-66c-13-21-38-36-64-36H171c-41 0-75 34-75 75v555c0 41 34 75 75 75h683c41 0 75-34 75-75V341c0-41-34-75-75-75zm-683-43h233c4 0 6 2 9 4l38 66c13 21 38 36 64 36H853c6 0 11 4 11 11v75h-704V235c0-6 4-11 11-11zm683 576H171c-6 0-11-4-11-11V480h704V789c0 6-4 11-11 11z - M1088 227H609L453 78a11 11 0 00-7-3H107a43 43 0 00-43 43v789a43 43 0 0043 43h981a43 43 0 0043-43V270a43 43 0 00-43-43zM757 599c0 5-5 9-10 9h-113v113c0 5-4 9-9 9h-56c-5 0-9-4-9-9V608h-113c-5 0-10-4-10-9V543c0-5 5-9 10-9h113V420c0-5 4-9 9-9h56c5 0 9 4 9 9V533h113c5 0 10 4 10 9v56z - M922 450c-6-9-15-13-26-13h-11V341c0-41-34-75-75-75H514c-4 0-6-2-9-4l-38-66c-13-21-38-36-64-36H171c-41 0-75 34-75 75v597c0 6 2 13 6 19 6 9 15 13 26 13h640c13 0 26-9 30-21l128-363c4-11 2-21-4-30zM171 224h233c4 0 6 2 9 4l38 66c13 21 38 36 64 36H811c6 0 11 4 11 11v96H256c-13 0-26 9-30 21l-66 186V235c0-6 4-11 11-11zm574 576H173l105-299h572l-105 299z - M509 556l93 149h124l-80-79 49-50 165 164-165 163-49-50 79-79h-163l-96-153 41-65zm187-395 165 164-165 163-49-50L726 360H530l-136 224H140v-70h215l136-224h236l-80-79 49-50z - M939 94v710L512 998 85 805V94h-64A21 21 0 010 73v-0C0 61 10 51 21 51h981c12 0 21 10 21 21v0c0 12-10 21-21 21h-64zm-536 588L512 624l109 58c6 3 13 4 20 3a32 32 0 0026-37l-21-122 88-87c5-5 8-11 9-18a32 32 0 00-27-37l-122-18-54-111a32 32 0 00-57 0l-54 111-122 18c-7 1-13 4-18 9a33 33 0 001 46l88 87-21 122c-1 7-0 14 3 20a32 32 0 0043 14z - M236 542a32 32 0 109 63l86-12a180 180 0 0022 78l-71 47a32 32 0 1035 53l75-50a176 176 0 00166 40L326 529zM512 16C238 16 16 238 16 512s222 496 496 496 496-222 496-496S786 16 512 16zm0 896c-221 0-400-179-400-400a398 398 0 0186-247l561 561A398 398 0 01512 912zm314-154L690 622a179 179 0 004-29l85 12a32 32 0 109-63l-94-13v-49l94-13a32 32 0 10-9-63l-87 12a180 180 0 00-20-62l71-47A32 32 0 10708 252l-75 50a181 181 0 00-252 10l-115-115A398 398 0 01512 112c221 0 400 179 400 400a398 398 0 01-86 247z - M884 159l-18-18a43 43 0 00-38-12l-235 43a166 166 0 00-101 60L400 349a128 128 0 00-148 47l-120 171a21 21 0 005 29l17 12a128 128 0 00178-32l27-38 124 124-38 27a128 128 0 00-32 178l12 17a21 21 0 0029 5l171-120a128 128 0 0047-148l117-92A166 166 0 00853 431l43-235a43 43 0 00-12-38zm-177 249a64 64 0 110-90 64 64 0 010 90zm-373 312a21 21 0 010 30l-139 139a21 21 0 01-30 0l-30-30a21 21 0 010-30l139-139a21 21 0 0130 0z - M525 0C235 0 0 235 0 525c0 232 150 429 359 498 26 5 36-11 36-25 0-12-1-54-1-97-146 31-176-63-176-63-23-61-58-76-58-76-48-32 3-32 3-32 53 3 81 54 81 54 47 80 123 57 153 43 4-34 18-57 33-70-116-12-239-57-239-259 0-57 21-104 54-141-5-13-23-67 5-139 0 0 44-14 144 54 42-11 87-17 131-17s90 6 131 17C756 203 801 217 801 217c29 72 10 126 5 139 34 37 54 83 54 141 0 202-123 246-240 259 19 17 36 48 36 97 0 70-1 127-1 144 0 14 10 30 36 25 209-70 359-266 359-498C1050 235 814 0 525 0z - M590 74 859 342V876c0 38-31 68-68 68H233c-38 0-68-31-68-68V142c0-38 31-68 68-68h357zm-12 28H233a40 40 0 00-40 38L193 142v734a40 40 0 0038 40L233 916h558a40 40 0 0040-38L831 876V354L578 102zM855 371h-215c-46 0-83-36-84-82l0-2V74h28v213c0 30 24 54 54 55l2 0h215v28zM57 489m28 0 853 0q28 0 28 28l0 284q0 28-28 28l-853 0q-28 0-28-28l0-284q0-28 28-28ZM157 717c15 0 29-6 37-13v-51h-41v22h17v18c-2 2-6 3-10 3-21 0-30-13-30-34 0-21 12-34 28-34 9 0 15 4 20 9l14-17C184 610 172 603 156 603c-29 0-54 21-54 57 0 37 24 56 54 56zM245 711v-108h-34v108h34zm69 0v-86H341V603H262v22h28V711h24zM393 711v-108h-34v108h34zm66 6c15 0 29-6 37-13v-51h-41v22h17v18c-2 2-6 3-10 3-21 0-30-13-30-34 0-21 12-34 28-34 9 0 15 4 20 9l14-17C485 610 474 603 458 603c-29 0-54 21-54 57 0 37 24 56 54 56zm88-6v-36c0-13-2-28-3-40h1l10 24 25 52H603v-108h-23v36c0 13 2 28 3 40h-1l-10-24L548 603H523v108h23zM677 717c30 0 51-22 51-57 0-36-21-56-51-56-30 0-51 20-51 56 0 36 21 57 51 57zm3-23c-16 0-26-12-26-32 0-19 10-31 26-31 16 0 26 11 26 31S696 694 680 694zm93 17v-38h13l21 38H836l-25-43c12-5 19-15 19-31 0-26-20-34-44-34H745v108h27zm16-51H774v-34h15c16 0 25 4 25 16s-9 18-25 18zM922 711v-22h-43v-23h35v-22h-35V625h41V603H853v108h68z M30 271l241 0 0-241-241 0 0 241zM392 271l241 0 0-241-241 0 0 241zM753 30l0 241 241 0 0-241-241 0zM30 632l241 0 0-241-241 0 0 241zM392 632l241 0 0-241-241 0 0 241zM753 632l241 0 0-241-241 0 0 241zM30 994l241 0 0-241-241 0 0 241zM392 994l241 0 0-241-241 0 0 241zM753 994l241 0 0-241-241 0 0 241z M566 585l37-146-145 0-37 146 145 0zM1005 297l-32 128q-4 14-18 14l-187 0-37 146 178 0q9 0 14 7 6 8 3 16l-32 128q-3 14-18 14l-187 0-46 187q-4 14-18 14l-128 0q-9 0-15-7-5-7-3-16l45-178-145 0-46 187q-4 14-18 14l-129 0q-9 0-14-7-5-7-3-16l45-178-178 0q-9 0-14-7-5-7-3-16l32-128q4-14 18-14l187 0 37-146-178 0q-9 0-14-7-6-8-3-16l32-128q3-14 18-14l187 0 46-187q4-14 18-14l128 0q9 0 14 7 5 7 3 16l-45 178 145 0 46-187q4-14 18-14l128 0q9 0 14 7 5 7 3 16l-45 178 178 0q9 0 14 7 5 7 3 16z M0 512M1024 512M512 0M512 1024M955 323q0 23-16 39l-414 414-78 78q-16 16-39 16t-39-16l-78-78-207-207q-16-16-16-39t16-39l78-78q16-16 39-16t39 16l168 169 375-375q16-16 39-16t39 16l78 78q16 16 16 39z @@ -72,7 +61,7 @@ M875 117H149C109 117 75 151 75 192v640c0 41 34 75 75 75h725c41 0 75-34 75-75V192c0-41-34-75-75-75zM139 832V192c0-6 4-11 11-11h331v661H149c-6 0-11-4-11-11zm747 0c0 6-4 11-11 11H544v-661H875c6 0 11 4 11 11v640z M40 9 15 23 15 31 9 28 9 20 34 5 24 0 0 14 0 34 25 48 25 28 49 14zM26 29 26 48 49 34 49 15z M892 251c-5-11-18-18-30-18H162c-12 0-23 7-30 18-5 11-5 26 2 35l179 265v320c0 56 44 102 99 102h200c55 0 99-46 99-102v-320l179-266c9-11 9-24 4-34zm-345 540c0 18-14 35-34 35-18 0-34-14-34-35v-157c0-18 14-34 34-34 18 0 34 14 34 34v157zM512 205c18 0 34-14 34-35V87c0-20-16-35-34-35s-34 14-34 35v84c1 20 16 34 34 34zM272 179c5 18 23 30 40 24 17-6 28-24 23-42l-25-51c-5-18-23-30-40-24s-28 24-23 42L272 179zM777 127c5-18-6-36-23-42-17-6-35 5-40 24l-25 51c-5 18 6 37 23 42 17 6 35-5 40-24l25-52z - M416 192m32 0 448 0q32 0 32 32l0 0q0 32-32 32l-448 0q-32 0-32-32l0 0q0-32 32-32ZM416 448m32 0 448 0q32 0 32 32l0 0q0 32-32 32l-448 0q-32 0-32-32l0 0q0-32 32-32ZM416 704m32 0 448 0q32 0 32 32l0 0q0 32-32 32l-448 0q-32 0-32-32l0 0q0-32 32-32ZM96 320l128-192 128 192h-256zM96 640l128 192 128-192h-256zM190 320h64v320H190z + M416 192m32 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM416 448m32 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM416 704m32 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM96 320l128-192 128 192h-256zM96 640l128 192 128-192h-256zM190 320h64v320H190z M408 232C408 210 426 192 448 192h416a40 40 0 110 80H448a40 40 0 01-40-40zM408 512c0-22 18-40 40-40h416a40 40 0 110 80H448A40 40 0 01408 512zM448 752A40 40 0 00448 832h416a40 40 0 100-80H448zM32 480l132 0 0-128 64 0 0 128 132 0 0 64-132 0 0 128-64 0 0-128-132 0Z M408 232C408 210 426 192 448 192h416a40 40 0 110 80H448a40 40 0 01-40-40zM408 512c0-22 18-40 40-40h416a40 40 0 110 80H448A40 40 0 01408 512zM448 752A40 40 0 00448 832h416a40 40 0 100-80H448zM32 480l328 0 0 64-328 0Z M 968 418 l -95 94 c -59 59 -146 71 -218 37 L 874 331 a 64 64 0 0 0 0 -90 L 783 150 a 64 64 0 0 0 -90 0 L 475 368 c -34 -71 -22 -159 37 -218 l 94 -94 c 75 -75 196 -75 271 0 l 90 90 c 75 75 75 196 0 271 z M 332 693 a 64 64 0 0 1 0 -90 l 271 -271 c 25 -25 65 -25 90 0 s 25 65 0 90 L 422 693 a 64 64 0 0 1 -90 0 z M 151 783 l 90 90 a 64 64 0 0 0 90 0 l 218 -218 c 34 71 22 159 -37 218 l -86 94 a 192 192 0 0 1 -271 0 l -98 -98 a 192 192 0 0 1 0 -271 l 94 -86 c 59 -59 146 -71 218 -37 L 151 693 a 64 64 0 0 0 0 90 z @@ -80,75 +69,191 @@ M512 0C233 0 7 223 0 500C6 258 190 64 416 64c230 0 416 200 416 448c0 53 43 96 96 96s96-43 96-96c0-283-229-512-512-512zm0 1023c279 0 505-223 512-500c-6 242-190 436-416 436c-230 0-416-200-416-448c0-53-43-96-96-96s-96 43-96 96c0 283 229 512 512 512z M976 0h-928A48 48 0 000 48v652a48 48 0 0048 48h416V928H200a48 48 0 000 96h624a48 48 0 000-96H560v-180h416a48 48 0 0048-48V48A48 48 0 00976 0zM928 652H96V96h832v556z M832 464h-68V240a128 128 0 00-128-128h-248a128 128 0 00-128 128v224H192c-18 0-32 14-32 32v384c0 18 14 32 32 32h640c18 0 32-14 32-32v-384c0-18-14-32-32-32zm-292 237v53a8 8 0 01-8 8h-40a8 8 0 01-8-8v-53a48 48 0 1156 0zm152-237H332V240a56 56 0 0156-56h248a56 56 0 0156 56v224z - M908 366h-25V248a18 18 0 00-0-2 20 20 0 00-5-13L681 7 681 7a19 19 0 00-4-3c-0-0-1-1-1-1a29 29 0 00-4-2L671 1a24 24 0 00-5-1H181a40 40 0 00-40 40v326h-25c-32 0-57 26-57 57v298c0 32 26 57 57 57h25v204c0 22 18 40 40 40H843a40 40 0 0040-40v-204h25c32 0 57-26 57-57V424a57 57 0 00-57-57zM181 40h465v205c0 11 9 20 20 20h177v101H181V40zm413 527c0 89-54 143-134 143-81 0-128-61-128-138 0-82 52-143 132-143 84 0 129 63 129 138zm-440 139V433h62v220h108v52h-170zm690 267H181v-193H843l0 193zm18-280a305 305 0 01-91 15c-50 0-86-12-111-37-25-23-39-59-38-99 0-90 66-142 155-142 35 0 62 7 76 13l-13 49c-15-6-33-12-63-12-51 0-90 29-90 88 0 56 35 89 86 89 14 0 25-2 30-4v-57h-42v-48h101v143zM397 570c0 53 25 91 66 91 42 0 65-40 65-92 0-49-23-91-66-91-42 0-66 40-66 93z + M908 366h-25V248a18 18 0 00-0-2 20 20 0 00-5-13L681 7 681 7a19 19 0 00-4-3c-0-0-1-1-1-1a29 29 0 00-4-2L671 1a24 24 0 00-5-1H181a40 40 0 00-40 40v326h-25c-32 0-57 26-57 57v298c0 32 26 57 57 57h25v204c0 22 18 40 40 40H843a40 40 0 0040-40v-204h25c32 0 57-26 57-57V424a57 57 0 00-57-57zM181 40h465v205c0 11 9 20 20 20h177v101H181V40zm413 527c0 89-54 143-134 143-81 0-128-61-128-138 0-82 52-143 132-143 84 0 129 63 129 138zm440 139V433h62v220h108v52h-170zm69-618H606l130-108v65h130c12 0 22 10 22 22s-10 22-22 22z M192 192m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM192 512m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM192 832m-64 0a64 64 0 1 0 128 0 64 64 0 1 0-128 0ZM864 160H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32zM864 480H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32zM864 800H352c-17.7 0-32 14.3-32 32s14.3 32 32 32h512c17.7 0 32-14.3 32-32s-14.3-32-32-32z - M824 645V307c0-56-46-102-102-102h-102V102l-154 154 154 154V307h102v338c-46 20-82 67-82 123 0 72 61 133 133 133 72 0 133-61 133-133 0-56-36-102-82-123zm-51 195c-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72s-31 72-72 72zM384 256c0-72-61-133-133-133-72 0-133 61-133 133 0 56 36 102 82 123v266C154 666 118 712 118 768c0 72 61 133 133 133 72 0 133-61 133-133 0-56-36-102-82-123V379C348 358 384 312 384 256zM323 768c0 41-31 72-72 72-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72zM251 328c-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72s-31 72-72 72z + M824 645V307c0-56-46-102-102-102h-102V102l-154 154 154 154V307h102v338c-46 20-82 67-82 123 0 72 61 133 133 133 72 0 133-61 133-138 0-56-36-102-82-123V379C394 346 448 275 448 192c0-106-86-192-192-192S64 86 64 192c0 83 54 154 128 180v280c-74 26-128 97-128 180c0 106 86 192 192 192s192-86 192-192c0-67-34-125-84-159c22-20 52-33 84-33h128c122 0 223-85 249-199c-19 4-37 7-57 7c-26 0-51-5-76-13zM256 128c35 0 64 29 64 64s-29 64-64 64s-64-29-64-64s29-64 64-64zm0 768c-35 0-64-29-64-64s29-64 64-64s64 29 64 64s-29 64-64 64zM757 417a48 48 0 110-96 48 48 0 010 96z M0 512M1024 512M512 0M512 1024M64 576h896V448H64z - M896 64H128C96 64 64 96 64 128v768c0 32 32 64 64 64h768c32 0 64-32 64-64V128c0-32-32-64-64-64z m-64 736c0 16-17 32-32 32H224c-18 0-32-12-32-32V224c0-16 16-32 32-32h576c15 0 32 16 32 32v576zM512 384c-71 0-128 57-128 128s57 128 128 128 128-57 128-128-57-128-128-128z - M0 512M1024 512M512 0M512 1024M813 448c-46 0-83 37-83 83 0 46 37 83 83 83 46 0 83-37 83-83 0-46-37-83-83-83zM211 448C165 448 128 485 128 531c0 46 37 83 83 83 46 0 83-37 83-83 0-46-37-83-83-83zM512 448c-46 0-83 37-83 83 0 46 37 83 83 83 46 0 83-37 83-83C595 485 558 448 512 448z - M299 811 299 725 384 725 384 811 299 811M469 811 469 725 555 725 555 811 469 811M640 811 640 725 725 725 725 811 640 811M299 640 299 555 384 555 384 640 299 640M469 640 469 555 555 555 555 640 469 640M640 640 640 555 725 555 725 640 640 640M299 469 299 384 384 384 384 469 299 469M469 469 469 384 555 384 555 469 469 469M640 469 640 384 725 384 725 469 640 469M299 299 299 213 384 213 384 299 299 299M469 299 469 213 555 213 555 299 469 299M640 299 640 213 725 213 725 299 640 299Z - M64 363l0 204 265 0L329 460c0-11 6-18 14-20C349 437 355 437 362 441c93 60 226 149 226 149 33 22 34 60 0 82 0 0-133 89-226 149-14 9-32-3-32-18l-1-110L64 693l0 117c0 41 34 75 75 75l746 0c41 0 75-34 75-74L960 364c0-0 0-1 0-1L64 363zM64 214l0 75 650 0-33-80c-16-38-62-69-103-69l-440 0C97 139 64 173 64 214z + M896 64H128C96 64 64 96 64 128v768c0 32 32 64 64 64h768c32 0 64-32 64-64V128c0-32-32-64-64-64z m-64 736c0 16-17 32-32 32H224c-18 0-32-12-32-32V224c0-16 16-32 32-32h576c15 0 32 16 32 32v576zM512 384c-71 0-128 57-128 127s57 128 128 128 128-57 128-128-57-127-128-127z + M0 512M1024 512M512 0M512 1024M813 448c-46 0-83 37-83 83 0 46 37 83 83 83 46 0 83-37 83-83 0-46-37-83-83-83zm-602 0C165 448 128 485 128 531c0 46 37 83 83 83 46 0 83-37 83-83 0-46-37-83-83-83zM512 448c-46 0-83 37-83 83 0 46 37 83 83 83 46 0 83-37 83-83C595 485 558 448 512 448z + M299 811 299 725 384 725 384 811 299 811M469 811 469 725 555 725 555 811 469 811M640 811 640 725 725 725 725 811 640 811M299 640 299 555 384 555 384 640 299 640M469 640 469 555 555 555 555 640 469 640M640 640 640 555 725 555 725 640 640 640M299 469 299 384 384 384 384 469 299 469M469 469 469 384 555 384 555 469 469 469M640 469 640 384 725 384 725 469 640 469M299 299 299 213 384 213 384 299 299 299M469 299 469 213 555 213 555 299 469 299M640 299 640 213 725 213 725 299 640 299z M683 409v204L1024 308 683 0v191c-413 0-427 526-427 526c117-229 203-307 427-307zm85 492H102V327h153s38-63 114-122H51c-28 0-51 27-51 61v697c0 34 23 61 51 61h768c28 0 51-27 51-61V614l-102 100v187z - M841 627A43 43 0 00811 555h-299v85h196l-183 183A43 43 0 00555 896h299v-85h-196l183-183zM299 170H213v512H85l171 171 171-171H299zM725 128h-85c-18 0-34 11-40 28l-117 313h91L606 384h154l32 85h91l-117-313A43 43 0 00725 128zm-88 171 32-85h26l32 85h-90z + M841 627A43 43 0 00811 555h-299v85h196l-183 183A43 43 0 00555 896h299v-85h-196l183-183zM299 170H213v512H85l171 171 171-171H299zM725 128h-85c-18 0-34 11-40 28l-117 313h91L606 384h154l32 85h91l-117-313A43 43 0 00725 128zm-88 171l32-85h26l32 85h-90z M512 0a512 512 0 01512 512 57 57 0 01-114 0 398 398 0 10-398 398 57 57 0 010 114A512 512 0 01512 0zm367 600 121 120a57 57 0 01-80 81l-40-40V967a57 57 0 01-50 57l-7 0a57 57 0 01-57-57v-205l-40 40a57 57 0 01-75 5l-5-5a57 57 0 01-0-80l120-121a80 80 0 01113-0zM512 272a57 57 0 0157 57V499h114a57 57 0 0156 50L740 556a57 57 0 01-57 57H512a57 57 0 01-57-57v-228a57 57 0 0150-57L512 272z - M834 0H190C85 0 0 85 0 189v646c0 104 85 189 189 189h645c104 0 189-85 189-189V189C1024 85 939 0 834 0zM658 748c-25 29-62 47-111 54v54h-66v-56c-38-4-72-19-101-44-29-26-43-71-43-135v-28h144v35c0 39 1 63 4 72 3 9 10 14 22 14 10 0 17-3 22-10 5-7 7-16 7-29 0-32-2-55-7-69-5-14-20-29-46-45-44-28-74-48-90-61-16-13-29-31-41-55-12-24-17-50-17-80 0-43 12-77 37-101 24-24 61-40 110-45v-46h66v46c44 6 78 21 100 45 22 24 33 57 33 100 0 6-0 15-1 27H535v-24c0-25-2-42-5-50-3-8-10-12-21-12-9 0-15 3-20 10-4 7-7 17-7 30 0 23 5 38 14 47 9 9 35 27 78 53 37 22 62 39 75 51 13 12 25 28 34 50 9 22 14 48 14 80 0 51-12 92-37 121z + M834 0A832 832 0 001 832a832 832 0 0011 142 32 32 0 0060-23A767 767 0 01320 768h400a767 767 0 01308 81 32 32 0 0060 23A832 832 0 00832 800a826 826 0 00-180-634 32 32 0 00-18-6h-400a32 32 0 00-18 6A826 826 0 0064 166 32 32 0 0024-6A832 832 0 00832 0zm-97 552H465l-40 132h279zm-23-279c-25-25-64-25-89 0l-161 161 89 89 161-161c25-25 25-64 0-89zm-248 248 23-76H506l40-132h123l-23 76zM863 256H625l-40 132h278l23-76a32 32 0 00-9-31 33 33 0 00-23-9zm-29 391H512l-40 132h272a33 33 0 0024-57l-23-75a32 32 0 00-31-20z"> M640 96c-158 0-288 130-288 288 0 17 3 31 5 46L105 681 96 691V928h224v-96h96v-96h96v-95c38 18 82 31 128 31 158 0 288-130 288-288s-130-288-288-288zm0 64c123 0 224 101 224 224s-101 224-224 224a235 235 0 01-109-28l-8-4H448v96h-96v96H256v96H160v-146l253-254 12-11-3-17C419 417 416 400 416 384c0-123 101-224 224-224zm64 96a64 64 0 100 128 64 64 0 100-128z - M544 85c49 0 90 37 95 85h75a96 96 0 0196 89L811 267a32 32 0 01-28 32L779 299a32 32 0 01-32-28L747 267a32 32 0 00-28-32L715 235h-91a96 96 0 01-80 42H395c-33 0-62-17-80-42L224 235a32 32 0 00-32 28L192 267v576c0 16 12 30 28 32l4 0h128a32 32 0 0132 28l0 4a32 32 0 01-32 32h-128a96 96 0 01-96-89L128 843V267a96 96 0 0189-96L224 171h75a96 96 0 0195-85h150zm256 256a96 96 0 0196 89l0 7v405a96 96 0 01-89 96L800 939h-277a96 96 0 01-96-89L427 843v-405a96 96 0 0189-96L523 341h277zm-256-192H395a32 32 0 000 64h150a32 32 0 100-64z + M544 85c49 0 90 37 95 85h75a96 96 0 0196 89L811 267a32 32 0 01-28 32L779 299a32 32 0 01-32-28L747 267a32 32 0 00-28-32L715 235h-91a96 96 0 01-80 42H395c-33 0-62-17-80-42L224 235a32 32 0 00-32 28L192 267v576c0 16 12 30 28 32l4 0h128a32 32 0 0132 28l0 4a32 32 0 01-32 32h-128a96 96 0 01-96-89L128 843V267a96 96 0 0189-96L224 171h75a96 96 0 0195-85h150zm256 256a96 96 0 0196 89l0 7v405a96 96 0 01-89 96L800 939h-277a96 96 0 01-96-89L427 843v-405a96 96 0 0189-96L523 341h277zm-256-192H395a32 32 0 000 64h128a32 32 0 100-64z M470 722q-23 3-43 3T384 722v-150l-106 106q-34-26-60-59L324 512H174q-3-23-3-43t3-42h150L218 320q16-20 28-32t32-27L384 367V217q23-4 43-4t43 4v150l106-106q34 26 60 59l-106 107h150q3 22 3 42T680 512h-150l106 107q-16 20-28 32t-32 27l-106-106v150zM0 811q0-36 25-61t61-25 61 25 25 61-25 61-61 25-61-25T0 811z M576 64H448v384H64v128h384v384h128V576h384V448H576z M432 0h160c27 0 48 21 48 48v336h175c36 0 53 43 28 68L539 757c-15 15-40 15-55 0L180 452c-25-25-7-68 28-68H384V48c0-27 21-48 48-48zm592 752v224c0 27-21 48-48 48H48c-27 0-48-21-48-48V752c0-27 21-48 48-48h293l98 98c40 40 105 40 145 0l98-98H976c27 0 48 21 48 48zm-248 176c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40zm128 0c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40z - M592 768h-160c-27 0-48-21-48-48V384h-175c-36 0-53-43-28-68L485 11c15-15 40-15 55 0l304 304c25 25 7 68-28 68H640v336c0 27-21 48-48 48zm432-16v224c0 27-21 48-48 48H48c-27 0-48-21-48-48V752c0-27 21-48 48-48h272v16c0 62 50 112 112 112h160c62 0 112-50 112-112v-16h272c27 0 48 21 48 48zm-248 176c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40zm128 0c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40z + M592 768h-160c-27 0-48-21-48-48V384h-175c-36 0-53-43-28-68L485 11c15-15 40-15 55 0l304 304c25 25 7 68-28 68H640v336c0 27-21 48-48 48zm432-16v224c0 27-21 48-48 48H48c-27 0-48-21-48-48V752c0-27 21-48 48-48h272v16c0 62 50 112 112 112h160c62 0 112-50 112-112v-16h272c27 0 48 21 48 48zm-248 176c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40z M563 555c0 28-23 51-51 51-28 0-51-23-51-51L461 113c0-28 23-51 51-51s51 23 51 51L563 555 563 555zM85 535c0-153 81-287 201-362 24-15 55-8 70 16C371 214 363 245 340 260 248 318 187 419 187 535c0 180 146 325 325 325 180-0 325-146 325-325 0-119-64-223-160-280-24-14-32-46-18-70 14-24 46-32 70-18 125 74 210 211 210 367 0 236-191 427-427 427C276 963 85 772 85 535 - M277 85a149 149 0 00-43 292v230a32 32 0 0064 0V555h267A160 160 0 00725 395v-12a149 149 0 10-64-5v17a96 96 0 01-96 96H299V383A149 149 0 00277 85zM228 720a32 32 0 00-37-52 150 150 0 00-53 68 32 32 0 1060 23 85 85 0 0130-39zm136-52a32 32 0 00-37 52 86 86 0 0130 39 32 32 0 1060-23 149 149 0 00-53-68zM204 833a32 32 0 10-55 32 149 149 0 0063 58 32 32 0 0028-57 85 85 0 01-36-33zm202 32a32 32 0 00-55-32 85 85 0 01-36 33 32 32 0 0028 57 149 149 0 0063-58z - m224 154a166 166 0 00-166 166v192a166 166 0 00166 166h64v-76h-64a90 90 0 01-90-90v-192a90 90 0 0190-90h320a90 90 0 0190 90v192a90 90 0 01-90 90h-128v77h128a166 166 0 00166-167v-192a166 166 0 00-166-166h-320zm166 390a90 90 0 0190-90h128v-76h-128a166 166 0 00-166 166v192a166 166 0 00166 166h320a166 166 0 00166-166v-192a166 166 0 00-166-166h-64v77h64a90 90 0 0190 90v192a90 90 0 01-90 90h-320a90 90 0 01-90-90v-192z - M512 128M706 302a289 289 0 00-173 44 27 27 0 1029 46 234 234 0 01125-36c23 0 45 3 66 9 93 28 161 114 161 215C914 704 813 805 687 805H337C211 805 110 704 110 580c0-96 61-178 147-210C282 263 379 183 495 183a245 245 0 01210 119z - M364 512h67v108h108v67h-108v108h-67v-108h-108v-67h108v-108zm298-64A107 107 0 01768 555C768 614 720 660 660 660h-108v-54h-108v-108h-94v108h-94c4-21 22-47 44-51l-1-12a75 75 0 0171-75a128 128 0 01239-7a106 106 0 0153-14z - M115 386l19 33c17 29 44 50 76 60l116 33c34 10 58 41 58 77v80c0 22 12 42 32 52s32 30 32 52v78c0 31 30 54 60 45 32-9 57-35 65-68l6-22c8-34 30-63 61-80l16-9c30-17 48-49 48-83v-17c0-25-10-50-28-68l-8-8c-18-18-42-28-68-28H514c-22 0-44-6-64-17l-69-39c-9-5-15-13-18-22-6-19 2-40 20-49l12-6c13-7 29-8 43-3l46 15c16 5 34-1 44-15 9-14 8-33-2-46l-27-33c-20-24-20-59 1-83l31-37c18-21 20-50 7-73l-5-8c-7-0-14-1-21-1-186 0-343 122-396 290zM928 512c0-74-19-143-53-203L824 330c-31 13-48 48-37 80l34 101c7 21 24 37 45 42l58 15c2-18 4-36 4-55zM0 512a512 512 0 111024 0 512 512 0 11-1024 0z - M1024 64v704h-128v128h-128v128h-768v-704h128v-128h128v-128zM64 960h640v-576h-640zM320 128v64h576v512h64v-576zM192 256v64h576v512h64v-576zM432 688L576 832H480L384 736 288 832H192l144-144L192 544h96L384 640l96-96H576z - M853 256h-43v512h43c47 0 85-38 85-85v-341c0-47-38-85-85-85zM725 768V171h128V85h-341v85H640v85H171c-47 0-85 38-85 85v341c0 47 38 85 85 85h469V853h-128v85h341v-85H725v-86zm-469-171v-171h384v171H256z - M960 146v91C960 318 759 384 512 384S64 318 64 238V146C64 66 265 0 512 0s448 66 448 146zM960 352v206C960 638 759 704 512 704S64 638 64 558V352c96 66 272 97 448 97S864 418 960 352zm0 320v206C960 958 759 1024 512 1024S64 958 64 878V672c96 66 272 97 448 97S864 738 960 672z - M883 567l-128-128c-17-17-43-17-60 0l-128 128c-17 17-17 43 0 60 17 17 43 17 60 0l55-55V683c0 21-21 43-43 43H418c-13-38-43-64-77-77V375c51-17 85-64 85-119 0-73-60-128-128-128-73 0-128 55-128 128 0 55 34 102 85 119v269c-51 17-85 64-85 119 0 73 55 128 128 128 55 0 102-34 119-85H640c73 0 128-55 128-128v-111l55 55c9 9 17 13 30 13 13 0 21-4 30-13 17-13 17-43 0-55zM299 213c26 0 43 17 43 43 0 21-21 43-43 43-26 0-43-21-43-43 0-26 17-43 43-43zm0 597c-26 0-43-21-43-43 0-26 17-43 43-43s43 17 43 43c0 21-17 43-43 43zM725 384c-73 0-128-60-128-128 0-73 55-128 128-128s128 55 128 128c0 68-55 128-128 128zm0-171c-26 0-43 17-43 43s17 43 43 43 43-17 43-43-17-43-43-43z - M293 122v244h439V146l171 175V829a73 73 0 01-73 73h-98V536H293v366H195a73 73 0 01-73-73V195a73 73 0 0173-73h98zm366 512v268H366V634h293zm-49 49h-195v73h195v-73zm49-561v171H366V122h293z - M0 551V472c0-11 9-19 19-19h984c11 0 19 9 19 19v79c0 11-9 19-19 19H19c-11 0-19-9-19-19zM114 154v240c0 11-9 19-19 19H19C9 413 0 404 0 394V79C0 35 35 0 79 0h315c11 0 19 9 19 19v75c0 11-9 19-19 19H154c-21 0-39 18-39 39zm795 0c0-22-17-39-39-39h-240c-11 0-19-9-19-19V19c0-11 9-19 19-19h315c43 0 79 35 79 79v315c0 11-9 19-19 19h-75c-11 0-19-9-19-19l-1-240zm0 716v-240c0-11 9-19 19-19h75c11 0 19 9 19 19v315c0 43-35 79-79 79h-315c-11 0-19-9-19-19v-75c0-11 9-19 19-19H870c21-1 39-18 39-40zm-795 0c0 21 18 39 39 39h240c11 0 19 9 19 19v75c0 11-9 19-19 19H79C35 1023 0 988 0 945v-315c0-11 9-19 19-19h75c11 0 19 9 19 19V870z - M155 143h715v81H155V143zm358 94 358 369H662l1 278H363V605H155l358-369z - M702 677 590 565a148 148 0 10-25 27L676 703zm-346-200a115 115 0 11115 115A115 115 0 01355 478z - M928 500a21 21 0 00-19-20L858 472a11 11 0 01-9-9c-1-6-2-13-3-19a11 11 0 015-12l46-25a21 21 0 0010-26l-8-22a21 21 0 00-24-13l-51 10a11 11 0 01-12-6c-3-6-6-11-10-17a11 11 0 011-13l34-39a21 21 0 001-28l-15-18a20 20 0 00-27-4l-45 27a11 11 0 01-13-1c-5-4-10-9-15-12a11 11 0 01-3-12l19-49a21 21 0 00-9-26l-20-12a21 21 0 00-27 6L650 193a9 9 0 01-11 3c-1-1-12-5-20-7a11 11 0 01-7-10l1-52a21 21 0 00-17-22l-23-4a21 21 0 00-24 14L532 164a11 11 0 01-11 7h-20a11 11 0 01-11-7l-17-49a21 21 0 00-24-15l-23 4a21 21 0 00-17 22l1 52a11 11 0 01-8 11c-5 2-15 6-19 7c-4 1-8 0-12-4l-33-40A21 21 0 00313 146l-20 12A21 21 0 00285 184l19 49a11 11 0 01-3 12c-5 4-10 8-15 12a11 11 0 01-13 1L228 231a21 21 0 00-27 4L186 253a21 21 0 001 28L221 320a11 11 0 011 13c-3 5-7 11-10 17a11 11 0 01-12 6l-51-10a21 21 0 00-24 13l-8 22a21 21 0 0010 26l46 25a11 11 0 015 12l0 3c-1 6-2 11-3 16a11 11 0 01-9 9l-51 8A21 21 0 0096 500v23A21 21 0 00114 544l51 8a11 11 0 019 9c1 6 2 13 3 19a11 11 0 01-5 12l-46 25a21 21 0 00-10 26l8 22a21 21 0 0024 13l51-10a11 11 0 0112 6c3 6 6 11 10 17a11 11 0 01-1 13l-34 39a21 21 0 00-1 28l15 18a20 20 0 0027 4l45-27a11 11 0 0113 1c5 4 10 9 15 12a11 11 0 013 12l-19 49a21 21 0 009 26l20 12a21 21 0 0027-6L374 832c3-3 7-5 10-4c7 3 12 5 20 7a11 11 0 018 10l-1 52a21 21 0 0017 22l23 4a21 21 0 0024-14l17-50a11 11 0 0111-7h20a11 11 0 0111 7l17 49a21 21 0 0020 15a19 19 0 004 0l23-4a21 21 0 0017-22l-1-52a11 11 0 018-10c8-3 13-5 18-7l1 0c6-2 9 0 11 3l34 41A21 21 0 00710 878l20-12a21 21 0 009-26l-18-49a11 11 0 013-12c5-4 10-8 15-12a11 11 0 0113-1l45 27a21 21 0 0027-4l15-18a21 21 0 00-1-28l-34-39a11 11 0 01-1-13c3-5 7-11 10-17a11 11 0 0112-6l51 10a21 21 0 0024-13l8-22a21 21 0 00-10-26l-46-25a11 11 0 01-5-12l0-3c1-6 2-11 3-16a11 11 0 019-9l51-8a21 21 0 0018-21v-23zm-565 188a32 32 0 01-51 5a270 270 0 011-363a32 32 0 0151 6l91 161a32 32 0 010 31zM512 782a270 270 0 01-57-6a32 32 0 01-20-47l92-160a32 32 0 0127-16h184a32 32 0 0130 41c-35 109-137 188-257 188zm15-328L436 294a32 32 0 0121-47a268 268 0 0155-6c120 0 222 79 257 188a32 32 0 01-30 41h-184a32 32 0 01-28-16z M653 435l-26 119H725c9 0 13 4 13 13v47c0 9-4 13-13 13h-107l-21 115c0 9-4 13-13 13h-47c-9 0-13-4-13-13l21-111H427l-21 115c0 9-4 13-13 13H346c-9 0-13-4-13-13l21-107h-85c-4-9-9-21-13-34v-38c0-9 4-13 13-13h98l26-119H294c-9 0-13-4-13-13V375c0-9 4-13 13-13h115l13-81c0-9 4-13 13-13h43c9 0 13 4 13 13L469 363h119l13-81c0-9 4-13 13-13h47c9 0 13 4 13 13l-13 77h85c9 0 13 4 13 13v47c0 9-4 13-13 13h-98v4zM512 0C230 0 0 230 0 512c0 145 60 282 166 375L90 1024H512c282 0 512-230 512-512S794 0 512 0zm-73 559h124l26-119h-128l-21 119z M900 287c40 69 60 144 60 225s-20 156-60 225c-40 69-94 123-163 163-69 40-144 60-225 60s-156-20-225-60c-69-40-123-94-163-163C84 668 64 593 64 512s20-156 60-225 94-123 163-163c69-40 144-60 225-60s156 20 225 60 123 94 163 163zM762 512c0-9-3-16-9-22L578 315l-44-44c-6-6-13-9-22-9s-16 3-22 9l-44 44-176 176c-6 6-9 13-9 22s3 16 9 22l44 44c6 6 13 9 22 9s16-3 22-9l92-92v269c0 9 3 16 9 22 6 6 13 9 22 9h62c8 0 16-3 22-9 6-6 9-13 9-22V486l92 92c6 6 13 9 22 9 8 0 16-3 22-9l44-44c6-6 9-13 9-22z M512 939C465 939 427 900 427 853 427 806 465 768 512 768 559 768 597 806 597 853 597 900 559 939 512 939M555 85 555 555 747 363 807 423 512 719 217 423 277 363 469 555 469 85 555 85Z M961 320 512 577 63 320 512 62l449 258zM512 628 185 442 63 512 512 770 961 512l-123-70L512 628zM512 821 185 634 63 704 512 962l449-258L839 634 512 821z M363 491h64v107h107v64h-107v107h-64v-107h-107v-64h107v-107zm149-235 256 128-256 128-64-32v-11H427l-171-85 256-128zm256 384-256 128-64-32v-53h64l0 0 0-0h43v-21l128-64 85 43zm0-128-213 107v-43h-107v-53l64 32 171-85 85 43zm-512 0 85-43v85l-85-43z - M447 561a26 26 0 0126 26v171H421v-171a26 26 0 0126-26zm-98 65a26 26 0 0126 26v104H323v-104a26 26 0 0126-26zm0 0M561 268a32 32 0 0132 30v457h-65V299a32 32 0 0132-32zm0 0M675 384a26 26 0 0126 26v348H649v-350a26 26 0 0126-24zm0 0M801 223v579H223V223h579M805 171H219A49 49 0 00171 219v585A49 49 0 00219 853h585A49 49 0 00853 805V219A49 49 0 00805 171z - M576 160H448c-18 0-32-14-32-32s14-32 32-32h128c18 0 32 14 32 32s-14 32-32 32zm243 186 36-36c13-13 13-33 0-45s-33-13-45 0l-33 33C708 233 614 192 512 192c-212 0-384 172-384 384s172 384 384 384 384-172 384-384c0-86-29-166-77-230zM544 894V864c0-18-14-32-32-32s-32 14-32 32v30C329 879 209 759 194 608H224c18 0 32-14 32-32s-14-32-32-32h-30C209 393 329 273 480 258V288c0 18 14 32 32 32s32-14 32-32v-30C695 273 815 393 830 544H800c-18 0-32 14-32 32s14 32 32 32h30C815 759 695 879 544 894zm108-471-160 128c-14 11-16 31-5 45 6 8 16 12 25 12 7 0 14-2 20-7l160-128c14-11 16-31 5-45-11-14-31-16-45-5z + M447 561a26 26 0 0126 26v171H421v-171a26 26 0 0126-26zm-98 65a26 26 0 0126 26v104H323v-104a26 26 0 0126-26zm0 0M561 268a32 32 0 0132 30v457h-65V299a32 32 0 0132-32zm0 0M675 384a26 26 0 0126 26v348H649v-350a26 26 0 0126-24zm0 0M801 223v579H154V250h819v557zm-755-64h691V314H218v429zM365 877h448v64h-448z + M576 160H448c-18 0-32-14-32-32s14-32 32-32h128c18 0 32 14 32 32s-14 32-32 32zm243 186 36-36c13-13 13-33 0-45s-33-13-45 0l-33 33C708 233 614 192 512 192c-212 0-384 172-384 384s172 384 384 384 384-172 384-384c0-86-29-166-77-230zM544 894V864c0-18-14-32-32-32s-32 14-32 32v30C329 879 209 759 194 608H224c18 0 32-14 32-32s-14-32-32-32h-30C209 393 329 273 480 258V288c0 18 14 32 32 32s32-14 32-32v-30C695 273 815 393 830 544H800c-18 0-32 14-32 32s14 32 32 32h30C815 759 695 879 544 894zm108-471c0 21-17 36-37 36-20 0-36-15-36-36L619 165c-1-7-9-7-10 0l-73 332c-1 4 2 7 6 7h128c4 0 7-3 7-7l-12-55V406h-12l-73 332a523 523 0 00-4 19c0 21 17 36 37 36 20 0 36-15 36-36 0-4-1-8-3-11l12-54 61-61 61 61 17 70c2 8 9 13 17 11 8-2 13-9 11-17l-17-70 61-61 61 61 12 54c2 8 9 13 17 11 8-2 13-9 11-17l-12-54 61-61 61 61 19 79c3 12 14 20 26 20 2 0 4 0 6-1 14-3 23-17 21-32l-19-79 61-61 61 61 19 79c3 12 14 20 26 20 2 0 4 0 6-1 14-3 23-17 21-32l-19-79 61-61 61 61 19 79c3 12 14 20 26 20 2 0 4 0 6-1 14-3 23-17 21-32l-19-79 50-50a26 26 0 000-37l-36-36-67 67-20-20-20-20-72 72a26 26 0 01-37 0l-15-15-49 49 18 77c3 12-4 24-16 27-2 1-4 1-6 1-12 0-22-8-25-20l-18-79-67 67-36-36a26 26 0 000-37l79-79z M558 545 790 403c24-15 31-47 16-71-15-24-46-31-70-17L507 457 277 315c-24-15-56-7-71 17-15 24-7 56 17 71l232 143V819c0 28 23 51 51 51 28 0 51-23 51-51V545h0zM507 0l443 256v512L507 1024 63 768v-512L507 0z M770 320a41 41 0 00-56-14l-252 153L207 306a41 41 0 10-43 70l255 153 2 296a41 41 0 0082 0l-2-295 255-155a41 41 0 0014-56zM481 935a42 42 0 01-42 0L105 741a42 42 0 01-21-36v-386a42 42 0 0121-36L439 89a42 42 0 0142 0l335 193a42 42 0 0121 36v87h84v-87a126 126 0 00-63-109L523 17a126 126 0 00-126 0L63 210a126 126 0 00-63 109v386a126 126 0 0063 109l335 193a126 126 0 00126 0l94-54-42-72zM1029 700h-126v-125a42 42 0 00-84 0v126h-126a42 42 0 000 84h126v126a42 42 0 1084 0v-126h126a42 42 0 000-84z - M416 587c21 0 37 17 37 37v299A37 37 0 01416 960h-299a37 37 0 01-37-37v-299c0-21 17-37 37-37h299zm448 0c21 0 37 17 37 37v299A37 37 0 01864 960h-299a37 37 0 01-37-37v-299c0-21 17-37 37-37h299zM758 91l183 189a37 37 0 010 52l-182 188a37 37 0 01-53 1l-183-189a37 37 0 010-52l182-188a37 37 0 0153-1zM416 139c21 0 37 17 37 37v299A37 37 0 01416 512h-299a37 37 0 01-37-37v-299c0-21 17-37 37-37h299z - M512 0C230 0 0 230 0 512c0 145 60 282 166 375L90 1024H512c282 0 512-230 512-512S794 0 512 0z - M875 128h-725A107 107 0 0043 235v555A107 107 0 00149 896h725a107 107 0 00107-107v-555A107 107 0 00875 128zm-115 640h-183v-58l25-3c15 0 19-8 14-24l-22-61H419l-28 82 39 2V768h-166v-58l18-3c18-2 22-11 26-24l125-363-40-4V256h168l160 448 39 3zM506 340l-72 218h145l-71-218h-2z - M177 156c-22 5-33 17-36 37c-10 57-33 258-13 278l445 445c23 23 61 23 84 0l246-246c23-23 23-61 0-84l-445-445C437 120 231 145 177 156zM331 344c-26 26-69 26-95 0c-26-26-26-69 0-95s69-26 95 0C357 276 357 318 331 344z - M683 537h-144v-142h-142V283H239a44 44 0 00-41 41v171a56 56 0 0014 34l321 321a41 41 0 0058 0l174-174a41 41 0 000-58zm-341-109a41 41 0 110-58a41 41 0 010 58zM649 284V142h-69v142h-142v68h142v142h69v-142h142v-68h-142z - M996 452 572 28A96 96 0 00504 0H96C43 0 0 43 0 96v408a96 96 0 0028 68l424 424c37 37 98 37 136 0l408-408c37-37 37-98 0-136zM224 320c-53 0-96-43-96-96s43-96 96-96 96 43 96 96-43 96-96 96zm1028 268L844 996c-37 37-98 37-136 0l-1-1L1055 647c34-34 53-79 53-127s-19-93-53-127L663 0h97a96 96 0 0168 28l424 424c37 37 37 98 0 136z - M765 118 629 239l-16 137-186 160 54 59 183-168 144 4 136-129 47-43-175-12L827 67zM489 404c-66 0-124 55-124 125s54 121 124 121c66 0 120-55 120-121H489l23-121c-8-4-16-4-23-4zM695 525c0 114-93 207-206 207s-206-94-206-207 93-207 206-207c16 0 27 0 43 4l43-207c-27-4-54-8-85-8-229 0-416 188-416 419s187 419 416 419c225 0 408-180 416-403v-12l-210-4z - M144 112h736c18 0 32 14 32 32v736c0 18-14 32-32 32H144c-18 0-32-14-32-32V144c0-18 14-32 32-32zm112 211v72a9 9 0 003 7L386 509 259 615a9 9 0 00-3 7v72a9 9 0 0015 7L493 516a9 9 0 000-14l-222-186a9 9 0 00-15 7zM522 624a10 10 0 00-10 10v60a10 10 0 0010 10h237a10 10 0 0010-10v-60a10 10 0 00-10-10H522z - M170 831 513 489 855 831 960 726 512 278 64 726 170 831zM512 278h448v-128h-896v128h448z - M897 673v13c0 51-42 93-93 93h-10c-1 0-2 0-2 0H220c-23 0-42 19-42 42v13c0 23 19 42 42 42h552c14 0 26 12 26 26 0 14-12 26-26 26H220c-51 0-93-42-93-93v-13c0-51 42-93 93-93h20c1-0 2-0 2-0h562c23 0 42-19 42-42v-13c0-11-5-22-13-29-8-7-17-11-28-10H660c-14 0-26-12-26-26 0-14 12-26 26-26h144c24-1 47 7 65 24 18 17 29 42 29 67zM479 98c-112 0-203 91-203 203 0 44 14 85 38 118l132 208c15 24 50 24 66 0l133-209c23-33 37-73 37-117 0-112-91-203-203-203zm0 327c-68 0-122-55-122-122s55-122 122-122 122 55 122 122-55 122-122 122z - M912 800a48 48 0 1 1 0 96h-416a48 48 0 1 1 0-96h416z m-704-704A112 112 0 0 1 256 309.184V480h80a48 48 0 0 1 0 96H256v224h81.664a48 48 0 1 1 0 96H256a96 96 0 0 1-96-96V309.248A112 112 0 0 1 208 96z m704 384a48 48 0 1 1 0 96h-416a48 48 0 0 1 0-96h416z m0-320a48 48 0 1 1 0 96h-416a48 48 0 0 1 0-96h416z - M30 0 30 30 0 15z - M0 0 0 30 30 15z - M762 1024C876 818 895 504 448 514V768L64 384l384-384v248c535-14 595 472 314 776z - M832 464H332V240c0-31 25-56 56-56h248c31 0 56 25 56 56v68c0 4 4 8 8 8h56c4 0 8-4 8-8v-68c0-71-57-128-128-128H388c-71 0-128 57-128 128v224h-68c-18 0-32 14-32 32v384c0 18 14 32 32 32h640c18 0 32-14 32-32V496c0-18-14-32-32-32zM540 701v53c0 4-4 8-8 8h-40c-4 0-8-4-8-8v-53c-12-9-20-23-20-39 0-27 22-48 48-48s48 22 48 48c0 16-8 30-20 39z - M170 831l343-342L855 831l105-105-448-448L64 726 170 831z - M667 607c-3-2-7-14-0-38 73-77 118-187 118-290C784 115 668 0 508 0 348 0 236 114 236 278c0 104 45 215 119 292 7 24-2 33-8 35C274 631 0 725 0 854L0 1024l1024 0 0-192C989 714 730 627 667 607L667 607z - M880 128A722 722 0 01555 13a77 77 0 00-85 0 719 719 0 01-325 115c-40 4-71 38-71 80v369c0 246 329 446 439 446 110 0 439-200 439-446V207c0-41-31-76-71-80zM465 692a36 36 0 01-53 0L305 579a42 42 0 010-57 36 36 0 0153 0l80 85L678 353a36 36 0 0153 0 42 42 0 01-0 57L465 692z - M812 864h-29V654c0-21-11-40-28-52l-133-88 134-89c18-12 28-31 28-52V164h28c18 0 32-14 32-32s-14-32-32-32H212c-18 0-32 14-32 32s14 32 32 32h30v210c0 21 11 40 28 52l133 88-134 89c-18 12-28 31-28 52V864H212c-18 0-32 14-32 32s14 32 32 32h600c18 0 32-14 32-32s-14-32-32-32zM441 566c18-12 28-31 28-52s-11-40-28-52L306 373V164h414v209l-136 90c-18 12-28 31-28 52 0 21 11 40 28 52l135 89V695c-9-7-20-13-32-19-30-15-93-41-176-41-63 0-125 14-175 38-12 6-22 12-31 18v-36l136-90z - M0 512M1024 512M512 0M512 1024M762 412v100h-500v-100h-150v200h800v-200h-150z + M996 452 572 28A96 96 0 00504 0H96C43 0 0 43 0 96v408a96 96 0 0028 68l424 424c37 37 98 37 136 0l408-408c37-37 37-98 0-136zM224 320c-53 0-96-43-96-96s43-96 96-96 96 43 96 96-43 96-96 96zm1028 268L844 996c-37 37-98 37-136 0l-1-1L1055 647c34-34 53-79 53-127s-19-93-53-127L663 0h97a96 96 0 0168 28l424 424c37 37 37 98 0 136z + M576 160H448c-18 0-32-14-32-32s14-32 32-32h128c18 0 32 14 32 32s-14 32-32 32zm243 186 36-36c13-13 13-33 0-45s-33-13-45 0l-33 33C708 233 614 192 512 192c-212 0-384 172-384 384s172 384 384 384 384-172 384-384c0-86-29-166-77-230zM544 894V864c0-18-14-32-32-32s-32 14-32 32v30C329 879 209 759 194 608H224c18 0 32-14 32-32s-14-32-32-32h-30C209 393 329 273 480 258V288c0 18 14 32 32 32s32-14 32-32v-30C695 273 815 393 830 544H800c-18 0-32 14-32 32s14 32 32 32h30C815 759 695 879 544 894zm108-471c0 21-17 36-37 36-20 0-36-15-36-36L619 165c-1-7-9-7-10 0l-73 332c-1 4 2 7 6 7h128c4 0 7-3 7-7l-12-55V406h-12l-73 332a523 523 0 00-4 19c0 21 17 36 37 36 20 0 36-15 36-36 0-4-1-8-3-11l12-54 61-61 61 61 17 70c2 8 9 13 17 11 8-2 13-9 11-17l-17-70 61-61 61 61 12 54c2 8 9 13 17 11 8-2 13-9 11-17l-12-54 61-61 61 61 19 79c3 12 14 20 26 20 2 0 4 0 6-1 14-3 23-17 21-32l-19-79 61-61 61 61 19 79c3 12 14 20 26 20 2 0 4 0 6-1 14-3 23-17 21-32l-19-79 50-50a26 26 0 000-37l-36-36-67 67-20-20-20-20-72 72a26 26 0 01-37 0l-15-15-49 49 18 77c3 12-4 24-16 27-2 1-4 1-6 1-12 0-22-8-25-20l-18-79-67 67-36-36a26 26 0 000-37l79-79zM928 512c0-74-19-143-53-203L824 330c-31 13-48 48-37 80l34 101c7 21 24 37 45 42l58 15c2-18 4-36 4-55zM204 833a32 32 0 00-37-52 150 150 0 00-53 68 32 32 0 1060 23 85 85 0 0130-39zm136-52a32 32 0 00-37 52 86 86 0 0130 39 32 32 0 1060-23 149 149 0 00-53-68zM204 917zm598 0zm-24-223a31 31 0 00-31 31v149a31 31 0 0061 0v-149a31 31 0 00-30-31zM805 571h-15a32 32 0 00-31 31v66h-68v-66a32 32 0 00-31-31h-15a31 31 0 00-31 31v149a31 31 0 0061 0v-103h68v103a31 31 0 0061 0V571a31 31 0 00-31-31z"> M519 459 222 162a37 37 0 10-52 52l297 297L169 809a37 37 0 1052 52l297-297 297 297a37 37 0 1052-52l-297-297 297-297a37 37 0 10-52-52L519 459z M0 0M32 512H936v96H32z M153 154h768v768h-768v-768zm64 64v640h640v-640h-640z M796 231v727H64V231h732zm-82 78H146V880h567V309zM229 66H960v732H796v-82h82V148h-567v82h-82V66z - M248 221a77 77 0 00-30-21c-18-7-40-10-68-5a224 224 0 00-45 13c-5 2-10 5-15 8l-3 2v68l11-9c10-8 21-14 34-19 13-5 26-7 39-7 12 0 21 3 28 10 6 6 9 16 9 29l-62 9c-14 2-26 6-36 11a80 80 0 00-25 20c-7 8-12 17-15 27-6 21-6 44 1 65a70 70 0 0041 43c10 4 21 6 34 6a80 80 0 0063-28v22h64V298c0-16-2-31-6-44a91 91 0 00-18-33zm-41 121v15c0 8-1 15-4 22a48 48 0 01-24 29 44 44 0 01-33 2 29 29 0 01-10-6 25 25 0 01-6-9 30 30 0 01-2-12c0-5 1-9 2-14a21 21 0 015-9 28 28 0 0110-7 83 83 0 0120-5l42-6zm323-68a144 144 0 00-16-42 87 87 0 00-28-29 75 75 0 00-41-11 73 73 0 00-44 14c-6 5-12 11-17 17V64H326v398h59v-18c8 10 18 17 30 21 6 2 13 3 21 3 16 0 31-4 43-11 12-7 23-18 31-31a147 147 0 0019-46 248 248 0 006-57c0-17-2-33-5-49zm-55 49c0 15-1 28-4 39-2 11-6 20-10 27a41 41 0 01-15 15 37 37 0 01-36 1 44 44 0 01-13-12 59 59 0 01-9-18A76 76 0 01384 352v-33c0-10 1-20 4-29 2-8 6-15 10-22a43 43 0 0115-13 37 37 0 0119-5 35 35 0 0132 18c4 6 7 14 9 23 2 9 3 20 3 31zM154 634a58 58 0 0120-15c14-6 35-7 49-1 7 3 13 6 20 12l21 17V572l-6-4a124 124 0 00-58-14c-20 0-38 4-54 11-16 7-30 17-41 30-12 13-20 29-26 46-6 17-9 36-9 57 0 18 3 36 8 52 6 16 14 30 24 42 10 12 23 21 38 28 15 7 32 10 50 10 15 0 28-2 39-5 11-3 21-8 30-14l5-4v-57l-13 6a26 26 0 01-5 2c-3 1-6 2-8 3-2 1-15 6-15 6-4 2-9 3-14 4a63 63 0 01-38-4 53 53 0 01-20-14 70 70 0 01-13-24 111 111 0 01-5-34c0-13 2-26 5-36 3-10 8-19 14-26zM896 384h-256V320h288c21 1 32 12 32 32v384c0 18-12 32-32 32H504l132 133-45 45-185-185c-16-21-16-25 0-45l185-185L637 576l-128 128H896V384z - M128 691H6V38h838v160h-64V102H70v525H128zM973 806H154V250h819v557zm-755-64h691V314H218v429zM365 877h448v64h-448z - M853 267H514c-4 0-6-2-9-4l-38-66c-13-21-38-36-64-36H171c-41 0-75 34-75 75v555c0 41 34 75 75 75h683c41 0 75-34 75-75V341c0-41-34-75-75-75zm-683-43h233c4 0 6 2 9 4l38 66c13 21 38 36 64 36H853c6 0 11 4 11 11v75h-704V235c0-6 4-11 11-11zm683 576H171c-6 0-11-4-11-11V480h704V789c0 6-4 11-11 11z - M896 96 614 96c-58 0-128-19-179-51C422 38 390 19 358 19L262 19 128 19c-70 0-128 58-128 128l0 736c0 70 58 128 128 128l768 0c70 0 128-58 128-128L1024 224C1024 154 966 96 896 96zM704 685 544 685l0 160c0 19-13 32-32 32s-32-13-32-32l0-160L320 685c-19 0-32-13-32-32 0-19 13-32 32-32l160 0L480 461c0-19 13-32 32-32s32 13 32 32l0 160L704 621c19 0 32 13 32 32C736 666 723 685 704 685zM890 326 102 326 102 250c0-32 32-64 64-64l659 0c38 0 64 32 64 64L890 326z - M1182 527a91 91 0 00-88-117H92a91 91 0 00-88 117l137 441A80 80 0 00217 1024h752a80 80 0 0076-56zM133 295a31 31 0 0031 31h858a31 31 0 0031-31A93 93 0 00959 203H226a93 93 0 00-94 92zM359 123h467a31 31 0 0031-31A92 92 0 00765 0H421a92 92 0 00-92 92 31 31 0 0031 31z + M248 221a77 77 0 00-30-21c-18-7-40-10-68-5a224 224 0 00-45 13c-5 2-10 5-15 8l-3 2v68l11-9c10-8 21-14 34-19 13-5 26-7 39-7 12 0 21 3 28 10 6 6 9 16 9 29l-62 9c-14 2-26 6-36 11a80 80 0 00-25 20c-7 8-12 17-15 27-6 21-6 44 1 65a70 70 0 0041 43c10 4 21 6 34 6a80 80 0 0063-28v22h64V298c0-16-2-31-6-44a91 91 0 00-18-33zm-41 121v15c0 8-1 15-4 22a48 48 0 01-24 29 44 44 0 01-33 2 29 29 0 01-10-6 25 25 0 01-6-9 30 30 0 01-2-12c0-5 1-9 2-14a21 21 0 015-9 28 28 0 0110-7 83 83 0 0120-5l42-6zm323-68a144 144 0 00-16-42 87 87 0 00-28-29 75 75 0 00-41-11 73 73 0 00-44 14c-6 5-12 11-17 17V64H326v398h59v-18c8 10 18 17 30 21 6 2 13 3 21 3 16 0 31-4 43-11 12-7 23-18 31-31a147 147 0 0019-46 248 248 0 006-57c0-17-2-33-5-49zm-55 49c0 15-1 28-4 39-2 11-6 20-10 27a41 41 0 01-15 15 37 37 0 01-36 1 44 44 0 01-13-12 59 59 0 01-9-18A76 76 0 01384 352v-33c0-10 1-20 4-29 2-8 6-15 10-22a43 43 0 0115-13 37 37 0 0119-5 35 35 0 0132 18c4 6 7 14 9 23 2 9 3 20 3 31zM154 634a58 58 0 0120-15c14-6 35-7 49-1 7 3 13 6 20 12l21 17V572l-6-4a124 124 0 00-58-14c-20 0-38 4-54 11-16 7-30 17-41 30-12 13-20 29-26 46-6 17-9 36-9 57 0 18 3 36 8 52 6 16 14 30 24 42 10 12 23 21 38 28 15 7 32 10 50 10 15 0 28-2 39-5 11-3 21-8 30-14l5-4v-57l-13 6a26 26 0 01-5 2c-3 1-15 6-15 6-4 2-9 3-14 4a63 63 0 01-38-4 53 53 0 01-20-14 70 70 0 01-13-24 111 111 0 01-5-34c0-13 2-26 5-36 3-10 8-19 14-26zM896 384h-256V320h288c21 1 32 12 32 32v384c0 18-12 32-32 32H504l132 133-45 45-185-185c-16-21-16-25 0-45l185-185L637 576l-128 128H896V384zM64 0h896a64 64 0 0164 64v896a64 64 0 01-64 64H64A64 64 0 000 960V64A64 64 0 0164 0z"> + + โšก + ๐Ÿค– + ๐Ÿ—„๏ธ + โŒ + ๐Ÿ’พ + ๐Ÿช“ + ๐Ÿ•ต๏ธ + ๐Ÿ”– + ๐Ÿ”ฝ + ๐ŸŒฟ + โž•๐ŸŒฟ + โœ”๏ธ + โญ•โœ”๏ธ + ๐Ÿ“ + ๐Ÿ’ + ๐Ÿ”ตโฌ‡๏ธ + ๐Ÿงน + ๐Ÿ”• + ๐Ÿงผ + ๐Ÿ‘ + โŽ + ๐Ÿ’ป + ๐ŸŽจ + ๐Ÿ“ + ๐Ÿค”๐Ÿ“ + ๐Ÿ”€ + โš”๏ธ + ๐Ÿ“‹ + โœ‚๏ธ + ๐Ÿ”— + ๐Ÿ”Ž + ๐Ÿ”„ + โฌ + โซ + โฌ‡๏ธ + โœ๏ธ + โญ• + โ— + ๐Ÿงญ + ๐Ÿ‘๏ธ + ๐Ÿ™ˆ + โฉ + ๐Ÿ“ฅ + ๐Ÿ“„ + โž•๐Ÿ“„ + ๐Ÿ“ค + ๐Ÿšซ๐Ÿ“„ + โž–๐Ÿ“„ + ๐Ÿ” + ๐Ÿ“ + โž•๐Ÿ“ + ๐Ÿ“‚ + ๐ŸŒŠ + โœจ + ๐Ÿ”ฅ + ๐Ÿš€ + ๐Ÿ™ + ๐Ÿšซ + ๐Ÿ”ฒ + # + ๐Ÿ‘‘ + ๐Ÿ™ˆ + ๐Ÿ•ฐ๏ธ + ๐Ÿ  + โŒจ๏ธ + ๐Ÿ“ฅ + โ„น๏ธ + ๐Ÿ”ฐ + ๐Ÿงฉ + ๐Ÿž + ๐Ÿ“ + ๐Ÿ“ฆ + ๐Ÿ’ก + ๐Ÿ“ƒ + โž•๐Ÿ“ƒ + โž–๐Ÿ“ƒ + ๐Ÿ”— + ๐Ÿ“‹ + โณ + ๐Ÿ“ + ๐Ÿ”’ + ๐Ÿ“œ + โ˜ฐ + ๐Ÿ”€ + โž– + โœ๏ธ + โ‹ฏ + ๐Ÿ”€ + โžก๏ธ + ๐Ÿ”— + ๐Ÿ”ค + โฐ + ๐Ÿ”ฃ + ๐Ÿ”‘ + ๐Ÿ“‹ + ๐Ÿ”ณ + โž• + โฌ‡๏ธ + โฌ†๏ธ + ๐Ÿšช + ๐Ÿงฌ + ๐Ÿ”— + ๐ŸŒ + โž•๐ŸŒ + ๐ŸŒŽ + ๐Ÿ—‘๏ธ + โœ๏ธ + ๐Ÿข + ๐Ÿ”„ + ๐Ÿ’พ + ๐Ÿ” + ๐Ÿ” + ๐Ÿ”Ž + โš™๏ธ + ๐Ÿ”ข + ๐Ÿ”„ + ๐Ÿฅ’ + ๐Ÿ“ฆ + โž•๐Ÿ“ฆ + ๐Ÿ“Š + โฑ๏ธ + ๐Ÿ“ฆ + โž•๐Ÿ“ฆ + ๐Ÿ“ฆ + ๐Ÿ“ + ๐ŸŒˆ + ๐Ÿท๏ธ + โž•๐Ÿท๏ธ + ๐Ÿท๏ธ + ๐ŸŽฏ + ๐Ÿ–ฅ๏ธ + ๐Ÿ”ผ + ๐Ÿš‚ + ๐ŸŒณ + โ—€๏ธ + โ–ถ๏ธ + โ†ฉ๏ธ + ๐Ÿ”“ + โฌ†๏ธ + ๐Ÿ‘ค + โœ… + โณ + โฌœ + โŽ + โž– + ๐Ÿ—– + ๐Ÿ—— + ๐Ÿ”  + ๐Ÿ—‚๏ธ + ๐ŸŒฒ + โž•๐ŸŒฒ + ๐ŸŒฒ diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj index 4440bc01a4..91dd8c866b 100644 --- a/src/SourceGit.csproj +++ b/src/SourceGit.csproj @@ -55,6 +55,7 @@ + diff --git a/src/Views/AIAssistant.axaml b/src/Views/AIAssistant.axaml index bef13df28f..cac9f31de3 100644 --- a/src/Views/AIAssistant.axaml +++ b/src/Views/AIAssistant.axaml @@ -4,6 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:v="using:SourceGit.Views" xmlns:vm="using:SourceGit.ViewModels" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="120" x:Class="SourceGit.Views.AIAssistant" x:DataType="vm:AIAssistant" @@ -20,11 +21,18 @@ BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}" PointerPressed="BeginMoveWindow"/> - + + + + + + + + - + - - + diff --git a/src/Views/AddRemote.axaml b/src/Views/AddRemote.axaml index f4fe8f3368..46b61c834d 100644 --- a/src/Views/AddRemote.axaml +++ b/src/Views/AddRemote.axaml @@ -4,53 +4,157 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" x:Class="SourceGit.Views.AddRemote" x:DataType="vm:AddRemote"> - + + + + 8,0 + 1,0 + + - + + + + 0,16,0,0 + 0,1,0,0 + + + + + 32,32,Auto + 3,3,Auto + + + + + 120,* + 12,* + + + HorizontalAlignment="Right" VerticalAlignment="Center"> + + + 0,0,8,0 + 0,0,1,0 + + + + + + + v:AutoFocusBehaviour.IsEnabled="True"> + + + 26 + 2 + + + + + 2 + 0 + + + + HorizontalAlignment="Right" VerticalAlignment="Center"> + + + 0,0,8,0 + 0,0,1,0 + + + + + + + Text="{Binding Url, Mode=TwoWay}"> + + + 26 + 2 + + + + + 2 + 0 + + + - + IsVisible="{Binding UseSSH}"> + + + 0,0,8,0 + 0,0,1,0 + + + + + + + 32 + 3 + + + + + 28 + 2 + + + + + 3 + 0 + + - diff --git a/src/Views/AddSubmodule.axaml b/src/Views/AddSubmodule.axaml index 2b5061ff34..ae5c24cc11 100644 --- a/src/Views/AddSubmodule.axaml +++ b/src/Views/AddSubmodule.axaml @@ -4,36 +4,95 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" x:Class="SourceGit.Views.AddSubmodule" x:DataType="vm:AddSubmodule"> - + + + + 8,0 + 1,0 + + - + + + + 0,16,0,0 + 0,1,0,0 + + + + + 32,32,32 + 3,3,3 + + + + + 120,* + 12,* + + + Text="{DynamicResource Text.URL}"> + + + 0,0,8,0 + 0,0,1,0 + + + + v:AutoFocusBehaviour.IsEnabled="True"> + + + 26 + 2 + + + + + 2 + 0 + + + + Text="{DynamicResource Text.Submodule.RelativePath}"> + + + 0,0,8,0 + 0,0,1,0 + + + + Text="{Binding RelativePath, Mode=TwoWay}"> + + + 26 + 2 + + + + + 2 + 0 + + + - + - + - + + + + + + + + - - + + + + + + + + + - - + + diff --git a/src/Views/AddWorktree.axaml b/src/Views/AddWorktree.axaml index 6ab3360bf6..4be302d7e6 100644 --- a/src/Views/AddWorktree.axaml +++ b/src/Views/AddWorktree.axaml @@ -3,57 +3,67 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.AddWorktree" x:DataType="vm:AddWorktree"> - + - + - - + + Margin="{console:OnPlatform Default='8,0,0,0', Console='1,0,0,0'}"/> - - + + + + + + + + + @@ -70,14 +87,14 @@ - - + + + + + + + + + diff --git a/src/Views/Apply.axaml b/src/Views/Apply.axaml index 6c2478bb5e..58f403587b 100644 --- a/src/Views/Apply.axaml +++ b/src/Views/Apply.axaml @@ -5,39 +5,50 @@ xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.Apply" x:DataType="vm:Apply"> - + - + - - + @@ -53,7 +64,7 @@ - + @@ -61,8 +72,8 @@ - - + + diff --git a/src/Views/ApplyStash.axaml b/src/Views/ApplyStash.axaml index ded0e9f22c..cb938555b8 100644 --- a/src/Views/ApplyStash.axaml +++ b/src/Views/ApplyStash.axaml @@ -3,27 +3,36 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.ApplyStash" x:DataType="vm:ApplyStash"> - + - + - - + + + + + + + + - + - + - + - - + + + + + + + + + - - - - + + + + + + + + + + + - - + + + + + + + + + @@ -46,18 +70,25 @@ - diff --git a/src/Views/Askpass.axaml b/src/Views/Askpass.axaml index 5a65d6f7a6..94410c1727 100644 --- a/src/Views/Askpass.axaml +++ b/src/Views/Askpass.axaml @@ -3,6 +3,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:v="using:SourceGit.Views" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.Askpass" x:Name="ThisControl" @@ -13,16 +14,23 @@ WindowStartupLocation="CenterScreen"> - + - + + + + + + + + - - + + + Width="{console:OnPlatform Default='26', Console='2'}" Height="{console:OnPlatform Default='14', Console='1'}"/> @@ -80,8 +102,15 @@ - - + + + + + + + + + diff --git a/src/Views/Blame.axaml b/src/Views/Blame.axaml index bd8a2f8114..61ae54bbcb 100644 --- a/src/Views/Blame.axaml +++ b/src/Views/Blame.axaml @@ -5,6 +5,7 @@ xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" xmlns:c="using:SourceGit.Converters" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.Blame" x:DataType="vm:Blame" @@ -12,7 +13,7 @@ Icon="/App.ico" Title="{DynamicResource Text.Blame}" MinWidth="1280" MinHeight="720"> - + @@ -21,11 +22,18 @@ DoubleTapped="MaximizeOrRestoreWindow" PointerPressed="BeginMoveWindow"/> - + + + + + + + + - - - + + + + + + + + + + - - + + - - + + + + + + + + + diff --git a/src/Views/BranchCompare.axaml b/src/Views/BranchCompare.axaml index a407527aa4..13ed7033e6 100644 --- a/src/Views/BranchCompare.axaml +++ b/src/Views/BranchCompare.axaml @@ -5,6 +5,7 @@ xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" xmlns:c="using:SourceGit.Converters" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.BranchCompare" x:DataType="vm:BranchCompare" @@ -12,7 +13,7 @@ Icon="/App.ico" Title="{DynamicResource Text.BranchCompare}" MinWidth="1280" MinHeight="720"> - + @@ -21,11 +22,18 @@ DoubleTapped="MaximizeOrRestoreWindow" PointerPressed="BeginMoveWindow"/> - + + + + + + + + - - + + - - - + + + - - + + @@ -60,22 +68,29 @@ - + - - - + + + - - + + @@ -86,32 +101,46 @@ - + - + - + + + + + + + + @@ -123,7 +152,7 @@ - + - - + + + + + + + + @@ -24,7 +25,7 @@ @@ -44,8 +47,15 @@ - - + + + + + + + + + @@ -54,19 +64,19 @@ - + - + @@ -76,8 +86,15 @@ - + + + + + + + + diff --git a/src/Views/Cleanup.axaml b/src/Views/Cleanup.axaml index d385712deb..e21056b0b0 100644 --- a/src/Views/Cleanup.axaml +++ b/src/Views/Cleanup.axaml @@ -3,15 +3,16 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" x:Class="SourceGit.Views.Cleanup" x:DataType="vm:Cleanup"> - + - + \ No newline at end of file diff --git a/src/Views/ClearStashes.axaml b/src/Views/ClearStashes.axaml index b986211b58..54947ce4f6 100644 --- a/src/Views/ClearStashes.axaml +++ b/src/Views/ClearStashes.axaml @@ -3,16 +3,17 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" x:Class="SourceGit.Views.ClearStashes" x:DataType="vm:ClearStashes"> - + - - + \ No newline at end of file diff --git a/src/Views/Clone.axaml b/src/Views/Clone.axaml index 8c7c9fafce..017dc27b26 100644 --- a/src/Views/Clone.axaml +++ b/src/Views/Clone.axaml @@ -4,75 +4,92 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.Clone" x:DataType="vm:Clone"> - + - + - - diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml index 4d0c7b0ba5..5372b0df66 100644 --- a/src/Views/CommitBaseInfo.axaml +++ b/src/Views/CommitBaseInfo.axaml @@ -6,6 +6,7 @@ xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" xmlns:c="using:SourceGit.Converters" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.CommitBaseInfo" x:Name="ThisControl"> @@ -13,34 +14,34 @@ - + - + - + - - + + - + - + - - + + @@ -48,28 +49,49 @@ - + - + - + @@ -78,8 +100,8 @@ - - + + @@ -87,7 +109,14 @@ - + + + + + + + + @@ -95,8 +124,8 @@ - - + + @@ -110,7 +139,7 @@ Foreground="DarkOrange" TextDecorations="Underline" Cursor="Hand" - Margin="0,0,16,0" + Margin="{console:OnPlatform Default='0,0,16,0', Console='0,0,1,0'}" PointerEntered="OnSHAPointerEntered" PointerPressed="OnSHAPressed" ToolTip.ShowDelay="0"> @@ -124,13 +153,13 @@ - + - - + + - + @@ -140,8 +169,8 @@ - - + + @@ -155,7 +184,7 @@ Foreground="DarkOrange" TextDecorations="Underline" Cursor="Hand" - Margin="0,0,16,0" + Margin="{console:OnPlatform Default='0,0,16,0', Console='0,0,1,0'}" PointerEntered="OnSHAPointerEntered" PointerPressed="OnSHAPressed" ToolTip.ShowDelay="0"> @@ -169,13 +198,13 @@ - + - - + + - + @@ -185,20 +214,20 @@ - - + + - + - + - - + + - + @@ -229,3 +258,5 @@ + + diff --git a/src/Views/CommitChanges.axaml b/src/Views/CommitChanges.axaml index 4656b6b481..a626148754 100644 --- a/src/Views/CommitChanges.axaml +++ b/src/Views/CommitChanges.axaml @@ -4,47 +4,62 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.CommitChanges" x:DataType="vm:CommitDetail"> - + - + - + + + + + + + + - + - @@ -73,8 +88,15 @@ - - + + + + + + + + - + @@ -27,19 +28,19 @@ Children="{Binding Children}"/> - + @@ -51,7 +52,7 @@ - + @@ -61,18 +62,18 @@ - + - diff --git a/src/Views/CommitMessageEditor.axaml b/src/Views/CommitMessageEditor.axaml index 4687aebbca..9ae463620a 100644 --- a/src/Views/CommitMessageEditor.axaml +++ b/src/Views/CommitMessageEditor.axaml @@ -3,6 +3,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:v="using:SourceGit.Views" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.CommitMessageEditor" x:Name="ThisControl" @@ -19,12 +20,18 @@ BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}" PointerPressed="BeginMoveWindow"/> - - + + + + + + + + - - + + - - + + - + + + + + + + + + + diff --git a/src/Views/CommitRelationTracking.axaml b/src/Views/CommitRelationTracking.axaml index 9d036e10bc..4c03ba879f 100644 --- a/src/Views/CommitRelationTracking.axaml +++ b/src/Views/CommitRelationTracking.axaml @@ -4,11 +4,12 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:m="using:SourceGit.Models" xmlns:v="using:SourceGit.Views" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.CommitRelationTracking"> - + @@ -19,11 +20,25 @@ - - - - - + + + + + + + + + + + + + + + + + + + @@ -31,6 +46,6 @@ - + diff --git a/src/Views/ConfigureCustomActionControls.axaml b/src/Views/ConfigureCustomActionControls.axaml index 1e7c9fa834..b563145dd5 100644 --- a/src/Views/ConfigureCustomActionControls.axaml +++ b/src/Views/ConfigureCustomActionControls.axaml @@ -5,6 +5,7 @@ xmlns:m="using:SourceGit.Models" xmlns:v="using:SourceGit.Views" xmlns:vm="using:SourceGit.ViewModels" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="520" d:DesignHeight="230" x:Class="SourceGit.Views.ConfigureCustomActionControls" x:DataType="vm:ConfigureCustomActionControls" @@ -21,11 +22,18 @@ BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}" PointerPressed="BeginMoveWindow"/> - + + + + + + + + - + - + @@ -64,9 +72,16 @@ - - - + + + + + + + + + + @@ -77,43 +92,78 @@ - + - + + + + + + + + @@ -123,11 +173,11 @@ - + - - + + @@ -135,20 +185,20 @@ - - + - - - @@ -157,24 +207,24 @@ - - - - - + @@ -202,8 +252,8 @@ Text="{DynamicResource Text.ConfigureCustomActionControls.IsFolder}" IsVisible="{Binding Type, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:CustomActionControlType.PathSelector}}"/> @@ -213,3 +263,5 @@ + + diff --git a/src/Views/ConfigureWorkspace.axaml b/src/Views/ConfigureWorkspace.axaml index aef9515f91..a812d1b981 100644 --- a/src/Views/ConfigureWorkspace.axaml +++ b/src/Views/ConfigureWorkspace.axaml @@ -4,6 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" x:Class="SourceGit.Views.ConfigureWorkspace" x:DataType="vm:ConfigureWorkspace" @@ -13,18 +14,25 @@ SizeToContent="WidthAndHeight" CanResize="False" WindowStartupLocation="CenterOwner"> - + - + + + + + + + + - + - + @@ -63,15 +71,29 @@ - - - - + + + + + + + + + + + + + + + + + + @@ -79,37 +101,65 @@ - + @@ -118,20 +168,27 @@ - - - + + + - - + + - - + + + diff --git a/src/Views/Confirm.axaml b/src/Views/Confirm.axaml index 6f2dbd6dc7..e65a4b8954 100644 --- a/src/Views/Confirm.axaml +++ b/src/Views/Confirm.axaml @@ -3,6 +3,7 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:v="using:SourceGit.Views" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.Confirm" x:Name="ThisControl" @@ -18,11 +19,18 @@ BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}" PointerPressed="BeginMoveWindow"/> - + + + + + + + + - + - + - - - + + + + + + + + + + + diff --git a/src/Views/ConventionalCommitMessageBuilder.axaml b/src/Views/ConventionalCommitMessageBuilder.axaml index a64037f820..8ed6eab56e 100644 --- a/src/Views/ConventionalCommitMessageBuilder.axaml +++ b/src/Views/ConventionalCommitMessageBuilder.axaml @@ -5,6 +5,7 @@ xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.ConventionalCommitMessageBuilder" x:DataType="vm:ConventionalCommitMessageBuilder" @@ -15,18 +16,25 @@ SizeToContent="Height" CanResize="False" WindowStartupLocation="CenterOwner"> - + - + + + + + + + + - + - - + + @@ -63,7 +71,7 @@ - + @@ -71,7 +79,7 @@ - + @@ -82,31 +90,31 @@ @@ -150,8 +158,8 @@ - + @@ -84,7 +106,14 @@ - + + + + + + + + - + + + + + + + + - + + + + + + + + - - + + + + + + + + - + + + + + + + + - + + + + + + + + - + + + + + + + + @@ -207,19 +305,23 @@ FontSize="18" FontWeight="Bold" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/> - + + + + + + + + - - + + - - - - - + + + - - + @@ -232,19 +334,23 @@ FontSize="18" FontWeight="Bold" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/> - + + + + + + + + - - + + - - - - - + + + - - + @@ -254,15 +360,15 @@ - - - + + + @@ -277,17 +383,31 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -344,8 +464,15 @@ - - + + + + + + + + - + @@ -22,11 +23,18 @@ DoubleTapped="MaximizeOrRestoreWindow" PointerPressed="BeginMoveWindow"/> - + + + + + + + + - - + + + + + + + + + - + - - + + @@ -58,7 +73,7 @@ @@ -81,11 +96,11 @@ - - - - - + + + + + @@ -109,19 +124,19 @@ - + @@ -133,3 +148,5 @@ + + diff --git a/src/Views/Discard.axaml b/src/Views/Discard.axaml index 8aee9a1cc6..d4f306fa54 100644 --- a/src/Views/Discard.axaml +++ b/src/Views/Discard.axaml @@ -4,20 +4,21 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" xmlns:c="using:SourceGit.Converters" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" x:Class="SourceGit.Views.Discard" x:DataType="vm:Discard"> - + - + - + - - - + + + + + + + + + @@ -45,23 +53,37 @@ - + - - + + + + + + + + + - - - + + + + + + + + + @@ -70,23 +92,37 @@ - + - + + + + + + + + + Margin="{console:OnPlatform Default='4,0,0,0', Console='1,0,0,0'}"/> - - - + + + + + + + + + @@ -97,3 +133,5 @@ + + diff --git a/src/Views/DropStash.axaml b/src/Views/DropStash.axaml index aa5de85aa5..85ea14ca5f 100644 --- a/src/Views/DropStash.axaml +++ b/src/Views/DropStash.axaml @@ -3,28 +3,38 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" x:Class="SourceGit.Views.DropStash" x:DataType="vm:DropStash"> - + - + - - + + + + + + + + - + + diff --git a/src/Views/EditRemote.axaml b/src/Views/EditRemote.axaml index 10e840198e..599517d969 100644 --- a/src/Views/EditRemote.axaml +++ b/src/Views/EditRemote.axaml @@ -4,53 +4,63 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" x:Class="SourceGit.Views.EditRemote" x:DataType="vm:EditRemote"> - + - + - + - @@ -58,3 +68,4 @@ + diff --git a/src/Views/EditRepositoryNode.axaml b/src/Views/EditRepositoryNode.axaml index 615e3f1105..eac693af0e 100644 --- a/src/Views/EditRepositoryNode.axaml +++ b/src/Views/EditRepositoryNode.axaml @@ -6,10 +6,11 @@ xmlns:c="using:SourceGit.Converters" xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.EditRepositoryNode" x:DataType="vm:EditRepositoryNode"> - + - - + + - - - + + + - - + + - - + + + + + + + + + @@ -50,3 +58,4 @@ + diff --git a/src/Views/ExecuteCustomAction.axaml b/src/Views/ExecuteCustomAction.axaml index 5329794f30..38c16600a7 100644 --- a/src/Views/ExecuteCustomAction.axaml +++ b/src/Views/ExecuteCustomAction.axaml @@ -5,56 +5,92 @@ xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" xmlns:c="using:SourceGit.Converters" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" x:Class="SourceGit.Views.ExecuteCustomAction" x:DataType="vm:ExecuteCustomAction" Loaded="OnLoaded"> - + - + + Margin="{console:OnPlatform Default='0,0,8,0', Console='0,0,1,0'}"/> - - + + + + + + + + + - - + + + + + + + + + - - - + + + + + + + + + + - - + + + + + + + + + - - - + + + + + + + + + + @@ -71,23 +107,24 @@ - + + Margin="{console:OnPlatform Default='0,0,8,0', Console='0,0,1,0'}"/> - + @@ -95,19 +132,26 @@ - + + Margin="{console:OnPlatform Default='0,0,8,0', Console='0,0,1,0'}"/> - @@ -115,20 +159,20 @@ - + + Margin="{console:OnPlatform Default='0,0,8,0', Console='0,0,1,0'}"/> + + diff --git a/src/Views/Fetch.axaml b/src/Views/Fetch.axaml index c38fdb7e48..9a8a82e238 100644 --- a/src/Views/Fetch.axaml +++ b/src/Views/Fetch.axaml @@ -4,20 +4,24 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" x:Class="SourceGit.Views.Fetch" x:DataType="vm:Fetch"> - + - + @@ -30,7 +34,14 @@ - + + + + + + + + @@ -43,7 +54,7 @@ ToolTip.Tip="--force"/> + + diff --git a/src/Views/FetchInto.axaml b/src/Views/FetchInto.axaml index 4a0c0966a0..0318698095 100644 --- a/src/Views/FetchInto.axaml +++ b/src/Views/FetchInto.axaml @@ -3,19 +3,35 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" x:Class="SourceGit.Views.FetchInto" x:DataType="vm:FetchInto"> - + - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Views/FileHistories.axaml b/src/Views/FileHistories.axaml index b7914c3d2b..c29f94a273 100644 --- a/src/Views/FileHistories.axaml +++ b/src/Views/FileHistories.axaml @@ -6,6 +6,7 @@ xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" xmlns:c="using:SourceGit.Converters" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.FileHistories" x:DataType="vm:FileHistories" @@ -13,7 +14,7 @@ Icon="/App.ico" Title="{DynamicResource Text.FileHistory}" MinWidth="1280" MinHeight="720"> - + @@ -22,11 +23,18 @@ DoubleTapped="MaximizeOrRestoreWindow" PointerPressed="BeginMoveWindow"/> - + + + + + + + + - - + + + + + + + + + @@ -49,15 +64,15 @@ - - + + @@ -80,11 +95,11 @@ - - - + + + - + @@ -116,22 +131,22 @@ - - + + - + - + - + @@ -139,21 +154,28 @@ - + - - + + + + + + + + + @@ -163,16 +185,30 @@ Converter="{x:Static c:ObjectConverters.IsTypeOf}" ConverterParameter="{x:Type m:RevisionTextFile}"/> - + + + + + + + + @@ -186,7 +222,7 @@ - + - - + @@ -243,13 +293,20 @@ - + + + + + + + + @@ -259,17 +316,26 @@ - - + + + + + + + + + + + diff --git a/src/Views/FilterModeInGraph.axaml b/src/Views/FilterModeInGraph.axaml index d8d4b165e5..e675619691 100644 --- a/src/Views/FilterModeInGraph.axaml +++ b/src/Views/FilterModeInGraph.axaml @@ -3,10 +3,11 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.FilterModeInGraph" x:DataType="vm:FilterModeInGraph"> - + - + + + + + + + + - + + + + + + + + + diff --git a/src/Views/FilterModeSwitchButton.axaml b/src/Views/FilterModeSwitchButton.axaml index 7e3b21d736..2a87eff170 100644 --- a/src/Views/FilterModeSwitchButton.axaml +++ b/src/Views/FilterModeSwitchButton.axaml @@ -3,31 +3,55 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:m="using:SourceGit.Models" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.FilterModeSwitchButton" x:Name="ThisControl"> + diff --git a/src/Views/GitFlowFinish.axaml b/src/Views/GitFlowFinish.axaml index 43fde72d27..f850b0c467 100644 --- a/src/Views/GitFlowFinish.axaml +++ b/src/Views/GitFlowFinish.axaml @@ -4,10 +4,11 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" x:Class="SourceGit.Views.GitFlowFinish" x:DataType="vm:GitFlowFinish"> - + - + - - + + + + + + + + + + + diff --git a/src/Views/GitFlowStart.axaml b/src/Views/GitFlowStart.axaml index 9a22e045a1..9b86c2e057 100644 --- a/src/Views/GitFlowStart.axaml +++ b/src/Views/GitFlowStart.axaml @@ -5,10 +5,11 @@ xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" x:Class="SourceGit.Views.GitFlowStart" x:DataType="vm:GitFlowStart"> - + - + diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml index 36d302fdd4..d492e9fc12 100644 --- a/src/Views/Histories.axaml +++ b/src/Views/Histories.axaml @@ -6,6 +6,7 @@ xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" xmlns:c="using:SourceGit.Converters" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.Histories" x:DataType="vm:Histories" @@ -13,13 +14,13 @@ - + - + @@ -35,10 +36,10 @@ AutoGenerateColumns="False" IsReadOnly="True" HeadersVisibility="Column" - ColumnHeaderHeight="24" + ColumnHeaderHeight="{console:OnPlatform Default='24', Console='2'}" ClipboardCopyMode="None" Focusable="False" - RowHeight="26" + RowHeight="{console:OnPlatform Default='26', Console='2'}" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Loaded="OnCommitListLoaded" @@ -53,15 +54,15 @@ @@ -79,13 +101,13 @@ - + - - + + - - + + @@ -101,33 +123,47 @@ - + + + + + + + + - - + - + @@ -159,7 +195,7 @@ @@ -167,7 +203,7 @@ - + - + + + + + + + + @@ -195,19 +238,19 @@ - + - @@ -105,8 +134,15 @@ - - + + + + + + + + + @@ -116,3 +152,5 @@ + + diff --git a/src/Views/LFSPrune.axaml b/src/Views/LFSPrune.axaml index a8ada7100a..8d6e6824a6 100644 --- a/src/Views/LFSPrune.axaml +++ b/src/Views/LFSPrune.axaml @@ -2,15 +2,16 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.LFSPrune"> - + - + \ No newline at end of file diff --git a/src/Views/LFSPull.axaml b/src/Views/LFSPull.axaml index 39b92c4a6a..4bcff9bcca 100644 --- a/src/Views/LFSPull.axaml +++ b/src/Views/LFSPull.axaml @@ -4,28 +4,39 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.LFSPull" x:DataType="vm:LFSPull"> - + - + - + + + + + + + + @@ -34,8 +45,10 @@ + + diff --git a/src/Views/LFSPush.axaml b/src/Views/LFSPush.axaml index f67f4acaaa..64b35172ad 100644 --- a/src/Views/LFSPush.axaml +++ b/src/Views/LFSPush.axaml @@ -4,28 +4,39 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.LFSPush" x:DataType="vm:LFSPush"> - + - + - - + + + + + + + + + @@ -34,8 +45,10 @@ + + diff --git a/src/Views/LFSTrackCustomPattern.axaml b/src/Views/LFSTrackCustomPattern.axaml index f60304d5df..8df4e5bad0 100644 --- a/src/Views/LFSTrackCustomPattern.axaml +++ b/src/Views/LFSTrackCustomPattern.axaml @@ -4,22 +4,25 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.LFSTrackCustomPattern" x:DataType="vm:LFSTrackCustomPattern"> - + - + diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml index 1e5fcfdc82..31f870bf15 100644 --- a/src/Views/Launcher.axaml +++ b/src/Views/Launcher.axaml @@ -5,6 +5,7 @@ xmlns:s="using:SourceGit" xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.Launcher" x:DataType="vm:Launcher" @@ -31,65 +32,121 @@ - - - + - - + + @@ -108,8 +165,8 @@ IsVisible="{Binding Switcher, Converter={x:Static ObjectConverters.IsNotNull}}" PointerPressed="OnCancelSwitcher"> - - + + @@ -125,3 +182,5 @@ + + diff --git a/src/Views/LauncherPage.axaml b/src/Views/LauncherPage.axaml index 82fa5efb8b..0ce3752781 100644 --- a/src/Views/LauncherPage.axaml +++ b/src/Views/LauncherPage.axaml @@ -6,10 +6,11 @@ xmlns:v="using:SourceGit.Views" xmlns:vm="using:SourceGit.ViewModels" xmlns:c="using:SourceGit.Converters" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.LauncherPage" x:DataType="vm:LauncherPage"> - + @@ -56,9 +57,9 @@ @@ -66,31 +67,31 @@ - - - @@ -129,25 +137,53 @@ - - - - - - - - - - @@ -161,3 +197,5 @@ + + diff --git a/src/Views/LauncherPageSwitcher.axaml b/src/Views/LauncherPageSwitcher.axaml index b52feef0cc..130adf0ad9 100644 --- a/src/Views/LauncherPageSwitcher.axaml +++ b/src/Views/LauncherPageSwitcher.axaml @@ -5,43 +5,58 @@ xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" xmlns:c="using:SourceGit.Converters" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.LauncherPageSwitcher" x:DataType="vm:LauncherPageSwitcher"> - + - + + + + + + + + @@ -50,7 +65,7 @@ x:Name="PagesListBox" Width="300" MaxHeight="400" - Margin="4,8,4,0" + Margin="{console:OnPlatform Default='4,8,4,0', Console='1,1,1,0'}" BorderThickness="0" SelectionMode="Single" Background="Transparent" @@ -61,9 +76,9 @@ SelectedItem="{Binding SelectedPage, Mode=TwoWay}"> @@ -47,17 +50,31 @@ - - - + + + + + + + ๐Ÿ—‘๏ธ + + + - - + + + + + + + + + @@ -68,18 +85,18 @@ - + - + @@ -91,3 +108,5 @@ + + diff --git a/src/Views/MoveRepositoryNode.axaml b/src/Views/MoveRepositoryNode.axaml index fb11cf3e4d..499cf45255 100644 --- a/src/Views/MoveRepositoryNode.axaml +++ b/src/Views/MoveRepositoryNode.axaml @@ -4,28 +4,29 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" xmlns:c="using:SourceGit.Converters" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.MoveRepositoryNode" x:DataType="vm:MoveRepositoryNode"> - + - - + + @@ -595,9 +671,16 @@ - - - + + + + + + + + + + @@ -605,46 +688,81 @@ - + - + - + + + + + + + + @@ -653,10 +771,10 @@ - + - - + + @@ -664,35 +782,56 @@ - - - - + + - - - - - - + + + + + + + + + + + + - + @@ -705,7 +844,7 @@ - + @@ -714,7 +853,7 @@ - + - + @@ -736,9 +875,16 @@ - - - + + + + + + + + + + @@ -748,13 +894,27 @@ @@ -762,15 +922,22 @@ - + - + + + + + + + + @@ -779,36 +946,39 @@ - + - - + + - - + + - - + + + - + - + - diff --git a/src/Views/PruneRemote.axaml b/src/Views/PruneRemote.axaml index fe110bd21d..079d497212 100644 --- a/src/Views/PruneRemote.axaml +++ b/src/Views/PruneRemote.axaml @@ -3,17 +3,27 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.PruneRemote" x:DataType="vm:PruneRemote"> - + - + - + + + + + + + + + + diff --git a/src/Views/PruneWorktrees.axaml b/src/Views/PruneWorktrees.axaml index a3a0f770e5..24c5ea839c 100644 --- a/src/Views/PruneWorktrees.axaml +++ b/src/Views/PruneWorktrees.axaml @@ -2,14 +2,15 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.PruneWorktrees"> - + - + \ No newline at end of file diff --git a/src/Views/Pull.axaml b/src/Views/Pull.axaml index df1fe4d6ec..edec16907b 100644 --- a/src/Views/Pull.axaml +++ b/src/Views/Pull.axaml @@ -4,37 +4,46 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" x:Class="SourceGit.Views.Pull" x:DataType="vm:Pull"> - + - + - - - - - + + + + + - - + + + + + + + + + @@ -43,11 +52,11 @@ - - + + + + + + + + + @@ -65,20 +81,27 @@ - - + + + + + + + + + + diff --git a/src/Views/Push.axaml b/src/Views/Push.axaml index ae015c888f..6bc00ba60a 100644 --- a/src/Views/Push.axaml +++ b/src/Views/Push.axaml @@ -4,22 +4,26 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450" x:Class="SourceGit.Views.Push" x:DataType="vm:Push"> - + - + - - + + + + + + + + + @@ -37,17 +48,25 @@ - - + + + + + + + + + @@ -56,23 +75,31 @@ - - + + + + + + + + + - @@ -84,14 +111,14 @@ + + diff --git a/src/Views/PushRevision.axaml b/src/Views/PushRevision.axaml index 092212c15d..ae27c493ab 100644 --- a/src/Views/PushRevision.axaml +++ b/src/Views/PushRevision.axaml @@ -4,47 +4,67 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" xmlns:c="using:SourceGit.Converters" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.PushRevision" x:DataType="vm:PushRevision"> - + - + - - + + + + + + + ๐Ÿ“ + + + Margin="{console:OnPlatform Default='8,0,0,0', Console='1,0,0,0'}"/> - - + + + + + + + + + + ToolTip.Tip="--force-with-lease" + Height="{console:OnPlatform Default='32', Console='3'}"/> + + diff --git a/src/Views/PushTag.axaml b/src/Views/PushTag.axaml index 1181e4e8bf..8c729a51c3 100644 --- a/src/Views/PushTag.axaml +++ b/src/Views/PushTag.axaml @@ -4,38 +4,56 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.PushTag" x:DataType="vm:PushTag"> - + - + - - + + + + + + + + + - - + + + + + + + + + @@ -48,3 +66,5 @@ + + diff --git a/src/Views/Rebase.axaml b/src/Views/Rebase.axaml index 91c1fab278..66577cad4e 100644 --- a/src/Views/Rebase.axaml +++ b/src/Views/Rebase.axaml @@ -5,41 +5,65 @@ xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" xmlns:c="using:SourceGit.Converters" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.Rebase" x:DataType="vm:Rebase"> - + - + - - + + + + + + + + + - - + + + + + + + + + - - - - + + + + + + + + + + + @@ -51,3 +75,5 @@ + + diff --git a/src/Views/RemoveWorktree.axaml b/src/Views/RemoveWorktree.axaml index 736e6e4095..67b98e8386 100644 --- a/src/Views/RemoveWorktree.axaml +++ b/src/Views/RemoveWorktree.axaml @@ -3,21 +3,31 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.RemoveWorktree" x:DataType="vm:RemoveWorktree"> - + - + - - + + + + + + + + + @@ -29,3 +39,4 @@ + diff --git a/src/Views/RenameBranch.axaml b/src/Views/RenameBranch.axaml index efbbf32337..4d9870181a 100644 --- a/src/Views/RenameBranch.axaml +++ b/src/Views/RenameBranch.axaml @@ -5,31 +5,41 @@ xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" xmlns:c="using:SourceGit.Converters" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.RenameBranch" x:DataType="vm:RenameBranch"> - + - + - - + + + + + + + + + @@ -37,9 +47,18 @@ - - + + + + + + + + + + + diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml index 07567752f4..9d5d447847 100644 --- a/src/Views/Repository.axaml +++ b/src/Views/Repository.axaml @@ -6,20 +6,21 @@ xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" xmlns:c="using:SourceGit.Converters" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.Repository" x:DataType="vm:Repository"> - + - + - + + + + + + + + - + + + + + + + + - + - - + + - - + diff --git a/src/Views/RevisionFiles.axaml b/src/Views/RevisionFiles.axaml index 0583c35a86..e216d5ca61 100644 --- a/src/Views/RevisionFiles.axaml +++ b/src/Views/RevisionFiles.axaml @@ -6,38 +6,53 @@ xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" xmlns:c="using:SourceGit.Converters" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.RevisionFiles" x:DataType="vm:CommitDetail"> - + - - + + - + + + + + + + + @@ -52,8 +67,8 @@ - - + + - - - - + - - + + + + + + + + + - + @@ -99,38 +118,41 @@ - - + - - - + - - + + + + + + + + + - @@ -140,12 +162,18 @@ Converter="{x:Static c:ObjectConverters.IsTypeOf}" ConverterParameter="{x:Type m:RevisionTextFile}"/> - + + + + + + + + - - + + diff --git a/src/Views/Reword.axaml b/src/Views/Reword.axaml index 5811eb7740..eb5d8ce22d 100644 --- a/src/Views/Reword.axaml +++ b/src/Views/Reword.axaml @@ -5,19 +5,29 @@ xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" xmlns:c="using:SourceGit.Converters" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.Reword" x:DataType="vm:Reword"> - + - - + + + + + + + + + - + + + diff --git a/src/Views/ScanRepositories.axaml b/src/Views/ScanRepositories.axaml index b9e87b46bd..eb6a1a9803 100644 --- a/src/Views/ScanRepositories.axaml +++ b/src/Views/ScanRepositories.axaml @@ -4,35 +4,46 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.ScanRepositories" x:DataType="vm:ScanRepositories"> - + - + - - + + + + + + + + + - + - - + + @@ -41,3 +52,5 @@ + + diff --git a/src/Views/SelfUpdate.axaml b/src/Views/SelfUpdate.axaml index 2d5990e703..0a440d3b35 100644 --- a/src/Views/SelfUpdate.axaml +++ b/src/Views/SelfUpdate.axaml @@ -5,6 +5,7 @@ xmlns:m="using:SourceGit.Models" xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.SelfUpdate" x:DataType="vm:SelfUpdate" @@ -21,11 +22,18 @@ BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}" PointerPressed="BeginMoveWindow"/> - + + + + + + + + - - - - - - + + + + + + + + + + + + + @@ -61,25 +76,39 @@ @@ -87,15 +116,22 @@ - - - - + + + + + + + + + + + @@ -70,9 +92,9 @@ ScrollViewer.VerticalScrollBarVisibility="Auto"> @@ -86,14 +108,14 @@ - + - - + + + + + + + + + @@ -144,11 +173,18 @@ BorderBrush="{DynamicResource Brush.Border0}"/> - + - - + + + + + + + + + + diff --git a/src/Views/Statistics.axaml b/src/Views/Statistics.axaml index 342a618109..99dd215bf0 100644 --- a/src/Views/Statistics.axaml +++ b/src/Views/Statistics.axaml @@ -6,6 +6,7 @@ xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" xmlns:lvc="using:LiveChartsCore.SkiaSharpView.Avalonia" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.Statistics" x:DataType="vm:Statistics" @@ -14,18 +15,25 @@ Width="800" Height="500" WindowStartupLocation="CenterOwner" CanResize="False"> - + - + - + + + + + + + + + CornerRadius="{console:OnPlatform Default='14', Console='0'}" + Padding="{console:OnPlatform Default='3,0', Console='1,0'}"> @@ -57,7 +65,7 @@ @@ -71,8 +79,8 @@ @@ -117,25 +125,32 @@ - - + - - + + @@ -165,15 +180,15 @@ - + - + - + @@ -183,25 +198,25 @@ - + - + - + @@ -212,8 +227,10 @@ + + diff --git a/src/Views/SubmodulesView.axaml b/src/Views/SubmodulesView.axaml index 4e21088fdc..7d05112020 100644 --- a/src/Views/SubmodulesView.axaml +++ b/src/Views/SubmodulesView.axaml @@ -6,6 +6,7 @@ xmlns:v="using:SourceGit.Views" xmlns:vm="using:SourceGit.ViewModels" xmlns:c="using:SourceGit.Converters" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.SubmodulesView"> @@ -13,7 +14,7 @@ @@ -21,20 +22,34 @@ - - + + + + + + ๐Ÿ—ƒ + + + - + - - + Margin="{console:OnPlatform Default='8,0,0,0', Console='1,0,0,0'}"> + + + + + + + + + - + Margin="{console:OnPlatform Default='8,0,0,0', Console='1,0,0,0'}"> + + + + + + ๐Ÿ“ + + - - + + + + + + โœ“ + + @@ -105,7 +134,7 @@ ContextRequested="OnItemContextRequested" ToolTip.Tip="{Binding Module}" ToolTip.Placement="Right"> - - + + + + + + โš  + + @@ -143,7 +179,7 @@ @@ -157,20 +193,34 @@ - - + + + + + + ๐Ÿ—ƒ + + + - + - - + Margin="{console:OnPlatform Default='8,0,0,0', Console='1,0,0,0'}"> + + + + + + + + + - + Margin="{console:OnPlatform Default='8,0,0,0', Console='1,0,0,0'}"> + + + + + + ๐Ÿ“ + + - - + + + + + + โœ“ + + - - + + + + + + + ๐Ÿ—ƒ + + - + + + + + + โš  + + @@ -248,3 +326,5 @@ + + diff --git a/src/Views/TagsView.axaml b/src/Views/TagsView.axaml index bc1aee4e4b..88dc195fc3 100644 --- a/src/Views/TagsView.axaml +++ b/src/Views/TagsView.axaml @@ -6,6 +6,7 @@ xmlns:v="using:SourceGit.Views" xmlns:vm="using:SourceGit.ViewModels" xmlns:c="using:SourceGit.Converters" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.TagsView"> @@ -24,19 +25,19 @@ ContextRequested="OnTagsContextMenuRequested"> - - + Margin="{console:OnPlatform Default='8,0,0,0', Console='1,0,0,0'}"> - + @@ -66,7 +67,7 @@ - - - + + + + + + + + + - + @@ -106,26 +114,33 @@ - + - - - - + + + + + + + + + + + - + - + - + @@ -139,7 +154,7 @@ HorizontalAlignment="Left" VerticalAlignment="Center" Text="{DynamicResource Text.Tag.Time}"/> @@ -148,3 +163,5 @@ + + diff --git a/src/Views/TextDiffView.axaml b/src/Views/TextDiffView.axaml index d7a9e43ec0..85ccb8f66f 100644 --- a/src/Views/TextDiffView.axaml +++ b/src/Views/TextDiffView.axaml @@ -4,6 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SourceGit.ViewModels" xmlns:v="using:SourceGit.Views" + xmlns:console="https://github.com/jinek/consolonia" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" x:Class="SourceGit.Views.TextDiffView" x:DataType="vm:TextDiffContext" @@ -12,7 +13,7 @@ - + - + - @@ -53,7 +68,7 @@