Merge lp:~cando/activity-log-manager/appdialog-fixes into lp:~activity-log-manager/activity-log-manager/vala

[Stefano Candori]

In this branch i've added a bunch of fixes regarding the ApplicationChooserDialog.
See the commit below for the explanation of the changes.

[lp:~cando/activity-log-manager/appdialog-fixes]

106. By Stefano Candori on 2012-03-15

Added updated .pot file.

[Stefano Candori (cando)]

I've also added the udpated .pot files.
Currently launchpad is configured to import the pot file from the 0.8 series...we should udpate this, right?

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

Yeah. We need to ask someone to up

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

Sweet. Looks like already updated
https://launchpad.net/ubuntu/+source/activity-log-manager

[Stefano Candori (cando)]

Cool..review on the branch? :)

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

Everything looks fine.

Seif have a look

review: Approve

=== added file 'po/activity-log-manager.pot'
--- po/activity-log-manager.pot	1970-01-01 00:00:00 +0000
+++ po/activity-log-manager.pot	2012-03-15 12:56:21 +0000
@@ -0,0 +1,252 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-03-15 13:52+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../data/activity-log-manager-ccpanel.desktop.in.h:1
+msgid "Privacy"
+msgstr ""
+
+#: ../data/activity-log-manager-ccpanel.desktop.in.h:2
+msgid "Privacy and Activity Manager"
+msgstr ""
+
+#. These keywords are used when searching for applications in dashes, etc.
+#: ../data/activity-log-manager-ccpanel.desktop.in.h:4
+msgid "privacy;activity;log;zeitgeist;"
+msgstr ""
+
+#: ../data/activity-log-manager.desktop.in.h:1
+msgid "Activities and Privacy Manager Tool"
+msgstr ""
+
+#: ../data/activity-log-manager.desktop.in.h:2 ../src/alm.vala:30
+msgid "Activity Log Manager"
+msgstr ""
+
+#: ../data/activity-log-manager.desktop.in.h:3
+msgid "Configure what gets logged in your Zeitgeist activity log"
+msgstr ""
+
+#: ../src/activity-log-manager.vala:45
+msgid "Recent Items"
+msgstr ""
+
+#: ../src/activity-log-manager.vala:50
+msgid "Files"
+msgstr ""
+
+#: ../src/activity-log-manager.vala:54
+msgid "Applications"
+msgstr ""
+
+#: ../src/activity-log-manager.vala:61
+#, c-format
+msgid "Record Activity"
+msgstr ""
+
+#: ../src/applications-widget.vala:86
+msgid "Add Application"
+msgstr ""
+
+#: ../src/applications-widget.vala:90
+msgid "Remove Application"
+msgstr ""
+
+#: ../src/applications-widget.vala:101
+#, c-format
+msgid "Do not log activity from the following applications:"
+msgstr ""
+
+#: ../src/applications-widget.vala:120 ../src/applications-widget.vala:559
+msgid "Select Application"
+msgstr ""
+
+#: ../src/applications-widget.vala:180
+msgid "No description available"
+msgstr ""
+
+#: ../src/applications-widget.vala:489 ../src/files-widget.vala:354
+msgid "Name"
+msgstr ""
+
+#: ../src/applications-widget.vala:504
+msgid "Last Used"
+msgstr ""
+
+#: ../src/applications-widget.vala:517
+msgid "Activity"
+msgstr ""
+
+#: ../src/applications-widget.vala:613
+msgid "Today"
+msgstr ""
+
+#: ../src/applications-widget.vala:614
+msgid "Yesterday"
+msgstr ""
+
+#: ../src/applications-widget.vala:627
+msgid "Never"
+msgstr ""
+
+#: ../src/files-widget.vala:253
+msgid "Audio"
+msgstr ""
+
+#: ../src/files-widget.vala:254
+msgid "Video"
+msgstr ""
+
+#: ../src/files-widget.vala:255
+msgid "Image"
+msgstr ""
+
+#: ../src/files-widget.vala:256
+msgid "Text"
+msgstr ""
+
+#: ../src/files-widget.vala:257
+msgid "Presentation"
+msgstr ""
+
+#: ../src/files-widget.vala:258
+msgid "Spreadsheet"
+msgstr ""
+
+#: ../src/files-widget.vala:259
+msgid "Instant Messaging"
+msgstr ""
+
+#: ../src/files-widget.vala:260
+msgid "E-mail"
+msgstr ""
+
+#: ../src/files-widget.vala:261
+msgid "Website"
+msgstr ""
+
+#: ../src/files-widget.vala:288
+#, c-format
+msgid "Don't record activity for following type of files:"
+msgstr ""
+
+#: ../src/files-widget.vala:340
+#, c-format
+msgid "Don't record activity in the following folders:"
+msgstr ""
+
+#: ../src/files-widget.vala:378
+msgid "Add Folder"
+msgstr ""
+
+#: ../src/files-widget.vala:382
+msgid "Remove Folder"
+msgstr ""
+
+#: ../src/files-widget.vala:402
+msgid "Select a directory to blacklist"
+msgstr ""
+
+#: ../src/history-widget.vala:45
+msgid "The past hour"
+msgstr ""
+
+#: ../src/history-widget.vala:46
+msgid "The past day"
+msgstr ""
+
+#: ../src/history-widget.vala:47
+msgid "The past week"
+msgstr ""
+
+#: ../src/history-widget.vala:48
+msgid "All"
+msgstr ""
+
+#: ../src/history-widget.vala:49
+msgid "Advanced"
+msgstr ""
+
+#: ../src/history-widget.vala:61
+#, c-format
+msgid "Forget activities"
+msgstr ""
+
+#: ../src/history-widget.vala:68
+#, c-format
+msgid ""
+"Every time a file or an application is used, some information can be stored. "
+"This activity can be used to retrieve files during searches or as history in "
+"applications."
+msgstr ""
+
+#: ../src/history-widget.vala:103
+msgid "Delete history"
+msgstr ""
+
+#: ../src/history-widget.vala:148
+msgid ""
+"This operation cannot be undone, are you sure you want to delete this "
+"activity?"
+msgstr ""
+
+#: ../src/history-widget.vala:285
+msgid "From:"
+msgstr ""
+
+#: ../src/history-widget.vala:289
+msgid "To:"
+msgstr ""
+
+#: ../src/history-widget.vala:300
+#, c-format
+msgid "Invalid Timerange"
+msgstr ""
+
+#: ../src/diagnostics/com.ubuntu.whoopsiepreferences.policy.in.h:1
+msgid "Privacy settings"
+msgstr ""
+
+#: ../src/diagnostics/com.ubuntu.whoopsiepreferences.policy.in.h:2
+msgid "To change your privacy settings you need to authenticate."
+msgstr ""
+
+#: ../src/diagnostics/whoopsie.ui.h:1
+msgid ""
+"<small>Error reports include information about what a program was doing when "
+"it failed. You always have the choice to send or cancel an error report.</"
+"small>"
+msgstr ""
+
+#: ../src/diagnostics/whoopsie.ui.h:2
+msgid "People using this computer can:"
+msgstr ""
+
+#: ../src/diagnostics/whoopsie.ui.h:3
+msgid "Privacy Policy"
+msgstr ""
+
+#: ../src/diagnostics/whoopsie.ui.h:4
+msgid "Send error reports to Canonical"
+msgstr ""
+
+#: ../src/diagnostics/whoopsie.ui.h:5
+msgid ""
+"Ubuntu can collect anonymous information that helps developers improve it. "
+"All information collected is covered by our privacy policy."
+msgstr ""

=== modified file 'src/applications-widget.vala'
--- src/applications-widget.vala	2012-03-12 14:45:32 +0000
+++ src/applications-widget.vala	2012-03-15 12:56:21 +0000
@@ -347,20 +347,34 @@
 			this.pack_start (scroll);
 		}
 		
-		public static Gdk.Pixbuf? get_pixbuf_from_gio_icon (Icon icon, int size=32) {
+		public static Gdk.Pixbuf? get_pixbuf_from_gio_icon (Icon? icon, int size=32) {
 			Gdk.Pixbuf? pix = null;
-			var icon_info = IconTheme.get_default ().lookup_by_gicon (icon ,
-															size,
-															IconLookupFlags.FORCE_SVG);
-			if (icon_info != null) {
-				try {
-					pix = icon_info.load_icon ();
-				}
-				catch (Error e){
-					return null;
-				}
-			}
-			
+			IconTheme theme = IconTheme.get_default ();
+			IconInfo icon_info = null;
+			/*If the application hasn't an icon in the current theme
+			  let's use the gtk-execute icon: 
+			  http://developer.gnome.org/gtk3/3.2/gtk3-Stock-Items.html#GTK-STOCK-EXECUTE:CAPS
+			*/
+			if(icon == null) {
+				icon_info = theme.lookup_icon ("gtk-execute" ,
+												size,
+												IconLookupFlags.FORCE_SVG);
+			}
+			else {
+				icon_info = theme.lookup_by_gicon (icon ,
+													size,
+													IconLookupFlags.FORCE_SVG);
+				if (icon_info == null)
+					icon_info = theme.lookup_icon ("gtk-execute" ,
+												size,
+												IconLookupFlags.FORCE_SVG);
+			}
+			try {
+				pix = icon_info.load_icon ();
+			}
+			catch (Error e){
+				return null;
+			}
 			return pix;
 		}
 
@@ -375,7 +389,13 @@
 
 				// Insert only when it is empty
 				if(this.blocked_apps.lookup(app) == null)
-					this.blocked_apps.insert(app, new AppChooseInfo(app_info.get_id(), app_info.get_name(), pix, "", 0));
+					this.blocked_apps.insert(app, new AppChooseInfo(
+														app_info.get_id(),
+														app_info.get_name(),
+														pix,
+														"",
+														0,
+														0));
 			}
 		}
 		
@@ -466,7 +486,7 @@
 		
 		private void set_up_ui () {
 			var column_pix_name = new TreeViewColumn ();
-			column_pix_name.set_title ("Name");
+			column_pix_name.set_title (_("Name"));
 			this.treeview.append_column (column_pix_name);
 			var pix_rend = new CellRendererPixbuf ();
 			column_pix_name.pack_start (pix_rend, false);
@@ -477,10 +497,11 @@
 			column_pix_name.add_attribute (name_rend, "text", 0);
 			column_pix_name.set_resizable (true);
 			column_pix_name.set_min_width (200);
+			column_pix_name.set_max_width (400);
 			column_pix_name.set_sort_column_id (0);
 
 			var column_used_name = new TreeViewColumn ();
-			column_used_name.set_title ("Last Used");
+			column_used_name.set_title (_("Last Used"));
 			this.treeview.append_column (column_used_name);
 			var used_rend = new CellRendererText ();
 			used_rend.set_property ("ellipsize", Pango.EllipsizeMode.END);
@@ -488,11 +509,12 @@
 			column_used_name.add_attribute (used_rend, "text", 3);
 			column_used_name.set_resizable (true);
 			column_used_name.set_min_width (200);
+			column_used_name.set_max_width (400);
 			column_used_name.set_sort_column_id (4);
-			used_rend.set_property("xalign", 1);
+			used_rend.set_property("xalign", 0);
 			
 			var column_usage_name = new TreeViewColumn ();
-			column_usage_name.set_title ("Activity");
+			column_usage_name.set_title (_("Activity"));
 			this.treeview.append_column (column_usage_name);
 			var usage_rend = new UsageCellRenderer ();
 			column_usage_name.pack_start (usage_rend, true);
@@ -557,6 +579,18 @@
 			}
 		}
 		
+		private int compare_dates(DateTime now, DateTime time) {
+			int res = -1;
+			int now_y, now_m, now_d, time_y, time_m, time_d;
+			now.get_ymd(out now_y, out now_m, out now_d); 
+			time.get_ymd(out time_y, out time_m, out time_d);
+			if (now_y == time_y && now_m == time_m && now_d == time_d)
+				return 0;
+			else if (now_y == time_y && now_m == time_m && now_d == time_d + 1)
+				return 1;
+			return res;
+		}
+		
 		public void handle_app_population(HashTable<string, int64?> all_actors) {
 			all_actors_list = all_actors;
 
@@ -570,18 +604,27 @@
 			{
 				string id = app_info.get_id ();
 				int64? last_accessed_time = all_actors.lookup(id);
-				//
 				if(last_accessed_time != null)
 				{
 					var time = new DateTime.from_unix_local (last_accessed_time/1000);
-					var last_accessed = time.format("%e %B %Y");
+					var now = new DateTime.now_local();
+					var res = this.compare_dates(now, time);
+					string last_accessed = "";
+					string today = _("Today");
+					string yesterday = _("Yesterday");
+					if (res == 0) // Today
+						last_accessed = time.format(today + ", %H:%M");
+					else if (res == 1) // Yesterday
+						last_accessed = time.format(yesterday + ", %H:%M");
+					else 
+						last_accessed = time.format("%e %B %Y, %H:%M");
 
 					insert_liststore(app_info, last_accessed, last_accessed_time,
 									0);
 				}
 				else {
 					other_appinfo.append(app_info);
-					insert_liststore(app_info, "", 0, 0);
+					insert_liststore(app_info, _("Never"), 0, 0);
 				}
 			}
 			/*foreach(AppInfo app_info in other_appinfo)
@@ -596,9 +639,7 @@
 			var name = app_info.get_name ();
 
 			var icon = app_info.get_icon ();
-			Gdk.Pixbuf? pix = null;
-			if(icon != null)
-				pix = ApplicationsTreeView.get_pixbuf_from_gio_icon (icon);
+			Gdk.Pixbuf? pix = ApplicationsTreeView.get_pixbuf_from_gio_icon (icon);
 
 			AppChooseInfo app_choose_info = blocked_apps.lookup(id);
 			if(app_choose_info == null)
@@ -607,11 +648,13 @@
 				this.treeview.liststore.append(out iter);
 				this.treeview.liststore.set(iter, 0, name, 1, pix, 2, id,
 											3, last_accessed, 4, last_accessed_time, 5, 0, -1);
-				this.blocked_apps.insert(id, new AppChooseInfo(id, name, pix, last_accessed, usage));
+				this.blocked_apps.insert(id, new AppChooseInfo(id, name, pix, 
+																last_accessed, 
+																last_accessed_time,
+																usage));
 				//this.actors_iter[id] = iter;
 				if (last_accessed_time > 0)
-					this.app_blacklist.get_count_for_app(id, iter, this.treeview.liststore);
-				
+					this.app_blacklist.get_count_for_app(id, iter, this.treeview.liststore); 
 			}
 			else
 			{
@@ -627,7 +670,8 @@
 				TreeIter iter;
 				this.treeview.liststore.insert(out iter, 1);
 				this.treeview.liststore.set(iter, 0, app_choose_info.name, 
-					1, app_choose_info.icon, 2, app, -1);
+					1, app_choose_info.icon, 2, app, 3, app_choose_info.last_accessed,
+					4, app_choose_info.last_accessed_time, -1);
 				this.app_blacklist.get_count_for_app(app_choose_info.get_id(), iter, this.treeview.liststore);
 			}
 		}
@@ -709,14 +753,16 @@
 		private string app_id;
 		private string app_name;
 		private Gdk.Pixbuf? app_icon;
-		private string last_accessed_time;
+		private string last_accessed_time_s;
+		private int64 last_accessed_time_i;
 		private uint usage_rating;
 
 		public AppChooseInfo(string id, string app_name, Gdk.Pixbuf? app_icon, 
-					string last_accessed_time, uint usage_rating ) {
+					string last_accessed_time_s, int64 last_accessed_time_i, uint usage_rating ) {
 			this.app_name = app_name;
 			this.app_icon = app_icon;
-			this.last_accessed_time = last_accessed_time;
+			this.last_accessed_time_s = last_accessed_time_s;
+			this.last_accessed_time_i = last_accessed_time_i;
 			this.usage_rating = usage_rating;
 			this.app_id = id;
 		}
@@ -745,10 +791,19 @@
 
 		public string last_accessed {
 			get {
-				return last_accessed_time;
-			}
-			set {
-				last_accessed_time = value;
+				return last_accessed_time_s;
+			}
+			set {
+				last_accessed_time_s = value;
+			}
+		}
+		
+		public int64 last_accessed_time {
+			get {
+				return last_accessed_time_i;
+			}
+			set {
+				last_accessed_time_i = value;
 			}
 		}
 

=== modified file 'src/blacklist-dbus.vala'
--- src/blacklist-dbus.vala	2012-02-24 17:48:20 +0000
+++ src/blacklist-dbus.vala	2012-03-15 12:56:21 +0000
@@ -162,20 +162,6 @@
 	    	                                    null);
 	    	                                    
 	    	var counter = results.length/100;
-			int64 last_accessed = 0;
-			var last_accessed_string = "";
-			if (counter > 0) {
-				var ids= new Array<int>();
-				int event_id = results.index(0);
-				ids.append_val(event_id);
-				var results2 = yield log.get_events(ids, null);
-	    	    last_accessed = results2.next().get_timestamp();
-				var time = new DateTime.from_unix_local (last_accessed/1000);
-				last_accessed_string = time.format("%e %B %Y");
-			}
-			
-			store.set_value(iter, 3, last_accessed_string);
-			store.set_value(iter, 4, last_accessed);
 			store.set_value(iter, 5, counter);
 		}