From 1b76a48ae201868891f14bc14d626cb2c312caa8 Mon Sep 17 00:00:00 2001
From: Quentin <quentin.guidee@gmail.com>
Date: Sat, 20 Jun 2020 19:31:42 +0200
Subject: [PATCH] [Revert] Omega App

---
 apps/omega/Makefile                    |  24 ------
 apps/omega/app.cpp                     |  43 ----------
 apps/omega/app.h                       |  31 -------
 apps/omega/base.de.i18n                |   4 -
 apps/omega/base.en.i18n                |   4 -
 apps/omega/base.es.i18n                |   4 -
 apps/omega/base.fr.i18n                |   4 -
 apps/omega/base.hu.i18n                |   4 -
 apps/omega/base.pt.i18n                |   4 -
 apps/omega/base.universal.i18n         |   2 -
 apps/omega/contributors_controller.cpp | 110 -------------------------
 apps/omega/contributors_controller.h   |  38 ---------
 apps/omega/contributors_view.cpp       |  33 --------
 apps/omega/contributors_view.h         |  22 -----
 apps/omega/omega_controller.cpp        |  79 ------------------
 apps/omega/omega_controller.h          |  35 --------
 apps/omega/omega_icon.png              | Bin 6806 -> 0 bytes
 apps/omega/omega_view.cpp              |  50 -----------
 apps/omega/omega_view.h                |  25 ------
 build/config.mak                       |   2 +-
 themes                                 |   2 +-
 21 files changed, 2 insertions(+), 518 deletions(-)
 delete mode 100644 apps/omega/Makefile
 delete mode 100644 apps/omega/app.cpp
 delete mode 100644 apps/omega/app.h
 delete mode 100644 apps/omega/base.de.i18n
 delete mode 100644 apps/omega/base.en.i18n
 delete mode 100644 apps/omega/base.es.i18n
 delete mode 100644 apps/omega/base.fr.i18n
 delete mode 100644 apps/omega/base.hu.i18n
 delete mode 100644 apps/omega/base.pt.i18n
 delete mode 100644 apps/omega/base.universal.i18n
 delete mode 100644 apps/omega/contributors_controller.cpp
 delete mode 100644 apps/omega/contributors_controller.h
 delete mode 100644 apps/omega/contributors_view.cpp
 delete mode 100644 apps/omega/contributors_view.h
 delete mode 100644 apps/omega/omega_controller.cpp
 delete mode 100644 apps/omega/omega_controller.h
 delete mode 100644 apps/omega/omega_icon.png
 delete mode 100644 apps/omega/omega_view.cpp
 delete mode 100644 apps/omega/omega_view.h

diff --git a/apps/omega/Makefile b/apps/omega/Makefile
deleted file mode 100644
index 40c0d3736..000000000
--- a/apps/omega/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-apps += Omega::App
-app_headers += apps/omega/app.h
-
-apps_src += $(addprefix apps/omega/,\
-  app.cpp \
-  omega_controller.cpp \
-  omega_view.cpp \
-  contributors_controller.cpp \
-  contributors_view.cpp \
-)
-
-app_images += apps/omega/omega_icon.png
-
-i18n_files += $(addprefix apps/omega/,\
-	base.de.i18n\
-	base.en.i18n\
-	base.es.i18n\
-	base.fr.i18n\
-	base.pt.i18n\
-	base.hu.i18n\
-	base.universal.i18n\
-)
-
-$(eval $(call depends_on_image,apps/omega/app.cpp,apps/omega/omega_icon.png))
\ No newline at end of file
diff --git a/apps/omega/app.cpp b/apps/omega/app.cpp
deleted file mode 100644
index fec7f0027..000000000
--- a/apps/omega/app.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "app.h"
-#include "apps/apps_container.h"
-#include "omega_icon.h"
-#include "apps/i18n.h"
-#include <assert.h>
-
-namespace Omega {
-
-I18n::Message App::Descriptor::name() {
-  return I18n::Message::OmegaApp;
-}
-
-I18n::Message App::Descriptor::upperName() {
-  return I18n::Message::OmegaAppCapital;
-}
-
-const Image * App::Descriptor::icon() {
-  return ImageStore::OmegaIcon;
-}
-
-App::Snapshot::Snapshot()
-{
-}
-
-App * App::Snapshot::unpack(Container * container) {
-  return new App(this);
-}
-
-App::Descriptor * App::Snapshot::descriptor() {
-  static Descriptor descriptor;
-  return &descriptor;
-}
-
-void App::Snapshot::reset() {
-}
-
-App::App(Snapshot * snapshot) :
-  ::App(snapshot, &m_omegaController),
-  m_omegaController(this)
-{
-}
-
-}
diff --git a/apps/omega/app.h b/apps/omega/app.h
deleted file mode 100644
index 9b3988a17..000000000
--- a/apps/omega/app.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef OMEGA_APP_H
-#define OMEGA_APP_H
-
-#include <escher.h>
-#include "omega_controller.h"
-
-namespace Omega {
-
-class App : public ::App {
-public:
-  class Descriptor : public ::App::Descriptor {
-  public:
-    I18n::Message name() override;
-    I18n::Message upperName() override;
-    const Image * icon() override;
-  };
-  class Snapshot : public ::App::Snapshot {
-  public:
-    Snapshot();
-    App * unpack(Container * container) override;
-    void reset() override;
-    Descriptor * descriptor() override;
-  };
-private:
-  App(Snapshot * snapshot);
-  OmegaController m_omegaController;
-};
-
-}
-
-#endif
diff --git a/apps/omega/base.de.i18n b/apps/omega/base.de.i18n
deleted file mode 100644
index 940675369..000000000
--- a/apps/omega/base.de.i18n
+++ /dev/null
@@ -1,4 +0,0 @@
-OmegaApp = "Omega"
-OmegaAppCapital = "OMEGA"
-OmegaContributors = "Beiträger"
-OmegaVersion = "Version"
diff --git a/apps/omega/base.en.i18n b/apps/omega/base.en.i18n
deleted file mode 100644
index 85ef278ce..000000000
--- a/apps/omega/base.en.i18n
+++ /dev/null
@@ -1,4 +0,0 @@
-OmegaApp = "Omega"
-OmegaAppCapital = "OMEGA"
-OmegaContributors = "Contributors"
-OmegaVersion = "Version"
diff --git a/apps/omega/base.es.i18n b/apps/omega/base.es.i18n
deleted file mode 100644
index 52f749487..000000000
--- a/apps/omega/base.es.i18n
+++ /dev/null
@@ -1,4 +0,0 @@
-OmegaApp = "Omega"
-OmegaAppCapital = "OMEGA"
-OmegaContributors = "Contribuyentes"
-OmegaVersion = "Versión"
diff --git a/apps/omega/base.fr.i18n b/apps/omega/base.fr.i18n
deleted file mode 100644
index 6e5579b8b..000000000
--- a/apps/omega/base.fr.i18n
+++ /dev/null
@@ -1,4 +0,0 @@
-OmegaApp = "Omega"
-OmegaAppCapital = "OMEGA"
-OmegaContributors = "Contributeurs"
-OmegaVersion = "Version"
diff --git a/apps/omega/base.hu.i18n b/apps/omega/base.hu.i18n
deleted file mode 100644
index 4b5fbedfd..000000000
--- a/apps/omega/base.hu.i18n
+++ /dev/null
@@ -1,4 +0,0 @@
-OmegaApp = "Omega"
-OmegaAppCapital = "OMEGA"
-OmegaContributors = "Közremüködök"
-OmegaVersion = "Verzió"
diff --git a/apps/omega/base.pt.i18n b/apps/omega/base.pt.i18n
deleted file mode 100644
index e5a90c9d1..000000000
--- a/apps/omega/base.pt.i18n
+++ /dev/null
@@ -1,4 +0,0 @@
-OmegaApp = "Omega"
-OmegaAppCapital = "OMEGA"
-OmegaContributors = "Contribuidores"
-OmegaVersion = "Versão"
diff --git a/apps/omega/base.universal.i18n b/apps/omega/base.universal.i18n
deleted file mode 100644
index 24a59a341..000000000
--- a/apps/omega/base.universal.i18n
+++ /dev/null
@@ -1,2 +0,0 @@
-OmegaURL = "getomega.web.app"
-OmegaDiscord = "discord.gg/X2TWhh9"
diff --git a/apps/omega/contributors_controller.cpp b/apps/omega/contributors_controller.cpp
deleted file mode 100644
index 2d59371d9..000000000
--- a/apps/omega/contributors_controller.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-#include "contributors_controller.h"
-#include <assert.h>
-#include "apps/i18n.h"
-
-// using namespace Shared;
-
-namespace Omega {
-
-// constexpr SettingsMessageTree s_contributorsChildren[17] = {
-//   SettingsMessageTree(I18n::Message::Developers),
-//   SettingsMessageTree(I18n::Message::QuentinGuidee),
-//   SettingsMessageTree(I18n::Message::SandraSimmons),
-//   SettingsMessageTree(I18n::Message::JoachimLeFournis),
-//   SettingsMessageTree(I18n::Message::JeanBaptisteBoric),
-//   SettingsMessageTree(I18n::Message::MaximeFriess),
-//   SettingsMessageTree(I18n::Message::David),
-//   SettingsMessageTree(I18n::Message::DamienNicolet),
-//   SettingsMessageTree(I18n::Message::EvannDreumont),
-//   SettingsMessageTree(I18n::Message::SzaboLevente),
-//   SettingsMessageTree(I18n::Message::VenceslasDuet),
-//   SettingsMessageTree(I18n::Message::CharlotteThomas),
-//   SettingsMessageTree(I18n::Message::BetaTesters),
-//   SettingsMessageTree(I18n::Message::CyprienMejat),
-//   SettingsMessageTree(I18n::Message::TimeoArnouts),
-//   SettingsMessageTree(I18n::Message::LouisC),
-//   SettingsMessageTree(I18n::Message::LelahelHideux)
-// };
-
-ContributorsController::ContributorsController(Responder * parentResponder) :
-  ViewController(parentResponder),
-  SelectableTableViewDataSource(),
-  m_contributorsView(&m_selectableTableView),
-  m_contributorCell(),
-  m_selectableTableView(this)
-{
-}
-
-View * ContributorsController::view() {
-  return &m_contributorsView;
-}
-
-const char * ContributorsController::title() {
-  return "Contributors";
-}
-
-void ContributorsController::didBecomeFirstResponder() {
-  if (selectedRow() < 0) {
-    selectCellAtLocation(0, 0);
-  }
-  Container::activeApp()->setFirstResponder(&m_selectableTableView);
-}
-
-void ContributorsController::viewWillAppear() {
-  ViewController::viewWillAppear();
-  m_selectableTableView.reloadData();
-}
-
-bool ContributorsController::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::Left) {
-    stackController()->pop();
-    return true;
-  }
-  return false;
-}
-
-int ContributorsController::numberOfRows() const {
-  return 1;
-}
-
-KDCoordinate ContributorsController::rowHeight(int j) {
-  return Metric::ParameterCellHeight;
-}
-
-KDCoordinate ContributorsController::cumulatedHeightFromIndex(int j) {
-  return rowHeight(0) * j;
-}
-
-int ContributorsController::indexFromCumulatedHeight(KDCoordinate offsetY) {
-  KDCoordinate height = rowHeight(0);
-  if (height == 0) {
-    return 0;
-  }
-  return (offsetY - 1) / height;
-}
-
-HighlightCell * ContributorsController::reusableCell(int index, int type) {
-  assert(index >= 0 && index <= k_numberOfCells);
-  return &m_contributorCell;
-}
-
-int ContributorsController::reusableCellCount(int type) {
-  return 1;
-}
-
-int ContributorsController::typeAtLocation(int i, int j) {
-  return 0;
-}
-
-void ContributorsController::willDisplayCellForIndex(HighlightCell * cell, int index) {
-  MessageTableCell * myCell = (MessageTableCell *)cell;
-  //I18n::Message titles[1] = {I18n::Message::OmegaContributors};
-  //myCell->setMessage(titles[index]);
-  myCell->setMessage(I18n::Message::QuentinGuidee);
-}
-
-StackViewController * ContributorsController::stackController() const {
-    return (StackViewController *)parentResponder();
-}
-
-}
diff --git a/apps/omega/contributors_controller.h b/apps/omega/contributors_controller.h
deleted file mode 100644
index 4c5dd210a..000000000
--- a/apps/omega/contributors_controller.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef APPS_OMEGA_CONTRIBUTORS_CONTROLLER_H
-#define APPS_OMEGA_CONTRIBUTORS_CONTROLLER_H
-
-#include <escher.h>
-#include "contributors_view.h"
-// #include <apps/shared/settings_message_tree.h>
-
-namespace Omega {
-
-class ContributorsController : public ViewController, public ListViewDataSource, public SelectableTableViewDataSource, public SelectableTableViewDelegate {
-public:
-  ContributorsController(Responder * parentResponder);
-  const char * title() override;
-  View * view() override;
-  bool handleEvent(Ion::Events::Event event) override;
-  void didBecomeFirstResponder() override;
-  void viewWillAppear() override;
- 
-  KDCoordinate cumulatedHeightFromIndex(int j) override;
-  int indexFromCumulatedHeight(KDCoordinate offsetY) override; 
-  virtual int numberOfRows() const override;
-  virtual KDCoordinate rowHeight(int j) override;
-  HighlightCell * reusableCell(int index, int type) override;
-  int reusableCellCount(int type) override;
-  int typeAtLocation(int i, int j) override;
-  void willDisplayCellForIndex(HighlightCell * cell, int index) override;
-private:
-  StackViewController * stackController() const;
-  virtual int initialSelectedRow() const { return 0; }
-  constexpr static int k_numberOfCells = 1;
-  ContributorsView m_contributorsView;
-  MessageTableCell m_contributorCell;
-  SelectableTableView m_selectableTableView;
-};
-
-}
-
-#endif
diff --git a/apps/omega/contributors_view.cpp b/apps/omega/contributors_view.cpp
deleted file mode 100644
index 4601c2135..000000000
--- a/apps/omega/contributors_view.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "contributors_view.h"
-#include "apps/i18n.h"
-
-namespace Omega {
-
-ContributorsView::ContributorsView(SelectableTableView * selectableTableView) :
-  View(),
-  m_selectableTableView(selectableTableView)
-{
-}
-
-void ContributorsView::drawRect(KDContext * ctx, KDRect rect) const {
-  ctx->fillRect(KDRect(0, 0, bounds().width(), bounds().height()), Palette::BackgroundApps);
-}
-
-void ContributorsView::reload() {
-  markRectAsDirty(bounds());
-}
-
-int ContributorsView::numberOfSubviews() const {
-  return 1;
-}
-
-View * ContributorsView::subviewAtIndex(int index) {
-  assert(index == 0 || index == 1);
-  return m_selectableTableView;
-}
-
-void ContributorsView::layoutSubviews(bool force) {
-  m_selectableTableView->setFrame(KDRect(0, 0, bounds().width(), bounds().height()), force);
-}
-
-}
diff --git a/apps/omega/contributors_view.h b/apps/omega/contributors_view.h
deleted file mode 100644
index 3b9ca7f4e..000000000
--- a/apps/omega/contributors_view.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef APPS_OMEGA_CONTRIBUTORS_VIEW_H
-#define APPS_OMEGA_CONTRIBUTORS_VIEW_H
-
-#include <escher.h>
-
-namespace Omega {
-
-class ContributorsView : public View {
-public:
-  ContributorsView(SelectableTableView * selectableTableView);
-  void drawRect(KDContext * ctx, KDRect rect) const override;
-  void reload();
-  int numberOfSubviews() const override;
-  View * subviewAtIndex(int index) override;
-private:
-  void layoutSubviews(bool force = false) override;
-  SelectableTableView * m_selectableTableView;
-};
-
-}
-
-#endif
diff --git a/apps/omega/omega_controller.cpp b/apps/omega/omega_controller.cpp
deleted file mode 100644
index 37419f46a..000000000
--- a/apps/omega/omega_controller.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-#include "omega_controller.h"
-#include <assert.h>
-#include "apps/i18n.h"
-
-namespace Omega {
-
-OmegaController::OmegaController(Responder * parentResponder) :
-  ViewController(parentResponder),
-  SelectableTableViewDataSource(),
-  m_omegaView(&m_selectableTableView),
-  m_selectableTableView(this),
-  m_contributorsCell(),
-  m_versionCell(),
-  m_contributorsController(this)
-{
-  m_contributorsCell.setMessageFont(KDFont::LargeFont);
-  m_versionCell.setMessageFont(KDFont::LargeFont);
-  m_versionCell.setAccessoryFont(KDFont::SmallFont);
-  m_versionCell.setAccessoryText(Ion::omegaVersion());
-}
-
-View * OmegaController::view() {
-  return &m_omegaView;
-}
-
-void OmegaController::didBecomeFirstResponder() {
-  if (selectedRow() < 0) {
-    selectCellAtLocation(0, 0);
-  }
-  Container::activeApp()->setFirstResponder(&m_selectableTableView);
-}
-
-bool OmegaController::handleEvent(Ion::Events::Event event) {
-  if (event == Ion::Events::OK || event == Ion::Events::EXE || event == Ion::Events::Right) {
-    //StackViewController * stack = (StackViewController *)parentResponder();
-    stackController()->push(&m_contributorsController, Palette::BannerFirstText, Palette::BannerFirstBackground, Palette::BannerFirstBorder);
-    return true;
-  }
-  return false;
-}
-
-int OmegaController::numberOfRows() const {
-  return 2;
-}
-
-KDCoordinate OmegaController::rowHeight(int j) {
-  return Metric::ParameterCellHeight;
-}
-
-HighlightCell * OmegaController::reusableCell(int index, int type) {
-  assert(index >= 0 && index <= 1);
-  switch (index)
-  {
-    case 1:
-      return &m_versionCell;
-    default:
-      return &m_contributorsCell;
-  }
-}
-
-int OmegaController::reusableCellCount(int type) {
-  return 2;
-}
-
-int OmegaController::typeAtLocation(int i, int j) {
-  return 0;
-}
-
-void OmegaController::willDisplayCellForIndex(HighlightCell * cell, int index) {
-  MessageTableCell * myCell = (MessageTableCell *)cell;
-  I18n::Message titles[2] = {I18n::Message::OmegaContributors, I18n::Message::OmegaVersion};
-  myCell->setMessage(titles[index]);
-}
-
-StackViewController * OmegaController::stackController() const {
-  return (StackViewController *)parentResponder();
-}
-
-}
diff --git a/apps/omega/omega_controller.h b/apps/omega/omega_controller.h
deleted file mode 100644
index cea3e5bf3..000000000
--- a/apps/omega/omega_controller.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef APPS_OMEGA_CONTROLLER_H
-#define APPS_OMEGA_CONTROLLER_H
-
-#include <escher.h>
-#include "omega_view.h"
-#include "contributors_controller.h"
-
-namespace Omega {
-
-class OmegaController : public ViewController, public ListViewDataSource, public SelectableTableViewDataSource, public SelectableTableViewDelegate {
-public:
-  OmegaController(Responder * parentResponder);
-  View * view() override;
-  bool handleEvent(Ion::Events::Event event) override;
-  void didBecomeFirstResponder() override;
-  
-  virtual int numberOfRows() const override;
-  virtual KDCoordinate rowHeight(int j) override;
-  HighlightCell * reusableCell(int index, int type) override;
-  int reusableCellCount(int type) override;
-  int typeAtLocation(int i, int j) override;
-  void willDisplayCellForIndex(HighlightCell * cell, int index) override;
-private:
-  StackViewController * stackController() const;
-  constexpr static int k_numberOfCells = 2;
-  OmegaView m_omegaView;
-  SelectableTableView m_selectableTableView;
-  MessageTableCellWithChevron m_contributorsCell;
-  MessageTableCellWithBuffer m_versionCell;
-  ContributorsController m_contributorsController;
-};
-
-}
-
-#endif
diff --git a/apps/omega/omega_icon.png b/apps/omega/omega_icon.png
deleted file mode 100644
index 5a2d74f3a72cd7fcfbbf4e33555814fcc16e264b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6806
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
Eg8tL)K>z>%

diff --git a/apps/omega/omega_view.cpp b/apps/omega/omega_view.cpp
deleted file mode 100644
index 1dc8f8f09..000000000
--- a/apps/omega/omega_view.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "omega_view.h"
-#include "apps/i18n.h"
-
-namespace Omega {
-
-OmegaView::OmegaView(SelectableTableView * selectableTableView) :
-  View(),
-  m_omegaTextView(KDFont::LargeFont, I18n::Message::OmegaApp, 0.5, 0.1, Palette::Toolbar, Palette::BackgroundApps),
-  m_urlTextView(KDFont::SmallFont, I18n::Message::OmegaURL, 0.5, 0.2, Palette::SecondaryText, Palette::BackgroundApps),
-  m_discordTextView(KDFont::SmallFont, I18n::Message::OmegaDiscord, 0.5, 0.2, Palette::SecondaryText, Palette::BackgroundApps),
-  m_selectableTableView(selectableTableView)
-{
-}
-
-void OmegaView::drawRect(KDContext * ctx, KDRect rect) const {
-  ctx->fillRect(KDRect(0, 0, bounds().width(), bounds().height()), Palette::BackgroundApps);
-}
-
-void OmegaView::reload() {
-  markRectAsDirty(bounds());
-}
-
-int OmegaView::numberOfSubviews() const {
-  return 4;
-}
-
-View * OmegaView::subviewAtIndex(int index) {
-  assert(index >= 0 && index <= 3);
-  switch (index)
-  {
-    case 1:
-      return &m_urlTextView;
-    case 2:
-      return &m_discordTextView;
-    case 3:
-      return m_selectableTableView;
-    default:
-      return &m_omegaTextView;
-  }
-}
-
-void OmegaView::layoutSubviews(bool force) {
-  KDCoordinate textHeight = KDFont::SmallFont->glyphSize().height();
-  m_omegaTextView.setFrame(KDRect(0, 30, bounds().width(), textHeight + 12), force);
-  m_urlTextView.setFrame(KDRect(0, 60, bounds().width(), textHeight), force);
-  m_discordTextView.setFrame(KDRect(0, 76, bounds().width(), textHeight), force);
-  m_selectableTableView->setFrame(KDRect(0, 100, bounds().width(), bounds().height()), force);
-}
-
-}
diff --git a/apps/omega/omega_view.h b/apps/omega/omega_view.h
deleted file mode 100644
index 11428c0c2..000000000
--- a/apps/omega/omega_view.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef APPS_OMEGA_VIEW_H
-#define APPS_OMEGA_VIEW_H
-
-#include <escher.h>
-
-namespace Omega {
-
-class OmegaView : public View {
-public:
-  OmegaView(SelectableTableView * selectableTableView);
-  void drawRect(KDContext * ctx, KDRect rect) const override;
-  void reload();
-  int numberOfSubviews() const override;
-  View * subviewAtIndex(int index) override;
-private:
-  void layoutSubviews(bool force = false) override;
-  MessageTextView m_omegaTextView;
-  MessageTextView m_urlTextView;
-  MessageTextView m_discordTextView;
-  SelectableTableView * m_selectableTableView;
-};
-
-}
-
-#endif
diff --git a/build/config.mak b/build/config.mak
index 4271b3581..6f2e004ed 100644
--- a/build/config.mak
+++ b/build/config.mak
@@ -7,7 +7,7 @@ HOME_DISPLAY_EXTERNALS ?= 1
 EPSILON_VERSION ?= 13.1.0
 OMEGA_VERSION ?= 1.20.0
 # USERNAME ?= N/A
-EPSILON_APPS ?= calculation rpn graph code statistics probability solver atom sequence regression settings external omega
+EPSILON_APPS ?= calculation rpn graph code statistics probability solver atom sequence regression settings external
 EPSILON_I18N ?= en fr es de pt hu
 # EPSILON_I18N ?= en fr es de pt hu
 EPSILON_GETOPT ?= 0
diff --git a/themes b/themes
index 1cc7e3805..c0f54d229 160000
--- a/themes
+++ b/themes
@@ -1 +1 @@
-Subproject commit 1cc7e38051441301a9b42349244ae0831affc15a
+Subproject commit c0f54d2298f0fff5d22d8d45401aee7e3e34e701