Fsck it, commiting an accidental global mode change as well as actual…

… useful changes
rjmarsan · Feb 24, 2012 · 9eb684f · 9eb684f
1 parent e5a8e06
commit 9eb684f
Show file tree

Hide file tree

Showing 298 changed files with 719 additions and 399 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.gitignore b/.gitignore
diff --git a/.project b/.project
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.rj.pixelesque"
-      android:versionCode="6"
-      android:versionName="1.2">
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="18" />
+      android:versionCode="7"
+      android:versionName="1.2.01">
+    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="10" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hardwareAccelerated="true"

diff --git a/README b/README
diff --git a/dist/Android 4.0/PixelArt.bar b/dist/Android 4.0/PixelArt.bar
diff --git a/dist/Android 4.0/PixelArt.lsv b/dist/Android 4.0/PixelArt.lsv
@@ -0,0 +1 @@
+1.0.7.0
diff --git a/exports/Pixelesque-1.0.1.apk b/exports/Pixelesque-1.0.1.apk
diff --git a/exports/Pixelesque-1.0.apk b/exports/Pixelesque-1.0.apk
diff --git a/exports/Pixelesque-1.1.5.apk b/exports/Pixelesque-1.1.5.apk
diff --git a/exports/Pixelesque-1.1.5final.apk b/exports/Pixelesque-1.1.5final.apk
diff --git a/exports/Pixelesque-1.1.apk b/exports/Pixelesque-1.1.apk
diff --git a/exports/Pixelesque-1.2.apk b/exports/Pixelesque-1.2.apk
diff --git a/exports/Pixelesque-1.2ALPHA.apk b/exports/Pixelesque-1.2ALPHA.apk
diff --git a/exports/Pixelesque-rc1.apk b/exports/Pixelesque-rc1.apk
diff --git a/exports/Pixelesque1.1aUNSIGNED.apk b/exports/Pixelesque1.1aUNSIGNED.apk
diff --git a/futureideas.txt b/futureideas.txt
@@ -23,3 +23,15 @@ pro tools:
 	non destructive resize/move
 	auto import image (not as background)
 
+
+
+import activity
+	camera or image
+	adjust pixel size
+editor activity
+	control foreground transparancy/toggle
+
+Camera
+	automatically pixelate
+		gradient algorithms for better pixelating
+	import into pixelesque
diff --git a/libs/AndMT.zip b/libs/AndMT.zip
diff --git a/proguard.cfg b/proguard.cfg
diff --git a/proguard/dump.txt b/proguard/dump.txt
diff --git a/proguard/mapping.txt b/proguard/mapping.txt
diff --git a/proguard/seeds.txt b/proguard/seeds.txt
diff --git a/proguard/usage.txt b/proguard/usage.txt
diff --git a/project.properties b/project.properties
@@ -7,8 +7,8 @@
 # "ant.properties", and override values to adapt the script to your
 # project structure.
 
-android.library.reference.1=../../../Documents/workspace/AndMT
 #proguard.config=proguard.cfg
 # Project target.
-target=android-11
-android.library.reference.2=../../../Documents/workspace/Processing15
+target=android-14
+android.library.reference.1=../../../../../Volumes/osfree/workspace/AndMT
+android.library.reference.2=../../../../../Volumes/osfree/workspace/Processing15
diff --git a/psds/blockynull-small.xcf b/psds/blockynull-small.xcf
diff --git a/psds/bottombar.xcf b/psds/bottombar.xcf
diff --git a/psds/featured.png b/psds/featured.png
diff --git a/psds/featured.xcf b/psds/featured.xcf
diff --git a/psds/featured1920.png b/psds/featured1920.png
diff --git a/psds/featured1920.xcf b/psds/featured1920.xcf
diff --git a/psds/featured290.png b/psds/featured290.png
diff --git a/psds/icon.png b/psds/icon.png
diff --git a/psds/icon114.png b/psds/icon114.png
diff --git a/psds/icon480.png b/psds/icon480.png
diff --git a/psds/icons.psd b/psds/icons.psd
diff --git a/psds/icons.xcf b/psds/icons.xcf
diff --git a/psds/pixelesque.xcf b/psds/pixelesque.xcf
diff --git a/psds/pixelesque2.xcf b/psds/pixelesque2.xcf
diff --git a/psds/promo.png b/psds/promo.png
diff --git a/psds/promo.xcf b/psds/promo.xcf
diff --git a/psds/topbar-hc.xcf b/psds/topbar-hc.xcf
diff --git a/psds/topbar.xcf b/psds/topbar.xcf
diff --git a/psds/topbar2.xcf b/psds/topbar2.xcf
diff --git a/res/drawable-hdpi/back.png b/res/drawable-hdpi/back.png
diff --git a/res/drawable-hdpi/back_disabled.png b/res/drawable-hdpi/back_disabled.png
diff --git a/res/drawable-hdpi/back_pressed.png b/res/drawable-hdpi/back_pressed.png
diff --git a/res/drawable-hdpi/bottombar_bg.png b/res/drawable-hdpi/bottombar_bg.png
diff --git a/res/drawable-hdpi/bucket.png b/res/drawable-hdpi/bucket.png
diff --git a/res/drawable-hdpi/bucket_pressed.png b/res/drawable-hdpi/bucket_pressed.png
diff --git a/res/drawable-hdpi/bucket_selected.png b/res/drawable-hdpi/bucket_selected.png
diff --git a/res/drawable-hdpi/circle.png b/res/drawable-hdpi/circle.png
diff --git a/res/drawable-hdpi/circle_pressed.png b/res/drawable-hdpi/circle_pressed.png
diff --git a/res/drawable-hdpi/circle_selected.png b/res/drawable-hdpi/circle_selected.png
diff --git a/res/drawable-hdpi/clear.png b/res/drawable-hdpi/clear.png
diff --git a/res/drawable-hdpi/color.png b/res/drawable-hdpi/color.png
diff --git a/res/drawable-hdpi/color_pressed.png b/res/drawable-hdpi/color_pressed.png
diff --git a/res/drawable-hdpi/eraser.png b/res/drawable-hdpi/eraser.png
diff --git a/res/drawable-hdpi/eraser_pressed.png b/res/drawable-hdpi/eraser_pressed.png
diff --git a/res/drawable-hdpi/eraser_selected.png b/res/drawable-hdpi/eraser_selected.png
diff --git a/res/drawable-hdpi/export.png b/res/drawable-hdpi/export.png
diff --git a/res/drawable-hdpi/forward.png b/res/drawable-hdpi/forward.png
diff --git a/res/drawable-hdpi/forward_disabled.png b/res/drawable-hdpi/forward_disabled.png
diff --git a/res/drawable-hdpi/forward_pressed.png b/res/drawable-hdpi/forward_pressed.png
diff --git a/res/drawable-hdpi/ic_menu_add.png b/res/drawable-hdpi/ic_menu_add.png
diff --git a/res/drawable-hdpi/ic_menu_archive.png b/res/drawable-hdpi/ic_menu_archive.png
diff --git a/res/drawable-hdpi/ic_menu_close_clear_cancel.png b/res/drawable-hdpi/ic_menu_close_clear_cancel.png
diff --git a/res/drawable-hdpi/ic_menu_save.png b/res/drawable-hdpi/ic_menu_save.png
diff --git a/res/drawable-hdpi/ic_menu_set_as.png b/res/drawable-hdpi/ic_menu_set_as.png
diff --git a/res/drawable-hdpi/ic_menu_share.png b/res/drawable-hdpi/ic_menu_share.png
diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png
diff --git a/res/drawable-hdpi/iconsmall.png b/res/drawable-hdpi/iconsmall.png
diff --git a/res/drawable-hdpi/line.png b/res/drawable-hdpi/line.png
diff --git a/res/drawable-hdpi/line_pressed.png b/res/drawable-hdpi/line_pressed.png
diff --git a/res/drawable-hdpi/line_selected.png b/res/drawable-hdpi/line_selected.png
diff --git a/res/drawable-hdpi/menunew.png b/res/drawable-hdpi/menunew.png
diff --git a/res/drawable-hdpi/more.png b/res/drawable-hdpi/more.png
diff --git a/res/drawable-hdpi/open.png b/res/drawable-hdpi/open.png
diff --git a/res/drawable-hdpi/pen.png b/res/drawable-hdpi/pen.png
diff --git a/res/drawable-hdpi/pen_pressed.png b/res/drawable-hdpi/pen_pressed.png
diff --git a/res/drawable-hdpi/pen_selected.png b/res/drawable-hdpi/pen_selected.png
diff --git a/res/drawable-hdpi/pencil.png b/res/drawable-hdpi/pencil.png
diff --git a/res/drawable-hdpi/pencil_disabled.png b/res/drawable-hdpi/pencil_disabled.png
diff --git a/res/drawable-hdpi/pencil_pressed.png b/res/drawable-hdpi/pencil_pressed.png
diff --git a/res/drawable-hdpi/pencil_selected.png b/res/drawable-hdpi/pencil_selected.png
diff --git a/res/drawable-hdpi/rect.png b/res/drawable-hdpi/rect.png
diff --git a/res/drawable-hdpi/rect_pressed.png b/res/drawable-hdpi/rect_pressed.png
diff --git a/res/drawable-hdpi/rect_selected.png b/res/drawable-hdpi/rect_selected.png
diff --git a/res/drawable-hdpi/save.png b/res/drawable-hdpi/save.png
diff --git a/res/drawable-hdpi/saveas.png b/res/drawable-hdpi/saveas.png
diff --git a/res/drawable-hdpi/shapes.png b/res/drawable-hdpi/shapes.png
diff --git a/res/drawable-hdpi/shapes_pressed.png b/res/drawable-hdpi/shapes_pressed.png
diff --git a/res/drawable-hdpi/shapes_selected.png b/res/drawable-hdpi/shapes_selected.png
diff --git a/res/drawable-hdpi/share.png b/res/drawable-hdpi/share.png
diff --git a/res/drawable-hdpi/timepicker_down_disabled.9.png b/res/drawable-hdpi/timepicker_down_disabled.9.png
diff --git a/res/drawable-hdpi/timepicker_down_disabled_focused.9.png b/res/drawable-hdpi/timepicker_down_disabled_focused.9.png
diff --git a/res/drawable-hdpi/timepicker_down_normal.9.png b/res/drawable-hdpi/timepicker_down_normal.9.png
diff --git a/res/drawable-hdpi/timepicker_down_pressed.9.png b/res/drawable-hdpi/timepicker_down_pressed.9.png
diff --git a/res/drawable-hdpi/timepicker_down_selected.9.png b/res/drawable-hdpi/timepicker_down_selected.9.png
diff --git a/res/drawable-hdpi/timepicker_input_disabled.9.png b/res/drawable-hdpi/timepicker_input_disabled.9.png
diff --git a/res/drawable-hdpi/timepicker_input_normal.9.png b/res/drawable-hdpi/timepicker_input_normal.9.png
diff --git a/res/drawable-hdpi/timepicker_input_pressed.9.png b/res/drawable-hdpi/timepicker_input_pressed.9.png
diff --git a/res/drawable-hdpi/timepicker_input_selected.9.png b/res/drawable-hdpi/timepicker_input_selected.9.png
diff --git a/res/drawable-hdpi/timepicker_up_disabled.9.png b/res/drawable-hdpi/timepicker_up_disabled.9.png
diff --git a/res/drawable-hdpi/timepicker_up_disabled_focused.9.png b/res/drawable-hdpi/timepicker_up_disabled_focused.9.png
diff --git a/res/drawable-hdpi/timepicker_up_normal.9.png b/res/drawable-hdpi/timepicker_up_normal.9.png
diff --git a/res/drawable-hdpi/timepicker_up_pressed.9.png b/res/drawable-hdpi/timepicker_up_pressed.9.png
diff --git a/res/drawable-hdpi/timepicker_up_selected.9.png b/res/drawable-hdpi/timepicker_up_selected.9.png
diff --git a/res/drawable-hdpi/topbar_rightside.png b/res/drawable-hdpi/topbar_rightside.png
diff --git a/res/drawable-ldpi/icon.png b/res/drawable-ldpi/icon.png
diff --git a/res/drawable-mdpi/clear.png b/res/drawable-mdpi/clear.png
diff --git a/res/drawable-mdpi/export.png b/res/drawable-mdpi/export.png
diff --git a/res/drawable-mdpi/ic_menu_archive.png b/res/drawable-mdpi/ic_menu_archive.png
diff --git a/res/drawable-mdpi/ic_menu_close_clear_cancel.png b/res/drawable-mdpi/ic_menu_close_clear_cancel.png
diff --git a/res/drawable-mdpi/ic_menu_save.png b/res/drawable-mdpi/ic_menu_save.png
diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png
diff --git a/res/drawable-mdpi/menunew.png b/res/drawable-mdpi/menunew.png
diff --git a/res/drawable-mdpi/open.png b/res/drawable-mdpi/open.png
diff --git a/res/drawable-mdpi/save.png b/res/drawable-mdpi/save.png
diff --git a/res/drawable-mdpi/saveas.png b/res/drawable-mdpi/saveas.png
diff --git a/res/drawable-mdpi/share.png b/res/drawable-mdpi/share.png
diff --git a/res/drawable-mdpi/timepicker_down_disabled.9.png b/res/drawable-mdpi/timepicker_down_disabled.9.png
diff --git a/res/drawable-mdpi/timepicker_down_disabled_focused.9.png b/res/drawable-mdpi/timepicker_down_disabled_focused.9.png
diff --git a/res/drawable-mdpi/timepicker_down_normal.9.png b/res/drawable-mdpi/timepicker_down_normal.9.png
diff --git a/res/drawable-mdpi/timepicker_down_pressed.9.png b/res/drawable-mdpi/timepicker_down_pressed.9.png
diff --git a/res/drawable-mdpi/timepicker_down_selected.9.png b/res/drawable-mdpi/timepicker_down_selected.9.png
diff --git a/res/drawable-mdpi/timepicker_input_disabled.9.png b/res/drawable-mdpi/timepicker_input_disabled.9.png
diff --git a/res/drawable-mdpi/timepicker_input_normal.9.png b/res/drawable-mdpi/timepicker_input_normal.9.png
diff --git a/res/drawable-mdpi/timepicker_input_pressed.9.png b/res/drawable-mdpi/timepicker_input_pressed.9.png
diff --git a/res/drawable-mdpi/timepicker_input_selected.9.png b/res/drawable-mdpi/timepicker_input_selected.9.png
diff --git a/res/drawable-mdpi/timepicker_up_disabled.9.png b/res/drawable-mdpi/timepicker_up_disabled.9.png
diff --git a/res/drawable-mdpi/timepicker_up_disabled_focused.9.png b/res/drawable-mdpi/timepicker_up_disabled_focused.9.png
diff --git a/res/drawable-mdpi/timepicker_up_normal.9.png b/res/drawable-mdpi/timepicker_up_normal.9.png
diff --git a/res/drawable-mdpi/timepicker_up_pressed.9.png b/res/drawable-mdpi/timepicker_up_pressed.9.png
diff --git a/res/drawable-mdpi/timepicker_up_selected.9.png b/res/drawable-mdpi/timepicker_up_selected.9.png
diff --git a/res/drawable-xlarge-hdpi/bucket_pressed.png b/res/drawable-xlarge-hdpi/bucket_pressed.png
diff --git a/res/drawable-xlarge-hdpi/bucket_selected.png b/res/drawable-xlarge-hdpi/bucket_selected.png
diff --git a/res/drawable-xlarge-hdpi/circle_pressed.png b/res/drawable-xlarge-hdpi/circle_pressed.png
diff --git a/res/drawable-xlarge-hdpi/circle_selected.png b/res/drawable-xlarge-hdpi/circle_selected.png
diff --git a/res/drawable-xlarge-hdpi/eraser_pressed.png b/res/drawable-xlarge-hdpi/eraser_pressed.png
diff --git a/res/drawable-xlarge-hdpi/eraser_selected.png b/res/drawable-xlarge-hdpi/eraser_selected.png
diff --git a/res/drawable-xlarge-hdpi/line_pressed.png b/res/drawable-xlarge-hdpi/line_pressed.png
diff --git a/res/drawable-xlarge-hdpi/line_selected.png b/res/drawable-xlarge-hdpi/line_selected.png
diff --git a/res/drawable-xlarge-hdpi/more.png b/res/drawable-xlarge-hdpi/more.png
diff --git a/res/drawable-xlarge-hdpi/pen_pressed.png b/res/drawable-xlarge-hdpi/pen_pressed.png
diff --git a/res/drawable-xlarge-hdpi/pen_selected.png b/res/drawable-xlarge-hdpi/pen_selected.png
diff --git a/res/drawable-xlarge-hdpi/pencil_pressed.png b/res/drawable-xlarge-hdpi/pencil_pressed.png
diff --git a/res/drawable-xlarge-hdpi/pencil_selected.png b/res/drawable-xlarge-hdpi/pencil_selected.png
diff --git a/res/drawable-xlarge-hdpi/rect_pressed.png b/res/drawable-xlarge-hdpi/rect_pressed.png
diff --git a/res/drawable-xlarge-hdpi/rect_selected.png b/res/drawable-xlarge-hdpi/rect_selected.png
diff --git a/res/drawable-xlarge-hdpi/shapes_pressed.png b/res/drawable-xlarge-hdpi/shapes_pressed.png
diff --git a/res/drawable/bucketbutton_bg.xml b/res/drawable/bucketbutton_bg.xml
diff --git a/res/drawable/circlebutton_bg.xml b/res/drawable/circlebutton_bg.xml
diff --git a/res/drawable/color_hue.png b/res/drawable/color_hue.png
diff --git a/res/drawable/color_seekselector.png b/res/drawable/color_seekselector.png
diff --git a/res/drawable/color_selector.png b/res/drawable/color_selector.png
diff --git a/res/drawable/colorbutton_bg.xml b/res/drawable/colorbutton_bg.xml
diff --git a/res/drawable/dialogbg.xml b/res/drawable/dialogbg.xml
diff --git a/res/drawable/eraserbutton_bg.xml b/res/drawable/eraserbutton_bg.xml
diff --git a/res/drawable/hex32.png b/res/drawable/hex32.png
diff --git a/res/drawable/hsv32.png b/res/drawable/hsv32.png
diff --git a/res/drawable/linebutton_bg.xml b/res/drawable/linebutton_bg.xml
diff --git a/res/drawable/penbutton_bg.xml b/res/drawable/penbutton_bg.xml
diff --git a/res/drawable/pencilbutton_bg.xml b/res/drawable/pencilbutton_bg.xml
diff --git a/res/drawable/rectbutton_bg.xml b/res/drawable/rectbutton_bg.xml
diff --git a/res/drawable/redobutton_bg.xml b/res/drawable/redobutton_bg.xml
diff --git a/res/drawable/rgb32.png b/res/drawable/rgb32.png
diff --git a/res/drawable/shapesbutton_bg.xml b/res/drawable/shapesbutton_bg.xml
diff --git a/res/drawable/timepicker_down_btn.xml b/res/drawable/timepicker_down_btn.xml
diff --git a/res/drawable/timepicker_input.xml b/res/drawable/timepicker_input.xml
diff --git a/res/drawable/timepicker_up_btn.xml b/res/drawable/timepicker_up_btn.xml
diff --git a/res/drawable/transparentback.png b/res/drawable/transparentback.png
diff --git a/res/drawable/transparentbackrepeat.xml b/res/drawable/transparentbackrepeat.xml
diff --git a/res/drawable/undobutton_bg.xml b/res/drawable/undobutton_bg.xml
diff --git a/res/layout-land/actual_buttonbar.xml b/res/layout-land/actual_buttonbar.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/scroll_buttonbarz"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_alignParentRight="true"
+    android:scrollbars="none" >
+
+    <com.rj.pixelesque.PixelArtStateView
+        android:id="@+id/buttonbarz"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:background="@color/hud_background"
+        android:orientation="vertical" >
+
+        <ImageView
+            android:id="@+id/pencilmode"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:scaleType="centerInside"
+            android:src="@drawable/pencilbutton_bg" />
+
+        <RelativeLayout
+            android:id="@+id/shapesholder"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" >
+
+            <ImageView
+                android:id="@+id/shapesmode"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:scaleType="centerInside"
+                android:src="@drawable/shapesbutton_bg" />
+
+            <ImageView
+                android:id="@+id/shapesmode"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:scaleType="centerInside"
+                android:src="@drawable/more" />
+        </RelativeLayout>
+
+        <ImageView
+            android:id="@+id/erasermode"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:scaleType="centerInside"
+            android:src="@drawable/eraserbutton_bg" />
+
+        <ImageView
+            android:id="@+id/pointermode"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:scaleType="centerInside"
+            android:src="@drawable/penbutton_bg"
+            android:visibility="gone" />
+
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" >
+
+            <ImageView
+                android:id="@+id/colorpicker"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:scaleType="centerInside"
+                android:src="@drawable/colorbutton_bg" />
+
+            <View
+                android:id="@+id/colorindicator"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_centerInParent="true" />
+        </RelativeLayout>
+
+        <ImageView
+            android:id="@+id/undo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:scaleType="centerInside"
+            android:src="@drawable/undobutton_bg" />
+
+        <ImageView
+            android:id="@+id/redo"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:scaleType="centerInside"
+            android:src="@drawable/redobutton_bg" />
+    </com.rj.pixelesque.PixelArtStateView>
+
+</LinearLayout>
diff --git a/res/layout-land/buttonbar.xml b/res/layout-land/buttonbar.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:id="@+id/layout"
+    >
+    <LinearLayout 
+    	android:id="@+id/surfaceholder"
+    	android:layout_width="match_parent"
+    	android:layout_height="match_parent"
+    	android:layout_toLeftOf="@+id/scroll_buttonbarz"
+    	android:background="#199"
+    />
+
+    <include
+        layout="@layout/shapesmenu" 
+ 		android:id="@+id/shapesmenu" />
+
+
+	<include
+	    layout="@layout/actual_buttonbar"
+		android:id="@+id/scroll_buttonbarz"
+		android:layout_alignParentRight="true"
+		android:layout_width="wrap_content"
+	    android:layout_height="match_parent"
+	    android:scrollbars="none"
+		/>
+</RelativeLayout>
diff --git a/res/layout-land/shapesmenu.xml b/res/layout-land/shapesmenu.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/shapesmenu"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_toLeftOf="@+id/scroll_buttonbarz"
+    android:background="@color/hud_background"
+    android:orientation="vertical"
+    android:visibility="gone" >
+
+    <ImageView
+        android:id="@+id/bucketmode"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:scaleType="centerInside"
+        android:src="@drawable/bucketbutton_bg" />
+
+    <ImageView
+        android:id="@+id/circlemode"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/bucketmode"
+        android:layout_toRightOf="@+id/bucketmode"
+        android:scaleType="centerInside"
+        android:src="@drawable/circlebutton_bg" />
+
+    <ImageView
+        android:id="@+id/rectanglemode"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/bucketmode"
+        android:scaleType="centerInside"
+        android:src="@drawable/rectbutton_bg" />
+
+    <ImageView
+        android:id="@+id/linemode"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/rectanglemode"
+        android:layout_alignRight="@+id/circlemode"
+        android:layout_below="@+id/circlemode"
+        android:layout_toRightOf="@+id/rectanglemode"
+        android:scaleType="centerInside"
+        android:src="@drawable/linebutton_bg" />
+
+</RelativeLayout>
diff --git a/res/layout-ldpi/buttonbar.xml b/res/layout-ldpi/buttonbar.xml