From 8cd74f85da607e4b0c89c745a3443c3ff70aa0b2 Mon Sep 17 00:00:00 2001 From: Nino Breuer Date: Wed, 3 Sep 2014 13:49:08 +0200 Subject: changed image in main-gui added image to imagefolder fixed unicode error in String --- Dozentenmodul/bin/e4_n_imgs2_bwl_vmc_v2.png | Bin 0 -> 34481 bytes Dozentenmodul/bin/gui/intro/Login_GUI.class | Bin 10961 -> 10959 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class | Bin 1088 -> 1088 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI.class | Bin 12910 -> 12954 bytes Dozentenmodul/img/e4_n_imgs2_bwl_vmc_v2.png | Bin 0 -> 34481 bytes Dozentenmodul/src/gui/intro/Login_GUI.java | 2 +- Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 39 ++++++++++++---------- 7 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 Dozentenmodul/bin/e4_n_imgs2_bwl_vmc_v2.png create mode 100644 Dozentenmodul/img/e4_n_imgs2_bwl_vmc_v2.png diff --git a/Dozentenmodul/bin/e4_n_imgs2_bwl_vmc_v2.png b/Dozentenmodul/bin/e4_n_imgs2_bwl_vmc_v2.png new file mode 100644 index 00000000..f2778dc4 Binary files /dev/null and b/Dozentenmodul/bin/e4_n_imgs2_bwl_vmc_v2.png differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class index b9584672..aeeb9b6d 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI.class and b/Dozentenmodul/bin/gui/intro/Login_GUI.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class index ad5c0897..aa99da5a 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class index e0371b15..524889cf 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class differ diff --git a/Dozentenmodul/img/e4_n_imgs2_bwl_vmc_v2.png b/Dozentenmodul/img/e4_n_imgs2_bwl_vmc_v2.png new file mode 100644 index 00000000..f2778dc4 Binary files /dev/null and b/Dozentenmodul/img/e4_n_imgs2_bwl_vmc_v2.png differ diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index 9e5244c9..31083d4f 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -204,7 +204,7 @@ public class Login_GUI extends JFrame { lblConnectionInfo.setHorizontalAlignment(SwingConstants.LEFT); lblConnectionInfo.setBounds(111, 290, 418, 20); lblConnectionInfo.setEnabled(true); - lblConnectionInfo.setText("Info: Bereit für Login"); + lblConnectionInfo.setText("Info: Bereit f\u00FCr Login"); contentPane.add(lblConnectionInfo); diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 7d4fcdd2..f954160c 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -132,14 +132,14 @@ public class MainMenue_GUI extends JFrame { panelImage.setBackground(SystemColor.menu); panelImage.setBorder(new TitledBorder(null, "Image", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panelImage.setBounds(10, 146, 270, 170); + panelImage.setBounds(10, 221, 270, 133); contentPanel.add(panelImage); panelImage.setLayout(null); rdbtnImageNew = new JRadioButton("Neu"); rdbtnImageNew .setToolTipText("Hier k\u00F6nnen Sie eine standard Laborvorlage downloaden"); - rdbtnImageNew.setBounds(6, 22, 159, 23); + rdbtnImageNew.setBounds(20, 22, 159, 23); panelImage.add(rdbtnImageNew); buttonGroup.add(rdbtnImageNew); rdbtnImageNew.setBackground(SystemColor.menu); @@ -147,7 +147,7 @@ public class MainMenue_GUI extends JFrame { rdbtnImageEdit = new JRadioButton("Bearbeiten"); rdbtnImageEdit .setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden"); - rdbtnImageEdit.setBounds(6, 48, 185, 23); + rdbtnImageEdit.setBounds(20, 48, 185, 23); panelImage.add(rdbtnImageEdit); buttonGroup.add(rdbtnImageEdit); rdbtnImageEdit.setHorizontalAlignment(SwingConstants.LEFT); @@ -160,7 +160,7 @@ public class MainMenue_GUI extends JFrame { .setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden"); rdbtnImageDelete.setHorizontalAlignment(SwingConstants.LEFT); rdbtnImageDelete.setBackground(SystemColor.menu); - rdbtnImageDelete.setBounds(6, 74, 185, 23); + rdbtnImageDelete.setBounds(20, 74, 185, 23); panelImage.add(rdbtnImageDelete); rdbtnImageSearchDownload = new JRadioButton("Suche und Download"); @@ -169,7 +169,7 @@ public class MainMenue_GUI extends JFrame { .setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden"); rdbtnImageSearchDownload.setHorizontalAlignment(SwingConstants.LEFT); rdbtnImageSearchDownload.setBackground(SystemColor.menu); - rdbtnImageSearchDownload.setBounds(6, 100, 185, 23); + rdbtnImageSearchDownload.setBounds(20, 100, 185, 23); panelImage.add(rdbtnImageSearchDownload); JPanel panelDesc = new JPanel(); @@ -178,12 +178,14 @@ public class MainMenue_GUI extends JFrame { .getBorder("TitledBorder.border"), "Erkl\u00e4rung", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panelDesc.setBackground(SystemColor.menu); - panelDesc.setBounds(290, 146, 270, 170); + panelDesc.setBounds(290, 221, 270, 133); contentPanel.add(panelDesc); ScrollPane scrollPaneDesc = new ScrollPane(); - scrollPaneDesc.setBounds(10, 15, 250, 145); + scrollPaneDesc.setBounds(10, 15, 250, 110); final JTextArea txtDesc = new JTextArea(); + txtDesc.setEditable(false); + txtDesc.setBounds(280, 211, 10, 10); txtDesc.setLineWrap(true); txtDesc.setWrapStyleWord(true); txtDesc.setFont(new Font("Tahoma", Font.PLAIN, 11)); @@ -199,21 +201,21 @@ public class MainMenue_GUI extends JFrame { .getBorder("TitledBorder.border"), "Veranstaltung (VMChooser)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panelVeranstaltung.setBackground(SystemColor.menu); - panelVeranstaltung.setBounds(10, 327, 270, 170); + panelVeranstaltung.setBounds(10, 364, 270, 133); contentPanel.add(panelVeranstaltung); rdbtnLectureNew = new JRadioButton("Neu"); buttonGroup.add(rdbtnLectureNew); rdbtnLectureNew .setToolTipText("Hier k\u00F6nnen Sie Ihre Labordaten eingeben"); - rdbtnLectureNew.setBounds(6, 24, 185, 23); + rdbtnLectureNew.setBounds(20, 24, 185, 23); panelVeranstaltung.add(rdbtnLectureNew); rdbtnLectureNew.setBackground(SystemColor.menu); rdbtnLectureEdit = new JRadioButton("Bearbeiten"); rdbtnLectureEdit .setToolTipText("Hier k\u00F6nnen Sie einen Link auf ein bestehendes Labor erzeugen"); - rdbtnLectureEdit.setBounds(6, 50, 230, 23); + rdbtnLectureEdit.setBounds(20, 50, 230, 23); panelVeranstaltung.add(rdbtnLectureEdit); buttonGroup.add(rdbtnLectureEdit); rdbtnLectureEdit.setBackground(SystemColor.menu); @@ -221,7 +223,7 @@ public class MainMenue_GUI extends JFrame { rdbtnLectureDelete = new JRadioButton("L\u00F6schen"); rdbtnLectureDelete .setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen"); - rdbtnLectureDelete.setBounds(6, 76, 175, 23); + rdbtnLectureDelete.setBounds(20, 76, 175, 23); panelVeranstaltung.add(rdbtnLectureDelete); buttonGroup.add(rdbtnLectureDelete); rdbtnLectureDelete.setBackground(SystemColor.menu); @@ -231,7 +233,7 @@ public class MainMenue_GUI extends JFrame { rdbtnLectureSearch .setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen"); rdbtnLectureSearch.setBackground(SystemColor.menu); - rdbtnLectureSearch.setBounds(6, 102, 175, 23); + rdbtnLectureSearch.setBounds(20, 102, 175, 23); panelVeranstaltung.add(rdbtnLectureSearch); JPanel panelNews = new JPanel(); @@ -240,13 +242,13 @@ public class MainMenue_GUI extends JFrame { .getBorder("TitledBorder.border"), "News", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panelNews.setBackground(SystemColor.menu); - panelNews.setBounds(290, 327, 270, 170); + panelNews.setBounds(290, 364, 270, 133); contentPanel.add(panelNews); ScrollPane scrollPaneNews = new ScrollPane(); - // scrollPaneDesc.setBounds(10, 15, 250, 145); - scrollPaneNews.setBounds(10, 15, 250, 145); + scrollPaneNews.setBounds(10, 15, 250, 110); JTextArea txtNews = new JTextArea(); + txtNews.setEditable(false); txtNews.setFont(new Font("Tahoma", Font.PLAIN, 11)); txtNews.setBackground(SystemColor.menu); txtNews.setWrapStyleWord(true); @@ -336,11 +338,12 @@ public class MainMenue_GUI extends JFrame { + "Intelligenz\" lauten und referenzieren dabei auf das allgemeine Image
" + "\"Programmieren\"."); lblGrafik.setIcon(new ImageIcon(MainMenue_GUI.class - .getResource("/Image_zu_Veranstaltung_HDD.png"))); + .getResource("/e4_n_imgs2_bwl_vmc_v2.png"))); + // ToolTipp lange anzeigen - 60sec ToolTipManager.sharedInstance().setDismissDelay(60000); ToolTipManager.sharedInstance().registerComponent(lblGrafik); - lblGrafik.setBounds(82, 3, 391, 110); + lblGrafik.setBounds(100, 0, 362, 177); contentPanel.add(lblGrafik); JTextPane txtpnUmDetaillierteInformationen = new JTextPane(); @@ -348,7 +351,7 @@ public class MainMenue_GUI extends JFrame { .setText("Um detaillierte Informationen zu erhalten, fahren Sie bitte mit der Maus \u00FCber die Grafik."); txtpnUmDetaillierteInformationen.setEditable(false); txtpnUmDetaillierteInformationen.setBackground(SystemColor.menu); - txtpnUmDetaillierteInformationen.setBounds(10, 113, 509, 22); + txtpnUmDetaillierteInformationen.setBounds(10, 188, 509, 22); contentPanel.add(txtpnUmDetaillierteInformationen); { JPanel buttonPane = new JPanel(); -- cgit v1.2.3-55-g7522