diff options
Diffstat (limited to 'plugins/unityshell')
27 files changed, 203 insertions, 119 deletions
diff --git a/plugins/unityshell/resources/album_missing.png b/plugins/unityshell/resources/album_missing.png Binary files differnew file mode 100644 index 000000000..dbb56373b --- /dev/null +++ b/plugins/unityshell/resources/album_missing.png diff --git a/plugins/unityshell/resources/album_missing_preview.png b/plugins/unityshell/resources/album_missing_preview.png Binary files differnew file mode 100644 index 000000000..2cd95245e --- /dev/null +++ b/plugins/unityshell/resources/album_missing_preview.png diff --git a/plugins/unityshell/resources/category_gradient.png b/plugins/unityshell/resources/category_gradient.png Binary files differnew file mode 100644 index 000000000..e6c8e66f6 --- /dev/null +++ b/plugins/unityshell/resources/category_gradient.png diff --git a/plugins/unityshell/resources/category_gradient_no_refine.png b/plugins/unityshell/resources/category_gradient_no_refine.png Binary files differnew file mode 100644 index 000000000..527a875a2 --- /dev/null +++ b/plugins/unityshell/resources/category_gradient_no_refine.png diff --git a/plugins/unityshell/resources/emblem_apps.svg b/plugins/unityshell/resources/emblem_apps.svg new file mode 100644 index 000000000..6af364db0 --- /dev/null +++ b/plugins/unityshell/resources/emblem_apps.svg @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="14px" height="14px" viewBox="0 0 14 14" enable-background="new 0 0 14 14" xml:space="preserve"> +<path fill="#DC4A26" d="M8.5,4.504v7.997c0,0.55-0.469,0.999-1.018,0.999H6.498c-0.55,0-0.998-0.449-0.998-0.999V4.504H8.5z"/> +<g> + <path fill="#DC4A26" d="M4.5,4.504h-2v-1h2V1.505c0-0.55-0.45-1-1-1H1.501c-0.55,0-1,0.45-1,1L0.5,12.501 + c0,0.55,0.45,0.999,1,0.999h1.999c0.55,0,1-0.449,1-0.999V10.5L2.5,10.502v-1L4.499,9.5V7.503H2.5v-1h2"/> +</g> +<path fill="#DC4A26" d="M4.5,6.503v-1l0,0V6.503L4.5,6.503z"/> +<path fill="#DC4A26" d="M4.5,9.502v-1h0L4.5,9.502L4.5,9.502z"/> +<path fill="#DC4A26" d="M4.5,12.499L4.5,12.499L4.5,12.499L4.5,12.499L4.5,12.499z"/> +<path fill="#DC4A26" d="M11.866,0.508v1.237C12.102,1.856,12.3,2.052,12.3,2.286c0,0.354-0.358,0.64-0.8,0.64s-0.8-0.286-0.8-0.64 + c0-0.234,0.198-0.43,0.433-0.541V0.508C10.66,0.972,9.5,2.321,9.5,2.917c0,0.884,1.116,1.6,2,1.6s2-0.716,2-1.6 + C13.5,2.321,12.34,0.972,11.866,0.508z"/> +<path fill="#DC4A26" d="M5.501,3.499L7.047,0.5L8.5,3.499H5.501z"/> +<path fill="#DC4A26" d="M13.5,5.503v6.998c0,0.55-0.45,0.999-1,0.999h-2c-0.55,0-1-0.449-1-0.999V5.503H13.5z"/> +</svg> diff --git a/plugins/unityshell/resources/emblem_books.svg b/plugins/unityshell/resources/emblem_books.svg new file mode 100644 index 000000000..89cfdfd14 --- /dev/null +++ b/plugins/unityshell/resources/emblem_books.svg @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="14px" height="14px" viewBox="0 0 14 14" enable-background="new 0 0 14 14" xml:space="preserve"> +<path fill="#DC4A26" d="M7,1.879C6.961,1.473,6.427,0.227,1,1.5c0,3.222,0,7.449,0,11C7.009,10.945,7,13,7,13s-0.009-2.055,6-0.5 + c0-3.551,0-7.778,0-11C7.574,0.227,7.039,1.473,7,1.879z M5,9H2V8h3V9z M5,7H2V6h3V7z M5,5H2V4h3V5z M7.5,12h-1V2h1V12z M12,9H9V8h3 + V9z M12,7H9V6h3V7z M12,5H9V4h3V5z"/> +</svg> diff --git a/plugins/unityshell/resources/emblem_clothes.svg b/plugins/unityshell/resources/emblem_clothes.svg new file mode 100644 index 000000000..882a09b3d --- /dev/null +++ b/plugins/unityshell/resources/emblem_clothes.svg @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="14px" height="14px" viewBox="0 0 14 14" enable-background="new 0 0 14 14" xml:space="preserve"> +<path fill="#DC4A26" d="M10.997,13V5.013l1.505,0.772L14,2.942L10.974,1L8.988,1.002c0,1.121-0.916,2.029-2.046,2.029 + S5.012,2.123,5.012,1.002L2.969,1L0,2.942l1.498,2.843l1.447-0.772V13H10.997z"/> +</svg> diff --git a/plugins/unityshell/resources/emblem_music.svg b/plugins/unityshell/resources/emblem_music.svg new file mode 100644 index 000000000..998583d85 --- /dev/null +++ b/plugins/unityshell/resources/emblem_music.svg @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="14px" height="14px" viewBox="0 0 14 14" enable-background="new 0 0 14 14" xml:space="preserve"> +<g> + <g> + <path fill="#DC4A26" d="M13,0.598c0-0.386-0.307-0.651-0.683-0.588L5.672,1.186C5.296,1.249,5,1.617,5,2.005v7.249 + C4.228,8.862,3.14,8.925,2.157,9.52c-1.393,0.841-2.033,2.413-1.43,3.506c0.603,1.094,2.223,1.299,3.615,0.455 + c1.078-0.65,1.697-1.735,1.648-2.699L6,10.789V3.624c0-0.386,0.277-0.756,0.653-0.818l4.684-0.823C11.712,1.919,12,2.184,12,2.57 + v4.684c-0.771-0.393-1.86-0.329-2.843,0.265C7.764,8.36,7.123,9.931,7.727,11.024c0.603,1.094,2.222,1.3,3.615,0.456 + c1.069-0.646,1.689-1.721,1.649-2.68L13,8.808V0.598z"/> + </g> +</g> +</svg> diff --git a/plugins/unityshell/resources/emblem_video.svg b/plugins/unityshell/resources/emblem_video.svg new file mode 100644 index 000000000..a8ad76142 --- /dev/null +++ b/plugins/unityshell/resources/emblem_video.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="14px" height="14px" viewBox="0 0 14 14" enable-background="new 0 0 14 14" xml:space="preserve"> +<g> + <g> + <path fill="#DC4A26" d="M12.301,2.5H1.7C1.315,2.5,1,2.813,1,3.196v7.608C1,11.188,1.315,11.5,1.7,11.5h10.601 + c0.385,0,0.699-0.312,0.699-0.696V3.196C13,2.813,12.686,2.5,12.301,2.5z M2.989,10.455H1.994V9.498h0.996V10.455z M2.989,8.49 + H1.994V7.5h0.996V8.49z M2.989,6.494H1.994V5.535h0.996V6.494z M2.989,4.496H1.994V3.538h0.996V4.496z M8.006,7.841 + C7.659,8.126,7.308,8.404,6.954,8.677C6.6,8.947,6.255,9.197,5.92,9.426c-0.335,0.229-0.64,0.422-0.913,0.579V4.026 + c0.261,0.158,0.559,0.35,0.894,0.578c0.335,0.229,0.68,0.476,1.034,0.74c0.354,0.265,0.708,0.54,1.061,0.825 + c0.355,0.286,0.687,0.565,0.998,0.836C8.684,7.276,8.354,7.555,8.006,7.841z M11.992,10.455h-0.996V9.498h0.996V10.455z + M11.992,8.49h-0.996V7.5h0.996V8.49z M11.992,6.494h-0.996V5.535h0.996V6.494z M11.992,4.496h-0.996V3.538h0.996V4.496z"/> + </g> +</g> +</svg> diff --git a/plugins/unityshell/resources/lens-nav-app.svg b/plugins/unityshell/resources/lens-nav-app.svg index 2ea0066c8..b0bb63120 100644 --- a/plugins/unityshell/resources/lens-nav-app.svg +++ b/plugins/unityshell/resources/lens-nav-app.svg @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) --> +<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> -<g> - <g> - <path fill="#FFFFFF" d="M9.5,21c0,0.55,0.45,1,1,1h3c0.55,0,1-0.45,1-1V8h-5V21z M6.5,2H3.501c-0.55,0-1,0.45-1,1L2.5,21 - c0,0.55,0.45,1,1,1h2.999c0.55,0,1-0.45,1-1v-2.969H5.5v-1h1.999V14H5.5v-1h2v-3h-2V9h2V6h-2V5h2V3C7.5,2.45,7.05,2,6.5,2z - M7.5,10V9V10L7.5,10z M7.5,14v-1h0L7.5,14L7.5,14z M7.5,18.031v-1H7.499L7.5,18.031L7.5,18.031z M19,8.015 - c1.104,0,2.5-1.119,2.5-2.5c0-0.933-1.408-2.79-2-3.515v1.515c0.293,0.174,0.5,0.48,0.5,0.847c0,0.553-0.447,1-1,1s-1-0.447-1-1 - c0-0.366,0.207-0.673,0.5-0.847V2c-0.592,0.725-2,2.582-2,3.515C16.5,6.896,17.896,8.015,19,8.015z M9.438,7H14.5l-2.531-5 - L9.438,7z M16.5,21c0,0.55,0.45,1,1,1h3c0.55,0,1-0.45,1-1V9h-5V21z"/> - </g> -</g> +<path fill="#FFFFFF" d="M14,8v12c0,0.55-0.45,1-1,1h-2c-0.55,0-1-0.45-1-1V8H14z"/> +<path fill="#FFFFFF" d="M8,11H6v-1h2V8H6V7h2V4c0-0.55-0.45-1-1-1H5.001c-0.55,0-1,0.45-1,1L4,20c0,0.55,0.45,1,1,1h2 + c0.55,0,1-0.45,1-1v-3H6v-1h2v-2H6v-1h2V11z"/> +<path fill="#FFFFFF" d="M8,8L8,8V7l0,0V8z"/> +<path fill="#FFFFFF" d="M18.366,3v1.542C18.602,4.681,18.8,4.925,18.8,5.217c0,0.441-0.358,0.799-0.8,0.799s-0.8-0.358-0.8-0.799 + c0-0.292,0.198-0.537,0.433-0.675V3C17.16,3.578,16,5.26,16,6.005C16,7.106,17.116,8,18,8s2-0.894,2-1.995 + C20,5.26,18.84,3.578,18.366,3z"/> +<path fill="#FFFFFF" d="M20,9v11c0,0.55-0.45,1-1,1h-2c-0.55,0-1-0.45-1-1V9H20z"/> +<path fill="#FFFFFF" d="M12.552,3.991c0.191,0.349,0.378,0.7,0.56,1.056c0.182,0.355,0.349,0.701,0.502,1.038 + C13.766,6.42,13.895,6.726,14,7h-4c0.105-0.262,0.234-0.561,0.387-0.897c0.153-0.336,0.318-0.682,0.495-1.038 + c0.177-0.354,0.36-0.71,0.552-1.065c0.191-0.355,0.377-0.688,0.559-1C12.175,3.312,12.36,3.642,12.552,3.991z"/> </svg> - \ No newline at end of file diff --git a/plugins/unityshell/resources/lens-nav-file.svg b/plugins/unityshell/resources/lens-nav-file.svg index 3c0e66ca6..48fb41c3b 100644 --- a/plugins/unityshell/resources/lens-nav-file.svg +++ b/plugins/unityshell/resources/lens-nav-file.svg @@ -1,13 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) --> +<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> -<g> - <g> - <path fill="#FFFFFF" d="M14.969,2H14v6h6V7L14.969,2z M13,2H5C4.45,2,4,2.45,4,3v18c0,0.55,0.45,1,1,1h14c0.551,0,1-0.45,1-1 - V9.007h-7V2z"/> - </g> -</g> +<path fill="#FFFFFF" d="M15,3v4h4V6l-3.031-3H15z"/> +<path fill="#FFFFFF" d="M18,21H6c-0.55,0-1-0.45-1-1V4c0-0.55,0.45-1,1-1h8v5.007h5V20C19,20.55,18.551,21,18,21z"/> </svg> - \ No newline at end of file diff --git a/plugins/unityshell/resources/lens-nav-gwibber.svg b/plugins/unityshell/resources/lens-nav-gwibber.svg new file mode 100644 index 000000000..07361aa25 --- /dev/null +++ b/plugins/unityshell/resources/lens-nav-gwibber.svg @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> +<path fill="#FFFFFF" d="M23,11.38c-0.774,0.14-1.897-0.005-2.492-0.267c1.236-0.108,2.073-0.701,2.396-1.505 + c-0.445,0.29-1.829,0.604-2.593,0.304c-0.038-0.189-0.078-0.369-0.121-0.533c-0.581-2.256-2.576-4.074-4.663-3.854 + c0.169-0.073,0.34-0.139,0.512-0.2c0.229-0.087,1.577-0.318,1.365-0.82c-0.179-0.442-1.828,0.332-2.138,0.435 + c0.41-0.162,1.087-0.441,1.159-0.939c-0.627,0.091-1.243,0.404-1.72,0.86c0.173-0.195,0.304-0.432,0.331-0.689 + c-1.675,1.129-2.652,3.405-3.443,5.613c-0.621-0.637-1.173-1.136-1.667-1.416C8.541,7.584,6.883,6.766,4.282,5.746 + c-0.08,0.909,0.426,2.118,1.881,2.92C5.848,8.621,5.271,8.722,4.811,8.838c0.188,1.042,0.801,1.899,2.463,2.312 + c-0.759,0.053-1.153,0.237-1.508,0.629c0.346,0.725,1.191,1.576,2.708,1.401c-1.689,0.769-0.688,2.19,0.686,1.979 + C6.817,17.715,3.122,17.525,1,15.39c5.539,7.969,17.581,4.712,19.374-2.963C21.721,12.438,22.51,11.936,23,11.38z"/> +</svg> diff --git a/plugins/unityshell/resources/lens-nav-home.svg b/plugins/unityshell/resources/lens-nav-home.svg index dd042315f..0f30fda7c 100644 --- a/plugins/unityshell/resources/lens-nav-home.svg +++ b/plugins/unityshell/resources/lens-nav-home.svg @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) --> +<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> -<path fill="#FFFFFF" d="M12.707,2.298C12.513,2.1,12.256,2,12,2s-0.513,0.1-0.707,0.298L2,11.788h2v9.191C4,21.539,4.45,22,5,22 - h5.02v-6.127h3.968V22H19c0.55,0,1-0.461,1-1.021v-9.191h2L12.707,2.298z"/> +<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M12.678,3.268C12.5,3.089,12.266,3,12.031,3 + c-0.235,0-0.47,0.089-0.647,0.268L3,12h2v8c0,0.553,0.447,1,1,1h12c0.553,0,1-0.447,1-1v-8h2L12.678,3.268z M14,20.998h-4v-5h4 + V20.998z"/> </svg> - \ No newline at end of file diff --git a/plugins/unityshell/resources/lens-nav-music.svg b/plugins/unityshell/resources/lens-nav-music.svg index ef341e717..ada6ce9e4 100644 --- a/plugins/unityshell/resources/lens-nav-music.svg +++ b/plugins/unityshell/resources/lens-nav-music.svg @@ -1,16 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) --> +<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> -<g> - <g> - <path fill="#FFFFFF" d="M21,2.85c0-0.55-0.443-0.927-0.986-0.837L9.986,3.687C9.444,3.776,9,4.301,9,4.851v10.268l0.02,0.026 - c-1.062-0.301-2.393-0.131-3.61,0.578c-2.025,1.178-2.956,3.379-2.079,4.911s3.232,1.819,5.258,0.637 - c1.437-0.835,2.307-2.182,2.389-3.441l0.022,0.03V7.155c0-0.55,0.444-1.075,0.986-1.165l6.028-1.006 - C18.557,4.894,19,5.271,19,5.821v7.296l0.02,0.026c-1.062-0.3-2.393-0.131-3.609,0.578c-2.025,1.179-2.957,3.379-2.079,4.911 - c0.877,1.533,3.231,1.82,5.257,0.638c1.438-0.835,2.308-2.183,2.39-3.442L21,15.859V2.85z"/> - </g> -</g> +<path fill="#FFFFFF" d="M19.964,14.964L20,15V3.849c0-0.55-0.444-0.926-0.986-0.835l-8.027,1.67C10.444,4.774,10,5.299,10,5.849 + v9.603c-0.984-0.633-2.52-0.61-3.892,0.172c-1.772,1.009-2.587,2.895-1.819,4.207c0.767,1.312,2.828,1.559,4.6,0.545 + c1.441-0.819,2.232-2.213,2.074-3.412L11,17V6.849c0-0.55,0.444-1.075,0.986-1.167l6.028-1.365C18.557,4.224,19,4.599,19,5.148 + v8.302c-0.984-0.632-2.521-0.609-3.891,0.174c-1.773,1.01-2.588,2.894-1.82,4.206c0.768,1.312,2.828,1.56,4.601,0.546 + C19.331,17.557,20.122,16.163,19.964,14.964z"/> </svg> - \ No newline at end of file diff --git a/plugins/unityshell/resources/lens-nav-photo.svg b/plugins/unityshell/resources/lens-nav-photo.svg index 91e80f44b..7c91448a0 100644 --- a/plugins/unityshell/resources/lens-nav-photo.svg +++ b/plugins/unityshell/resources/lens-nav-photo.svg @@ -1,16 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) --> +<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> -<g> - <g> - <path fill="#FFFFFF" d="M12.009,9.51c-2.218,0-4.016,1.797-4.016,4.013s1.798,4.013,4.016,4.013s4.016-1.797,4.016-4.013 - S14.227,9.51,12.009,9.51z M21,6.511H3c-0.55,0-1,0.45-1,0.999v11.991c0,0.55,0.45,0.999,1,0.999h18c0.55,0,1-0.449,1-0.999V7.51 - C22,6.961,21.55,6.511,21,6.511z M12,19.501c-3.313,0-6-2.684-6-5.995c0-3.312,2.687-5.996,6-5.996s6,2.684,6,5.996 - C18,16.817,15.313,19.501,12,19.501z M15.664,5.55l-0.368-1.102C15.122,3.927,14.53,3.5,13.979,3.5h-4 - c-0.55,0-1.142,0.427-1.316,0.948L8.296,5.55C8.122,6.071,7.53,6.498,6.98,6.498h10C16.431,6.498,15.838,6.071,15.664,5.55z"/> - </g> -</g> +<path fill="#FFFFFF" d="M16,13.5c0,2.21-1.79,4-4,4s-4-1.79-4-4s1.79-4,4-4S16,11.29,16,13.5z"/> +<path fill="#FFFFFF" d="M20,7.5h-3c-0.55,0-1.162-0.433-1.336-0.956l-0.368-1.103C15.122,4.92,14.55,4.5,14,4.5h-4 + c-0.55,0-1.162,0.42-1.337,0.942L8.296,6.544C8.122,7.067,7.55,7.5,7,7.5H4c-0.55,0-1,0.45-1,1v10c0,0.551,0.45,1,1,1h16 + c0.55,0,1-0.449,1-1v-10C21,7.95,20.55,7.5,20,7.5z M12,18.5c-2.762,0-5-2.238-5-5c0-2.763,2.238-5,5-5c2.761,0,5,2.237,5,5 + C17,16.262,14.761,18.5,12,18.5z"/> </svg> - \ No newline at end of file diff --git a/plugins/unityshell/resources/lens-nav-video.svg b/plugins/unityshell/resources/lens-nav-video.svg index 4fe5ffe3e..7c07198a9 100644 --- a/plugins/unityshell/resources/lens-nav-video.svg +++ b/plugins/unityshell/resources/lens-nav-video.svg @@ -1,14 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) --> +<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> -<g> - <g> - <path fill="#FFFFFF" d="M21,4H3C2.45,4,2,4.45,2,5v14c0,0.55,0.45,1,1,1h18c0.55,0,1-0.45,1-1V5C22,4.45,21.55,4,21,4z M5,19H3v-2 - h2V19z M5,16H3v-2h2V16z M5,13H3v-2h2V13z M5,10H3V8h2V10z M5,7H3V5h2V7z M9,15.98V8l7.036,4L9,15.98z M21,19h-2v-2h2V19z M21,16 - h-2v-2h2V16z M21,13h-2v-2h2V13z M21,10h-2V8h2V10z M21,7h-2V5h2V7z"/> - </g> -</g> +<path fill="#FFFFFF" d="M20,4.5H4c-0.532,0-1,0.467-1,1v13c0,0.533,0.468,1,1,1h16c0.533,0,1-0.467,1-1v-13 + C21,4.967,20.533,4.5,20,4.5z M5.5,18.5h-1v-1h1V18.5z M5.5,16.5h-1v-1h1V16.5z M5.5,14.5h-1v-1h1V14.5z M5.5,12.5h-1v-1h1V12.5z + M5.5,10.5h-1v-1h1V10.5z M5.5,8.5h-1v-1h1V8.5z M5.5,6.5h-1v-1h1V6.5z M14.267,13.241c-0.61,0.431-1.226,0.85-1.849,1.259 + c-0.621,0.408-1.226,0.785-1.815,1.129C10.015,15.973,9.479,16.263,9,16.5v-9c0.458,0.236,0.981,0.527,1.57,0.871 + c0.588,0.343,1.194,0.715,1.816,1.113c0.621,0.398,1.243,0.812,1.864,1.242c0.622,0.429,1.205,0.849,1.75,1.257 + C15.455,12.392,14.877,12.812,14.267,13.241z M19.5,18.5h-1v-1h1V18.5z M19.5,16.5h-1v-1h1V16.5z M19.5,14.5h-1v-1h1V14.5z + M19.5,12.5h-1v-1h1V12.5z M19.5,10.5h-1v-1h1V10.5z M19.5,8.5h-1v-1h1V8.5z M19.5,6.5h-1v-1h1V6.5z"/> </svg> - \ No newline at end of file diff --git a/plugins/unityshell/resources/refine_gradient.png b/plugins/unityshell/resources/refine_gradient.png Binary files differnew file mode 100644 index 000000000..20620258d --- /dev/null +++ b/plugins/unityshell/resources/refine_gradient.png diff --git a/plugins/unityshell/resources/refine_gradient_corner.png b/plugins/unityshell/resources/refine_gradient_corner.png Binary files differnew file mode 100644 index 000000000..a7ab65744 --- /dev/null +++ b/plugins/unityshell/resources/refine_gradient_corner.png diff --git a/plugins/unityshell/resources/refine_gradient_dash.png b/plugins/unityshell/resources/refine_gradient_dash.png Binary files differnew file mode 100644 index 000000000..26fe103c8 --- /dev/null +++ b/plugins/unityshell/resources/refine_gradient_dash.png diff --git a/plugins/unityshell/resources/refine_gradient_dash_no_refine.png b/plugins/unityshell/resources/refine_gradient_dash_no_refine.png Binary files differnew file mode 100644 index 000000000..c8cb44728 --- /dev/null +++ b/plugins/unityshell/resources/refine_gradient_dash_no_refine.png diff --git a/plugins/unityshell/resources/refine_gradient_no_refine_dash.png b/plugins/unityshell/resources/refine_gradient_no_refine_dash.png Binary files differnew file mode 100644 index 000000000..12ab5956e --- /dev/null +++ b/plugins/unityshell/resources/refine_gradient_no_refine_dash.png diff --git a/plugins/unityshell/resources/refine_gradient_panel.png b/plugins/unityshell/resources/refine_gradient_panel.png Binary files differnew file mode 100644 index 000000000..d283f0977 --- /dev/null +++ b/plugins/unityshell/resources/refine_gradient_panel.png diff --git a/plugins/unityshell/resources/refine_gradient_panel_no_refine.png b/plugins/unityshell/resources/refine_gradient_panel_no_refine.png Binary files differnew file mode 100644 index 000000000..f50902e56 --- /dev/null +++ b/plugins/unityshell/resources/refine_gradient_panel_no_refine.png diff --git a/plugins/unityshell/resources/refine_gradient_panel_single_column.png b/plugins/unityshell/resources/refine_gradient_panel_single_column.png Binary files differnew file mode 100644 index 000000000..7ce0efa2f --- /dev/null +++ b/plugins/unityshell/resources/refine_gradient_panel_single_column.png diff --git a/plugins/unityshell/resources/video_missing.png b/plugins/unityshell/resources/video_missing.png Binary files differnew file mode 100644 index 000000000..0de4797e9 --- /dev/null +++ b/plugins/unityshell/resources/video_missing.png diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp index 0ec87f497..586040110 100644 --- a/plugins/unityshell/src/unityshell.cpp +++ b/plugins/unityshell/src/unityshell.cpp @@ -25,6 +25,7 @@ #include <Nux/BaseWindow.h> #include <Nux/WindowCompositor.h> +#include "BaseWindowRaiserImp.h" #include "IconRenderer.h" #include "Launcher.h" #include "LauncherIcon.h" @@ -131,7 +132,6 @@ UnityScreen::UnityScreen(CompScreen* screen) , panel_texture_has_changed_(true) , paint_panel_(false) , scale_just_activated_(false) - , scale_highlighted_window_(0) , minimize_speed_controller(new WindowMinimizeSpeedController()) { Timer timer; @@ -359,7 +359,7 @@ UnityScreen::UnityScreen(CompScreen* screen) g_variant_get(data, UBUS_OVERLAY_FORMAT_STRING, &overlay_identity, &can_maximise, &overlay_monitor); - dash_monitor_ = overlay_monitor; + overlay_monitor_ = overlay_monitor; RaiseInputWindows(); }); @@ -370,7 +370,6 @@ UnityScreen::UnityScreen(CompScreen* screen) } panel::Style::Instance().changed.connect(sigc::mem_fun(this, &UnityScreen::OnPanelStyleChanged)); - WindowManager::Default()->terminate_spread.connect([this] { scale_highlighted_window_ = 0; }); minimize_speed_controller->DurationChanged.connect( sigc::mem_fun(this, &UnityScreen::OnMinimizeDurationChanged) @@ -527,34 +526,48 @@ void UnityScreen::setPanelShadowMatrix(const GLMatrix& matrix) panel_shadow_matrix_ = matrix; } -/* Currently unimplemented */ -void UnityScreen::paintPanelShadow(const GLMatrix& matrix) +void UnityScreen::paintPanelShadow(const CompRegion& clip) { - return; - if (sources_.GetSource(local::RELAYOUT_TIMEOUT)) return; if (PluginAdapter::Default()->IsExpoActive()) return; - nuxPrologue(); - CompOutput* output = _last_output; - float vc[4]; - float h = 20.0f; - float w = 1.0f; float panel_h = static_cast<float>(panel_style_.panel_height); - float x1 = output->x(); - float y1 = output->y() + panel_h; - float x2 = x1 + output->width(); - float y2 = y1 + h; + // You have no shadow texture. But how? + if (_shadow_texture.empty() || !_shadow_texture[0]) + return; + + float shadowX = output->x(); + float shadowY = output->y() + panel_h; + float shadowWidth = output->width(); + float shadowHeight = _shadow_texture[0]->height(); + CompRect shadowRect(shadowX, shadowY, shadowWidth, shadowHeight); + + CompRegion redraw(clip); + redraw &= shadowRect; + + if (redraw.isEmpty()) + return; - vc[0] = x1; - vc[1] = x2; - vc[2] = y1; - vc[3] = y2; + const CompRect& bounds(redraw.boundingRect()); + + // Sub-rectangle of the shadow needing redrawing: + float x1 = bounds.x1(); + float y1 = bounds.y1(); + float x2 = bounds.x2(); + float y2 = bounds.y2(); + + // Texture coordinates of the above rectangle: + float tx1 = (x1 - shadowX) / shadowWidth; + float ty1 = (y1 - shadowY) / shadowHeight; + float tx2 = (x2 - shadowX) / shadowWidth; + float ty2 = (y2 - shadowY) / shadowHeight; + + nuxPrologue(); // compiz doesn't use the same method of tracking monitors as our toolkit // we need to make sure we properly associate with the right monitor @@ -571,7 +584,7 @@ void UnityScreen::paintPanelShadow(const GLMatrix& matrix) i++; } - if (!(launcher_controller_->IsOverlayOpen() && current_monitor == dash_monitor_) + if (!(launcher_controller_->IsOverlayOpen() && current_monitor == overlay_monitor_) && panel_controller_->opacity() > 0.0f) { foreach(GLTexture * tex, _shadow_texture) @@ -595,17 +608,17 @@ void UnityScreen::paintPanelShadow(const GLMatrix& matrix) }; vertexData = { - vc[0], vc[2], 0, - vc[0], vc[3], 0, - vc[1], vc[2], 0, - vc[1], vc[3], 0, + x1, y1, 0, + x1, y2, 0, + x2, y1, 0, + x2, y2, 0, }; textureData = { - COMP_TEX_COORD_X(tex->matrix(), 0), COMP_TEX_COORD_Y(tex->matrix(), 0), - COMP_TEX_COORD_X(tex->matrix(), 0), COMP_TEX_COORD_Y(tex->matrix(), h), - COMP_TEX_COORD_X(tex->matrix(), w), COMP_TEX_COORD_Y(tex->matrix(), 0), - COMP_TEX_COORD_X(tex->matrix(), w), COMP_TEX_COORD_Y(tex->matrix(), h), + tx1, ty1, + tx1, ty2, + tx2, ty1, + tx2, ty2, }; streamingBuffer->begin(GL_TRIANGLE_STRIP); @@ -615,7 +628,7 @@ void UnityScreen::paintPanelShadow(const GLMatrix& matrix) streamingBuffer->addTexCoords(0, 4, &textureData[0]); streamingBuffer->end(); - streamingBuffer->render(matrix); + streamingBuffer->render(panel_shadow_matrix_); tex->disable(); if (!wasBlend) @@ -1379,14 +1392,17 @@ void UnityScreen::nuxDamageCompiz() void UnityScreen::handleEvent(XEvent* event) { bool skip_other_plugins = false; + auto wm = PluginAdapter::Default(); + switch (event->type) { case FocusIn: case FocusOut: if (event->xfocus.mode == NotifyGrab) - PluginAdapter::Default()->OnScreenGrabbed(); + wm->OnScreenGrabbed(); else if (event->xfocus.mode == NotifyUngrab) - PluginAdapter::Default()->OnScreenUngrabbed(); + wm->OnScreenUngrabbed(); + if (_key_nav_mode_requested) { // Close any overlay that is open. @@ -1400,9 +1416,10 @@ void UnityScreen::handleEvent(XEvent* event) _key_nav_mode_requested = false; break; case MotionNotify: - if (scale_highlighted_window_ && PluginAdapter::Default()->IsScaleActive()) + if (wm->IsScaleActive()) { - if (CompWindow *w = screen->findWindow(scale_highlighted_window_)) + ScaleScreen* ss = ScaleScreen::get(screen); + if (CompWindow *w = screen->findWindow(ss->getSelectedWindow())) skip_other_plugins = UnityWindow::get(w)->handleEvent(event); } break; @@ -1412,12 +1429,21 @@ void UnityScreen::handleEvent(XEvent* event) launcher_controller_->KeyNavTerminate(false); EnableCancelAction(CancelActionTarget::LAUNCHER_SWITCHER, false); } - if (scale_highlighted_window_ && PluginAdapter::Default()->IsScaleActive()) + if (wm->IsScaleActive()) { - if (CompWindow *w = screen->findWindow(scale_highlighted_window_)) + ScaleScreen* ss = ScaleScreen::get(screen); + if (CompWindow *w = screen->findWindow(ss->getSelectedWindow())) skip_other_plugins = UnityWindow::get(w)->handleEvent(event); } - + if (launcher_controller_->IsOverlayOpen()) + { + int monitor_with_mouse = UScreen::GetDefault()->GetMonitorWithMouse(); + if (overlay_monitor_ != monitor_with_mouse) + { + dash_controller_->HideDash(false); + hud_controller_->HideHud(false); + } + } break; case ButtonRelease: if (switcher_controller_ && switcher_controller_->Visible()) @@ -1437,10 +1463,11 @@ void UnityScreen::handleEvent(XEvent* event) } } } - else if (scale_highlighted_window_ && PluginAdapter::Default()->IsScaleActive()) + else if (wm->IsScaleActive()) { - if (CompWindow *w = screen->findWindow(scale_highlighted_window_)) - UnityWindow::get(w)->handleEvent(event); + ScaleScreen* ss = ScaleScreen::get(screen); + if (CompWindow *w = screen->findWindow(ss->getSelectedWindow())) + skip_other_plugins = UnityWindow::get(w)->handleEvent(event); } break; case KeyPress: @@ -1764,9 +1791,10 @@ void UnityScreen::SetUpAndShowSwitcher(switcher::ShowMode show_mode) { // maybe check launcher position/hide state? - WindowManager *wm = WindowManager::Default(); - int monitor = wm->GetWindowMonitor(wm->GetActiveWindow()); - nux::Geometry monitor_geo = UScreen::GetDefault()->GetMonitorGeometry(monitor); + auto uscreen = UScreen::GetDefault(); + int monitor = uscreen->GetMonitorWithMouse(); + auto monitor_geo = uscreen->GetMonitorGeometry(monitor); + monitor_geo.x += 100; monitor_geo.y += 100; monitor_geo.width -= 200; @@ -2360,7 +2388,7 @@ bool UnityWindow::glDraw(const GLMatrix& matrix, Window active_window = screen->activeWindow(); if (window->id() == active_window && window->type() != CompWindowTypeDesktopMask) { - uScreen->paintPanelShadow(matrix); + uScreen->paintPanelShadow(region); } bool ret = gWindow->glDraw(matrix, attrib, region, mask); @@ -2368,7 +2396,7 @@ bool UnityWindow::glDraw(const GLMatrix& matrix, if ((active_window == 0 || active_window == window->id()) && (window->type() == CompWindowTypeDesktopMask)) { - uScreen->paintPanelShadow(matrix); + uScreen->paintPanelShadow(region); } @@ -2556,7 +2584,8 @@ void UnityWindow::windowNotify(CompWindowNotify n) UnityScreen* us = UnityScreen::get(screen); CompWindow *lw; - if (us->launcher_controller_->IsOverlayOpen()) + // can't rely on launcher->IsOverlayVisible on focus change (because ubus is async close on focus change.) + if (us && (us->dash_controller_->IsVisible() || us->hud_controller_->IsVisible())) { lw = screen->findWindow(us->launcher_controller_->LauncherWindowId(0)); lw->moveInputFocusTo(); @@ -2770,6 +2799,7 @@ void UnityScreen::optionChanged(CompOption* opt, UnityshellOptions::Options num) * that must not be considered when drawing an overlay */ hud_controller_->launcher_width = launcher_controller_->launcher().GetAbsoluteWidth() - 1; dash_controller_->launcher_width = launcher_controller_->launcher().GetAbsoluteWidth() - 1; + panel_controller_->launcher_width = launcher_controller_->launcher().GetAbsoluteWidth() - 1; if (p) { @@ -2960,7 +2990,8 @@ void UnityScreen::initLauncher() // Setup Shortcut Hint InitHints(); - shortcut_controller_ = std::make_shared<shortcut::Controller>(hints_); + auto base_window_raiser_ = std::make_shared<shortcut::BaseWindowRaiserImp>(); + shortcut_controller_ = std::make_shared<shortcut::Controller>(hints_, base_window_raiser_); AddChild(shortcut_controller_.get()); AddChild(dash_controller_.get()); @@ -3597,8 +3628,8 @@ void UnityWindow::scalePaintDecoration(GLWindowPaintAttrib const& attrib, if (!scale_win->hasSlot()) // animation not finished return; - UnityScreen* us = UnityScreen::get(screen); - const bool highlighted = (us->scale_highlighted_window_ == window->id()); + ScaleScreen* ss = ScaleScreen::get(screen); + const bool highlighted = (ss->getSelectedWindow() == window->id()); ScalePosition const& pos = scale_win->getCurrentPosition(); auto const& border_rect = window->borderRect(); @@ -3651,16 +3682,6 @@ void UnityWindow::scalePaintDecoration(GLWindowPaintAttrib const& attrib, } } -void UnityWindow::scaleSelectWindow() -{ - ScaleWindow::get(window)->scaleSelectWindow(); - - UnityScreen* us = UnityScreen::get(screen); - - if (us->scale_highlighted_window_ != window->id()) - us->scale_highlighted_window_ = window->id(); -} - void UnityWindow::OnInitiateSpreed() { auto const windows = screen->windows(); diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h index a1de06832..5eb16559e 100644 --- a/plugins/unityshell/src/unityshell.h +++ b/plugins/unityshell/src/unityshell.h @@ -95,7 +95,7 @@ public: /* nux draw wrapper */ void paintDisplay(); - void paintPanelShadow(const GLMatrix& matrix); + void paintPanelShadow(const CompRegion& clip); void setPanelShadowMatrix(const GLMatrix& matrix); void preparePaint (int ms); @@ -312,7 +312,7 @@ private: bool queryForShader (); - int dash_monitor_; + int overlay_monitor_; CompScreen::GrabHandle grab_index_; CompWindowList fullscreen_windows_; bool painting_tray_; @@ -333,8 +333,6 @@ private: glib::SourceManager sources_; unity::ThumbnailGenerator thumb_generator; - Window scale_highlighted_window_; - WindowMinimizeSpeedController* minimize_speed_controller; friend class UnityWindow; }; @@ -409,7 +407,6 @@ public: //! Emited when CompWindowNotifyBeforeDestroy is received sigc::signal<void> being_destroyed; - void scaleSelectWindow(); void scalePaintDecoration(const GLWindowPaintAttrib &, const GLMatrix &, const CompRegion &, |