mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-10 16:19:28 +01:00
70f3a069f2
This breaks Linux stdout logging. This reverts commit 7ac5b1f2f805b2bc553492606cf71b6609fa0ae7, reversing changes made to 9bc14012fccf92f38b7d270ec82f7dac522986c5. Revert "Merge pull request #77 from lioncash/remove-console" This reverts commit 9bc14012fccf92f38b7d270ec82f7dac522986c5, reversing changes made to b18a33377d7229a66226a524186d24c57f1d56aa. Conflicts: Source/Core/Common/LogManager.cpp Source/Core/DolphinWX/Frame.cpp Source/Core/DolphinWX/FrameAui.cpp Source/Core/DolphinWX/LogConfigWindow.cpp Source/Core/DolphinWX/LogWindow.cpp
95 lines
2.0 KiB
C++
95 lines
2.0 KiB
C++
// Copyright 2013 Dolphin Emulator Project
|
|
// Licensed under GPLv2
|
|
// Refer to the license.txt file included.
|
|
|
|
#pragma once
|
|
|
|
#include <mutex>
|
|
#include <queue>
|
|
#include <utility>
|
|
#include <vector>
|
|
#include <wx/defs.h>
|
|
#include <wx/event.h>
|
|
#include <wx/font.h>
|
|
#include <wx/gdicmn.h>
|
|
#include <wx/panel.h>
|
|
#include <wx/string.h>
|
|
#include <wx/translation.h>
|
|
#include <wx/windowid.h>
|
|
|
|
#include "Common/Common.h"
|
|
#include "Common/LogManager.h"
|
|
|
|
class CFrame;
|
|
class wxBoxSizer;
|
|
class wxCheckBox;
|
|
class wxChoice;
|
|
class wxTextCtrl;
|
|
class wxTimer;
|
|
class wxTimerEvent;
|
|
|
|
enum
|
|
{
|
|
IDM_LOG,
|
|
IDM_CLEARLOG,
|
|
IDM_TOGGLEALL,
|
|
IDM_WRAPLINE,
|
|
IDTM_UPDATELOG,
|
|
IDM_FONT,
|
|
IDM_SUBMITCMD
|
|
};
|
|
|
|
// Uses multiple inheritance - only sane because LogListener is a pure virtual interface.
|
|
class CLogWindow : public wxPanel, LogListener
|
|
{
|
|
public:
|
|
CLogWindow(CFrame *parent,
|
|
wxWindowID id = wxID_ANY,
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
const wxSize& size = wxDefaultSize,
|
|
long style = wxTAB_TRAVERSAL,
|
|
const wxString& name = _("Log")
|
|
);
|
|
~CLogWindow();
|
|
|
|
void SaveSettings();
|
|
void Log(LogTypes::LOG_LEVELS, const char *text);
|
|
|
|
int x, y, winpos;
|
|
|
|
private:
|
|
CFrame *Parent;
|
|
wxFont DefaultFont, MonoSpaceFont;
|
|
std::vector<wxFont> LogFont;
|
|
wxTimer *m_LogTimer;
|
|
bool m_ignoreLogTimer;
|
|
LogManager *m_LogManager;
|
|
std::queue<std::pair<u8, wxString> > msgQueue;
|
|
bool m_writeFile, m_writeConsole, m_writeWindow, m_writeDebugger, m_LogAccess;
|
|
|
|
// Controls
|
|
wxBoxSizer *sBottom;
|
|
wxTextCtrl *m_Log, *m_cmdline;
|
|
wxChoice *m_FontChoice;
|
|
wxCheckBox *m_WrapLine;
|
|
|
|
std::mutex m_LogSection;
|
|
|
|
DECLARE_EVENT_TABLE()
|
|
|
|
wxTextCtrl * CreateTextCtrl(wxPanel* parent, wxWindowID id, long Style);
|
|
void CreateGUIControls();
|
|
void PopulateBottom();
|
|
void UnPopulateBottom();
|
|
void OnClose(wxCloseEvent& event);
|
|
void OnSubmit(wxCommandEvent& event);
|
|
void OnFontChange(wxCommandEvent& event);
|
|
void OnWrapLineCheck(wxCommandEvent& event);
|
|
void OnClear(wxCommandEvent& event);
|
|
void OnLogTimer(wxTimerEvent& WXUNUSED(event));
|
|
void UpdateLog();
|
|
|
|
// LogListener
|
|
const char *getName() const { return "LogWindow"; }
|
|
};
|