From 911f3855f184ecdb1339c1d8383ea19e86fe918e Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Fri, 27 Sep 2013 22:57:30 +0200
Subject: Implement changing log level on the fly in the log window, still
 needs some UI design love

--HG--
extra : rebase_source : 207343cea3b74cd07ebdf00f8ef443465d12c966
---
 res/layout/logwindow.xml | 81 +++++++++++++++++++++++++++++++++++++++++-------
 res/menu/logmenu.xml     | 55 ++++++++++++++++----------------
 2 files changed, 98 insertions(+), 38 deletions(-)

(limited to 'res')

diff --git a/res/layout/logwindow.xml b/res/layout/logwindow.xml
index 57ab5cb9..d7281346 100644
--- a/res/layout/logwindow.xml
+++ b/res/layout/logwindow.xml
@@ -1,18 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-    
-    <TextView android:text="@string/speed_waiting"
-        android:singleLine="true"
-        android:id="@+id/speed"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-  <ListView
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+    <LinearLayout
+            android:orientation="vertical"
+            android:id="@+id/logOptionsLayout"
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+        <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/log_verbosity_level"/>
+
+        <SeekBar
+                android:id="@+id/LogLevelSlider"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:max="5"
+                android:indeterminate="false"/>
+
+        <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Timestamps"/>
+
+        <RadioGroup
+                android:id="@+id/timeFormatRadioGroup"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+            <RadioButton
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="None"
+                    android:id="@+id/radioNone"
+                    />
+
+            <RadioButton
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Short"
+                    android:id="@+id/radioShort"
+                />
+            <RadioButton
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="ISO"
+                    android:id="@+id/radioISO"
+                    />
+
+
+        </RadioGroup>
+    </LinearLayout>
+
+    <TextView
+            android:text="@string/speed_waiting"
+            android:singleLine="true"
+            android:id="@+id/speed"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
+
+    <ListView
             android:id="@android:id/list"
             android:transcriptMode="normal"
             android:layout_width="fill_parent"
-            android:layout_height="fill_parent" />
-    
+            android:layout_height="fill_parent"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/res/menu/logmenu.xml b/res/menu/logmenu.xml
index 1c0551ed..d59dcf6f 100644
--- a/res/menu/logmenu.xml
+++ b/res/menu/logmenu.xml
@@ -1,35 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
 
     <item
-        android:id="@+id/clearlog"
-        android:icon="@drawable/ic_menu_trash_holo_light"
-        android:showAsAction="ifRoom|withText"
-        android:title="@string/clear_log"
-        android:titleCondensed="@string/clear"/>
+            android:id="@+id/toggle_time"
+            android:alphabeticShortcut="t"
+            android:icon="@drawable/ic_clock"
+            android:showAsAction="withText|ifRoom"
+            android:title="@string/toggle_timestamps"/>
+
     <item
-        android:id="@+id/cancel"
-        android:icon="@android:drawable/ic_menu_close_clear_cancel"
-        android:showAsAction="ifRoom|withText"
-        android:title="@string/cancel_connection_long"
-        android:titleCondensed="@string/cancel_connection"/>
+            android:id="@+id/clearlog"
+            android:icon="@drawable/ic_menu_trash_holo_light"
+            android:showAsAction="ifRoom|withText"
+            android:title="@string/clear_log"
+            android:titleCondensed="@string/clear"/>
     <item
-        android:id="@+id/send"
-        android:icon="@android:drawable/ic_menu_share"
-        android:showAsAction="ifRoom|withText"
-        android:title="@string/send_logfile"
-        android:titleCondensed="@string/send"/>
+            android:id="@+id/send"
+            android:icon="@android:drawable/ic_menu_share"
+            android:showAsAction="ifRoom|withText"
+            android:title="@string/send_logfile"
+            android:titleCondensed="@string/send"/>
+
     <item
-        android:id="@+id/edit_vpn"
-        android:alphabeticShortcut="e"
-        android:icon="@android:drawable/ic_menu_edit"
-        android:showAsAction="withText|ifRoom"
-        android:title="@string/edit_vpn"/>
+            android:id="@+id/cancel"
+            android:icon="@android:drawable/ic_menu_close_clear_cancel"
+            android:showAsAction="ifRoom|withText"
+            android:title="@string/cancel_connection_long"
+            android:titleCondensed="@string/cancel_connection"/>
     <item
-        android:id="@+id/toggle_time"
-        android:alphabeticShortcut="t"
-        android:icon="@drawable/ic_clock"
-        android:showAsAction="withText|ifRoom"
-        android:title="@string/toggle_timestamps"/>
+            android:id="@+id/edit_vpn"
+            android:alphabeticShortcut="e"
+            android:icon="@android:drawable/ic_menu_edit"
+            android:showAsAction="withText|ifRoom"
+            android:title="@string/edit_vpn"/>
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3