Fixed file priorities and added appropriate action bar icons.

core/res/menu/fragment_details.xml

@@ -42,6 +42,7 @@
 		android:title="@string/action_setlabel" />
 	<item
 		android:id="@+id/action_updatetrackers"
+		android:icon="?attr/ic_action_trackers"
 		android:showAsAction="ifRoom"
 		android:title="@string/action_updatetrackers" />
 

core/res/menu/fragment_details_file.xml

@@ -2,18 +2,22 @@
 
 	<item
 		android:id="@+id/action_priority_off"
+		android:icon="?attr/ic_action_priority_off"
 		android:showAsAction="ifRoom"
 		android:title="@string/action_priority_off" />
 	<item
 		android:id="@+id/action_priority_low"
+		android:icon="?attr/ic_action_priority_low"
 		android:showAsAction="ifRoom"
 		android:title="@string/action_priority_low" />
 	<item
 		android:id="@+id/action_priority_normal"
+		android:icon="?attr/ic_action_priority_normal"
 		android:showAsAction="ifRoom"
 		android:title="@string/action_priority_normal" />
 	<item
 		android:id="@+id/action_priority_high"
+		android:icon="?attr/ic_action_priority_high"
 		android:showAsAction="ifRoom"
 		android:title="@string/action_priority_high" />
 	<item

core/res/values/attrs.xml

@@ -10,6 +10,10 @@
 	<attr name="ic_action_labels" format="reference"/>
 	<attr name="ic_action_new" format="reference"/>
 	<attr name="ic_action_pause" format="reference"/>
+	<attr name="ic_action_priority_off" format="reference"/>
+	<attr name="ic_action_priority_low" format="reference"/>
+	<attr name="ic_action_priority_normal" format="reference"/>
+	<attr name="ic_action_priority_high" format="reference"/>
 	<attr name="ic_action_refresh" format="reference"/>
 	<attr name="ic_action_remove" format="reference"/>
 	<attr name="ic_action_resume" format="reference"/>
@@ -18,6 +22,7 @@
 	<attr name="ic_action_sort_by_size" format="reference"/>
 	<attr name="ic_action_start" format="reference"/>
 	<attr name="ic_action_stop" format="reference"/>
+	<attr name="ic_action_trackers" format="reference"/>
 	<attr name="ic_action_website" format="reference"/>
 	<attr name="loading_progress" format="reference"/>
 	<attr name="selectable_background_transdroid" format="reference"/>

core/res/values/styles.xml

@@ -9,6 +9,10 @@
 		<item name="ic_action_labels">@drawable/ic_action_labels_light</item>
 		<item name="ic_action_new">@drawable/ic_action_new_light</item>
 		<item name="ic_action_pause">@drawable/ic_action_pause_light</item>
+		<item name="ic_action_priority_off">@drawable/ic_action_priority_off_light</item>
+		<item name="ic_action_priority_low">@drawable/ic_action_priority_low_light</item>
+		<item name="ic_action_priority_normal">@drawable/ic_action_priority_normal_light</item>
+		<item name="ic_action_priority_high">@drawable/ic_action_priority_high_light</item>
 		<item name="ic_action_refresh">@drawable/ic_action_refresh_light</item>
 		<item name="ic_action_remove">@drawable/ic_action_remove_light</item>
 		<item name="ic_action_resume">@drawable/ic_action_resume_light</item>
@@ -17,6 +21,7 @@
 		<item name="ic_action_sort_by_size">@drawable/ic_action_sort_by_size_light</item>
 		<item name="ic_action_start">@drawable/ic_action_start_light</item>
 		<item name="ic_action_stop">@drawable/ic_action_stop_light</item>
+		<item name="ic_action_trackers">@drawable/ic_action_trackers_light</item>
 		<item name="ic_action_website">@drawable/ic_action_website_light</item>
 		<item name="loading_progress">@drawable/loading_progress_light</item>
 		<item name="selectable_background_transdroid">@drawable/selectable_background_transdroid2</item>
@@ -33,6 +38,10 @@
 		<item name="ic_action_labels">@drawable/ic_action_labels_dark</item>
 		<item name="ic_action_new">@drawable/ic_action_new_dark</item>
 		<item name="ic_action_pause">@drawable/ic_action_pause_dark</item>
+		<item name="ic_action_priority_off">@drawable/ic_action_priority_off_dark</item>
+		<item name="ic_action_priority_low">@drawable/ic_action_priority_low_dark</item>
+		<item name="ic_action_priority_normal">@drawable/ic_action_priority_normal_dark</item>
+		<item name="ic_action_priority_high">@drawable/ic_action_priority_high_dark</item>
 		<item name="ic_action_refresh">@drawable/ic_action_refresh_dark</item>
 		<item name="ic_action_remove">@drawable/ic_action_remove_dark</item>
 		<item name="ic_action_resume">@drawable/ic_action_resume_dark</item>
@@ -41,6 +50,7 @@
 		<item name="ic_action_sort_by_size">@drawable/ic_action_sort_by_size_dark</item>
 		<item name="ic_action_start">@drawable/ic_action_start_dark</item>
 		<item name="ic_action_stop">@drawable/ic_action_stop_dark</item>
+		<item name="ic_action_trackers">@drawable/ic_action_trackers_dark</item>
 		<item name="ic_action_website">@drawable/ic_action_website_dark</item>
 		<item name="loading_progress">@drawable/loading_progress_light</item>
 		<item name="selectable_background_transdroid">@drawable/selectable_background_transdroid</item>

core/src/org/transdroid/core/gui/DetailsFragment.java

@@ -274,9 +274,13 @@ public class DetailsFragment extends SherlockFragment {
 				mode.finish();
 				return true;
 			} else {
-				Priority priority = Priority.Normal;
+				Priority priority = Priority.Off;
 				if (itemId == R.id.action_priority_low)
 					priority = Priority.Low;
+				if (itemId == R.id.action_priority_normal)
+					priority = Priority.Normal;
+				if (itemId == R.id.action_priority_high)
+					priority = Priority.High;
 				getTasksExecutor().updatePriority(torrent, checked, priority);
 				mode.finish();
 				return true;

core/src/org/transdroid/core/gui/TorrentsActivity.java

@@ -305,7 +305,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 				navigationSpinnerAdapter.updateCurrentFilter(currentFilter);
 
 			// Clear the currently shown list of torrents and perhaps the details
-			fragmentTorrents.clear();
+			fragmentTorrents.clear(true);
 			if (fragmentDetails != null && fragmentDetails.getActivity() != null) {
 				fragmentDetails.clear();
 			}
@@ -701,7 +701,7 @@ public class TorrentsActivity extends SherlockFragmentActivity implements OnNavi
 		DaemonTaskResult result = RemoveTask.create(currentConnection, torrent, withData).execute();
 		if (result instanceof DaemonTaskResult) {
 			onTaskSucceeded((DaemonTaskSuccessResult) result, getString(withData ? R.string.result_removed_with_data
-					: R.string.result_removed));
+					: R.string.result_removed, torrent.getName()));
 		} else {
 			onCommunicationError((DaemonTaskFailureResult) result, false);
 		}

core/src/org/transdroid/core/gui/TorrentsFragment.java

@@ -95,9 +95,11 @@ public class TorrentsFragment extends SherlockFragment {
 
 	/**
 	 * Clears the currently visible list of torrents.
+	 * @param b 
 	 */
-	public void clear() {
+	public void clear(boolean clearError) {
 		this.torrents = null;
+		if (clearError)
 			this.connectionErrorMessage = null;
 		this.currentTextFilter = null;
 		this.currentNavigationFilter = null;
@@ -264,7 +266,7 @@ public class TorrentsFragment extends SherlockFragment {
 	public void updateConnectionStatus(boolean hasAConnection) {
 		this.hasAConnection = hasAConnection;
 		if (!hasAConnection) {
-			clear(); // Indirectly also calls updateViewVisibility()
+			clear(true); // Indirectly also calls updateViewVisibility()
 		} else {
 			updateViewVisibility();
 		}
@@ -278,7 +280,7 @@ public class TorrentsFragment extends SherlockFragment {
 	public void updateIsLoading(boolean isLoading) {
 		this.isLoading = isLoading;
 		if (isLoading) {
-			clear(); // Indirectly also calls updateViewVisibility()
+			clear(true); // Indirectly also calls updateViewVisibility()
 		} else {
 			updateViewVisibility();
 		}
@@ -294,7 +296,7 @@ public class TorrentsFragment extends SherlockFragment {
 		this.connectionErrorMessage = connectionErrorMessage;
 		errorText.setText(connectionErrorMessage);
 		if (connectionErrorMessage != null) {
-			clear(); // Indirectly also calls updateViewVisibility()
+			clear(false); // Indirectly also calls updateViewVisibility()
 		} else {
 			updateViewVisibility();
 		}

core/src/org/transdroid/core/gui/lists/TorrentFilePriorityLayout.java

@@ -9,10 +9,16 @@ import android.graphics.RectF;
 import android.util.AttributeSet;
 import fr.marvinlabs.widget.CheckableRelativeLayout;
 
+/**
+ * A relative layout that that is checkable (to be used in a contextual action bar) and shows a coloured bar in the far
+ * left indicating the priority of the represented file. The darker the green, the higher the priority, while grey means
+ * the file isn't downloaded at all.
+ * @author Eric Kok
+ */
 public class TorrentFilePriorityLayout extends CheckableRelativeLayout {
 
 	private final float scale = getContext().getResources().getDisplayMetrics().density;
-	private final int WIDTH = (int) (5 * scale + 0.5f);
+	private final int WIDTH = (int) (6 * scale + 0.5f);
 
 	private Priority priority = null;
 	private final Paint offPaint = new Paint();
@@ -35,9 +41,9 @@ public class TorrentFilePriorityLayout extends CheckableRelativeLayout {
 
 	private void initPaints() {
 		offPaint.setColor(0xFF9E9E9E); // Grey
-		lowPaint.setColor(0x778ACC12);		// Very Light green
-		normalPaint.setColor(0xBB8ACC12);		// Light green
-		highPaint.setColor(0xFF8ACC12);			// Green
+		lowPaint.setColor(0xFFC8E88E); // Light green
+		normalPaint.setColor(0xFF8ACC12); // Normal green
+		highPaint.setColor(0xFF4B6617); // Dark green
 	}
 
 	public void setPriority(Priority priority) {

core/src/org/transdroid/core/gui/lists/TorrentStatusLayout.java

@@ -9,10 +9,16 @@ import android.graphics.RectF;
 import android.util.AttributeSet;
 import fr.marvinlabs.widget.CheckableRelativeLayout;
 
+/**
+ * A relative layout that is checkable (to be used in a contextual action bar) and shows a coloured bar in the far left
+ * indicating the status of the represented torrent. Active downloads are blue, seeding torrents are green, errors are
+ * red, etc.
+ * @author Eric Kok
+ */
 public class TorrentStatusLayout extends CheckableRelativeLayout {
 
 	private final float scale = getContext().getResources().getDisplayMetrics().density;
-	private final int WIDTH = (int) (5 * scale + 0.5f);
+	private final int WIDTH = (int) (6 * scale + 0.5f);
 
 	private TorrentStatus status = null;
 	private final Paint inactiveDonePaint = new Paint();
@@ -42,6 +48,11 @@ public class TorrentStatusLayout extends CheckableRelativeLayout {
 		errorPaint.setColor(0xFFDE3939);		// Red
 	}
 
+	/**
+	 * Registers the status of the represented torrent and invalidates the view so the status colour will be updated
+	 * accordingly.
+	 * @param status
+	 */
 	public void setStatus(TorrentStatus status) {
 		this.status = status;
 		this.invalidate();