From bcc616b8e425f73e7abc6799f23445c1e411463d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 14 Oct 2011 17:05:23 -0400
Subject: [PATCH] Rpc Client create/edit user and repository now fully functional.
---
src/com/gitblit/client/GitblitClient.java | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/src/com/gitblit/client/GitblitClient.java b/src/com/gitblit/client/GitblitClient.java
index 51d8e7e..d66fdea 100644
--- a/src/com/gitblit/client/GitblitClient.java
+++ b/src/com/gitblit/client/GitblitClient.java
@@ -18,6 +18,7 @@
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.EventQueue;
+import java.awt.Font;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -92,11 +93,11 @@
private JMenuBar setupMenu() {
JMenuBar menuBar = new JMenuBar();
- JMenu serversMenu = new JMenu("Servers");
+ JMenu serversMenu = new JMenu(Translation.get("gb.servers"));
menuBar.add(serversMenu);
- recentMenu = new JMenu("Recent");
+ recentMenu = new JMenu(Translation.get("gb.recent"));
serversMenu.add(recentMenu);
- JMenuItem login = new JMenuItem("Login...");
+ JMenuItem login = new JMenuItem(Translation.get("gb.login") + "...");
login.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_L, KeyEvent.CTRL_DOWN_MASK, false));
login.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent event) {
@@ -109,6 +110,7 @@
private JPanel newLabelPanel(String text, JTextField field) {
JLabel label = new JLabel(text);
+ label.setFont(label.getFont().deriveFont(Font.BOLD));
label.setPreferredSize(new Dimension(75, 10));
JPanel jpanel = new JPanel(new BorderLayout());
jpanel.add(label, BorderLayout.WEST);
@@ -132,13 +134,13 @@
JPasswordField passwordField = new JPasswordField(new String(reg.password));
JPanel panel = new JPanel(new GridLayout(0, 1, 5, 5));
- panel.add(newLabelPanel("name", nameField));
- panel.add(newLabelPanel("url", urlField));
- panel.add(newLabelPanel("account", accountField));
- panel.add(newLabelPanel("password", passwordField));
+ panel.add(newLabelPanel(Translation.get("gb.name"), nameField));
+ panel.add(newLabelPanel(Translation.get("gb.url"), urlField));
+ panel.add(newLabelPanel(Translation.get("gb.username"), accountField));
+ panel.add(newLabelPanel(Translation.get("gb.password"), passwordField));
- int result = JOptionPane.showConfirmDialog(GitblitClient.this, panel, "Login",
- JOptionPane.OK_CANCEL_OPTION);
+ int result = JOptionPane.showConfirmDialog(GitblitClient.this, panel,
+ Translation.get("gb.login"), JOptionPane.OK_CANCEL_OPTION);
if (result != JOptionPane.OK_OPTION) {
return false;
}
@@ -148,13 +150,13 @@
}
reg = new GitblitRegistration(nameField.getText(), url, accountField.getText(),
passwordField.getPassword());
- login(reg);
+ boolean success = login(reg);
registrations.add(0, reg);
rebuildRecentMenu();
- return true;
+ return success;
}
- private void login(GitblitRegistration reg) {
+ private boolean login(GitblitRegistration reg) {
try {
GitblitPanel panel = new GitblitPanel(reg);
panel.login();
@@ -163,10 +165,12 @@
serverTabs.setSelectedIndex(idx);
serverTabs.setTabComponentAt(idx, new ClosableTabComponent(reg.name, null, serverTabs,
panel));
+ return true;
} catch (IOException e) {
- JOptionPane.showMessageDialog(GitblitClient.this, e.getMessage(), "Error",
- JOptionPane.ERROR_MESSAGE);
+ JOptionPane.showMessageDialog(GitblitClient.this, e.getMessage(),
+ Translation.get("gb.error"), JOptionPane.ERROR_MESSAGE);
}
+ return false;
}
private void rebuildRecentMenu() {
--
Gitblit v1.9.1