From fc42a53629eee92eb4155326841a270907640209 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 21 Oct 2011 17:48:48 -0400
Subject: [PATCH] Documentation and some .gitignore updates
---
src/com/gitblit/client/GitblitPanel.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/client/GitblitPanel.java b/src/com/gitblit/client/GitblitPanel.java
index 5e7cfe1..8635b00 100644
--- a/src/com/gitblit/client/GitblitPanel.java
+++ b/src/com/gitblit/client/GitblitPanel.java
@@ -52,6 +52,7 @@
import com.gitblit.Constants.RpcRequest;
import com.gitblit.client.ClosableTabComponent.CloseTabListener;
import com.gitblit.models.RepositoryModel;
+import com.gitblit.models.SettingModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.StringUtils;
@@ -116,7 +117,6 @@
tabs = new JTabbedPane(JTabbedPane.BOTTOM);
tabs.addTab(Translation.get("gb.repositories"), createRepositoriesPanel());
tabs.addTab(Translation.get("gb.users"), createUsersPanel());
- tabs.addTab(Translation.get("gb.federation"), new JPanel());
tabs.addTab(Translation.get("gb.settings"), createSettingsPanel());
setLayout(new BorderLayout());
@@ -214,10 +214,10 @@
}
}
});
-
+
repositoriesTable.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent e) {
- if (e.getClickCount() == 2) {
+ if (e.getClickCount() == 2 && gitblit.allowAdmin()) {
editRepository(getSelectedRepositories().get(0));
}
}
@@ -328,7 +328,7 @@
delUser.setEnabled(selected);
}
});
-
+
usersTable.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent e) {
if (e.getClickCount() == 2) {
@@ -380,9 +380,11 @@
}
private JPanel createSettingsPanel() {
+ final SettingPanel settingPanel = new SettingPanel();
settingsModel = new SettingsModel();
defaultSettingsSorter = new TableRowSorter<SettingsModel>(settingsModel);
settingsTable = Utils.newTable(settingsModel);
+ settingsTable.setDefaultRenderer(SettingModel.class, new SettingCellRenderer());
String name = settingsTable.getColumnName(UsersModel.Columns.Name.ordinal());
settingsTable.setRowHeight(nameRenderer.getFont().getSize() + 8);
settingsTable.getColumn(name).setCellRenderer(nameRenderer);
@@ -398,6 +400,14 @@
boolean selected = settingsTable.getSelectedRow() > -1;
boolean singleSelection = settingsTable.getSelectedRows().length == 1;
// TODO enable/disable setting buttons
+ if (singleSelection) {
+ int viewRow = settingsTable.getSelectedRow();
+ int modelRow = settingsTable.convertRowIndexToModel(viewRow);
+ SettingModel setting = settingsModel.get(modelRow);
+ settingPanel.setSetting(setting);
+ } else {
+ settingPanel.clear();
+ }
}
});
@@ -420,6 +430,7 @@
JPanel settingsTablePanel = new JPanel(new BorderLayout(margin, margin));
settingsTablePanel.add(settingFilterPanel, BorderLayout.NORTH);
settingsTablePanel.add(new JScrollPane(settingsTable), BorderLayout.CENTER);
+ settingsTablePanel.add(settingPanel, BorderLayout.SOUTH);
JPanel settingsControls = new JPanel(new FlowLayout(FlowLayout.CENTER, 5, 0));
// TODO update setting?
@@ -571,7 +582,7 @@
gitblit = null;
}
- protected void refreshRepositories() {
+ protected void refreshRepositories() {
GitblitWorker worker = new GitblitWorker(GitblitPanel.this, RpcRequest.LIST_REPOSITORIES) {
@Override
protected Boolean doRequest() throws IOException {
--
Gitblit v1.9.1