Merge lp:~hunter.rew/steadyflow/modified into lp:steadyflow

[Hunter Rew]

Remaining time estimation

[Maia Everett (linneris)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-05-05 07:40:08 +0000
+++ CMakeLists.txt	2011-05-05 13:37:23 +0000
@@ -32,7 +32,12 @@
 include(Po)
 include(sources)
 
+<<<<<<< TREE
 ensure_vala_version(0.12.0 MINIMUM)
+=======
+# Vala 0.11.6 required for parse functions
+ensure_vala_version(0.11.6 MINIMUM)
+>>>>>>> MERGE-SOURCE
 
 configure_file(${CMAKE_SOURCE_DIR}/cmake/config.h.in ${CMAKE_BINARY_DIR}/config.h @ONLY)
 
@@ -41,7 +46,18 @@
 	${CMAKE_SOURCE_DIR}/vapi/AppConfig.vapi
 )
 
+<<<<<<< TREE
 set(VALA_PACKAGES
+=======
+vala_precompile(VALA_C
+	${STEADYFLOW_SOURCES}
+OPTIONS
+	--vapidir=${CMAKE_SOURCE_DIR}/vapi
+CUSTOM_VAPIS
+	${CUSTOM_VAPIS}
+PACKAGES
+	dbus-glib-1
+>>>>>>> MERGE-SOURCE
 	gee-1.0
 	gio-2.0
 	glib-2.0

=== modified file 'Steadyflow.Core/GioDownloadFile.vala'
--- Steadyflow.Core/GioDownloadFile.vala	2011-05-04 17:46:48 +0000
+++ Steadyflow.Core/GioDownloadFile.vala	2011-05-05 13:37:23 +0000
@@ -197,8 +197,13 @@
 					set_status (IDownloadFile.Status.FINISHED);
 					break;
 				}
+<<<<<<< TREE
 				
 				yield output.write_async (buf[0:read]);
+=======
+
+				yield output.write_async (buf[0:read]);
+>>>>>>> MERGE-SOURCE
 				on_download_progress (_downloaded_size + read, _size);
 			}
 		} catch (Error e) {

=== modified file 'Steadyflow.UI/DownloadCellRenderer.vala'
--- Steadyflow.UI/DownloadCellRenderer.vala	2011-05-05 05:35:00 +0000
+++ Steadyflow.UI/DownloadCellRenderer.vala	2011-05-05 13:37:23 +0000
@@ -61,9 +61,15 @@
 			
 			switch (_file.status) {
 			case IDownloadFile.Status.DOWNLOADING:
+<<<<<<< TREE
 				string time_str = get_time_remaining(_file.size, _file.downloaded_size, _file.speed);
 				text_under_renderer.text = _("Downloading at speed %s/s").printf (
 					format_size_for_display (_file.speed)) + " (%s)".printf (time_str);
+=======
+				string timeRemaining = getTimeRemaining(_file.size, _file.downloaded_size, _file.speed);
+				text_under_renderer.text = _("Downloading at speed %s/s (%s)").printf (
+					format_size_for_display (_file.speed), timeRemaining);
+>>>>>>> MERGE-SOURCE
 				break;
 			case IDownloadFile.Status.CONNECTING:
 				text_under_renderer.text = _("Connecting...");
@@ -102,7 +108,11 @@
 			pixbuf = IconTheme.get_default ().load_icon (icon_name, ICON_SIZE, 0);
 		} catch (Error e) {
 			try {
+<<<<<<< TREE
 				pixbuf = IconTheme.get_default ().load_icon (Stock.FILE, ICON_SIZE, 0);
+=======
+				pixbuf = IconTheme.get_default ().load_icon (Gtk.Stock.FILE, ICON_SIZE, 0);
+>>>>>>> MERGE-SOURCE
 			} catch (Error e) {
 				pixbuf = null;
 			}
@@ -163,6 +173,7 @@
 /*
 	 *  Estimate remaining time to completion
 	 */
+<<<<<<< TREE
 	private string get_time_remaining(int64 file_size, int64 downloaded_size, int64 speed) {
 		if (speed <= 0) {
 			return _("Unknown time remaining");
@@ -198,6 +209,61 @@
 		
 		return ngettext ("%s, %d hour remaining", "%s, %d hour remaining", hours).printf(
 			ngettext ("%d day", "%d days", days).printf(days), hours);
+=======
+	private string getTimeRemaining(int64 fileSize, int64 fileDownloadedSize, int64 fileSpeed) {
+		string timeRemaining;
+		if (fileSpeed > 0) {
+			if (fileSize > fileDownloadedSize) { // fileSize is 0 for small downloads
+				int64 sizeRemaining = fileSize - fileDownloadedSize;
+				int64 nRemSecs = sizeRemaining / fileSpeed;
+				string secsAppend = "";
+				if (nRemSecs > 1) {
+					secsAppend = "s";
+				}
+				timeRemaining = nRemSecs.to_string() + " second" + secsAppend;
+				if ((nRemSecs / 60) >= 1) {
+					int64 nRemMins = nRemSecs / 60;
+					string minAppend = "";
+					if (nRemMins > 1) {
+						minAppend = "s";
+					}					
+					timeRemaining = nRemMins.to_string() + " minute" + minAppend;
+					if ((nRemMins / 60) >= 1) {
+						int64 nRemHours = nRemMins / 60;
+						nRemMins = nRemMins % 60;
+						string hourAppend = "";
+						if (nRemMins > 1) {
+							minAppend = "s";
+						}
+						if (nRemHours > 1) {
+							hourAppend = "s";
+						}
+						timeRemaining = nRemHours.to_string() + " hour" + hourAppend + ", " + nRemMins.to_string() + " minute" + minAppend;
+						if ((nRemHours / 24) >= 1) {
+							int64 nRemDays = nRemHours / 24;
+							nRemHours = nRemHours % 24;
+							string dayAppend = "";
+							if (nRemHours > 1) {
+								hourAppend = "s";
+							}
+							if (nRemDays > 1) {
+								dayAppend = "s";
+							}
+							timeRemaining = nRemDays.to_string() + " day" + dayAppend + ", " + nRemHours.to_string() + " hour" + hourAppend;
+						}
+					}
+				}
+			}
+			else {
+				timeRemaining = "A few seconds";
+			}
+		}
+		else {
+			timeRemaining = "Unknown time";
+		}
+		timeRemaining += " remaining";
+		return timeRemaining;
+>>>>>>> MERGE-SOURCE
 	} 
 }
 

=== modified file 'Steadyflow/AddFileDialog.vala'
--- Steadyflow/AddFileDialog.vala	2011-05-05 06:35:09 +0000
+++ Steadyflow/AddFileDialog.vala	2011-05-05 13:37:23 +0000
@@ -51,8 +51,13 @@
 		finished_action.add_attribute (renderer, "text", 0);
 		finished_action.active = Services.settings.get_enum ("default-post-download-action");
 		
+<<<<<<< TREE
 		add_button (Stock.CANCEL, ResponseType.CANCEL);
 		add_button (Stock.ADD, ResponseType.OK);
+=======
+		add_button (Gtk.Stock.CANCEL, ResponseType.CANCEL);
+		add_button (Gtk.Stock.ADD, ResponseType.OK);
+>>>>>>> MERGE-SOURCE
 		set_default_response (ResponseType.OK);
 		autoconnect ();
 

=== modified file 'Steadyflow/IndicatorController.vala'
--- Steadyflow/IndicatorController.vala	2011-05-04 17:46:48 +0000
+++ Steadyflow/IndicatorController.vala	2011-05-05 13:37:23 +0000
@@ -36,8 +36,13 @@
 
 public class IndicatorController : GLib.Object {
 	private ActionEntry[] actions = {
+<<<<<<< TREE
 		ActionEntry () { name = "Add", stock_id = Stock.ADD, label = _("_Add download...") },
 		ActionEntry () { name = "Quit", stock_id = Stock.QUIT }
+=======
+		ActionEntry () { name = "Add", stock_id = Gtk.Stock.ADD, label = _("_Add download...") },
+		ActionEntry () { name = "Quit", stock_id = Gtk.Stock.QUIT }
+>>>>>>> MERGE-SOURCE
 	};
 	
 	private ToggleActionEntry[] toggle_actions = {

=== modified file 'Steadyflow/MainWindow.vala'
--- Steadyflow/MainWindow.vala	2011-05-05 06:00:38 +0000
+++ Steadyflow/MainWindow.vala	2011-05-05 13:37:23 +0000
@@ -190,7 +190,11 @@
 					_("The file you are trying to save the download to already exists. " +
 					"Are you sure you want to overwrite it?"));
 				
+<<<<<<< TREE
 				md.add_button (Stock.CANCEL, ResponseType.CANCEL);
+=======
+				md.add_button (Gtk.Stock.CANCEL, ResponseType.CANCEL);
+>>>>>>> MERGE-SOURCE
 				md.add_button (_("Overwrite"), ResponseType.OK);
 				response = md.run ();
 				md.destroy ();
@@ -255,8 +259,13 @@
 				_("The file you request to be removed from the download list is not yet fully downloaded. " +
 				"Are you sure you want to remove it?"));
 			
+<<<<<<< TREE
 			md.add_button (Stock.CANCEL, ResponseType.CANCEL);
 			md.add_button (Stock.REMOVE, ResponseType.OK);
+=======
+			md.add_button (Gtk.Stock.CANCEL, ResponseType.CANCEL);
+			md.add_button (Gtk.Stock.REMOVE, ResponseType.OK);
+>>>>>>> MERGE-SOURCE
 			int response = md.run ();
 			md.destroy ();
 			

=== modified file 'Steadyflow/PreferencesDialog.vala'
--- Steadyflow/PreferencesDialog.vala	2011-05-04 17:46:48 +0000
+++ Steadyflow/PreferencesDialog.vala	2011-05-05 13:37:23 +0000
@@ -53,7 +53,11 @@
 		
 		finish_action_map = new HashMap<RadioButton, IDownloadFile.FinishAction> ();
 		load_settings ();
+<<<<<<< TREE
 		add_button (Stock.CLOSE, ResponseType.CLOSE);
+=======
+		add_button (Gtk.Stock.CLOSE, ResponseType.CLOSE);
+>>>>>>> MERGE-SOURCE
 		autoconnect ();
 	}