Skip to content
This repository has been archived by the owner on Oct 31, 2021. It is now read-only.

Commit

Permalink
New 'bootloader' section.
Browse files Browse the repository at this point in the history 
Added a 'cancel' button on installation (still buggy).
  • Loading branch information
Cyrille Pontvieux committed Feb 22, 2013
1 parent c49923a commit 67d47a9
Show file tree
Hide file tree
Showing 3 changed files with 374 additions and 21 deletions.
258 changes: 254 additions & 4 deletions src/salix-live-installer.glade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<property name="comments" translatable="yes">SalixOS installation from SalixLive's graphic environment</property>
<property name="website">http://www.salixos.org</property>
<property name="website_label">salixos.org</property>
<property name="license" translatable="yes">This program is free software; you can redistribute it and/or modify
<property name="license">This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
Expand Down Expand Up @@ -113,6 +113,11 @@ MA 02110-1301, USA.</property>
</row>
</data>
</object>
<object class="GtkImage" id="image36">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-missing-image</property>
</object>
<object class="GtkListStore" id="keymap_list_store">
<columns>
<!-- column-name KeyboardLayout -->
Expand Down Expand Up @@ -827,6 +832,58 @@ MA 02110-1301, USA.</property>
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkButton" id="bootloader_tab">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="relief">none</property>
<signal name="enter-notify-event" handler="on_bootloader_tab_enter_notify_event" swapped="no"/>
<signal name="leave-notify-event" handler="on_leave_notify_event" swapped="no"/>
<signal name="clicked" handler="on_bootloader_tab_clicked" swapped="no"/>
<child>
<object class="GtkHBox" id="hbox47">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">10</property>
<property name="spacing">11</property>
<child>
<object class="GtkImage" id="image35">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">computer</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label26">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Boot_loader</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">packages_tab</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">6</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
Expand All @@ -839,6 +896,7 @@ MA 02110-1301, USA.</property>
<property name="width_request">40</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkHBox" id="hbox36">
<property name="visible">True</property>
Expand Down Expand Up @@ -1043,6 +1101,40 @@ MA 02110-1301, USA.</property>
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox48">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImage" id="bootloader_check">
<property name="can_focus">False</property>
<property name="stock">gtk-yes</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="bootloader_check_marker">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label"> </property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">6</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
Expand Down Expand Up @@ -4246,6 +4338,146 @@ If you already have all the needed partitions, please click on the button 'Do no
<property name="position">10</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="bootloader_box">
<property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label52">
<property name="width_request">580</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;Please select your bootloader:&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">5</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="nobootloader_radiobutton">
<property name="label" translatable="yes">None. I already have one</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
<property name="group">lilo_radiobutton</property>
<signal name="enter-notify-event" handler="on_nobootloader_radiobutton_enter_notify_event" swapped="no"/>
<signal name="leave-notify-event" handler="on_leave_notify_event" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="lilo_radiobutton">
<property name="label">LiLo</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="enter-notify-event" handler="on_lilo_radiobutton_enter_notify_event" swapped="no"/>
<signal name="leave-notify-event" handler="on_leave_notify_event" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="grub2_radiobutton">
<property name="label">Grub2</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
<property name="group">lilo_radiobutton</property>
<signal name="enter-notify-event" handler="on_grub2_radiobutton_enter_notify_event" swapped="no"/>
<signal name="leave-notify-event" handler="on_leave_notify_event" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkFixed" id="fixed2">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkHButtonBox" id="hbuttonbox12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkButton" id="bootloader_undo">
<property name="label">gtk-undo</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<signal name="enter-notify-event" handler="on_bootloader_undo_enter_notify_event" swapped="no"/>
<signal name="leave-notify-event" handler="on_leave_notify_event" swapped="no"/>
<signal name="clicked" handler="on_bootloader_undo_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="bootloader_apply">
<property name="label">gtk-apply</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<signal name="enter-notify-event" handler="on_bootloader_apply_enter_notify_event" swapped="no"/>
<signal name="leave-notify-event" handler="on_leave_notify_event" swapped="no"/>
<signal name="clicked" handler="on_bootloader_apply_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">11</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
Expand Down Expand Up @@ -4277,11 +4509,13 @@ If you already have all the needed partitions, please click on the button 'Do no
<property name="title" translatable="yes">Salix installation</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window_position">center-always</property>
<property name="window_position">center</property>
<property name="destroy_with_parent">True</property>
<property name="icon">salix-live-installer.png</property>
<property name="type_hint">normal</property>
<property name="deletable">False</property>
<property name="transient_for">main_window</property>
<property name="has_separator">True</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox3">
<property name="visible">True</property>
Expand All @@ -4291,9 +4525,22 @@ If you already have all the needed partitions, please click on the button 'Do no
<object class="GtkHButtonBox" id="dialog-action_area3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<property name="layout_style">center</property>
<child>
<placeholder/>
<object class="GtkButton" id="progress_undo">
<property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_progress_undo_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
Expand Down Expand Up @@ -4329,6 +4576,9 @@ If you already have all the needed partitions, please click on the button 'Do no
</child>
</object>
</child>
<action-widgets>
<action-widget response="0">progress_undo</action-widget>
</action-widgets>
</object>
<object class="GtkListStore" id="win_mountpoint_list_store">
<columns>
Expand Down
Loading

0 comments on commit 67d47a9

Please sign in to comment.