Changeset 18370 for gli/trunk/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.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/NewCollectionDetailsPrompt.java (modified) (8 diffs)

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

@@ -90 +90 @@
      */
     public NewCollectionDetailsPrompt() {
-    super(Gatherer.g_man, true);
+    super(Gatherer.g_man, true);        
     this.cancelled = true;
+        this.setComponentOrientation(Dictionary.getOrientation());
     this.self = this;
     // Setup
@@ -121 +122 @@
     // Creation
     JPanel content_pane = (JPanel) getContentPane();
+        content_pane.setComponentOrientation(Dictionary.getOrientation());
     content_pane.setOpaque(true);
     JPanel upper_pane = new JPanel();
+        upper_pane.setComponentOrientation(Dictionary.getOrientation());
     JLabel instructions_label = new JLabel(Dictionary.get("NewCollectionPrompt.Instructions"));
-    
+    instructions_label.setComponentOrientation(Dictionary.getOrientation());
+        
     JPanel title_pane = new JPanel();
+        title_pane.setComponentOrientation(Dictionary.getOrientation());
     JLabel title_label = new JLabel(Dictionary.get("CDM.General.Collection_Name"));
+        title_label.setComponentOrientation(Dictionary.getOrientation());
     title = new JTextField();
+        title.setComponentOrientation(Dictionary.getOrientation());
     title.setPreferredSize(COMPONENT_SIZE);
     title.setToolTipText(Dictionary.get("CDM.General.Collection_Name_Tooltip"));
     JLabel name_label = new JLabel(Dictionary.get("NewCollectionPrompt.Collection_Name"));
-    
+    name_label.setComponentOrientation(Dictionary.getOrientation());
+        
     JPanel center_pane = new JPanel();
+        center_pane.setComponentOrientation(Dictionary.getOrientation());
     JPanel description_pane = new JPanel();
+        description_pane.setComponentOrientation(Dictionary.getOrientation());
     JLabel description_label = new JLabel(Dictionary.get("NewCollectionPrompt.Collection_Description"));
+        description_label.setComponentOrientation(Dictionary.getOrientation());
     description = new JTextArea();
+        description.setComponentOrientation(Dictionary.getOrientation());
     description.setBackground(Configuration.getColor("coloring.editable_background", false));
     description.setForeground(Configuration.getColor("coloring.editable_foreground", false));
@@ -142 +154 @@
     
     JPanel bottom_pane = new JPanel();
+        bottom_pane.setComponentOrientation(Dictionary.getOrientation());
     // Base Collection
     JPanel base_collection_pane = new JPanel();
-    JLabel base_collection_label = new JLabel(Dictionary.get("NewCollectionPrompt.Base_Collection"));
-    base_collection = new JComboBox(base_collection_model);
+        base_collection_pane.setComponentOrientation(Dictionary.getOrientation());
+    
+        JLabel base_collection_label = new JLabel(Dictionary.get("NewCollectionPrompt.Base_Collection"));
+        base_collection_label.setComponentOrientation(Dictionary.getOrientation());
+    
+        base_collection = new JComboBox(base_collection_model);
+        base_collection.setComponentOrientation(Dictionary.getOrientation());    
     base_collection.setOpaque(false);
     base_collection.setToolTipText(Dictionary.get("NewCollectionPrompt.Base_Collection_Tooltip"));
     
     JPanel collection_scope_pane = new JPanel();
-    personal_collection_button = new JRadioButton(Dictionary.get("NewCollectionPrompt.Collection_Scope_Personal"));
+        collection_scope_pane.setComponentOrientation(Dictionary.getOrientation());
+    
+        personal_collection_button = new JRadioButton(Dictionary.get("NewCollectionPrompt.Collection_Scope_Personal"));
         personal_collection_button.setToolTipText(Dictionary.get("NewCollectionPrompt.Collection_Scope_Personal_Tooltip"));
     personal_collection_button.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
     personal_collection_button.setOpaque(false);
-    JRadioButton shared_collection_button = new JRadioButton(Dictionary.get("NewCollectionPrompt.Collection_Scope_Shared"));
+        personal_collection_button.setComponentOrientation(Dictionary.getOrientation());
+    
+        JRadioButton shared_collection_button = new JRadioButton(Dictionary.get("NewCollectionPrompt.Collection_Scope_Shared"));        
     shared_collection_button.setToolTipText(Dictionary.get("NewCollectionPrompt.Collection_Scope_Shared_Tooltip")); 
     shared_collection_button.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
     shared_collection_button.setOpaque(false);
-    ButtonGroup collection_scope_group = new ButtonGroup();
+        shared_collection_button.setComponentOrientation(Dictionary.getOrientation());
+    
+        ButtonGroup collection_scope_group = new ButtonGroup();
     collection_scope_group.add(personal_collection_button);
     collection_scope_group.add(shared_collection_button);
@@ -164 +188 @@
 
     JPanel button_pane = new JPanel();
+        button_pane.setComponentOrientation(Dictionary.getOrientation());
     create_button = new GLIButton(Dictionary.get("General.OK"), Dictionary.get("General.OK_Tooltip"));
     JButton cancel_button = new GLIButton(Dictionary.get("General.Cancel"), Dictionary.get("General.Cancel_Tooltip"));
@@ -174 +199 @@
     // Layout
     title_pane.setLayout(new BorderLayout(5,0));
-    title_pane.add(title_label, BorderLayout.WEST);
+    title_pane.add(title_label, BorderLayout.LINE_START);
     title_pane.add(title, BorderLayout.CENTER);
 
@@ -181 +206 @@
     upper_pane.add(title_pane);
 
+        JScrollPane scrol_tmp;
+        
     description_pane.setLayout(new BorderLayout());
-    description_pane.add(description_label, BorderLayout.NORTH);
-    description_pane.add(new JScrollPane(description), BorderLayout.CENTER);
+    description_pane.add(description_label, BorderLayout.NORTH);        
+        scrol_tmp=new JScrollPane(description);
+        scrol_tmp.setComponentOrientation(Dictionary.getOrientation());
+    description_pane.add(scrol_tmp, BorderLayout.CENTER);
 
     base_collection_pane.setLayout(new BorderLayout(5,0));
-    base_collection_pane.add(base_collection_label, BorderLayout.WEST);
+    base_collection_pane.add(base_collection_label, BorderLayout.LINE_START);
     base_collection_pane.add(base_collection, BorderLayout.CENTER);
 
@@ -342 +371 @@
         if(title_final.length() == 0) {
         JOptionPane jOptionPane=new JOptionPane();
+                jOptionPane.setComponentOrientation(Dictionary.getOrientation());
         jOptionPane.setOpaque(!Utility.isMac());
         jOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("NewCollectionPrompt.Title_Error"), Dictionary.get("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
@@ -350 +380 @@
         if(titleClashes(title_final, null)) {
             JOptionPane jOptionPane=new JOptionPane();
+                    jOptionPane.setComponentOrientation(Dictionary.getOrientation());
             jOptionPane.setOpaque(!Utility.isMac());
             if (jOptionPane.showConfirmDialog(Gatherer.g_man, Dictionary.get("NewCollectionPrompt.Title_Clash"), Dictionary.get("General.Warning"), JOptionPane.YES_NO_OPTION) == JOptionPane.NO_OPTION) {