From 740dd166def5d88946a17eabad6ee8f46b8d8eba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Capello?= <m.a.capello@gmail.com>
Date: Tue, 24 Aug 2021 16:58:49 -0300
Subject: [PATCH] Refactor the code to change the "register" dialog for
 "enter_license" dialog

---
 data/gui.xml                                  |  2 +-
 data/strings/en.ini                           | 12 ++---
 .../{register.xml => enter_license.xml}       | 12 ++---
 src/app/CMakeLists.txt                        |  2 +-
 src/app/commands/cmd_enter_license.cpp        | 46 ++++++++++++++++
 src/app/commands/cmd_register.cpp             | 53 -------------------
 6 files changed, 58 insertions(+), 69 deletions(-)
 rename data/widgets/{register.xml => enter_license.xml} (52%)
 create mode 100644 src/app/commands/cmd_enter_license.cpp
 delete mode 100644 src/app/commands/cmd_register.cpp

diff --git a/data/gui.xml b/data/gui.xml
index ad1d89e22..38bfd8fee 100644
--- a/data/gui.xml
+++ b/data/gui.xml
@@ -1025,7 +1025,7 @@
           <param name="path" value="http://twitter.com/aseprite" />
         </item>
         <separator />
-        <item command="Register" text="@.help_register" group="help_register" />
+        <item command="EnterLicense" text="@.help_enter_license" group="help_enter_license" />
         <separator />
         <item command="About" text="@.help_about" group="help_about" />
       </menu>
diff --git a/data/strings/en.ini b/data/strings/en.ini
index c3080f33d..f350c481e 100644
--- a/data/strings/en.ini
+++ b/data/strings/en.ini
@@ -422,7 +422,7 @@ PlayAnimation = Play Animation
 PlayPreviewAnimation = Play Preview Animation
 Redo = Redo
 Refresh = Refresh
-Register = Register Aseprite
+EnterLicense = Enter License
 RemoveFrame = Remove Frame
 RemoveFrameTag = Remove Tag
 RemoveLayer = Remove Layer
@@ -1044,7 +1044,7 @@ help_documentation = Documentation
 help_tutorial = Tutorial
 help_release_notes = Release Notes
 help_twitter = Twitter
-help_register = &Register Aseprite
+help_enter_license = Enter &License
 help_about = &About
 
 [modify_selection]
@@ -1063,10 +1063,10 @@ name = Name:
 tileset = Tileset:
 default_new_layer_name = New Layer
 
-[register]
-title = Register Aseprite
-default_message = If you need an activation code, go to
-activation_code = Activation Code
+[enter_license]
+title = Enter License
+default_message = If you need a license key, go to
+license_key = License Key
 
 [tileset_selector]
 new_tileset = New Tileset
diff --git a/data/widgets/register.xml b/data/widgets/enter_license.xml
similarity index 52%
rename from data/widgets/register.xml
rename to data/widgets/enter_license.xml
index 520ef63ef..83cbb10ac 100644
--- a/data/widgets/register.xml
+++ b/data/widgets/enter_license.xml
@@ -1,22 +1,18 @@
 <!-- Aseprite -->
 <!-- Copyright (c) 2021  Igara Studio S.A. -->
 <gui>
-  <window id="register" text="@.title" expansive="false">
+  <window id="enter_license" text="@.title" expansive="false">
     <box vertical="true">
       <hbox>
         <label text="@.default_message" />
         <link text="https://www.aseprite.org/download/" url="https://www.aseprite.org/download/" />
       </hbox>
-      <separator text="@.activation_code" left="true" horizontal="true" />
-      <grid columns="4">
-        <entry id="code1" cell_align="horizontal" magnet="true" maxsize="5" />
-        <entry id="code2" cell_align="horizontal" maxsize="5" />
-        <entry id="code3" cell_align="horizontal" maxsize="5" />
-      </grid>
+      <separator text="@.license_key" left="true" horizontal="true" />
+      <entry id="license_key" cell_align="horizontal" magnet="true" maxsize="17" />
       <box horizontal="true">
         <box horizontal="true" expansive="true" />
         <box horizontal="true" homogeneous="true">
-          <button text="@general.ok" closewindow="true" id="ok_button" magnet="true" width="60" />
+          <button text="@general.ok" id="ok_button" magnet="true" width="60" />
           <button text="@general.cancel" closewindow="true" />
         </box>
       </box>
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index b54921510..6cd92e604 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -278,7 +278,7 @@ if(ENABLE_UI)
     commands/cmd_pixel_perfect_mode.cpp
     commands/cmd_play_animation.cpp
     commands/cmd_refresh.cpp
-    commands/cmd_register.cpp
+    commands/cmd_enter_license.cpp
     commands/cmd_remove_frame.cpp
     commands/cmd_remove_frame_tag.cpp
     commands/cmd_remove_slice.cpp
diff --git a/src/app/commands/cmd_enter_license.cpp b/src/app/commands/cmd_enter_license.cpp
new file mode 100644
index 000000000..c3f58ed97
--- /dev/null
+++ b/src/app/commands/cmd_enter_license.cpp
@@ -0,0 +1,46 @@
+// Aseprite
+// Copyright (C) 2021  Igara Studio S.A.
+//
+// This program is distributed under the terms of
+// the End-User License Agreement for Aseprite.
+
+#include "app/app.h"
+#include "app/commands/command.h"
+#include "app/context.h"
+
+#include "enter_license.xml.h"
+
+namespace app {
+
+class EnterLicenseCommand : public Command {
+public:
+  EnterLicenseCommand();
+protected:
+  void onExecute(Context* context) override;
+};
+
+EnterLicenseCommand::EnterLicenseCommand()
+  : Command(CommandId::EnterLicense(), CmdUIOnlyFlag)
+{
+}
+
+void EnterLicenseCommand::onExecute(Context* context)
+{
+  // Load the window widget
+  app::gen::EnterLicense window;
+
+  window.setSizeable(false);
+  window.licenseKey()->Change.connect([&window]() {
+    window.licenseKey()->setText(base::string_to_upper(window.licenseKey()->text()));
+  });
+
+  // Open the window
+  window.openWindowInForeground();
+}
+
+Command* CommandFactory::createRegisterCommand()
+{
+  return new EnterLicenseCommand;
+}
+
+} // namespace app
diff --git a/src/app/commands/cmd_register.cpp b/src/app/commands/cmd_register.cpp
deleted file mode 100644
index 5747b12af..000000000
--- a/src/app/commands/cmd_register.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// Aseprite
-// Copyright (C) 2021  Igara Studio S.A.
-//
-// This program is distributed under the terms of
-// the End-User License Agreement for Aseprite.
-
-#include "app/app.h"
-#include "app/commands/command.h"
-#include "app/context.h"
-
-#include "register.xml.h"
-
-namespace app {
-
-class RegisterCommand : public Command {
-public:
-  RegisterCommand();
-protected:
-  void onExecute(Context* context) override;
-};
-
-RegisterCommand::RegisterCommand()
-  : Command(CommandId::Register(), CmdUIOnlyFlag)
-{
-}
-
-void RegisterCommand::onExecute(Context* context)
-{
-  // Load the window widget
-  app::gen::Register window;
-
-  window.setSizeable(false);
-
-  auto onChange = [] (ui::Entry *entry) {
-    return [entry]() {
-      entry->setText(base::string_to_upper(entry->text()));
-    };
-  };
-
-  window.code1()->Change.connect(onChange(window.code1()));
-  window.code2()->Change.connect(onChange(window.code2()));
-  window.code3()->Change.connect(onChange(window.code3()));
-
-  // Open the window
-  window.openWindowInForeground();
-}
-
-Command* CommandFactory::createRegisterCommand()
-{
-  return new RegisterCommand;
-}
-
-} // namespace app