mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-07-11 01:25:07 +02:00
Remove UI::EVENT_SKIPPED, not any real need for it
This commit is contained in:
+16
-10
@@ -47,9 +47,7 @@
|
||||
#include "UI/RemoteISOScreen.h"
|
||||
#include "UI/OnScreenDisplay.h"
|
||||
|
||||
using namespace UI;
|
||||
|
||||
static const char *REPORT_HOSTNAME = "report.ppsspp.org";
|
||||
static const char * const REPORT_HOSTNAME = "report.ppsspp.org";
|
||||
static const int REPORT_PORT = 80;
|
||||
|
||||
static bool scanCancelled = false;
|
||||
@@ -296,9 +294,9 @@ void RemoteISOScreen::update() {
|
||||
if (!WebServerStopped(WebServerFlags::DISCS) && frameCount_ > 60) {
|
||||
auto result = IsServerAllowed(g_Config.iRemoteISOPort);
|
||||
if (result == ServerAllowStatus::NO) {
|
||||
firewallWarning_->SetVisibility(V_VISIBLE);
|
||||
firewallWarning_->SetVisibility(UI::V_VISIBLE);
|
||||
} else if (result == ServerAllowStatus::YES) {
|
||||
firewallWarning_->SetVisibility(V_GONE);
|
||||
firewallWarning_->SetVisibility(UI::V_GONE);
|
||||
}
|
||||
frameCount_ = 0;
|
||||
}
|
||||
@@ -318,6 +316,8 @@ void RemoteISOScreen::CreateConnectTab(UI::ViewGroup *tab) {
|
||||
auto di = GetI18NCategory(I18NCat::DIALOG);
|
||||
auto ri = GetI18NCategory(I18NCat::REMOTEISO);
|
||||
|
||||
using namespace UI;
|
||||
|
||||
Margins actionMenuMargins(0, 20, 15, 0);
|
||||
Margins contentMargins(0, 20, 5, 5);
|
||||
|
||||
@@ -368,6 +368,8 @@ void RemoteISOScreen::CreateConnectTab(UI::ViewGroup *tab) {
|
||||
void RemoteISOScreen::CreateSettingsTab(UI::ViewGroup *remoteisoSettings) {
|
||||
serverRunning_ = !WebServerStopped(WebServerFlags::DISCS);
|
||||
|
||||
using namespace UI;
|
||||
|
||||
auto ri = GetI18NCategory(I18NCat::REMOTEISO);
|
||||
|
||||
remoteisoSettings->Add(new ItemHeader(ri->T("Remote disc streaming")));
|
||||
@@ -427,26 +429,26 @@ UI::EventReturn RemoteISOScreen::OnChangeRemoteISOSubdir(UI::EventParams &e) {
|
||||
UI::EventReturn RemoteISOScreen::HandleStartServer(UI::EventParams &e) {
|
||||
frameCount_ = 0;
|
||||
if (!StartWebServer(WebServerFlags::DISCS)) {
|
||||
return EVENT_SKIPPED;
|
||||
return UI::EVENT_DONE;
|
||||
}
|
||||
|
||||
return EVENT_DONE;
|
||||
return UI::EVENT_DONE;
|
||||
}
|
||||
|
||||
UI::EventReturn RemoteISOScreen::HandleStopServer(UI::EventParams &e) {
|
||||
if (!StopWebServer(WebServerFlags::DISCS)) {
|
||||
return EVENT_SKIPPED;
|
||||
return UI::EVENT_DONE;
|
||||
}
|
||||
|
||||
serverStopping_ = true;
|
||||
RecreateViews();
|
||||
|
||||
return EVENT_DONE;
|
||||
return UI::EVENT_DONE;
|
||||
}
|
||||
|
||||
UI::EventReturn RemoteISOScreen::HandleBrowse(UI::EventParams &e) {
|
||||
screenManager()->push(new RemoteISOConnectScreen());
|
||||
return EVENT_DONE;
|
||||
return UI::EVENT_DONE;
|
||||
}
|
||||
|
||||
RemoteISOConnectScreen::RemoteISOConnectScreen() {
|
||||
@@ -478,6 +480,8 @@ void RemoteISOConnectScreen::CreateViews() {
|
||||
auto di = GetI18NCategory(I18NCat::DIALOG);
|
||||
auto ri = GetI18NCategory(I18NCat::REMOTEISO);
|
||||
|
||||
using namespace UI;
|
||||
|
||||
Margins actionMenuMargins(0, 20, 15, 0);
|
||||
Margins contentMargins(0, 20, 5, 5);
|
||||
ViewGroup *leftColumn = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(WRAP_CONTENT, FILL_PARENT, 0.4f, contentMargins));
|
||||
@@ -595,6 +599,8 @@ void RemoteISOBrowseScreen::CreateViews() {
|
||||
|
||||
bool vertical = UseVerticalLayout();
|
||||
|
||||
using namespace UI;
|
||||
|
||||
TabHolder *leftColumn = new TabHolder(ORIENT_HORIZONTAL, 64, nullptr, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT));
|
||||
tabHolder_ = leftColumn;
|
||||
tabHolder_->SetTag("RemoteGames");
|
||||
|
||||
Reference in New Issue
Block a user