Changeset 18370 for gli/trunk/src/org/greenstone/gatherer/gui/AboutDialog.java

Timestamp:

2009-01-12T13:04:29+13:00 (15 years ago)

Author:

kjdon

Message:

committed code submitted by Amin Hedjazi for making the GLI right to left. I worked on this code on the rtl-gli branch, then merged the branch back to the trunk at revision 18368. The branch code was slightly different in a couple of places where it shouldn't have been. So don't use the branch code next time. Start a new branch.

File:

• gli/trunk/src/org/greenstone/gatherer/gui/AboutDialog.java (modified) (3 diffs)

gli/trunk/src/org/greenstone/gatherer/gui/AboutDialog.java

@@ -68 +68 @@
     this.self = this;
     setSize(SIZE);
-          
+        this.setComponentOrientation(Dictionary.getOrientation());        
     JPanel content_pane = (JPanel) getContentPane();
+        content_pane.setComponentOrientation(Dictionary.getOrientation());
+        
     JPanel upper_pane = new JPanel();
-
+        upper_pane.setComponentOrientation(Dictionary.getOrientation());
+        
     String gmedium_image = "gatherer_medium.gif";
     if (Configuration.fedora_info.isActive()) {
@@ -80 +83 @@
     ImageIcon scaled_icon = new ImageIcon(icon.getImage().getScaledInstance(ICON_SIZE, ICON_SIZE, Image.SCALE_DEFAULT));
     JLabel icon_label = new JLabel(scaled_icon);
-    JPanel title_pane = new JPanel();
-    JLabel title_one_label = new JLabel(Dictionary.get("AboutDialog.Title_One"));
-    JLabel title_two_label = new JLabel(Gatherer.PROGRAM_NAME + " " + Gatherer.PROGRAM_VERSION + " " + Dictionary.get("AboutDialog.Date"));
-    JLabel title_three_label = new JLabel(Dictionary.get("AboutDialog.Title_Two"));
-    JLabel copyright_label = new JLabel(Dictionary.get("AboutDialog.Copyright"));
-    JLabel gpl_label = new JLabel(Dictionary.get("AboutDialog.Copyright_Two"));
-    
+    icon_label.setComponentOrientation(Dictionary.getOrientation());
+        
+        JPanel title_pane = new JPanel();
+    title_pane.setComponentOrientation(Dictionary.getOrientation());
+        
+        JLabel title_one_label = new JLabel(Dictionary.get("AboutDialog.Title_One"));
+    title_one_label.setComponentOrientation(Dictionary.getOrientation());
+        JLabel title_two_label = new JLabel(Gatherer.PROGRAM_NAME + " " + Gatherer.PROGRAM_VERSION + " " + Dictionary.get("AboutDialog.Date"));
+        title_two_label.setComponentOrientation(Dictionary.getOrientation());
+        JLabel title_three_label = new JLabel(Dictionary.get("AboutDialog.Title_Two"));
+    title_three_label.setComponentOrientation(Dictionary.getOrientation());
+        JLabel copyright_label = new JLabel(Dictionary.get("AboutDialog.Copyright"));
+    copyright_label.setComponentOrientation(Dictionary.getOrientation());
+        JLabel gpl_label = new JLabel(Dictionary.get("AboutDialog.Copyright_Two"));
+        gpl_label.setComponentOrientation(Dictionary.getOrientation());
+        
     JTextArea text = new JTextArea();
+        text.setComponentOrientation(Dictionary.getOrientation());
     text.setLineWrap(true);
     text.setWrapStyleWord(true);
-
+        
+        
     JPanel button_pane = new JPanel();
+        button_pane.setComponentOrientation(Dictionary.getOrientation());
     close_button = new GLIButton(Dictionary.get("General.Close"), Dictionary.get("General.Close_Tooltip"));
     
@@ -109 +124 @@
     upper_pane.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
     upper_pane.setLayout(new BorderLayout());
-    upper_pane.add(icon_label, BorderLayout.WEST);
+    upper_pane.add(icon_label, BorderLayout.LINE_START);
     upper_pane.add(title_pane, BorderLayout.CENTER);
 
     button_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
     button_pane.setLayout(new BorderLayout());
-    button_pane.add(close_button, BorderLayout.EAST);
+    button_pane.add(close_button, BorderLayout.LINE_END);
 
     content_pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));