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

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

@@ -127 +127 @@
     this.group = new DragGroup();
     this.file_queue = Gatherer.f_man.getQueue();
-
+        this.setComponentOrientation(org.greenstone.gatherer.Dictionary.getOrientation());
     // Create components.
     stop_action = new GLIButton(Dictionary.get("Collection.Stop"), Dictionary.get("Collection.Stop_Tooltip"));
@@ -207 +207 @@
     workspace_pane.setPreferredSize(TREE_SIZE);
     workspace_pane.setSize(TREE_SIZE);
+        workspace_pane.setComponentOrientation(Dictionary.getOrientation());
 
     workspace_label = new JLabel(Dictionary.get("Collection.Workspace"));
@@ -212 +213 @@
     workspace_label.setBackground(Configuration.getColor("coloring.workspace_heading_background", false));
     workspace_label.setForeground(Configuration.getColor("coloring.workspace_heading_foreground", false));
-    
+    workspace_label.setComponentOrientation(Dictionary.getOrientation());
+        
     workspace_tree = new WorkspaceTree();
+        workspace_tree.setComponentOrientation(Dictionary.getOrientation());
     group.add(workspace_tree);
     workspace_scroll = new JScrollPane(workspace_tree);
+        workspace_scroll.setComponentOrientation(Dictionary.getOrientation());
     workspace_filter = workspace_tree.getFilter();
-
+        workspace_filter.setComponentOrientation(Dictionary.getOrientation()); 
+        
     card_layout = new CardLayout();
 
@@ -225 +230 @@
     collection_pane.setPreferredSize(TREE_SIZE);
     collection_pane.setSize(TREE_SIZE);
-
+        collection_pane.setComponentOrientation(Dictionary.getOrientation());
+        
     collection_label = new JLabel(Dictionary.get("Collection.Collection"));
     collection_label.setOpaque(true);
-    
+    collection_label.setComponentOrientation(Dictionary.getOrientation());
+        
     collection_tree = Gatherer.c_man.getCollectionTree();
     collection_tree.setEnabled(Gatherer.c_man.getCollectionTreeModel() != null);
@@ -235 +242 @@
 
     tree_pane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
-
+        tree_pane.setComponentOrientation(Dictionary.getOrientation());
     // No collection loaded pane
     JPanel no_collection_pane = new JPanel();
     no_collection_pane.setBackground(Color.lightGray);
-
+        no_collection_pane.setComponentOrientation(Dictionary.getOrientation());
+        
     JLabel no_collection_label = new JLabel(Dictionary.get("Collection.Collection"));
     no_collection_label.setBackground(Color.lightGray);
     no_collection_label.setForeground(Color.black);
     no_collection_label.setOpaque(true);
+        no_collection_label.setComponentOrientation(Dictionary.getOrientation());
     
     JPanel no_collection_loaded_panel = new JPanel();
     no_collection_loaded_panel.setBorder(BorderFactory.createLineBorder(Color.black));
     no_collection_loaded_panel.setBackground(Color.lightGray);
-
+        no_collection_loaded_panel.setComponentOrientation(Dictionary.getOrientation());
+        
     JLabel no_collection_loaded_label = new JLabel(Dictionary.get("Collection.No_Collection_Loaded"));
     no_collection_loaded_label.setHorizontalAlignment(JLabel.CENTER);
     no_collection_loaded_label.setVerticalAlignment(JLabel.CENTER);
-    
+    no_collection_loaded_label.setComponentOrientation(Dictionary.getOrientation());
+        
     // Status pane
     control_pane = new JPanel();
-
+        control_pane.setComponentOrientation(Dictionary.getOrientation());
+        
     JPanel inner_pane = new JPanel();
     inner_pane.setSize(STATUS_SIZE);
-
+        inner_pane.setComponentOrientation(Dictionary.getOrientation());
+        
     card_pane = new JPanel();
+        card_pane.setComponentOrientation(Dictionary.getOrientation());
+        
     JPanel file_pane = new JPanel();
+        file_pane.setComponentOrientation(Dictionary.getOrientation());
+        
     JPanel progress_pane = new JPanel();
+        progress_pane.setComponentOrientation(Dictionary.getOrientation());
+        
     JLabel file_status = file_queue.getFileStatus();
-
+        file_status.setComponentOrientation(Dictionary.getOrientation());
+        
     JProgressBar progress_bar = file_queue.getProgressBar();
-
+        progress_bar.setComponentOrientation(Dictionary.getOrientation());
+        
     JPanel button_pane = new JPanel();
-
+        button_pane.setComponentOrientation(Dictionary.getOrientation());
     RecycleBin recycle_bin = Gatherer.recycle_bin;
     recycle_bin.addActionListener(this);
@@ -295 +316 @@
     card_pane.add(collection_pane, COLLECTION_LOADED_CARD);
 
-    tree_pane.add(workspace_pane, JSplitPane.LEFT);
-    tree_pane.add(card_pane, JSplitPane.RIGHT);
+        if (Dictionary.getOrientation().isLeftToRight()){
+            tree_pane.add(workspace_pane, JSplitPane.LEFT);
+            tree_pane.add(card_pane, JSplitPane.RIGHT);
+        }else{
+            tree_pane.add(workspace_pane, JSplitPane.RIGHT);
+            tree_pane.add(card_pane, JSplitPane.LEFT);
+        }
+        
+        
     tree_pane.setDividerLocation(TREE_SIZE.width - 10);
 
@@ -302 +330 @@
     file_pane.setLayout(new BorderLayout());
     file_pane.add(file_status, BorderLayout.CENTER);
-    file_pane.add(stop_action, BorderLayout.EAST);
+    file_pane.add(stop_action, BorderLayout.LINE_END);
 
     progress_pane.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
@@ -318 +346 @@
     control_pane.setLayout(new BorderLayout());
     control_pane.add(inner_pane, BorderLayout.CENTER);
-    control_pane.add(button_pane, BorderLayout.EAST);
+    control_pane.add(button_pane, BorderLayout.LINE_END);
 
     this.setLayout(new BorderLayout());