Skip to content

Commit

Permalink
[ui] UI redesign
Browse files Browse the repository at this point in the history
* Better guide the user through the flow of operations
* Also follow a concept design by Fahad Al-Riyami
* Closes pbatard#117
  • Loading branch information
pbatard committed Mar 22, 2018
1 parent 95db209 commit a445183
Show file tree
Hide file tree
Showing 31 changed files with 3,128 additions and 3,586 deletions.
1 change: 1 addition & 0 deletions .vs/rufus.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@
<ClInclude Include="..\src\smart.h" />
<ClInclude Include="..\src\sys_types.h" />
<ClInclude Include="..\src\dev.h" />
<ClInclude Include="..\src\ui.h" />
</ItemGroup>
<ItemGroup>
<Manifest Include="..\src\rufus.manifest" />
Expand Down
3 changes: 3 additions & 0 deletions .vs/rufus.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@
<ClInclude Include="..\src\process.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\ui.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\res\rufus.ico">
Expand Down
2 changes: 1 addition & 1 deletion _sign.cmd
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@echo off
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool" sign /v /sha1 5759b23dc8f45e9120a7317f306e5b6890b612f0 /fd SHA256 /tr http://timestamp.comodoca.com/rfc3161 /td SHA256 %1
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://timestamp.comodoca.com/rfc3161 /td SHA256 %1
exit
20 changes: 10 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for rufus 2.18.
# Generated by GNU Autoconf 2.69 for rufus 3.0.
#
# Report bugs to <https://github.com/pbatard/rufus/issues>.
#
Expand Down Expand Up @@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='rufus'
PACKAGE_TARNAME='rufus'
PACKAGE_VERSION='2.18'
PACKAGE_STRING='rufus 2.18'
PACKAGE_VERSION='3.0'
PACKAGE_STRING='rufus 3.0'
PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues'
PACKAGE_URL='https://rufus.akeo.ie'

Expand Down Expand Up @@ -1228,7 +1228,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures rufus 2.18 to adapt to many kinds of systems.
\`configure' configures rufus 3.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1294,7 +1294,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of rufus 2.18:";;
short | recursive ) echo "Configuration of rufus 3.0:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1385,7 +1385,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
rufus configure 2.18
rufus configure 3.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1440,7 +1440,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by rufus $as_me 2.18, which was
It was created by rufus $as_me 3.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -2303,7 +2303,7 @@ fi
# Define the identity of the package.
PACKAGE='rufus'
VERSION='2.18'
VERSION='3.0'
cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -4481,7 +4481,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by rufus $as_me 2.18, which was
This file was extended by rufus $as_me 3.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -4535,7 +4535,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
rufus config.status 2.18
rufus config.status 3.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT([rufus], [2.18], [https://github.com/pbatard/rufus/issues], [rufus], [https://rufus.akeo.ie])
AC_INIT([rufus], [3.0], [https://github.com/pbatard/rufus/issues], [rufus], [https://rufus.akeo.ie])
AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies])
AC_CONFIG_SRCDIR([src/rufus.c])
AC_CONFIG_MACRO_DIR([m4])
Expand Down
2 changes: 1 addition & 1 deletion res/appstore/AppxManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
for an interesting struggle, when you also happen to have a comma in one of the fields... -->
<Identity
Name="Rufus"
Version="2.18.1213.0"
Version="3.0.1213.0"
ProcessorArchitecture="x86"
Publisher='CN=Akeo Consulting, O=Akeo Consulting, STREET="24, Grey Rock", L=Milford, S=Co Donegal, PostalCode=Co Donegal, C=IE' />
<Properties>
Expand Down
4 changes: 2 additions & 2 deletions res/appstore/packme.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@echo off
set VERSION=2.18
set VERSION=3.0

rem Make sure you don't have anything you don't want included in the package, as anything residing in the
rem current directory will be included, including any previous .appx, which makes for nice recursion...
Expand All @@ -17,7 +17,7 @@ copy "..\..\rufus-%VERSION%.exe" "rufus.exe"
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\MakePri" new /o /pr . /cf priconfig.xml
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\MakeAppx" pack /o /d . /p Rufus-%VERSION%.appx
if ERRORLEVEL 1 goto out
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\SignTool" sign /v /sha1 5759b23dc8f45e9120a7317f306e5b6890b612f0 /fd SHA256 /tr http://timestamp.comodoca.com/rfc3161 /td SHA256 Rufus-%VERSION%.appx
"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\SignTool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://timestamp.comodoca.com/rfc3161 /td SHA256 Rufus-%VERSION%.appx
:out
del /q rufus.exe
del /q priconfig.xml
Expand Down
46 changes: 46 additions & 0 deletions res/localization/ChangeLog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,52 @@ content. PLEASE, do not just look at this Changelog when updating your
translation, but always use the English section of rufus.loc as your base.
For instance, MSG_114, that was introduced in v1.0.8 is MORE than one line!

o Version 1.0.23 (2018.??.??)
- All positioning ('m', 's') has now been removed as well as some controls, for the 3.0 UI redesign
- Removed: MSG_086, MSG_087, MSG_163
- *NEW* IDS_DRIVE_PROPERTIES_TXT "Drive Properties"
- *NEW* IDS_BOOT_SELECTION_TXT "Boot selection"
Note: The current translation was taken from MSG_278 when available, which was for "Boot type".
However, "Boot selection", is more appropriate, so please update if it makes sense.
- *NEW* IDC_SELECT "SELECT"
- *NEW* IDS_IMAGE_OPTION_TXT "Image Option"
- *UPDATED* IDS_PARTITION_TYPE_TXT Partition scheme and target system type -> "Partition scheme"
- *NEW* IDS_TARGET_SYSTEM_TXT "Target system"
- *NEW* IDS_STATUS_TXT "Status"
- *REPLACED* MSG_031 -> "BIOS (or UEFI-CSM)"
- *REPLACED* MSG_032 -> "UEFI (non CSM)"
- *REPLACED* MSG_033 -> "BIOS or UEFI"
- *REMOVED* MSG_087
- *RENAMED* IDC_WINDOWS_INSTALL -> MSG_117
- *RENAMED* IDC_WINDOWS_TO_GO -> MSG_118
- *NEW* MSG_119 "advanced drive properties"
- *NEW* MSG_120 "advanced format options"
- *NEW* MSG_121 "Show %s"
- *NEW* MSG_122 "Hide %s"
MSG_119/120 + MSG_121/122 are used to create the advanced options clickable toolbars
- *REPLACED* MSG_150 -> "Type of computer you plan to use this bootable drive with. It is up to YOU to find whether your target is of BIOS or UEFI type.\n"
"Be mindful that CSM, which can be enabled or disabled on UEFI computers, means 'BIOS emulation', and is not really UEFI."
- *REPLACED* MSG_151 -> "Note: 'UEFI-CSM' means that the device will only boot in BIOS emulation mode (also known as 'Legacy Mode') under UEFI, and not in native UEFI mode."
Be mindful that you probably don't want to translate 'Legacy Mode' as this is an option that usually appears in English in the UEFI settings.
- *REPLACED* MSG_152 -> "Note: 'non CSM' means that the device will only boot in native UEFI mode, and not in BIOS emulation mode (also known as 'Legacy Mode')."
- *REPLACED* MSG_163 -> "Method that will be used to create partitions."
- *NEW* MSG_278 "Checking for conflicting processes..."
- *REPLACED* MSG_280 "Image selection" -> "Disk or ISO image"
- *REPLACED* MSG_281 "(Please select an image)" -> "%s (Please select)"
MSG_281 + MSG_280 are used to create the message that appears in the boot selection dropdown when an image has not been selected.
- *NEW* MSG_299 "Timestamp validation error"
- *NEW* MSG_300 "Rufus could not validate that the timestamp of the downloaded update is more recent than the one for the "
"current executable.\n\nIn order to prevent potential attack scenarios, the update process has been aborted and "
"the download will be deleted. Please check the log for more details."
- *NEW* MSG_301 "Show application settings"
- *NEW* MSG_302 "Show information about this application"
- *NEW* MSG_303 "Show the log"
- *NEW* MSG_314 "Create a disk image of the selected device"
- *UPDATED* On IDD_LOG, IDC_LOG_CLEAR, IDC_LOG_SAVE and IDCANCEL were updated to remove the redundant mention of "Log" in the buttons
for the languages who did that. *PLEASE* verify that the modification looks correct in your language.
- *UPDATED* Log dialog buttons (in the 'g IDD_LOG' section). "Save Log", "Clear Log" "Close Log" have become "Save", "Clear", "Close".
I updated existing translations to remove the mention of "Log". Please check that it was done properly.

o Version 1.0.22 (2017.07.17)
- *NEW* MSG_295 "Warning: Unofficial version"
- *NEW* MSG_296 "This version of Rufus was NOT produced by its official developer(s).\n\nAre you sure you want to run it?"
Expand Down
Loading

0 comments on commit a445183

Please sign in to comment.