mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-12 00:40:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #760 from Syphurith/patch-UI

Browse Source 
UI: Clear command for Log Console
This commit is contained in:
B1ackDaemon 2014-08-16 21:09:22 +03:00
commit 2b4f44c0b2
2 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
rpcs3/Gui/ConLogFrame.cpp
View File

@ -1,6 +1,7 @@
#include "stdafx.h"
#include <wx/listctrl.h>
#include <wx/clipbrd.h>
#include <fstream>
#include <vector>
#include <mutex>
@ -24,6 +25,12 @@ const int BUFFER_MAX_SIZE = 1024 * 1024;
//amount of characters in the TextCtrl text-buffer for the emulation log
const int GUI_BUFFER_MAX_SIZE = 1024 * 1024;
enum
{
id_log_copy, //Copy log to ClipBoard
id_log_clear //Clear log
};
struct wxWriter : Log::LogListener
{
wxTextCtrl *m_log;
@ -146,6 +153,10 @@ LogFrame::LogFrame(wxWindow* parent)
SetSizer(s_main);
Layout();
m_log->Bind(wxEVT_RIGHT_DOWN, &LogFrame::OnRightClick, this);
Bind(wxEVT_MENU, &LogFrame::OnContextMenu, this, id_log_clear);
Bind(wxEVT_MENU, &LogFrame::OnContextMenu, this, id_log_copy);
Show();
}
@ -162,4 +173,40 @@ bool LogFrame::Close(bool force)
void LogFrame::OnQuit(wxCloseEvent& event)
{
event.Skip();
}
//Deals with the RightClick on Log Console, shows up the Context Menu.
void LogFrame::OnRightClick(wxMouseEvent& event)
{
wxMenu* menu = new wxMenu();
menu->Append(id_log_copy, "&Copy Ctrl+C");
menu->AppendSeparator();
menu->Append(id_log_clear, "C&lear");
PopupMenu(menu);
}
//Well you can bind more than one control to a single handler.
void LogFrame::OnContextMenu(wxCommandEvent& event)
{
int id = event.GetId();
switch (id)
{
case id_log_clear:
m_log->Clear();
break;
case id_log_copy:
if (wxTheClipboard->Open())
{
m_tdo = new wxTextDataObject(m_log->GetStringSelection());
if (m_tdo->GetTextLength() > 0)
{
wxTheClipboard->SetData(new wxTextDataObject(m_log->GetStringSelection()));
}
wxTheClipboard->Close();
}
break;
default:
event.Skip();
}
}

5
rpcs3/Gui/ConLogFrame.h
View File

@ -1,4 +1,5 @@
#pragma once
#include <wx/dataobj.h>
#include "Utilities/Log.h"
@ -9,6 +10,8 @@ class LogFrame
wxAuiNotebook m_tabs;
wxTextCtrl *m_log;
wxTextCtrl *m_tty;
//Copy Action in Context Menu
wxTextDataObject* m_tdo;
public:
LogFrame(wxWindow* parent);
@ -21,6 +24,8 @@ private:
virtual void Task(){};
void OnQuit(wxCloseEvent& event);
void OnRightClick(wxMouseEvent& event); //Show context menu
void OnContextMenu(wxCommandEvent& event); //After select
DECLARE_EVENT_TABLE();
};