Changeset 205

Timestamp:

07/09/10 23:17:01 (2 months ago)

Author:

Guillaume Mazoyer <respawneral@…>

branch-nick:

gnome-split

revision id:

respawneral@gmail.com-20100709211701-yu510k5l5l8x3crz

Message:

More assistant changes.

Do not ask the user if he wants to start the
action after the assistant anymore. Now, the
action is automatically started after the end of
the assistant.

Files:

• po/gnome-split.pot (modified) (11 diffs)
• src/org/gnome/split/gtk/widget/ActionAssistant.java (modified) (6 diffs)

po/gnome-split.pot

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-09 14:25+0200\n"
+"POT-Creation-Date: 2010-07-09 23:16+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -516 +516 @@
 
 #: src/org/gnome/split/gtk/widget/SplitWidget.java:158
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:387
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:379
 msgid "Split in:"
 msgstr ""
@@ -533 +533 @@
 
 #: src/org/gnome/split/gtk/widget/MergeWidget.java:127
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:594
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:568
 msgid "Valid chunks"
 msgstr ""
@@ -577 +577 @@
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:127
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:120
 msgid "Assistant"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:196
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:188
 msgid "What do you want to do?"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:214
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:206
 msgid "Split a file"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:215
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:207
 msgid "Merge several files"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:248
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:240
 msgid "Action selection"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:260
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:252
 msgid ""
 "Here, you have to select the file to split. After that, you can go to the\n"
@@ -605 +605 @@
 msgstr ""
 
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:268
+msgid "File to split:"
+msgstr ""
+
 #: src/org/gnome/split/gtk/widget/ActionAssistant.java:276
-msgid "File to split:"
-msgstr ""
-
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:284
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:601
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:575
 msgid "Select a file."
 msgstr ""
 
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:311
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:611
+msgid "This file is a directory!"
+msgstr ""
+
 #: src/org/gnome/split/gtk/widget/ActionAssistant.java:319
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:637
-msgid "This file is a directory!"
-msgstr ""
-
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:327
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:645
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:619
 msgid "This file does not exist!"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:359
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:677
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:351
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:651
 msgid "File selection"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:371
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:363
 msgid ""
 "Now, you have to select the maximal size for each chunks. You can choose "
@@ -640 +640 @@
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:408
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:400
 msgid ""
 "Invalid chunk size. The size must be lower than the size of the file to "
@@ -646 +646 @@
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:455
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:447
 msgid "Size selection"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:470
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:462
 msgid ""
 "The algorithm of split defines the way the file will be splitted.\n"
@@ -665 +665 @@
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:486
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:478
 msgid "Algorithm to use:"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:509
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:501
 msgid "Algorithm selection"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:521
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:513
 msgid ""
 "Now, we are able to start to split the file you want. But please take a look "
@@ -682 +682 @@
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:539
-msgid ""
-"Just a last question before you confirm the split to do.\n"
-"If you check the following box, the split will start after your confirmation."
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:532
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:693
+msgid "Confirmation"
 msgstr ""
 
 #: src/org/gnome/split/gtk/widget/ActionAssistant.java:544
-msgid "Start the split after the confirmation."
-msgstr ""
-
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:558
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:737
-msgid "Confirmation"
-msgstr ""
-
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:570
 msgid ""
 "Here, you have to select the first file to merge. After that, you can go to "
@@ -706 +696 @@
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:586
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:560
 msgid "File to merge:"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:689
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:663
 msgid ""
 "The first file to merge is now selected. But you can still check that you "
@@ -718 +708 @@
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:709
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:683
 msgid "Filename:"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:718
-msgid ""
-"Just a last question before you confirm the merge to do.\n"
-"If you check the following box, the merge will start after your confirmation."
-msgstr ""
-
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:723
-msgid "Start the merge after the confirmation."
-msgstr ""
-
-#: src/org/gnome/split/gtk/widget/ActionAssistant.java:804
+#: src/org/gnome/split/gtk/widget/ActionAssistant.java:758
 #, java-format
 msgid ""

src/org/gnome/split/gtk/widget/ActionAssistant.java

@@ -31 +31 @@
 import org.gnome.gtk.Assistant.Prepare;
 import org.gnome.gtk.AssistantPageType;
-import org.gnome.gtk.Button;
 import org.gnome.gtk.ButtonBoxStyle;
-import org.gnome.gtk.CheckButton;
 import org.gnome.gtk.ComboBox;
 import org.gnome.gtk.Editable;
@@ -110 +108 @@
     private int algorithm;
 
-    /**
-     * To know if we should start the action.
-     */
-    private boolean start;
-
     public ActionAssistant(final GnomeSplit app) {
         super();
@@ -135 +128 @@
         this.unit = 0;
         this.algorithm = 0;
-        this.start = false;
 
         // Add introduction
@@ -535 +527 @@
         page.container.packStart(label, false, false, 0);
 
-        // Last label and last question
-        final Label last = new Label(
-                _("Just a last question before you confirm the split to do.\nIf you check the following box, the split will start after your confirmation."));
-        last.setJustify(Justification.LEFT);
-        page.container.packStart(last, false, false, 0);
-
-        // Last question
-        final CheckButton startCheck = new CheckButton(_("Start the split after the confirmation."));
-        page.container.packStart(startCheck, false, false, 0);
-
-        // Connect the signal handler of the question
-        startCheck.connect(new Button.Clicked() {
-            @Override
-            public void onClicked(Button source) {
-                start = startCheck.getActive();
-            }
-        });
-
         // Setup the page in the assistant
         this.insertPage(page, 5);
@@ -714 +688 @@
         fileBox.packStart(label, false, false, 0);
 
-        // Last label and last question
-        final Label last = new Label(
-                _("Just a last question before you confirm the merge to do.\nIf you check the following box, the merge will start after your confirmation."));
-        last.setJustify(Justification.LEFT);
-        page.container.packStart(last, false, false, 0);
-
-        // Last question
-        final CheckButton startCheck = new CheckButton(_("Start the merge after the confirmation."));
-        page.container.packStart(startCheck, false, false, 0);
-
-        // Connect the signal handler of the question
-        startCheck.connect(new Button.Clicked() {
-            @Override
-            public void onClicked(Button source) {
-                start = startCheck.getActive();
-            }
-        });
-
         // Setup the page in the assistant
         this.insertPage(page, 3);
@@ -746 +702 @@
             this.updateWidget();
 
-            if (start) {
-                // Start the merge if requested
-                app.getActionManager().getAction(ActionId.START).emitActivate();
-            }
+            // Start the split/merge if requested
+            app.getActionManager().getAction(ActionId.START).emitActivate();
 
             // Then hide the assistant