summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java
diff options
context:
space:
mode:
authorSimon Rettberg2015-09-05 22:26:12 +0200
committerSimon Rettberg2015-09-05 22:26:12 +0200
commit5b0559c069ff618417588c23ee264ca147d0f18c (patch)
treee6ba8f08bfc00680d35d35b60e20f0e44bdb23ab /dozentenmodul/src/main/java
parent[client] Change wording of upload wizard, refine cancel check (diff)
downloadtutor-module-5b0559c069ff618417588c23ee264ca147d0f18c.tar.gz
tutor-module-5b0559c069ff618417588c23ee264ca147d0f18c.tar.xz
tutor-module-5b0559c069ff618417588c23ee264ca147d0f18c.zip
[client] Set background of scrollpane to match table
Diffstat (limited to 'dozentenmodul/src/main/java')
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageCustomPermissionManager.java5
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java6
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LectureCustomPermissionManager.java5
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java5
-rw-r--r--dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/UserListWindowLayout.java8
5 files changed, 19 insertions, 10 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageCustomPermissionManager.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageCustomPermissionManager.java
index 7e260032..76b6a94f 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageCustomPermissionManager.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageCustomPermissionManager.java
@@ -14,6 +14,7 @@ import javax.swing.JButton;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
import org.apache.log4j.Logger;
import org.openslx.bwlp.thrift.iface.ImagePermissions;
@@ -67,7 +68,9 @@ public class ImageCustomPermissionManager extends JPanel {
userButtonPane.add(Box.createGlue());
// Put everything into the grid
- grid.add(new JScrollPane(permissionTable)).fill(true, true).expand(true, true);
+ JScrollPane jsp = new JScrollPane(permissionTable);
+ jsp.setBackground(UIManager.getColor("Table.background"));
+ grid.add(jsp).fill(true, true).expand(true, true);
grid.nextRow();
grid.add(userButtonPane).fill(true, false).expand(true, false);
grid.nextRow();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java
index a979f026..10f55205 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageListViewer.java
@@ -19,7 +19,6 @@ import javax.swing.border.TitledBorder;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
-import org.apache.log4j.Logger;
import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
import org.openslx.bwlp.thrift.iface.UserInfo;
import org.openslx.dozmod.gui.Gui;
@@ -35,7 +34,6 @@ import org.openslx.util.QuickTimer.Task;
@SuppressWarnings("serial")
public class ImageListViewer extends QLabel {
- private final static Logger LOGGER = Logger.getLogger(ImageListViewer.class);
protected JTextField searchTextField;
protected ImageTable imageTable;
protected JComboBox<FilterType> filterCbo;
@@ -128,7 +126,9 @@ public class ImageListViewer extends QLabel {
grid.add(filterPanel).fill(true, false).expand(true, false);
grid.nextRow();
- grid.add(new JScrollPane(imageTable)).fill(true, true).expand(true, true);
+ JScrollPane jsp = new JScrollPane(imageTable);
+ jsp.setBackground(UIManager.getColor("Table.background"));
+ grid.add(jsp).fill(true, true).expand(true, true);
grid.finish(false);
/**
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LectureCustomPermissionManager.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LectureCustomPermissionManager.java
index 5b09b124..4925728e 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LectureCustomPermissionManager.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LectureCustomPermissionManager.java
@@ -14,6 +14,7 @@ import javax.swing.JButton;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
import org.apache.log4j.Logger;
import org.openslx.bwlp.thrift.iface.LecturePermissions;
@@ -72,7 +73,9 @@ public class LectureCustomPermissionManager extends JPanel{
userButtonPane.add(Box.createGlue());
// Put everything into the grid
- grid.add(new JScrollPane(permissionTable)).fill(true, true).expand(true, true);
+ JScrollPane jsp = new JScrollPane(permissionTable);
+ jsp.setBackground(UIManager.getColor("Table.background"));
+ grid.add(jsp).fill(true, true).expand(true, true);
grid.nextRow();
grid.add(userButtonPane).fill(true, false).expand(true, false);
grid.nextRow();
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java
index ac23d07c..dd36bfaa 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java
@@ -13,6 +13,7 @@ import javax.swing.JComboBox;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextField;
+import javax.swing.UIManager;
import javax.swing.border.TitledBorder;
import org.openslx.dozmod.gui.control.QLabel;
@@ -93,7 +94,9 @@ public abstract class LectureListWindowLayout extends CompositePage {
tableGrid.add(filterPanel).fill(true, false).expand(true, false);
tableGrid.nextRow();
- tableGrid.add(new JScrollPane(lectureTable)).fill(true, true).expand(true, true);
+ JScrollPane jsp = new JScrollPane(lectureTable);
+ jsp.setBackground(UIManager.getColor("Table.background"));
+ tableGrid.add(jsp).fill(true, true).expand(true, true);
tableGrid.nextRow();
tableGrid.finish(false);
// ---------- end for table group -----------------------------
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/UserListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/UserListWindowLayout.java
index 948a2476..25f33d8a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/UserListWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/UserListWindowLayout.java
@@ -11,8 +11,8 @@ import javax.swing.JDialog;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextField;
+import javax.swing.UIManager;
-import org.apache.log4j.Logger;
import org.openslx.dozmod.gui.control.QLabel;
import org.openslx.dozmod.gui.control.table.UserTable;
import org.openslx.dozmod.gui.helper.GridManager;
@@ -20,8 +20,6 @@ import org.openslx.dozmod.gui.helper.GridManager;
@SuppressWarnings("serial")
public class UserListWindowLayout extends JDialog {
- private static final Logger LOGGER = Logger.getLogger(UserListWindowLayout.class);
-
protected final UserTable userTable;
protected final JButton setButton;
@@ -50,7 +48,9 @@ public class UserListWindowLayout extends JDialog {
listPane.setLayout(new BoxLayout(listPane, BoxLayout.PAGE_AXIS));
listPane.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
userTable = new UserTable();
- listPane.add(new JScrollPane(userTable));
+ JScrollPane jsp = new JScrollPane(userTable);
+ jsp.setBackground(UIManager.getColor("Table.background"));
+ listPane.add(jsp);
// --------------- end user table ------------------------------------
// --------------- button panel --------------------------------------