UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[escher] Toolbox: title is a message instead of a const char

Browse Source
This commit is contained in:
Émilie Feral
2018-10-05 13:08:48 +02:00
parent d8ffb73e69
commit 7035ad01ae
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/code/python_toolbox.cpp
View File

@@ -256,7 +256,7 @@ const ToolboxMessageTree toolboxModel = ToolboxMessageTree(I18n::Message::Toolbo
PythonToolbox::PythonToolbox() :
Toolbox(nullptr, I18n::translate(rootModel()->label()))
Toolbox(nullptr, rootModel()->label())
{
}

2
apps/math_toolbox.cpp
View File

@@ -107,7 +107,7 @@ const ToolboxMessageTree toolboxModel = ToolboxMessageTree(I18n::Message::Toolbo
#endif
MathToolbox::MathToolbox() :
Toolbox(nullptr, I18n::translate(rootModel()->label()))
Toolbox(nullptr, rootModel()->label())
{
}

6
escher/include/escher/nested_menu_controller.h
View File

@@ -8,7 +8,7 @@
class NestedMenuController : public StackViewController, public ListViewDataSource, public SelectableTableViewDataSource {
public:
NestedMenuController(Responder * parentResponder, const char * title = 0);
NestedMenuController(Responder * parentResponder, I18n::Message title = (I18n::Message)0);
void setSender(Responder * sender) { m_sender = sender; }
// StackViewController
@@ -45,7 +45,7 @@ protected:
class ListController : public ViewController {
public:
ListController(Responder * parentResponder, SelectableTableView * tableView, const char * title);
ListController(Responder * parentResponder, SelectableTableView * tableView, I18n::Message title);
const char * title() override;
View * view() override;
void didBecomeFirstResponder() override;
@@ -53,7 +53,7 @@ protected:
private:
SelectableTableView * m_selectableTableView;
int m_firstSelectedRow;
const char * m_title;
I18n::Message m_title;
};
static constexpr int LeafCellType = 0;

2
escher/include/escher/toolbox.h
View File

@@ -8,7 +8,7 @@
class Toolbox : public NestedMenuController {
public:
Toolbox(Responder * parentResponder, const char * title = 0);
Toolbox(Responder * parentResponder, I18n::Message title = (I18n::Message)0);
// StackViewController
void viewWillAppear() override;

6
escher/src/nested_menu_controller.cpp
View File

@@ -59,7 +59,7 @@ void NestedMenuController::Stack::resetStack() {
/* List Controller */
NestedMenuController::ListController::ListController(Responder * parentResponder, SelectableTableView * tableView, const char * title) :
NestedMenuController::ListController::ListController(Responder * parentResponder, SelectableTableView * tableView, I18n::Message title) :
ViewController(parentResponder),
m_selectableTableView(tableView),
m_firstSelectedRow(0),
@@ -68,7 +68,7 @@ NestedMenuController::ListController::ListController(Responder * parentResponder
}
const char * NestedMenuController::ListController::title() {
return m_title;
return I18n::translate(m_title);
}
View * NestedMenuController::ListController::view() {
@@ -87,7 +87,7 @@ void NestedMenuController::ListController::setFirstSelectedRow(int firstSelected
/* NestedMenuController */
NestedMenuController::NestedMenuController(Responder * parentResponder, const char * title) :
NestedMenuController::NestedMenuController(Responder * parentResponder, I18n::Message title) :
StackViewController(parentResponder, &m_listController, KDColorWhite, Palette::PurpleBright, Palette::PurpleDark),
m_selectableTableView(&m_listController, this, this),
m_listController(this, &m_selectableTableView, title),

2
escher/src/toolbox.cpp
View File

@@ -3,7 +3,7 @@
#include <assert.h>
#include <string.h>
Toolbox::Toolbox(Responder * parentResponder, const char * title) :
Toolbox::Toolbox(Responder * parentResponder, I18n::Message title) :
NestedMenuController(parentResponder, title),
m_messageTreeModel(nullptr)
{}