From e31a9258a7cfde0bfa5a59d1698b89d36fa3c859 Mon Sep 17 00:00:00 2001 From: Armin Wolf Date: Fri, 4 Aug 2017 09:58:16 +0200 Subject: [PATCH] kleine Anpassungen zu Icons und dem evaluationDialog (dispose hat nicht ricvhtig funktioniert) --- src/main/java/View/MainFrame.java | 8 +++++--- src/main/resources/Thumbs.db | Bin 3072 -> 13824 bytes src/main/resources/frame-2.png | Bin 0 -> 764 bytes src/main/resources/frame.png | Bin 764 -> 1080 bytes 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/frame-2.png diff --git a/src/main/java/View/MainFrame.java b/src/main/java/View/MainFrame.java index df7e60c..bfbd4be 100644 --- a/src/main/java/View/MainFrame.java +++ b/src/main/java/View/MainFrame.java @@ -136,7 +136,7 @@ public class MainFrame extends JFrame { } public void showEvauluationDialog(){ - if (evaluationPanel == null){ + if (evaluationDialog == null){ SwingUtilities.invokeLater(() -> { evaluationDialog = new JDialog(); evaluationDialog.setTitle("Evaluation"); @@ -150,7 +150,7 @@ public class MainFrame extends JFrame { }); } else { SwingUtilities.invokeLater(()->{ - evaluationPanel.setVisible(true); + evaluationDialog.setVisible(true); }); } @@ -216,8 +216,10 @@ public class MainFrame extends JFrame { } private void setDimensions() { - this.setMinimumSize(new Dimension(1024,700)); this.setExtendedState(JFrame.MAXIMIZED_BOTH); + this.setResizable(false); + GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment(); + this.setMaximizedBounds(env.getMaximumWindowBounds()); lmsPanel.setMinimumSize(new Dimension(400, 500)); rmPanel.setMinimumSize(new Dimension(400, 500)); tsPanel.setMinimumSize(new Dimension(400, 500)); diff --git a/src/main/resources/Thumbs.db b/src/main/resources/Thumbs.db index c5ba72ee7c37ae9ccee28da8e6110ef68fa36075..2f2eeb1d565cee41d996fe02069c2757a0a4132f 100644 GIT binary patch literal 13824 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 diff --git a/src/main/resources/frame-2.png b/src/main/resources/frame-2.png new file mode 100644 index 0000000000000000000000000000000000000000..2b6f862a491499cb9b7858bb7ca698fcdd208e1e GIT binary patch literal 764 zcmV#>_K5QV=ID1j2_AS%HfTsnw5xO9+oV0REYusXPOV0YkjKz?X7T4afb9S1VQnc0B@ zLYyP?SOGhB>{yBt__pyVr%V{&4)hz3yJ*eA0yp3w1-BRn(P*cP=mJG_|8MhhL3w>{ zabG42%h1RjXd-@8B6^?}UJ0*+n~2xKOW{YU&!YjZino!LR^llmePl#)li?=An+zwz zV=bCn78@ zIMKhQ?hcnQ-bBoWu+Vwb;Pa8Rlm`0B0v5FFcVzH>Yydk~#BQ;?Q9JkyTuCJH4E_We}13O{D;~?b=b#5kfE;3Rm zQ5~+eEUrtGa=Z~t`Ek%QOv$HE$g{q&y7A)6j8wSpGiRziMCCe$W61EB;l?voAg9M!+}H0*Wxqu($@!q9yF5<8@&x@gW*Vw+R*N uccnRTV|)iWFl06wvkdImv17-Me}X^D15znbBM)Z)0000pX>BtLR#PI3QbI#V$`Itm8x?<4KPh@A9_J04Qi_bYO1wOEG{mn6}gb+ z;t+=t>^RAH4<^iUd?(CKc7D?L#g~)w{hZ(V9s9)Bu8|-?f&>W?7eUkX1QUu)F;pxU zrdW)F7%G-yD0Z5r=?Pl^Oei+xcZaVGL?||858!;{*Pd_V!=5k}dhv|A$OKyeJz9Qu zdf4ju@&sUkS;gYai;+HdDFEYei~t~0;1U4FK?HzX0HYvniZ3v$mgmP3z{+py-9r(| zp$KJpHrdsmk3|w^n|V36RZ#M-0c_-3ffQG1BijIS7W!K6;!~-OjeHB6g%%EuyY4f< zZ=Md#+<7ZrT2b&zYoUjVyh*%$Ntxp`j!Y?ozpB?%vjS8Kj{(!MaC(v1Aj0sL`0 zVOo^fXtM9xY)v%}NkZpL!a;Q~6XNU!?)~x{uXxe3`C_93ND{b`j8stpFLVa385#h) z%B;QiU7>|xK^C zht%UfnccTlXrUsS*ML{Nh`E~&!Ca5w_5O(~^T*#6;5@^$5>J)j0NBX4uxT^L-)3dk z=D*gvNSE69BFIqARO4MqLjAOje2_B0t^Qiv#A0|A`-P^XYM(k%P!!cnsC_q1|B(T} zRoYni^%=qxi}_oR3?b;v_X^%=vt^kv{}})$tAkaw|Fm63JhFx`#bPOvKzgTQZoW2H z?E?wGE;ICVKD}MWQV&8@g_X{h2i+|NiF5d>{chUFzO^EaCo)IvpNF63FaUM<0OO7n|3gMckzyS*{Ko zFM#8P-~uqxpTDm=TIYG8gZ)Ai^S8_)L?+{iOvVk{I}`&7AWX52*ZEun$m~|JeCH*? z6pQ8Am&oi@2S(V)e5Ty?9{?)%`ef8$Cre#sw~FQ2e<5&tf+>KWd2PP~3&71fZ!{hB z?P<*i9)OpJ96bbWdwTPM25^}tJdPKzGMDVDDMsc44ZzLn!0`eilX1&?jm(c60HbQ| z1i*t?^Ovr`0{H2@)F&$dX3B~HryF_w_S@J3FfyMyYN382^+6a*0A?d!KT)^Hj*jKg z1z=Ykjm&EyXw8oefL>-;nID@XsNd@D9rt2>C;+Vf5ekZ|_8tj#>_K5QV=ID1j2_AS%HfTsnw5xO9+oV0REYusXPOV0YkjKz?X7T4afb9S1VQnc0B@ zLYyP?SOGhB>{yBt__pyVr%V{&4)hz3yJ*eA0yp3w1-BRn(P*cP=mJG_|8MhhL3w>{ zabG42%h1RjXd-@8B6^?}UJ0*+n~2xKOW{YU&!YjZino!LR^llmePl#)li?=An+zwz zV=bCn78@ zIMKhQ?hcnQ-bBoWu+Vwb;Pa8Rlm`0B0v5FFcVzH>Yydk~#BQ;?Q9JkyTuCJH4E_We}13O{D;~?b=b#5kfE;3Rm zQ5~+eEUrtGa=Z~t`Ek%QOv$HE$g{q&y7A)6j8wSpGiRziMCCe$W61EB;l?voAg9M!+}H0*Wxqu($@!q9yF5<8@&x@gW*Vw+R*N uccnRTV|)iWFl06wvkdImv17-Me}X^D15znbBM)Z)0000