From: James Moger Date: Tue, 18 Oct 2011 02:22:40 +0000 (-0400) Subject: Polish GitblitPanel. Exclude the manager from GO and WAR builds. X-Git-Tag: v0.7.0~72 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=44f2dad1f1d3a9ee2b22f213e806d5ef415769b0;p=gitblit.git Polish GitblitPanel. Exclude the manager from GO and WAR builds. --- diff --git a/build.xml b/build.xml index 720bf90f..5ed87d5a 100644 --- a/build.xml +++ b/build.xml @@ -162,6 +162,7 @@ + @@ -365,6 +366,7 @@ + diff --git a/src/com/gitblit/client/GitblitPanel.java b/src/com/gitblit/client/GitblitPanel.java index 3e2cb7af..5525e414 100644 --- a/src/com/gitblit/client/GitblitPanel.java +++ b/src/com/gitblit/client/GitblitPanel.java @@ -19,6 +19,7 @@ import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; import java.awt.Desktop; +import java.awt.FlowLayout; import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -215,15 +216,22 @@ public class GitblitPanel extends JPanel implements CloseTabListener { repositoryTablePanel.add(repositoryFilterPanel, BorderLayout.NORTH); repositoryTablePanel.add(new JScrollPane(repositoriesTable), BorderLayout.CENTER); - JPanel repositoryControls = new JPanel(); + JPanel repositoryControls = new JPanel(new FlowLayout(FlowLayout.CENTER, 5, 0)); repositoryControls.add(refreshRepositories); repositoryControls.add(browseRepository); repositoryControls.add(createRepository); repositoryControls.add(editRepository); repositoryControls.add(delRepository); - JPanel repositoriesPanel = new JPanel(new BorderLayout(margin, margin)); - repositoriesPanel.add(newHeaderLabel(Translation.get("gb.repositories")), + JPanel repositoriesPanel = new JPanel(new BorderLayout(margin, margin)) { + + private static final long serialVersionUID = 1L; + + public Insets getInsets() { + return insets; + } + }; + repositoriesPanel.add(new HeaderPanel(Translation.get("gb.repositories")), BorderLayout.NORTH); repositoriesPanel.add(repositoryTablePanel, BorderLayout.CENTER); repositoriesPanel.add(repositoryControls, BorderLayout.SOUTH); @@ -300,14 +308,21 @@ public class GitblitPanel extends JPanel implements CloseTabListener { userTablePanel.add(userFilterPanel, BorderLayout.NORTH); userTablePanel.add(new JScrollPane(usersTable), BorderLayout.CENTER); - JPanel userControls = new JPanel(); + JPanel userControls = new JPanel(new FlowLayout(FlowLayout.CENTER, 5, 0)); userControls.add(refreshUsers); userControls.add(createUser); userControls.add(editUser); userControls.add(delUser); - JPanel usersPanel = new JPanel(new BorderLayout(margin, margin)); - usersPanel.add(newHeaderLabel(Translation.get("gb.users")), BorderLayout.NORTH); + JPanel usersPanel = new JPanel(new BorderLayout(margin, margin)) { + + private static final long serialVersionUID = 1L; + + public Insets getInsets() { + return insets; + } + }; + usersPanel.add(new HeaderPanel(Translation.get("gb.users")), BorderLayout.NORTH); usersPanel.add(userTablePanel, BorderLayout.CENTER); usersPanel.add(userControls, BorderLayout.SOUTH); @@ -320,15 +335,6 @@ public class GitblitPanel extends JPanel implements CloseTabListener { add(tabs, BorderLayout.CENTER); } - private JLabel newHeaderLabel(String text) { - JLabel label = new JLabel(text); - label.setOpaque(true); - label.setForeground(Color.white); - label.setBackground(Color.gray); - label.setFont(label.getFont().deriveFont(14f)); - return label; - } - private void setRepositoryRenderer(RepositoriesModel.Columns col, TableCellRenderer renderer) { String name = repositoriesTable.getColumnName(col.ordinal()); repositoriesTable.getColumn(name).setCellRenderer(renderer); diff --git a/src/com/gitblit/client/HeaderPanel.java b/src/com/gitblit/client/HeaderPanel.java new file mode 100644 index 00000000..b3953b39 --- /dev/null +++ b/src/com/gitblit/client/HeaderPanel.java @@ -0,0 +1,57 @@ +/* + * Copyright 2011 gitblit.com. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.gitblit.client; + +import java.awt.Color; +import java.awt.FlowLayout; +import java.awt.GradientPaint; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Paint; +import java.awt.geom.Point2D; +import java.awt.geom.Rectangle2D; + +import javax.swing.JLabel; +import javax.swing.JPanel; + +public class HeaderPanel extends JPanel { + + private static final long serialVersionUID = 1L; + + private Color lightColor = new Color(0, 0, 0x60); + + public HeaderPanel(String text) { + super(new FlowLayout(FlowLayout.LEFT), true); + setOpaque(true); + setBackground(new Color(0, 0, 0x20)); + + JLabel label = new JLabel(text); + label.setForeground(Color.white); + label.setFont(label.getFont().deriveFont(14f)); + add(label); + } + + @Override + public void paintComponent(Graphics oldG) { + Graphics2D g = (Graphics2D) oldG; + Point2D startPoint = new Point2D.Float(0, 0); + Point2D endPoint = new Point2D.Float(0, getHeight()); + Paint gradientPaint = new GradientPaint(startPoint, lightColor, endPoint, getBackground(), + false); + g.setPaint(gradientPaint); + g.fill(new Rectangle2D.Double(0, 0, getWidth(), getHeight())); + } +}