Menu
▾
▴
[Morphix-cvs] morphixinstaller morphixinstaller.glade,1.10,1.11 trans.c,1.10,1.11
|
From: <ale...@us...> - 2004-01-03 22:00:03
|
Update of /cvsroot/morphix/morphixinstaller
In directory sc8-pr-cvs1:/tmp/cvs-serv24467
Modified Files:
morphixinstaller.glade trans.c
Log Message:
removed some old gui code
Index: morphixinstaller.glade
===================================================================
RCS file: /cvsroot/morphix/morphixinstaller/morphixinstaller.glade,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** morphixinstaller.glade 24 Sep 2003 23:23:02 -0000 1.10
--- morphixinstaller.glade 3 Jan 2004 21:59:55 -0000 1.11
***************
*** 900,915 ****
<child>
! <widget class="GtkProgressBar" id="progressbar4">
! <property name="visible">True</property>
! <property name="orientation">GTK_PROGRESS_BOTTOM_TO_TOP</property>
! <property name="fraction">0.05</property>
! <property name="pulse_step">0.1</property>
! <property name="text" translatable="yes">5%</property>
! </widget>
! <packing>
! <property name="padding">0</property>
! <property name="expand">False</property>
! <property name="fill">False</property>
! </packing>
</child>
</widget>
--- 900,904 ----
<child>
! <placeholder/>
</child>
</widget>
***************
*** 1728,1743 ****
<child>
! <widget class="GtkProgressBar" id="progressbar8">
! <property name="visible">True</property>
! <property name="orientation">GTK_PROGRESS_BOTTOM_TO_TOP</property>
! <property name="fraction">0.1</property>
! <property name="pulse_step">0.1</property>
! <property name="text" translatable="yes">10%</property>
! </widget>
! <packing>
! <property name="padding">0</property>
! <property name="expand">False</property>
! <property name="fill">False</property>
! </packing>
</child>
</widget>
--- 1717,1721 ----
<child>
! <placeholder/>
</child>
</widget>
***************
*** 1797,2137 ****
<property name="expand">False</property>
<property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
-
- <widget class="GtkDialog" id="SelectFS">
- <property name="width_request">640</property>
- <property name="height_request">400</property>
- <property name="visible">True</property>
- <property name="title" translatable="yes">Morphix Install</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
- <property name="modal">False</property>
- <property name="default_width">640</property>
- <property name="default_height">480</property>
- <property name="resizable">True</property>
- <property name="destroy_with_parent">False</property>
- <property name="has_separator">True</property>
- <signal name="realize" handler="on_SelectFS_realize" object="optionmenuFS" last_modification_time="Thu, 06 Feb 2003 22:39:30 GMT"/>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="vbox20">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="hbuttonbox4">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
-
- <child>
- <widget class="GtkButton" id="helpbutton8">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-help</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="response_id">-11</property>
- <signal name="clicked" handler="on_helpbutton_clicked" last_modification_time="Fri, 31 Jan 2003 22:57:00 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="button9">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-back</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="response_id">-6</property>
- <signal name="clicked" handler="on_cancelFS_clicked" last_modification_time="Fri, 31 Jan 2003 22:57:25 GMT"/>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="button10">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-go-forward</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="response_id">-5</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox17">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkVBox" id="vbox21">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkImage" id="image10">
- <property name="visible">True</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label35">
- <property name="width_request">51</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes">Filesystem selection
-
- Step:
- 4 of 8</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVSeparator" id="vseparator10">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox18">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkVBox" id="vbox22">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label13">
- <property name="width_request">400</property>
- <property name="height_request">200</property>
- <property name="visible">True</property>
- <property name="label" translatable="yes">Please select the filesystem type,
- the recommended setting has been selected:
- </property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkOptionMenu" id="optionmenuFS">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">A list of available filesystems, if you are unsure choose the default "ext3"</property>
- <property name="can_focus">True</property>
- <property name="history">0</property>
- <signal name="realize" handler="on_optionmenuFS_realize" object="optionmenuFS" last_modification_time="Sat, 01 Feb 2003 00:08:03 GMT"/>
-
- <child>
- <widget class="GtkMenu" id="menu2">
-
- <child>
- <widget class="GtkImageMenuItem" id="ext_2_-_standard_linux_filesystem1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ext 2 - Standard Linux Filesystem</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_ext_2_-_standard_linux_filesystem1_activate" last_modification_time="Sat, 01 Feb 2003 02:08:10 GMT"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image23">
- <property name="visible">True</property>
- <property name="stock">gtk-yes</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="ext_3_-_journaling_file_system1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Ext 3 - Journaling File System</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_ext_3_-_journaling_file_system1_activate" last_modification_time="Sat, 01 Feb 2003 02:08:10 GMT"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image24">
- <property name="visible">True</property>
- <property name="stock">gtk-yes</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="reiserfs_-_journaling_file_system1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">ReiserFS - Journaling File System</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_reiserfs_-_journaling_file_system1_activate" last_modification_time="Sat, 01 Feb 2003 02:08:10 GMT"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image25">
- <property name="visible">True</property>
- <property name="stock">gtk-yes</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkImageMenuItem" id="xfs_-_journaling_file_system1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">XFS - Journaling File System</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_xfs_-_journaling_file_system1_activate" last_modification_time="Sat, 01 Feb 2003 02:08:10 GMT"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image26">
- <property name="visible">True</property>
- <property name="stock">gtk-yes</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label26">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Next all changes will be made to your system.
- Please make sure that you have entered all
- information correctly, if you have any doubt
- please go back and correct your settings!</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
--- 1775,1778 ----
Index: trans.c
===================================================================
RCS file: /cvsroot/morphix/morphixinstaller/trans.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** trans.c 24 Sep 2003 23:23:03 -0000 1.10
--- trans.c 3 Jan 2004 21:59:57 -0000 1.11
***************
*** 49,53 ****
gchar *s = N_("*");
gchar *s = N_("Morphix Install");
- gchar *s = N_("5%");
gchar *s = N_("Couldn't find a Linux partition\n"
"on the selected harddisk.\n"
--- 49,52 ----
***************
*** 85,89 ****
"partition is bigger than X MB");
gchar *s = N_("Morphix Install");
- gchar *s = N_("10%");
gchar *s = N_("Couldn't find a Linux partition\n"
"on the selected harddisk.\n"
--- 84,87 ----
***************
*** 92,112 ****
"or add a Linux partition to the harddisk.\n"
"");
- gchar *s = N_("Morphix Install");
- gchar *s = N_("Filesystem selection\n"
- "\n"
- "Step:\n"
- "4 of 8");
- gchar *s = N_("Please select the filesystem type,\n"
- "the recommended setting has been selected:\n"
- "");
- gchar *s = N_("A list of available filesystems, if you are unsure choose the default \"ext3\"");
- gchar *s = N_("Ext 2 - Standard Linux Filesystem");
- gchar *s = N_("Ext 3 - Journaling File System");
- gchar *s = N_("ReiserFS - Journaling File System");
- gchar *s = N_("XFS - Journaling File System");
- gchar *s = N_("Next all changes will be made to your system.\n"
- "Please make sure that you have entered all\n"
- "information correctly, if you have any doubt\n"
- "please go back and correct your settings!");
gchar *s = N_("Processing...");
gchar *s = N_("Creating filesystem, please wait...");
--- 90,93 ----
|
