← Back to team overview

usb-creator-hackers team mailing list archive

[Merge] lp:~ldunn/usb-creator/usb-creator-fix-645818 into lp:usb-creator

 

Liam Dunn has proposed merging lp:~ldunn/usb-creator/usb-creator-fix-645818 into lp:usb-creator.

Requested reviews:
  usb-creator hackers (usb-creator-hackers)
Related bugs:
  #645818 10.04.1 image created in Maverick does not boot in my Dell Mini9
  https://bugs.launchpad.net/bugs/645818


Add a warning to notify users that they can not create USB images for 10.04, as per LP: #645818
-- 
https://code.launchpad.net/~ldunn/usb-creator/usb-creator-fix-645818/+merge/36519
Your team usb-creator hackers is requested to review the proposed merge of lp:~ldunn/usb-creator/usb-creator-fix-645818 into lp:usb-creator.
=== modified file 'debian/changelog'
--- debian/changelog	2010-09-23 08:18:16 +0000
+++ debian/changelog	2010-09-24 00:28:40 +0000
@@ -1,3 +1,9 @@
+usb-creator (0.2.25ubuntu1) maverick; urgency=low
+
+  * Add a warning to warn users that creating USB images for Lucid will not work. (LP: #645818)
+
+ -- Liam Dunn <liam.dunn144@xxxxxxxxx>  Fri, 24 Sep 2010 10:16:11 +1000
+
 usb-creator (0.2.25) maverick; urgency=low
 
   * Grow support for installing GRUB to USB sticks if it's detected in the image

=== modified file 'gui/usbcreator-gtk.ui'
--- gui/usbcreator-gtk.ui	2010-06-02 03:49:59 +0000
+++ gui/usbcreator-gtk.ui	2010-09-24 00:28:40 +0000
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 2.12 -->
   <!-- interface-naming-policy toplevel-contextual -->
@@ -19,14 +19,15 @@
           <object class="GtkVBox" id="main_vbox">
             <property name="visible">True</property>
             <property name="border_width">12</property>
-            <property name="orientation">vertical</property>
             <property name="spacing">18</property>
             <child>
               <object class="GtkLabel" id="intro_label">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
                 <property name="yalign">0</property>
-                <property name="label" translatable="yes">To try or install Ubuntu from a removable disk, it needs to be set up as a startup disk.</property>
+                <property name="label" translatable="yes">To try or install Ubuntu from a removable disk, it needs to be set up as a startup disk.
+
+WARNING: This program is currently unable to create USB disks for Ubuntu 10.04</property>
                 <property name="wrap">True</property>
                 <property name="selectable">True</property>
               </object>
@@ -38,7 +39,6 @@
             <child>
               <object class="GtkVBox" id="source_vbox">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkHBox" id="hbox4">
@@ -125,7 +125,6 @@
             <child>
               <object class="GtkVBox" id="target_vbox">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkHBox" id="hbox5">
@@ -231,7 +230,6 @@
             <child>
               <object class="GtkVBox" id="persist_vbox">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label4">
@@ -252,12 +250,10 @@
                     <child>
                       <object class="GtkVBox" id="vbox2">
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
                         <property name="spacing">12</property>
                         <child>
                           <object class="GtkVBox" id="persist_enabled_vbox">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
                             <property name="spacing">3</property>
                             <child>
                               <object class="GtkRadioButton" id="persist_enabled">
@@ -424,7 +420,6 @@
     <child>
       <object class="GtkVBox" id="vbox35">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkLabel" id="progress_title">
@@ -507,7 +502,6 @@
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox10">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
           <object class="GtkHBox" id="hbox27">
             <property name="visible">True</property>
@@ -615,7 +609,6 @@
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox3">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
           <object class="GtkHBox" id="hbox9">
             <property name="visible">True</property>
@@ -706,7 +699,6 @@
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox5">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
         <child>
           <object class="GtkHBox" id="hbox10">
             <property name="visible">True</property>

=== modified file 'gui/usbcreator-kde.ui'
--- gui/usbcreator-kde.ui	2010-05-17 18:18:03 +0000
+++ gui/usbcreator-kde.ui	2010-09-24 00:28:40 +0000
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>459</width>
-    <height>397</height>
+    <width>575</width>
+    <height>488</height>
    </rect>
   </property>
   <property name="maximumSize">
@@ -23,7 +23,9 @@
    <item row="0" column="0">
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>To try or install Ubuntu from a removable disk, it needs to be set up as a startup disk.</string>
+      <string>To try or install Ubuntu from a removable disk, it needs to be set up as a startup disk.
+
+WARNING: This program is currently unable to create USB disks for Ubuntu 10.04</string>
      </property>
     </widget>
    </item>
@@ -122,11 +124,11 @@
     </widget>
    </item>
    <item row="6" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0">
+    <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0">
      <item>
       <widget class="QLabel" name="ui_dest_status">
        <property name="text">
-        <string></string>
+        <string/>
        </property>
       </widget>
      </item>