Changeset 274

Timestamp:

02/06/12 07:15:18 (3 months ago)

Author:

Guillaume Mazoyer <respawneral@…>

branch-nick:

gnome-split

bugs:

https://launchpad.net/bugs/892763 fixed

revision id:

respawneral@gmail.com-20120206061518-sm8ss69jwwefygbh

Message:

Fix assistant look.

Remove the assistant to replace it by one dialog and 2
assistants (one to split and another to merge files).
The dialog is shown in first to select the proper
assistant to use.

Files:

• src/org/gnome/split/gtk/dialog/AssistantDialog.java (added)
• src/org/gnome/split/gtk/widget/assistant/BasicAssistant.java (added)
• src/org/gnome/split/gtk/widget/assistant/MergeAssistant.java (added)
• src/org/gnome/split/gtk/widget/assistant/SplitAssistant.java (added)
• src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java (deleted)
• po/gnome-split.pot (modified) (7 diffs)
• src/org/gnome/split/gtk/action/AssistantAction.java (modified) (2 diffs)
• src/org/gnome/split/gtk/dialog/AboutSoftDialog.java (modified) (1 diff)
• src/org/gnome/split/gtk/dialog/ErrorDialog.java (modified) (1 diff)
• src/org/gnome/split/gtk/dialog/MinimizeDialog.java (modified) (1 diff)
• src/org/gnome/split/gtk/dialog/PreferencesDialog.java (modified) (27 diffs)
• src/org/gnome/split/gtk/dialog/QuestionDialog.java (modified) (1 diff)
• src/org/gnome/split/gtk/widget/assistant/FinalPage.java (modified) (3 diffs)
• src/org/gnome/split/gtk/widget/base/InfoHeader.java (modified) (2 diffs)
• src/org/gnome/split/gtk/widget/base/ProgressWidget.java (modified) (1 diff)

po/gnome-split.pot

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-04 06:06+0100\n"
+"POT-Creation-Date: 2012-02-06 06:46+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -392 +392 @@
 
 #: src/org/gnome/split/gtk/dialog/PreferencesDialog.java:148
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:111
+#: src/org/gnome/split/gtk/dialog/AssistantDialog.java:66
 msgid "Assistant"
 msgstr ""
 
 #: src/org/gnome/split/gtk/dialog/PreferencesDialog.java:158
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:265
+#: src/org/gnome/split/gtk/dialog/AssistantDialog.java:96
 msgid "_Show the assistant on start"
 msgstr ""
@@ -530 +530 @@
 msgstr ""
 
+#: src/org/gnome/split/gtk/dialog/AssistantDialog.java:74
+msgid "What do you want to do?"
+msgstr ""
+
+#: src/org/gnome/split/gtk/dialog/AssistantDialog.java:88
+msgid "Split a file"
+msgstr ""
+
+#: src/org/gnome/split/gtk/dialog/AssistantDialog.java:89
+msgid "Merge several files"
+msgstr ""
+
 #: src/org/gnome/split/gtk/DefaultEngineListener.java:159
 #, java-format
@@ -588 +600 @@
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:221
-msgid "What do you want to do?"
-msgstr ""
-
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:233
-msgid "Split a file"
-msgstr ""
-
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:234
-msgid "Merge several files"
-msgstr ""
-
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:282
-msgid "Action selection"
-msgstr ""
-
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:292
+#: src/org/gnome/split/gtk/widget/assistant/MergeAssistant.java:56
+msgid "Merge assistant"
+msgstr ""
+
+#: src/org/gnome/split/gtk/widget/assistant/MergeAssistant.java:73
+msgid "Select the first file to merge."
+msgstr ""
+
+#: src/org/gnome/split/gtk/widget/assistant/MergeAssistant.java:79
+#: src/org/gnome/split/gtk/widget/MergeWidget.java:123
+msgid "Valid chunks"
+msgstr ""
+
+#: src/org/gnome/split/gtk/widget/assistant/MergeAssistant.java:86
+#: src/org/gnome/split/gtk/widget/assistant/SplitAssistant.java:261
+msgid "Select a file."
+msgstr ""
+
+#: src/org/gnome/split/gtk/widget/assistant/MergeAssistant.java:107
+#: src/org/gnome/split/gtk/widget/assistant/SplitAssistant.java:280
+msgid "File selection"
+msgstr ""
+
+#: src/org/gnome/split/gtk/widget/assistant/MergeAssistant.java:115
+#: src/org/gnome/split/gtk/widget/assistant/SplitAssistant.java:288
 msgid ""
 "You can verify that all the data that have been collected are correct. If "
@@ -610 +630 @@
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:300
+#: src/org/gnome/split/gtk/widget/assistant/MergeAssistant.java:123
+#: src/org/gnome/split/gtk/widget/assistant/SplitAssistant.java:296
 msgid "Confirmation"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:312
-msgid "Select the file to split."
-msgstr ""
-
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:322
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:579
-msgid "File to split:"
-msgstr ""
-
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:326
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:513
-msgid "Select a file."
-msgstr ""
-
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:346
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:534
-msgid "File selection"
-msgstr ""
-
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:358
+#: src/org/gnome/split/gtk/widget/assistant/MergeAssistant.java:141
+msgid "First file to merge:"
+msgstr ""
+
+#: src/org/gnome/split/gtk/widget/assistant/SplitAssistant.java:80
+msgid "Split assistant"
+msgstr ""
+
+#: src/org/gnome/split/gtk/widget/assistant/SplitAssistant.java:127
 msgid ""
 "Select the maximal size for each chunk. You can let GNOME Split calculate "
@@ -639 +649 @@
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:400
+#: src/org/gnome/split/gtk/widget/assistant/SplitAssistant.java:169
 msgid ""
 "Invalid chunk size. The size must be lower than the size of the file to "
@@ -645 +655 @@
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:430
+#: src/org/gnome/split/gtk/widget/assistant/SplitAssistant.java:199
 msgid "Size selection"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:445
+#: src/org/gnome/split/gtk/widget/assistant/SplitAssistant.java:214
 msgid "The algorithm defines the way how the file will be split."
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:455
-msgid "Algorithm to use:"
-msgstr ""
-
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:480
+#: src/org/gnome/split/gtk/widget/assistant/SplitAssistant.java:245
 msgid "Algorithm selection"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:492
-msgid "Select the first file to merge."
-msgstr ""
-
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:502
-msgid "File to merge:"
-msgstr ""
-
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:506
-#: src/org/gnome/split/gtk/widget/MergeWidget.java:123
-msgid "Valid chunks"
-msgstr ""
-
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:573
-msgid "First file to merge:"
-msgstr ""
-
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:580
+#: src/org/gnome/split/gtk/widget/assistant/SplitAssistant.java:255
+msgid "Select the file to split."
+msgstr ""
+
+#: src/org/gnome/split/gtk/widget/assistant/SplitAssistant.java:314
+msgid "File to split:"
+msgstr ""
+
+#: src/org/gnome/split/gtk/widget/assistant/SplitAssistant.java:315
 msgid "Maximum size of a chunk:"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:581
+#: src/org/gnome/split/gtk/widget/assistant/SplitAssistant.java:316
 msgid "Algorithm of split:"
 msgstr ""

src/org/gnome/split/gtk/action/AssistantAction.java

@@ -23 +23 @@
 import org.gnome.gtk.Stock;
 import org.gnome.split.GnomeSplit;
-import org.gnome.split.gtk.widget.assistant.ActionAssistant;
+import org.gnome.split.gtk.dialog.AssistantDialog;
 
 import static org.freedesktop.bindings.Internationalization._;
@@ -40 +40 @@
     @Override
     public void onActivate(org.gnome.gtk.Action source) {
-        new ActionAssistant(this.getApplication()).showAll();
+        new AssistantDialog(this.getApplication()).present();
     }
 }

src/org/gnome/split/gtk/dialog/AboutSoftDialog.java

@@ -93 +93 @@
     public void onResponse(Dialog source, ResponseType response) {
         this.hide();
+        this.destroy();
     }
 }

src/org/gnome/split/gtk/dialog/ErrorDialog.java

@@ -82 +82 @@
         this.showAll();
     }
+
+    @Override
+    public void hide() {
+        super.hide();
+        this.destroy();
+    }
 }

src/org/gnome/split/gtk/dialog/MinimizeDialog.java

@@ -120 +120 @@
         // Hide the dialog
         this.hide();
+        this.destroy();
     }
 }

src/org/gnome/split/gtk/dialog/PreferencesDialog.java

@@ -112 +112 @@
      * Just create a label with 4 spaces in it for alignment reason.
      */
-    private Label createEmptyLabel() {
+    private static Label createEmptyLabel() {
         return new Label("    ");
     }
@@ -119 +119 @@
      * Create a label justified to the left and using bold font.
      */
-    private Label createSectionLabel(String text) {
+    private static Label createSectionLabel(String text) {
         // Create the label
         final Label label = new Label("<b>" + text + "</b>");
@@ -146 +146 @@
 
         // Add the label
-        first.packStart(this.createSectionLabel(_("Assistant")), false, false, 0);
+        first.packStart(createSectionLabel(_("Assistant")), false, false, 0);
 
         // Add the row of options
@@ -153 +153 @@
 
         // Add an empty label
-        firstRow.packStart(this.createEmptyLabel(), false, false, 0);
+        firstRow.packStart(createEmptyLabel(), false, false, 0);
 
         // Add the option
@@ -173 +173 @@
 
         // Add the label
-        second.packStart(this.createSectionLabel(_("Program run")), false, false, 0);
+        second.packStart(createSectionLabel(_("Program run")), false, false, 0);
 
         // Add the row of options
@@ -180 +180 @@
 
         // Add an empty label
-        secondRow.packStart(this.createEmptyLabel(), false, false, 0);
+        secondRow.packStart(createEmptyLabel(), false, false, 0);
 
         // Restore multiple instances status
@@ -216 +216 @@
 
         // Add the label
-        first.packStart(this.createSectionLabel(_("Default view")), false, false, 0);
+        first.packStart(createSectionLabel(_("Default view")), false, false, 0);
 
         // Add the row of options
@@ -223 +223 @@
 
         // Add an empty label
-        firstRow.packStart(this.createEmptyLabel(), false, false, 0);
+        firstRow.packStart(createEmptyLabel(), false, false, 0);
 
         // Pack the options
@@ -264 +264 @@
 
         // Add the label
-        second.packStart(this.createSectionLabel(_("Size of the main window")), false, false, 0);
+        second.packStart(createSectionLabel(_("Size of the main window")), false, false, 0);
 
         // Add the row of options
@@ -271 +271 @@
 
         // Add an empty label
-        secondRow.packStart(this.createEmptyLabel(), false, false, 0);
+        secondRow.packStart(createEmptyLabel(), false, false, 0);
 
         // Add a box to pack widgets to change the size
@@ -399 +399 @@
 
         // Add the label
-        first.packStart(this.createSectionLabel(_("During a split")), false, false, 0);
+        first.packStart(createSectionLabel(_("During a split")), false, false, 0);
 
         // Add the row of option
@@ -406 +406 @@
 
         // Add an empty label
-        firstRow.packStart(this.createEmptyLabel(), false, false, 0);
+        firstRow.packStart(createEmptyLabel(), false, false, 0);
 
         final CheckButton md5sum = new CheckButton(_("_Calculate the MD5 sum if possible."));
@@ -425 +425 @@
 
         // Add the label
-        second.packStart(this.createSectionLabel(_("Default algorithm")), false, false, 0);
+        second.packStart(createSectionLabel(_("Default algorithm")), false, false, 0);
 
         // Add the row of option
@@ -432 +432 @@
 
         // Add an empty label
-        secondRow.packStart(this.createEmptyLabel(), false, false, 0);
+        secondRow.packStart(createEmptyLabel(), false, false, 0);
 
         // Algorithm list
@@ -458 +458 @@
 
         // Add the label
-        third.packStart(this.createSectionLabel(_("Default directory")), false, false, 0);
+        third.packStart(createSectionLabel(_("Default directory")), false, false, 0);
 
         // Add the row of option
@@ -465 +465 @@
 
         // Add an empty label
-        thirdRow.packStart(this.createEmptyLabel(), false, false, 0);
+        thirdRow.packStart(createEmptyLabel(), false, false, 0);
 
         // Default directory button
@@ -496 +496 @@
 
         // Add the label
-        first.packStart(this.createSectionLabel(_("During a merge")), false, false, 0);
+        first.packStart(createSectionLabel(_("During a merge")), false, false, 0);
 
         // Add the row of options
@@ -503 +503 @@
 
         // Add an empty label
-        firstRow.packStart(this.createEmptyLabel(), false, false, 0);
+        firstRow.packStart(createEmptyLabel(), false, false, 0);
 
         // Box for check buttons
@@ -535 +535 @@
 
         // Add the label
-        second.packStart(this.createSectionLabel(_("After a merge")), false, false, 0);
+        second.packStart(createSectionLabel(_("After a merge")), false, false, 0);
 
         // Add the row of options
@@ -542 +542 @@
 
         // Add an empty label
-        secondRow.packStart(this.createEmptyLabel(), false, false, 0);
+        secondRow.packStart(createEmptyLabel(), false, false, 0);
 
         // Box for check buttons
@@ -579 +579 @@
 
         // Add the label
-        third.packStart(this.createSectionLabel(_("Default directory")), false, false, 0);
+        third.packStart(createSectionLabel(_("Default directory")), false, false, 0);
 
         // Add the row of option
@@ -586 +586 @@
 
         // Add an empty label
-        thirdRow.packStart(this.createEmptyLabel(), false, false, 0);
+        thirdRow.packStart(createEmptyLabel(), false, false, 0);
 
         // Default directory button
@@ -612 +612 @@
 
         // Add the label
-        first.packStart(this.createSectionLabel(_("Power management")), false, false, 0);
+        first.packStart(createSectionLabel(_("Power management")), false, false, 0);
 
         // Add the row of options
@@ -619 +619 @@
 
         // Add an empty label
-        firstRow.packStart(this.createEmptyLabel(), false, false, 0);
+        firstRow.packStart(createEmptyLabel(), false, false, 0);
 
         // Restore hibernation status
@@ -640 +640 @@
 
         // Add the label
-        second.packStart(this.createSectionLabel(_("Notification")), false, false, 0);
+        second.packStart(createSectionLabel(_("Notification")), false, false, 0);
 
         // Add the row of options
@@ -647 +647 @@
 
         // Add an empty label
-        secondRow.packStart(this.createEmptyLabel(), false, false, 0);
+        secondRow.packStart(createEmptyLabel(), false, false, 0);
 
         // Box to pack buttons
@@ -717 +717 @@
         // Hide the dialog
         this.hide();
+        this.destroy();
     }
 }

src/org/gnome/split/gtk/dialog/QuestionDialog.java

@@ -74 +74 @@
         return (response == ResponseType.YES);
     }
+
+    @Override
+    public void hide() {
+        super.hide();
+        this.destroy();
+    }
 }

src/org/gnome/split/gtk/widget/assistant/FinalPage.java

@@ -46 +46 @@
 
         // Add the label
-        this.packStart(ActionAssistant.createLeftAlignedLabel(data), false, false, 0);
+        this.packStart(BasicAssistant.createLeftAlignedLabel(data), false, false, 0);
     }
 
@@ -77 +77 @@
     {
         /**
-         * A group to use the same size for several widgets.
+         * A group to use the same size for all fields.
          */
-        private SizeGroup group;
+        private SizeGroup fieldsGroup;
+
+        /**
+         * A group to use the same size for all values.
+         */
+        private SizeGroup valuesGroup;
 
         private ConclusionWidget() {
             super(false, 3);
-            this.group = new SizeGroup(SizeGroupMode.BOTH);
+            this.fieldsGroup = new SizeGroup(SizeGroupMode.HORIZONTAL);
+            this.valuesGroup = new SizeGroup(SizeGroupMode.HORIZONTAL);
         }
 
@@ -96 +102 @@
 
                 // Add a field name
-                final Label label = ActionAssistant.createLeftAlignedLabel(fields[b]);
-                box.packStart(label, false, false, 0);
-                group.add(label);
+                final Label field = BasicAssistant.createLeftAlignedLabel(fields[b]);
+                box.packStart(field, false, false, 0);
+                fieldsGroup.add(field);
 
                 // Add a field value
-                box.packStart(ActionAssistant.createLeftAlignedLabel(values[b]), false, false, 0);
+                final Label value = BasicAssistant.createLeftAlignedLabel(values[b]);
+                box.packStart(value, false, false, 0);
+                valuesGroup.add(value);
             }
         }

src/org/gnome/split/gtk/widget/base/InfoHeader.java

@@ -116 +116 @@
         // Just hide the info bar
         this.hide();
+        this.destroy();
     }
 
@@ -123 +124 @@
             // Just hide the info bar
             this.hide();
+            this.destroy();
         }
     }

src/org/gnome/split/gtk/widget/base/ProgressWidget.java

@@ -48 +48 @@
         // Show the text in the progress bar
         progress.setShowText(true);
+        this.setText("");
     }