|
|
@@ -61,7 +61,7 @@ public class CustomizeFieldsActivity extends Activity implements
|
|
|
|
|
|
int hidePosition = adapter.getPosition(mHideField);
|
|
|
// hide -> display && displayCount >= maxDisplayCount
|
|
|
- if (from > hidePosition && to < hidePosition && hidePosition >= maxDisplayCount) {
|
|
|
+ if (from > hidePosition && to < hidePosition && hidePosition > maxDisplayCount) {
|
|
|
|
|
|
new AlertDialog.Builder(this)
|
|
|
.setTitle("Warning")
|
|
|
@@ -208,7 +208,11 @@ public class CustomizeFieldsActivity extends Activity implements
|
|
|
// {
|
|
|
// navList.add("Aѡ��" + i);
|
|
|
// }
|
|
|
- mDisplayField = new fieldedit(getString(R.string.str_displayitem), -1);
|
|
|
+ if (forNewResult) {
|
|
|
+ mDisplayField = new fieldedit("Additional Fields To Display", -1);
|
|
|
+ } else {
|
|
|
+ mDisplayField = new fieldedit(getString(R.string.str_displayitem), -1);
|
|
|
+ }
|
|
|
list.add(mDisplayField);
|
|
|
list.addAll(showList);
|
|
|
|
|
|
@@ -216,7 +220,11 @@ public class CustomizeFieldsActivity extends Activity implements
|
|
|
// {
|
|
|
// moreList.add("Bѡ��" + i);
|
|
|
// }
|
|
|
- mHideField = new fieldedit(getString(R.string.str_hideitem), -2);
|
|
|
+ if (forNewResult) {
|
|
|
+ mHideField = new fieldedit("Additional Fields", -2);
|
|
|
+ } else {
|
|
|
+ mHideField = new fieldedit(getString(R.string.str_hideitem), -2);
|
|
|
+ }
|
|
|
list.add(mHideField);
|
|
|
list.addAll(hideList);
|
|
|
dbUtil.CloseCursor(cursor);
|
|
|
@@ -303,35 +311,37 @@ public class CustomizeFieldsActivity extends Activity implements
|
|
|
{
|
|
|
// DragListView dragListView = (DragListView)
|
|
|
// findViewById(R.id.drag_list);
|
|
|
- int count = 0;
|
|
|
- for (int i = 0; i < adapter.getCount(); i++)
|
|
|
- {
|
|
|
- fieldedit fe = adapter.getItem(i);
|
|
|
- if (fe._id == -2 || count > 0)
|
|
|
- break;
|
|
|
- if (fe._id >= 0)
|
|
|
- count++;
|
|
|
+ if (!forNewResult) {
|
|
|
+ int count = 0;
|
|
|
+ for (int i = 0; i < adapter.getCount(); i++)
|
|
|
+ {
|
|
|
+ fieldedit fe = adapter.getItem(i);
|
|
|
+ if (fe._id == -2 || count > 0)
|
|
|
+ break;
|
|
|
+ if (fe._id >= 0)
|
|
|
+ count++;
|
|
|
|
|
|
- }
|
|
|
- if (count == 0)
|
|
|
- {
|
|
|
- new AlertDialog.Builder(CustomizeFieldsActivity.this)
|
|
|
- .setIcon(android.R.drawable.ic_dialog_info)
|
|
|
- .setTitle("Error!")
|
|
|
- .setMessage("You must set at least 1 field visiable!")
|
|
|
- .setPositiveButton("OK",
|
|
|
- new DialogInterface.OnClickListener()
|
|
|
- {
|
|
|
- public void onClick(DialogInterface dialog,
|
|
|
- int whichButton)
|
|
|
+ }
|
|
|
+ if (count == 0)
|
|
|
+ {
|
|
|
+ new AlertDialog.Builder(CustomizeFieldsActivity.this)
|
|
|
+ .setIcon(android.R.drawable.ic_dialog_info)
|
|
|
+ .setTitle("Error!")
|
|
|
+ .setMessage("You must set at least 1 field visiable!")
|
|
|
+ .setPositiveButton("OK",
|
|
|
+ new DialogInterface.OnClickListener()
|
|
|
{
|
|
|
+ public void onClick(DialogInterface dialog,
|
|
|
+ int whichButton)
|
|
|
+ {
|
|
|
+
|
|
|
+ // finish();
|
|
|
+ /* User clicked OK so do some stuff */
|
|
|
+ }
|
|
|
+ }).show();
|
|
|
+ break;
|
|
|
|
|
|
- // finish();
|
|
|
- /* User clicked OK so do some stuff */
|
|
|
- }
|
|
|
- }).show();
|
|
|
- break;
|
|
|
-
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
int show = 1;
|