From 55a46bd1db51e00467fb2d5c968fbd10feb1bc57 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 16 Oct 2011 08:07:19 -0400
Subject: [PATCH] Use tabs in repository dialog and show origin.
---
src/com/gitblit/wicket/GitBlitWebApp.properties | 3 ++-
src/com/gitblit/client/EditRepositoryDialog.java | 15 +++++++++++----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/client/EditRepositoryDialog.java b/src/com/gitblit/client/EditRepositoryDialog.java
index 93fcced..0955d7b 100644
--- a/src/com/gitblit/client/EditRepositoryDialog.java
+++ b/src/com/gitblit/client/EditRepositoryDialog.java
@@ -42,6 +42,7 @@
import javax.swing.JList;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
+import javax.swing.JTabbedPane;
import javax.swing.JTextField;
import javax.swing.ListCellRenderer;
@@ -104,6 +105,7 @@
this.isCreate = false;
initialize(aRepository);
setModal(true);
+ setResizable(false);
setTitle(Translation.get("gb.edit") + ": " + aRepository.name);
setIconImage(new ImageIcon(getClass().getResource("/gitblt-favicon.png")).getImage());
}
@@ -112,6 +114,10 @@
nameField = new JTextField(anRepository.name == null ? "" : anRepository.name, 35);
descriptionField = new JTextField(anRepository.description == null ? ""
: anRepository.description, 35);
+
+ JTextField originField = new JTextField(anRepository.origin == null ? ""
+ : anRepository.origin, 40);
+ originField.setEditable(false);
ownerField = new JComboBox();
@@ -142,6 +148,7 @@
JPanel fieldsPanel = new JPanel(new GridLayout(0, 1));
fieldsPanel.add(newFieldPanel(Translation.get("gb.name"), nameField));
fieldsPanel.add(newFieldPanel(Translation.get("gb.description"), descriptionField));
+ fieldsPanel.add(newFieldPanel(Translation.get("gb.origin"), originField));
fieldsPanel.add(newFieldPanel(Translation.get("gb.owner"), ownerField));
fieldsPanel.add(newFieldPanel(Translation.get("gb.enableTickets"), useTickets));
@@ -166,10 +173,10 @@
federationPanel.add(newFieldPanel(Translation.get("gb.federationSets"), setsPalette),
BorderLayout.CENTER);
- JPanel panel = new JPanel(new BorderLayout(5, 5));
- panel.add(fieldsPanel, BorderLayout.NORTH);
- panel.add(accessPanel, BorderLayout.CENTER);
- panel.add(federationPanel, BorderLayout.SOUTH);
+ JTabbedPane panel = new JTabbedPane(JTabbedPane.TOP);
+ panel.addTab(Translation.get("gb.general"), fieldsPanel);
+ panel.addTab(Translation.get("gb.accessRestriction"), accessPanel);
+ panel.addTab(Translation.get("gb.federation"), federationPanel);
JButton createButton = new JButton(Translation.get("gb.save"));
createButton.addActionListener(new ActionListener() {
diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties
index c7ee6ce..9702e6c 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/com/gitblit/wicket/GitBlitWebApp.properties
@@ -154,4 +154,5 @@
gb.size = size
gb.downloading = downloading
gb.loading = loading
-gb.starting = starting
\ No newline at end of file
+gb.starting = starting
+gb.general = general
\ No newline at end of file
--
Gitblit v1.9.1