diff options
| author | Murilo Araujo | 2014-06-06 11:24:39 +0200 |
|---|---|---|
| committer | Murilo Araujo | 2014-06-06 11:24:39 +0200 |
| commit | adffefa54b9aaf13afd31157c77b59e8349f7aca (patch) | |
| tree | 30bc80171db43c075a1afd24aa7119b8c290784c /Dozentenmodul | |
| parent | Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff) | |
| parent | Initial Commit (diff) | |
| download | tutor-module-adffefa54b9aaf13afd31157c77b59e8349f7aca.tar.gz tutor-module-adffefa54b9aaf13afd31157c77b59e8349f7aca.tar.xz tutor-module-adffefa54b9aaf13afd31157c77b59e8349f7aca.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Diffstat (limited to 'Dozentenmodul')
102 files changed, 683 insertions, 600 deletions
diff --git a/Dozentenmodul/bin/Models/Image.class b/Dozentenmodul/bin/Models/Image.class Binary files differdeleted file mode 100644 index 6a1603c3..00000000 --- a/Dozentenmodul/bin/Models/Image.class +++ /dev/null diff --git a/Dozentenmodul/bin/Models/Lecture.class b/Dozentenmodul/bin/Models/Lecture.class Binary files differdeleted file mode 100644 index 31755bcf..00000000 --- a/Dozentenmodul/bin/Models/Lecture.class +++ /dev/null diff --git a/Dozentenmodul/bin/Models/person.class b/Dozentenmodul/bin/Models/person.class Binary files differdeleted file mode 100644 index ef2a89eb..00000000 --- a/Dozentenmodul/bin/Models/person.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$1.class Binary files differindex b6db4a44..d5e68cc7 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class Binary files differindex 192b81a6..13c6acba 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class +++ b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$3.class Binary files differindex b75c16b3..5fbb8da2 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$4.class Binary files differindex c68ae652..079505d0 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class Binary files differindex 3b6c600d..eff180c5 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class +++ b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class Binary files differindex 519d3b0f..0fe93aa0 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class Binary files differindex 2283207b..15f0f6f4 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class +++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class Binary files differindex 722ecdf2..403028b4 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class Binary files differindex 087cc45a..86e252cc 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class Binary files differindex 101eeca5..524ef307 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class +++ b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class Binary files differindex 7f37814b..acab1faf 100644 --- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class +++ b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class Binary files differindex 502e9387..3f059838 100644 --- a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class +++ b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class Binary files differindex cea4adc4..79798d57 100644 --- a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class Binary files differindex aea7cc9d..d314d8e9 100644 --- a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class +++ b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$1.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$1.class Binary files differindex ba4c1b16..b9b34af0 100644 --- a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class Binary files differindex b9990e6d..4505ccb5 100644 --- a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class +++ b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class Binary files differindex f591fa7e..c276055c 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class Binary files differindex 14f49298..7073c5e6 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class Binary files differindex 65f6eba8..8da20bc5 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class Binary files differindex 5aa7bc75..c932333d 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class Binary files differindex e67f41d5..94cccaf3 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class Binary files differindex 5b2e2f61..05b6ad14 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class Binary files differindex 6e81b472..c9cf19e6 100644 --- a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class +++ b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class Binary files differindex 41128bc8..9eeb6cec 100644 --- a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class +++ b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class Binary files differindex ef0dedf1..f3583709 100644 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class Binary files differindex 3e960f4f..964b4984 100644 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class +++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class Binary files differindex cb5966d1..7d9686ba 100644 --- a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class +++ b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class Binary files differindex fdf5b938..57f838b4 100644 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class Binary files differindex f0f619ac..5494b443 100644 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class Binary files differindex 4a9e9a0f..45fb3ab5 100644 --- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class +++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class Binary files differindex aebbf028..74425fa4 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class Binary files differindex d599dabe..c9eec04e 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class Binary files differindex 9949e5fe..07430748 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class Binary files differindex 41208104..e1de1ba0 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class Binary files differindex 33cf65cb..c98dfa2f 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class Binary files differindex b74a9bf2..d596ea32 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class Binary files differindex 88c5fdfe..ae978687 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class Binary files differindex b55da9f2..bfeb2f5f 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class Binary files differindex f2c03ce9..5fff5ecb 100644 --- a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class +++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class Binary files differindex 34ba71c8..707b38a1 100644 --- a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class +++ b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class Binary files differindex 6608b6fa..97ba1b77 100644 --- a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class +++ b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class Binary files differindex dd4fba48..7f0a2110 100644 --- a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class +++ b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class Binary files differindex 3f9d2221..b315ab3f 100644 --- a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class +++ b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class Binary files differdeleted file mode 100644 index 570e91d4..00000000 --- a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class Binary files differdeleted file mode 100644 index 8d8f8918..00000000 --- a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class +++ /dev/null diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class Binary files differindex 78bcd9b7..aaa9ada0 100644 --- a/Dozentenmodul/bin/gui/intro/Login_GUI.class +++ b/Dozentenmodul/bin/gui/intro/Login_GUI.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class Binary files differindex 359af1fe..a6abdea4 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class Binary files differindex 1bbaae71..97246b3f 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class Binary files differindex 1f8d4f7e..021f7c75 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class Binary files differindex acfc42b0..0a8b212d 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class Binary files differindex 17a2d992..0181a09e 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class Binary files differindex de6193d4..9b87348c 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class Binary files differindex 24e03d07..4c8a2787 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class Binary files differindex 302b8c84..7cabbfc7 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class Binary files differindex cfa89387..cf347646 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class Binary files differindex 31dd1069..70c7e041 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class Binary files differindex f14366f8..b2f0ae63 100644 --- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class +++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class Binary files differindex 799a2aab..e1f554c7 100644 --- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class +++ b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class Binary files differindex 2957775c..4511c064 100644 --- a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class +++ b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class Binary files differindex 3577fd18..17be57c0 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class Binary files differindex db82c341..aef106f9 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class Binary files differindex 49b37d40..987d51f7 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class Binary files differindex aeea08eb..db294536 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class Binary files differindex 8446b2d1..901d3de4 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class Binary files differindex 60c57e03..4c68681a 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class Binary files differindex e804c5fa..0d3d29cc 100644 --- a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class +++ b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class Binary files differindex 6a5bcf01..5013f754 100644 --- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class +++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class Binary files differindex 80671923..b35ccd3d 100644 --- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class +++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class Binary files differindex e5a83ed6..ff9cf61a 100644 --- a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class +++ b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class diff --git a/Dozentenmodul/src/Models/Image.java b/Dozentenmodul/src/Models/Image.java deleted file mode 100644 index 89df5cd5..00000000 --- a/Dozentenmodul/src/Models/Image.java +++ /dev/null @@ -1,87 +0,0 @@ -package models; - -public class Image { - - private String ImageId; - private String version; - private String imagename; - private String newName; - private String imagepath; - private int shareMode; - private boolean licensed; - private boolean internet; - private int ram; - private int cpu; - private long filesize; - public static Image image =new Image(); - - - - public int getShareMode() { - return shareMode; - } - public void setShareMode(int shareMode) { - this.shareMode = shareMode; - } - public String getImagepath() { - return imagepath; - } - public void setImagepath(String imagepath) { - this.imagepath = imagepath; - } - public String getImagename() { - return imagename; - } - public void setImagename(String imagename) { - this.imagename = imagename; - } - public boolean isLicensed() { - return licensed; - } - public void setLicensed(boolean licensed) { - this.licensed = licensed; - } - public boolean isInternet() { - return internet; - } - public void setInternet(boolean internet) { - this.internet = internet; - } - public int getRam() { - return ram; - } - public void setRam(int ram) { - this.ram = ram; - } - public int getCpu() { - return cpu; - } - public void setCpu(int cpu) { - this.cpu = cpu; - } - public String getNewName() { - return newName; - } - public void setNewName(String newName) { - this.newName = newName; - } - public String getImageId() { - return ImageId; - } - public void setImageId(String imageId) { - ImageId = imageId; - } - public String getVersion() { - return version; - } - public void setVersion(String version) { - this.version = version; - } - public long getFilesize() { - return filesize; - } - public void setFilesize(long filesize) { - this.filesize = filesize; - } - -} diff --git a/Dozentenmodul/src/Models/Lecture.java b/Dozentenmodul/src/Models/Lecture.java deleted file mode 100644 index eae05ec5..00000000 --- a/Dozentenmodul/src/Models/Lecture.java +++ /dev/null @@ -1,91 +0,0 @@ -package models; - -import java.util.Date; - -public class Lecture { - - private String name; - private String newName; - private String shortDesc; - private String desc; - private Date startdate; - private Date enddate; - private boolean active; - private String id; - private String linkedImagename; - public static Lecture lecture =new Lecture(); - - - public String getNewName() { - return newName; - } - - public void setNewName(String newName) { - this.newName = newName; - } - - public String getLinkedImagename() { - return linkedImagename; - } - - public void setLinkedImagename(String linkedImagename) { - this.linkedImagename = linkedImagename; - } - - public String getid() { - return id; - } - - public void setid(String id) { - this.id = id; - } - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getShortDesc() { - return shortDesc; - } - - public void setShortDesc(String shortDesc) { - this.shortDesc = shortDesc; - } - - public String getDesc() { - return desc; - } - - public void setDesc(String desc) { - this.desc = desc; - } - - public Date getStartdate() { - return startdate; - } - - public void setStartdate(Date startdate) { - this.startdate = startdate; - } - - public Date getEnddate() { - return enddate; - } - - public void setEnddate(Date enddate) { - this.enddate = enddate; - } - - public boolean isActive() { - return active; - } - - public void setActive(boolean active) { - this.active = active; - } - - -} diff --git a/Dozentenmodul/src/Models/person.java b/Dozentenmodul/src/Models/person.java deleted file mode 100644 index 0f14af51..00000000 --- a/Dozentenmodul/src/Models/person.java +++ /dev/null @@ -1,67 +0,0 @@ -package models; - - -public class person{ - - private String username; - private String Name; - private String Vorname; - private String Hochschule; - private String EMail; - private String Tel; - private String Fakultaet; - private boolean ischecked; - public static person verantwortlicher=new person(); - - public String getUsername() { - return username; - } - public void setUsername(String username) { - this.username = username; - } - - public String getName() { - return Name; - } - public void setName(String name) { - Name = name; - } - public String getVorname() { - return Vorname; - } - public void setVorname(String vorname) { - Vorname = vorname; - } - public String getHochschule() { - return Hochschule; - } - public void setHochschule(String hochschule) { - Hochschule = hochschule; - } - public String getEMail() { - return EMail; - } - public void setEMail(String eMail) { - EMail = eMail; - } - public String getTel() { - return Tel; - } - public void setTel(String tel) { - Tel = tel; - } - public String getFakultaet() { - return Fakultaet; - } - public void setFakultaet(String fakultaet) { - Fakultaet = fakultaet; - } - public boolean isIschecked() { - return ischecked; - } - public void setIschecked(boolean ischecked) { - this.ischecked = ischecked; - } - - -} diff --git a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java index 36c2bb4c..956dea25 100644 --- a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java @@ -1,43 +1,41 @@ package gui.image; +import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; -import java.awt.Dimension; +import java.awt.Color; import java.awt.FlowLayout; -import java.awt.Toolkit; -import javax.swing.JFrame; +import java.awt.Font; +import java.awt.SystemColor; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; + import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPanel; +import javax.swing.JSeparator; +import javax.swing.JTextArea; +import javax.swing.JTextField; +import javax.swing.JTextPane; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; -import java.awt.Color; -import javax.swing.JLabel; -import java.awt.Font; -import javax.swing.JTextPane; -import java.awt.SystemColor; -import javax.swing.JTextField; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; -import javax.swing.JSeparator; -import javax.swing.JMenuBar; -import javax.swing.JMenu; -import javax.swing.JMenuItem; - -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; import javax.swing.border.TitledBorder; -import javax.swing.JTextArea; import models.Image; import models.Links; import models.person; - -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.io.IOException; +import util.GuiOrganizer; @SuppressWarnings("serial") public class CreateImageAllgemein_GUI extends JFrame { @@ -82,10 +80,8 @@ public class CreateImageAllgemein_GUI extends JFrame { //Setzt den Titel setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen"); //Zentriert das Fenster - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); getContentPane().setLayout(null); { @@ -322,5 +318,14 @@ public class CreateImageAllgemein_GUI extends JFrame { }); mnNewMenu_1.add(mntmOtrs); + JMenuItem menuItem = new JMenuItem("About"); + menuItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + mnNewMenu_1.add(menuItem); + }//end main } diff --git a/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java b/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java index df610f6b..38991942 100644 --- a/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java @@ -1,39 +1,40 @@ package gui.image; +import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Toolkit; -import javax.swing.JFrame; -import javax.swing.JButton; -import javax.swing.JPanel; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; import java.awt.Color; -import javax.swing.JLabel; +import java.awt.FlowLayout; import java.awt.Font; -import javax.swing.JTextPane; import java.awt.SystemColor; -import java.awt.event.ActionListener; import java.awt.event.ActionEvent; -import javax.swing.JSeparator; -import javax.swing.JMenuBar; -import javax.swing.JMenu; -import javax.swing.JMenuItem; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import javax.swing.border.TitledBorder; +import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import java.io.IOException; + import javax.swing.ButtonGroup; +import javax.swing.DefaultComboBoxModel; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JPanel; +import javax.swing.JSeparator; +import javax.swing.JTextPane; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; import models.Image; import models.Links; -import javax.swing.JComboBox; -import javax.swing.DefaultComboBoxModel; +import util.GuiOrganizer; @SuppressWarnings("serial") public class CreateImageFreigabe_GUI extends JFrame { @@ -64,11 +65,10 @@ public class CreateImageFreigabe_GUI extends JFrame { e.printStackTrace(); } setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - // setBounds(100, 100, 603, 722); + + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); + getContentPane().setLayout(null); { JPanel panel = new JPanel(); @@ -246,6 +246,15 @@ public class CreateImageFreigabe_GUI extends JFrame { }); mnNewMenu_1.add(mntmOtrs); + + JMenuItem menuItem = new JMenuItem("About"); + menuItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + mnNewMenu_1.add(menuItem); } } diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java index 4e53b2d5..ebcbcaec 100644 --- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java @@ -1,43 +1,42 @@ package gui.image; +import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Toolkit; -import javax.swing.JFrame; -import javax.swing.JButton; -import javax.swing.JPanel; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; import java.awt.Color; -import javax.swing.JLabel; +import java.awt.FlowLayout; import java.awt.Font; -import javax.swing.JTextPane; import java.awt.SystemColor; -import java.awt.event.ActionListener; import java.awt.event.ActionEvent; -import javax.swing.JSeparator; -import javax.swing.JMenuBar; -import javax.swing.JMenu; -import javax.swing.JMenuItem; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import javax.swing.border.TitledBorder; -import javax.swing.JTextArea; +import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.io.IOException; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; -import javax.swing.JRadioButton; import javax.swing.ButtonGroup; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JSeparator; import javax.swing.JSpinner; +import javax.swing.JTextArea; +import javax.swing.JTextPane; import javax.swing.SpinnerNumberModel; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; import models.Image; import models.Links; +import util.GuiOrganizer; @SuppressWarnings("serial") public class CreateImageTechnisch_GUI extends JFrame { @@ -74,11 +73,10 @@ public class CreateImageTechnisch_GUI extends JFrame { e.printStackTrace(); } setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - //setBounds(100, 100, 603, 722); + + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); + getContentPane().setLayout(null); { JPanel panel = new JPanel(); @@ -371,5 +369,14 @@ public class CreateImageTechnisch_GUI extends JFrame { mnNewMenu_1.add(mntmOtrs); + JMenuItem menuItem = new JMenuItem("About"); + menuItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + mnNewMenu_1.add(menuItem); + } } diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 21147e56..2c748679 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -1,15 +1,13 @@ package gui.image; +import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; -import gui.lecture.ExtendedSearchForImages_GUI; + import java.awt.Color; -import java.awt.Desktop; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; import java.awt.HeadlessException; import java.awt.SystemColor; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; @@ -18,11 +16,9 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.IOException; -import java.net.URISyntaxException; -import java.net.URL; import java.util.Iterator; import java.util.List; + import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JFrame; @@ -39,6 +35,7 @@ import javax.swing.JTabbedPane; import javax.swing.JTable; import javax.swing.JTextField; import javax.swing.JTextPane; +import javax.swing.ListSelectionModel; import javax.swing.RowFilter; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; @@ -49,12 +46,15 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; + import models.Links; import models.person; + import org.apache.thrift.TException; + import server.Server.Client; import thrift.ThriftConnection; -import javax.swing.ListSelectionModel; +import util.GuiOrganizer; @SuppressWarnings("serial") public class DeleteImage_GUI extends JFrame { @@ -113,10 +113,8 @@ public class DeleteImage_GUI extends JFrame { // Setzt den Fenstertitel setTitle("bwLehrpool Suite *Prototyp* - Image l\u00F6schen"); // Zentriert das Fenster in die Bildmitte - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); final DefaultTableModel model = new DefaultTableModel(titles, 0); @@ -555,6 +553,15 @@ public class DeleteImage_GUI extends JFrame { } }); mnNewMenu_1.add(mntmOtrs); + + JMenuItem menuItem = new JMenuItem("About"); + menuItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + mnNewMenu_1.add(menuItem); } diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index fe89746c..d9b29d91 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -1,24 +1,20 @@ package gui.image; +import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; -import java.awt.Desktop; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.IOException; -import java.net.URISyntaxException; -import java.net.URL; import java.util.Map; + import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JLabel; @@ -35,12 +31,16 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; -import org.apache.thrift.TException; + import models.Image; import models.Links; import models.person; + +import org.apache.thrift.TException; + import server.Server.Client; import thrift.ThriftConnection; +import util.GuiOrganizer; @SuppressWarnings("serial") public class EditImageAllgemein_GUI extends JFrame { @@ -87,10 +87,8 @@ public class EditImageAllgemein_GUI extends JFrame { setTitle("bwLehrpool Suite *Prototyp* - Image bearbeiten"); // Zentriert das Fenster in der Bildmitte - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); initData(); getContentPane().setLayout(null); { @@ -341,6 +339,15 @@ public class EditImageAllgemein_GUI extends JFrame { }); mnNewMenu_1.add(mntmOtrs); + + JMenuItem menuItem = new JMenuItem("About"); + menuItem.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + mnNewMenu_1.add(menuItem); // setFocusTraversalPolicy(new FocusTraversalOnArray(new // Component[]{getContentPane(), panel_2, lblNewLabel, // txtpnBitteWhlenSie, contentPanel, panel_1, label, Vorname, label_7, diff --git a/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java b/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java index 0f54c346..94ec06a6 100644 --- a/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java @@ -1,45 +1,41 @@ package gui.image; +import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Toolkit; -import javax.swing.JFrame; -import javax.swing.JButton; -import javax.swing.JPanel; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; import java.awt.Color; -import javax.swing.JLabel; +import java.awt.FlowLayout; import java.awt.Font; -import javax.swing.JTextPane; import java.awt.SystemColor; -import java.awt.event.ActionListener; import java.awt.event.ActionEvent; -import javax.swing.JSeparator; -import javax.swing.JMenuBar; -import javax.swing.JMenu; -import javax.swing.JMenuItem; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import javax.swing.border.TitledBorder; -import javax.swing.JTextArea; +import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import java.io.IOException; -import javax.swing.JRadioButton; import javax.swing.ButtonGroup; -import javax.swing.JSpinner; -import javax.swing.SpinnerNumberModel; +import javax.swing.DefaultComboBoxModel; +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JPanel; +import javax.swing.JSeparator; +import javax.swing.JTextPane; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; import models.Image; import models.Links; -import javax.swing.JComboBox; -import javax.swing.DefaultComboBoxModel; +import util.GuiOrganizer; @SuppressWarnings("serial") public class EditImageFreigabe_GUI extends JFrame { @@ -70,11 +66,10 @@ public class EditImageFreigabe_GUI extends JFrame { e.printStackTrace(); } setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - //setBounds(100, 100, 603, 722); + + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); + getContentPane().setLayout(null); { JPanel panel = new JPanel(); @@ -247,5 +242,14 @@ public class EditImageFreigabe_GUI extends JFrame { mnNewMenu_1.add(mntmOtrs); + JMenuItem mntmAbout = new JMenuItem("About"); + mntmAbout.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + mnNewMenu_1.add(mntmAbout); + } } diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java index f0d7dacb..4e0140c2 100644 --- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java @@ -1,20 +1,20 @@ package gui.image; +import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; -import java.awt.Toolkit; + import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.IOException; + import javax.swing.ButtonGroup; import javax.swing.JButton; @@ -34,6 +34,8 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; + +import util.GuiOrganizer; import models.Image; import models.Links; @@ -64,7 +66,7 @@ public class EditImageTechnisch_GUI extends JFrame { } }); - // Verhindert das Vergroeßern des Fensters + // Verhindert das Vergroe�ern des Fensters setResizable(false); try { @@ -78,10 +80,8 @@ public class EditImageTechnisch_GUI extends JFrame { // Setzt den Titel des Fensters setTitle("bwLehrpool Suite *Prototyp* - Image bearbeiten"); // Zentriert das Fenster - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); getContentPane().setLayout(null); { @@ -364,6 +364,15 @@ public class EditImageTechnisch_GUI extends JFrame { } }); mnNewMenu_1.add(mntmOtrs); + + JMenuItem mntmAbout = new JMenuItem("About"); + mntmAbout.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + mnNewMenu_1.add(mntmAbout); } } diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 6118d1ac..91e5decb 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -2,28 +2,29 @@ package gui.image; import java.awt.BorderLayout; import java.awt.Color; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; -import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; + import javax.swing.JButton; import javax.swing.JFileChooser; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; import javax.swing.JMenuBar; +import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JProgressBar; @@ -33,18 +34,20 @@ import javax.swing.SwingConstants; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; + import models.Image; import models.Links; import models.SessionData; import models.person; + import org.apache.thrift.TException; + import server.Server.Client; import thrift.ThriftConnection; +import util.GuiOrganizer; import ftp.UploadTask; +import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; -import javax.swing.JMenuItem; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; @SuppressWarnings("serial") public class FTPCreateUploader_GUI extends JFrame implements @@ -118,11 +121,10 @@ public class FTPCreateUploader_GUI extends JFrame implements // filename=name; setBackground(Color.WHITE); setTitle("Dozentenmodul *Prototyp* - Image erzeugen"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - // setBounds(100, 100, 603, 250); + + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); + getContentPane().setLayout(new BorderLayout()); contentPanel.setBackground(SystemColor.menu); contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); @@ -373,6 +375,15 @@ public class FTPCreateUploader_GUI extends JFrame implements } }); menu.add(menuItem_1); + + JMenuItem mntmAbout = new JMenuItem("About"); + mntmAbout.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + menu.add(mntmAbout); setVisible(true); } diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index 96826596..87a59a6b 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -2,49 +2,49 @@ package gui.image; import java.awt.BorderLayout; import java.awt.Color; -import java.awt.Dimension; import java.awt.FlowLayout; -import java.awt.Toolkit; +import java.awt.Font; +import java.awt.SystemColor; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.io.File; -import java.io.IOException; import javax.swing.JButton; import javax.swing.JFileChooser; import javax.swing.JFrame; import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JProgressBar; +import javax.swing.JSeparator; +import javax.swing.JTextPane; import javax.swing.SwingConstants; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; -import ftp.DownloadTask; -import gui.intro.MainMenue_GUI; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.awt.SystemColor; -import java.awt.Font; -import javax.swing.JTextPane; -import javax.swing.JSeparator; import models.Image; import models.Links; import models.SessionData; import org.apache.thrift.TException; + import server.Server.Client; import server.User; import thrift.ThriftConnection; -import javax.swing.JMenuBar; -import javax.swing.JMenu; -import javax.swing.JMenuItem; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; +import util.GuiOrganizer; +import ftp.DownloadTask; +import gui.intro.About_GUI; +import gui.intro.MainMenue_GUI; @SuppressWarnings("serial") public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener { @@ -114,10 +114,10 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener setBackground(Color.WHITE); setTitle("Dozentenmodul *Prototyp* - Image herunterladen"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); + + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); + getContentPane().setLayout(new BorderLayout()); contentPanel.setBackground(SystemColor.menu); contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); @@ -319,6 +319,15 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener }); menu.add(menuItem_1); + + JMenuItem mntmAbout = new JMenuItem("About"); + mntmAbout.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + menu.add(mntmAbout); { JPanel buttonPane = new JPanel(); buttonPane.setBackground(UIManager.getColor("Button.background")); diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index a5f64d90..298ea6ea 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -2,28 +2,29 @@ package gui.image; import java.awt.BorderLayout; import java.awt.Color; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; -import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; + import javax.swing.JButton; import javax.swing.JFileChooser; import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JMenu; import javax.swing.JMenuBar; +import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JProgressBar; @@ -33,18 +34,20 @@ import javax.swing.SwingConstants; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; + import models.Image; import models.Links; import models.SessionData; import models.person; + import org.apache.thrift.TException; + import server.Server.Client; import thrift.ThriftConnection; +import util.GuiOrganizer; import ftp.UploadTask; +import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; -import javax.swing.JMenuItem; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; @SuppressWarnings("serial") public class FTPEditUploader_GUI extends JFrame implements @@ -115,11 +118,10 @@ public class FTPEditUploader_GUI extends JFrame implements // filename=name; setBackground(Color.WHITE); setTitle("Dozentenmodul *Prototyp* - Image bearbeiten"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - // setBounds(100, 100, 603, 250); + + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); + getContentPane().setLayout(new BorderLayout()); contentPanel.setBackground(SystemColor.menu); contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); @@ -366,6 +368,15 @@ public class FTPEditUploader_GUI extends JFrame implements }); menu.add(menuItem_1); + + JMenuItem mntmAbout = new JMenuItem("About"); + mntmAbout.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + menu.add(mntmAbout); setVisible(true); } diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index ae368310..11dacd09 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -1,13 +1,12 @@ package gui.image; +import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; -import gui.lecture.ExtendedSearchForImages_GUI; + import java.awt.Color; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; @@ -16,9 +15,9 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.IOException; import java.util.Iterator; import java.util.List; + import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JFrame; @@ -45,15 +44,17 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; + import models.Image; import models.Links; import models.person; -//import models.person; import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; +import util.GuiOrganizer; +//import models.person; @SuppressWarnings("serial") public class SearchEditImage_GUI extends JFrame { @@ -121,10 +122,8 @@ public class SearchEditImage_GUI extends JFrame { // Setzt den Fenstertitel setTitle("bwLehrpool Suite *Prototyp* - Image bearbeiten"); // Zentriert das Fenster in die Bildmitte - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); final DefaultTableModel model = new DefaultTableModel(titles, 0); @@ -521,6 +520,15 @@ public class SearchEditImage_GUI extends JFrame { }); mnNewMenu_1.add(mntmOtrs); + + JMenuItem mntmAbout = new JMenuItem("About"); + mntmAbout.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + mnNewMenu_1.add(mntmAbout); } diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java index 59512570..9c197421 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -1,13 +1,12 @@ package gui.image; +import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; -import gui.lecture.ExtendedSearchForImages_GUI; + import java.awt.Color; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; @@ -16,9 +15,9 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.IOException; import java.util.Iterator; import java.util.List; + import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JFrame; @@ -45,12 +44,16 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; + import models.Image; import models.Links; import models.person; + import org.apache.thrift.TException; + import server.Server.Client; import thrift.ThriftConnection; +import util.GuiOrganizer; @SuppressWarnings("serial") public class SearchImage_GUI extends JFrame { @@ -115,10 +118,8 @@ public class SearchImage_GUI extends JFrame { // Setzt den Fenstertitel setTitle("bwLehrpool Suite *Prototyp* - Suche VL-Image"); // Zentriert das Fenster in die Bildmitte - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); final DefaultTableModel model = new DefaultTableModel(titles, 0); @@ -452,6 +453,15 @@ public class SearchImage_GUI extends JFrame { }); mnNewMenu_1.add(mntmOtrs); + + JMenuItem mntmAbout = new JMenuItem("About"); + mntmAbout.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + mnNewMenu_1.add(mntmAbout); } diff --git a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java index 3d312394..daef9bae 100644 --- a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java @@ -1,20 +1,19 @@ package gui.image; +import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.IOException; + import javax.swing.ButtonGroup; import javax.swing.JButton; import javax.swing.JFrame; @@ -31,7 +30,9 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; + import models.Links; +import util.GuiOrganizer; @SuppressWarnings("serial") public class SearchMethodLecture_GUI extends JFrame { @@ -64,11 +65,10 @@ public class SearchMethodLecture_GUI extends JFrame { e.printStackTrace(); } setTitle("bwLehrpool Suite *Prototyp* - Suchmethode w\u00E4hlen"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 603) / 2; - int left = (screenSize.width - 722) / 2; - setBounds(left, top, 603, 722); - // setBounds(100, 100, 603, 722); + + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); + getContentPane().setLayout(null); { JPanel panel = new JPanel(); @@ -253,6 +253,15 @@ public class SearchMethodLecture_GUI extends JFrame { }); mnNewMenu_1.add(mntmOtrs); + + JMenuItem mntmAbout = new JMenuItem("About"); + mntmAbout.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + mnNewMenu_1.add(mntmAbout); } } diff --git a/Dozentenmodul/src/gui/intro/About_GUI.java b/Dozentenmodul/src/gui/intro/About_GUI.java new file mode 100644 index 00000000..447f18ee --- /dev/null +++ b/Dozentenmodul/src/gui/intro/About_GUI.java @@ -0,0 +1,95 @@ +package gui.intro; + +import java.awt.Image; +import java.awt.SystemColor; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JTextPane; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; + +import util.GuiOrganizer; + +@SuppressWarnings("serial") +public class About_GUI extends JFrame { + + private JPanel contentPane; + private JTextPane txtpnVersionVBuilddate; + + /** + * Create the frame. + */ + public About_GUI() { + // Fenster darf nicht vergroessert werden + setResizable(false); + + try { + // Setzt das Look and Feel auf System + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + JOptionPane.showMessageDialog(null, + e.getCause() + "\n" + e.getMessage(), "Debug-Message", + JOptionPane.ERROR_MESSAGE); + } + // Titel des Fensters setzen + setTitle("Dozentenmodul *Prototyp* - About"); + // Aktion die beim Schliessen durchgefuehrt werden soll + setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + // Groesse des Fensters definieren + setBounds(0, 0, 355, 309); + GuiOrganizer.centerGUI(this); + // Erzeugen eines Panels + contentPane = new JPanel(); + // Hintergrund Farbe des Panels setzen + contentPane.setBackground(SystemColor.menu); + // Rahmen des Fensters setzen + contentPane.setBorder(new EmptyBorder(5, 5, 5, 5)); + setContentPane(contentPane); + // Layout setzen + contentPane.setLayout(null); + // Label fuer das Logo erzeugen + JLabel imgLabel = new JLabel(); + // Groesse und Position des Logos festelegen + imgLabel.setBounds(30, 18, 294, 80); + // Pfadangabe des Logos + + ImageIcon icon = new ImageIcon(getClass().getResource( + "/Logo_bwLehrpool.png"), "Logo"); + // Skalierung des Logos + Image scaled = icon.getImage().getScaledInstance(270, 64, 0); + imgLabel.setIcon(new ImageIcon(scaled)); + // Hinzufuegen des Logos in das Fenster + contentPane.add(imgLabel); + + // Erzeugen, Hinzufuegen und definierung der Aktion des Buttons + JButton BtnClose = new JButton("Close"); + BtnClose.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + dispose(); + + }// end actionPerformed + }); + + BtnClose.setBounds(62, 226, 237, 23); + contentPane.add(BtnClose); + + txtpnVersionVBuilddate = new JTextPane(); + txtpnVersionVBuilddate + .setText("Version: v0.1\r\nBuild-Date: 03.06.2014\r\n\r\nContact: michael.wilson@hs-offenburg.de\r\nWebsite: http://bwlehrpool.hs-offenburg.de/"); + txtpnVersionVBuilddate.setEditable(false); + txtpnVersionVBuilddate.setBackground(SystemColor.menu); + txtpnVersionVBuilddate.setBounds(62, 95, 224, 90); + contentPane.add(txtpnVersionVBuilddate); + }// end LoginGUI() +}// end class diff --git a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java index 652cca80..2cd45f08 100644 --- a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java +++ b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java @@ -1,13 +1,13 @@ package gui.intro; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.File; @@ -37,8 +37,8 @@ import models.Links; import org.ini4j.InvalidFileFormatException; import org.ini4j.Wini; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; + +import util.GuiOrganizer; @@ -75,10 +75,8 @@ public class BillOfRights_GUI extends JFrame { setTitle("bwLehrpool Suite *Prototyp*"); //Zentiert das Fenster in der Bildschirmmitte - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); getContentPane().setLayout(null); { diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index 5b47f4e0..06a87307 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -1,17 +1,16 @@ package gui.intro; import java.awt.Color; -import java.awt.Dimension; import java.awt.EventQueue; import java.awt.Image; import java.awt.SystemColor; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; + import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JFrame; @@ -20,19 +19,23 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JPasswordField; import javax.swing.JTextField; +import javax.swing.SwingConstants; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; + import models.SessionData; import models.person; + import org.apache.thrift.TException; import org.ini4j.Wini; -import thrift.MasterThriftConnection; + import thrift.ImageServer.Client; +import thrift.MasterThriftConnection; import thrift.ThriftConnection; import thrift.UserInfo; +import util.GuiOrganizer; import config.config_file; -import javax.swing.SwingConstants; @SuppressWarnings("serial") public class Login_GUI extends JFrame { @@ -106,11 +109,11 @@ public class Login_GUI extends JFrame { setTitle("Dozentenmodul *Prototyp*"); // Aktion die beim Schliessen durchgefuehrt werden soll setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - // Groesse des Fensters definieren - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 400) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 400); + + //Größe setzen und mittig ausrichten + setBounds(0, 0, 603, 400); + GuiOrganizer.centerGUI(this); + // Erzeugen eines Panels contentPane = new JPanel(); // Hintergrund Farbe des Panels setzen @@ -182,6 +185,7 @@ public class Login_GUI extends JFrame { lblConnectionInfo.setHorizontalAlignment(SwingConstants.LEFT); lblConnectionInfo.setBounds(292, 290, 237, 20); contentPane.add(lblConnectionInfo); + //GuiOrganizer.centerGUI(this); }// end LoginGUI() // Versuche den Benutzer einzuloggen diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 59a35df3..abce5001 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -1,41 +1,48 @@ package gui.intro; -import gui.image.*; -import gui.lecture.*; -import java.awt.Dimension; +import gui.image.CreateImageAllgemein_GUI; +import gui.image.DeleteImage_GUI; +import gui.image.SearchEditImage_GUI; +import gui.image.SearchImage_GUI; +import gui.lecture.CreateLectureAllgemein_GUI; +import gui.lecture.DeleteLecture_GUI; +import gui.lecture.EditLectureSearch_GUI; +import gui.lecture.SearchLecture_GUI; + import java.awt.FlowLayout; -import java.awt.Toolkit; -import javax.swing.JFrame; -import javax.swing.JButton; -import javax.swing.JPanel; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.JLabel; import java.awt.Font; -import javax.swing.JTextPane; +import java.awt.ScrollPane; import java.awt.SystemColor; -import java.awt.event.ActionListener; import java.awt.event.ActionEvent; -import javax.swing.JSeparator; -import javax.swing.JRadioButton; -import javax.swing.SwingConstants; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; + import javax.swing.ButtonGroup; -import javax.swing.JMenuBar; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JLabel; import javax.swing.JMenu; +import javax.swing.JMenuBar; import javax.swing.JMenuItem; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JSeparator; +import javax.swing.JTextArea; +import javax.swing.JTextPane; +import javax.swing.SwingConstants; import javax.swing.ToolTipManager; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; -import java.awt.ScrollPane; -import javax.swing.JTextArea; -import javax.swing.ImageIcon; + import models.Links; import models.SessionData; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.io.IOException; +import util.GuiOrganizer; @SuppressWarnings("serial") public class MainMenue_GUI extends JFrame { @@ -54,6 +61,7 @@ public class MainMenue_GUI extends JFrame { JRadioButton rdbtnLectureDelete; JRadioButton rdbtnLectureSearch; private final ButtonGroup buttonGroup = new ButtonGroup(); + private JMenuItem mntmAbout; /** @@ -74,11 +82,9 @@ public class MainMenue_GUI extends JFrame { e.printStackTrace(); } setTitle("bwLehrpool Suite *Prototyp* - Connected Server: "+SessionData.session.getServerAdress()); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - // setBounds(100, 100, 545, 366); + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); + getContentPane().setLayout(null); { JPanel panel = new JPanel(); @@ -419,7 +425,15 @@ public class MainMenue_GUI extends JFrame { }); mnNewMenu_1.add(mntmOtrs); + + mntmAbout = new JMenuItem("About"); + mntmAbout.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + mnNewMenu_1.add(mntmAbout); }// end main - }// end class diff --git a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java index 59f47f4b..cfe046ad 100644 --- a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java +++ b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java @@ -2,41 +2,44 @@ package gui.intro; import java.awt.Desktop; -import java.awt.Dimension; import java.awt.FlowLayout; -import java.awt.Toolkit; -import javax.swing.JFrame; -import javax.swing.JButton; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.JLabel; import java.awt.Font; -import javax.swing.JTextPane; import java.awt.SystemColor; -import java.awt.event.ActionListener; import java.awt.event.ActionEvent; -import javax.swing.JSeparator; -import javax.swing.JMenuBar; -import javax.swing.JMenu; -import javax.swing.JMenuItem; +import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; + +import javax.swing.JButton; import javax.swing.JCheckBox; -import javax.swing.event.ChangeListener; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JSeparator; +import javax.swing.JTextPane; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; + import models.Links; + import org.ini4j.InvalidFileFormatException; import org.ini4j.Wini; +import util.GuiOrganizer; + @SuppressWarnings("serial") public class VmWareLink_GUI extends JFrame { @@ -65,11 +68,9 @@ public class VmWareLink_GUI extends JFrame { e.printStackTrace(); } setTitle("Dozentenmodul *Prototyp*"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - //setBounds(100, 100, 603, 722); + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); + getContentPane().setLayout(null); { JPanel panel = new JPanel(); diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java index 0c115f69..bf0a99be 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java @@ -1,18 +1,22 @@ package gui.lecture; +import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; + import java.awt.Color; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; +import java.awt.ScrollPane; import java.awt.SystemColor; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.util.Calendar; +import java.util.Date; + import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JLabel; @@ -21,24 +25,23 @@ import javax.swing.JMenuBar; import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPanel; +import javax.swing.JRadioButton; import javax.swing.JSeparator; +import javax.swing.JTextArea; import javax.swing.JTextField; import javax.swing.JTextPane; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; + import models.Image; import models.Lecture; import models.Links; import models.person; -import javax.swing.JTextArea; -import java.awt.ScrollPane; -import java.io.IOException; -import java.util.Calendar; -import java.util.Date; +import util.GuiOrganizer; + import com.toedter.calendar.JDateChooser; -import javax.swing.JRadioButton; @SuppressWarnings("serial") public class CreateLectureAllgemein_GUI extends JFrame { @@ -88,11 +91,9 @@ public class CreateLectureAllgemein_GUI extends JFrame { e.printStackTrace(); } setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung erzeugen"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - // setBounds(100, 100, 603, 722); + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); + getContentPane().setLayout(null); { JPanel panel = new JPanel(); @@ -500,6 +501,15 @@ public class CreateLectureAllgemein_GUI extends JFrame { }); mnNewMenu_1.add(mntmOtrs); + + JMenuItem mnmtAbout = new JMenuItem("About"); + mnmtAbout.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + mnNewMenu_1.add(mnmtAbout); } diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index 148e42fc..54c467c5 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -1,12 +1,12 @@ package gui.lecture; +import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; + import java.awt.Color; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; @@ -15,12 +15,12 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Iterator; import java.util.List; + import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JFrame; @@ -42,12 +42,16 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import javax.swing.table.DefaultTableModel; + import models.Lecture; import models.Links; import models.person; + import org.apache.thrift.TException; + import server.Server.Client; import thrift.ThriftConnection; +import util.GuiOrganizer; @SuppressWarnings("serial") public class CreateLectureLink_GUI extends JFrame { @@ -95,10 +99,8 @@ public class CreateLectureLink_GUI extends JFrame { e.printStackTrace(); } setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung erzeugen"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 603) / 2; - int left = (screenSize.width - 722) / 2; - setBounds(left, top, 603, 722); + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel model = new DefaultTableModel(titles, 0); @@ -468,6 +470,15 @@ public class CreateLectureLink_GUI extends JFrame { }); mnNewMenu_1.add(mntmOtrs); + + JMenuItem mntmAbout = new JMenuItem("About"); + mntmAbout.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + mnNewMenu_1.add(mntmAbout); } diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index 5a3f24df..06c6b6ac 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -1,12 +1,12 @@ package gui.lecture; +import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; + import java.awt.Color; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; @@ -15,9 +15,9 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.IOException; import java.util.Iterator; import java.util.List; + import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JLabel; @@ -43,11 +43,15 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; + import models.Links; import models.person; + import org.apache.thrift.TException; + import server.Server.Client; import thrift.ThriftConnection; +import util.GuiOrganizer; @SuppressWarnings("serial") public class DeleteLecture_GUI extends JFrame { @@ -103,10 +107,8 @@ public class DeleteLecture_GUI extends JFrame { // Setzt den Fenstertitel setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung l\u00F6schen"); // Zentriert das Fenster in die Bildmitte - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); final DefaultTableModel model = new DefaultTableModel(titles, 0); @@ -421,6 +423,15 @@ public class DeleteLecture_GUI extends JFrame { }); mnNewMenu_1.add(mntmOtrs); + + JMenuItem mntmAbout = new JMenuItem("About"); + mntmAbout.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + mnNewMenu_1.add(mntmAbout); } diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java index 7e171078..1c92026b 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java @@ -1,20 +1,22 @@ package gui.lecture; +import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; import java.awt.Color; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; +import java.awt.ScrollPane; import java.awt.SystemColor; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; + +import javax.swing.ButtonGroup; import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JLabel; @@ -22,23 +24,23 @@ import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JMenuItem; import javax.swing.JPanel; +import javax.swing.JRadioButton; import javax.swing.JSeparator; +import javax.swing.JTextArea; import javax.swing.JTextField; import javax.swing.JTextPane; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; + import models.Image; import models.Lecture; import models.Links; import models.person; -import javax.swing.JTextArea; -import java.awt.ScrollPane; -import java.io.IOException; +import util.GuiOrganizer; + import com.toedter.calendar.JDateChooser; -import javax.swing.JRadioButton; -import javax.swing.ButtonGroup; @SuppressWarnings("serial") @@ -78,12 +80,10 @@ public class EditLectureAllgemein_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung bearbeiten"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - //setBounds(100, 100, 603, 722); + setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung bearbeiten");; + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); + getContentPane().setLayout(null); { JPanel panel = new JPanel(); @@ -416,6 +416,15 @@ public class EditLectureAllgemein_GUI extends JFrame { mnNewMenu_1.add(mntmOtrs); + JMenuItem mntmAbout = new JMenuItem("About"); + mntmAbout.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + mnNewMenu_1.add(mntmAbout); + } diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index 9db4be3b..439c5b41 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -1,12 +1,12 @@ package gui.lecture; +import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; + import java.awt.Color; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; @@ -15,12 +15,12 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Iterator; import java.util.List; + import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JFrame; @@ -42,12 +42,16 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import javax.swing.table.DefaultTableModel; + import models.Lecture; import models.Links; import models.person; + import org.apache.thrift.TException; + import server.Server.Client; import thrift.ThriftConnection; +import util.GuiOrganizer; @SuppressWarnings("serial") public class EditLectureLink_GUI extends JFrame { @@ -89,10 +93,9 @@ public class EditLectureLink_GUI extends JFrame { e.printStackTrace(); } setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung bearbeiten"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 603) / 2; - int left = (screenSize.width - 722) / 2; - setBounds(left, top, 603, 722); + + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel model = new DefaultTableModel(titles, 0); @@ -460,6 +463,15 @@ public class EditLectureLink_GUI extends JFrame { }); mnNewMenu_1.add(mntmOtrs); + + JMenuItem mntmAbout = new JMenuItem("About"); + mntmAbout.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + mnNewMenu_1.add(mntmAbout); } diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index 4174ca66..a6436ebf 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -1,12 +1,12 @@ package gui.lecture; +import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; + import java.awt.Color; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; @@ -15,12 +15,12 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.IOException; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Iterator; import java.util.List; + import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JLabel; @@ -46,12 +46,16 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; + import models.Lecture; import models.Links; import models.person; + import org.apache.thrift.TException; + import server.Server.Client; import thrift.ThriftConnection; +import util.GuiOrganizer; @SuppressWarnings("serial") public class EditLectureSearch_GUI extends JFrame { @@ -114,10 +118,8 @@ public class EditLectureSearch_GUI extends JFrame { // Setzt den Fenstertitel setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung bearbeiten"); // Zentriert das Fenster in die Bildmitte - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); final DefaultTableModel model = new DefaultTableModel(titles, 0); @@ -488,6 +490,15 @@ public class EditLectureSearch_GUI extends JFrame { }); mnNewMenu_1.add(mntmOtrs); + + JMenuItem mntmAbout = new JMenuItem("About"); + mntmAbout.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + mnNewMenu_1.add(mntmAbout); } diff --git a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java index a8dcf498..d0a18bb7 100644 --- a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java +++ b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java @@ -3,13 +3,16 @@ package gui.lecture; import gui.image.CreateImageAllgemein_GUI; import gui.image.FTPCreateUploader_GUI; -import java.awt.Dimension; +import gui.intro.About_GUI; + import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; + import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComboBox; @@ -26,10 +29,9 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; + import models.Links; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.io.IOException; +import util.GuiOrganizer; @SuppressWarnings("serial") public class ExtendedSearchForImages_GUI extends JFrame { @@ -55,10 +57,8 @@ public class ExtendedSearchForImages_GUI extends JFrame { e.printStackTrace(); } setTitle("bwLehrpool Suite *Prototyp* - Erweiterte Suche"); - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width -603) / 2; - setBounds(left, top, 603, 722); + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); getContentPane().setLayout(null); { @@ -233,5 +233,14 @@ public class ExtendedSearchForImages_GUI extends JFrame { mnNewMenu_1.add(mntmOtrs); + JMenuItem mntmAbout = new JMenuItem("About"); + mntmAbout.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + mnNewMenu_1.add(mntmAbout); + } } diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java index 1e1cf7e0..841d17df 100644 --- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -1,12 +1,12 @@ package gui.lecture; +import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; + import java.awt.Color; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; import java.awt.SystemColor; -import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; @@ -15,9 +15,9 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import java.io.IOException; import java.util.Iterator; import java.util.List; + import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JLabel; @@ -42,11 +42,15 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; + import models.Links; import models.person; + import org.apache.thrift.TException; + import server.Server.Client; import thrift.ThriftConnection; +import util.GuiOrganizer; @SuppressWarnings("serial") public class SearchLecture_GUI extends JFrame { @@ -108,11 +112,9 @@ public class SearchLecture_GUI extends JFrame { } // Setzt den Fenstertitel setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung suchen"); - // Zentriert das Fenster in die Bildmitte - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top = (screenSize.height - 722) / 2; - int left = (screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); + // Zentriert das Fenster in die Bildmitte 2; + setBounds(0, 0, 603, 722); + GuiOrganizer.centerGUI(this); final DefaultTableModel model = new DefaultTableModel(titles, 0); @@ -378,6 +380,15 @@ public class SearchLecture_GUI extends JFrame { }); mnNewMenu_1.add(mntmOtrs); + + JMenuItem mntmAbout = new JMenuItem("About"); + mntmAbout.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + mnNewMenu_1.add(mntmAbout); } diff --git a/Dozentenmodul/src/util/GuiOrganizer.java b/Dozentenmodul/src/util/GuiOrganizer.java new file mode 100644 index 00000000..f03c3811 --- /dev/null +++ b/Dozentenmodul/src/util/GuiOrganizer.java @@ -0,0 +1,26 @@ +package util; + +import java.awt.Dimension; +import java.awt.Toolkit; +import java.awt.Window; + +public abstract class GuiOrganizer { + + + + + /*receive GUI, set it to center of the screen*/ + public static void centerGUI(Window gui) + { + Dimension dm = Toolkit.getDefaultToolkit().getScreenSize(); + double width = dm.getWidth(); + double height = dm.getHeight(); + double xPosition = (width / 2 - gui.getWidth() / 2); + double yPosition = (height / 2 - gui.getHeight() / 2); + gui.setLocation((int) xPosition, (int) yPosition); + } + + + + +} |