T27935

diff --git a/workspace/EverMemo/gen/com/yuji/em/R.java b/workspace/EverMemo/gen/com/yuji/em/R.java
index f1db215..2e55519 100644 (file)
--- a/workspace/EverMemo/gen/com/yuji/em/R.java
+++ b/workspace/EverMemo/gen/com/yuji/em/R.java
@@ -74,18 +74,31 @@ public final class R {
         public static final int app_name=0x7f050000;
         public static final int cancelButton=0x7f050006;
         public static final int closeButton=0x7f050007;
-        public static final int date_title=0x7f05000f;
         public static final int deleteButton=0x7f050005;
-        public static final int headerExplainText1=0x7f050009;
-        public static final int headerExplainText2=0x7f05000a;
-        public static final int headerExplainText3=0x7f05000b;
-        public static final int headerExplainText4=0x7f05000c;
+        public static final int headerEditTitle=0x7f050016;
+        public static final int headerExplainText1=0x7f050017;
+        public static final int headerExplainText2=0x7f050018;
+        public static final int headerExplainText3=0x7f050019;
+        public static final int headerExplainText4=0x7f05001a;
         public static final int mainMenuSetting=0x7f050008;
-        public static final int mainTitle=0x7f05000d;
+        public static final int mainTitle=0x7f05001b;
         public static final int noButton=0x7f050003;
-        public static final int selectTitle=0x7f05000e;
+        public static final int noteListGetting=0x7f050015;
+        public static final int selectListConfirmMessage=0x7f05000b;
+        public static final int selectListConfirmTitle=0x7f05000a;
+        public static final int selectListTitle=0x7f050009;
+        public static final int selectTitle=0x7f05001c;
         public static final int sendButton=0x7f050001;
+        public static final int settingConfirmTitle=0x7f05000e;
+        public static final int settingHeaderButton=0x7f050014;
+        public static final int settingHeaderTitle=0x7f050011;
+        public static final int settingNoteButton=0x7f050013;
+        public static final int settingNoteTitle=0x7f050010;
+        public static final int settingUserButton=0x7f050012;
+        public static final int settingUserTitle=0x7f05000f;
         public static final int updateButton=0x7f050004;
+        public static final int userPasswordTitle=0x7f05000d;
+        public static final int userUserTitle=0x7f05000c;
         public static final int yesButton=0x7f050002;
     }
 }

diff --git a/workspace/EverMemo/res/layout/header.xml b/workspace/EverMemo/res/layout/header.xml
index 9cfa227..30b8627 100644 (file)
--- a/workspace/EverMemo/res/layout/header.xml
+++ b/workspace/EverMemo/res/layout/header.xml
@@ -6,7 +6,7 @@
     >
     <ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1">
                <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical">
-                   <TextView android:text="TextView" android:background="#99cccc" android:id="@+id/headerheaderTextView" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+                   <TextView android:text="@+string/headerEditTitle" android:background="#99cccc" android:id="@+id/headerheaderTextView" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
                        <EditText android:id="@+id/headerEditText" android:layout_height="fill_parent" android:layout_width="fill_parent" android:inputType="textMultiLine"
                                android:gravity="top"
                        ></EditText>

diff --git a/workspace/EverMemo/res/layout/select_note_list.xml b/workspace/EverMemo/res/layout/select_note_list.xml
index 17604c6..7924660 100644 (file)
--- a/workspace/EverMemo/res/layout/select_note_list.xml
+++ b/workspace/EverMemo/res/layout/select_note_list.xml
@@ -5,9 +5,9 @@
     android:layout_height="fill_parent"
     >
        <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_weight="1" android:orientation="vertical">
-               <TextView android:id="@+id/selectListTitle" android:text="@+string/selectTitle" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+               <TextView android:id="@+id/selectListTitle" android:text="@+string/selectListTitle" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
                <LinearLayout android:id="@+id/selectListLayout" android:padding="6px" android:layout_margin="3px" android:background="#666666" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical">
-                       <TextView android:text="@+string/date_title" android:background="#ccffff" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+                       <TextView android:text="@+string/selectListConfirmTitle" android:background="#ccffff" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
                        <TextView android:id="@+id/selectListMessage" android:padding="10px" android:text="@+string/selectTitle" android:background="#ffff66" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
                </LinearLayout>
                <ListView android:id="@+id/selectListView" android:layout_width="fill_parent" android:layout_height="fill_parent"></ListView>

diff --git a/workspace/EverMemo/res/layout/setting.xml b/workspace/EverMemo/res/layout/setting.xml
index 9c8efc6..037f40c 100644 (file)
--- a/workspace/EverMemo/res/layout/setting.xml
+++ b/workspace/EverMemo/res/layout/setting.xml
@@ -7,16 +7,15 @@
     <ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1">
                <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical" android:padding="0px">
                        <LinearLayout android:id="@+id/settingLayout" android:padding="6px" android:layout_margin="3px" android:background="#666666" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical">
-                               <TextView android:text="@+string/date_title" android:background="#ccffff" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+                               <TextView android:text="@+string/settingConfirmTitle" android:background="#ccffff" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
                                <TextView android:id="@+id/settingMessage" android:padding="10px" android:text="@+string/selectTitle" android:background="#ffff66" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
                        </LinearLayout>
-                       <TextView android:text="@+string/date_title" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
-                       <Button android:text="ユーザ/パスワードを設定する" android:id="@+id/settingUserButton" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px" /> 
-                       <TextView android:text="@+string/date_title" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
-                       <TextView android:text="@+string/date_title" android:background="#cc99cc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
-                       <Button android:text="送信先のノートを設定する" android:id="@+id/settingNoteButton" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px" /> 
-                       <TextView android:text="@+string/date_title" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
-                       <Button android:text="ヘッダーを設定する" android:id="@+id/settingHeaderButton" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px" /> 
+                       <TextView android:text="@+string/settingUserTitle" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
+                       <Button android:text="@+string/settingUserButton" android:id="@+id/settingUserButton" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px" /> 
+                       <TextView android:text="@+string/settingNoteTitle" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
+                       <Button android:text="@+string/settingNoteButton" android:id="@+id/settingNoteButton" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px" /> 
+                       <TextView android:text="@+string/settingHeaderTitle" android:background="#99cccc" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px"></TextView>
+                       <Button android:text="@+string/settingHeaderButton" android:id="@+id/settingHeaderButton" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="0px" /> 
                </LinearLayout>
        </ScrollView>
        <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">

diff --git a/workspace/EverMemo/res/layout/user_password.xml b/workspace/EverMemo/res/layout/user_password.xml
index b020a87..e0a57e1 100644 (file)
--- a/workspace/EverMemo/res/layout/user_password.xml
+++ b/workspace/EverMemo/res/layout/user_password.xml
@@ -6,9 +6,9 @@
     >
     <ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_weight="1">
        <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical">
-           <TextView android:text="TextView" android:background="#99cccc" android:id="@+id/userUserTextView" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+           <TextView android:text="@+string/userUserTitle" android:background="#99cccc" android:id="@+id/userUserTextView" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
            <EditText android:layout_height="wrap_content" android:id="@+id/userUserEditText" android:layout_width="fill_parent" android:inputType="text"></EditText>
-           <TextView android:text="TextView" android:background="#99cccc" android:id="@+id/userPasswordTextView" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
+           <TextView android:text="@+string/userPasswordTitle" android:background="#99cccc" android:id="@+id/userPasswordTextView" android:layout_width="fill_parent" android:layout_height="wrap_content"></TextView>
            <EditText android:layout_height="wrap_content" android:id="@+id/userPasswordEditText" android:hint="********" android:layout_width="fill_parent" android:inputType="textPassword"></EditText>
        </LinearLayout>
        </ScrollView>

diff --git a/workspace/EverMemo/res/values-ja/strings.xml b/workspace/EverMemo/res/values-ja/strings.xml
new file mode 100644 (file)
index 0000000..f21ba8f
--- /dev/null
+++ b/workspace/EverMemo/res/values-ja/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">EverMemo</string>
+
+    <string name="sendButton">送信</string>
+    <string name="yesButton">はい</string>
+    <string name="noButton">いいえ</string>
+    <string name="updateButton">更新</string>
+    <string name="deleteButton">削除</string>
+    <string name="cancelButton">取消</string>
+    <string name="closeButton">閉じる</string>
+
+    <string name="mainMenuSetting">設定</string>
+    
+    <string name="userUserTitle">ユーザ</string>
+    <string name="userPasswordTitle">パスワード</string>
+
+    <string name="settingConfirmTitle">確認</string>
+    <string name="settingUserTitle">ユーザ</string>
+    <string name="settingNoteTitle">ノート</string>
+    <string name="settingHeaderTitle">ヘッダー</string>
+    <string name="settingUserButton">ユーザ/パスワードを設定する</string>
+    <string name="settingNoteButton">送信先のノートを設定する</string>
+    <string name="settingHeaderButton">ヘッダーを設定する</string>
+
+    <string name="selectListTitle">出力先のノート</string>
+    <string name="selectListConfirmTitle">確認</string>
+    <string name="selectListConfirmMessage">削除しますか？</string>
+
+    <string name="noteListGetting">取得中</string>
+
+    <string name="headerEditTitle">ヘッダー</string>
+    <string name="headerExplainText1">・送信したテキストの先頭に付加されます。</string>
+    <string name="headerExplainText2">・「{DATE}」は、現在日付に変換されます。</string>
+    <string name="headerExplainText3">・「{TIME}」は、現在時刻に変換されます。</string>
+    <string name="headerExplainText4">・例) &lt;hr /&gt;&lt;h3&gt;{DATE} {TIME}&lt;/h3&gt;&lt;hr /&gt;</string>
+</resources>

diff --git a/workspace/EverMemo/res/values/strings.xml b/workspace/EverMemo/res/values/strings.xml
index 7c48cdb..ab24879 100644 (file)
--- a/workspace/EverMemo/res/values/strings.xml
+++ b/workspace/EverMemo/res/values/strings.xml
@@ -2,18 +2,36 @@
 <resources>
     <string name="app_name">EverMemo</string>
 
-    <string name="sendButton">送信</string>
-    <string name="yesButton">はい</string>
-    <string name="noButton">いいえ</string>
-    <string name="updateButton">更新</string>
-    <string name="deleteButton">削除</string>
-    <string name="cancelButton">取消</string>
-    <string name="closeButton">閉じる</string>
+    <string name="sendButton">Send</string>
+    <string name="yesButton">Yes</string>
+    <string name="noButton">No</string>
+    <string name="updateButton">Update</string>
+    <string name="deleteButton">Delete</string>
+    <string name="cancelButton">Cancel</string>
+    <string name="closeButton">Close</string>
 
-    <string name="mainMenuSetting">設定</string>
+    <string name="mainMenuSetting">Settings</string>
     
-    <string name="headerExplainText1">・送信したテキストの先頭に付加されます。</string>
-    <string name="headerExplainText2">・「{DATE}」は、現在日付に変換されます。</string>
-    <string name="headerExplainText3">・「{TIME}」は、現在時刻に変換されます。</string>
-    <string name="headerExplainText4">・例) &lt;hr /&gt;&lt;h3&gt;{DATE} {TIME}&lt;/h3&gt;&lt;hr /&gt;</string>
+    <string name="selectListTitle">Note of the destination</string>
+    <string name="selectListConfirmTitle">Confirm</string>
+    <string name="selectListConfirmMessage">Delete?</string>
+
+    <string name="userUserTitle">User</string>
+    <string name="userPasswordTitle">Password</string>
+
+    <string name="settingConfirmTitle">Confirm</string>
+    <string name="settingUserTitle">User</string>
+    <string name="settingNoteTitle">Note</string>
+    <string name="settingHeaderTitle">Header</string>
+    <string name="settingUserButton">Set user and password</string>
+    <string name="settingNoteButton">Set the note of the destination</string>
+    <string name="settingHeaderButton">Set the header</string>
+
+    <string name="noteListGetting">Getting</string>
+
+    <string name="headerEditTitle">Header</string>
+    <string name="headerExplainText1">・Header is added to the beginning of the text.</string>
+    <string name="headerExplainText2">・「{DATE}」is converted to the current date.</string>
+    <string name="headerExplainText3">・「{TIME}」is converted to the current time.</string>
+    <string name="headerExplainText4">・Example: &lt;hr /&gt;&lt;h3&gt;{DATE} {TIME}&lt;/h3&gt;&lt;hr /&gt;</string>
 </resources>

diff --git a/workspace/EverMemo/src/com/yuji/em/NoteListActivity.java b/workspace/EverMemo/src/com/yuji/em/NoteListActivity.java
index b93c0bf..04e4a68 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/NoteListActivity.java
+++ b/workspace/EverMemo/src/com/yuji/em/NoteListActivity.java
@@ -58,6 +58,8 @@ public class NoteListActivity extends BaseActivity {
                        } else {
                                NoteListTask task = new NoteListTask(this);
                                AsyncTaskCommand command = new AsyncTaskCommand(this, task);
+                               command.setTitle(getString(R.string.noteListGetting));
+                               command.setButtonTitle(getString(R.string.cancelButton));
                                command.execute("");
                        }
                } catch (Exception e) {

diff --git a/workspace/EverMemo/src/com/yuji/em/SelectNoteListActivity.java b/workspace/EverMemo/src/com/yuji/em/SelectNoteListActivity.java
index 2a4e3e3..d33f0fe 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/SelectNoteListActivity.java
+++ b/workspace/EverMemo/src/com/yuji/em/SelectNoteListActivity.java
@@ -213,7 +213,7 @@ public class SelectNoteListActivity extends BaseActivity {
                        noButton.setVisibility(View.GONE);
                } else if (view == deleteButton) {
                        messageLayout.setVisibility(View.VISIBLE);
-                       messageView.setText("\8dí\8f\9c\82µ\82Ü\82·\82©"); // TODO
+                       messageView.setText(getString(R.string.selectListConfirmMessage));
                        selectListView.setEnabled(false);
                        editButton.setVisibility(View.GONE);
                        deleteButton.setVisibility(View.GONE);

diff --git a/workspace/EverMemo/src/com/yuji/em/utility/AsyncTaskCommand.java b/workspace/EverMemo/src/com/yuji/em/utility/AsyncTaskCommand.java
index 7f4bceb..36e1853 100644 (file)
--- a/workspace/EverMemo/src/com/yuji/em/utility/AsyncTaskCommand.java
+++ b/workspace/EverMemo/src/com/yuji/em/utility/AsyncTaskCommand.java
@@ -19,6 +19,9 @@ public class AsyncTaskCommand extends AsyncTask<String, Integer, String> {
        private boolean isDialog = true;\r
        private int status = -1;\r
        \r
+       private String title = "";\r
+       private String buttonTitle = "";\r
+       \r
        @SuppressWarnings({ "rawtypes", "unchecked" })\r
        public AsyncTaskCommand(Activity activity, AsyncTaskIF command) {\r
                this.activityRef = new WeakReference(activity);\r
@@ -37,12 +40,8 @@ public class AsyncTaskCommand extends AsyncTask<String, Integer, String> {
                        dialog = new ProgressDialog(activity);\r
                        dialog.setIndeterminate(true);\r
                        dialog.setCancelable(false);\r
-                       // TODO\r
-                       // dialog.setTitle(activity.getString(R.string.calculating));\r
-                       // dialog.setButton(activity.getString(R.string.cancel), new\r
-                       // DialogInterface.OnClickListener() {\r
-                       dialog.setTitle("\8cv\8eZ\92\86\81\97\81\97\81\97");\r
-                       dialog.setButton("\83L\83\83\83\93\83Z\83\8b\81\97\81\97\81\97", new DialogInterface.OnClickListener() {\r
+                       dialog.setTitle(title);\r
+                       dialog.setButton(buttonTitle, new DialogInterface.OnClickListener() {\r
                                @Override\r
                                public void onClick(DialogInterface dialog, int which) {\r
                                        dialog.cancel();\r
@@ -138,4 +137,12 @@ public class AsyncTaskCommand extends AsyncTask<String, Integer, String> {
        public int getResultStatus(){\r
                return status;\r
        }\r
+\r
+       public void setTitle(String title) {\r
+               this.title = title;\r
+       }\r
+\r
+       public void setButtonTitle(String buttonTitle) {\r
+               this.buttonTitle = buttonTitle;\r
+       }\r
 }\r