Pantyhose-X
/
vengi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

let it compile again

master
Martin Gerhardy 2016-03-11 06:36:41 +01:00
parent a314c4a4e9
commit 178a4cdb25
7 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/Client.cpp
View File

@ -204,7 +204,7 @@ core::AppState Client::onInit() {
_clearColor = glm::vec3(0.04, 0.29, 0.94);
_root.SetSkinBg(tb::TBIDC("background"));
_root.SetSkinBg(TBIDC("background"));
new frontend::LoginWindow(this);
SDL_GL_SetSwapInterval(core::Var::get("cl_vsync", "true")->boolVal());

2
src/modules/frontend/ui/AuthFailedWindow.h
View File

@ -13,7 +13,7 @@ public:
}
bool OnEvent(const tb::TBWidgetEvent &ev) override {
if (ev.type == tb::EVENT_TYPE_CLICK && ev.target->GetID() == tb::TBIDC("ok")) {
if (ev.type == tb::EVENT_TYPE_CLICK && ev.target->GetID() == TBIDC("ok")) {
Close();
return true;
}

2
src/modules/frontend/ui/DisconnectWindow.h
View File

@ -13,7 +13,7 @@ public:
}
bool OnEvent(const tb::TBWidgetEvent &ev) override {
if (ev.type == tb::EVENT_TYPE_CLICK && ev.target->GetID() == tb::TBIDC("ok")) {
if (ev.type == tb::EVENT_TYPE_CLICK && ev.target->GetID() == TBIDC("ok")) {
Close();
return true;
}

2
src/modules/frontend/ui/HudWindow.h
View File

@ -18,7 +18,7 @@ public:
}
bool OnEvent(const tb::TBWidgetEvent &ev) override {
if (ev.type == tb::EVENT_TYPE_CLICK && ev.target->GetID() == tb::TBIDC("disconnect")) {
if (ev.type == tb::EVENT_TYPE_CLICK && ev.target->GetID() == TBIDC("disconnect")) {
_client->disconnect();
return true;
}

4
src/modules/frontend/ui/LoginWindow.h
View File

@ -24,7 +24,7 @@ public:
}
bool OnEvent(const tb::TBWidgetEvent &ev) override {
if ((ev.type == tb::EVENT_TYPE_CLICK && ev.target->GetID() == tb::TBIDC("login")) || ev.special_key == tb::TB_KEY_ENTER) {
if ((ev.type == tb::EVENT_TYPE_CLICK && ev.target->GetID() == TBIDC("login")) || ev.special_key == tb::TB_KEY_ENTER) {
TBWidget *email = ev.target->GetParentWindow()->GetWidgetByID(tb::TBID("email"));
TBWidget *password = ev.target->GetParentWindow()->GetWidgetByID(tb::TBID("password"));
@ -36,7 +36,7 @@ public:
if (!_client->connect(port->intVal(), host->strVal())) {
tb::TBStr text;
text.SetFormatted("Failed to connect");
tb::TBMessageWindow *win = new tb::TBMessageWindow(this, tb::TBIDC(""));
tb::TBMessageWindow *win = new tb::TBMessageWindow(this, TBIDC(""));
win->Show("Failed to connect", text);
} else {
Close();

2
src/modules/ui/TurboBadger.h
View File

@ -1,5 +1,7 @@
#pragma once
#include <tb_core.h>
#include <tb_language.h>
#include <tb_node_tree.h>
#include <tb_skin.h>
#include <tb_system.h>

30
src/modules/ui/UIApp.cpp
View File

@ -122,30 +122,30 @@ bool UIApp::invokeKey(int key, tb::SPECIAL_KEY special, tb::MODIFIER_KEYS mod, b
key += 'A' - 'a';
tb::TBID id;
if (key == 'X')
id = tb::TBIDC("cut");
id = TBIDC("cut");
else if (key == 'C' || special == tb::TB_KEY_INSERT)
id = tb::TBIDC("copy");
id = TBIDC("copy");
else if (key == 'V' || (special == tb::TB_KEY_INSERT && reverseKey))
id = tb::TBIDC("paste");
id = TBIDC("paste");
else if (key == 'A')
id = tb::TBIDC("selectall");
id = TBIDC("selectall");
else if (key == 'Z' || key == 'Y') {
bool undo = key == 'Z';
if (reverseKey)
undo = !undo;
id = undo ? tb::TBIDC("undo") : tb::TBIDC("redo");
id = undo ? TBIDC("undo") : TBIDC("redo");
} else if (key == 'N')
id = tb::TBIDC("new");
id = TBIDC("new");
else if (key == 'O')
id =tb:: TBIDC("open");
id = TBIDC("open");
else if (key == 'S')
id = tb::TBIDC("save");
id = TBIDC("save");
else if (key == 'W')
id = tb::TBIDC("close");
id = TBIDC("close");
else if (special == tb::TB_KEY_PAGE_UP)
id = tb::TBIDC("prev_doc");
id = TBIDC("prev_doc");
else if (special == tb::TB_KEY_PAGE_DOWN)
id = tb::TBIDC("next_doc");
id = TBIDC("next_doc");
else
return false;
@ -260,11 +260,13 @@ core::AppState UIApp::onConstruct() {
}
core::AppState UIApp::onInit() {
if (!tb::tb_core_init(&_renderer, "ui/lang/en.tb.txt")) {
if (!tb::tb_core_init(&_renderer)) {
Log::error("failed to initialize the ui");
return core::AppState::Cleanup;
}
tb::g_tb_lng->Load("ui/lang/en.tb.txt");
if (!tb::g_tb_skin->Load("ui/skin/skin.tb.txt", nullptr)) {
Log::error("could not load the skin");
return core::AppState::Cleanup;
@ -283,7 +285,7 @@ core::AppState UIApp::onInit() {
register_tbbf_font_renderer();
tb::g_font_manager->AddFontInfo("ui/font/font.tb.txt", "Segoe");
tb::TBFontDescription fd;
fd.SetID(tb::TBIDC("Segoe"));
fd.SetID(TBIDC("Segoe"));
fd.SetSize(tb::g_tb_skin->GetDimensionConverter()->DpToPx(14));
tb::g_font_manager->SetDefaultFontDescription(fd);
tb::TBFontFace *font = tb::g_font_manager->CreateFontFace(tb::g_font_manager->GetDefaultFontDescription());
@ -294,7 +296,7 @@ core::AppState UIApp::onInit() {
font->RenderGlyphs(" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~•·åäöÅÄÖ");
_root.SetRect(tb::TBRect(0, 0, _width, _height));
_root.SetSkinBg(tb::TBIDC("background"));
_root.SetSkinBg(TBIDC("background"));
const core::AppState state = WindowedApp::onInit();
return state;