This email list is read-only. Emails sent to this list will be discarded
----------------------------------
debian/changelog | 3 +-
default_config/defaults.cfg | 13 +-
gui/image-creator.glade | 8647 +++++++++++++++++++++++++++----------------
libs/InstallImage.py | 20 +-
libs/mic_cfg.py | 2 +-
moblin-image-creator.spec | 1 +
6 files changed, 5494 insertions(+), 3192 deletions(-)
New commits:
commit edf3d2274d225a47969ada2e56ecd4d4b3d44b58
Author: Mitsutaka Amano <[EMAIL PROTECTED]>
Date: Thu Oct 2 16:00:44 2008 +0900
Added welcome_message in the Target config.
Diff in this email is a maximum of 400 lines.
diff --git a/debian/changelog b/debian/changelog
index 0634f90..6c05810 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,8 +38,9 @@ moblin-image-creator (0.46) UNRELEASED; urgency=low
* Added the Target config function.
* Updated debian/changelog and rpm spec file.
* Updated ja.po.
+ * Added welcome_message in the Target config.
- -- Mitsutaka Amano <[EMAIL PROTECTED]> Thu, 02 Oct 2008 13:52:00 +0900
+ -- Mitsutaka Amano <[EMAIL PROTECTED]> Thu, 02 Oct 2008 15:59:19 +0900
moblin-image-creator (0.45) gaston; urgency=low
diff --git a/default_config/defaults.cfg b/default_config/defaults.cfg
index 0a860c2..4015895 100644
--- a/default_config/defaults.cfg
+++ b/default_config/defaults.cfg
@@ -46,7 +46,10 @@ buildroot_extras = squashfs-tools dosfstools syslinux
module-init-tools mtools g
buildroot_packages = initramfs-tools debhelper devscripts liburi-perl
kernel-package dpatch grub libncursesw5-dev libncurses5-dev man less vim
apt-utils libgtk2.0-dev ssh automake autotools-dev build-essential
gtk-doc-tools dh-make hildon-desktop libhildon-1-dev libhildonfm2-dev
hildon-desktop-dev
# Target configurations
-target_configs = usb_kernel_cmdline usb_ext3fs_size hd_kernel_cmdline
hd_swap_option hd_use_squashfs hd_swap_partition_size hd_boot_partition_size
hd_fat32_partition_size cd_kernel_cmdline nand_kernel_cmdline nand_image_size
+target_configs = welcome_message usb_kernel_cmdline usb_ext3fs_size
hd_kernel_cmdline hd_swap_option hd_use_squashfs hd_swap_partition_size
hd_boot_partition_size hd_fat32_partition_size cd_kernel_cmdline
nand_kernel_cmdline nand_image_size
+
+# Boot welcome message
+welcome_message = Welcome to Moblin:
# Options for USB flash drive
usb_kernel_cmdline = initrd=initrd.img boot=usb
@@ -67,8 +70,6 @@ cd_kernel_cmdline = initrd=initrd.img boot=cd
nand_kernel_cmdline = ro no-hlt boot=nand single console=ttyMS0
earlyprintk=serial apic=debug idle=poll loglevel=8
nand_image_size = 512
-welcome_message = Welcome to Moblin:
-
# Architecture to use for creating the rootstraps
architecture=lpia
@@ -157,6 +158,7 @@ buildroot_packages = grub man less vim automake
autotools-dev openssh-clients
# ********** Moblin 2.0 Platforms **********
[platform.netbook-lpia-moblin2]
+welcome_message = Welcome to Moblin 2.0:
# What additional packages need to be installed in the buildroot roostrap
buildroot_extras = squashfs-tools dosfstools syslinux module-init-tools mtools
busybox setup
@@ -166,6 +168,7 @@ buildroot_packages=
boot_partition_size = 250
[platform.menlow-lpia-moblin2]
+welcome_message = Welcome to Moblin 2.0:
# What additional packages need to be installed in the buildroot roostrap
buildroot_extras = squashfs-tools dosfstools syslinux module-init-tools mtools
busybox setup
use_squashfs = 1
@@ -176,10 +179,6 @@ swap_partition_size = 512
#buildroot_packages = grub man less vim automake autotools-dev openssh-clients
buildroot_packages =
-# ********** Install Image section **********
-[installimage]
-welcome_message = Welcome to Moblin:
-
# Distribution information
# ubuntu = debian
[distribution.debian]
diff --git a/gui/image-creator.glade b/gui/image-creator.glade
index 92b6db8..bea5a23 100644
--- a/gui/image-creator.glade
+++ b/gui/image-creator.glade
@@ -1,735 +1,1279 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
+
<glade-interface>
- <widget class="GtkWindow" id="main">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Moblin Image Creator</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
- <property name="default_width">500</property>
- <property name="default_height">650</property>
- <property name="icon">image-creator-32x32.xpm</property>
- <property name="gravity">GDK_GRAVITY_CENTER</property>
- <signal name="destroy" handler="on_main_destroy_event" after="yes"/>
- <child>
- <widget class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <child>
- <widget class="GtkMenuBar" id="menubar1">
- <property name="visible">True</property>
- <child>
- <widget class="GtkMenuItem" id="menuitem1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_File</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="menuitem1_menu">
- <child>
- <widget class="GtkImageMenuItem" id="Add Project Wizard">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Load
Project</property>
- <property name="label" translatable="yes">_Add Project
Wizard</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_Add_Project_Wizard_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="menu-item-image8">
- <property name="stock">gtk-add</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="Load Project">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Load
Project</property>
- <property name="label" translatable="yes">_Load
Project</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_Load_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="menu-item-image2">
- <property name="stock">gtk-open</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="Save Project">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Save
Project</property>
- <property name="label" translatable="yes">_Save
Project</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_Save_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="menu-item-image3">
- <property name="stock">gtk-save</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="quit1">
- <property name="visible">True</property>
- <property name="label">gtk-quit</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <signal name="activate" handler="on_quit_activate"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="Tools">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Tools</property>
- <property name="label" translatable="yes">_Tools</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="menu1">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <widget class="GtkImageMenuItem" id="WriteUsbImage">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Writes an
Image to USB Drive</property>
- <property name="label" translatable="yes">_Write USB
Image</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_WriteUsbImage_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="menu-item-image1">
- <property name="stock">gtk-media-record</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="Clear Rootstraps">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Clear
Rootstraps</property>
- <property name="label" translatable="yes">_Clear
Rootstraps</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_ClearRootstraps_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="menu-item-image5">
- <property name="stock">gtk-clear</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="MirrorSettings">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Clear
Rootstraps</property>
- <property name="label" translatable="yes">_Mirror
Settings</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_MirrorSettings_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="menu-item-image7">
- <property name="stock">gtk-properties</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="fsetsInfo">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Clear
Rootstraps</property>
- <property name="label" translatable="yes">_Fsets
Info</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_fsetsInfo_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="menu-item-image11">
- <property name="stock">gtk-info</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="editRepo">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Clear
Rootstraps</property>
- <property name="label" translatable="yes">_Edit
Repo</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="on_editRepo_activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="menu-item-image12">
- <property name="stock">gtk-edit</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkMenuItem" id="menuitem4">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Help</property>
- <property name="use_underline">True</property>
- <child>
- <widget class="GtkMenu" id="menuitem4_menu">
- <child>
- <widget class="GtkImageMenuItem" id="about1">
- <property name="visible">True</property>
- <property name="label">gtk-about</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <signal name="activate" handler="on_about_activate"/>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="help1">
- <property name="visible">True</property>
- <property name="label">gtk-help</property>
- <property name="use_underline">True</property>
- <property name="use_stock">True</property>
- <signal name="activate" handler="on_help_activate"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="width_request">15</property>
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkVBox" id="vbox2">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="height_request">10</property>
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkFrame" id="frame1">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <child>
- <widget class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <widget class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <child>
- <widget class="GtkVBox" id="vbox3">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label13">
- <property
name="height_request">3</property>
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="p_lbl_txt">
- <property
name="width_request">650</property>
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label"
translatable="yes">Create a project for the desired platform. You can then add
a target below.</property>
- <property name="wrap">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">4</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox7">
- <property name="visible">True</property>
- <child>
- <widget class="GtkButton"
id="new_project_add">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property name="tooltip"
translatable="yes">Create a new project</property>
- <property
name="response_id">0</property>
- <signal name="clicked"
handler="on_new_project_clicked"/>
- <accelerator key="A"
modifiers="GDK_MOD1_MASK" signal="clicked"/>
- <child>
- <widget class="GtkVBox" id="vbox13">
- <property
name="visible">True</property>
- <child>
- <widget class="GtkImage"
id="image8">
- <property
name="visible">True</property>
- <property
name="pixbuf">add.png</property>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel"
id="label26">
- <property
name="visible">True</property>
- <property name="label"
translatable="yes">_Add</property>
- <property
name="use_underline">True</property>
- </widget>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">False</property>
- <property
name="position">1</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property
name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkButton"
id="project_delete">
- <property
name="visible">True</property>
- <property
name="sensitive">False</property>
- <property
name="can_focus">True</property>
- <property name="tooltip"
translatable="yes">Delete the selected project</property>
- <property
name="response_id">0</property>
- <signal name="clicked"
handler="on_projectDelete_clicked"/>
- <child>
- <widget class="GtkVBox" id="vbox14">
- <property
name="visible">True</property>
- <child>
- <widget class="GtkImage"
id="image9">
- <property
name="visible">True</property>
- <property
name="pixbuf">delete.png</property>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel"
id="label27">
_______________________________________________
Commits mailing list
[email protected]
https://lists.moblin.org/mailman/listinfo/commits
