changes, changes, changes

res/layout/calc_clear_button.xml

@@ -6,9 +6,9 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
-													   a:id="@+id/clearButton"
-													   a:text="@string/c_clear"
-													   style="@style/control_button_style"
-													   a:onClick="clearButtonClickHandler"/>
+<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
+			 xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+			 a:id="@+id/clearButton"
+			 a:drawableTop="@drawable/ic_delete"
+			 style="@style/control_image_button_style"
+			 a:onClick="clearButtonClickHandler"/>

res/layout/calc_copy_button.xml

@@ -6,10 +6,9 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
 			 xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 			 a:id="@+id/pasteButton"
-			 a:src="@drawable/copy"
-			 style="@style/control_button_style"
-			 a:padding="6dp"
+			 a:drawableTop="@drawable/copy"
+			 style="@style/control_image_button_style"
 			 a:onClick="copyButtonClickHandler"/>

res/layout/calc_donate_button.xml

@@ -10,6 +10,5 @@
 			 xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 			 a:id="@+id/pasteButton"
 			 a:src="@drawable/heart"
-			 style="@style/control_button_style"
-			 a:padding="6dp"
+			 style="@style/control_image_button_style"
 			 a:onClick="donateButtonClickHandler"/>

res/layout/calc_erase_button.xml

@@ -6,9 +6,9 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
-													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
-													   a:id="@+id/eraseButton"
-													   a:text="@string/c_erase"
-													   style="@style/control_button_style"
-													   a:onClick="eraseButtonClickHandler"/>
+<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
+			 xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
+			 a:id="@+id/eraseButton"
+			 a:drawableTop="@drawable/sym_keyboard_delete"
+			 style="@style/control_image_button_style"
+			 a:onClick="eraseButtonClickHandler"/>

res/layout/calc_paste_button.xml

@@ -6,10 +6,9 @@
   ~ or visit http://se.solovyev.org
   -->
 
-<ImageButton xmlns:a="http://schemas.android.com/apk/res/android"
+<org.solovyev.android.view.widgets.ColorButton xmlns:a="http://schemas.android.com/apk/res/android"
 			 xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 			 a:id="@+id/pasteButton"
-			 a:src="@drawable/paste"
-			 style="@style/control_button_style"
-			 a:padding="6dp"
+			 a:drawableTop="@drawable/paste"
+			 style="@style/control_image_button_style"
 			 a:onClick="pasteButtonClickHandler"/>

res/layout/calc_round_brackets_button.xml

@@ -10,5 +10,6 @@
 													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/roundBracketsButton" a:text="()"
 													   calc:textUp="("
-													   calc:textDown=")" style="@style/digit_button_style"
+													   calc:textDown=")"
+													   style="@style/digit_button_style"
 													   a:onClick="digitButtonClickHandler"/>

res/layout/calc_square_brackets_button.xml

@@ -10,5 +10,6 @@
 													   xmlns:calc="http://schemas.android.com/apk/res/org.solovyev.android.calculator"
 													   a:id="@+id/squareBracketsButton" a:text="[]"
 													   calc:textUp="["
-													   calc:textDown="]" style="@style/digit_button_style"
+													   calc:textDown="]"
+													   style="@style/digit_button_style"
 													   a:onClick="digitButtonClickHandler"/>

res/layout/calc_vars_button.xml

@@ -8,7 +8,7 @@
 
 <org.solovyev.android.view.widgets.DirectionDragButton xmlns:a="http://schemas.android.com/apk/res/android"
 													   a:id="@+id/varsButton"
-													   a:text="π,e,…"
+													   a:text="π,…"
 													   a:textStyle="italic"
 													   a:onClick="varsButtonClickHandler"
 													   style="@style/control_button_style"/>

res/layout/vars.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2009-2011. Created by serso aka se.solovyev.
+  ~ For more information, please, contact se.solovyev@gmail.com
+  ~ or visit http://se.solovyev.org
+  -->
+
+<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
+    a:orientation="vertical"
+    a:layout_width="match_parent"
+    a:layout_height="match_parent">
+
+    <ListView
+        a:layout_width="match_parent"
+        a:layout_height="match_parent"
+        a:layout_weight="1"
+        a:id="@android:id/list"/>
+
+    <Button
+        a:layout_width="wrap_content"
+        a:layout_height="wrap_content"
+        a:layout_gravity="center_horizontal"
+        a:text="@string/c_add"
+		a:paddingLeft="40dp"
+		a:paddingRight="40dp"
+        a:onClick="addVarButtonClickHandler"/>
+
+</LinearLayout>