Merge branch 'master' into musl

elementary · Jan 5, 2019 · 953a41e · 953a41e
2 parents 09c884f + 1da543c
commit 953a41e
Show file tree

Hide file tree

Showing 228 changed files with 15,263 additions and 15,731 deletions.
diff --git a/core/Settings/LanguagesFormat.vala b/core/Settings/LanguagesFormat.vala
@@ -22,7 +22,7 @@ namespace Maya.Settings {
     }
 
     public string DateFormat_Complete () {
-        return _("%A, %b %d");
+        return _("%a, %b %d");
     }
 
     public string TimeFormat () {
@@ -45,3 +45,4 @@ namespace Maya.Settings {
     }
 
 }
+
diff --git a/core/Utils.vala b/core/Utils.vala
@@ -634,21 +634,4 @@ namespace Maya.Util {
             Settings.SavedState.get_default ().show_weeks = !Settings.SavedState.get_default ().show_weeks;
         }
     }
-
-    public void style_calendar_color (Gtk.Widget widget, string color, bool background = false) {
-        string style = ".cal_color { %s: %s }";
-
-        var style_context = widget.get_style_context ();
-        style_context.add_class ("cal_color");
-        var css_color = style.printf(background ? "background-color" : "color", color);
-        var style_provider = new Gtk.CssProvider ();
-
-        try {
-            style_provider.load_from_data (css_color, css_color.length);
-            style_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-        } catch (Error e) {
-            warning ("Could not create CSS Provider: %s\nStylesheet:\n%s", e.message, css_color);
-        }
-    }
-
 }
diff --git a/core/config.vala.in b/core/config.vala.in
@@ -1,7 +1,5 @@
 namespace Build {
     public const string APP_NAME = "@APP_NAME@";
     public const string EXEC_NAME = "@EXEC_NAME@";
-    public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
     public const string PLUGIN_DIR = "@PLUGIN_DIR@";
-    public const string VERSION = "@VERSION@";
 }
diff --git a/core/meson.build b/core/meson.build
@@ -1,9 +1,7 @@
 config_data = configuration_data()
 config_data.set('APP_NAME', 'Calendar')
 config_data.set('EXEC_NAME', meson.project_name())
-config_data.set('GETTEXT_PACKAGE', meson.project_name())
 config_data.set('PLUGIN_DIR', pluginsdir)
-config_data.set('VERSION', meson.project_version())
 
 config_file = configure_file(
     configuration: config_data,
@@ -27,6 +25,7 @@ core_files = files(
 
 core_deps = [
     glib_dep,
+    gee_dep,
     granite_dep,
     gtk_dep,
     libecal_dep,

diff --git a/daemon/Daemon.vala b/daemon/Daemon.vala
@@ -19,13 +19,10 @@ namespace MayaDaemon {
     const OptionEntry[] options =  {
         { "debug", 'd', 0, OptionArg.NONE, out has_debug,
         N_("Print debug information"), null},
-        { "version", 0, 0, OptionArg.NONE, out has_version,
-        N_("Print version info and exit"), null},
         { null }
     };
     private static MainLoop mainloop;
     private static bool has_debug;
-    private static bool has_version;
     private Gee.HashMap<E.CalComponent, string> event_uid;
 
     private static void on_exit (int signum) {
@@ -47,12 +44,6 @@ namespace MayaDaemon {
             error (e.message);
         }
 
-        if (has_version) {
-            message ("%s (Daemon)", Build.APP_NAME);
-            message ("%s", Build.VERSION);
-            return 0;
-        }
-
         Granite.Services.Logger.initialize (Build.APP_NAME);
         Granite.Services.Logger.DisplayLevel = Granite.Services.LogLevel.WARN;
 

diff --git a/data/maya.gresource.xml b/data/maya.gresource.xml
@@ -4,6 +4,7 @@
     <file alias="calendar-go-today.svg" compressed="true" preprocess="xml-stripblanks">calendar-go-today.svg</file>
     <file alias="location-marker.svg" compressed="true" preprocess="xml-stripblanks">LocationMarker.svg</file>
     <file alias="AgendaEventRow.css" compressed="true">style/AgendaEventRow.css</file>
+    <file alias="Application.css" compressed="true">style/Application.css</file>
     <file alias="calendar.css" compressed="true">style/calendar.css</file>
     <file alias="ColorButton.css" compressed="true">style/ColorButton.css</file>
   </gresource>

diff --git a/data/style/AgendaEventRow.css b/data/style/AgendaEventRow.css
@@ -18,3 +18,14 @@
 .event .title {
     font-weight: 600;
 }
+
+row:selected .event {
+    background: mix (#fff, @accent_color, 0.2);
+    box-shadow:
+       0 1px 2px alpha (#000, 0.2),
+       0 1px 3px alpha (@accent_color, 0.15);
+}
+
+row:selected .event image {
+    color: shade(@accent_color, 0.65);
+}
diff --git a/data/style/Application.css b/data/style/Application.css
@@ -0,0 +1,2 @@
+@define-color colorAccent @LIME_500;
+
diff --git a/po/POTFILES b/po/POTFILES
@@ -18,6 +18,7 @@ src/ImportDialog.vala
 src/MainWindow.vala
 src/EventEdition/ContactImage.vala
 src/EventEdition/EventDialog.vala
+src/EventEdition/GuestGrid.vala
 src/EventEdition/GuestsPanel.vala
 src/EventEdition/InfoPanel.vala
 src/EventEdition/LocationPanel.vala
@@ -44,4 +45,5 @@ src/Widgets/ContractorButtonWithMenu.vala
 src/Widgets/DateSwitcher.vala
 src/Widgets/DateTimePicker.vala
 src/Widgets/DynamicSpinner.vala
+src/Widgets/EventMenu.vala
 src/Widgets/HeaderBar.vala