masterElmar/jaujau
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'patch-1' of https://gitlab.imn.htwk-leipzig.de/weicker/inb1-a-jaujau.git into patch-1

Browse Source
This commit is contained in:
mokoe
2021-01-08 14:22:46 +01:00
parent fc40bd31f4 dda8646af5
commit 679f352838
3 changed files with 50 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/de/jaujau/gui/Dashboard_GUI.java
View File

@@ -254,6 +254,10 @@ public class Dashboard_GUI extends JPanel{
showwunsch(false); showwunsch(false);
aussetzen.setVisible(false); aussetzen.setVisible(false);
aktuellesSpiel.spiel(this); aktuellesSpiel.spiel(this);
player_hand.setVisible(true);
label_final.setVisible(false);
ablagestapel.setVisible(true);
rechts.setVisible(true);
aktualisiereGUI(); aktualisiereGUI();
} }

23
src/de/jaujau/gui/GUI.java
View File

@@ -113,6 +113,14 @@ public class GUI extends JFrame{
gamelabel.setBounds(0, 91, 220, 29); gamelabel.setBounds(0, 91, 220, 29);
menuhide.add(gamelabel); menuhide.add(gamelabel);
JLabel texturenlabel = new JLabel("Texturen");
texturenlabel.setHorizontalAlignment(SwingConstants.CENTER);
texturenlabel.setForeground(Color.WHITE);
texturenlabel.setFont(new Font("Tahoma", Font.PLAIN, 24));
texturenlabel.setBounds(0, 131, 220, 29);
menuhide.add(texturenlabel);
JPanel dashboard = new JPanel(); JPanel dashboard = new JPanel();
dashboard.setBackground(new Color(73, 128, 242)); dashboard.setBackground(new Color(73, 128, 242));
getContentPane().add(dashboard, BorderLayout.CENTER); getContentPane().add(dashboard, BorderLayout.CENTER);
@@ -181,10 +189,15 @@ public class GUI extends JFrame{
} }
}); });
texturenlabel.addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
texturenauswaehlen_GUI texturenauswahl = new texturenauswaehlen_GUI(texturenpakete);
texturenauswahl.setVisible(true);
}
});
} }
} }

50
src/de/jaujau/gui/texturenauswaehlen_GUI.java
View File

@@ -1,31 +1,37 @@
package de.jaujau.gui; package de.jaujau.gui;
import java.awt.BorderLayout;
import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.border.EmptyBorder;
import de.jaujau.daten.Texturenpakete;
/** /**
* Class texturenauswaehlen_GUI * Klasse texturenauswaehlen_GUI
*/ */
public class texturenauswaehlen_GUI { public class texturenauswaehlen_GUI extends JFrame{
// private static final long serialVersionUID = 1L;
// Fields private JPanel contentPane;
// private Texturenpakete pakete;
public texturenauswaehlen_GUI (Texturenpakete texturenpakete) {
pakete = texturenpakete;
erstelleFenster();
}
private void erstelleFenster() {
setAlwaysOnTop(true);
setBounds(100, 100, 588, 382);
contentPane = new JPanel();
contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
contentPane.setLayout(new BorderLayout(0, 0));
setContentPane(contentPane);
}
//
// Constructors
//
public texturenauswaehlen_GUI () { };
//
// Methods
//
//
// Accessor methods
//
//
// Other methods
//
} }