Merge fixing, commit to catch up on recent files

This commit is contained in:
furrtek 2016-02-04 10:27:53 +01:00
parent 44638e504b
commit 6e496e2b26
90 changed files with 2257 additions and 1428 deletions

View file

@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
* Copyright (C) 2016 Furrtek
*
* This file is part of PortaPack.
*
@ -31,7 +32,7 @@ namespace ui {
class LoadModuleView : public View {
public:
LoadModuleView(NavigationView& nav, const char * hash, View* new_view);
LoadModuleView(NavigationView& nav, const char * hash, View * new_view);
void loadmodule();
void on_show() override;
@ -40,12 +41,17 @@ public:
void paint(Painter& painter) override;
private:
int load_image(void);
const char * _hash;
bool _mod_loaded = false;
Text text_info {
{ 8, 64, 224, 16 },
"Searching module..."
"-"
};
Text text_infob {
{ 8, 64+16, 224, 16 },
"-"
};
Button button_ok {