diff --git a/gfx/drivers_context/x_ctx.c b/gfx/drivers_context/x_ctx.c index f04d6d850d..2dfdee1ef9 100644 --- a/gfx/drivers_context/x_ctx.c +++ b/gfx/drivers_context/x_ctx.c @@ -128,49 +128,22 @@ typedef struct Hints /* We use long because X11 wants 32-bit pixels for 32-bit systems and 64 for 64... */ static const unsigned long retroarch_icon_data[] = { 16, 16, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, - 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, - 0xffffffff, 0xffffffff, 0x000000ff, 0xffffffff, 0xffffffff, 0x00000000, - 0xffffffff, 0xffffffff, 0x000000ff, 0xffffffff, 0xffffffff, 0xffffffff, - 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0x000000ff, 0xffffffff, - 0xffffffff, 0x000000ff, 0xffffffff, 0xffffffff, 0xffffffff, 0x000000ff, - 0xffffffff, 0xffffffff, 0x000000ff, 0xffffffff, 0x00000000, 0x00000000, - 0x00000000, 0xffffffff, 0x000000ff, 0xffffffff, 0x000000ff, 0x000000ff, - 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0xffffffff, - 0x000000ff, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, - 0x000000ff, 0x000000ff, 0x000000ff, 0xffffffff, 0x000000ff, 0x000000ff, - 0x000000ff, 0xffffffff, 0x000000ff, 0x000000ff, 0x000000ff, 0xffffffff, - 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0x000000ff, 0x000000ff, - 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, - 0x000000ff, 0x000000ff, 0x000000ff, 0xffffffff, 0x00000000, 0x00000000, - 0x00000000, 0xffffffff, 0xffffffff, 0x000000ff, 0x000000ff, 0x000000ff, - 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, - 0xffffffff, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0xffffffff, 0xffffffff, 0x000000ff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0x000000ff, 0xffffffff, 0xffffffff, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0x000000ff, - 0xffffffff, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, - 0xffffffff, 0x000000ff, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, - 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000 +0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000, +0x00000000,0x00000000,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x00000000,0x00000000,0x00000000, +0x00000000,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x00000000,0x00000000, +0x00000000,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x00000000,0x00000000, +0x00000000,0x333333ff,0x333333ff,0x333333ff,0xf2f2f2ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0xf2f2f2ff,0x333333ff,0x333333ff,0x333333ff,0x00000000,0x00000000, +0x00000000,0x333333ff,0xf2f2f2ff,0x333333ff,0x333333ff,0xf2f2f2ff,0x333333ff,0x333333ff,0x333333ff,0xf2f2f2ff,0x333333ff,0x333333ff,0xf2f2f2ff,0x333333ff,0x00000000,0x00000000, +0x00000000,0x333333ff,0xf2f2f2ff,0x333333ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0x333333ff,0xf2f2f2ff,0x333333ff,0x00000000,0x00000000, +0x00000000,0x333333ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0x333333ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0x333333ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0x333333ff,0x00000000,0x00000000, +0x00000000,0x333333ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0x333333ff,0x00000000,0x00000000, +0x00000000,0x333333ff,0x333333ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0xf2f2f2ff,0x333333ff,0x333333ff,0x00000000,0x00000000, +0x00000000,0x333333ff,0x333333ff,0x333333ff,0xf2f2f2ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0xf2f2f2ff,0x333333ff,0x333333ff,0x333333ff,0x00000000,0x00000000, +0x00000000,0x333333ff,0x333333ff,0xf2f2f2ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0xf2f2f2ff,0x333333ff,0x333333ff,0x00000000,0x00000000, +0x00000000,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x00000000,0x00000000, +0x00000000,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x00000000,0x00000000, +0x00000000,0x00000000,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x333333ff,0x00000000,0x00000000,0x00000000, +0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000 }; #ifdef HAVE_OPENGL diff --git a/media/ico_src/icon.svg b/media/ico_src/icon.svg new file mode 100644 index 0000000000..549cc6f68f --- /dev/null +++ b/media/ico_src/icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/media/ico_src/icon128.png b/media/ico_src/icon128.png new file mode 100644 index 0000000000..51963b8eb9 Binary files /dev/null and b/media/ico_src/icon128.png differ diff --git a/media/ico_src/icon16.png b/media/ico_src/icon16.png new file mode 100644 index 0000000000..ec24e78ce7 Binary files /dev/null and b/media/ico_src/icon16.png differ diff --git a/media/ico_src/icon16.svg b/media/ico_src/icon16.svg new file mode 100644 index 0000000000..d63c88cb7e --- /dev/null +++ b/media/ico_src/icon16.svg @@ -0,0 +1,256 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/media/ico_src/icon192.png b/media/ico_src/icon192.png new file mode 100644 index 0000000000..066462ca73 Binary files /dev/null and b/media/ico_src/icon192.png differ diff --git a/media/ico_src/icon24.png b/media/ico_src/icon24.png new file mode 100644 index 0000000000..6a8a5faaaa Binary files /dev/null and b/media/ico_src/icon24.png differ diff --git a/media/ico_src/icon256.png b/media/ico_src/icon256.png new file mode 100644 index 0000000000..ba65830397 Binary files /dev/null and b/media/ico_src/icon256.png differ diff --git a/media/ico_src/icon32.png b/media/ico_src/icon32.png new file mode 100644 index 0000000000..0ed56e1f11 Binary files /dev/null and b/media/ico_src/icon32.png differ diff --git a/media/ico_src/icon48.png b/media/ico_src/icon48.png new file mode 100644 index 0000000000..6d33f7146f Binary files /dev/null and b/media/ico_src/icon48.png differ diff --git a/media/ico_src/icon64.png b/media/ico_src/icon64.png new file mode 100644 index 0000000000..dbef305e1d Binary files /dev/null and b/media/ico_src/icon64.png differ diff --git a/media/ico_src/icon96.png b/media/ico_src/icon96.png new file mode 100644 index 0000000000..412dedafc9 Binary files /dev/null and b/media/ico_src/icon96.png differ diff --git a/media/ico_src/make.sh b/media/ico_src/make.sh new file mode 100644 index 0000000000..b7e5d536cf --- /dev/null +++ b/media/ico_src/make.sh @@ -0,0 +1 @@ +magick convert -verbose icon16.png icon24.png icon32.png icon48.png icon64.png icon96.png icon128.png icon192.png icon256.png ../retroarch.ico \ No newline at end of file diff --git a/media/retroarch-16x16.ico b/media/retroarch-16x16.ico index bd9042f840..1cb4646c66 100644 Binary files a/media/retroarch-16x16.ico and b/media/retroarch-16x16.ico differ diff --git a/media/retroarch-16x16.png b/media/retroarch-16x16.png index 627c0ba2a9..ec24e78ce7 100644 Binary files a/media/retroarch-16x16.png and b/media/retroarch-16x16.png differ diff --git a/media/retroarch.ico b/media/retroarch.ico index 6355390e3e..19a0ab8a97 100644 Binary files a/media/retroarch.ico and b/media/retroarch.ico differ diff --git a/media/retroarch.svg b/media/retroarch.svg index 08dbe2e93c..9c6f6fc214 100644 --- a/media/retroarch.svg +++ b/media/retroarch.svg @@ -13,7 +13,7 @@ height="128.19" id="svg2" version="1.1" - inkscape:version="0.48.4 r9939" + inkscape:version="0.92.3 (2405546, 2018-03-11)" sodipodi:docname="retroarch.svg"> @@ -24,22 +24,23 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1.979899" - inkscape:cx="-0.71358335" - inkscape:cy="80.21972" + inkscape:zoom="2.8" + inkscape:cx="140.09253" + inkscape:cy="60.040888" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" showguides="true" - inkscape:window-width="1301" - inkscape:window-height="744" - inkscape:window-x="65" - inkscape:window-y="24" + inkscape:window-width="1920" + inkscape:window-height="1001" + inkscape:window-x="-9" + inkscape:window-y="-9" inkscape:window-maximized="1" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" - fit-margin-bottom="0"> + fit-margin-bottom="0" + inkscape:pagecheckerboard="true"> + originx="-635.53125" + originy="-706.75561" + spacingx="1" + spacingy="1" /> diff --git a/ui/drivers/qt/ui_qt_application.cpp b/ui/drivers/qt/ui_qt_application.cpp index 3a45561c53..0fb8315f69 100644 --- a/ui/drivers/qt/ui_qt_application.cpp +++ b/ui/drivers/qt/ui_qt_application.cpp @@ -41,50 +41,24 @@ static int app_argc = 1; static char app_name[] = "retroarch"; static char *app_argv[] = { app_name, NULL }; +/* ARGB 16x16 */ static const unsigned retroarch_qt_icon_data[] = { - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, - 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, - 0xffffffff, 0xffffffff, 0x000000ff, 0xffffffff, 0xffffffff, 0x00000000, - 0xffffffff, 0xffffffff, 0x000000ff, 0xffffffff, 0xffffffff, 0xffffffff, - 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0x000000ff, 0xffffffff, - 0xffffffff, 0x000000ff, 0xffffffff, 0xffffffff, 0xffffffff, 0x000000ff, - 0xffffffff, 0xffffffff, 0x000000ff, 0xffffffff, 0x00000000, 0x00000000, - 0x00000000, 0xffffffff, 0x000000ff, 0xffffffff, 0x000000ff, 0x000000ff, - 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0xffffffff, - 0x000000ff, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, - 0x000000ff, 0x000000ff, 0x000000ff, 0xffffffff, 0x000000ff, 0x000000ff, - 0x000000ff, 0xffffffff, 0x000000ff, 0x000000ff, 0x000000ff, 0xffffffff, - 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0x000000ff, 0x000000ff, - 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, - 0x000000ff, 0x000000ff, 0x000000ff, 0xffffffff, 0x00000000, 0x00000000, - 0x00000000, 0xffffffff, 0xffffffff, 0x000000ff, 0x000000ff, 0x000000ff, - 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, - 0xffffffff, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0xffffffff, 0xffffffff, 0x000000ff, 0xffffffff, 0xffffffff, 0xffffffff, - 0xffffffff, 0xffffffff, 0x000000ff, 0xffffffff, 0xffffffff, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0x000000ff, - 0xffffffff, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, - 0xffffffff, 0x000000ff, 0xffffffff, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, 0xffffffff, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0xffffffff, - 0xffffffff, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000 +0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000, +0x00000000,0x00000000,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0x00000000,0x00000000,0x00000000, +0x00000000,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0x00000000,0x00000000, +0x00000000,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0x00000000,0x00000000, +0x00000000,0xff333333,0xff333333,0xff333333,0xfff2f2f2,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xfff2f2f2,0xff333333,0xff333333,0xff333333,0x00000000,0x00000000, +0x00000000,0xff333333,0xfff2f2f2,0xff333333,0xff333333,0xfff2f2f2,0xff333333,0xff333333,0xff333333,0xfff2f2f2,0xff333333,0xff333333,0xfff2f2f2,0xff333333,0x00000000,0x00000000, +0x00000000,0xff333333,0xfff2f2f2,0xff333333,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xff333333,0xfff2f2f2,0xff333333,0x00000000,0x00000000, +0x00000000,0xff333333,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xff333333,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xff333333,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xff333333,0x00000000,0x00000000, +0x00000000,0xff333333,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xff333333,0x00000000,0x00000000, +0x00000000,0xff333333,0xff333333,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xfff2f2f2,0xff333333,0xff333333,0x00000000,0x00000000, +0x00000000,0xff333333,0xff333333,0xff333333,0xfff2f2f2,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xfff2f2f2,0xff333333,0xff333333,0xff333333,0x00000000,0x00000000, +0x00000000,0xff333333,0xff333333,0xfff2f2f2,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xfff2f2f2,0xff333333,0xff333333,0x00000000,0x00000000, +0x00000000,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0x00000000,0x00000000, +0x00000000,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0x00000000,0x00000000, +0x00000000,0x00000000,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0xff333333,0x00000000,0x00000000,0x00000000, +0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000,0x00000000 }; AppHandler::AppHandler(QObject *parent) :