← Back to team overview

gnome-split-team team mailing list archive

  1. gnome-split-team team
  2. Mailing list archive
  3. Message #00153

[Branch ~respawneral/gnome-split/mainline] Rev 264: Logo of the assistant.

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 264
committer: Guillaume Mazoyer <respawneral@xxxxxxxxx>
branch nick: assistant-fix
timestamp: Sun 2011-08-14 23:40:20 +0200
message:
  Logo of the assistant.
  
  Use the same logo (the GNOME Split logo) in every
  pages of the assistant. It looks better like that.
modified:
  po/gnome-split.pot
  src/org/gnome/split/gtk/widget/assistant/ActionAssistant.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 'po/gnome-split.pot'
--- po/gnome-split.pot	2011-08-07 12:57:40 +0000
+++ po/gnome-split.pot	2011-08-14 21:40:20 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-07 14:57+0200\n"
+"POT-Creation-Date: 2011-08-14 23:38+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -391,12 +391,12 @@
 msgstr ""
 
 #: src/org/gnome/split/gtk/dialog/PreferencesDialog.java:148
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:117
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:110
 msgid "Assistant"
 msgstr ""
 
 #: src/org/gnome/split/gtk/dialog/PreferencesDialog.java:158
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:271
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:264
 msgid "_Show the assistant on start"
 msgstr ""
 
@@ -587,101 +587,101 @@
 msgid "View:"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:227
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:220
 msgid "What do you want to do?"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:239
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:232
 msgid "Split a file"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:240
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:233
 msgid "Merge several files"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:288
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:281
 msgid "Action selection"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:298
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:291
 msgid ""
 "You can verify that all the data that have been collected are correct. If "
 "they are not, you can go back to a previous step to change them."
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:306
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:299
 msgid "Confirmation"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:317
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:311
 msgid "Select the file to split."
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:327
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:591
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:321
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:573
 msgid "File to split:"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:331
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:518
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:325
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:512
 msgid "Select a file."
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:351
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:539
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:345
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:533
 msgid "File selection"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:363
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:357
 msgid ""
 "Select the maximal size for each chunk. You can let GNOME Split calculate "
 "the size by giving the number of chunks to create."
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:405
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:399
 msgid ""
 "Invalid chunk size. The size must be lower than the size of the file to "
 "split."
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:435
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:429
 msgid "Size selection"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:450
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:444
 msgid "The algorithm defines the way how the file will be split."
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:460
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:454
 msgid "Algorithm to use:"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:485
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:479
 msgid "Algorithm selection"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:497
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:491
 msgid "Select the first file to merge."
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:507
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:501
 msgid "File to merge:"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:511
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:505
 #: src/org/gnome/split/gtk/widget/MergeWidget.java:123
 msgid "Valid chunks"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:585
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:567
 msgid "First file to merge:"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:592
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:574
 msgid "Maximum size of a chunk:"
 msgstr ""
 
-#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:593
+#: src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java:575
 msgid "Algorithm of split:"
 msgstr ""
 

=== modified file 'src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java'
--- src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java	2011-06-28 12:37:26 +0000
+++ src/org/gnome/split/gtk/widget/assistant/ActionAssistant.java	2011-08-14 21:40:20 +0000
@@ -22,7 +22,6 @@
 
 import java.io.File;
 
-import org.gnome.gdk.Pixbuf;
 import org.gnome.gtk.Assistant;
 import org.gnome.gtk.AssistantPageType;
 import org.gnome.gtk.Button;
@@ -32,7 +31,6 @@
 import org.gnome.gtk.FileChooserAction;
 import org.gnome.gtk.FileChooserButton;
 import org.gnome.gtk.FileFilter;
-import org.gnome.gtk.Gtk;
 import org.gnome.gtk.HBox;
 import org.gnome.gtk.IconSize;
 import org.gnome.gtk.Image;
@@ -80,11 +78,6 @@
     private FinalPage conclusion;
 
     /**
-     * The logo of this assistant.
-     */
-    private Pixbuf logo;
-
-    /**
      * The name of the file to split.
      */
     private String filename;
@@ -304,6 +297,7 @@
         this.appendPage(conclusion);
         this.setPageType(conclusion, AssistantPageType.CONFIRM);
         this.setPageTitle(conclusion, _("Confirmation"));
+        this.setPageHeaderImage(conclusion, Constants.PROGRAM_LOGO);
         this.setPageComplete(conclusion, true);
     }
 
@@ -349,7 +343,7 @@
         this.appendPage(page);
         this.setPageType(page, AssistantPageType.CONTENT);
         this.setPageTitle(page, _("File selection"));
-        this.setPageHeaderImage(page, logo);
+        this.setPageHeaderImage(page, Constants.PROGRAM_LOGO);
         this.setPageComplete(page, false);
     }
 
@@ -433,7 +427,7 @@
         this.appendPage(page);
         this.setPageType(page, AssistantPageType.CONTENT);
         this.setPageTitle(page, _("Size selection"));
-        this.setPageHeaderImage(page, logo);
+        this.setPageHeaderImage(page, Constants.PROGRAM_LOGO);
         this.setPageComplete(page, true);
     }
 
@@ -483,7 +477,7 @@
         this.appendPage(page);
         this.setPageType(page, AssistantPageType.CONTENT);
         this.setPageTitle(page, _("Algorithm selection"));
-        this.setPageHeaderImage(page, logo);
+        this.setPageHeaderImage(page, Constants.PROGRAM_LOGO);
         this.setPageComplete(page, true);
     }
 
@@ -537,7 +531,7 @@
         this.appendPage(page);
         this.setPageType(page, AssistantPageType.CONTENT);
         this.setPageTitle(page, _("File selection"));
-        this.setPageHeaderImage(page, logo);
+        this.setPageHeaderImage(page, Constants.PROGRAM_LOGO);
         this.setPageComplete(page, false);
     }
 
@@ -567,19 +561,7 @@
 
     @Override
     public void onPrepare(Assistant source, Widget widget) {
-        switch (source.getCurrentPage()) {
-        case 1:
-            if (type == 1) {
-                // Update the logo to use
-                logo = Gtk.renderIcon(this, Stock.PASTE, IconSize.DIALOG);
-            } else {
-                // Update the logo to use
-                logo = Gtk.renderIcon(this, Stock.CUT, IconSize.DIALOG);
-            }
-            this.setPageHeaderImage(conclusion, logo);
-            break;
-
-        case 5:
+        if (source.getCurrentPage() == 5) {
             if (type == 1) {
                 conclusion.setFields(new String[] {
                     _("First file to merge:")
@@ -597,7 +579,6 @@
                     Algorithm.toStrings()[algorithm]
                 });
             }
-            break;
         }
     }
  Thread Previous • Date Previous • • Thread Next