diff --git a/rpcs3/rpcs3qt/log_frame.cpp b/rpcs3/rpcs3qt/log_frame.cpp index a155cf215d..1d2739608d 100644 --- a/rpcs3/rpcs3qt/log_frame.cpp +++ b/rpcs3/rpcs3qt/log_frame.cpp @@ -293,7 +293,7 @@ void log_frame::CreateAndConnectActions() }); }); - m_perform_goto_on_debugger = new QAction(tr("Go-To On The Debugger"), this); + m_perform_goto_on_debugger = new QAction(tr("Go-To on Debugger"), this); connect(m_perform_goto_on_debugger, &QAction::triggered, [this]() { QPlainTextEdit* pte = (m_tabWidget->currentIndex() == 1 ? m_tty : m_log); @@ -315,7 +315,7 @@ void log_frame::CreateAndConnectActions() memory_viewer_panel::ShowAtPC(static_cast(pc)); }); - m_perform_goto_thread_on_debugger = new QAction(tr("Show Thread On The Debugger"), this); + m_perform_goto_thread_on_debugger = new QAction(tr("Show Thread on Debugger"), this); connect(m_perform_goto_thread_on_debugger, &QAction::triggered, [this]() { QPlainTextEdit* pte = (m_tabWidget->currentIndex() == 1 ? m_tty : m_log); @@ -433,12 +433,13 @@ void log_frame::CreateAndConnectActions() m_perform_goto_thread_on_debugger->setToolTip(tr("Show the thread that corresponds to the thread ID from the log text on the debugger.")); m_perform_show_in_mem_viewer->setToolTip(tr("Jump to the selected hexadecimal address from the log text on the memory viewer.")); - menu->addSeparator(); - menu->addActions(m_log_level_acts->actions()); menu->addSeparator(); menu->addAction(m_stack_act_log); menu->addAction(m_stack_act_err); menu->addAction(m_show_prefix_act); + menu->addSeparator(); + menu->addActions(m_log_level_acts->actions()); + menu->exec(m_log->viewport()->mapToGlobal(pos)); }); diff --git a/rpcs3/rpcs3qt/log_viewer.cpp b/rpcs3/rpcs3qt/log_viewer.cpp index ef45025b58..99961809c9 100644 --- a/rpcs3/rpcs3qt/log_viewer.cpp +++ b/rpcs3/rpcs3qt/log_viewer.cpp @@ -114,24 +114,19 @@ void log_viewer::show_context_menu(const QPoint& pos) init_action(trace_act, logs::level::trace); menu.addAction(copy); + menu.addAction(clear); + menu.addSeparator(); menu.addAction(open); - menu.addSeparator(); + menu.addAction(config); + menu.addAction(filter); menu.addAction(save); menu.addSeparator(); - menu.addAction(config); - menu.addSeparator(); - menu.addAction(filter); - menu.addSeparator(); menu.addAction(timestamps); - menu.addSeparator(); menu.addAction(threads); - menu.addSeparator(); menu.addAction(last_actions_only); menu.addSeparator(); menu.addActions(log_level_acts->actions()); - menu.addSeparator(); - menu.addAction(clear); connect(copy, &QAction::triggered, this, [this]() { diff --git a/rpcs3/rpcs3qt/main_window.ui b/rpcs3/rpcs3qt/main_window.ui index bcd5f50791..39a3c014bb 100644 --- a/rpcs3/rpcs3qt/main_window.ui +++ b/rpcs3/rpcs3qt/main_window.ui @@ -335,24 +335,23 @@ - - - - - - + + - - + + + + +