[PATCH] Mark language search string translatable. (#955229)
by Samantha N. Bueno
---
pyanaconda/ui/gui/spokes/welcome.glade | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pyanaconda/ui/gui/spokes/welcome.glade b/pyanaconda/ui/gui/spokes/welcome.glade
index f0a4602..4f79b7c 100644
--- a/pyanaconda/ui/gui/spokes/welcome.glade
+++ b/pyanaconda/ui/gui/spokes/welcome.glade
@@ -367,7 +367,7 @@
<property name="invisible_char">●</property>
<property name="invisible_char_set">True</property>
<property name="secondary_icon_name">edit-clear-symbolic</property>
- <property name="placeholder_text">Type here to search.</property>
+ <property name="placeholder_text" translatable="yes">Type here to search.</property>
<signal name="changed" handler="on_entry_changed" swapped="no"/>
<signal name="icon-release" handler="on_clear_icon_clicked" swapped="no"/>
</object>
--
1.7.11.7
10 years, 1 month
[anaconda][PATCH] Allow hubs and standalone spokes decide if it is possible to continue
by Vratislav Podzimek
Related: rhbz#965797
Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com>
---
pyanaconda/ui/gui/hubs/__init__.py | 29 +++++++++++++++++++++++++++--
pyanaconda/ui/gui/spokes/__init__.py | 18 ++++++++++++++++--
2 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/pyanaconda/ui/gui/hubs/__init__.py b/pyanaconda/ui/gui/hubs/__init__.py
index 37daf47..bb473b6 100644
--- a/pyanaconda/ui/gui/hubs/__init__.py
+++ b/pyanaconda/ui/gui/hubs/__init__.py
@@ -354,11 +354,36 @@ class Hub(GUIObject, common.Hub):
self._update_spoke_id = GLib.timeout_add_seconds(1, self._update_spokes)
- ### SIGNAL HANDLERS
+ @property
+ def continue_possible(self):
+ """
+ Indicates whether it is possible to continue to the next action (hub,
+ standalone spoke,...). When overridden, IT IS THE HUB'S RESPONSIBILITY
+ to inform user, where the problem is and how to fix it.
+
+ """
+
+ return True
+
+ ### SIGNAL HANDLING
+ def _checked_continue(self, cb):
+ """
+ Checks if continue is possible (from the hub's perspective and if yes,
+ runs the callback.
+
+ """
+
+ if self.continue_possible:
+ cb()
+
+ def _register_continue_event_cb(self, cb):
+ """Registers the callback for the continue event adding the check."""
+
+ self.continueButton.connect("clicked", lambda *args: self._checked_continue(cb))
def register_event_cb(self, event, cb):
if event == "continue" and hasattr(self, "continueButton"):
- self.continueButton.connect("clicked", lambda *args: cb())
+ self._register_continue_event_cb(cb)
elif event == "quit" and hasattr(self, "quitButton"):
self.quitButton.connect("clicked", lambda *args: cb())
diff --git a/pyanaconda/ui/gui/spokes/__init__.py b/pyanaconda/ui/gui/spokes/__init__.py
index c1a35b3..bb85e1e 100644
--- a/pyanaconda/ui/gui/spokes/__init__.py
+++ b/pyanaconda/ui/gui/spokes/__init__.py
@@ -63,9 +63,23 @@ class StandaloneSpoke(Spoke, common.StandaloneSpoke):
Spoke.__init__(self, data)
common.StandaloneSpoke.__init__(self, data, storage, payload, instclass)
+ @property
+ def continue_possible(self):
+ """
+ Indicates whether it is possible to continue to the next action (hub,
+ standalone spoke,...). When overridden, IT IS THE SPOKES'S
+ RESPONSIBILITY to inform user, where the problem is and how to fix it.
+
+ """
+
+ return True
+
+
+ ### SIGNAL HANDLING
def _on_continue_clicked(self, cb):
- self.apply()
- cb()
+ if self.continue_possible:
+ self.apply()
+ cb()
def register_event_cb(self, event, cb):
if event == "continue":
--
1.7.11.7
10 years, 2 months
[blivet][master/f20-branch]rhel7-branch] Remove some unnecessary code to check for LVM constraints on s390x. (#873125, #885011)
by Samantha N. Bueno
Related: rhbz#873125
Related: rhbz#885011
---
blivet/__init__.py | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/blivet/__init__.py b/blivet/__init__.py
index 9420c50..65e8026 100644
--- a/blivet/__init__.py
+++ b/blivet/__init__.py
@@ -1471,20 +1471,6 @@ class Blivet(object):
"which is required for installation of %s "
"to continue.") % (productName,))
- # Prevent users from installing on s390x with (a) no /boot volume, (b) the
- # root volume on LVM, and (c) the root volume not restricted to a single
- # PV
- # NOTE: There is not really a way for users to create a / volume
- # restricted to a single PV. The backend support is there, but there are
- # no UI hook-ups to drive that functionality, but I do not personally
- # care. --dcantrell
- if arch.isS390() and not self.mountpoints.has_key('/boot') and root:
- if root.type == 'lvmlv' and not root.singlePV:
- errors.append(_("This platform requires /boot on a dedicated "
- "partition or logical volume. If you do not "
- "want a /boot volume, you must place / on a "
- "dedicated non-LVM partition."))
-
# FIXME: put a check here for enough space on the filesystems. maybe?
for (mount, size) in checkSizes:
--
1.8.3.1
10 years, 3 months
[master/rhel7-branch] A bit controversial one for the MountpointSelectors' usage
by Vratislav Podzimek
The following patch fixes the bug #975838 by moving the focus changes handling
from the MountpointSelector widget to the Page and spoke it appears in,
respectively. The controversy lies in making the MountpointSelector's behaviour
relying on the widget it is placed into. The MounpointSelector widget per se no
longer handles focus changes correctly and it looks like being selected/chosen
even if it loses focus. However, this is what we want -- to keep it look like
that when user clicks to the right part of the screen to change parameters of
the mount point being chosen. And since I doubt anybody will reuse the
MountpointSelector as a standalone widget without the Page and the Accordion I
think this change could be done.
I've recorded a video preview [1] showing the functionality with this patch
applied.
[1] http://vpodzime.fedorapeople.org/MountpointSelector_focus.webm
Let me know if I should add more comments to some places.
Vratislav Podzimek (1):
Handle focus changes of MountpointSelectors from outside (#975838)
pyanaconda/ui/gui/spokes/custom.py | 2 ++
pyanaconda/ui/gui/spokes/lib/accordion.py | 6 ++++++
widgets/src/MountpointSelector.c | 31 ++++++++-----------------------
3 files changed, 16 insertions(+), 23 deletions(-)
--
1.7.11.7
10 years, 4 months
[PATCH lorax/master] Add initial 64-bit ARM (aarch64) support.
by d.marlin
From: "d.marlin" <dmarlin(a)redhat.com>
Signed-off-by: David A. Marlin <dmarlin(a)redhat.com>
---
share/aarch64.tmpl | 50 ++++++++++++++++++++++++++++++++
share/config_files/aarch64/boot.msg | 5 ++++
share/config_files/aarch64/grub.conf | 13 +++++++++
share/config_files/aarch64/grub2-efi.cfg | 24 +++++++++++++++
share/runtime-install.tmpl | 3 ++
src/pylorax/__init__.py | 2 +-
src/pylorax/treebuilder.py | 1 +
7 files changed, 97 insertions(+), 1 deletion(-)
create mode 100644 share/aarch64.tmpl
create mode 100644 share/config_files/aarch64/boot.msg
create mode 100644 share/config_files/aarch64/grub.conf
create mode 100644 share/config_files/aarch64/grub2-efi.cfg
diff --git a/share/aarch64.tmpl b/share/aarch64.tmpl
new file mode 100644
index 0000000..5b9acd2
--- /dev/null
+++ b/share/aarch64.tmpl
@@ -0,0 +1,50 @@
+<%page args="kernels, runtime_img, basearch, outroot, product, isolabel"/>
+<%
+configdir="tmp/config_files/aarch64"
+PXEBOOTDIR="images/pxeboot"
+BOOTDIR="boot"
+KERNELDIR=PXEBOOTDIR
+LIVEDIR="LiveOS"
+%>
+
+mkdir ${LIVEDIR}
+install ${runtime_img} ${LIVEDIR}/squashfs.img
+treeinfo stage2 mainimage ${LIVEDIR}/squashfs.img
+
+## install bootloader and config files
+mkdir ${BOOTDIR}
+# FIXME: fill this in when we have grub2 or gummiboot or ?
+install ${configdir}/boot.msg ${BOOTDIR}
+install ${configdir}/grub.conf ${BOOTDIR}
+
+## configure bootloader
+replace @VERSION@ ${product.version} ${BOOTDIR}/grub.conf ${BOOTDIR}/*.msg
+replace @PRODUCT@ '${product.name}' ${BOOTDIR}/grub.conf ${BOOTDIR}/*.msg
+
+## install kernels
+mkdir ${KERNELDIR}
+%for kernel in kernels:
+ ## normal aarch64
+ installkernel images-${basearch} ${kernel.path} ${KERNELDIR}/vmlinuz
+ installinitrd images-${basearch} ${kernel.initrd.path} ${KERNELDIR}/initrd.img
+ %if doupgrade:
+ installupgradeinitrd images-${basearch} ${kernel.upgrade.path} ${KERNELDIR}/upgrade.img
+ %endif
+%endfor
+
+#FIXME: this will need adjusted when we have a real bootloader.
+## WHeeeeeeee, EFI.
+## We could remove the basearch restriction someday..
+<% efiargs=""; efigraft="" %>
+%if exists("boot/efi/EFI/*/gcdx64.efi"):
+ <%
+ efiarch = 'AARCH64'
+ efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
+ images = ["images/efiboot.img"]
+ for img in images:
+ efiargs += " -eltorito-alt-boot -e {0} -no-emul-boot".format(img)
+ efigraft += " {0}={1}/{0}".format(img,outroot)
+ %>
+ <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch=efiarch, isolabel=isolabel"/>
+%endif
+
diff --git a/share/config_files/aarch64/boot.msg b/share/config_files/aarch64/boot.msg
new file mode 100644
index 0000000..ff54899
--- /dev/null
+++ b/share/config_files/aarch64/boot.msg
@@ -0,0 +1,5 @@
+
+splash.lss
+
+ - Press the 01<ENTER>07 key to begin the installation process.
+
diff --git a/share/config_files/aarch64/grub.conf b/share/config_files/aarch64/grub.conf
new file mode 100644
index 0000000..49fa32b
--- /dev/null
+++ b/share/config_files/aarch64/grub.conf
@@ -0,0 +1,13 @@
+#debug --graphics
+default=0
+splashimage=@SPLASHPATH@
+timeout 5
+hiddenmenu
+title Install @PRODUCT@ @VERSION@
+ findiso
+ kernel @KERNELPATH@ @ROOT@ quiet
+ initrd @INITRDPATH@
+title Test this media & install @PRODUCT@ @VERSION@
+ findiso
+ kernel @KERNELPATH@ @ROOT@ rd.live.check quiet
+ initrd @INITRDPATH@
diff --git a/share/config_files/aarch64/grub2-efi.cfg b/share/config_files/aarch64/grub2-efi.cfg
new file mode 100644
index 0000000..d02fcd3
--- /dev/null
+++ b/share/config_files/aarch64/grub2-efi.cfg
@@ -0,0 +1,24 @@
+set default="0"
+
+insmod gzio
+insmod part_gpt
+insmod ext2
+
+set timeout=5
+### END /etc/grub.d/00_header ###
+
+### BEGIN /etc/grub.d/10_linux ###
+menuentry 'Install @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
+ linuxefi @KERNELPATH@ @ROOT@ quiet
+ initrdefi @INITRDPATH@
+}
+menuentry 'Test this media & install @PRODUCT@ @VERSION@' --class fedora --class gnu-linux --class gnu --class os {
+ linuxefi @KERNELPATH@ @ROOT@ rd.live.check quiet
+ initrdefi @INITRDPATH@
+}
+submenu 'Troubleshooting -->' {
+ menuentry 'Rescue a @PRODUCT@ system' --class fedora --class gnu-linux --class gnu --class os {
+ linuxefi @KERNELPATH@ @ROOT@ rescue quiet
+ initrdefi @INITRDPATH@
+ }
+}
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index 547ce89..2323f7d 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -21,6 +21,9 @@ installpkg grubby
%endif
## arch-specific packages (bootloaders etc.)
+%if basearch == "aarch64":
+ installpkg grubby
+%endif
%if basearch in ("arm", "armhfp"):
installpkg kernel-lpae
installpkg uboot-tools
diff --git a/src/pylorax/__init__.py b/src/pylorax/__init__.py
index 37829da..f5f21be 100644
--- a/src/pylorax/__init__.py
+++ b/src/pylorax/__init__.py
@@ -50,7 +50,7 @@ from discinfo import DiscInfo
from executils import runcmd, runcmd_output
class ArchData(DataHolder):
- lib64_arches = ("x86_64", "ppc64", "s390x", "ia64")
+ lib64_arches = ("x86_64", "ppc64", "s390x", "ia64", "aarch64")
bcj_arch = dict(i386="x86", x86_64="x86",
ppc="powerpc", ppc64="powerpc",
arm="arm", armhfp="arm")
diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py
index 3106483..9020f6a 100644
--- a/src/pylorax/treebuilder.py
+++ b/src/pylorax/treebuilder.py
@@ -37,6 +37,7 @@ templatemap = {
'ppc64': 'ppc.tmpl',
's390': 's390.tmpl',
's390x': 's390.tmpl',
+ 'aarch64': 'aarch64.tmpl',
'arm': 'arm.tmpl',
'armhfp': 'arm.tmpl',
}
--
1.8.3.1
10 years, 4 months
[master/f20/rhel7] Send the continue click after the queue is empty (#1025346)
by Brian C. Lane
From: "Brian C. Lane" <bcl(a)redhat.com>
Previously, if the queue was not empty, the click would not be sent and
kickstarts would sometimes not continue automatically.
Resolves: rhbz#1025346
---
pyanaconda/ui/gui/hubs/__init__.py | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/pyanaconda/ui/gui/hubs/__init__.py b/pyanaconda/ui/gui/hubs/__init__.py
index e52d87e..e2efb09 100644
--- a/pyanaconda/ui/gui/hubs/__init__.py
+++ b/pyanaconda/ui/gui/hubs/__init__.py
@@ -303,6 +303,7 @@ class Hub(GUIObject, common.Hub):
# no spokes, move on
gtk_call_once(self.continueButton.emit, "clicked")
+ click_continue = False
# Grab all messages that may have appeared since last time this method ran.
while True:
try:
@@ -350,15 +351,21 @@ class Hub(GUIObject, common.Hub):
if self.continuePossible:
if self._inSpoke:
self._autoContinue = False
- elif self._autoContinue and q.empty():
- # enqueue the emit to the Gtk message queue
- gtk_call_once(self.continueButton.emit, "clicked")
+ elif self._autoContinue:
+ click_continue = True
+
elif code == hubQ.HUB_CODE_MESSAGE:
spoke.selector.set_property("status", args[1])
log.info("setting %s status to: %s" % (spoke, args[1]))
q.task_done()
+ # queue is now empty, should continue be clicked?
+ if self._autoContinue and click_continue:
+ # enqueue the emit to the Gtk message queue
+ log.info("_autoContinue clicking continue button")
+ gtk_call_once(self.continueButton.emit, "clicked")
+
return True
def refresh(self):
--
1.8.3.1
10 years, 5 months
[lorax/rhel7 1/3] livemedia-creator: Add minimal disk example kickstart (#1019728)
by Brian C. Lane
From: "Brian C. Lane" <bcl(a)redhat.com>
Also adds a check for a bad url repo, and fix ram calculation for
appliance mode. Updates the README.livemedia-creator documentation.
Resolves: rhbz#1019728
---
README.livemedia-creator | 29 +++++++++++++++++++++-----
docs/rhel7-minimal.ks | 52 ++++++++++++++++++++++++++++++++++++++++++++++
src/sbin/livemedia-creator | 20 +++++++++++-------
3 files changed, 89 insertions(+), 12 deletions(-)
create mode 100644 docs/rhel7-minimal.ks
diff --git a/README.livemedia-creator b/README.livemedia-creator
index e8c2e4a..62d5f13 100644
--- a/README.livemedia-creator
+++ b/README.livemedia-creator
@@ -16,6 +16,14 @@ minimum you need:
--iso to specify the Anaconda install media to use with virt-install
--ks is the kickstart to use to install the system
+To use livemedia-creator with virt-install you will need to install the
+following packages, as well as have libvirtd setup correctly.
+ virt-install
+ libvirt-python
+
+If you are going to be using Anaconda directly, with --no-virt mode, make sure
+you have the anaconda package installed.
+
QUICKSTART
----------
@@ -74,13 +82,18 @@ written using the Mako template system which is very flexible.
KICKSTARTS
----------
-Existing spin kickstarts can be used to create live media with a few changes.
-Here are the steps I used to convert the XFCE spin.
+The docs/ directory includes two example kickstarts, one to create a live desktop
+iso using GNOME, and the other to create a minimal disk image. When creating your
+own kickstarts you should start with the minimal example, it includes several
+needed packages that are not always included by dependencies.
+
+Or you can use existing spin kickstarts to create live media with a few
+changes. Here are the steps I used to convert the Fedora XFCE spin.
1. Flatten the xfce kickstart using ksflatten
2. Add zerombr so you don't get the disk init dialog
3. Add clearpart --all
-4. Add swap and biosboot partitions
+4. Add swap partition
5. bootloader target
6. Add shutdown to the kickstart
7. Add network --bootproto=dhcp --activate to activate the network
@@ -96,7 +109,6 @@ network --bootproto=dhcp --activate
zerombr
clearpart --all
bootloader --location=mbr
-part biosboot --size=1
part swap --size=512
shutdown
@@ -110,6 +122,9 @@ passwd -d root > /dev/null
cat /dev/null > /dev/fstab
+ Do this only for live iso's, the filesystem will be mounted read only if
+ there is no /etc/fstab
+
11. Don't delete initramfs files from /boot in %post
12. Have grub2-efi, shim, memtest86+, isomd5sum and syslinux in the package list
13. Omit dracut-config-rescue from the package list "-dracut-config-rescue"
@@ -179,7 +194,7 @@ switch. This will create the partitioned disk image and an XML file that can be
used with virt-image to setup a virtual system.
The XML is generated using the Mako template from
-/usr/share/lorax/appliance/virt-image.xml You can use a different template by
+/usr/share/lorax/appliance/libvirt.xml You can use a different template by
passing --app-template <template path>
Documentation on the Mako template system can be found here:
@@ -204,6 +219,10 @@ title from --title
project from --project
releasever from --releasever
+The created image can be imported into libvirt using:
+
+virt-image appliance.xml
+
DEBUGGING PROBLEMS
------------------
diff --git a/docs/rhel7-minimal.ks b/docs/rhel7-minimal.ks
new file mode 100644
index 0000000..978c24a
--- /dev/null
+++ b/docs/rhel7-minimal.ks
@@ -0,0 +1,52 @@
+# Minimal Disk Image
+#
+sshpw --username=root --plaintext randOmStrinGhERE
+# Firewall configuration
+firewall --enabled
+# Use network installation
+url --url=http://prxy.notae.us/rhel7.0/Server/os
+repo --name=optional --baseurl=http://prxy.notae.us/rhel7.0/Server/optional/os
+
+# Root password
+rootpw --plaintext removethispw
+# Network information
+network --bootproto=dhcp --onboot=on --activate
+# System authorization information
+auth --useshadow --enablemd5
+# System keyboard
+keyboard --xlayouts=us --vckeymap=us
+# System language
+lang en_US.UTF-8
+# SELinux configuration
+selinux --enforcing
+# Installation logging level
+logging --level=info
+# Shutdown after installation
+shutdown
+# System timezone
+timezone US/Eastern
+# System bootloader configuration
+bootloader --location=mbr
+# Clear the Master Boot Record
+zerombr
+# Partition clearing information
+clearpart --all
+# Disk partitioning information
+part / --fstype="ext4" --size=4000
+part swap --size=1000
+
+%post
+# Remove root password
+passwd -d root > /dev/null
+%end
+
+%packages
+@core
+kernel
+memtest86+
+grub2-efi
+grub2
+shim
+syslinux
+-dracut-config-rescue
+%end
diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator
index d2727d6..042fa33 100755
--- a/src/sbin/livemedia-creator
+++ b/src/sbin/livemedia-creator
@@ -36,6 +36,7 @@ from time import sleep
import shutil
import argparse
import hashlib
+import re
# Use pykickstart to calculate disk image size
from pykickstart.parser import KickstartParser
@@ -123,12 +124,17 @@ class LogRequestHandler(SocketServer.BaseRequestHandler):
"""
Check a line to see if it contains an error indicating install failure
"""
- simple_tests = [ "Traceback (",
- "Out of memory:",
- "Call Trace:",
- "insufficient disk space:" ]
+ simple_tests = ["Traceback (",
+ "Out of memory:",
+ "Call Trace:",
+ "insufficient disk space:"]
+ re_tests = [r"WARNING packaging: base repo .* not valid"]
for t in simple_tests:
- if line.find( t ) > -1:
+ if line.find(t) > -1:
+ self.server.log_error = True
+ return
+ for t in re_tests:
+ if re.search(t, line):
self.server.log_error = True
return
@@ -406,7 +412,7 @@ def make_appliance(disk_img, name, template, outfile, networks=None, ram=1024,
if not (disk_img and template and outfile):
return None
- log.info("Creating appliance definition using ${0}".format(template))
+ log.info("Creating appliance definition using {0}".format(template))
if not arch:
arch = "x86_64"
@@ -791,7 +797,7 @@ if __name__ == '__main__':
virt_group = parser.add_argument_group("virt-install arguments (DISABLED -- no libvirt)")
else:
virt_group = parser.add_argument_group("virt-install arguments")
- virt_group.add_argument("--ram", metavar="MEMORY", default=1024,
+ virt_group.add_argument("--ram", metavar="MEMORY", type=int, default=1024,
help="Memory to allocate for installer in megabytes." )
virt_group.add_argument("--vcpus", default=1,
help="Passed to --vcpus command" )
--
1.8.3.1
10 years, 5 months
[initial-setup][PATCH] Inform user that the system may be rebooted (#1022040)
by Vratislav Podzimek
If the License agreement is not accepted and user quits the Initial Setup, the
system should be rebooted. We should inform user about that in the quit dialog.
Signed-off-by: Vratislav Podzimek <vpodzime(a)redhat.com>
---
initial_setup/gui/gui.py | 3 ++-
initial_setup/tui/tui.py | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/initial_setup/gui/gui.py b/initial_setup/gui/gui.py
index 3b525a5..a627827 100644
--- a/initial_setup/gui/gui.py
+++ b/initial_setup/gui/gui.py
@@ -16,7 +16,8 @@ N_ = lambda x: x
class InitialSetupQuitDialog(QuitDialog):
MESSAGE = N_("Are you sure you want to quit the configuration process?\n"
- "You might end up with unusable system if you do.")
+ "You might end up with unusable system if you do. Unless the"
+ "Lincense agreement is accepted, the system will be rebooted.")
@inject(Gdk, product_title = product_title, is_final = is_final)
class InitialSetupGraphicalUserInterface(GraphicalUserInterface):
diff --git a/initial_setup/tui/tui.py b/initial_setup/tui/tui.py
index de00095..68a96dd 100644
--- a/initial_setup/tui/tui.py
+++ b/initial_setup/tui/tui.py
@@ -14,7 +14,8 @@ _ = lambda x: gettext.ldgettext("initial-setup", x)
N_ = lambda x: x
QUIT_MESSAGE = N_("Are you sure you want to quit the configuration process?\n"
- "You might end up with unusable system if you do.")
+ "You might end up with unusable system if you do. Unless the"
+ "Lincense agreement is accepted, the system will be rebooted.")
@inject(product_title = product_title, is_final = is_final)
class InitialSetupTextUserInterface(TextUserInterface):
--
1.7.11.7
10 years, 5 months
[master] Use the default yscale for the HubWindow alignment
by David Shea
Neither of our hubs set the yscale on this child to 0.5, and they look
kinda weird if we did.
---
widgets/src/glade-adaptor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/widgets/src/glade-adaptor.c b/widgets/src/glade-adaptor.c
index 557937a..edf52da 100644
--- a/widgets/src/glade-adaptor.c
+++ b/widgets/src/glade-adaptor.c
@@ -64,7 +64,7 @@ void anaconda_standalone_window_post_create(GladeWidgetAdaptor *adaptor,
glade_widget_property_set(alignment_widget, "xalign", 0.5);
glade_widget_property_set(alignment_widget, "yalign", 0.0);
glade_widget_property_set(alignment_widget, "xscale", 0.5);
- glade_widget_property_set(alignment_widget, "yscale", 0.5);
+ glade_widget_property_set(alignment_widget, "yscale", 1.0);
} else {
glade_widget_property_set(alignment_widget, "xalign", 0.5);
glade_widget_property_set(alignment_widget, "yalign", 0.0);
--
1.8.3.1
10 years, 5 months
[master] Remove column titles from the software spoke.
by David Shea
The titles are never displayed, so there's no point in having them. For
the one part in the code where the title was used to determine which
column is selected, use its order in the TreeView instead.
---
pyanaconda/ui/gui/spokes/software.glade | 4 ----
pyanaconda/ui/gui/spokes/software.py | 3 ++-
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/software.glade b/pyanaconda/ui/gui/spokes/software.glade
index bacd565..7a9a717 100644
--- a/pyanaconda/ui/gui/spokes/software.glade
+++ b/pyanaconda/ui/gui/spokes/software.glade
@@ -146,7 +146,6 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="addonSelectedCol">
- <property name="title">Selected</property>
<signal name="clicked" handler="on_addon_toggled" swapped="no"/>
<child>
<object class="GtkCellRendererToggle" id="addonSelectedRenderer">
@@ -161,7 +160,6 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="addonDescCol">
- <property name="title" translatable="yes">column</property>
<property name="expand">True</property>
<child>
<object class="GtkCellRendererText" id="addonDescRenderer">
@@ -212,7 +210,6 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="environmentSelectedCol">
- <property name="title" translatable="yes">column</property>
<child>
<object class="GtkCellRendererToggle" id="environmentSelectedRenderer">
<property name="yalign">0</property>
@@ -227,7 +224,6 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="environmentDescCol">
- <property name="title" translatable="yes">column</property>
<property name="expand">True</property>
<child>
<object class="GtkCellRendererText" id="environmentDescRenderer">
diff --git a/pyanaconda/ui/gui/spokes/software.py b/pyanaconda/ui/gui/spokes/software.py
index affbee8..832a77b 100644
--- a/pyanaconda/ui/gui/spokes/software.py
+++ b/pyanaconda/ui/gui/spokes/software.py
@@ -440,7 +440,8 @@ class SoftwareSelectionSpoke(NormalSpoke):
# handled separately from this signal handler. Handling it again here will result in
# the checkbox being toggled yet again. So, we need to return in that case.
col = view.get_cursor()[1]
- if not col or col.get_title() == "Selected":
+ first_col = view.get_column(0)
+ if col == first_col:
return
# Always do something here, since addons can be toggled.
--
1.8.3.1
10 years, 5 months