From 67d528fcbb134b105988b0d935251edf51f70432 Mon Sep 17 00:00:00 2001
From: Adah Boukhari <adahboukhary@gmail.com>
Date: Thu, 30 Jan 2020 23:44:59 +0100
Subject: [PATCH] Commit_9 Gui Erweiterung-- 3 x label hinzugefuegt

---
 .../bin/MeinBudgetView/MeinGui$1.class        | Bin 738 -> 738 bytes
 .../bin/MeinBudgetView/MeinGui.class          | Bin 4781 -> 4999 bytes
 .../src/MeinBudgetView/MeinGui.java           |  32 ++++++++++++------
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class b/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class
index 31d48c4d407baccf61385d5f902a5f99e0b0f5e2..53983919b7e13131d44819a53d5fa6adc3ab7ffd 100644
GIT binary patch
delta 35
qcmaFF`iOOd3KOH|WL2h6K^+DT23-bT20aEr27Lxm2E)nSOyK~D_6CRm

delta 35
qcmaFF`iOOd3KOHoWL2h6L2U*O1|0@o23-b020aE*27}4nOyK~Dng)UZ

diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui.class b/Budget Projekt/bin/MeinBudgetView/MeinGui.class
index b1ba1ddc4b0f6decce5ac321c37248c26bb7d24b..0ba7543a7caf093c6d908713ef9a75545d1d0953 100644
GIT binary patch
delta 1189
zcmZ9KeUQ#o6vsd3-fN$?->zr3v1aXr^0HngG!2Ppib66)>t&m$$F^z3V_Tajd63eo
z4E@@6R!d2C5L4UgSuc~(j3}cQDSA_u-d43zDiYgyhSB8yanARid%owKd+&Ecr-gaZ
z-DkIK1NulXfDy9&k-_ZR&btG_K(8LX+8>_3zV1XIAnl80mK4RO7fl~rJiTN}Y?hEQ
zF*YR@FDyDA@J|N&gbr~yK!ec6zbx1)eB+Fwc$vo$zV*k1I;DNjj{$!0=Y`tHQNKFW
zHtlDRUug2ThdQ+VmEQs!7owA6Gh#ip?xdc#mz5UBCwctN317m!TQ`y)<S)UcW(w2D
zDUZK7?T-le&u!$4$61<$VA-^D#4sg-CsMa6oGC5366Pv@bEIA9T>_+od&6&tY>~Ns
zwbx7S`(9mVnxnyJk7!1c72P&6;EE*U$8M#hAZt}UrTtuv%akXgLBA&batZqHr4MyV
z$o5-h47W?v7piX;&91A>Xe)`W_yt)NF6z}&nPi!k+m)%=qoQLjluyMjba*G#A(9ih
zh?f&dwHy_VUtr}#{?GApyo)(rrir#w(&+z4o`0m}z{JB$(0}fW;~IU9ezc@NmvSv#
z7@)g>+`x6*%=L^_bT@-2VKB3~iE@Te#ZXr3>FW$<JGZch5q!$69O5>PGm<lmk~H$=
z5=KiNW26t`WEcf9jyvQY?vyy=6EcShvWUCHCnn38DC;PcI*Mc)_sSk7$$pBZfyr`=
z`{fi<O&W2N%QVxS2TXrT%@E2=J`b8=W|&#bH08`P6+B{IX11y4QL~GLIlx?Vg!!h4
z$4oN|Y&wtI)-1FgNjzz<rrZu?k<I668{-*U%3?c*CH5(n+G?J)Yk1DqQDJxRyxm8o
zJxG;3$})R~7hF2kE{7GaBQLt%yyOP4(v4u18^<fInAPqfYTP{5xN_FIrL1#Ryy{l6
z-mPVWtK~JiB=qqYoRc0O@F7T^HvWjch{Ww+KGriM%WW(6DYCN7oZu5hP8!T!ee85v
zm|RoIer2SYVl#{biUOuyPV<?fplOmFe6D#Ry+ku#C<^Pii}_Mf#3l4E_)4LNaFDOn
zw$YI)RS!n}u<l8|QBl5KL%?q0yYt(^8m`pneLLx<F20ivDdBFVu^<&q^3x`c)$>Qz
zpGi(8`6o$ptroN7sm-Q^+KohbQ^gjlSEX%M9lhmG&1&7%h}DZbP0;==`|8zG$wty7
MpgyeA<*L{9FW*x)=>Px#

delta 961
zcmYk4du&ui6vlsN=5}xQvRf9kZPF?j6t_xJ8VxO4Ac{d+F+S4rijQ=)6_%8>wu_2j
zR}sa6M9mcyLh%&|T1jlyY#aV)d?iGJ_&@<4NDIm;VgW^YDB#)RA5QL^^Ua)@Ip_P%
zT@l?p*4uV=OCL}vfo|`h>)49&iu6g>6@N_d>fjIbyX+H6{C!?YUWftq`;P|4PWzFA
zE<Xv81+fQX<C|lNdE@IAw<VhvhA3i!%g;jb|3b;ucw*kvMe*jwrdE$84u$xY!+th+
zX<(3}E=T-`S7?v%yI<x_D9%!!&!2*G$^K>Ucw{*d;v}d1q*q;<<?j&xa9GGs-d{KL
zu15=JL!3)*^F~Ns86H>p{li8F3vn3+PL-b@+9F;4N1+O}$3tmH8X{4@D?Hlvs{b@R
zMxy@Fa7}Kz+MiS~!+xlKrTQx()#*J2qvXO78fuG_M+!1*xbi(F>)h%;8JUur#Z1+%
z3WtfB_Zo(CEf-Tw8Iu%EW-3#-iR+ln^)%?Jg&SDPG&;DEwM^$tYI#>ryw41_b2DFa
z3;o>6F>d1ww@ZLJxqy0!GE*v<Ew#*%In0$t?vMm`rlg&_WF>ctPlI$4lef7?(lkmR
zO|qT)WEb;gfVdoCft;e*1XyTFNtki8m}(v{(`hsHBu$(}W-$+$4jwjZc*MNU64S#{
zvz2zUo0K`g<7SX$<{VGhFw1Q*Pua^zt*})*ZENVT^{lcnp0Ta0w(UG?SMi)(&+~Q@
zzD@Ij{g^d&CokH)ylfA#)}Cga6JWhlK&Mm024@tnIG6LPQ_gEnC2y#Ls9Hn)V+Wss
zL~Vr6`2vxI`GhYCV^Y#-*0EEel|HTiD@BeBm{}@hm^@QzE@GEn37EL-V7DUI^vGlE
zQIu~6RnBkpTu=*K&bNv@gzxxXZHcCTN!x1F*N)4uS6lwUMqJy=f&Z5GZp1$^vT#Xu
zuEyqP_@$TMdiZ1H@eF@uIGy24w_dhH)fSPbc9ZgXOaGBBWw)6cx`$X6olkO}WiFj4
aMg4NAwSeIhF=7=PaU}OjuE<jLI{pQ23hnIx

diff --git a/Budget Projekt/src/MeinBudgetView/MeinGui.java b/Budget Projekt/src/MeinBudgetView/MeinGui.java
index 8f066c4..b2444df 100644
--- a/Budget Projekt/src/MeinBudgetView/MeinGui.java	
+++ b/Budget Projekt/src/MeinBudgetView/MeinGui.java	
@@ -17,6 +17,7 @@ import java.awt.Font;
 import javax.swing.JComboBox;
 import javax.swing.JTextArea;
 import java.awt.Color;
+import javax.swing.JSeparator;
 
 public class MeinGui extends JFrame implements ActionListener {
 
@@ -71,12 +72,12 @@ public class MeinGui extends JFrame implements ActionListener {
 		contentPane.add(senden);
 
 		text1 = new JTextField();
-		text1.setBounds(10, 111, 171, 23);
+		text1.setBounds(10, 111, 128, 23);
 		contentPane.add(text1);
 		text1.setColumns(10);
 
 		text2 = new JTextField();
-		text2.setBounds(10, 246, 171, 23);
+		text2.setBounds(10, 246, 128, 23);
 		contentPane.add(text2);
 		text2.setColumns(10);
 
@@ -94,36 +95,36 @@ public class MeinGui extends JFrame implements ActionListener {
 		contentPane.add(budgetEingeben);
 
 		JLabel labelBudget = new JLabel("Budget");
-		labelBudget.setBounds(352, 39, 46, 14);
+		labelBudget.setBounds(255, 8, 46, 14);
 		contentPane.add(labelBudget);
 
 		JLabel labelExpenses = new JLabel("Expenses");
-		labelExpenses.setBounds(440, 39, 56, 14);
+		labelExpenses.setBounds(390, 8, 56, 14);
 		contentPane.add(labelExpenses);
 
 		JLabel labelBalance = new JLabel("Balance");
-		labelBalance.setBounds(543, 39, 46, 14);
+		labelBalance.setBounds(543, 8, 46, 14);
 		contentPane.add(labelBalance);
 
 		labelBudgetImage = new JLabel("");
 		Image image1 = new ImageIcon(this.getClass().getResource("/money.png")).getImage();
 		labelBudgetImage.setIcon(new ImageIcon(image1));
 
-		labelBudgetImage.setBounds(352, 59, 46, 55);
+		labelBudgetImage.setBounds(255, 22, 46, 55);
 		contentPane.add(labelBudgetImage);
 
 		labelExpensesImage = new JLabel("");
 		Image image2 = new ImageIcon(this.getClass().getResource("/wings-icon.png")).getImage();
 		labelExpensesImage.setIcon(new ImageIcon(image2));
 
-		labelExpensesImage.setBounds(450, 59, 46, 55);
+		labelExpensesImage.setBounds(400, 22, 46, 55);
 		contentPane.add(labelExpensesImage);
 
 		labelBalancetImage = new JLabel("New labelBalance");
 		Image image3 = new ImageIcon(this.getClass().getResource("/Money-icon.png")).getImage();
 		labelBalancetImage.setIcon(new ImageIcon(image3));
 
-		labelBalancetImage.setBounds(553, 59, 34, 55);
+		labelBalancetImage.setBounds(543, 22, 34, 55);
 		contentPane.add(labelBalancetImage);
 
 		JLabel budgetAusgeben = new JLabel("Ausgaben");
@@ -149,10 +150,21 @@ public class MeinGui extends JFrame implements ActionListener {
 		beendne.setBounds(508, 246, 81, 14);
 		contentPane.add(beendne);
 		
-		this.budgetDispaly = new JLabel("0.0");
-		this.budgetDispaly.setBounds(352, 115, 46, 14);
+		this.budgetDispaly = new JLabel("0.0 \u20AC");
+		budgetDispaly.setFont(new Font("Tahoma", Font.BOLD, 12));
+		this.budgetDispaly.setBounds(255, 82, 86, 14);
 		contentPane.add(this.budgetDispaly);
 		
+		JLabel expensesDisplay = new JLabel("0.0 \u20AC");
+		expensesDisplay.setFont(new Font("Tahoma", Font.BOLD, 12));
+		expensesDisplay.setBounds(390, 82, 110, 14);
+		contentPane.add(expensesDisplay);
+		
+		JLabel balanceDisplay = new JLabel("0.0 \u20AC");
+		balanceDisplay.setFont(new Font("Tahoma", Font.BOLD, 12));
+		balanceDisplay.setBounds(543, 82, 85, 14);
+		contentPane.add(balanceDisplay);
+		
 		this.text1.addActionListener(this);
 		this.text2.addActionListener(this);
 		this.senden.addActionListener(this);