[Gotisso-commit] SF.net SVN: gotisso:[9] trunk
Status: Inactive
Brought to you by:
jmvaz
Menu
▾
▴
[Gotisso-commit] SF.net SVN: gotisso:[9] trunk
|
From: <jm...@us...> - 2009-12-04 17:50:03
|
Revision: 9
http://gotisso.svn.sourceforge.net/gotisso/?rev=9&view=rev
Author: jmvaz
Date: 2009-12-04 17:49:56 +0000 (Fri, 04 Dec 2009)
Log Message:
-----------
changed component names from portuguese to english
Modified Paths:
--------------
trunk/gotisso.lpr
trunk/lang/gotisso.po
trunk/u_ingredients.lfm
trunk/u_ingredients.lrt
trunk/u_ingredients.pas
trunk/u_main.lfm
trunk/u_main.lrt
trunk/u_main.pas
trunk/u_meal.lfm
trunk/u_meal.lrt
trunk/u_meal.pas
Modified: trunk/gotisso.lpr
===================================================================
--- trunk/gotisso.lpr 2009-12-04 17:25:30 UTC (rev 8)
+++ trunk/gotisso.lpr 2009-12-04 17:49:56 UTC (rev 9)
@@ -38,8 +38,8 @@
Application.Title:= sTitle;
Application.Initialize;
Application.CreateForm(TfmMain, fmMain);
+ Application.CreateForm(TfmMeal, fmMeal);
Application.CreateForm(TfmIngredients, fmIngredients);
- Application.CreateForm(TfmMeal, fmMeal);
Application.Run;
end.
Modified: trunk/lang/gotisso.po
===================================================================
--- trunk/lang/gotisso.po 2009-12-04 17:25:30 UTC (rev 8)
+++ trunk/lang/gotisso.po 2009-12-04 17:49:56 UTC (rev 9)
@@ -1,69 +1,55 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
-#: TFMINGREDIENTES.BTFECHAR.CAPTION
-msgctxt "TFMINGREDIENTES.BTFECHAR.CAPTION"
+#: TFMINGREDIENTS.BTCLOSE.CAPTION
+msgctxt "TFMINGREDIENTS.BTCLOSE.CAPTION"
msgid "Fechar"
msgstr ""
-#: TFMINGREDIENTES.BTIMPRIMIR.CAPTION
-msgctxt "TFMINGREDIENTES.BTIMPRIMIR.CAPTION"
+#: TFMINGREDIENTS.BTPRINT.CAPTION
+msgctxt "TFMINGREDIENTS.BTPRINT.CAPTION"
msgid "Imprimir..."
msgstr ""
-#: TFMINGREDIENTES.CAPTION
-msgctxt "TFMINGREDIENTES.CAPTION"
+#: TFMINGREDIENTS.CAPTION
msgid "Ingredientes"
msgstr ""
-#: TFMINGREDIENTS.BTFECHAR.CAPTION
-msgctxt "TFMINGREDIENTS.BTFECHAR.CAPTION"
-msgid "Fechar"
+#: TFMMAIN.BTCLEAR.CAPTION
+msgctxt "TFMMAIN.BTCLEAR.CAPTION"
+msgid "Limpar"
msgstr ""
-#: TFMINGREDIENTS.BTIMPRIMIR.CAPTION
-msgctxt "TFMINGREDIENTS.BTIMPRIMIR.CAPTION"
-msgid "Imprimir..."
+#: TFMMAIN.BTDOWN.CAPTION
+msgid "Down"
msgstr ""
-#: TFMINGREDIENTS.CAPTION
-msgctxt "TFMINGREDIENTS.CAPTION"
-msgid "Ingredientes"
+#: TFMMAIN.BTINGREDIENTS.CAPTION
+msgid "Lista de Ingredientes..."
msgstr ""
-#: TFMMAIN.BTCARLIMPAR.CAPTION
-msgctxt "TFMMAIN.BTCARLIMPAR.CAPTION"
-msgid "Limpar"
+#: TFMMAIN.BTNEW.CAPTION
+msgid "Nova..."
msgstr ""
-#: TFMMAIN.BTCARREMOVER.CAPTION
-msgctxt "TFMMAIN.BTCARREMOVER.CAPTION"
-msgid "Remover"
-msgstr ""
-
-#: TFMMAIN.BTIMPRIMIR.CAPTION
-msgctxt "TFMMAIN.BTIMPRIMIR.CAPTION"
+#: TFMMAIN.BTPRINT.CAPTION
+msgctxt "TFMMAIN.BTPRINT.CAPTION"
msgid "Imprimir..."
msgstr ""
-#: TFMMAIN.BTINGREDIENTES.CAPTION
-msgid "Lista de Ingredientes..."
+#: TFMMAIN.BTREMOVE.CAPTION
+msgid "Remove"
msgstr ""
-#: TFMMAIN.BTNOVA.CAPTION
-msgid "Nova..."
+#: TFMMAIN.BTUP.CAPTION
+msgid "Up"
msgstr ""
-#: TFMMAIN.BUTTON8.CAPTION
-msgid "Button1"
-msgstr ""
-
#: TFMMAIN.CAPTION
msgid "fmMain"
msgstr ""
#: TFMMAIN.GBCARDAPIO.CAPTION
-msgctxt "TFMMAIN.GBCARDAPIO.CAPTION"
msgid "Cardápio"
msgstr ""
@@ -71,43 +57,39 @@
msgid "Pratos"
msgstr ""
-#: TFMMEAL.BTADICIONAR.CAPTION
-msgctxt "TFMMEAL.BTADICIONAR.CAPTION"
+#: TFMMEAL.BTADD.CAPTION
+msgctxt "TFMMEAL.BTADD.CAPTION"
msgid "Adicionar"
msgstr ""
-#: TFMMEAL.BTADICIONAREFECHAR.CAPTION
-msgctxt "TFMMEAL.BTADICIONAREFECHAR.CAPTION"
+#: TFMMEAL.BTADDANDCLOSE.CAPTION
msgid "Adicionar e Fechar"
msgstr ""
-#: TFMMEAL.BTDOWN.CAPTION
-msgctxt "TFMMEAL.BTDOWN.CAPTION"
-msgid "Abaixo"
+#: TFMMEAL.BTADDDISH.CAPTION
+msgctxt "TFMMEAL.BTADDDISH.CAPTION"
+msgid "Adicionar"
msgstr ""
-#: TFMMEAL.BTFECHAR.CAPTION
-msgctxt "TFMMEAL.BTFECHAR.CAPTION"
-msgid "Fechar"
+#: TFMMEAL.BTCLEAR.CAPTION
+msgctxt "TFMMEAL.BTCLEAR.CAPTION"
+msgid "Limpar"
msgstr ""
-#: TFMMEAL.BTLIMPAR.CAPTION
-msgctxt "TFMMEAL.BTLIMPAR.CAPTION"
-msgid "Limpar"
+#: TFMMEAL.BTCLOSE.CAPTION
+msgctxt "TFMMEAL.BTCLOSE.CAPTION"
+msgid "Fechar"
msgstr ""
-#: TFMMEAL.BTPRATO.CAPTION
-msgctxt "TFMMEAL.BTPRATO.CAPTION"
-msgid "Adicionar"
+#: TFMMEAL.BTDOWN.CAPTION
+msgid "Abaixo"
msgstr ""
-#: TFMMEAL.BTREMOVER.CAPTION
-msgctxt "TFMMEAL.BTREMOVER.CAPTION"
+#: TFMMEAL.BTREMOVE.CAPTION
msgid "Remover"
msgstr ""
#: TFMMEAL.BTUP.CAPTION
-msgctxt "TFMMEAL.BTUP.CAPTION"
msgid "Acima"
msgstr ""
@@ -115,117 +97,31 @@
msgid "fmMeal"
msgstr ""
-#: TFMMEAL.DEDATA.CANCELCAPTION
-msgctxt "TFMMEAL.DEDATA.CANCELCAPTION"
+#: TFMMEAL.DEDATE.CANCELCAPTION
msgid "Cancelar"
msgstr ""
-#: TFMMEAL.DEDATA.DIALOGTITLE
-msgctxt "TFMMEAL.DEDATA.DIALOGTITLE"
+#: TFMMEAL.DEDATE.DIALOGTITLE
msgid "Escolha a data"
msgstr ""
-#: TFMMEAL.DEDATA.OKCAPTION
-msgctxt "TFMMEAL.DEDATA.OKCAPTION"
+#: TFMMEAL.DEDATE.OKCAPTION
msgid "OK"
msgstr ""
-#: TFMMEAL.GBREFEICAO.CAPTION
-msgctxt "TFMMEAL.GBREFEICAO.CAPTION"
+#: TFMMEAL.GBMEAL.CAPTION
msgid "Refeição"
msgstr ""
-#: TFMMEAL.LBLREFEICAO.CAPTION
-msgctxt "TFMMEAL.LBLREFEICAO.CAPTION"
-msgid "Refeição:"
-msgstr ""
-
-#: TFMMEAL.LBPRATO.CAPTION
-msgctxt "TFMMEAL.LBPRATO.CAPTION"
+#: TFMMEAL.LBDISH.CAPTION
msgid "Prato:"
msgstr ""
-#: TFMMEAL.LBTIPO.CAPTION
-msgctxt "TFMMEAL.LBTIPO.CAPTION"
-msgid "Tipo:"
-msgstr ""
-
-#: TFMREFEICAO.BTADICIONAR.CAPTION
-msgctxt "TFMREFEICAO.BTADICIONAR.CAPTION"
-msgid "Adicionar"
-msgstr ""
-
-#: TFMREFEICAO.BTADICIONAREFECHAR.CAPTION
-msgctxt "TFMREFEICAO.BTADICIONAREFECHAR.CAPTION"
-msgid "Adicionar e Fechar"
-msgstr ""
-
-#: TFMREFEICAO.BTDOWN.CAPTION
-msgctxt "TFMREFEICAO.BTDOWN.CAPTION"
-msgid "Abaixo"
-msgstr ""
-
-#: TFMREFEICAO.BTFECHAR.CAPTION
-msgctxt "TFMREFEICAO.BTFECHAR.CAPTION"
-msgid "Fechar"
-msgstr ""
-
-#: TFMREFEICAO.BTLIMPAR.CAPTION
-msgctxt "TFMREFEICAO.BTLIMPAR.CAPTION"
-msgid "Limpar"
-msgstr ""
-
-#: TFMREFEICAO.BTPRATO.CAPTION
-msgctxt "TFMREFEICAO.BTPRATO.CAPTION"
-msgid "Adicionar"
-msgstr ""
-
-#: TFMREFEICAO.BTREMOVER.CAPTION
-msgctxt "TFMREFEICAO.BTREMOVER.CAPTION"
-msgid "Remover"
-msgstr ""
-
-#: TFMREFEICAO.BTUP.CAPTION
-msgctxt "TFMREFEICAO.BTUP.CAPTION"
-msgid "Acima"
-msgstr ""
-
-#: TFMREFEICAO.CAPTION
-msgid "fmRefeicao"
-msgstr ""
-
-#: TFMREFEICAO.DEDATA.CANCELCAPTION
-msgctxt "TFMREFEICAO.DEDATA.CANCELCAPTION"
-msgid "Cancelar"
-msgstr ""
-
-#: TFMREFEICAO.DEDATA.DIALOGTITLE
-msgctxt "TFMREFEICAO.DEDATA.DIALOGTITLE"
-msgid "Escolha a data"
-msgstr ""
-
-#: TFMREFEICAO.DEDATA.OKCAPTION
-msgctxt "TFMREFEICAO.DEDATA.OKCAPTION"
-msgid "OK"
-msgstr ""
-
-#: TFMREFEICAO.GBREFEICAO.CAPTION
-msgctxt "TFMREFEICAO.GBREFEICAO.CAPTION"
-msgid "Refeição"
-msgstr ""
-
-#: TFMREFEICAO.LBLREFEICAO.CAPTION
-msgctxt "TFMREFEICAO.LBLREFEICAO.CAPTION"
+#: TFMMEAL.LBLMEAL.CAPTION
msgid "Refeição:"
msgstr ""
-#: TFMREFEICAO.LBPRATO.CAPTION
-msgctxt "TFMREFEICAO.LBPRATO.CAPTION"
-msgid "Prato:"
-msgstr ""
-
-#: TFMREFEICAO.LBTIPO.CAPTION
-msgctxt "TFMREFEICAO.LBTIPO.CAPTION"
+#: TFMMEAL.LBTYPE.CAPTION
msgid "Tipo:"
msgstr ""
@@ -234,7 +130,6 @@
msgstr ""
#: u_consts.stitle
-msgctxt "u_consts.stitle"
msgid "Gotisso Meal Planner"
msgstr ""
Modified: trunk/u_ingredients.lfm
===================================================================
--- trunk/u_ingredients.lfm 2009-12-04 17:25:30 UTC (rev 8)
+++ trunk/u_ingredients.lfm 2009-12-04 17:49:56 UTC (rev 9)
@@ -7,7 +7,7 @@
ClientHeight = 300
ClientWidth = 400
LCLVersion = '0.9.28.2'
- object ListBox1: TListBox
+ object lbIngredients: TListBox
Left = 24
Height = 218
Top = 16
@@ -15,24 +15,24 @@
ItemHeight = 0
TabOrder = 0
end
- object btImprimir: TButton
+ object btPrint: TButton
Left = 24
Height = 25
Top = 248
Width = 75
Caption = 'Imprimir...'
Default = True
- OnClick = btImprimirClick
+ OnClick = btPrintClick
TabOrder = 1
end
- object btFechar: TButton
+ object btClose: TButton
Left = 301
Height = 25
Top = 252
Width = 75
Cancel = True
Caption = 'Fechar'
- OnClick = btFecharClick
+ OnClick = btCloseClick
TabOrder = 2
end
object PrintDialog: TPrintDialog
Modified: trunk/u_ingredients.lrt
===================================================================
--- trunk/u_ingredients.lrt 2009-12-04 17:25:30 UTC (rev 8)
+++ trunk/u_ingredients.lrt 2009-12-04 17:49:56 UTC (rev 9)
@@ -1,3 +1,3 @@
TFMINGREDIENTS.CAPTION=Ingredientes
-TFMINGREDIENTS.BTIMPRIMIR.CAPTION=Imprimir...
-TFMINGREDIENTS.BTFECHAR.CAPTION=Fechar
+TFMINGREDIENTS.BTPRINT.CAPTION=Imprimir...
+TFMINGREDIENTS.BTCLOSE.CAPTION=Fechar
Modified: trunk/u_ingredients.pas
===================================================================
--- trunk/u_ingredients.pas 2009-12-04 17:25:30 UTC (rev 8)
+++ trunk/u_ingredients.pas 2009-12-04 17:49:56 UTC (rev 9)
@@ -33,12 +33,12 @@
{ TfmIngredients }
TfmIngredients = class(TForm)
- btImprimir: TButton;
- btFechar: TButton;
- ListBox1: TListBox;
+ btPrint: TButton;
+ btClose: TButton;
+ lbIngredients: TListBox;
PrintDialog: TPrintDialog;
- procedure btFecharClick(Sender: TObject);
- procedure btImprimirClick(Sender: TObject);
+ procedure btCloseClick(Sender: TObject);
+ procedure btPrintClick(Sender: TObject);
private
{ private declarations }
public
@@ -52,7 +52,7 @@
{ TfmIngredients }
-procedure TfmIngredients.btImprimirClick(Sender: TObject);
+procedure TfmIngredients.btPrintClick(Sender: TObject);
begin
if PrintDialog.Execute then
begin
@@ -60,7 +60,7 @@
end;
end;
-procedure TfmIngredients.btFecharClick(Sender: TObject);
+procedure TfmIngredients.btCloseClick(Sender: TObject);
begin
Close;
end;
Modified: trunk/u_main.lfm
===================================================================
--- trunk/u_main.lfm 2009-12-04 17:25:30 UTC (rev 8)
+++ trunk/u_main.lfm 2009-12-04 17:49:56 UTC (rev 9)
@@ -41,24 +41,24 @@
310
)
end
- object btNova: TButton
+ object btNew: TButton
Left = 413
Height = 25
Top = 17
Width = 75
Caption = 'Nova...'
- OnClick = btNovaClick
+ OnClick = btNewClick
TabOrder = 1
end
- object btCarRemover: TButton
+ object btDown: TButton
Left = 413
Height = 25
- Top = 136
+ Top = 96
Width = 75
- Caption = 'Remover'
+ Caption = 'Down'
TabOrder = 2
end
- object btCarLimpar: TButton
+ object btClear: TButton
Left = 413
Height = 25
Top = 248
@@ -66,34 +66,42 @@
Caption = 'Limpar'
TabOrder = 3
end
- object Button8: TButton
+ object btUp: TButton
Left = 414
Height = 25
Top = 64
Width = 75
- Caption = 'Button1'
+ Caption = 'Up'
TabOrder = 4
end
- object btImprimir: TButton
+ object btPrint: TButton
Left = 21
Height = 25
Top = 297
Width = 75
Anchors = [akLeft, akBottom]
Caption = 'Imprimir...'
- OnClick = btImprimirClick
+ OnClick = btPrintClick
TabOrder = 5
end
- object btIngredientes: TButton
+ object btIngredients: TButton
Left = 134
Height = 25
Top = 296
Width = 154
Anchors = [akLeft, akBottom]
Caption = 'Lista de Ingredientes...'
- OnClick = btIngredientesClick
+ OnClick = btIngredientsClick
TabOrder = 6
end
+ object btRemove: TButton
+ Left = 413
+ Height = 25
+ Top = 128
+ Width = 75
+ Caption = 'Remove'
+ TabOrder = 7
+ end
end
object PrintDialog: TPrintDialog
left = 528
Modified: trunk/u_main.lrt
===================================================================
--- trunk/u_main.lrt 2009-12-04 17:25:30 UTC (rev 8)
+++ trunk/u_main.lrt 2009-12-04 17:49:56 UTC (rev 9)
@@ -2,9 +2,10 @@
TFMMAIN.GBCARDAPIO.CAPTION=Cardápio
TFMMAIN.SGCARDAPIO.COLUMNS.TITLE.CAPTION=Data
TFMMAIN.SGCARDAPIO.COLUMNS.TITLE.CAPTION=Pratos
-TFMMAIN.BTNOVA.CAPTION=Nova...
-TFMMAIN.BTCARREMOVER.CAPTION=Remover
-TFMMAIN.BTCARLIMPAR.CAPTION=Limpar
-TFMMAIN.BUTTON8.CAPTION=Button1
-TFMMAIN.BTIMPRIMIR.CAPTION=Imprimir...
-TFMMAIN.BTINGREDIENTES.CAPTION=Lista de Ingredientes...
+TFMMAIN.BTNEW.CAPTION=Nova...
+TFMMAIN.BTDOWN.CAPTION=Down
+TFMMAIN.BTCLEAR.CAPTION=Limpar
+TFMMAIN.BTUP.CAPTION=Up
+TFMMAIN.BTPRINT.CAPTION=Imprimir...
+TFMMAIN.BTINGREDIENTS.CAPTION=Lista de Ingredientes...
+TFMMAIN.BTREMOVE.CAPTION=Remove
Modified: trunk/u_main.pas
===================================================================
--- trunk/u_main.pas 2009-12-04 17:25:30 UTC (rev 8)
+++ trunk/u_main.pas 2009-12-04 17:49:56 UTC (rev 9)
@@ -33,18 +33,19 @@
{ TfmMain }
TfmMain = class(TForm)
- btIngredientes: TButton;
- btNova: TButton;
- btCarRemover: TButton;
- btCarLimpar: TButton;
- Button8: TButton;
- btImprimir: TButton;
+ btIngredients: TButton;
+ btNew: TButton;
+ btDown: TButton;
+ btClear: TButton;
+ btUp: TButton;
+ btPrint: TButton;
+ btRemove: TButton;
gbCardapio: TGroupBox;
PrintDialog: TPrintDialog;
sgCardapio: TStringGrid;
- procedure btImprimirClick(Sender: TObject);
- procedure btIngredientesClick(Sender: TObject);
- procedure btNovaClick(Sender: TObject);
+ procedure btPrintClick(Sender: TObject);
+ procedure btIngredientsClick(Sender: TObject);
+ procedure btNewClick(Sender: TObject);
procedure FormCreate(Sender: TObject);
private
{ private declarations }
@@ -83,7 +84,7 @@
end;
-procedure TfmMain.btImprimirClick(Sender: TObject);
+procedure TfmMain.btPrintClick(Sender: TObject);
begin
if PrintDialog.Execute then
with TStringGridPrinter.Create do
@@ -104,12 +105,12 @@
end;
-procedure TfmMain.btIngredientesClick(Sender: TObject);
+procedure TfmMain.btIngredientsClick(Sender: TObject);
begin
fmIngredients.ShowModal;
end;
-procedure TfmMain.btNovaClick(Sender: TObject);
+procedure TfmMain.btNewClick(Sender: TObject);
begin
fmMeal.ShowModal;
end;
Modified: trunk/u_meal.lfm
===================================================================
--- trunk/u_meal.lfm 2009-12-04 17:25:30 UTC (rev 8)
+++ trunk/u_meal.lfm 2009-12-04 17:49:56 UTC (rev 9)
@@ -9,7 +9,7 @@
OnCreate = FormCreate
OnShow = FormShow
LCLVersion = '0.9.28.2'
- object gbRefeicao: TGroupBox
+ object gbMeal: TGroupBox
Left = 20
Height = 240
Top = 16
@@ -19,25 +19,25 @@
ClientHeight = 222
ClientWidth = 516
TabOrder = 0
- object lbTipo: TLabel
+ object lbType: TLabel
Left = 30
Height = 14
Top = 23
Width = 25
Caption = 'Tipo:'
- FocusControl = cbTipo
+ FocusControl = cbType
ParentColor = False
end
- object lbPrato: TLabel
+ object lbDish: TLabel
Left = 30
Height = 14
Top = 72
Width = 31
Caption = 'Prato:'
- FocusControl = cbPrato
+ FocusControl = cbDish
ParentColor = False
end
- object lblRefeicao: TLabel
+ object lblMeal: TLabel
Left = 238
Height = 14
Top = 24
@@ -45,17 +45,17 @@
Caption = 'Refeição:'
ParentColor = False
end
- object cbTipo: TComboBox
+ object cbType: TComboBox
Left = 30
Height = 21
Top = 40
Width = 152
ItemHeight = 13
- OnChange = cbTipoChange
+ OnChange = cbTypeChange
Style = csDropDownList
TabOrder = 0
end
- object deData: TDateEdit
+ object deDate: TDateEdit
Left = 238
Height = 21
Top = 176
@@ -106,7 +106,7 @@
NumGlyphs = 0
TabOrder = 1
end
- object cbPrato: TComboBox
+ object cbDish: TComboBox
Left = 30
Height = 21
Top = 90
@@ -115,23 +115,23 @@
Style = csDropDownList
TabOrder = 2
end
- object btPrato: TButton
+ object btAddDish: TButton
Left = 107
Height = 25
Top = 127
Width = 75
Caption = 'Adicionar'
- OnClick = btPratoClick
+ OnClick = btAddDishClick
TabOrder = 3
end
- object lbRefeicao: TListBox
+ object lbMeal: TListBox
Left = 238
Height = 112
Top = 40
Width = 152
ItemHeight = 0
MultiSelect = True
- OnClick = lbRefeicaoClick
+ OnClick = lbMealClick
TabOrder = 4
end
object btDown: TButton
@@ -154,54 +154,54 @@
OnClick = btUpClick
TabOrder = 6
end
- object btRemover: TButton
+ object btRemove: TButton
Left = 414
Height = 25
Top = 96
Width = 75
Caption = 'Remover'
Enabled = False
- OnClick = btRemoverClick
+ OnClick = btRemoveClick
TabOrder = 7
end
- object btLimpar: TButton
+ object btClear: TButton
Left = 414
Height = 25
Top = 127
Width = 75
Caption = 'Limpar'
Enabled = False
- OnClick = btLimparClick
+ OnClick = btClearClick
TabOrder = 8
end
end
- object btAdicionar: TButton
+ object btAdd: TButton
Left = 24
Height = 25
Top = 280
Width = 75
Caption = 'Adicionar'
Default = True
- OnClick = btAdicionarClick
+ OnClick = btAddClick
TabOrder = 1
end
- object btAdicionarEFechar: TButton
+ object btAddAndClose: TButton
Left = 128
Height = 25
Top = 280
Width = 107
Caption = 'Adicionar e Fechar'
- OnClick = btAdicionarEFecharClick
+ OnClick = btAddAndCloseClick
TabOrder = 2
end
- object btFechar: TButton
+ object btClose: TButton
Left = 464
Height = 25
Top = 280
Width = 75
Cancel = True
Caption = 'Fechar'
- OnClick = btFecharClick
+ OnClick = btCloseClick
TabOrder = 3
end
end
Modified: trunk/u_meal.lrt
===================================================================
--- trunk/u_meal.lrt 2009-12-04 17:25:30 UTC (rev 8)
+++ trunk/u_meal.lrt 2009-12-04 17:49:56 UTC (rev 9)
@@ -1,16 +1,16 @@
TFMMEAL.CAPTION=fmMeal
-TFMMEAL.GBREFEICAO.CAPTION=Refeição
-TFMMEAL.LBTIPO.CAPTION=Tipo:
-TFMMEAL.LBPRATO.CAPTION=Prato:
-TFMMEAL.LBLREFEICAO.CAPTION=Refeição:
-TFMMEAL.DEDATA.DIALOGTITLE=Escolha a data
-TFMMEAL.DEDATA.OKCAPTION=OK
-TFMMEAL.DEDATA.CANCELCAPTION=Cancelar
-TFMMEAL.BTPRATO.CAPTION=Adicionar
+TFMMEAL.GBMEAL.CAPTION=Refeição
+TFMMEAL.LBTYPE.CAPTION=Tipo:
+TFMMEAL.LBDISH.CAPTION=Prato:
+TFMMEAL.LBLMEAL.CAPTION=Refeição:
+TFMMEAL.DEDATE.DIALOGTITLE=Escolha a data
+TFMMEAL.DEDATE.OKCAPTION=OK
+TFMMEAL.DEDATE.CANCELCAPTION=Cancelar
+TFMMEAL.BTADDDISH.CAPTION=Adicionar
TFMMEAL.BTDOWN.CAPTION=Abaixo
TFMMEAL.BTUP.CAPTION=Acima
-TFMMEAL.BTREMOVER.CAPTION=Remover
-TFMMEAL.BTLIMPAR.CAPTION=Limpar
-TFMMEAL.BTADICIONAR.CAPTION=Adicionar
-TFMMEAL.BTADICIONAREFECHAR.CAPTION=Adicionar e Fechar
-TFMMEAL.BTFECHAR.CAPTION=Fechar
+TFMMEAL.BTREMOVE.CAPTION=Remover
+TFMMEAL.BTCLEAR.CAPTION=Limpar
+TFMMEAL.BTADD.CAPTION=Adicionar
+TFMMEAL.BTADDANDCLOSE.CAPTION=Adicionar e Fechar
+TFMMEAL.BTCLOSE.CAPTION=Fechar
Modified: trunk/u_meal.pas
===================================================================
--- trunk/u_meal.pas 2009-12-04 17:25:30 UTC (rev 8)
+++ trunk/u_meal.pas 2009-12-04 17:49:56 UTC (rev 9)
@@ -33,34 +33,34 @@
{ TfmMeal }
TfmMeal = class(TForm)
- btPrato: TButton;
- btAdicionar: TButton;
- btLimpar: TButton;
- btRemover: TButton;
+ btAddDish: TButton;
+ btAdd: TButton;
+ btClear: TButton;
+ btRemove: TButton;
btDown: TButton;
btUp: TButton;
- btAdicionarEFechar: TButton;
- btFechar: TButton;
- cbPrato: TComboBox;
- cbTipo: TComboBox;
- deData: TDateEdit;
- gbRefeicao: TGroupBox;
- lblRefeicao: TLabel;
- lbPrato: TLabel;
- lbRefeicao: TListBox;
- lbTipo: TLabel;
- procedure btAdicionarClick(Sender: TObject);
- procedure btAdicionarEFecharClick(Sender: TObject);
+ btAddAndClose: TButton;
+ btClose: TButton;
+ cbDish: TComboBox;
+ cbType: TComboBox;
+ deDate: TDateEdit;
+ gbMeal: TGroupBox;
+ lblMeal: TLabel;
+ lbDish: TLabel;
+ lbMeal: TListBox;
+ lbType: TLabel;
+ procedure btAddClick(Sender: TObject);
+ procedure btAddAndCloseClick(Sender: TObject);
procedure btDownClick(Sender: TObject);
- procedure btFecharClick(Sender: TObject);
- procedure btPratoClick(Sender: TObject);
- procedure btLimparClick(Sender: TObject);
- procedure btRemoverClick(Sender: TObject);
+ procedure btCloseClick(Sender: TObject);
+ procedure btAddDishClick(Sender: TObject);
+ procedure btClearClick(Sender: TObject);
+ procedure btRemoveClick(Sender: TObject);
procedure btUpClick(Sender: TObject);
- procedure cbTipoChange(Sender: TObject);
+ procedure cbTypeChange(Sender: TObject);
procedure FormCreate(Sender: TObject);
procedure FormShow(Sender: TObject);
- procedure lbRefeicaoClick(Sender: TObject);
+ procedure lbMealClick(Sender: TObject);
private
{ private declarations }
procedure UpdateRefeicao;
@@ -81,30 +81,30 @@
procedure TfmMeal.FormCreate(Sender: TObject);
begin
- cbTipo.Items.Assign(Pratos.TodosTipos);
+ cbType.Items.Assign(Pratos.TodosTipos);
end;
procedure TfmMeal.FormShow(Sender: TObject);
begin
- cbTipo.ItemIndex:= 0;
- cbTipoChange(Sender); // já que alterar o ItemIndex não dispara esse evento...
+ cbType.ItemIndex:= 0;
+ cbTypeChange(Sender); // já que alterar o ItemIndex não dispara esse evento...
UpdateRefeicao;
end;
-procedure TfmMeal.cbTipoChange(Sender: TObject);
+procedure TfmMeal.cbTypeChange(Sender: TObject);
begin
- cbPrato.Items.Assign(Pratos.PratosPorTipo(cbTipo.Items[cbTipo.ItemIndex]).TodosPratos);
- cbPrato.ItemIndex:= 0;
+ cbDish.Items.Assign(Pratos.PratosPorTipo(cbType.Items[cbType.ItemIndex]).TodosPratos);
+ cbDish.ItemIndex:= 0;
end;
-procedure TfmMeal.btAdicionarClick(Sender: TObject);
+procedure TfmMeal.btAddClick(Sender: TObject);
begin
if not Adicionar then
ShowMessage(sError);
end;
-procedure TfmMeal.btAdicionarEFecharClick(Sender: TObject);
+procedure TfmMeal.btAddAndCloseClick(Sender: TObject);
begin
if not Adicionar then
ShowMessage(sError)
@@ -116,36 +116,36 @@
var
i: Integer;
begin
- for i:= (lbRefeicao.Count-2) downto 0 do
- if lbRefeicao.Selected[i] then
- lbRefeicao.Items.Exchange(i, i+1); //TODO: não está funcionando a contento: é necessário trocar os selecionados
+ for i:= (lbMeal.Count-2) downto 0 do
+ if lbMeal.Selected[i] then
+ lbMeal.Items.Exchange(i, i+1); //TODO: não está funcionando a contento: é necessário trocar os selecionados
end;
-procedure TfmMeal.btFecharClick(Sender: TObject);
+procedure TfmMeal.btCloseClick(Sender: TObject);
begin
- lbRefeicao.Clear;
+ lbMeal.Clear;
Close;
end;
-procedure TfmMeal.btPratoClick(Sender: TObject);
+procedure TfmMeal.btAddDishClick(Sender: TObject);
begin
- lbRefeicao.Items.Add(cbPrato.Items.Strings[cbPrato.ItemIndex]);
+ lbMeal.Items.Add(cbDish.Items.Strings[cbDish.ItemIndex]);
UpdateRefeicao;
end;
-procedure TfmMeal.btLimparClick(Sender: TObject);
+procedure TfmMeal.btClearClick(Sender: TObject);
begin
- lbRefeicao.Clear;
+ lbMeal.Clear;
UpdateRefeicao;
end;
-procedure TfmMeal.btRemoverClick(Sender: TObject);
+procedure TfmMeal.btRemoveClick(Sender: TObject);
var
i: Integer;
begin
- for i:= (lbRefeicao.Count-1) downto 0 do
- if lbRefeicao.Selected[i] then
- lbRefeicao.Items.Delete(i);
+ for i:= (lbMeal.Count-1) downto 0 do
+ if lbMeal.Selected[i] then
+ lbMeal.Items.Delete(i);
UpdateRefeicao;
end;
@@ -156,19 +156,19 @@
end;
-procedure TfmMeal.lbRefeicaoClick(Sender: TObject);
+procedure TfmMeal.lbMealClick(Sender: TObject);
begin
UpdateRefeicao;
end;
procedure TfmMeal.UpdateRefeicao;
begin
- btUp.Enabled:= ((lbRefeicao.SelCount > 0) and (not lbRefeicao.Selected[0]));
- btDown.Enabled:= ((lbRefeicao.SelCount > 0) and (not lbRefeicao.Selected[lbRefeicao.Count-1]));
- btRemover.Enabled:= (lbRefeicao.SelCount > 0);
- btLimpar.Enabled:= (lbRefeicao.Count > 0);
- btAdicionar.Enabled:= (lbRefeicao.Items.Count > 0);
- btAdicionarEFechar.Enabled:= btAdicionar.Enabled;
+ btUp.Enabled:= ((lbMeal.SelCount > 0) and (not lbMeal.Selected[0]));
+ btDown.Enabled:= ((lbMeal.SelCount > 0) and (not lbMeal.Selected[lbMeal.Count-1]));
+ btRemove.Enabled:= (lbMeal.SelCount > 0);
+ btClear.Enabled:= (lbMeal.Count > 0);
+ btAdd.Enabled:= (lbMeal.Items.Count > 0);
+ btAddAndClose.Enabled:= btAdd.Enabled;
end;
function TfmMeal.Adicionar: Boolean;
@@ -179,15 +179,15 @@
Result:= False;
Refeicao:= TRefeicao.Create;
try
- for i:= 0 to (lbRefeicao.Count-1) do
+ for i:= 0 to (lbMeal.Count-1) do
begin
- Refeicao.AdicionaPrato(Pratos.PratoPorNome(lbRefeicao.Items.Strings[i]));
+ Refeicao.AdicionaPrato(Pratos.PratoPorNome(lbMeal.Items.Strings[i]));
end;
- Refeicao.Data:= deData.Date;
+ Refeicao.Data:= deDate.Date;
//TODO: falta adicionar ao cardápio
- lbRefeicao.Clear;
+ lbMeal.Clear;
UpdateRefeicao;
except
Result:= False;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|