update splash screen, add windows icon

AUTHORS

@@ -6,6 +6,8 @@ Contributors:
    * Piano roll auto-scroll
  Georg Krause
    * Forward and backward button callbacks
+ Daniel Peterson
+   * Splash screen
 
 ----
 

CHANGELOG.md

@@ -1,7 +1,7 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
-## [0.7.344] - 2020-01-05
+## [0.7.345] - 2020-01-05
 - Add experimental VST2 support (X11 UIs only)
 - Previously visible plugins now open on project load
 - Fader and pan controls are now exposed as ports

data/meson.build

@@ -62,3 +62,5 @@ if desktop_utils.found()
     args: [desktop_file]
   )
 endif
+
+subdir('windows')

data/windows/meson.build

@@ -0,0 +1,23 @@
+# Copyright (C) 2020 Alexandros Theodotou <alex at zrythm dot org>
+#
+# This file is part of Zrythm
+#
+# Zrythm is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Zrythm is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Zrythm.  If not, see <https://www.gnu.org/licenses/>.
+
+if os_windows
+winmod = import('windows')
+win_res = winmod.compile_resources (
+  'zrythm.rc',
+  depend_files: 'zrythm.ico')
+endif

data/windows/zrythm.rc

@@ -0,0 +1 @@
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "zrythm.ico"

doc/user/conf.py

@@ -30,7 +30,7 @@ author = 'Alexandros Theodotou'
 from subprocess import check_output
 
 # The full version, including alpha/beta/rc tags
-release = '0.7.344'
+release = '0.7.345'
 # The short X.Y version
 version = release[:-4]
 

meson.build

@@ -17,7 +17,7 @@
 
 project (
   'zrythm', ['c', 'cpp'],
-  version: '0.7.344',
+  version: '0.7.345',
   license: 'AGPLv3+',
   meson_version: '>= 0.50.0',
   default_options: [
@@ -503,10 +503,10 @@ ext_srcs = []
 subdir ('po')
 subdir ('ext')
 subdir ('resources')
+subdir ('data')
 subdir ('src')
 subdir ('plugins')
 subdir ('tests')
-subdir ('data')
 subdir ('doc')
 subdir ('scripts')
 

resources/icons/zrythm/README

@@ -1,4 +1,17 @@
+The following copyright notice and license applies
+to z-splash-daniel-v1.png.
+
+Copyright (C) 2020 Daniel Peterson
+These files are licensed under CC-BY-SA-4.0.
+You should have received a copy of CC-BY-SA 4.0 along
+with Zrythm. If not, see <https://creativecommons.org/licenses/by-sa/4.0/>.
+
+-------------------------
+
+The following copyright notice and license applies
+to all other files in this directory.
+
 Copyright (C) 2019 Alexandros Theodotou
-All of the icons in this folder are licensed under CC-BY-SA-4.0.
+These files are licensed under CC-BY-SA-4.0.
 You should have received a copy of CC-BY-SA 4.0 along
 with Zrythm. If not, see <https://creativecommons.org/licenses/by-sa/4.0/>.

resources/ui/splash.ui

@@ -50,7 +50,7 @@
               <object class="GtkImage" id="img">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="icon_name">z-splash-png</property>
+                <property name="icon_name">z-splash-daniel-v1</property>
                 <property name="icon_size">0</property>
               </object>
               <packing>

src/gui/widgets/about_dialog.c

@@ -33,11 +33,12 @@ about_dialog_widget_new (
   GtkImage * img =
     GTK_IMAGE (
       resources_get_icon (ICON_TYPE_ZRYTHM,
-                          "z-splash-png.png"));
+                          "z-splash-daniel-v1.png"));
 
   const char * artists[] =
     {
       "Alexandros Theodotou <alex@zrythm.org>",
+      "Daniel Peterson",
       NULL
     };
   const char * authors[] =
@@ -70,7 +71,7 @@ about_dialog_widget_new (
       GTK_TYPE_ABOUT_DIALOG,
       "artists", artists,
       "authors", authors,
-      "copyright", "Copyright (C) 2018-2019 Alexandros Theodotou",
+      "copyright", "Copyright (C) 2018-2020 Alexandros Theodotou",
       "documenters", documenters,
       /*"logo-icon-name", "z",*/
       "logo", gtk_image_get_pixbuf (img),

src/meson.build

@@ -44,10 +44,16 @@ if not cyaml_dep.found()
     ]
 endif
 
+# there are problems if added to zrythm_srcs directly
+zrythm_lib_srcs = zrythm_srcs
+if os_windows
+  zrythm_lib_srcs += win_res
+endif
+
 zrythm_lib = static_library (
   'zrythm-lib',
   sources: [
-    zrythm_srcs,
+    zrythm_lib_srcs,
     ext_srcs,
     ],
   dependencies: zrythm_deps,

src/zrythm.c

@@ -660,10 +660,18 @@ zrythm_app_startup (
     gdk_monitor_get_scale_factor (monitor);
   g_message (
     "Monitor scale factor: %d", scale_factor);
+#ifdef _WIN32
   g_object_set (
     gtk_settings_get_default (),
-    "gtk-font-name", "Cantarell Regular 10",
-    NULL);
+    "gtk-font-name", "Segoe UI Normal 10", NULL);
+  g_object_set (
+    gtk_settings_get_default (),
+    "gtk-cursor-theme-name", "Adwaita", NULL);
+#else
+  g_object_set (
+    gtk_settings_get_default (),
+    "gtk-font-name", "Cantarell Regular 10", NULL);
+#endif
   g_message ("Theme set");
 
   /*g_object_set (gtk_settings_get_default (),*/

tools/convert_svg_to_ico.sh

@@ -0,0 +1,3 @@
+# Convert SVG to ICO using ImageMagick, with transparent background and multi-size icons
+# from https://gist.github.com/azam/3b6995a29b9f079282f3
+convert -density 384 -background transparent $1 -define icon:auto-resize -colors 256 $2