gnome-split-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 255
committer: Guillaume Mazoyer <respawneral@xxxxxxxxx>
branch nick: java-gnome-4.0.20
timestamp: Fri 2011-05-06 18:13:51 +0200
message:
  Remove useless file selection widgets.
  
  Remove from UI entries that used to display the
  filenames of the file that was selected with the
  file choosers.
  
  Make the dimensions of all labels identical. Make
  the dimensions of all file choosers identical.
modified:
  src/org/gnome/split/gtk/widget/ActionWidget.java
  src/org/gnome/split/gtk/widget/MergeWidget.java
  src/org/gnome/split/gtk/widget/SplitWidget.java


--
lp:gnome-split
https://code.launchpad.net/~respawneral/gnome-split/mainline

Your team GNOME Split developers is subscribed to branch lp:gnome-split.
To unsubscribe from this branch go to https://code.launchpad.net/~respawneral/gnome-split/mainline/+edit-subscription

=== modified file 'src/org/gnome/split/gtk/widget/ActionWidget.java'
--- src/org/gnome/split/gtk/widget/ActionWidget.java	2011-01-04 12:56:24 +0000
+++ src/org/gnome/split/gtk/widget/ActionWidget.java	2011-05-06 16:13:51 +0000
@@ -20,6 +20,9 @@
  */
 package org.gnome.split.gtk.widget;
 
+import org.gnome.gtk.SizeGroup;
+import org.gnome.gtk.SizeGroupMode;
+
 /**
  * Interface which defines a model for action views.
  * 
@@ -28,6 +31,16 @@
 public interface ActionWidget
 {
     /**
+     * Group to make all labels of the interface identical.
+     */
+    final static SizeGroup labels = new SizeGroup(SizeGroupMode.BOTH);
+
+    /**
+     * Group to make all choosers of the interface identical.
+     */
+    final static SizeGroup choosers = new SizeGroup(SizeGroupMode.BOTH);
+
+    /**
      * Return whether or not the widget is visible.
      */
     public boolean isVisible();

=== modified file 'src/org/gnome/split/gtk/widget/MergeWidget.java'
--- src/org/gnome/split/gtk/widget/MergeWidget.java	2011-05-05 20:43:29 +0000
+++ src/org/gnome/split/gtk/widget/MergeWidget.java	2011-05-06 16:13:51 +0000
@@ -31,8 +31,6 @@
 import org.gnome.gtk.Frame;
 import org.gnome.gtk.HBox;
 import org.gnome.gtk.Label;
-import org.gnome.gtk.SizeGroup;
-import org.gnome.gtk.SizeGroupMode;
 import org.gnome.gtk.VBox;
 import org.gnome.gtk.Widget;
 import org.gnome.split.GnomeSplit;
@@ -61,11 +59,6 @@
     private boolean visible;
 
     /**
-     * The first file to merge.
-     */
-    private Entry fileEntry;
-
-    /**
      * Select a file using a {@link FileChooserWidget}.
      */
     private FileChooserButton fileChooser;
@@ -112,21 +105,18 @@
         // Set the border of the widget
         this.setBorderWidth(5);
 
-        // Secondary vertical box
-        final VBox secondary = new VBox(false, 5);
-        this.packStart(secondary, true, true, 0);
+        // Container vertical box
+        final VBox container = new VBox(false, 5);
+        this.packStart(container, true, true, 0);
 
         // First chunk row
         final HBox chunkRow = new HBox(false, 5);
-        secondary.packStart(chunkRow, true, true, 0);
+        container.packStart(chunkRow, true, true, 0);
 
         final Label fileLabel = new Label(_("First chunk:"));
         fileLabel.setAlignment(0.0f, 0.5f);
         chunkRow.packStart(fileLabel, false, false, 0);
 
-        fileEntry = new Entry();
-        chunkRow.packStart(fileEntry, true, true, 0);
-
         // Filter for the file chooser to limit the file choice
         final FileFilter all = new FileFilter(_("All files"));
         all.addPattern("*");
@@ -150,12 +140,11 @@
                 setFile(source.getFilename());
             }
         });
-        // table.attach(fileChooser, 2, 3, 0, 1);
-        chunkRow.packStart(fileChooser, false, false, 0);
+        chunkRow.packStart(fileChooser, true, true, 0);
 
         // Destination row
         final HBox destinationRow = new HBox(false, 5);
-        secondary.packStart(destinationRow, true, true, 0);
+        container.packStart(destinationRow, true, true, 0);
 
         final Label destinationLabel = new Label(_("Destination:"));
         destinationLabel.setAlignment(0.0f, 0.5f);
@@ -170,7 +159,7 @@
 
         // Parts info row
         final HBox partsRow = new HBox(false, 5);
-        secondary.packStart(partsRow, true, true, 0);
+        container.packStart(partsRow, true, true, 0);
 
         final Label partsLabel = new Label(_("Chunks:"));
         partsLabel.setAlignment(0.0f, 0.5f);
@@ -182,7 +171,7 @@
 
         // Size info row
         final HBox infoRow = new HBox(false, 5);
-        secondary.packStart(infoRow, true, true, 0);
+        container.packStart(infoRow, true, true, 0);
 
         final Label sizeLabel = new Label(_("Total size:"));
         sizeLabel.setAlignment(0.0f, 0.5f);
@@ -194,7 +183,7 @@
 
         // MD5 sum info row
         final HBox md5Row = new HBox(false, 5);
-        secondary.packStart(md5Row, true, true, 0);
+        container.packStart(md5Row, true, true, 0);
 
         final Label md5Label = new Label(_("MD5 sum:"));
         md5Label.setAlignment(0.0f, 0.5f);
@@ -205,22 +194,14 @@
         md5Row.packStart(md5sum, true, true, 0);
 
         // Make all labels the same size
-        final SizeGroup labels = new SizeGroup(SizeGroupMode.HORIZONTAL);
         labels.add(fileLabel);
         labels.add(destinationLabel);
         labels.add(partsLabel);
         labels.add(sizeLabel);
         labels.add(md5Label);
 
-        // Make all entries the same size
-        final SizeGroup entries = new SizeGroup(SizeGroupMode.HORIZONTAL);
-        entries.add(fileEntry);
-        entries.add(destEntry);
-
         // Make all choosers the same size
-        final SizeGroup choosers = new SizeGroup(SizeGroupMode.BOTH);
         choosers.add(fileChooser);
-        choosers.add(dirChooser);
     }
 
     /**
@@ -285,7 +266,7 @@
 
     @Override
     public boolean isFullyFilled() {
-        return (!fileEntry.getText().isEmpty() && !destEntry.getText().isEmpty());
+        return ((fileChooser.getFilename() != null) && !destEntry.getText().isEmpty());
     }
 
     @Override
@@ -299,7 +280,7 @@
     @Override
     public byte checkFileSystemPermission() {
         // Check permission
-        boolean read = new File(fileEntry.getText()).canRead();
+        boolean read = new File(fileChooser.getFilename()).canRead();
         boolean write = new File(dirChooser.getCurrentFolder()).canWrite();
 
         // Consider we can do everything
@@ -340,7 +321,6 @@
 
     @Override
     public void reset() {
-        fileEntry.setText("");
         fileChooser.setCurrentFolder(app.getConfig().MERGE_DIRECTORY);
         destEntry.setText("");
         dirChooser.setCurrentFolder(app.getConfig().MERGE_DIRECTORY);
@@ -367,7 +347,7 @@
 
     @Override
     public File getFile() {
-        return new File(fileEntry.getText());
+        return new File(fileChooser.getFilename());
     }
 
     @Override
@@ -401,7 +381,6 @@
             this.reset();
         } else {
             fileChooser.setFilename(filename);
-            fileEntry.setText(filename);
         }
     }
 }

=== modified file 'src/org/gnome/split/gtk/widget/SplitWidget.java'
--- src/org/gnome/split/gtk/widget/SplitWidget.java	2011-05-05 20:43:29 +0000
+++ src/org/gnome/split/gtk/widget/SplitWidget.java	2011-05-06 16:13:51 +0000
@@ -61,11 +61,6 @@
     private boolean visible;
 
     /**
-     * File to split.
-     */
-    private Entry fileEntry;
-
-    /**
      * Select a file using a {@link FileChooserWidget}.
      */
     private FileChooserButton fileChooser;
@@ -110,31 +105,9 @@
         final HBox firstRow = new HBox(false, 5);
         this.packStart(firstRow, true, true, 0);
 
-        // Pack all Labels in the same box
-        final VBox labelColumn = new VBox(false, 5);
-        firstRow.packStart(labelColumn, false, false, 0);
-
         final Label fileLabel = new Label(_("File:"));
         fileLabel.setAlignment(0.0f, 0.5f);
-        labelColumn.packStart(fileLabel, true, true, 0);
-
-        final Label destinationLabel = new Label(_("Destination:"));
-        destinationLabel.setAlignment(0.0f, 0.5f);
-        labelColumn.packStart(destinationLabel, true, true, 0);
-
-        // Pack all Entrys in the same box
-        final VBox entryColumn = new VBox(false, 5);
-        firstRow.packStart(entryColumn, true, true, 0);
-
-        fileEntry = new Entry();
-        entryColumn.packStart(fileEntry, true, true, 0);
-
-        destinationEntry = new Entry();
-        entryColumn.packStart(destinationEntry, true, true, 0);
-
-        // Pack all choosers in the same box
-        final VBox chooserColumn = new VBox(false, 5);
-        firstRow.packStart(chooserColumn, false, false, 0);
+        firstRow.packStart(fileLabel, false, false, 0);
 
         fileChooser = new FileChooserButton(_("Choose a file."), FileChooserAction.OPEN);
         fileChooser.setCurrentFolder(app.getConfig().SPLIT_DIRECTORY);
@@ -144,11 +117,21 @@
                 setFile(source.getFilename());
             }
         });
-        chooserColumn.packStart(fileChooser, true, true, 0);
+        firstRow.packStart(fileChooser, true, true, 0);
+
+        final HBox secondRow = new HBox(false, 5);
+        this.packStart(secondRow, true, true, 0);
+
+        final Label destinationLabel = new Label(_("Destination:"));
+        destinationLabel.setAlignment(0.0f, 0.5f);
+        secondRow.packStart(destinationLabel, true, true, 0);
+
+        destinationEntry = new Entry();
+        secondRow.packStart(destinationEntry, true, true, 0);
 
         dirChooser = new FileChooserButton(_("Choose a directory."), FileChooserAction.SELECT_FOLDER);
         dirChooser.setCurrentFolder(app.getConfig().SPLIT_DIRECTORY);
-        chooserColumn.packStart(dirChooser, true, true, 0);
+        secondRow.packStart(dirChooser, true, true, 0);
 
         final HBox thirdRow = new HBox(false, 5);
         this.packStart(thirdRow, true, true, 0);
@@ -179,10 +162,17 @@
         algoList = new AlgorithmsBox(app);
         secondColumn.packStart(algoList, true, true, 0);
 
+        // Make all labels the same size
+        labels.add(fileLabel);
+        labels.add(destinationLabel);
+
+        // Make all choosers the same size
+        choosers.add(fileChooser);
+
         // Make the sizes of size and algorithm boxes equal
-        final SizeGroup group = new SizeGroup(SizeGroupMode.BOTH);
-        group.add(firstColumn);
-        group.add(secondColumn);
+        final SizeGroup boxes = new SizeGroup(SizeGroupMode.BOTH);
+        boxes.add(firstColumn);
+        boxes.add(secondColumn);
     }
 
     /**
@@ -224,12 +214,12 @@
 
     @Override
     public boolean isFullyFilled() {
-        return (!fileEntry.getText().isEmpty() && !destinationEntry.getText().isEmpty());
+        return ((fileChooser.getFilename() != null) && !destinationEntry.getText().isEmpty());
     }
 
     @Override
     public long checkFreeSpace() {
-        File file = new File(fileEntry.getText());
+        File file = new File(fileChooser.getFilename());
         long free = new File(dirChooser.getCurrentFolder()).getFreeSpace();
 
         return ((free >= file.length()) ? -1 : free);
@@ -238,7 +228,7 @@
     @Override
     public byte checkFileSystemPermission() {
         // Check permission
-        boolean read = new File(fileEntry.getText()).canRead();
+        boolean read = new File(fileChooser.getFilename()).canRead();
         boolean write = new File(dirChooser.getCurrentFolder()).canWrite();
 
         // Consider we can do everything
@@ -279,7 +269,6 @@
 
     @Override
     public void reset() {
-        fileEntry.setText("");
         fileChooser.setCurrentFolder(app.getConfig().SPLIT_DIRECTORY);
         destinationEntry.setText("");
         dirChooser.setCurrentFolder(app.getConfig().SPLIT_DIRECTORY);
@@ -306,7 +295,7 @@
 
     @Override
     public File getFile() {
-        return new File(fileEntry.getText());
+        return new File(fileChooser.getFilename());
     }
 
     @Override
@@ -369,7 +358,6 @@
 
         // Update entries
         fileChooser.setFilename(filename);
-        fileEntry.setText(filename);
         destinationEntry.setText(file);
     }