From fb3d21dd264151dce808d7698ee0d8a28d6f227e Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Wed, 08 Aug 2012 09:50:50 +0000
Subject: [PATCH] Przeniesienie menu z osobnej formatki pod przycisk.
---
src/brydz/BrydzForm.java | 68 ++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 23 deletions(-)
diff --git a/src/brydz/BrydzForm.java b/src/brydz/BrydzForm.java
index f791084..bf56192 100644
--- a/src/brydz/BrydzForm.java
+++ b/src/brydz/BrydzForm.java
@@ -4,6 +4,8 @@
public class BrydzForm extends Form implements CommandListener, ItemStateListener {
protected BrydzMIDlet midlet;
+ protected BrydzPomocForm help = null;
+ protected BrydzPomocForm about = null;
protected TextField kontraktField;
protected ChoiceGroup kontraktChoice;
@@ -33,8 +35,10 @@
this.kontraChoice.append("rektr.", null);
this.partiaChoice = new ChoiceGroup(null, ChoiceGroup.EXCLUSIVE);
- this.partiaChoice.append("przed", null);
- this.partiaChoice.append("po", null);
+ this.partiaChoice.append("przed / przed", null);
+ this.partiaChoice.append("przed / po", null);
+ this.partiaChoice.append("po / przed", null);
+ this.partiaChoice.append("po / po", null);
this.punktyField = new TextField("PC:", null, 2, TextField.NUMERIC);
this.lewyField = new TextField("Lew:", null, 2, TextField.NUMERIC);
@@ -49,26 +53,46 @@
this.append(this.lewyField);
this.append(this.resultText);
- setItemStateListener(this);
- setCommandListener(this);
- addCommand(new Command("Wyczyść", Command.OK, 1));
- addCommand(new Command("Wyjście", Command.EXIT, 1));
+ this.addCommand(new Command("Wyczyść", Command.BACK, 1));
+ this.addCommand(new Command("Pomoc", Command.HELP, 2));
+ this.addCommand(new Command("O programie", Command.HELP, 3));
+ this.addCommand(new Command("Wyjście", Command.EXIT, 4));
+
+ this.setItemStateListener(this);
+ this.setCommandListener(this);
}
public void commandAction(Command command, Displayable displayable) {
- if (command.getCommandType() == Command.OK) {
- this.kontraktField.setString(null);
- this.kontraktChoice.setSelectedIndex(0, true);
- this.kontraChoice.setSelectedIndex(0, true);
- this.partiaChoice.setSelectedIndex(0, true);
- this.punktyField.setString(null);
- this.lewyField.setString(null);
- this.resultText.setText("Podaj wszystkie dane.");
-
- Display.getDisplay(this.midlet).setCurrentItem(this.kontraktField);
- }
- else if (command.getCommandType() == Command.EXIT) {
- this.midlet.destroyApp(true);
+ switch(command.getCommandType()) {
+ case Command.EXIT:
+ this.midlet.destroyApp(true);
+ break;
+ case Command.CANCEL:
+ case Command.BACK:
+ this.kontraktField.setString(null);
+ this.kontraktChoice.setSelectedIndex(0, true);
+ this.kontraChoice.setSelectedIndex(0, true);
+ this.partiaChoice.setSelectedIndex(0, true);
+ this.punktyField.setString(null);
+ this.lewyField.setString(null);
+ this.resultText.setText("Podaj wszystkie dane.");
+
+ this.midlet.display.setCurrentItem(this.kontraktField);
+ break;
+ case Command.HELP:
+ if(command.getPriority() == 2) {
+ if(this.help == null) {
+ this.help = new BrydzPomocForm(this.midlet, this, false);
+ }
+ this.midlet.display.setCurrent(this.help);
+ }
+ else if(command.getPriority() == 3) {
+ if(this.about == null) {
+ this.about = new BrydzPomocForm(this.midlet, this, true);
+ }
+ this.midlet.display.setCurrent(this.about);
+ }
+ break;
}
}
@@ -89,9 +113,7 @@
}
BrydzWynik wynik;
-
- String data = "";
-
+
if( kontrakt < 0 || kontrakt > 7 ) {
this.resultText.setText("Niepoprawny kontrakt.");
return;
@@ -107,7 +129,7 @@
return;
}
- if( partia != 0 && partia != 1) {
+ if( partia < 0 || partia > 3) {
this.resultText.setText("Niepoprawna informacja o partii.");
return;
}
--
Gitblit v1.9.1