From 0229035d6928a18a5d0cac2be30429b21fd6734f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Heredero?= Date: Sun, 15 May 2022 19:06:32 +0200 Subject: [PATCH 1/3] insert grid layout --- bin/BillGUI/ManagerGui.class | Bin 273 -> 387 bytes src/BillGUI/ManagerGui.java | 7 +++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/BillGUI/ManagerGui.class b/bin/BillGUI/ManagerGui.class index 295fc329e12d50fb426a43762dccc68e402bae55..54fcc25146e5a2ac0152c1974f58bec26affff88 100644 GIT binary patch delta 214 zcmbQp)XdCv>ff$?3=9nB43ZPMjAU8Ti!xIf8AN@u63Y_x6U$5V-GKr=iIw@KCDs$I zq|CT^7}yy&*co^k8HBN@;bP!n;0GxYU}Rv`@buIS<78lD5SkcTl)(tJg_VH~NHPK; z&=4TW3FNr~ML}}HTH6`8w01M_M6wESZfD@z${@HAD9pql3?%s&n1Li00}BH;gAkAw X0rGet+89I`#DF|T25}(C#2^6x1GXVi delta 122 zcmZo>p2);?>ff$?3=9nB3<49mj3n7?GV?M^>=+rCH8jH*8Cab2Q&PDYm>D=Ht}OCm zU| Date: Sun, 15 May 2022 20:44:07 +0200 Subject: [PATCH 2/3] just started --- bin/BillGUI/App.class | Bin 0 -> 551 bytes bin/BillGUI/ManagerGui.class | Bin 387 -> 664 bytes src/BillGUI/App.java | 11 +++++++++++ src/BillGUI/ManagerGui.java | 12 +++++++++++- 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 bin/BillGUI/App.class create mode 100644 src/BillGUI/App.java diff --git a/bin/BillGUI/App.class b/bin/BillGUI/App.class new file mode 100644 index 0000000000000000000000000000000000000000..a6962ae6c7b39f0ddd020773dd2706168a1d86fb GIT binary patch literal 551 zcmah`%}Rnn6g}fl>X)WjTJ5Htwa8_V5mZzJQh_N%t5F9XnQunMPobWq*Jvda)V_y` z?wDW;q0PN>f6lr0p85KI`v7o=ofKjWt7l5Y#F5D&i4}%?T^V^Z4%^b*i?)^w#k%bX-4aguc%Do|eKlgp z)&GpF5nU*hVJKG~>x%-WvBB`tG)|7Jp2#lm*l?({h?F&a z=q$|)M@Kx!-1jBdeic5M@4}4;B@e|DH#XvZF_FA2rQ!ZUCA4~$-K8*Xd-hUkc_*U& zKkxtrl)N-$hEiqOQ4B%Dj$KE3Mus$Lf8bBVE=Xkh9Uw+85|?a>qAGbtKDj?d`gK+g z$oet}uu3-j+dw`?Q3h+sQ^te$sl)dL?7IaFZ8Qc~g_11CX+pA{VZ?2cdOto7EaWk6!@`6>zUnqjObV1f5o4iR;WOK6@0^Ya_Hy>qg)oPVLek;!B0j8^Ht(G FxNlo`i_QQ5 delta 195 zcmXAiy$XV06o%iUewv?OX4;RnwS;;DEzuGZjx9oaK`ym)2VH@thWb%O82+ywJ-q5{rtRY~!{1A{Z U;K1kJV^jY%^f6!~44E3jAD227xBvhE diff --git a/src/BillGUI/App.java b/src/BillGUI/App.java new file mode 100644 index 0000000..eb03620 --- /dev/null +++ b/src/BillGUI/App.java @@ -0,0 +1,11 @@ +package BillGUI; + +public class App { + public static void main(String[] args) { + int rows = 9; + int cols = 2; + String name; + String logoFilePath; + new ManagerGui(rows, cols, name, logoFilePath); + } +} diff --git a/src/BillGUI/ManagerGui.java b/src/BillGUI/ManagerGui.java index 28eaef8..10d0432 100644 --- a/src/BillGUI/ManagerGui.java +++ b/src/BillGUI/ManagerGui.java @@ -8,6 +8,16 @@ import javax.swing.*; * */ public class ManagerGui extends JFrame{ - GridLayout grid = new GridLayout(2,9); + GridLayout grid; + JLabel Jname; + JLabel Jlogo; + + + public ManagerGui(int n,int m, String name, String logoFilePath){ + grid = new GridLayout(n,m); + Jname = new JLabel(name); + } + + } From 665a5e2292ac0f1850c3a377da2ef234d88eca7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Heredero?= Date: Tue, 17 May 2022 19:22:49 +0200 Subject: [PATCH 3/3] push for commun work --- bin/BillGUI/App.class | Bin 551 -> 649 bytes src/BillGUI/App.java | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/BillGUI/App.class b/bin/BillGUI/App.class index a6962ae6c7b39f0ddd020773dd2706168a1d86fb..5ed50fbe591648e8f6257157583f85480ab3f944 100644 GIT binary patch delta 382 zcmZvX&q~8U5XQf)8=J-)YTDY?MvZ#WgXSU#{<(Ot1XKzl2p(i9VNKa?WD^xU*ozmB z(q|CQo&*ISz=sk?i}WG`GavK)W@q-9KUmJ^*V_kxO)Nh;PXim%41QY}A>*JgG!+v# zLC3^dF7hPRnT-lVB{SVnr7}I2zv%jQ*pEsz7`h^H?Cyr3grIhk!-G3t0LFrKwMr delta 291 zcmaivy-Gtt5QWc1lbBU7#>Ag)O0`KPg4SB45Y&L>BpL2q*}EGy%LQ$$Q>u+GAU=Yi zpuGpT~-e$19i4u(@sjtilJugUpHIhR5s5l6+*-BDox diff --git a/src/BillGUI/App.java b/src/BillGUI/App.java index eb03620..0812c0a 100644 --- a/src/BillGUI/App.java +++ b/src/BillGUI/App.java @@ -4,8 +4,8 @@ public class App { public static void main(String[] args) { int rows = 9; int cols = 2; - String name; - String logoFilePath; + String name = "Garage manager \n Prestations"; + String logoFilePath = "src/logo_garage.png"; new ManagerGui(rows, cols, name, logoFilePath); } }