Better appearance integration, allowing easy themeability

gtg@bsaleil.org/gtgcalendarmenu.js

@@ -72,8 +72,7 @@ const GTGCalendarMenu = new Lang.Class({
 
 		// Scroll view
 		this.scrollView = new St.ScrollView({style_class: 'vfade',
-                                          hscrollbar_policy: Gtk.PolicyType.NEVER,
-                                          vscrollbar_policy: Gtk.PolicyType.ALWAYS});
+                                          hscrollbar_policy: Gtk.PolicyType.NEVER});
 		this.scrollView.add_actor(this.mainBox);
 		this.mainBox.add_actor(this.scrollView, {expand: true});
 
@@ -155,13 +154,17 @@ const GTGCalendarMenu = new Lang.Class({
 		else
 		{
 			dateFormat = _("%A, %B %d");
-        		strTitle = day.toLocaleFormat(dateFormat);
-        	}
-        	title = new PopupMenu.PopupMenuItem(strTitle, {reactive: false});
-        	title.actor.set_style("padding-top : 10px");
-        	// Check preferences
-        	if (prefs.SystemTheme)
-			title.actor.add_style_class_name("dayTitle");
+			strTitle = day.toLocaleFormat(dateFormat);
+		}
+		title = new PopupMenu.PopupMenuItem(strTitle, {reactive: false});
+		// Check preferences
+		if (prefs.SystemTheme) {
+			title.actor.remove_style_class_name("popup-menu-item");
+			title.actor.remove_style_class_name("popup-inactive-menu-item");
+			title.actor.add_style_class_name("events-day-header");
+		} else {
+			title.actor.add_style_class_name("dayTitle-custom");
+		}
 
 		this.tasksBox.add(title.actor,{y_align: St.Align.START,y_fill: false});
 		actors.push(title);
@@ -175,7 +178,7 @@ const GTGCalendarMenu = new Lang.Class({
 		{
 			var nbTasks = 0;
 			// First block
-			for (i=0; i<allTasks.length; i++)
+			for (let i = 0; i < allTasks.length; i++)
 			{
 				let ret = allTasks[i].startdate.split('-');
 				let startDate = new Date(ret[0],ret[1]-1,ret[2]);
@@ -201,7 +204,7 @@ const GTGCalendarMenu = new Lang.Class({
 			}			
 
 			// Second block
-			for (i=0; i<allTasks.length; i++)
+			for (let i = 0; i < allTasks.length; i++)
 			{
 				let ret = allTasks[i].startdate.split('-');
 				let startDate = new Date(ret[0],ret[1]-1,ret[2]);
@@ -266,36 +269,48 @@ const GTGCalendarMenu = new Lang.Class({
 			strTask = strTask.substr(0,LENGTHMAX) + "..."
 
 		let taskItem = new PopupMenu.PopupMenuItem(strTask);
-		taskItem.actor.set_style("padding-left:50px;");
+		//taskItem.actor.set_style("padding-left:50px;");
 
 		taskItem.connect('activate', function() {
 			GTGDBus.openTaskEditor(task.id);
 			Main.panel.statusArea.dateMenu.menu.close();
 		});		
 
 		// Check preferences
-		if (multipleDayTask)
-			if (prefs.SystemTheme)
+		if (multipleDayTask) {
+			if (prefs.SystemTheme) {
+				taskItem.actor.add_style_class_name("events-day-task");
 				taskItem.actor.add_style_class_name("multipleDayTask");
-		else
-			if (prefs.SystemTheme)
-				taskItem.actor.add_style_class_name("task");
+
+			} else {
+				taskItem.actor.add_style_class_name("multipleDayTask-custom");
+			}
+		} else {
+			if (prefs.SystemTheme) {
+				taskItem.actor.add_style_class_name("events-day-task");
+			} else {
+				taskItem.actor.add_style_class_name("task-custom");
+			}
+		}
 
 		this.tasksBox.add(taskItem.actor,{y_align: St.Align.START,y_fill: false});
 		actors.push(taskItem);
 	},
 
+	// FIXME: Duplicated code
 	// Display a blocked item (non-clickable) with given string
 	displayBlockedItem: function(title)
 	{
 		let item = new PopupMenu.PopupMenuItem(title,{reactive:false});
-		item.actor.set_style("padding-left:50px");
 
-		// Check preferences
-		if (prefs.SystemTheme)
-			item.actor.add_style_class_name("task");
+		if (prefs.SystemTheme) {
+			item.actor.remove_style_class_name("popup-inactive-menu-item");
+			item.actor.add_style_class_name("events-day-task");
+		} else {
+			item.actor.add_style_class_name("task-custom");
+		}
 
-		this.tasksBox.add(item.actor,{y_align: St.Align.START,y_fill: false});		
+		this.tasksBox.add(item.actor,{y_align: St.Align.START,y_fill: false});
 		actors.push(item);
 	},
 
@@ -342,6 +357,7 @@ const GTGCalendarMenu = new Lang.Class({
 		{
 			this.tasksBox.remove_actor(actors[i].actor);
 		}
+		actors = [];
 	},
 
 	// Open GTG if it's closed
@@ -442,3 +458,4 @@ function loadPreferences()
 	else
 		showSystemTasksList();
 }
+

gtg@bsaleil.org/gtgtodomenu.js

@@ -11,6 +11,8 @@ const Extension = ExtensionUtils.getCurrentExtension();
 const GTGCalendarMenu = Extension.imports.gtgcalendarmenu;
 const GTGDBus = Extension.imports.gtgdbus;
 const Preferences = Extension.imports.prefs;
+const Gettext = imports.gettext;
+const _ = Gettext.domain('gtgextension').gettext;
 
 const LENGTHMAX = 40; // Maximum length of a displayed task
 
@@ -24,6 +26,9 @@ const GTGTodoMenu = new Lang.Class({
 
 	_init: function()
 	{
+		let locales = Extension.dir.get_path() + "/locale";
+		Gettext.bindtextdomain('gtgextension', locales);
+
 		// Load tasks
 		allTasks = new Array();
 		loadTasks();
@@ -62,8 +67,7 @@ const GTGTodoMenu = new Lang.Class({
 
 		// Scroll view
 		this.scrollView = new St.ScrollView({style_class: 'vfade',
-                                          hscrollbar_policy: Gtk.PolicyType.NEVER,
-                                          vscrollbar_policy: Gtk.PolicyType.ALWAYS});
+                                          hscrollbar_policy: Gtk.PolicyType.NEVER});
 		this.scrollView.add_actor(this.todoBox);
 		calendar.add_actor(this.scrollView);
 
@@ -89,37 +93,49 @@ const GTGTodoMenu = new Lang.Class({
 		// Remove actual actors
 		for (let i=0; i<actors.length; i++)
 			this.todoBox.remove_actor(actors[i].actor);
-
-		// Display tasks only if gtg is running
-		if (!running)
-		{
-			this.displayBlockedItem("GTG is closed");
+
+		let title = new PopupMenu.PopupMenuItem(_("To do"), {reactive: false});
+		if (prefs.SystemTheme) {
+			title.actor.remove_style_class_name("popup-menu-item");
+			title.actor.remove_style_class_name("popup-inactive-menu-item");
+			title.actor.add_style_class_name("events-day-header");
+		} else {
+			title.actor.add_style_class_name("dayTitle-custom");
 		}
-		else
-		{	
+		this.todoBox.add(title.actor,{y_align: St.Align.START,y_fill: false});
+		actors.push(title);
+
+		// Display tasks only if gtg is running
+		if (!running) {
+			this.displayBlockedItem(_("GTG is closed"));
+		} else {
 			// Display all tasks without start and due date
 			var nbTasks = 0;
-			for (i=0; i<allTasks.length; i++)
+			for (let i = 0; i < allTasks.length; i++)
 				if (allTasks[i].startdate == "" && allTasks[i].duedate == "")
 				{
 					this.displayTodo(allTasks[i]);
 					nbTasks++;
 				}
 			if (nbTasks < 1)
-				this.displayBlockedItem("Nothing");
+				this.displayBlockedItem(_("Nothing Scheduled"));
 		}
 	},
 
+	// FIXME: Duplicated code
 	// Display a blocked item (non-clickable) with given string
 	displayBlockedItem: function(title)
 	{
 		let item = new PopupMenu.PopupMenuItem(title,{reactive:false});
 
-		// Check preferences
-		if (prefs.SystemTheme)
-			item.actor.add_style_class_name("task");
-
-		this.todoBox.add(item.actor,{y_align: St.Align.START,y_fill: false});		
+		if (prefs.SystemTheme) {
+			item.actor.remove_style_class_name("popup-inactive-menu-item");
+			item.actor.add_style_class_name("events-day-task");
+		} else {
+			item.actor.add_style_class_name("task-custom");
+		}
+
+		this.todoBox.add(item.actor,{y_align: St.Align.START,y_fill: false});
 		actors.push(item);
 	},
 
@@ -134,9 +150,12 @@ const GTGTodoMenu = new Lang.Class({
 		let item = new PopupMenu.PopupMenuItem(title);
 
 		// Check preferences
-		if (prefs.SystemTheme)
-			item.actor.add_style_class_name("task");
-
+		if (prefs.SystemTheme) {
+			item.actor.add_style_class_name("events-day-task");
+		} else {
+			item.actor.add_style_class_name("task-custom");
+		}
+
 		item.connect('activate', function() {
 			GTGDBus.openTaskEditor(task.id);
 			Main.panel.statusArea.dateMenu.menu.close();

gtg@bsaleil.org/locale/af/LC_MESSAGES/af.po

@@ -15,3 +15,6 @@ msgstr "Open GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/an/LC_MESSAGES/an.po

@@ -15,3 +15,6 @@ msgstr "Ubrir GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/ar/LC_MESSAGES/ar.po

@@ -15,3 +15,6 @@ msgstr "افتح GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/as/LC_MESSAGES/as.po

@@ -15,3 +15,6 @@ msgstr "খোলক GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/ast/LC_MESSAGES/ast.po

@@ -15,3 +15,6 @@ msgstr "Abrir GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/be/LC_MESSAGES/be.po

@@ -15,3 +15,6 @@ msgstr "Адкрыць GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/bg/LC_MESSAGES/bg.po

@@ -15,3 +15,6 @@ msgstr "Отваряне GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/bn/LC_MESSAGES/bn.po

@@ -15,3 +15,6 @@ msgstr "খুলুন GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/bn_IN/LC_MESSAGES/bn_IN.po

@@ -15,3 +15,6 @@ msgstr "খুলুন GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/ca/LC_MESSAGES/ca.po

@@ -15,3 +15,6 @@ msgstr "Obre GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/ca@valencia/LC_MESSAGES/ca@valencia.po

@@ -15,3 +15,6 @@ msgstr "Obri GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/cs/LC_MESSAGES/cs.po

@@ -15,3 +15,6 @@ msgstr "Otevřít GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/da/LC_MESSAGES/da.po

@@ -15,3 +15,6 @@ msgstr "Åbn GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/de/LC_MESSAGES/de.po

@@ -15,3 +15,6 @@ msgstr "Öffnen GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/el/LC_MESSAGES/el.po

@@ -15,3 +15,6 @@ msgstr "Άνοιγμα GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/en_GB/LC_MESSAGES/en_GB.po

@@ -15,3 +15,6 @@ msgstr "Open GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/eo/LC_MESSAGES/eo.po

@@ -15,3 +15,6 @@ msgstr "Malfermi GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/es/LC_MESSAGES/es.po

@@ -14,4 +14,7 @@ msgid "Open GTG"
 msgstr "Abrir GTG"
 
 msgid "GTG is closed"
-msgstr "GTG is closed"
+msgstr "GTG está cerrado"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/et/LC_MESSAGES/et.po

@@ -15,3 +15,6 @@ msgstr "Ava GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/eu/LC_MESSAGES/eu.po

@@ -15,3 +15,6 @@ msgstr "Ireki GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/fa/LC_MESSAGES/fa.po

@@ -15,3 +15,6 @@ msgstr "بازکردن GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/fi/LC_MESSAGES/fi.po

@@ -15,3 +15,6 @@ msgstr "Avaa GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"

gtg@bsaleil.org/locale/fr/LC_MESSAGES/fr.po

@@ -15,3 +15,6 @@ msgstr "Ouvrir GTG"
 
 msgid "GTG is closed"
 msgstr "GTG is closed"
+
+msgid "To do"
+msgstr "To do"