diff options
| author | Nino Breuer | 2014-12-01 16:30:59 +0100 |
|---|---|---|
| committer | Nino Breuer | 2014-12-01 16:30:59 +0100 |
| commit | 6a90495ac046d90a749ec2ec152ffdf4d7d603f0 (patch) | |
| tree | 625e5d14802ad1d3d847ab1895edd85a48167e95 /dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java | |
| parent | • changed implementation of user authentication. (diff) | |
| parent | • Admin can download any image (diff) | |
| download | tutor-module-6a90495ac046d90a749ec2ec152ffdf4d7d603f0.tar.gz tutor-module-6a90495ac046d90a749ec2ec152ffdf4d7d603f0.tar.xz tutor-module-6a90495ac046d90a749ec2ec152ffdf4d7d603f0.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Conflicts:
dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
möp. großes geschrei, fehler bitte an mich.
dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
dozentenmodulserver/src/main/java/server/ServerHandler.java
dozentenmodulserver/src/main/java/server/generated/Server.java
dozentenmodulserver/thrift/server.thrift
Diffstat (limited to 'dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java index fc00997f..cb783a59 100644 --- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java @@ -223,7 +223,7 @@ public class SearchLecture_GUI extends JFrame { e.printStackTrace();
}
// Setzt den Fenstertitel
- setTitle("bwLehrpool Suite - Veranstaltung suchen");
+ setTitle("bwLehrpool Suite - Veranstaltung suchen - "+person.verantwortlicher.getUserID());
// Zentriert das Fenster in die Bildmitte 2;
setBounds(0, 0, 842, 722);
setLocationRelativeTo(formerGUI);
@@ -660,6 +660,8 @@ public class SearchLecture_GUI extends JFrame { i.next();
}
+ //show number of rows in GUI
+ tabbedPane.setTitleAt(0, tabbedPane.getTitleAt(0)+" ("+model.getRowCount()+") ");
return model;
} catch (TException e1) {
@@ -697,6 +699,8 @@ public class SearchLecture_GUI extends JFrame { i.next();
}
+ //show number of rows in GUI
+ tabbedPane.setTitleAt(1, tabbedPane.getTitleAt(1)+" ("+model.getRowCount()+") ");
return model;
} catch (TException e1) {
|