--- gui.py | 1 - iw/partmethod_gui.py | 84 ---------------------------------------------- text.py | 3 -- textw/partmethod_text.py | 46 ------------------------- 4 files changed, 0 insertions(+), 134 deletions(-) mode change 100644 => 100755 gui.py delete mode 100644 iw/partmethod_gui.py delete mode 100644 textw/partmethod_text.py diff --git a/gui.py b/gui.py old mode 100644 new mode 100755 index b2e6916..fca3a0d --- a/gui.py +++ b/gui.py @@ -65,7 +65,6 @@ stepToClass = { "keyboard" : ("kbd_gui", "KeyboardWindow"), "welcome" : ("welcome_gui", "WelcomeWindow"), "zfcpconfig" : ("zfcp_gui", "ZFCPWindow"), - "partitionmethod" : ("partmethod_gui", "PartitionMethodWindow"), "partition" : ("partition_gui", "PartitionWindow"), "parttype" : ("autopart_type", "PartitionTypeWindow"), "findinstall" : ("examine_gui", "UpgradeExamineWindow"), diff --git a/iw/partmethod_gui.py b/iw/partmethod_gui.py deleted file mode 100644 index 8aa7bf5..0000000 --- a/iw/partmethod_gui.py +++ /dev/null @@ -1,84 +0,0 @@ -# -# partmethod_gui.py: allows the user to choose how to partition their disks -# -# Copyright (C) 2001, 2002 Red Hat, Inc. All rights reserved. -# -# 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. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Author(s): Matt Wilson <msw@xxxxxxxxxx> -# - -import gtk -from gui import WrappingLabel -from iw_gui import * -from autopart import PARTMETHOD_TYPE_DESCR_TEXT - -from constants import * -import gettext -_ = lambda x: gettext.ldgettext("anaconda", x) - -class PartitionMethodWindow(InstallWindow): - def __init__(self, ics): - InstallWindow.__init__(self, ics) - ics.setTitle (_("Disk Partitioning Setup")) - - def getNext(self): - - if self.useAuto.get_active(): - self.partitions.useAutopartitioning = 1 - else: - self.partitions.useAutopartitioning = 0 - - return None - - def getScreen (self, partitions, instclass): - self.partitions = partitions - - box = gtk.VBox (False) - box.set_border_width (5) - - label=WrappingLabel(_(PARTMETHOD_TYPE_DESCR_TEXT)) - label.set_alignment(0.0, 0.0) - - box.pack_start(label, True, True) - - radioBox = gtk.VBox (False) - - self.useAuto = gtk.RadioButton( - None, _("_Automatically partition")) - radioBox.pack_start(self.useAuto, False, False) - self.useDS = gtk.RadioButton( - self.useAuto, _("Manually partition with _Disk Druid")) - radioBox.pack_start(self.useDS, False, False) - - if partitions.useAutopartitioning: - self.useAuto.set_active(1) - else: - self.useDS.set_active(1) - - align = gtk.Alignment() - align.add(radioBox) - align.set(0.5, 0.5, 0.0, 0.0) - - box.pack_start(align, False, False, 10) - - box.set_border_width (5) - - self.ics.setNextEnabled (True) - - align = gtk.Alignment() - align.add(box) - align.set(0.5, 0.5, 0.0, 0.0) - - return align diff --git a/text.py b/text.py index d9abd30..171d1b1 100644 --- a/text.py +++ b/text.py @@ -49,14 +49,11 @@ stepToClasses = { "keyboard" : ("keyboard_text", "KeyboardWindow"), "welcome" : ("welcome_text", "WelcomeWindow"), "parttype" : ("partition_text", "PartitionTypeWindow"), - "custom-upgrade" : ("upgrade_text", "UpgradeExamineWindow"), "addswap" : ("upgrade_text", "UpgradeSwapWindow"), "upgrademigratefs" : ("upgrade_text", "UpgradeMigrateFSWindow"), - "partitionmethod" : ("partmethod_text", ("PartitionMethod")), "partition": ("partition_text", ("PartitionWindow")), "zfcpconfig": ("zfcp_text", ("ZFCPWindow")), "findinstall" : ("upgrade_text", ("UpgradeExamineWindow")), - "addswap" : ("upgrade_text", "UpgradeSwapWindow"), "upgbootloader": ("upgrade_bootloader_text", "UpgradeBootloaderWindow"), "bootloader" : ("bootloader_text", ("BootloaderChoiceWindow", "BootloaderAppendWindow", diff --git a/textw/partmethod_text.py b/textw/partmethod_text.py deleted file mode 100644 index 85d07ef..0000000 --- a/textw/partmethod_text.py +++ /dev/null @@ -1,46 +0,0 @@ -# -# partmethod_text.py: allows the user to choose how to partition their disks -# in text mode -# -# Copyright (C) 2001, 2002 Red Hat, Inc. All rights reserved. -# -# 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. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -# Author(s): Jeremy Katz <katzj@xxxxxxxxxx> -# - -from snack import * -from constants_text import * -from autopart import PARTMETHOD_TYPE_DESCR_TEXT - -import gettext -_ = lambda x: gettext.ldgettext("anaconda", x) - -class PartitionMethod: - def __call__(self, screen, partitions, instclass): - rc = ButtonChoiceWindow(screen, _("Disk Partitioning Setup"), - _(PARTMETHOD_TYPE_DESCR_TEXT), - [ (_("Autopartition"), "auto"), - (_("Disk Druid"), "ds"), - TEXT_BACK_BUTTON ], - width = 50, help = "parttool") - - if rc == TEXT_BACK_CHECK: - return INSTALL_BACK - elif rc == "ds": - partitions.useAutopartitioning = 0 - else: - partitions.useAutopartitioning = 1 - - return INSTALL_OK -- 1.6.0.3 _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list