added timer state for epg details and share function

4 files changed, 29 insertions, 5 deletions

diff --git a/vdrmanager/res/layout/epg_detail.xml b/vdrmanager/res/layout/epg_detail.xml
index bc64690..b7761be 100644
--- a/vdrmanager/res/layout/epg_detail.xml
+++ b/vdrmanager/res/layout/epg_detail.xml
@@ -51,17 +51,24 @@
     </LinearLayout>
    
    
-        
+	<LinearLayout android:layout_width="fill_parent" android:padding="3dip" android:paddingBottom="1dip"
+		android:layout_height="wrap_content" android:layout_marginTop="0dip"
+		android:orientation="horizontal">
+   
+    <ImageView android:id="@+id/epg_timer_state" android:layout_marginRight="5dip"
+			android:layout_width="wrap_content"  android:layout_height="fill_parent"
+			android:layout_centerVertical="true" android:visibility="gone" />
+   
     <TextView
         android:id="@+id/epg_detail_shorttext"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:gravity="left"
+        android:layout_weight="1"
         android:text="Krimikömedie"
-        android:textAppearance="?android:textAppearanceSmall"
-        android:layout_below="@id/epg_detail_time"/>
-       
-   
+        android:textAppearance="?android:textAppearanceSmall"/>
+        
+   </LinearLayout>
 
 
     <TextView
@@ -153,6 +160,19 @@
       style="?android:attr/buttonStyleSmall"
       android:text="@string/epg_event_imdb_text"/>
      
+     
+     <!-- 
+     <ImageButton
+      android:id="@+id/epg_event_share"
+      android:src="@android:drawable/ic_menu_share"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content" android:layout_marginLeft="20dip" android:layout_marginRight="20dip"
+      android:layout_gravity="center_horizontal"
+      android:layout_centerHorizontal="true" 
+      android:background="@android:drawable/list_selector_background"
+      style="?android:attr/buttonStyleSmall"
+      android:text="@string/epg_event_share_text"/>
+     -->
       
      <!-- 
      <ImageButton
diff --git a/vdrmanager/res/values/common.xml b/vdrmanager/res/values/common.xml
index 340b42b..9d1670e 100644
--- a/vdrmanager/res/values/common.xml
+++ b/vdrmanager/res/values/common.xml
@@ -7,4 +7,6 @@
   <string name="no_connection_retry">Retry</string>
   <string name="refresh">Refresh</string>
   <string name="done">Done</string>
+  <string name="share">Share</string>
+  <string name="share_chooser">Share EPG Entry</string>
 </resources>
diff --git a/vdrmanager/res/values/epg.xml b/vdrmanager/res/values/epg.xml
index db84fdd..3936bf4 100644
--- a/vdrmanager/res/values/epg.xml
+++ b/vdrmanager/res/values/epg.xml
@@ -9,6 +9,7 @@
   <string name="epg_list_search_label">Search results</string>
   
   <!-- create timer -->
+  <string name="epg_event_share_text">Share</string>
   <string name="epg_event_imdb_text">IMDB Search</string>
   <string name="epg_eent_livetv_text">Stream</string>
   <string name="epg_event_create_timer_text">Add timer</string>
diff --git a/vdrmanager/res/values/progress.xml b/vdrmanager/res/values/progress.xml
index 8007725..0f27c03 100644
--- a/vdrmanager/res/values/progress.xml
+++ b/vdrmanager/res/values/progress.xml
@@ -16,6 +16,7 @@
   <string name="progress_wakeup_error">Error sending wakeup request: %1$s</string>
   <string name="progress_timer_save">Saving timer …</string>
   <string name="progress_timer_delete">Deleting timer …</string>
+  <string name="progress_recording_delete">Deleting recording …</string>
   <string name="progress_timer_enable">Enabling timer …</string>
   <string name="progress_timer_modify">Updating timer …</string>
   <string name="progress_timer_disable">Disabling timer …</string>