[Relies on #263] Style update

CMakeLists.txt

@@ -116,6 +116,7 @@ vala_precompile(VALA_C
   src/Styles/modest.vala
 
   src/Services/Bookmark.vala
+  src/Services/ClockSettings.vala
   src/Services/FileManager.vala
   src/Services/Notebook.vala
   src/Services/Image.vala
@@ -139,8 +140,10 @@ OPTIONS
   ${GLOBAL_VALAC_OPTIONS}
 )
 
-add_executable(com.github.philip-scott.notes-up ${VALA_C} ${generated_resources})
+include (gresource)
+glib_compile_resources(GLIB_RESOURCES_ICONS SOURCE /data/assets.gresource.xml)
 
+add_executable(com.github.philip-scott.notes-up ${VALA_C} ${GLIB_RESOURCES_ICONS})
 
 install(TARGETS com.github.philip-scott.notes-up RUNTIME
   DESTINATION bin)

cmake/gresource.cmake

@@ -1,37 +1,69 @@
-# Used for GResource.
 #
-# resource_dir: Directory where the .gresource.xml is located.
-# resource_file: Filename of the .gresource.xml file (just the
-#                filename, not the complete path).
-# output_dir: Directory where the C output file is written.
-# output_file: This variable will be set with the complete path of the
-#              output C file.
+#    Copyright (C) 2013 Venom authors and contributors
+#
+#    This file is part of Venom.
+#
+#    Venom is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    Venom 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 General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with Venom.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+FIND_PROGRAM(GLIB_COMPILE_RESOURCES_EXECUTABLE NAMES glib-compile-resources)
+MARK_AS_ADVANCED(GLIB_COMPILE_RESOURCES_EXECUTABLE)
+
+INCLUDE(CMakeParseArguments)
 
-function (gresource resource_dir resource_file output_dir output_file)
-	# Get the output file path
-	get_filename_component (resource_name ${resource_file} NAME_WE)
-	set (output "${output_dir}/${resource_name}-resources.c")
-	set (${output_file} ${output} PARENT_SCOPE)
+FUNCTION(GLIB_COMPILE_RESOURCES output)
+  CMAKE_PARSE_ARGUMENTS(ARGS "" "" "SOURCE" ${ARGN})
+  SET(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+  SET(out_files "")
 
-	# Get the dependencies of the gresource
-	execute_process (
-		OUTPUT_VARIABLE _files
-		WORKING_DIRECTORY ${resource_dir}
-		COMMAND ${gresources_executable} --generate-dependencies ${resource_file}
-	)
+  FOREACH(src ${ARGS_SOURCE} ${ARGS_UNPARSED_ARGUMENTS})
+    SET(in_file "${CMAKE_CURRENT_SOURCE_DIR}/${src}")
+    GET_FILENAME_COMPONENT(WORKING_DIR ${in_file} PATH)
+    STRING(REPLACE ".xml" ".c" src ${src})
+    SET(out_file "${DIRECTORY}/${src}")
+    GET_FILENAME_COMPONENT(OUPUT_DIR ${out_file} PATH)
+    FILE(MAKE_DIRECTORY ${OUPUT_DIR})
+    LIST(APPEND out_files "${DIRECTORY}/${src}")
 
-	string (REPLACE "\n" ";" files ${_files})
+    #FIXME implicit depends currently not working
+    EXECUTE_PROCESS(
+      COMMAND
+        ${GLIB_COMPILE_RESOURCES_EXECUTABLE}
+          "--generate-dependencies"
+          ${in_file}
+      WORKING_DIRECTORY ${WORKING_DIR}
+      OUTPUT_VARIABLE in_file_dep
+    )
+    STRING(REGEX REPLACE "(\r?\n)" ";" in_file_dep "${in_file_dep}")
+    SET(in_file_dep_path "")
+    FOREACH(dep ${in_file_dep})
+      LIST(APPEND in_file_dep_path "${WORKING_DIR}/${dep}")
+    ENDFOREACH(dep ${in_file_dep})
+    ADD_CUSTOM_COMMAND(
+      OUTPUT ${out_file}
+      WORKING_DIRECTORY ${WORKING_DIR}
+      COMMAND
+        ${GLIB_COMPILE_RESOURCES_EXECUTABLE}
+      ARGS
+        "--generate-source"
+        "--target=${out_file}"
+        ${in_file}
+      DEPENDS
+        ${in_file};${in_file_dep_path}
+    )
+  ENDFOREACH(src ${ARGS_SOURCES} ${ARGS_UNPARSED_ARGUMENTS})
+  SET(${output} ${out_files} PARENT_SCOPE)
+ENDFUNCTION(GLIB_COMPILE_RESOURCES)
 
-	set (depends "")
-	foreach (cur_file ${files})
-		list (APPEND depends "${resource_dir}/${cur_file}")
-	endforeach ()
 
-	# Command to compile the resources
-	add_custom_command (
-		OUTPUT ${output}
-		DEPENDS "${resource_dir}/${resource_file}" ${depends}
-		WORKING_DIRECTORY ${resource_dir}
-		COMMAND ${gresources_executable} --generate-source --target=${output} ${resource_file}
-	)
-endfunction ()

data/assets.gresource.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+    <gresource prefix="/com/github/philip-scott/notes-up">
+        <file alias="stylesheet.css" compressed="false" preprocess="">stylesheet.css</file>
+  </gresource>
+</gresources>

data/stylesheet.css

@@ -0,0 +1,15 @@
+.title-label {
+    /* font-size: 1.15em;
+	font-size: 15px; */
+	font-size: 1.2em;
+	font-weight: 700;
+}
+
+.preview-label {
+	opacity:1;
+}
+
+.date-time-label {
+	opacity:0.6;
+	font-size:0.9em;
+}

schemas/org.notes.gschema.xml

@@ -91,7 +91,7 @@
 		</key>
 
 		<key name="editor-font" type="s">
-			<default>"Open Sans 12"</default>
+			<default>"Open Sans 10"</default>
 			<summary>Editor font</summary>
 			<description>The editor's font family and size</description>
 		</key>

src/Application.vala

@@ -54,6 +54,8 @@ public enum ENotes.Key {
 namespace ENotes {
     public ENotes.Services.Settings settings;
     public ENotes.Window window;
+    public ClockSettings clockSettings;
+    public bool use24HSFormat = false;
     public string NOTES_DB;
     public string NOTES_DIR;
 }
@@ -87,6 +89,9 @@ public class ENotes.Application : Granite.Application {
     public override void activate () {
         if (!running) {
             settings = ENotes.Services.Settings.get_instance ();
+
+            clockSettings = new ClockSettings ();
+            use24HSFormat = (clockSettings.clock_format == "24h");
 
             if (settings.notes_database == "") { // Init databases
                 var notes_dir = GLib.Environment.get_home_dir () + "/.local/share/notes-up/";

src/Services/ClockSettings.vala

@@ -0,0 +1,22 @@
+/***
+    BEGIN LICENSE
+    Copyright (C) 2016 elementary LLC.
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+    PURPOSE.  See the GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License along
+    with this program.  If not, see <http://www.gnu.org/licenses/>
+    END LICENSE
+***/
+public class ClockSettings : Granite.Services.Settings {
+
+    public string clock_format { get; set; }
+
+    public ClockSettings () {
+        base ("org.gnome.desktop.interface");
+    }
+}

src/Services/Page.vala

@@ -161,19 +161,19 @@ public class ENotes.PageTable : DatabaseTable {
     }
 
     public Page new_page (int64 notebook_id) {
-         var stmt = create_stmt ("INSERT INTO Page (notebook_id, name, creation_date, modification_date) "
+        var stmt = create_stmt ("INSERT INTO Page (notebook_id, name, creation_date, modification_date) "
                        + "VALUES (?, ?, CAST(strftime('%s', 'now') AS INT), CAST(strftime('%s', 'now') AS INT))");
 
-         bind_int (stmt, 1, notebook_id);
-         bind_text (stmt, 2, _("New Page"));
+        bind_int (stmt, 1, notebook_id);
+        bind_text (stmt, 2, _("New Page"));
 
-         stmt.step ();
+        stmt.step ();
 
-         return get_page (last_insert_row ());
+        return get_page (last_insert_row ());
     }
 
     public Gee.ArrayList<Page> get_pages (int64 notebook_id) {
-        var stmt = create_stmt ("SELECT id, name, subtitle, data FROM Page Where notebook_id = ?");
+        var stmt = create_stmt ("SELECT id, name, subtitle, data, creation_date, modification_date FROM Page Where notebook_id = ?");
         bind_int (stmt, 1, notebook_id);
 
         var pages = new Gee.ArrayList<Page>();
@@ -193,6 +193,8 @@ public class ENotes.PageTable : DatabaseTable {
             row.name = stmt.column_text (1);
             row.subtitle = stmt.column_text (2);
             row.data = stmt.column_text (3);
+            row.creation_date = stmt.column_int64 (4);
+            row.modification_date = stmt.column_int64 (5);
 
             pages.add (row);
         }

src/Widgets/PageItem.vala

@@ -25,6 +25,9 @@ public class ENotes.PageItem : Gtk.ListBoxRow {
     private Gtk.Grid grid;
     private Gtk.Label line1;
     private Gtk.Label line2;
+    private Gtk.Label line3;
+    private DateTime time;
+    private string date_string;
 
     public PageItem (ENotes.Page page) {
         this.page = page;
@@ -34,38 +37,53 @@ public class ENotes.PageItem : Gtk.ListBoxRow {
     private void build_ui () {
         set_activatable (true);
 
+        var margin_horizontal = 10;
+
         grid = new Gtk.Grid ();
         grid.orientation = Gtk.Orientation.VERTICAL;
 
         line1 = new Gtk.Label ("");
         line1.use_markup = true;
         line1.halign = Gtk.Align.START;
-        line1.get_style_context ().add_class ("h3");
+        line1.get_style_context ().add_class ("title-label");
         line1.ellipsize = Pango.EllipsizeMode.END;
         ((Gtk.Misc) line1).xalign = 0;
-        line1.margin_top = 4;
-        line1.margin_left = 8;
-        line1.margin_right = 8;
+        line1.margin_top = 10;
+        line1.margin_left = margin_horizontal;
+        line1.margin_right = margin_horizontal;
         line1.margin_bottom = 4;
 
         line2 = new Gtk.Label ("");
         line2.halign = Gtk.Align.START;
-        line2.margin_left = 8;
-        line2.margin_right = 8;
+        line2.margin_left = margin_horizontal;
+        line2.margin_right = margin_horizontal;
         line2.margin_bottom = 4;
         line2.use_markup = true;
         line2.set_line_wrap (true);
         line2.ellipsize = Pango.EllipsizeMode.END;
         ((Gtk.Misc) line2).xalign = 0;
-        line2.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL);
-        line2.lines = 3;
+        line2.get_style_context ().add_class ("preview-label");
+        line2.lines = 1;
+
+        line3 = new Gtk.Label ("");
+        line3.halign = Gtk.Align.START;
+        line3.margin_left = margin_horizontal;
+        line3.margin_right = margin_horizontal;
+        line3.margin_bottom = 10;
+        line3.use_markup = true;
+        line3.set_line_wrap (true);
+        line3.ellipsize = Pango.EllipsizeMode.END;
+        ((Gtk.Misc) line3).xalign = 0;
+        line3.get_style_context ().add_class ("date-time-label");
+        line3.lines = 1;
 
         var separator = new Gtk.Separator (Gtk.Orientation.HORIZONTAL);
         separator.hexpand = true;
 
         this.add (grid);
         grid.add (line1);
         grid.add (line2);
+        grid.add (line3);
         grid.add (separator);
 
         load_data ();
@@ -77,8 +95,17 @@ public class ENotes.PageItem : Gtk.ListBoxRow {
     }
 
     public void load_data () {
+        time = new DateTime.from_unix_utc (page.modification_date);
+
+        if (use24HSFormat) {
+            date_string = time.format ("%H:%M, %a, %e %b %Y");
+        } else {
+            date_string = time.format ("%l:%M %p, %a, %e %b %Y");
+        }
+        date_string = date_string.chug ();
+        this.line3.label = date_string;
         this.line2.label = page.subtitle;
-        this.line1.label = "<b>" + page.name + "</b>";
+        this.line1.label = page.name;
     }
 }
 

src/Widgets/PagesList.vala

@@ -76,13 +76,16 @@ public class ENotes.PagesList : Gtk.Box {
         });
 
         listbox.set_sort_func ((row1, row2) => {
-            int64 a = ((PageItem) row1).page.id;
-            int64 b = ((PageItem) row2).page.id;
+            int64 a = ((PageItem) row1).page.modification_date;
+            int64 b = ((PageItem) row2).page.modification_date;
 
             if (a > b) return -1;
             if (b > a) return 1;
 
             return 0;
+
+            // For sorting strings
+            // return a.collate (b);
         });
 
         scroll_box.set_size_request (200,250);
@@ -291,6 +294,7 @@ public class ENotes.PagesList : Gtk.Box {
                 var page_item = added_pages.get ((int) page.id);
                 page_item.page = page;
                 page_item.load_data ();
+                listbox.invalidate_sort ();
             }
         });
     }

src/Widgets/Window.vala

@@ -41,6 +41,11 @@ public class ENotes.Window : Gtk.ApplicationWindow {
     }
 
     private void build_ui () {
+
+        var provider = new Gtk.CssProvider ();
+        provider.load_from_resource ("/com/github/philip-scott/notes-up/stylesheet.css");
+        Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default (), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+
         headerbar = ENotes.Headerbar.get_instance ();
         set_titlebar (headerbar);