Skip to content

Commit 81cb431

Browse files
committed
feat(UI): add macros tab to dashboard [closes #91]
1 parent 0445b14 commit 81cb431

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+18
-7
lines changed

src/UI/Widgets/Dashboard/Dashboard.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ namespace UI
1818

1919
Dashboard::Dashboard(const std::string& name, LvObj& parent)
2020
: View(name, parent, layout_t(0, 0, 100, 100))
21-
, m_fileView("files", m_tabs.addTab(_("app_drawer.files")))
22-
, m_statusView("status", m_tabs.addTab(_("app_drawer.status")))
2321
{
2422
ZoneScoped;
2523
setStylePad(0);
@@ -28,6 +26,7 @@ namespace UI
2826
m_toolList.addStyle(Themes::getLvglStyles().card);
2927
m_graph.addStyle(Themes::getLvglStyles().card);
3028
m_fileView.addStyle(Themes::getLvglStyles().card);
29+
m_macroView.addStyle(Themes::getLvglStyles().card);
3130

3231
setLayoutStyle(LV_LAYOUT_GRID);
3332
setGridDsc(s_mainWindowLayoutColDsc, s_mainWindowLayoutRowDsc);
@@ -48,7 +47,7 @@ namespace UI
4847

4948
/* Tabs (Jobs & Status) */
5049
m_tabs.setActiveTab(0);
51-
// m_tabs.setTabBarPosition(LV_DIR_TOP, true);
50+
m_macroView.getPresenter()->setBaseFolder(FilePresenter::BaseFolder::MACROS);
5251
}
5352

5453
void Dashboard::disableJobsTab(bool disable)

src/UI/Widgets/Dashboard/Dashboard.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace UI
2929
StatusView& getStatusView() { return m_statusView; }
3030

3131
void showJobsTab() { m_tabs.setActiveTab(0); }
32-
void showStatusTab() { m_tabs.setActiveTab(1); }
32+
void showStatusTab() { m_tabs.setActiveTab(2); }
3333
void disableJobsTab(bool disable);
3434

3535
void setNumberPad(ModalNumberPad* np);
@@ -41,7 +41,8 @@ namespace UI
4141
TemperatureGraph m_graph{"graph", getRoot()};
4242

4343
TabView m_tabs{"tabs", getRoot()};
44-
FileView m_fileView;
45-
StatusView m_statusView;
44+
FileView m_fileView{"files", m_tabs.addTab(_("file.jobs"))};
45+
FileView m_macroView{"macros", m_tabs.addTab(_("file.macros"))};
46+
StatusView m_statusView{"status", m_tabs.addTab(_("app_drawer.status"))};
4647
};
4748
} // namespace UI

src/UI/Widgets/Dashboard/DashboardPresenter.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,10 @@ namespace UI
3232
break;
3333
}
3434
}
35+
36+
void DashboardPresenter::newJobFileName(const std::string& /* filename */)
37+
{
38+
ZoneScoped;
39+
getView()->showStatusTab();
40+
}
3541
} // namespace UI

src/UI/Widgets/Dashboard/DashboardPresenter.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,14 @@ namespace UI
2727

2828
// Observers
2929
void newStatus(const OM::PrinterStatus& status);
30+
void newJobFileName(const std::string& filename);
3031

3132
protected:
32-
void onInit() override { registerEventListener<EventType::Status>(this, &DashboardPresenter::newStatus); }
33+
void onInit() override
34+
{
35+
registerEventListener<EventType::Status>(this, &DashboardPresenter::newStatus);
36+
registerEventListener<EventType::JobFileName>(this, &DashboardPresenter::newJobFileName);
37+
}
3338
void onActivate() override {}
3439
void onDeactivate() override {}
3540

759 Bytes
759 Bytes
50 Bytes
51 Bytes
52 Bytes
51 Bytes

0 commit comments

Comments
 (0)