x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 5 Activity

GUI: Add hide tab action #1089 (#1153) 

* This action will close the current tab and open the tab to the right of the closed one.
* Default hotkey is Ctrl+W.
This commit is contained in:
Atvaark 2016-10-09 14:35:11 +02:00 committed by Duncan Ogilvie
parent a9cca78f09
commit 4d9e6f2843
6 changed files with 83 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/gui/Src/Gui/MainWindow.cpp
View File

@ -195,40 +195,25 @@ MainWindow::MainWindow(QWidget* parent)
mGraphView->setWindowTitle(tr("Graph"));
mGraphView->setWindowIcon(DIcon("graph.png"));
// Create the tab widget
mTabWidget = new MHTabWidget();
// Create the tab widget and enable detaching and hiding
mTabWidget = new MHTabWidget(this, true, true);
// Add all widgets to the list
mWidgetList.push_back(mCpuWidget);
mWidgetNativeNameList.push_back("CPUTab");
mWidgetList.push_back(mGraphView);
mWidgetNativeNameList.push_back("GraphTab");
mWidgetList.push_back(mLogView);
mWidgetNativeNameList.push_back("LogTab");
mWidgetList.push_back(mNotesManager);
mWidgetNativeNameList.push_back("NotesTab");
mWidgetList.push_back(mBreakpointsView);
mWidgetNativeNameList.push_back("BreakpointsTab");
mWidgetList.push_back(mMemMapView);
mWidgetNativeNameList.push_back("MemoryMapTab");
mWidgetList.push_back(mCallStackView);
mWidgetNativeNameList.push_back("CallStackTab");
mWidgetList.push_back(mSEHChainView);
mWidgetNativeNameList.push_back("SEHTab");
mWidgetList.push_back(mScriptView);
mWidgetNativeNameList.push_back("ScriptTab");
mWidgetList.push_back(mSymbolView);
mWidgetNativeNameList.push_back("SymbolsTab");
mWidgetList.push_back(mSourceViewManager);
mWidgetNativeNameList.push_back("SourceTab");
mWidgetList.push_back(mReferenceManager);
mWidgetNativeNameList.push_back("ReferencesTab");
mWidgetList.push_back(mThreadView);
mWidgetNativeNameList.push_back("ThreadsTab");
mWidgetList.push_back(mSnowmanView);
mWidgetNativeNameList.push_back("SnowmanTab");
mWidgetList.push_back(mHandlesView);
mWidgetNativeNameList.push_back("HandlesTab");
mWidgetList.push_back(WidgetInfo(mCpuWidget, "CPUTab"));
mWidgetList.push_back(WidgetInfo(mGraphView, "GraphTab"));
mWidgetList.push_back(WidgetInfo(mLogView, "LogTab"));
mWidgetList.push_back(WidgetInfo(mNotesManager, "NotesTab"));
mWidgetList.push_back(WidgetInfo(mBreakpointsView, "BreakpointsTab"));
mWidgetList.push_back(WidgetInfo(mMemMapView, "MemoryMapTab"));
mWidgetList.push_back(WidgetInfo(mCallStackView, "CallStackTab"));
mWidgetList.push_back(WidgetInfo(mSEHChainView, "SEHTab"));
mWidgetList.push_back(WidgetInfo(mScriptView, "ScriptTab"));
mWidgetList.push_back(WidgetInfo(mSymbolView, "SymbolsTab"));
mWidgetList.push_back(WidgetInfo(mSourceViewManager, "SourceTab"));
mWidgetList.push_back(WidgetInfo(mReferenceManager, "ReferencesTab"));
mWidgetList.push_back(WidgetInfo(mThreadView, "ThreadsTab"));
mWidgetList.push_back(WidgetInfo(mSnowmanView, "SnowmanTab"));
mWidgetList.push_back(WidgetInfo(mHandlesView, "HandlesTab"));
// If LoadSaveTabOrder disabled, load tabs in default order
if(!ConfigBool("Miscellaneous", "LoadSaveTabOrder"))
@ -318,6 +303,7 @@ MainWindow::MainWindow(QWidget* parent)
connect(ui->actionGraph, SIGNAL(triggered()), this, SLOT(displayGraphWidget()));
connect(ui->actionPreviousTab, SIGNAL(triggered()), this, SLOT(displayPreviousTab()));
connect(ui->actionNextTab, SIGNAL(triggered()), this, SLOT(displayNextTab()));
connect(ui->actionHideTab, SIGNAL(triggered()), this, SLOT(hideTab()));
makeCommandAction(ui->actionStepIntoSource, "TraceIntoConditional src.line(cip) && !src.disp(cip)");
makeCommandAction(ui->actionStepOverSource, "TraceOverConditional src.line(cip) && !src.disp(cip)");
makeCommandAction(ui->actionseStepInto, "seStepInto");
@ -479,12 +465,24 @@ void MainWindow::closeEvent(QCloseEvent* event)
void MainWindow::setTab(QWidget* widget)
{
// shown tabs
for(int i = 0; i < mTabWidget->count(); i++)
{
if(mTabWidget->widget(i) == widget)
{
mTabWidget->setCurrentIndex(i);
break;
return;
}
}
// hidden tabs
for(int i = 0; i < mWidgetList.count(); i++)
{
if(mWidgetList[i].widget == widget)
{
addQWidgetTab(mWidgetList[i].widget, mWidgetList[i].nativeName);
mTabWidget->setCurrentIndex(mTabWidget->count() - 1);
return;
}
}
}
@ -496,7 +494,7 @@ void MainWindow::loadTabDefaultOrder()
// Setup tabs
//TODO
for(int i = 0; i < mWidgetList.size(); i++)
addQWidgetTab(mWidgetList[i], mWidgetNativeNameList[i]);
addQWidgetTab(mWidgetList[i].widget, mWidgetList[i].nativeName);
}
void MainWindow::loadTabSavedOrder()
@ -508,10 +506,10 @@ void MainWindow::loadTabSavedOrder()
// Get tabIndex for each widget and add them to tabIndexToWidget
for(int i = 0; i < mWidgetList.size(); i++)
{
QString tabName = mWidgetNativeNameList[i];
QString tabName = mWidgetList[i].nativeName;
duint tabIndex = Config()->getUint("TabOrder", tabName);
if(!tabIndexToWidget.contains(tabIndex))
tabIndexToWidget.insert(tabIndex, std::make_pair(mWidgetList[i], tabName));
tabIndexToWidget.insert(tabIndex, std::make_pair(mWidgetList[i].widget, tabName));
else
{
// Conflicts. Try to find an unused tab index.
@ -520,7 +518,7 @@ void MainWindow::loadTabSavedOrder()
auto item = tabIndexToWidget.find(j);
if(item == tabIndexToWidget.end())
{
tabIndexToWidget.insert(j, std::make_pair(mWidgetList[i], tabName));
tabIndexToWidget.insert(j, std::make_pair(mWidgetList[i].widget, tabName));
break;
}
}
@ -578,6 +576,7 @@ void MainWindow::refreshShortcuts()
setGlobalShortcut(ui->actionGraph, ConfigShortcut("ViewGraph"));
setGlobalShortcut(ui->actionPreviousTab, ConfigShortcut("ViewPreviousTab"));
setGlobalShortcut(ui->actionNextTab, ConfigShortcut("ViewNextTab"));
setGlobalShortcut(ui->actionHideTab, ConfigShortcut("ViewHideTab"));
setGlobalShortcut(ui->actionRun, ConfigShortcut("DebugRun"));
setGlobalShortcut(ui->actioneRun, ConfigShortcut("DebugeRun"));
@ -934,6 +933,11 @@ void MainWindow::displayNextTab()
mTabWidget->showNextTab();
}
void MainWindow::hideTab()
{
mTabWidget->deleteCurrentTab();
}
void MainWindow::openSettings()
{
SettingsDialog* settings = new SettingsDialog(this);

20
src/gui/Src/Gui/MainWindow.h
View File

@ -85,6 +85,7 @@ public slots:
void displayGraphWidget();
void displayPreviousTab();
void displayNextTab();
void hideTab();
void openSettings();
void openAppearance();
void openCalculator();
@ -225,8 +226,23 @@ private:
bool bCanClose;
MainWindowCloseThread* mCloseThread;
QVector<QWidget*> mWidgetList;
QVector<QString> mWidgetNativeNameList;
struct WidgetInfo
{
public:
WidgetInfo() { }
WidgetInfo(QWidget* widget, QString nativeName)
{
this->widget = widget;
this->nativeName = nativeName;
}
QWidget* widget;
QString nativeName;
};
QVector<WidgetInfo> mWidgetList;
protected:
void dragEnterEvent(QDragEnterEvent* pEvent);

6
src/gui/Src/Gui/MainWindow.ui
View File

@ -77,6 +77,7 @@
<addaction name="separator"/>
<addaction name="actionPreviousTab"/>
<addaction name="actionNextTab"/>
<addaction name="actionHideTab"/>
</widget>
<widget class="QMenu" name="menuDebug">
<property name="title">
@ -1089,6 +1090,11 @@
<string>Next Tab</string>
</property>
</action>
<action name="actionHideTab">
<property name="text">
<string>Hide Tab</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources>

16
src/gui/Src/Gui/TabWidget.cpp
View File

@ -228,6 +228,22 @@ void MHTabWidget::showNextTab()
QTabWidget::setCurrentIndex((QTabWidget::currentIndex() + 1) % QTabWidget::count());
}
void MHTabWidget::deleteCurrentTab()
{
if(QTabWidget::count() == 0)
{
return;
}
int index = QTabWidget::currentIndex();
DeleteTab(index);
if(index < count())
{
// open the tab to the right of the deleted tab
setCurrentIndex(index);
}
}
//----------------------------------------------------------------------------
MHDetachedWindow::MHDetachedWindow(QWidget* parent, MHTabWidget* tabwidget) : QMainWindow(parent)

1
src/gui/Src/Gui/TabWidget.h
View File

@ -31,6 +31,7 @@ public:
QString getNativeName(int index);
void showPreviousTab();
void showNextTab();
void deleteCurrentTab();
signals:
void tabMovedTabWidget(int from, int to);

1
src/gui/Src/Utils/Configuration.cpp
View File

@ -312,6 +312,7 @@ Configuration::Configuration() : QObject(), noMoreMsgbox(false)
defaultShortcuts.insert("ViewGraph", Shortcut(tr("View -> Graph"), "Alt+G", true));
defaultShortcuts.insert("ViewPreviousTab", Shortcut(tr("View -> Previous Tab"), "Ctrl+Shift+Tab"));
defaultShortcuts.insert("ViewNextTab", Shortcut(tr("View -> Next Tab"), "Ctrl+Tab"));
defaultShortcuts.insert("ViewHideTab", Shortcut(tr("View -> Hide Tab"), "Ctrl+W"));
defaultShortcuts.insert("DebugRun", Shortcut(tr("Debug -> Run"), "F9", true));
defaultShortcuts.insert("DebugeRun", Shortcut(tr("Debug -> Run (pass exceptions)"), "Shift+F9", true));