Skip to content

Commit

Permalink
Added menu and ribbon for search. #31
Browse files Browse the repository at this point in the history
  • Loading branch information
@waliarubal
waliarubal committed Feb 4, 2020
1 parent 49d9b52 commit d044847
Show file tree
Hide file tree
Showing 3 changed files with 211 additions and 11 deletions.
67 changes: 67 additions & 0 deletions Jaya.Ui/Styles/IconStyles.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,73 @@
<GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M13.6943,9.6094L11.2193,12.0844 8.0003,8.8644 4.7803,12.0844 2.3053,9.6094 8.0003,3.9154z" />
<GeometryDrawing Brush="#FF424242" Geometry="F1M12.2803,9.6094L11.2193,10.6704 8.0003,7.4504 4.7803,10.6704 3.7193,9.6094 8.0003,5.3294z" />
</DrawingGroup>
<DrawingGroup x:Key="Icon.SubFolders">
<GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
<GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M3.9927,7L5.0807,7C5.0257,7.156,4.9897,7.322,4.9887,7.498L4.9877,8.076 4.7567,7.846 3.9927,8.611z M2.7357,12.874L2.6237,12.985 4.7567,15.119 5.0257,14.852C5.1687,15.441,5.6647,15.877,6.2727,15.964L14.7097,15.964C15.2947,15.878,15.7687,15.466,15.9287,14.907L15.9287,9.087C15.8597,8.846 15.7427,8.622 15.5607,8.44 15.2777,8.157 14.9007,8.001 14.4977,8.001L12.6157,8.003 11.6047,6 7.9997,6 7.9997,0.0359999999999996 0.0357000000000003,0.0359999999999996 0.0357000000000003,7 0.9997,7 0.9997,10.489C1.0017,11.49,1.6047,12.545,2.7357,12.874" />
<GeometryDrawing Brush="#FF424242" Geometry="F1M6,5L2,5 2,2 6,2z M1,6L7,6 7,1 1,1z" />
<GeometryDrawing Brush="#FFDBB679" Geometry="F1M7,9L7,8 9.989,8 10.489,9z M15,9.501C15,9.225,14.775,9,14.499,9.001L12,9.004 10.989,7 6.489,7C6.213,7,5.989,7.224,5.989,7.499L5.986,9.072 8.414,11.5 5.98,13.935 5.979,14.499C5.979,14.775,6.203,15,6.479,15L14.5,15C14.776,15,15,14.776,15,14.5z" />
<GeometryDrawing Brush="#FF00529C" Geometry="F1M6.9946,11.4844L4.7586,13.7074 4.0376,12.9854 5.0406,11.9814 3.4886,11.9774 3.4886,11.9764C2.3986,11.9754,2.0006,11.0864,1.9996,10.4874L1.9996,7.0004 2.9926,7.0004 2.9926,10.4804C2.9986,10.7104,3.0896,10.9844,3.4896,10.9844L5.0406,10.9844 4.0376,9.9804 4.7586,9.2584z" />
</DrawingGroup>
<DrawingGroup x:Key="Icon.FindInFiles">
<GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
<GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M2,0L9.116,0 10.116,2 13,2C13.97,2,15,2.951,15,4.25L15,6 16,6 16,7.446 14.618,10.748 16,12.129 16,13.957 14.958,15 14.043,15 12.042,13 11.606,13C11.487,13.014,10.966,13.019,10.825,13L2,13C2,13 1.14,13.104 0.57,12.56 0.227,12.228 0,11.867 0,11.25L0,2.25C0,0.947,1.005,0,2,0" />
<GeometryDrawing Brush="#FFDBB679" Geometry="F1M9.6162,7L5.0002,7 2.0002,12 8.8792,12C8.3382,11.419 8.0002,10.647 8.0002,9.793 8.0002,8.6 8.6542,7.565 9.6162,7 M2.0002,1L8.5002,1 9.5002,3 13.0002,3C13.0002,3,14.0002,3.25,14.0002,4.25L14.0002,7 15.0002,7 14.3072,8.732C14.0522,7.998,13.5452,7.388,12.8842,7L13.0002,7 13.0002,4 9.0002,4 8.0002,2 2.0002,2 2.0002,12C2.0002,12,1.0002,11.944,1.0002,10.944L1.0002,2.25C1.0002,1.25,2.0002,1,2.0002,1" />
<GeometryDrawing Brush="#FF00529C" Geometry="F1M10,9.793C10,9.103 10.56,8.543 11.25,8.543 11.94,8.543 12.5,9.103 12.5,9.793 12.5,10.483 11.94,11.043 11.25,11.043 10.56,11.043 10,10.483 10,9.793 M9,9.793C9,11.035 10.007,12.043 11.25,12.043 11.613,12.043 11.95,11.949 12.253,11.797L14.5,14.043 15.499,13.043 13.253,10.797C13.406,10.493 13.5,10.155 13.5,9.793 13.5,8.551 12.492,7.543 11.25,7.543 10.007,7.543 9,8.551 9,9.793" />
</DrawingGroup>
<DrawingGroup x:Key="Icon.ContentType">
<GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
<GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M1,15L16,15 16,0 1,0z" />
<GeometryDrawing Brush="#FF414141" Geometry="F1M14,13L3,13 3,2 14,2z M2,14L15,14 15,1 2,1z" />
<GeometryDrawing Brush="#FF378A33" Geometry="F1M5,4L11.999,4 11.999,3 5,3z" />
<GeometryDrawing Brush="#FF378A33" Geometry="F1M7,7L6,7 6,6 7,6z M8,5L5,5 5,8 8,8z" />
<GeometryDrawing Brush="#FF378A33" Geometry="F1M10,6L11,6 11,7 10,7z M9,8L12,8 12,5 9,5z" />
<GeometryDrawing Brush="#FF378A33" Geometry="F1M7,11L6,11 6,10 7,10z M8,9L5,9 5,12 8,12z" />
<GeometryDrawing Brush="#FF378A33" Geometry="F1M10,10L11,10 11,11 10,11z M9,12L12,12 12,9 9,9z" />
<GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M6,7L7,7 7,6 6,6z" />
<GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M10,7L11,7 11,6 10,6z" />
<GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M6,11L7,11 7,10 6,10z" />
<GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M12,4L5,4 5,3 12,3z M12,8L9,8 9,5 12,5z M12,12L9,12 9,9 12,9z M8,8L5,8 5,5 8,5z M8,12L5,12 5,9 8,9z M3,13L14,13 14,2 3,2z" />
<GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M10,11L11,11 11,10 10,10z" />
</DrawingGroup>
<DrawingGroup x:Key="Icon.History">
<GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
<GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M16,8C16,12.418 12.418,16 8,16 7.98,16 7.96,15.997 7.94,15.997 7.919,15.997 7.9,16 7.879,16 7.817,16 7.758,15.986 7.695,15.985 7.439,15.975 7.185,15.954 6.936,15.921 3.755,15.538 1.045,13.278 0.175000000000001,10.133L0,9.5 0,9.143 0,3 0,1 3,1 3,1.68C4.133,0.795 5.491,0.252 6.935,0.0789999999999997 7.185,0.0460000000000003 7.439,0.0250000000000004 7.696,0.0149999999999997 7.758,0.0140000000000002 7.817,0 7.879,0 7.9,0 7.919,0.00300000000000011 7.94,0.00300000000000011 7.96,0.00300000000000011 7.98,0 8,0 12.418,0 16,3.582 16,8" />
<GeometryDrawing Brush="#FF424242" Geometry="F1M10.3701,10.6641L8.0001,8.0571 8.0001,4.0001 7.0001,4.0001 7.0001,8.4431 9.6301,11.3361 10.3701,10.6641z" />
<GeometryDrawing Brush="#FF329932" Geometry="F1M14.8799,8C14.8799,11.859 11.7389,15 7.8789,15 4.7459,15 1.9739,12.889 1.1389,9.866L2.1029,9.601C2.8179,12.19 5.1939,14 7.8799,14 11.1889,14 13.8799,11.309 13.8799,8 13.8799,4.691 11.1889,2 7.8789,2 5.7209,2 3.7609,3.174 2.7019,5L4.9999,5 4.9999,6 0.999899999999998,6 0.999899999999998,2 1.9999,2 1.9999,4.25C3.2659,2.267 5.4629,1 7.8789,1 11.7389,1 14.8799,4.14 14.8799,8" />
</DrawingGroup>
<DrawingGroup x:Key="Icon.CodeFile">
<GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
<GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M4,15C3.03,15,2,14.299,2,13L2,3C2,1.701,3.03,1,4,1L10.061,1 14,4.556 14,13C14,13.97,13.299,15,12,15z" />
<GeometryDrawing Brush="#FF672777" Geometry="F1M12,13L4,13 4,3 9,3 9,6 12,6z M9.641,2L3.964,2C3.964,2,3,2,3,3L3,13C3,14,3.965,14,3.965,14L11.965,14C12.965,14,13,13,13,13L13,5z" />
<GeometryDrawing Brush="#FF672777" Geometry="F1M6.5059,11.3359C6.1189,11.3359 5.9259,10.8999 5.9259,10.0309 5.9259,9.1089 6.1229,8.6479 6.5179,8.6479 6.8869,8.6479 7.0709,9.0959 7.0709,9.9919 7.0709,10.8869 6.8829,11.3359 6.5059,11.3359 M6.5579,7.9999C6.0519,7.9999 5.6659,8.1759 5.3999,8.5249 5.1329,8.8759 4.9999,9.3849 4.9999,10.0529 4.9999,11.3399 5.4919,11.9859 6.4769,11.9859 6.9669,11.9859 7.3439,11.8129 7.6059,11.4649 7.8689,11.1169 7.9999,10.6169 7.9999,9.9649 7.9999,8.6539 7.5199,7.9999 6.5579,7.9999" />
<GeometryDrawing Brush="#FF672777" Geometry="F1M8.957,8.3672C8.866,8.4152,8.763,8.4442,8.666,8.4842L8.666,9.2562C8.706,9.2432 8.747,9.2322 8.785,9.2172 8.857,9.1852 8.924,9.1522 8.988,9.1152 9.052,9.0802 9.107,9.0402 9.153,8.9992L9.153,12.0002 10,12.0002 10,8.0352 9.486,8.0352C9.329,8.1562,9.152,8.2672,8.957,8.3672" />
<GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M6.5176,8.6484C6.1226,8.6484 5.9256,9.1094 5.9256,10.0314 5.9256,10.9004 6.1196,11.3364 6.5056,11.3364 6.8826,11.3364 7.0716,10.8864 7.0716,9.9924 7.0716,9.0954 6.8866,8.6484 6.5176,8.6484" />
<GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M10,12L9.153,12 9.153,8.999C9.107,9.04 9.052,9.08 8.988,9.115 8.924,9.152 8.857,9.186 8.785,9.217 8.747,9.232 8.706,9.243 8.666,9.256L8.666,8.484C8.763,8.444 8.866,8.415 8.957,8.367 9.152,8.268 9.329,8.156 9.486,8.035L10,8.035z M7.605,11.465C7.344,11.812 6.967,11.986 6.477,11.986 5.492,11.986 5,11.34 5,10.053 5,9.385 5.133,8.876 5.399,8.525 5.666,8.176 6.052,8 6.558,8 7.52,8 8,8.654 8,9.965 8,10.617 7.869,11.117 7.605,11.465 M9,6L9,3 4,3 4,13 12,13 12,6z" />
</DrawingGroup>
<DrawingGroup x:Key="Icon.Calendar">
<GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
<GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M1,15L16,15 16,0 1,0z" />
<GeometryDrawing Brush="#FF424242" Geometry="F1M10,8L11,8 11,7 10,7z" />
<GeometryDrawing Brush="#FF424242" Geometry="F1M8,8L9,8 9,7 8,7z" />
<GeometryDrawing Brush="#FF424242" Geometry="F1M4,12L5.001,12 5.001,10.999 4,10.999z" />
<GeometryDrawing Brush="#FF424242" Geometry="F1M12,8L13,8 13,7 12,7z" />
<GeometryDrawing Brush="#FF424242" Geometry="F1M8,10L9,10 9,9 8,9z" />
<GeometryDrawing Brush="#FF424242" Geometry="F1M8,12L9,12 9,10.999 8,10.999z" />
<GeometryDrawing Brush="#FF424242" Geometry="F1M4,10L5.001,10 5.001,9 4,9z" />
<GeometryDrawing Brush="#FF424242" Geometry="F1M6,12L7,12 7,10.999 6,10.999z" />
<GeometryDrawing Brush="#FF424242" Geometry="F1M4,8L5.001,8 5.001,7 4,7z" />
<GeometryDrawing Brush="#FF424242" Geometry="F1M6,8L7,8 7,7 6,7z" />
<GeometryDrawing Brush="#FF424242" Geometry="F1M6,10L7,10 7,9 6,9z" />
<GeometryDrawing Brush="#FF424242" Geometry="F1M15,14L2,14 2,1 15,1z" />
<GeometryDrawing Brush="#FFEFEFF0" Geometry="F1M13,7L12,7 12,8 13,8z M13,9L10,9 10,12 13,12z M9,7L8,7 8,8 9,8z M9,9L8,9 8,10 9,10z M9,11L8,11 8,12 9,12z M7,7L6,7 6,8 7,8z M7,9L6,9 6,10 7,10z M7,11L6,11 6,12 7,12z M5,7L4,7 4,8 5,8z M5,9L4,9 4,10 5,10z M5,11L4,11 4,12 5,12z M10,8L11,8 11,7 10,7z M14,13L3,13 3,6 14,6z M11,2L11,5 13,3.499z M6,5L4,3.501 6,2z" />
<GeometryDrawing Brush="#FFC17C1A" Geometry="F1M13,12L10,12 10,9 13,9z" />
</DrawingGroup>
<DrawingGroup x:Key="Icon.Save">
<GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
<GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M16,2L16,16 2.586,16 0,13.414 0,2C0,0.897,0.897,0,2,0L14,0C15.103,0,16,0.897,16,2" />
<GeometryDrawing Brush="#FFEFEFF0" Geometry="F1M4,10L4,15 6,15 6,12 8,12 8,15 12,15 12,10z M13,7L3,7 3,3 13,3z" />
<GeometryDrawing Brush="#FF00529C" Geometry="F1M13,3L3,3 3,7 13,7z M15,2L15,15 12,15 12,10 4,10 4,15 3,15 1,13 1,2C1,1.448,1.448,1,2,1L14,1C14.553,1,15,1.448,15,2 M6,12L8,12 8,15 6,15z" />
</DrawingGroup>
<Geometry x:Key="Icon.DiscClean">M 58.5833,45.9167L 58.5833,57L 19,57L 19,45.9167L 28.8998,45.9167C 31.0306,47.2793 33.6795,48.4476 36.6434,49.2418C 40.3467,50.2341 44.7079,50.4746 47.6249,50.0692L 47.6249,45.9167L 58.5833,45.9167 Z M 56.2083,48.2917L 53.4374,48.2917L 53.4374,53.0417L 56.2082,53.0417L 56.2083,48.2917 Z M 45.7433,48.2824C 43.1578,48.6418 39.9938,48.0327 36.7113,47.1532C 31.1866,45.6728 26.8965,42.7258 25.5163,39.7952L 32.2902,33.0213L 45.7433,38.0663L 45.7433,48.2824 Z M 39.2905,28.1719C 39.6351,28.1719 39.9737,28.1941 40.3047,28.2368L 46.0048,17.0498L 49.0712,18.6122L 43.5443,29.4594C 45.1454,30.5622 46.1735,32.2733 46.1735,34.1946C 46.1735,35.0197 45.9839,35.806 45.6407,36.5221L 33.4151,31.7762C 34.4796,29.6541 36.4722,28.1719 39.2905,28.1719 Z</Geometry>
<Geometry x:Key="Icon.Github">F1M513.109985351563,-874.668029785156C748.159973144531,-874.668029785156 938.6669921875,-684.161987304688 938.6669921875,-449.110992431641 938.6669921875,-261.164001464844 816.89599609375,-101.761001586914 647.851013183594,-45.3560028076172 626.133972167969,-41.173999786377 618.539001464844,-54.4010009765625 618.539001464844,-65.7929916381836 618.539001464844,-79.745002746582 619.051025390625,-125.654998779297 619.051025390625,-182.572006225586 619.051025390625,-222.251998901367 605.398010253906,-248.194000244141 590.2509765625,-261.334991455078 685.057006835938,-271.872985839844 784.469970703125,-307.799011230469 784.469970703125,-471.339996337891 784.469970703125,-517.760986328125 768.085998535156,-555.776977539063 740.778991699219,-585.473022460938 745.216003417969,-596.268005371094 759.807983398438,-639.573974609375 736.554992675781,-698.112976074219 736.554992675781,-698.112976074219 700.885986328125,-709.632995605469 619.56298828125,-654.549987792969 585.643005371094,-663.97900390625 549.291015625,-668.715026855469 513.067016601563,-668.885986328125 476.928009033203,-668.715026855469 440.618988037109,-663.97900390625 406.571014404297,-654.549987792969 325.290985107422,-709.590026855469 289.579010009766,-698.112976074219 289.579010009766,-698.112976074219 266.325988769531,-639.573974609375 281.045989990234,-596.268005371094 285.355010986328,-585.473022460938 258.260986328125,-555.776977539063 241.664001464844,-517.718994140625 241.664001464844,-471.339996337891 241.664001464844,-308.225006103516 340.992004394531,-271.701995849609 435.455993652344,-260.993011474609 423.338989257813,-250.369003295898 412.246002197266,-231.595993041992 408.363006591797,-204.07600402832 384.213012695313,-193.195999145508 322.516998291016,-174.423004150391 284.544006347656,-239.447006225586 284.544006347656,-239.447006225586 262.144012451172,-280.321014404297 219.391998291016,-283.308013916016 219.391998291016,-283.308013916016 177.835006713867,-283.906005859375 216.447998046875,-257.494995117188 216.447998046875,-257.494995117188 244.395004272461,-244.39599609375 263.679992675781,-195.244003295898 263.679992675781,-195.244003295898 288.683013916016,-112.471000671387 407.0830078125,-138.156005859375 407.210998535156,-102.699996948242 407.552001953125,-75.9049987792969 407.552001953125,-65.7929916381836 407.552001953125,-54.5289993286133 399.872009277344,-41.4300003051758 378.580993652344,-45.2699966430664 209.45100402832,-101.589996337891 87.552001953125,-261.121002197266 87.552001953125,-449.109985351563 87.552001953125,-684.159973144531 278.058013916016,-874.6669921875 513.109008789063,-874.6669921875L513.109985351563,-874.668029785156z</Geometry>
<Geometry x:Key="Icon.License">M9 10A3.04 3.04 0 0 1 12 7A3.04 3.04 0 0 1 15 10A3.04 3.04 0 0 1 12 13A3.04 3.04 0 0 1 9 10M12 19L16 20V16.92A7.54 7.54 0 0 1 12 18A7.54 7.54 0 0 1 8 16.92V20M12 4A5.78 5.78 0 0 0 7.76 5.74A5.78 5.78 0 0 0 6 10A5.78 5.78 0 0 0 7.76 14.23A5.78 5.78 0 0 0 12 16A5.78 5.78 0 0 0 16.24 14.23A5.78 5.78 0 0 0 18 10A5.78 5.78 0 0 0 16.24 5.74A5.78 5.78 0 0 0 12 4M20 10A8.04 8.04 0 0 1 19.43 12.8A7.84 7.84 0 0 1 18 15.28V23L12 21L6 23V15.28A7.9 7.9 0 0 1 4 10A7.68 7.68 0 0 1 6.33 4.36A7.73 7.73 0 0 1 12 2A7.73 7.73 0 0 1 17.67 4.36A7.68 7.68 0 0 1 20 10Z</Geometry>
Expand Down
66 changes: 55 additions & 11 deletions Jaya.Ui/Views/MenuView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,20 +270,64 @@
</MenuItem>

<MenuItem Header="Search">
<MenuItem Header="Current Folder" />
<MenuItem Header="All Subfolders" />
<MenuItem Header="Search Again In" />
<MenuItem Header="Current Folder">
<MenuItem.Icon>
<DrawingPresenter Drawing="{DynamicResource Icon.Folder}" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="All Subfolders">
<MenuItem.Icon>
<DrawingPresenter Drawing="{DynamicResource Icon.SubFolders}" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Search Again In">
<MenuItem.Icon>
<DrawingPresenter Drawing="{DynamicResource Icon.FindInFiles}" />
</MenuItem.Icon>
</MenuItem>
<Separator />
<MenuItem Header="Date Modified" />
<MenuItem Header="Kind" />
<MenuItem Header="Size" />
<MenuItem Header="Other Properties" />
<MenuItem Header="Date Modified">
<MenuItem.Icon>
<DrawingPresenter Drawing="{DynamicResource Icon.Calendar}" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Kind">
<MenuItem.Icon>
<DrawingPresenter Drawing="{DynamicResource Icon.ContentType}" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Size">
<MenuItem.Icon>
<DrawingPresenter Drawing="{DynamicResource Icon.CodeFile}" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Other Properties">
<MenuItem.Icon>
<DrawingPresenter Drawing="{DynamicResource Icon.FileProperties}" />
</MenuItem.Icon>
</MenuItem>
<Separator />
<MenuItem Header="Recent Searches" />
<MenuItem Header="Advanced Options" />
<MenuItem Header="Save Search" />
<MenuItem Header="Recent Searches">
<MenuItem.Icon>
<DrawingPresenter Drawing="{DynamicResource Icon.History}" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Advanced Options">
<MenuItem.Icon>
<DrawingPresenter Drawing="{DynamicResource Icon.Property}" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="Save Search">
<MenuItem.Icon>
<DrawingPresenter Drawing="{DynamicResource Icon.Save}" />
</MenuItem.Icon>
</MenuItem>
<Separator />
<MenuItem Header="Close Search" />
<MenuItem Header="Close Search">
<MenuItem.Icon>
<DrawingPresenter Drawing="{DynamicResource Icon.Close}" />
</MenuItem.Icon>
</MenuItem>
</MenuItem>

<MenuItem Header="_Help">
Expand Down
Loading

0 comments on commit d044847

Please sign in to comment.