From 82898e69214fb416bb8df75f7c50d6cf4efc6baa Mon Sep 17 00:00:00 2001
From: lado <herrlado@gmail.com>
Date: Mon, 10 Feb 2014 21:21:12 +0100
Subject: http://projects.vdr-developer.org/issues/1689

---
 vdrmanager/res/layout/epg_detail.xml                                | 4 ++--
 vdrmanager/res/layout/epg_event_item.xml                            | 4 ++--
 vdrmanager/src/de/bjusystems/vdrmanager/data/Timer.java             | 6 +++++-
 vdrmanager/src/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java | 4 ++--
 .../src/de/bjusystems/vdrmanager/gui/TimerDetailsActivity.java      | 4 ++--
 5 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'vdrmanager')

diff --git a/vdrmanager/res/layout/epg_detail.xml b/vdrmanager/res/layout/epg_detail.xml
index 8374a17..85bc221 100644
--- a/vdrmanager/res/layout/epg_detail.xml
+++ b/vdrmanager/res/layout/epg_detail.xml
@@ -57,8 +57,8 @@
 
         <ImageView
             android:id="@+id/epg_timer_state"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
             android:layout_centerVertical="true"
             android:layout_marginRight="5dip"
             android:visibility="gone" />
diff --git a/vdrmanager/res/layout/epg_event_item.xml b/vdrmanager/res/layout/epg_event_item.xml
index 03a6517..a8caa6f 100644
--- a/vdrmanager/res/layout/epg_event_item.xml
+++ b/vdrmanager/res/layout/epg_event_item.xml
@@ -35,11 +35,11 @@
 		android:layout_height="wrap_content" android:layout_marginTop="0dip" android:gravity="center"
 		android:orientation="horizontal">
 
-		<ImageView android:id="@+id/timer_item_state" android:layout_marginRight="2dip" android:src="@drawable/newrecording"
+		<ImageView android:id="@+id/timer_item_state" android:layout_marginRight="3dip" android:src="@drawable/newrecording"
 			android:layout_width="16dp" android:layout_height="16dp"
 			 android:visibility="gone" />
 
-		<ImageView android:id="@+id/timer_item_other" android:layout_marginRight="2dip" android:src="@drawable/schere"
+		<ImageView android:id="@+id/timer_item_other" android:layout_marginRight="3dip" android:src="@drawable/schere"
 			android:layout_width="16dp" android:layout_height="16dp"
 			 android:visibility="gone" />
 		
diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/data/Timer.java b/vdrmanager/src/de/bjusystems/vdrmanager/data/Timer.java
index e0f8b49..7782dca 100644
--- a/vdrmanager/src/de/bjusystems/vdrmanager/data/Timer.java
+++ b/vdrmanager/src/de/bjusystems/vdrmanager/data/Timer.java
@@ -165,7 +165,11 @@ public class Timer extends Event implements Timerable {
 		line.append(channelNumber).append(":");
 
 		final Calendar cal = Calendar.getInstance();
-		cal.setTime(start);
+		if(isVps() == true){
+			cal.setTimeInMillis(vps);
+		} else {
+			cal.setTime(start);
+		}
 
 		cal.setTimeZone(TimeZone.getTimeZone(Preferences.get().getCurrentVdr()
 				.getServerTimeZone()));
diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java b/vdrmanager/src/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java
index e639355..2675722 100644
--- a/vdrmanager/src/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java
+++ b/vdrmanager/src/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java
@@ -618,12 +618,12 @@ public class EpgDetailsActivity extends ICSBaseActivity implements
 								R.drawable.timer_inactive_end,
                                 R.drawable.timer_inactive);
 					} else if (state == TimerState.Inactive) {
-						Utils.getTimerStateDrawable(match,
+						res = Utils.getTimerStateDrawable(match,
 								R.drawable.timer_active,
 								R.drawable.timer_active_begin,
 								R.drawable.timer_active_end,
                                 R.drawable.timer_active_conflict);
-						res = R.drawable.timer_active;
+						
 					}
 					if (res != -1) {
 						setState(
diff --git a/vdrmanager/src/de/bjusystems/vdrmanager/gui/TimerDetailsActivity.java b/vdrmanager/src/de/bjusystems/vdrmanager/gui/TimerDetailsActivity.java
index c91b4b7..c6ce4a6 100644
--- a/vdrmanager/src/de/bjusystems/vdrmanager/gui/TimerDetailsActivity.java
+++ b/vdrmanager/src/de/bjusystems/vdrmanager/gui/TimerDetailsActivity.java
@@ -130,11 +130,11 @@ public class TimerDetailsActivity extends Activity implements OnClickListener,
 			prevDate = tView.dateField.getText();
 		}
 
-		DateFormatter formatter = new DateFormatter(new Date(original.getVPS()));
+		DateFormatter formatter = new DateFormatter(original.getStart());
 		String date = formatter.getDateString();
 		tView.startField.setEnabled(false);
 		tView.startField.setText(formatter.getTimeString());
-		timer.setStart(new Date(timer.getVPS()));
+		timer.setStart(original.getStart());
 
 		DateFormatter stopF = new DateFormatter(original.getStop());
 
-- 
cgit v1.2.3