diff options
author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-06-19 19:35:31 +0000 |
---|---|---|
committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-06-19 19:35:31 +0000 |
commit | c5dd4a2e8de0ce0a3a1d63cbd5e650c8a1aeef11 (patch) | |
tree | 9031d0398e0619cae050bb7dfdce00f6b4579694 /ui/qt5 | |
parent | 0c6decad96afebf359e61a19afd2b5859e5bdb20 (diff) | |
parent | 9345b6f67c60d696220dfb729455a35a051e9c30 (diff) | |
download | horizon-c5dd4a2e8de0ce0a3a1d63cbd5e650c8a1aeef11.tar.gz horizon-c5dd4a2e8de0ce0a3a1d63cbd5e650c8a1aeef11.tar.bz2 horizon-c5dd4a2e8de0ce0a3a1d63cbd5e650c8a1aeef11.tar.xz horizon-c5dd4a2e8de0ce0a3a1d63cbd5e650c8a1aeef11.zip |
Merge branch 'qtui-fixes' into 'master'
A few fixes for Qt UI
See merge request adelie/horizon!4
Diffstat (limited to 'ui/qt5')
-rw-r--r-- | ui/qt5/horizonwizard.cc | 4 | ||||
-rw-r--r-- | ui/qt5/resources/packages.txt | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ui/qt5/horizonwizard.cc b/ui/qt5/horizonwizard.cc index 328837e..4b147e5 100644 --- a/ui/qt5/horizonwizard.cc +++ b/ui/qt5/horizonwizard.cc @@ -431,14 +431,14 @@ QStringList bootForArch(const std::string &raw_disk, HorizonWizard::Arch arch, case HorizonWizard::aarch64:/* 64-bit ARM: assume UEFI */ return { QString{"partition %1 %2 256M esp"}.arg(disk).arg(*start), - QString{"fs %1 fat32"}.arg(nameForPartitionOnDisk(raw_disk, *start)), + QString{"fs %1 vfat"}.arg(nameForPartitionOnDisk(raw_disk, *start)), QString{"mount %1 /boot/efi"}.arg(nameForPartitionOnDisk(raw_disk, (*start)++)) }; case HorizonWizard::x86_64: /* 64-bit Intel: support UEFI and BIOS */ return { QString{"partition %1 %2 1M bios"}.arg(disk).arg((*start)++), QString{"partition %1 %2 256M esp"}.arg(disk).arg(*start), - QString{"fs %1 fat32"}.arg(nameForPartitionOnDisk(raw_disk, *start)), + QString{"fs %1 vfat"}.arg(nameForPartitionOnDisk(raw_disk, *start)), QString{"mount %1 /boot/efi"}.arg(nameForPartitionOnDisk(raw_disk, (*start)++)) }; case HorizonWizard::ppc: /* 32-bit PowerPC: we only support Power Mac */ diff --git a/ui/qt5/resources/packages.txt b/ui/qt5/resources/packages.txt index ae88ab1..7a7a7d4 100644 --- a/ui/qt5/resources/packages.txt +++ b/ui/qt5/resources/packages.txt @@ -3,7 +3,7 @@ Desktop Environments X11-based desktop environments. preferences-theme LXQt lxqt-desktop Lightweight desktop environment using the Openbox window manager and Qt widgets. qt MATE mate-complete The MATE desktop environment, featuring a classic desktop experience with Gtk+ 2. mate-logo XFCE xfce-desktop The XFCE desktop environment. xfce4-logo -Documentation doc Install documentation for the software you select. application-x-fictionbook +Documentation docs Install documentation for the software you select. application-x-fictionbook Games Video games for your Adélie Linux computer. applications-games Mednafen mednaffe An emulator for playing games from many types of 8-bit and 16-bit home consoles. OpenTTD openttd Transportation simulation game. @@ -13,7 +13,6 @@ Games Video games for your Adélie Linux computer. applications-games Internet Software Software to explore the Internet. applications-internet Firefox Web browser firefox-esr Popular, powerful Web browser. Includes JavaScript and multimedia (audio/video) playback support. Netsurf Web browser netsurf Lightweight Web browser. Does not include JavaScript support. - Otter Browser otter-browser WebKit-based Web browser with JavaScript support. Thunderbird Email thunderbird Read and compose email, and participate in newsgroups. KDE Applications kde A variety of cohesive applications including a word processor, media player, and many games. kde-logo Default Theme adelie-kde-theme The Adélie KDE theme, including wallpapers and colour themes. kcontrol @@ -38,7 +37,7 @@ Programming Environments Interpreters, language tools, and development environm Ada gcc-gnat The Ada programming language. applications-interfacedesign COBOL gnucobol The COBOL programming language. applications-interfacedesign Go gcc-go The Go programming language. text-x-go - Java openjdk8-jdk The Java 8 programming environment. java + Java openjdk8 The Java 8 programming environment. java Node.js node The Node JavaScript programming environment. javascript Perl perl The Perl programming language. text-x-perl PHP 7 php7 The PHP 7 programming language. application-x-php |