ver1.3.0

diff --git a/pic/screenshot/en/device-2014-01-13-152659.png b/pic/screenshot/en/device-2014-01-13-152659.png
new file mode 100644 (file)
index 0000000..5b5f61a
Binary files /dev/null and b/pic/screenshot/en/device-2014-01-13-152659.png differ

diff --git a/pic/screenshot/ja/device-2014-01-13-152844.png b/pic/screenshot/ja/device-2014-01-13-152844.png
new file mode 100644 (file)
index 0000000..374dd49
Binary files /dev/null and b/pic/screenshot/ja/device-2014-01-13-152844.png differ

diff --git a/workspace/JuggleMaster/AndroidManifest.xml b/workspace/JuggleMaster/AndroidManifest.xml
index 5515800..8ce48ce 100644 (file)
--- a/workspace/JuggleMaster/AndroidManifest.xml
+++ b/workspace/JuggleMaster/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.jm"
-    android:versionCode="3"
-    android:versionName="1.2.0" >
+    android:versionCode="4"
+    android:versionName="1.3.0" >
 
     <application
         android:icon="@drawable/icon"

diff --git a/workspace/JuggleMaster/bin/AndroidManifest.xml b/workspace/JuggleMaster/bin/AndroidManifest.xml
index 5515800..8ce48ce 100644 (file)
--- a/workspace/JuggleMaster/bin/AndroidManifest.xml
+++ b/workspace/JuggleMaster/bin/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.jm"
-    android:versionCode="3"
-    android:versionName="1.2.0" >
+    android:versionCode="4"
+    android:versionName="1.3.0" >
 
     <application
         android:icon="@drawable/icon"

diff --git a/workspace/JuggleMaster/gen/com/jm/R.java b/workspace/JuggleMaster/gen/com/jm/R.java
index 1fcfe4f..4c163d8 100644 (file)
--- a/workspace/JuggleMaster/gen/com/jm/R.java
+++ b/workspace/JuggleMaster/gen/com/jm/R.java
@@ -66,13 +66,13 @@ public final class R {
         public static final int button71=0x7f070026;
         public static final int button73=0x7f070027;
         public static final int button91=0x7f07002d;
-        public static final int patternAddButton=0x7f070036;
+        public static final int patternAddButton=0x7f070037;
         public static final int patternCloseButton=0x7f070039;
         public static final int patternDeleteButton=0x7f070038;
         public static final int patternFileText=0x7f070034;
         public static final int patternLayout=0x7f070033;
         public static final int patternList=0x7f070035;
-        public static final int patternUpdateButton=0x7f070037;
+        public static final int patternUpdateButton=0x7f070036;
         public static final int radio71=0x7f070019;
         public static final int radio72=0x7f07001a;
         public static final int radiogroup71=0x7f070018;
@@ -102,7 +102,6 @@ public final class R {
         public static final int simple_list_item_2=0x7f030008;
     }
     public static final class string {
-        public static final int action_settings=0x7f060033;
         public static final int add=0x7f06000b;
         public static final int andmode=0x7f060009;
         public static final int app_name=0x7f060001;
@@ -113,11 +112,10 @@ public final class R {
         public static final int common_settings=0x7f060015;
         public static final int create=0x7f060017;
         public static final int delete=0x7f06000d;
-        public static final int error_unexpected=0x7f060028;
+        public static final int error_unexpected=0x7f060029;
         public static final int generate=0x7f060020;
         public static final int handling=0x7f060012;
         public static final int height=0x7f060013;
-        public static final int hello_world=0x7f060034;
         public static final int help=0x7f060007;
         public static final int help1=0x7f060002;
         public static final int help2=0x7f060003;
@@ -126,34 +124,34 @@ public final class R {
         public static final int help5=0x7f060006;
         public static final int hold=0x7f060014;
         public static final int lang=0x7f060000;
-        public static final int list0_1=0x7f06002a;
-        public static final int list0_2=0x7f06002b;
-        public static final int list0_3=0x7f06002c;
-        public static final int list0_4=0x7f06002d;
-        public static final int list0_5=0x7f06002e;
-        public static final int list0_6=0x7f06002f;
-        public static final int list0_7=0x7f060030;
-        public static final int list0_8=0x7f060031;
+        public static final int list0_1=0x7f06002b;
+        public static final int list0_2=0x7f06002c;
+        public static final int list0_3=0x7f06002d;
+        public static final int list0_4=0x7f06002e;
+        public static final int list0_5=0x7f06002f;
+        public static final int list0_6=0x7f060030;
+        public static final int list0_7=0x7f060031;
+        public static final int list0_8=0x7f060032;
         public static final int load=0x7f06000a;
-        public static final int message_delete_pattern=0x7f060024;
-        public static final int message_delete_patternfile=0x7f060025;
-        public static final int message_nopattern=0x7f060027;
+        public static final int message_delete_pattern=0x7f060025;
+        public static final int message_delete_patternfile=0x7f060026;
+        public static final int message_nopattern=0x7f060028;
         public static final int normal=0x7f06001a;
         public static final int number=0x7f06001c;
         public static final int orgmode=0x7f060008;
-        public static final int patternFileTitle=0x7f060026;
+        public static final int patternFileTitle=0x7f060027;
         public static final int patternMax=0x7f06001f;
         public static final int patternTypes=0x7f060019;
         public static final int pattern_name=0x7f060010;
         public static final int period=0x7f06001e;
         public static final int save=0x7f06000c;
+        public static final int select=0x7f060021;
         public static final int siteswap=0x7f060011;
-        public static final int siteswap_error=0x7f060029;
+        public static final int siteswap_error=0x7f06002a;
         public static final int speed=0x7f060016;
         public static final int synchronization=0x7f06001b;
-        public static final int title_activity_pattern_list=0x7f060032;
-        public static final int title_delete=0x7f060023;
-        public static final int title_system_error=0x7f060022;
-        public static final int update=0x7f060021;
+        public static final int title_delete=0x7f060024;
+        public static final int title_system_error=0x7f060023;
+        public static final int update=0x7f060022;
     }
 }

diff --git a/workspace/JuggleMaster/res/layout/pattern_manager.xml b/workspace/JuggleMaster/res/layout/pattern_manager.xml
index e20e61e..9f2c06c 100644 (file)
--- a/workspace/JuggleMaster/res/layout/pattern_manager.xml
+++ b/workspace/JuggleMaster/res/layout/pattern_manager.xml
@@ -16,8 +16,8 @@
     </ListView>
 
        <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
-               <Button android:text="@+string/add" android:layout_weight="1" android:id="@+id/patternAddButton" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
-               <Button android:text="@+string/update" android:layout_weight="1" android:id="@+id/patternUpdateButton" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
+               <Button android:text="@+string/select" android:layout_weight="1" android:id="@+id/patternUpdateButton" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
+           <Button android:text="@+string/add" android:layout_weight="1" android:id="@+id/patternAddButton" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
                <Button android:text="@+string/delete" android:layout_weight="1" android:id="@+id/patternDeleteButton" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
                <Button android:text="@+string/close" android:layout_weight="1" android:id="@+id/patternCloseButton" android:layout_width="fill_parent" android:layout_height="wrap_content" /> 
        </LinearLayout>    

diff --git a/workspace/JuggleMaster/res/values-fr/strings.xml b/workspace/JuggleMaster/res/values-fr/strings.xml
index 617cb3a..0263c34 100644 (file)
--- a/workspace/JuggleMaster/res/values-fr/strings.xml
+++ b/workspace/JuggleMaster/res/values-fr/strings.xml
@@ -49,4 +49,14 @@
     <string name="list0_6">[6] Pédagogie</string>
     <string name="list0_7">[7] Mes patterns</string>
     <string name="list0_8">[8] Générateur de patterns</string>
+    
+    <string name="help5">●メニューから「オリジナルモード」を選択後、「パターンファイル」を選択する事で、パターンファイルの変更、追加ができます。</string>
+    <string name="orgmode">オリジナルモード</string>
+    <string name="andmode">Androidモード</string>
+    <string name="load">パターンファイル</string>
+    <string name="add">追加</string>
+    <string name="select">選択</string>
+    <string name="message_delete_patternfile">このパターンファイルを削除しますか</string>
+    <string name="patternFileTitle">パターン名</string>
+    
 </resources>

diff --git a/workspace/JuggleMaster/res/values-ja/strings.xml b/workspace/JuggleMaster/res/values-ja/strings.xml
index a0b3206..d3b0252 100644 (file)
--- a/workspace/JuggleMaster/res/values-ja/strings.xml
+++ b/workspace/JuggleMaster/res/values-ja/strings.xml
@@ -7,7 +7,12 @@
     <string name="help2">●「[7]マイパターン」→「[新規作成]」を選択することで、新規のパターンを登録できます。</string>
     <string name="help3">●「[8]パターン生成」を選択することで、パターンを生成できます。</string>
     <string name="help4">●画面をタッチすることで、ジャグラーを見る視点を変えることができます。</string>
+    <string name="help5">●メニューから「オリジナルモード」を選択後、「パターンファイル」を選択する事で、パターンファイルの変更、追加ができます。</string>
     <string name="help">ヘルプ</string>
+    <string name="orgmode">オリジナルモード</string>
+    <string name="andmode">Androidモード</string>
+    <string name="load">パターンファイル</string>
+    <string name="add">追加</string>
     <string name="save">保存</string>
     <string name="delete">削除</string>
     <string name="cancel">取消</string>
@@ -31,11 +36,14 @@
     <string name="patternMax">パターンの最大数</string>
     <string name="generate">生成</string>
 
+    <string name="select">選択</string>
     <string name="update">更新</string>
     
     <string name="title_system_error">システムエラー</string>
     <string name="title_delete">削除</string>
     <string name="message_delete_pattern">このパターンを削除しますか</string>
+    <string name="message_delete_patternfile">このパターンファイルを削除しますか</string>
+    <string name="patternFileTitle">パターン名</string>
     <string name="message_nopattern">パターンがありません</string>
     <string name="error_unexpected">予期しないエラーが発生しました</string>
     

diff --git a/workspace/JuggleMaster/res/values/strings.xml b/workspace/JuggleMaster/res/values/strings.xml
index 59c36f0..b8b769a 100644 (file)
--- a/workspace/JuggleMaster/res/values/strings.xml
+++ b/workspace/JuggleMaster/res/values/strings.xml
@@ -7,12 +7,12 @@
     <string name="help2">●You can create a new figure by going into the menu [7] My patterns</string>
     <string name="help3">●You can generate patterns by going to the menu [8] generator patterns</string>
     <string name="help4">●You can change your point of view by draging the juggler</string>
-    <string name="help5">●メニューから「オリジナルモード」を選択後、「パターンファイル選択」を選択する事で、パターンファイルの変更、追加ができます。</string>
+    <string name="help5">●After selecting the \"Original mode\" from the menu, then select \"Pattern file\", you can change the pattern file, and add</string>
     <string name="help">Help</string>
-    <string name="orgmode">オリジナルモード</string>
-    <string name="andmode">Androidモード</string>
-    <string name="load">パターンファイル選択</string>
-    <string name="add">追加</string>
+    <string name="orgmode">Original mode</string>
+    <string name="andmode">Android mode</string>
+    <string name="load">Pattern file</string>
+    <string name="add">Add</string>
     <string name="save">Save</string>
     <string name="delete">Delete</string>
     <string name="cancel">Cancel</string>
@@ -34,12 +34,13 @@
     <string name="period">Period of the pattern</string>
     <string name="patternMax">The maximum number of patterns</string>
     <string name="generate">Generation</string>
+    <string name="select">Select</string>
     <string name="update">Update</string>
     <string name="title_system_error">System Error</string>
     <string name="title_delete">Delete</string>
-    <string name="message_delete_pattern">Are you sure you want to delete this pattern</string>
-    <string name="message_delete_patternfile">このパターンファイルを削除しますか</string>
-    <string name="patternFileTitle">パターン名</string>
+    <string name="message_delete_pattern">Are you sure you want to delete this pattern?</string>
+    <string name="message_delete_patternfile">Are you sure you want to delete this pattern file?</string>
+    <string name="patternFileTitle">Pattern name</string>
     <string name="message_nopattern">There is no pattern</string>
     <string name="error_unexpected">An unexpected error has occurred</string>
     <string name="siteswap_error">Error</string>
@@ -51,8 +52,9 @@
     <string name="list0_6">[6] Education</string>
     <string name="list0_7">[7] My patterns</string>
     <string name="list0_8">[8] Patterns generator</string>
+<!--  
     <string name="title_activity_pattern_list">PatternList</string>
     <string name="action_settings">Settings</string>
     <string name="hello_world">Hello world!</string>
-
+-->
 </resources>

diff --git a/workspace/JuggleMaster/src/com/jm/db/Dao.java b/workspace/JuggleMaster/src/com/jm/db/Dao.java
index f0e1e1d..f374711 100644 (file)
--- a/workspace/JuggleMaster/src/com/jm/db/Dao.java
+++ b/workspace/JuggleMaster/src/com/jm/db/Dao.java
@@ -355,8 +355,10 @@ public class Dao implements IDao<SQLiteDatabase> {
                                        android.provider.BaseColumns._ID, "name", "value",\r
                                        "iswritable" }, selection, selectionArgs, null, null,\r
                                        orderBy);\r
-                       cursor.moveToFirst();\r
                        int size = cursor.getCount();\r
+                       if (size > 0){\r
+                               cursor.moveToFirst();\r
+                       }\r
                        for (int i = 0; i < size; i++) {\r
                                PatternFile pf = new PatternFile(cursor.getLong(0),\r
                                                cursor.getString(1), (isBlob) ? cursor.getBlob(2)\r