From f59210c164a1e46a3f03753251eed8b9ff44fc42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=87a=C4=9Fr=C4=B1=20ULA=C5=9E?= Date: Wed, 22 Feb 2017 05:06:23 +0300 Subject: [PATCH] changed file hierarchy #22 This change making pince more compatible with creating setup.py files. So we can create distribution package much more easily. - added pince directory and gather all program files in it. - refactor customlabel imported ui files with `from pince.*` prefix - regenarated all ui files --- GUI/.directory | 3 - bin/pince-gui.py | 12 ++++ pince-non-stop-files/.directory | 3 - {GUI => pince/GUI}/AboutWidget.py | 7 +- {GUI => pince/GUI}/AboutWidget.ui | 0 .../GUI}/AddAddressManuallyDialog.py | 3 +- .../GUI}/AddAddressManuallyDialog.ui | 0 {GUI => pince/GUI}/BookmarkWidget.py | 5 +- {GUI => pince/GUI}/BookmarkWidget.ui | 0 {GUI => pince/GUI}/BreakpointInfoWidget.py | 5 +- {GUI => pince/GUI}/BreakpointInfoWidget.ui | 0 {GUI => pince/GUI}/ConsoleWidget.py | 5 +- {GUI => pince/GUI}/ConsoleWidget.ui | 0 .../CustomAbstractTableModels/AsciiModel.py | 4 +- .../CustomAbstractTableModels/HexModel.py | 2 +- .../GUI}/CustomLabels/FlagRegisterLabel.py | 4 +- .../GUI}/CustomLabels/RegisterLabel.py | 6 +- .../GUI}/CustomTableViews/AsciiView.py | 2 +- .../GUI}/CustomTableViews/HexView.py | 0 {GUI => pince/GUI}/DialogWithButtons.py | 3 +- {GUI => pince/GUI}/DialogWithButtons.ui | 0 {GUI => pince/GUI}/FloatRegisterWidget.py | 7 +- {GUI => pince/GUI}/FloatRegisterWidget.ui | 0 {GUI => pince/GUI}/FunctionsInfoWidget.py | 3 +- {GUI => pince/GUI}/FunctionsInfoWidget.ui | 0 {GUI => pince/GUI}/HexEditDialog.py | 3 +- {GUI => pince/GUI}/HexEditDialog.ui | 0 {GUI => pince/GUI}/LibPINCEReferenceWidget.py | 3 +- {GUI => pince/GUI}/LibPINCEReferenceWidget.ui | 0 {GUI => pince/GUI}/LoadingDialog.py | 3 +- {GUI => pince/GUI}/LoadingDialog.ui | 0 {GUI => pince/GUI}/LogFileWidget.py | 3 +- {GUI => pince/GUI}/LogFileWidget.ui | 0 {GUI => pince/GUI}/MainWindow.py | 7 +- {GUI => pince/GUI}/MainWindow.ui | 0 {GUI => pince/GUI}/MemoryRegionsWidget.py | 3 +- {GUI => pince/GUI}/MemoryRegionsWidget.ui | 0 {GUI => pince/GUI}/MemoryViewerWindow.py | 25 ++++--- {GUI => pince/GUI}/MemoryViewerWindow.ui | 18 +++--- {GUI => pince/GUI}/Notes.txt | 0 {GUI => pince/GUI}/SearchOpcodeWidget.py | 3 +- {GUI => pince/GUI}/SearchOpcodeWidget.ui | 0 {GUI => pince/GUI}/SelectProcess.py | 3 +- {GUI => pince/GUI}/SelectProcess.ui | 0 {GUI => pince/GUI}/SettingsDialog.py | 8 ++- {GUI => pince/GUI}/SettingsDialog.ui | 0 {GUI => pince/GUI}/StackTraceInfoWidget.py | 5 +- {GUI => pince/GUI}/StackTraceInfoWidget.ui | 0 .../GUI}/TraceInstructionsPromptDialog.py | 3 +- .../GUI}/TraceInstructionsPromptDialog.ui | 0 .../GUI}/TraceInstructionsWaitWidget.py | 3 +- .../GUI}/TraceInstructionsWaitWidget.ui | 0 {GUI => pince/GUI}/TraceInstructionsWindow.py | 3 +- {GUI => pince/GUI}/TraceInstructionsWindow.ui | 0 {GUI => pince/GUI}/TrackBreakpointWidget.py | 3 +- {GUI => pince/GUI}/TrackBreakpointWidget.ui | 0 {GUI => pince/GUI}/TrackWatchpointWidget.py | 3 +- {GUI => pince/GUI}/TrackWatchpointWidget.ui | 0 {GUI => pince/GUI}/__init__.py | 0 PINCE.py => pince/PINCE.py | 61 ++++++++---------- __init__.py => pince/__init__.py | 0 {libPINCE => pince/libPINCE}/.gitignore | 0 {libPINCE => pince/libPINCE}/GDB_Engine.py | 0 {libPINCE => pince/libPINCE}/GuiUtils.py | 0 .../libPINCE}/Injection/.gitignore | 0 .../libPINCE}/Injection/Notes.txt | 0 .../libPINCE}/Injection/example.c | 0 {libPINCE => pince/libPINCE}/SysUtils.py | 0 {libPINCE => pince/libPINCE}/__init__.py | 0 .../libPINCE}/gdb_python_scripts/.gitignore | 0 .../GDBCommandExtensions.py | 6 +- .../gdb_python_scripts/ScriptUtils.py | 4 +- .../libPINCE}/gdb_python_scripts/__init__.py | 0 .../gdb_python_scripts/tests/.gitignore | 0 .../gdb_python_scripts/tests/Notes.txt | 0 .../gdb_python_scripts/tests/example.c | 0 {libPINCE => pince/libPINCE}/type_defs.py | 0 .../InitialCodeInjections.c | 0 .../InitialCodeInjections.so | Bin .../pince-non-stop-files}/old_gdbinit | 0 .../on_code_injection_failure | 0 .../pince-non-stop-mode.py | 0 82 files changed, 120 insertions(+), 124 deletions(-) delete mode 100644 GUI/.directory create mode 100644 bin/pince-gui.py delete mode 100644 pince-non-stop-files/.directory rename {GUI => pince/GUI}/AboutWidget.py (89%) rename {GUI => pince/GUI}/AboutWidget.ui (100%) rename {GUI => pince/GUI}/AddAddressManuallyDialog.py (99%) rename {GUI => pince/GUI}/AddAddressManuallyDialog.ui (100%) rename {GUI => pince/GUI}/BookmarkWidget.py (94%) rename {GUI => pince/GUI}/BookmarkWidget.ui (100%) rename {GUI => pince/GUI}/BreakpointInfoWidget.py (96%) rename {GUI => pince/GUI}/BreakpointInfoWidget.ui (100%) rename {GUI => pince/GUI}/ConsoleWidget.py (97%) rename {GUI => pince/GUI}/ConsoleWidget.ui (100%) rename {GUI => pince/GUI}/CustomAbstractTableModels/AsciiModel.py (88%) rename {GUI => pince/GUI}/CustomAbstractTableModels/HexModel.py (97%) rename {GUI => pince/GUI}/CustomLabels/FlagRegisterLabel.py (94%) rename {GUI => pince/GUI}/CustomLabels/RegisterLabel.py (94%) rename {GUI => pince/GUI}/CustomTableViews/AsciiView.py (79%) rename {GUI => pince/GUI}/CustomTableViews/HexView.py (100%) rename {GUI => pince/GUI}/DialogWithButtons.py (96%) rename {GUI => pince/GUI}/DialogWithButtons.ui (100%) rename {GUI => pince/GUI}/FloatRegisterWidget.py (93%) rename {GUI => pince/GUI}/FloatRegisterWidget.ui (100%) rename {GUI => pince/GUI}/FunctionsInfoWidget.py (97%) rename {GUI => pince/GUI}/FunctionsInfoWidget.ui (100%) rename {GUI => pince/GUI}/HexEditDialog.py (97%) rename {GUI => pince/GUI}/HexEditDialog.ui (100%) rename {GUI => pince/GUI}/LibPINCEReferenceWidget.py (98%) rename {GUI => pince/GUI}/LibPINCEReferenceWidget.ui (100%) rename {GUI => pince/GUI}/LoadingDialog.py (97%) rename {GUI => pince/GUI}/LoadingDialog.ui (100%) rename {GUI => pince/GUI}/LogFileWidget.py (94%) rename {GUI => pince/GUI}/LogFileWidget.ui (100%) rename {GUI => pince/GUI}/MainWindow.py (99%) rename {GUI => pince/GUI}/MainWindow.ui (100%) rename {GUI => pince/GUI}/MemoryRegionsWidget.py (98%) rename {GUI => pince/GUI}/MemoryRegionsWidget.ui (100%) rename {GUI => pince/GUI}/MemoryViewerWindow.py (98%) rename {GUI => pince/GUI}/MemoryViewerWindow.ui (99%) rename {GUI => pince/GUI}/Notes.txt (100%) rename {GUI => pince/GUI}/SearchOpcodeWidget.py (98%) rename {GUI => pince/GUI}/SearchOpcodeWidget.ui (100%) rename {GUI => pince/GUI}/SelectProcess.py (98%) rename {GUI => pince/GUI}/SelectProcess.ui (100%) rename {GUI => pince/GUI}/SettingsDialog.py (98%) rename {GUI => pince/GUI}/SettingsDialog.ui (100%) rename {GUI => pince/GUI}/StackTraceInfoWidget.py (93%) rename {GUI => pince/GUI}/StackTraceInfoWidget.ui (100%) rename {GUI => pince/GUI}/TraceInstructionsPromptDialog.py (98%) rename {GUI => pince/GUI}/TraceInstructionsPromptDialog.ui (100%) rename {GUI => pince/GUI}/TraceInstructionsWaitWidget.py (96%) rename {GUI => pince/GUI}/TraceInstructionsWaitWidget.ui (100%) rename {GUI => pince/GUI}/TraceInstructionsWindow.py (97%) rename {GUI => pince/GUI}/TraceInstructionsWindow.ui (100%) rename {GUI => pince/GUI}/TrackBreakpointWidget.py (98%) rename {GUI => pince/GUI}/TrackBreakpointWidget.ui (100%) rename {GUI => pince/GUI}/TrackWatchpointWidget.py (97%) rename {GUI => pince/GUI}/TrackWatchpointWidget.ui (100%) rename {GUI => pince/GUI}/__init__.py (100%) rename PINCE.py => pince/PINCE.py (98%) rename __init__.py => pince/__init__.py (100%) rename {libPINCE => pince/libPINCE}/.gitignore (100%) rename {libPINCE => pince/libPINCE}/GDB_Engine.py (100%) rename {libPINCE => pince/libPINCE}/GuiUtils.py (100%) rename {libPINCE => pince/libPINCE}/Injection/.gitignore (100%) rename {libPINCE => pince/libPINCE}/Injection/Notes.txt (100%) rename {libPINCE => pince/libPINCE}/Injection/example.c (100%) rename {libPINCE => pince/libPINCE}/SysUtils.py (100%) rename {libPINCE => pince/libPINCE}/__init__.py (100%) rename {libPINCE => pince/libPINCE}/gdb_python_scripts/.gitignore (100%) rename {libPINCE => pince/libPINCE}/gdb_python_scripts/GDBCommandExtensions.py (99%) rename {libPINCE => pince/libPINCE}/gdb_python_scripts/ScriptUtils.py (99%) rename {libPINCE => pince/libPINCE}/gdb_python_scripts/__init__.py (100%) rename {libPINCE => pince/libPINCE}/gdb_python_scripts/tests/.gitignore (100%) rename {libPINCE => pince/libPINCE}/gdb_python_scripts/tests/Notes.txt (100%) rename {libPINCE => pince/libPINCE}/gdb_python_scripts/tests/example.c (100%) rename {libPINCE => pince/libPINCE}/type_defs.py (100%) rename {pince-non-stop-files => pince/pince-non-stop-files}/InitialCodeInjections.c (100%) rename {pince-non-stop-files => pince/pince-non-stop-files}/InitialCodeInjections.so (100%) rename {pince-non-stop-files => pince/pince-non-stop-files}/old_gdbinit (100%) rename {pince-non-stop-files => pince/pince-non-stop-files}/on_code_injection_failure (100%) rename {pince-non-stop-files => pince/pince-non-stop-files}/pince-non-stop-mode.py (100%) diff --git a/GUI/.directory b/GUI/.directory deleted file mode 100644 index 7240e84b..00000000 --- a/GUI/.directory +++ /dev/null @@ -1,3 +0,0 @@ -[Dolphin] -Timestamp=2016,5,14,1,40,54 -Version=3 diff --git a/bin/pince-gui.py b/bin/pince-gui.py new file mode 100644 index 00000000..96d11507 --- /dev/null +++ b/bin/pince-gui.py @@ -0,0 +1,12 @@ +#!/usr/bin/env python3 + +import sys +from PyQt5.QtWidgets import QApplication + +import pince.PINCE as p + +if __name__ == "__main__": + app = QApplication(sys.argv) + window = p.MainForm() + window.show() + sys.exit(app.exec_()) diff --git a/pince-non-stop-files/.directory b/pince-non-stop-files/.directory deleted file mode 100644 index 5a84e58f..00000000 --- a/pince-non-stop-files/.directory +++ /dev/null @@ -1,3 +0,0 @@ -[Dolphin] -Timestamp=2016,6,16,22,4,4 -Version=3 diff --git a/GUI/AboutWidget.py b/pince/GUI/AboutWidget.py similarity index 89% rename from GUI/AboutWidget.py rename to pince/GUI/AboutWidget.py index 4ff0ea25..32abc149 100644 --- a/GUI/AboutWidget.py +++ b/pince/GUI/AboutWidget.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'aboutwidget.ui' +# Form implementation generated from reading ui file 'AboutWidget.ui' # -# Created: Wed Jun 29 16:34:26 2016 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! @@ -16,6 +15,7 @@ def setupUi(self, TabWidget): self.tab_Contributors = QtWidgets.QWidget() self.tab_Contributors.setObjectName("tab_Contributors") self.gridLayout_2 = QtWidgets.QGridLayout(self.tab_Contributors) + self.gridLayout_2.setContentsMargins(0, 0, 0, 0) self.gridLayout_2.setObjectName("gridLayout_2") self.textBrowser_Contributors = QtWidgets.QTextBrowser(self.tab_Contributors) self.textBrowser_Contributors.setObjectName("textBrowser_Contributors") @@ -24,6 +24,7 @@ def setupUi(self, TabWidget): self.tab_License = QtWidgets.QWidget() self.tab_License.setObjectName("tab_License") self.gridLayout = QtWidgets.QGridLayout(self.tab_License) + self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setObjectName("gridLayout") self.textBrowser_License = QtWidgets.QTextBrowser(self.tab_License) self.textBrowser_License.setObjectName("textBrowser_License") diff --git a/GUI/AboutWidget.ui b/pince/GUI/AboutWidget.ui similarity index 100% rename from GUI/AboutWidget.ui rename to pince/GUI/AboutWidget.ui diff --git a/GUI/AddAddressManuallyDialog.py b/pince/GUI/AddAddressManuallyDialog.py similarity index 99% rename from GUI/AddAddressManuallyDialog.py rename to pince/GUI/AddAddressManuallyDialog.py index 3c89c0d0..0c3945c9 100644 --- a/GUI/AddAddressManuallyDialog.py +++ b/pince/GUI/AddAddressManuallyDialog.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'AddAddressManuallyDialog.ui' # -# Created: Mon Dec 26 20:22:30 2016 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! diff --git a/GUI/AddAddressManuallyDialog.ui b/pince/GUI/AddAddressManuallyDialog.ui similarity index 100% rename from GUI/AddAddressManuallyDialog.ui rename to pince/GUI/AddAddressManuallyDialog.ui diff --git a/GUI/BookmarkWidget.py b/pince/GUI/BookmarkWidget.py similarity index 94% rename from GUI/BookmarkWidget.py rename to pince/GUI/BookmarkWidget.py index 72164235..1db88e3e 100644 --- a/GUI/BookmarkWidget.py +++ b/pince/GUI/BookmarkWidget.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'bookmarkwidget.ui' +# Form implementation generated from reading ui file 'BookmarkWidget.ui' # -# Created: Sat Jul 9 16:03:34 2016 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! diff --git a/GUI/BookmarkWidget.ui b/pince/GUI/BookmarkWidget.ui similarity index 100% rename from GUI/BookmarkWidget.ui rename to pince/GUI/BookmarkWidget.ui diff --git a/GUI/BreakpointInfoWidget.py b/pince/GUI/BreakpointInfoWidget.py similarity index 96% rename from GUI/BreakpointInfoWidget.py rename to pince/GUI/BreakpointInfoWidget.py index 333b99db..94ec7177 100644 --- a/GUI/BreakpointInfoWidget.py +++ b/pince/GUI/BreakpointInfoWidget.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'BreakpointInfoWidget.ui' # -# Created: Fri Dec 2 21:32:09 2016 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! @@ -16,6 +15,7 @@ def setupUi(self, TabWidget): self.tab_BreakpointInfo = QtWidgets.QWidget() self.tab_BreakpointInfo.setObjectName("tab_BreakpointInfo") self.gridLayout_2 = QtWidgets.QGridLayout(self.tab_BreakpointInfo) + self.gridLayout_2.setContentsMargins(0, 0, 0, 0) self.gridLayout_2.setObjectName("gridLayout_2") self.tableWidget_BreakpointInfo = QtWidgets.QTableWidget(self.tab_BreakpointInfo) self.tableWidget_BreakpointInfo.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers) @@ -45,6 +45,7 @@ def setupUi(self, TabWidget): self.tab_RawBreakpointInfo = QtWidgets.QWidget() self.tab_RawBreakpointInfo.setObjectName("tab_RawBreakpointInfo") self.gridLayout = QtWidgets.QGridLayout(self.tab_RawBreakpointInfo) + self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setObjectName("gridLayout") self.textBrowser_BreakpointInfo = QtWidgets.QTextBrowser(self.tab_RawBreakpointInfo) self.textBrowser_BreakpointInfo.setObjectName("textBrowser_BreakpointInfo") diff --git a/GUI/BreakpointInfoWidget.ui b/pince/GUI/BreakpointInfoWidget.ui similarity index 100% rename from GUI/BreakpointInfoWidget.ui rename to pince/GUI/BreakpointInfoWidget.ui diff --git a/GUI/ConsoleWidget.py b/pince/GUI/ConsoleWidget.py similarity index 97% rename from GUI/ConsoleWidget.py rename to pince/GUI/ConsoleWidget.py index 29c6e48e..06adab73 100644 --- a/GUI/ConsoleWidget.py +++ b/pince/GUI/ConsoleWidget.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'consolewidget.ui' +# Form implementation generated from reading ui file 'ConsoleWidget.ui' # -# Created: Thu Jul 21 18:11:36 2016 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! diff --git a/GUI/ConsoleWidget.ui b/pince/GUI/ConsoleWidget.ui similarity index 100% rename from GUI/ConsoleWidget.ui rename to pince/GUI/ConsoleWidget.ui diff --git a/GUI/CustomAbstractTableModels/AsciiModel.py b/pince/GUI/CustomAbstractTableModels/AsciiModel.py similarity index 88% rename from GUI/CustomAbstractTableModels/AsciiModel.py rename to pince/GUI/CustomAbstractTableModels/AsciiModel.py index f61809aa..4462b767 100644 --- a/GUI/CustomAbstractTableModels/AsciiModel.py +++ b/pince/GUI/CustomAbstractTableModels/AsciiModel.py @@ -1,8 +1,8 @@ from PyQt5.QtCore import QVariant, Qt from PyQt5.QtGui import QColor -from GUI.CustomAbstractTableModels.HexModel import QHexModel +from pince.GUI.CustomAbstractTableModels.HexModel import QHexModel -from libPINCE import SysUtils +from pince.libPINCE import SysUtils class QAsciiModel(QHexModel): diff --git a/GUI/CustomAbstractTableModels/HexModel.py b/pince/GUI/CustomAbstractTableModels/HexModel.py similarity index 97% rename from GUI/CustomAbstractTableModels/HexModel.py rename to pince/GUI/CustomAbstractTableModels/HexModel.py index 15c396a5..263f3cae 100644 --- a/GUI/CustomAbstractTableModels/HexModel.py +++ b/pince/GUI/CustomAbstractTableModels/HexModel.py @@ -1,7 +1,7 @@ from PyQt5.QtCore import QAbstractTableModel, QVariant, Qt from PyQt5.QtGui import QColor -from libPINCE import GDB_Engine +from pince.libPINCE import GDB_Engine class QHexModel(QAbstractTableModel): diff --git a/GUI/CustomLabels/FlagRegisterLabel.py b/pince/GUI/CustomLabels/FlagRegisterLabel.py similarity index 94% rename from GUI/CustomLabels/FlagRegisterLabel.py rename to pince/GUI/CustomLabels/FlagRegisterLabel.py index ec178b5e..13dcae1d 100644 --- a/GUI/CustomLabels/FlagRegisterLabel.py +++ b/pince/GUI/CustomLabels/FlagRegisterLabel.py @@ -1,8 +1,8 @@ from PyQt5.QtWidgets import QLabel, QMessageBox from PyQt5.QtGui import QCursor from PyQt5.QtCore import Qt -from libPINCE import GDB_Engine -from PINCE import DialogWithButtonsForm +from pince.libPINCE import GDB_Engine +#from pince.PINCE import DialogWithButtonsForm class QFlagRegisterLabel(QLabel): diff --git a/GUI/CustomLabels/RegisterLabel.py b/pince/GUI/CustomLabels/RegisterLabel.py similarity index 94% rename from GUI/CustomLabels/RegisterLabel.py rename to pince/GUI/CustomLabels/RegisterLabel.py index 7e452d7e..a67e4560 100644 --- a/GUI/CustomLabels/RegisterLabel.py +++ b/pince/GUI/CustomLabels/RegisterLabel.py @@ -1,9 +1,9 @@ from PyQt5.QtWidgets import QLabel, QMenu from PyQt5.QtGui import QCursor from PyQt5.QtCore import Qt -from libPINCE import GDB_Engine -from libPINCE import GuiUtils -from PINCE import DialogWithButtonsForm +from pince.libPINCE import GDB_Engine +from pince.libPINCE import GuiUtils +#from pince.PINCE import DialogWithButtonsForm class QRegisterLabel(QLabel): diff --git a/GUI/CustomTableViews/AsciiView.py b/pince/GUI/CustomTableViews/AsciiView.py similarity index 79% rename from GUI/CustomTableViews/AsciiView.py rename to pince/GUI/CustomTableViews/AsciiView.py index d88dfae7..43c0e8ca 100644 --- a/GUI/CustomTableViews/AsciiView.py +++ b/pince/GUI/CustomTableViews/AsciiView.py @@ -1,4 +1,4 @@ -from GUI.CustomTableViews.HexView import QHexView +from pince.GUI.CustomTableViews.HexView import QHexView class QAsciiView(QHexView): # data_array is returned from GDB_Engine.hex_dump() diff --git a/GUI/CustomTableViews/HexView.py b/pince/GUI/CustomTableViews/HexView.py similarity index 100% rename from GUI/CustomTableViews/HexView.py rename to pince/GUI/CustomTableViews/HexView.py diff --git a/GUI/DialogWithButtons.py b/pince/GUI/DialogWithButtons.py similarity index 96% rename from GUI/DialogWithButtons.py rename to pince/GUI/DialogWithButtons.py index 2fb66a4e..7ea3c9fd 100644 --- a/GUI/DialogWithButtons.py +++ b/pince/GUI/DialogWithButtons.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'DialogWithButtons.ui' # -# Created: Sat Oct 15 14:22:42 2016 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! diff --git a/GUI/DialogWithButtons.ui b/pince/GUI/DialogWithButtons.ui similarity index 100% rename from GUI/DialogWithButtons.ui rename to pince/GUI/DialogWithButtons.ui diff --git a/GUI/FloatRegisterWidget.py b/pince/GUI/FloatRegisterWidget.py similarity index 93% rename from GUI/FloatRegisterWidget.py rename to pince/GUI/FloatRegisterWidget.py index 35aa8a46..1dbadb7a 100644 --- a/GUI/FloatRegisterWidget.py +++ b/pince/GUI/FloatRegisterWidget.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'floatregisterwidget.ui' +# Form implementation generated from reading ui file 'FloatRegisterWidget.ui' # -# Created: Tue Jul 19 01:12:53 2016 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! @@ -16,6 +15,7 @@ def setupUi(self, TabWidget): self.FPU = QtWidgets.QWidget() self.FPU.setObjectName("FPU") self.gridLayout = QtWidgets.QGridLayout(self.FPU) + self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setObjectName("gridLayout") self.tableWidget_FPU = QtWidgets.QTableWidget(self.FPU) self.tableWidget_FPU.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers) @@ -35,6 +35,7 @@ def setupUi(self, TabWidget): self.XMM = QtWidgets.QWidget() self.XMM.setObjectName("XMM") self.gridLayout_2 = QtWidgets.QGridLayout(self.XMM) + self.gridLayout_2.setContentsMargins(0, 0, 0, 0) self.gridLayout_2.setObjectName("gridLayout_2") self.tableWidget_XMM = QtWidgets.QTableWidget(self.XMM) self.tableWidget_XMM.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers) diff --git a/GUI/FloatRegisterWidget.ui b/pince/GUI/FloatRegisterWidget.ui similarity index 100% rename from GUI/FloatRegisterWidget.ui rename to pince/GUI/FloatRegisterWidget.ui diff --git a/GUI/FunctionsInfoWidget.py b/pince/GUI/FunctionsInfoWidget.py similarity index 97% rename from GUI/FunctionsInfoWidget.py rename to pince/GUI/FunctionsInfoWidget.py index c5635020..7bbe393b 100644 --- a/GUI/FunctionsInfoWidget.py +++ b/pince/GUI/FunctionsInfoWidget.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'FunctionsInfoWidget.ui' # -# Created: Fri Dec 9 14:18:45 2016 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! diff --git a/GUI/FunctionsInfoWidget.ui b/pince/GUI/FunctionsInfoWidget.ui similarity index 100% rename from GUI/FunctionsInfoWidget.ui rename to pince/GUI/FunctionsInfoWidget.ui diff --git a/GUI/HexEditDialog.py b/pince/GUI/HexEditDialog.py similarity index 97% rename from GUI/HexEditDialog.py rename to pince/GUI/HexEditDialog.py index 179ff306..151cf983 100644 --- a/GUI/HexEditDialog.py +++ b/pince/GUI/HexEditDialog.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'HexEditDialog.ui' # -# Created: Fri Dec 9 21:31:02 2016 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! diff --git a/GUI/HexEditDialog.ui b/pince/GUI/HexEditDialog.ui similarity index 100% rename from GUI/HexEditDialog.ui rename to pince/GUI/HexEditDialog.ui diff --git a/GUI/LibPINCEReferenceWidget.py b/pince/GUI/LibPINCEReferenceWidget.py similarity index 98% rename from GUI/LibPINCEReferenceWidget.py rename to pince/GUI/LibPINCEReferenceWidget.py index 490ab481..185eb524 100644 --- a/GUI/LibPINCEReferenceWidget.py +++ b/pince/GUI/LibPINCEReferenceWidget.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'LibPINCEReferenceWidget.ui' # -# Created: Thu Feb 2 23:39:23 2017 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! diff --git a/GUI/LibPINCEReferenceWidget.ui b/pince/GUI/LibPINCEReferenceWidget.ui similarity index 100% rename from GUI/LibPINCEReferenceWidget.ui rename to pince/GUI/LibPINCEReferenceWidget.ui diff --git a/GUI/LoadingDialog.py b/pince/GUI/LoadingDialog.py similarity index 97% rename from GUI/LoadingDialog.py rename to pince/GUI/LoadingDialog.py index 5efff741..98047544 100644 --- a/GUI/LoadingDialog.py +++ b/pince/GUI/LoadingDialog.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'LoadingDialog.ui' # -# Created: Tue Feb 21 22:38:30 2017 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! diff --git a/GUI/LoadingDialog.ui b/pince/GUI/LoadingDialog.ui similarity index 100% rename from GUI/LoadingDialog.ui rename to pince/GUI/LoadingDialog.ui diff --git a/GUI/LogFileWidget.py b/pince/GUI/LogFileWidget.py similarity index 94% rename from GUI/LogFileWidget.py rename to pince/GUI/LogFileWidget.py index f88c8e5f..0515f352 100644 --- a/GUI/LogFileWidget.py +++ b/pince/GUI/LogFileWidget.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'LogFileWidget.ui' # -# Created: Sat Feb 11 01:51:44 2017 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! diff --git a/GUI/LogFileWidget.ui b/pince/GUI/LogFileWidget.ui similarity index 100% rename from GUI/LogFileWidget.ui rename to pince/GUI/LogFileWidget.ui diff --git a/GUI/MainWindow.py b/pince/GUI/MainWindow.py similarity index 99% rename from GUI/MainWindow.py rename to pince/GUI/MainWindow.py index aee5d7c8..7bc5b78c 100644 --- a/GUI/MainWindow.py +++ b/pince/GUI/MainWindow.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'MainWindow.ui' # -# Created: Tue Feb 14 21:25:22 2017 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! @@ -141,8 +140,8 @@ def setupUi(self, MainWindow): self.widget.setSizePolicy(sizePolicy) self.widget.setObjectName("widget") self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.widget) - self.verticalLayout_2.setSpacing(0) self.verticalLayout_2.setContentsMargins(0, 0, 0, 0) + self.verticalLayout_2.setSpacing(0) self.verticalLayout_2.setObjectName("verticalLayout_2") self.radioButton_Bits = QtWidgets.QRadioButton(self.widget) self.radioButton_Bits.setObjectName("radioButton_Bits") @@ -200,8 +199,8 @@ def setupUi(self, MainWindow): self.widget_2 = QtWidgets.QWidget(self.QWidget_Toolbox) self.widget_2.setObjectName("widget_2") self.verticalLayout = QtWidgets.QVBoxLayout(self.widget_2) - self.verticalLayout.setSpacing(0) self.verticalLayout.setContentsMargins(0, 0, 0, 0) + self.verticalLayout.setSpacing(0) self.verticalLayout.setObjectName("verticalLayout") self.radioButton_RoundedDefault = QtWidgets.QRadioButton(self.widget_2) self.radioButton_RoundedDefault.setObjectName("radioButton_RoundedDefault") diff --git a/GUI/MainWindow.ui b/pince/GUI/MainWindow.ui similarity index 100% rename from GUI/MainWindow.ui rename to pince/GUI/MainWindow.ui diff --git a/GUI/MemoryRegionsWidget.py b/pince/GUI/MemoryRegionsWidget.py similarity index 98% rename from GUI/MemoryRegionsWidget.py rename to pince/GUI/MemoryRegionsWidget.py index 54514b84..768cd5b9 100644 --- a/GUI/MemoryRegionsWidget.py +++ b/pince/GUI/MemoryRegionsWidget.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'MemoryRegionsWidget.ui' # -# Created: Wed Feb 15 17:56:42 2017 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! diff --git a/GUI/MemoryRegionsWidget.ui b/pince/GUI/MemoryRegionsWidget.ui similarity index 100% rename from GUI/MemoryRegionsWidget.ui rename to pince/GUI/MemoryRegionsWidget.ui diff --git a/GUI/MemoryViewerWindow.py b/pince/GUI/MemoryViewerWindow.py similarity index 98% rename from GUI/MemoryViewerWindow.py rename to pince/GUI/MemoryViewerWindow.py index 18157ab2..7d876124 100644 --- a/GUI/MemoryViewerWindow.py +++ b/pince/GUI/MemoryViewerWindow.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'MemoryViewerWindow.ui' # -# Created: Wed Feb 15 17:57:59 2017 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! @@ -73,9 +72,10 @@ def setupUi(self, MainWindow_MemoryView): self.scrollArea_Registers.setWidgetResizable(True) self.scrollArea_Registers.setObjectName("scrollArea_Registers") self.scrollAreaWidgetContents_Registers = QtWidgets.QWidget() - self.scrollAreaWidgetContents_Registers.setGeometry(QtCore.QRect(0, 0, 358, 455)) + self.scrollAreaWidgetContents_Registers.setGeometry(QtCore.QRect(0, 0, 340, 440)) self.scrollAreaWidgetContents_Registers.setObjectName("scrollAreaWidgetContents_Registers") self.gridLayout_8 = QtWidgets.QGridLayout(self.scrollAreaWidgetContents_Registers) + self.gridLayout_8.setContentsMargins(0, 0, 0, 0) self.gridLayout_8.setObjectName("gridLayout_8") self.horizontalLayout_4 = QtWidgets.QHBoxLayout() self.horizontalLayout_4.setObjectName("horizontalLayout_4") @@ -98,6 +98,7 @@ def setupUi(self, MainWindow_MemoryView): self.registers_64 = QtWidgets.QWidget() self.registers_64.setObjectName("registers_64") self.gridLayout_7 = QtWidgets.QGridLayout(self.registers_64) + self.gridLayout_7.setContentsMargins(0, 0, 0, 0) self.gridLayout_7.setObjectName("gridLayout_7") self.verticalLayout_17 = QtWidgets.QVBoxLayout() self.verticalLayout_17.setObjectName("verticalLayout_17") @@ -226,6 +227,7 @@ def setupUi(self, MainWindow_MemoryView): self.registers_32 = QtWidgets.QWidget() self.registers_32.setObjectName("registers_32") self.gridLayout_6 = QtWidgets.QGridLayout(self.registers_32) + self.gridLayout_6.setContentsMargins(0, 0, 0, 0) self.gridLayout_6.setObjectName("gridLayout_6") self.verticalLayout_14 = QtWidgets.QVBoxLayout() self.verticalLayout_14.setObjectName("verticalLayout_14") @@ -535,9 +537,10 @@ def setupUi(self, MainWindow_MemoryView): self.scrollArea_Hex.setWidgetResizable(True) self.scrollArea_Hex.setObjectName("scrollArea_Hex") self.scrollAreaWidgetContents_2 = QtWidgets.QWidget() - self.scrollAreaWidgetContents_2.setGeometry(QtCore.QRect(0, 0, 493, 181)) + self.scrollAreaWidgetContents_2.setGeometry(QtCore.QRect(0, 0, 516, 169)) self.scrollAreaWidgetContents_2.setObjectName("scrollAreaWidgetContents_2") self.gridLayout_11 = QtWidgets.QGridLayout(self.scrollAreaWidgetContents_2) + self.gridLayout_11.setContentsMargins(0, 0, 0, 0) self.gridLayout_11.setObjectName("gridLayout_11") self.horizontalLayout_5 = QtWidgets.QHBoxLayout() self.horizontalLayout_5.setObjectName("horizontalLayout_5") @@ -582,6 +585,8 @@ def setupUi(self, MainWindow_MemoryView): self.line_6.setFrameShadow(QtWidgets.QFrame.Sunken) self.line_6.setObjectName("line_6") self.gridLayout_11.addWidget(self.line_6, 1, 0, 1, 1) + self.label_HexView_Information.raise_() + self.line_6.raise_() self.scrollArea_Hex.setWidget(self.scrollAreaWidgetContents_2) self.gridLayout.addWidget(self.scrollArea_Hex, 0, 0, 1, 1) self.verticalScrollBar_HexView = QtWidgets.QScrollBar(self.widget_HexView) @@ -598,6 +603,7 @@ def setupUi(self, MainWindow_MemoryView): self.StackTrace = QtWidgets.QWidget() self.StackTrace.setObjectName("StackTrace") self.gridLayout_9 = QtWidgets.QGridLayout(self.StackTrace) + self.gridLayout_9.setContentsMargins(0, 0, 0, 0) self.gridLayout_9.setObjectName("gridLayout_9") self.tableWidget_StackTrace = QtWidgets.QTableWidget(self.StackTrace) font = QtGui.QFont() @@ -622,6 +628,7 @@ def setupUi(self, MainWindow_MemoryView): self.Stack = QtWidgets.QWidget() self.Stack.setObjectName("Stack") self.gridLayout_10 = QtWidgets.QGridLayout(self.Stack) + self.gridLayout_10.setContentsMargins(0, 0, 0, 0) self.gridLayout_10.setObjectName("gridLayout_10") self.tableWidget_Stack = QtWidgets.QTableWidget(self.Stack) font = QtGui.QFont() @@ -650,7 +657,7 @@ def setupUi(self, MainWindow_MemoryView): self.gridLayout_5.addWidget(self.splitter_MainMiddle, 0, 0, 1, 1) MainWindow_MemoryView.setCentralWidget(self.centralwidget) self.menubar = QtWidgets.QMenuBar(MainWindow_MemoryView) - self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 22)) + self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 24)) self.menubar.setObjectName("menubar") self.menuView = QtWidgets.QMenu(self.menubar) self.menuView.setObjectName("menuView") @@ -835,7 +842,7 @@ def retranslateUi(self, MainWindow_MemoryView): self.actionSearch_Opcode.setText(_translate("MainWindow_MemoryView", "Search Opcode")) self.actionMemory_Regions.setText(_translate("MainWindow_MemoryView", "Memory Regions")) -from GUI.CustomTableViews.AsciiView import QAsciiView -from GUI.CustomTableViews.HexView import QHexView -from GUI.CustomLabels.RegisterLabel import QRegisterLabel -from GUI.CustomLabels.FlagRegisterLabel import QFlagRegisterLabel +from pince.GUI.CustomLabels.FlagRegisterLabel import QFlagRegisterLabel +from pince.GUI.CustomLabels.RegisterLabel import QRegisterLabel +from pince.GUI.CustomTableViews.AsciiView import QAsciiView +from pince.GUI.CustomTableViews.HexView import QHexView diff --git a/GUI/MemoryViewerWindow.ui b/pince/GUI/MemoryViewerWindow.ui similarity index 99% rename from GUI/MemoryViewerWindow.ui rename to pince/GUI/MemoryViewerWindow.ui index 3eff98c6..5f8c6e3b 100644 --- a/GUI/MemoryViewerWindow.ui +++ b/pince/GUI/MemoryViewerWindow.ui @@ -127,8 +127,8 @@ 0 0 - 358 - 455 + 340 + 440 @@ -1061,8 +1061,8 @@ 0 0 - 493 - 181 + 516 + 169 @@ -1277,7 +1277,7 @@ 0 0 800 - 22 + 24 @@ -1426,22 +1426,22 @@ QRegisterLabel QLabel -
GUI.CustomLabels.RegisterLabel
+
pince.GUI.CustomLabels.RegisterLabel
 QFlagRegisterLabel QLabel -
GUI.CustomLabels.FlagRegisterLabel
+
pince.GUI.CustomLabels.FlagRegisterLabel
 QHexView QTableView -
GUI.CustomTableViews.HexView
+
pince.GUI.CustomTableViews.HexView
 QAsciiView QTableView -
GUI.CustomTableViews.AsciiView
+
pince.GUI.CustomTableViews.AsciiView
 diff --git a/GUI/Notes.txt b/pince/GUI/Notes.txt similarity index 100% rename from GUI/Notes.txt rename to pince/GUI/Notes.txt diff --git a/GUI/SearchOpcodeWidget.py b/pince/GUI/SearchOpcodeWidget.py similarity index 98% rename from GUI/SearchOpcodeWidget.py rename to pince/GUI/SearchOpcodeWidget.py index 3fa9abe0..26df7b19 100644 --- a/GUI/SearchOpcodeWidget.py +++ b/pince/GUI/SearchOpcodeWidget.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'SearchOpcodeWidget.ui' # -# Created: Tue Feb 14 17:34:28 2017 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! diff --git a/GUI/SearchOpcodeWidget.ui b/pince/GUI/SearchOpcodeWidget.ui similarity index 100% rename from GUI/SearchOpcodeWidget.ui rename to pince/GUI/SearchOpcodeWidget.ui diff --git a/GUI/SelectProcess.py b/pince/GUI/SelectProcess.py similarity index 98% rename from GUI/SelectProcess.py rename to pince/GUI/SelectProcess.py index 02c16cc1..5fff5113 100644 --- a/GUI/SelectProcess.py +++ b/pince/GUI/SelectProcess.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'SelectProcess.ui' # -# Created: Mon Feb 6 17:00:54 2017 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! diff --git a/GUI/SelectProcess.ui b/pince/GUI/SelectProcess.ui similarity index 100% rename from GUI/SelectProcess.ui rename to pince/GUI/SelectProcess.ui diff --git a/GUI/SettingsDialog.py b/pince/GUI/SettingsDialog.py similarity index 98% rename from GUI/SettingsDialog.py rename to pince/GUI/SettingsDialog.py index ef1b94f5..0ac877e5 100644 --- a/GUI/SettingsDialog.py +++ b/pince/GUI/SettingsDialog.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'SettingsDialog.ui' # -# Created: Fri Dec 16 04:11:05 2016 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! @@ -44,6 +43,7 @@ def setupUi(self, Dialog): self.page = QtWidgets.QWidget() self.page.setObjectName("page") self.gridLayout = QtWidgets.QGridLayout(self.page) + self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setObjectName("gridLayout") self.verticalLayout_5 = QtWidgets.QVBoxLayout() self.verticalLayout_5.setObjectName("verticalLayout_5") @@ -84,6 +84,7 @@ def setupUi(self, Dialog): self.page_2 = QtWidgets.QWidget() self.page_2.setObjectName("page_2") self.gridLayout_3 = QtWidgets.QGridLayout(self.page_2) + self.gridLayout_3.setContentsMargins(0, 0, 0, 0) self.gridLayout_3.setObjectName("gridLayout_3") self.horizontalLayout_5 = QtWidgets.QHBoxLayout() self.horizontalLayout_5.setObjectName("horizontalLayout_5") @@ -126,6 +127,7 @@ def setupUi(self, Dialog): self.page_3 = QtWidgets.QWidget() self.page_3.setObjectName("page_3") self.gridLayout_4 = QtWidgets.QGridLayout(self.page_3) + self.gridLayout_4.setContentsMargins(0, 0, 0, 0) self.gridLayout_4.setObjectName("gridLayout_4") self.verticalLayout_9 = QtWidgets.QVBoxLayout() self.verticalLayout_9.setObjectName("verticalLayout_9") @@ -163,6 +165,7 @@ def setupUi(self, Dialog): self.page_4 = QtWidgets.QWidget() self.page_4.setObjectName("page_4") self.gridLayout_5 = QtWidgets.QGridLayout(self.page_4) + self.gridLayout_5.setContentsMargins(0, 0, 0, 0) self.gridLayout_5.setObjectName("gridLayout_5") self.verticalLayout_10 = QtWidgets.QVBoxLayout() self.verticalLayout_10.setObjectName("verticalLayout_10") @@ -191,6 +194,7 @@ def setupUi(self, Dialog): self.page_5 = QtWidgets.QWidget() self.page_5.setObjectName("page_5") self.gridLayout_6 = QtWidgets.QGridLayout(self.page_5) + self.gridLayout_6.setContentsMargins(0, 0, 0, 0) self.gridLayout_6.setObjectName("gridLayout_6") self.verticalLayout_11 = QtWidgets.QVBoxLayout() self.verticalLayout_11.setObjectName("verticalLayout_11") diff --git a/GUI/SettingsDialog.ui b/pince/GUI/SettingsDialog.ui similarity index 100% rename from GUI/SettingsDialog.ui rename to pince/GUI/SettingsDialog.ui diff --git a/GUI/StackTraceInfoWidget.py b/pince/GUI/StackTraceInfoWidget.py similarity index 93% rename from GUI/StackTraceInfoWidget.py rename to pince/GUI/StackTraceInfoWidget.py index e9877bcc..baf8e6e1 100644 --- a/GUI/StackTraceInfoWidget.py +++ b/pince/GUI/StackTraceInfoWidget.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'stacktraceinfowidget.ui' +# Form implementation generated from reading ui file 'StackTraceInfoWidget.ui' # -# Created: Tue Jul 26 21:56:27 2016 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! diff --git a/GUI/StackTraceInfoWidget.ui b/pince/GUI/StackTraceInfoWidget.ui similarity index 100% rename from GUI/StackTraceInfoWidget.ui rename to pince/GUI/StackTraceInfoWidget.ui diff --git a/GUI/TraceInstructionsPromptDialog.py b/pince/GUI/TraceInstructionsPromptDialog.py similarity index 98% rename from GUI/TraceInstructionsPromptDialog.py rename to pince/GUI/TraceInstructionsPromptDialog.py index 4d0dd8d6..f3cea4d6 100644 --- a/GUI/TraceInstructionsPromptDialog.py +++ b/pince/GUI/TraceInstructionsPromptDialog.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'TraceInstructionsPromptDialog.ui' # -# Created: Tue Jan 10 18:45:42 2017 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! diff --git a/GUI/TraceInstructionsPromptDialog.ui b/pince/GUI/TraceInstructionsPromptDialog.ui similarity index 100% rename from GUI/TraceInstructionsPromptDialog.ui rename to pince/GUI/TraceInstructionsPromptDialog.ui diff --git a/GUI/TraceInstructionsWaitWidget.py b/pince/GUI/TraceInstructionsWaitWidget.py similarity index 96% rename from GUI/TraceInstructionsWaitWidget.py rename to pince/GUI/TraceInstructionsWaitWidget.py index c3dfc3cf..cbe07696 100644 --- a/GUI/TraceInstructionsWaitWidget.py +++ b/pince/GUI/TraceInstructionsWaitWidget.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'TraceInstructionsWaitWidget.ui' # -# Created: Sun Dec 25 15:05:53 2016 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! diff --git a/GUI/TraceInstructionsWaitWidget.ui b/pince/GUI/TraceInstructionsWaitWidget.ui similarity index 100% rename from GUI/TraceInstructionsWaitWidget.ui rename to pince/GUI/TraceInstructionsWaitWidget.ui diff --git a/GUI/TraceInstructionsWindow.py b/pince/GUI/TraceInstructionsWindow.py similarity index 97% rename from GUI/TraceInstructionsWindow.py rename to pince/GUI/TraceInstructionsWindow.py index 59ac231d..71aafaa2 100644 --- a/GUI/TraceInstructionsWindow.py +++ b/pince/GUI/TraceInstructionsWindow.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'TraceInstructionsWindow.ui' # -# Created: Mon Jan 16 19:23:48 2017 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! diff --git a/GUI/TraceInstructionsWindow.ui b/pince/GUI/TraceInstructionsWindow.ui similarity index 100% rename from GUI/TraceInstructionsWindow.ui rename to pince/GUI/TraceInstructionsWindow.ui diff --git a/GUI/TrackBreakpointWidget.py b/pince/GUI/TrackBreakpointWidget.py similarity index 98% rename from GUI/TrackBreakpointWidget.py rename to pince/GUI/TrackBreakpointWidget.py index 59cd72f8..70bd7e4e 100644 --- a/GUI/TrackBreakpointWidget.py +++ b/pince/GUI/TrackBreakpointWidget.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'TrackBreakpointWidget.ui' # -# Created: Fri Dec 16 02:40:23 2016 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! diff --git a/GUI/TrackBreakpointWidget.ui b/pince/GUI/TrackBreakpointWidget.ui similarity index 100% rename from GUI/TrackBreakpointWidget.ui rename to pince/GUI/TrackBreakpointWidget.ui diff --git a/GUI/TrackWatchpointWidget.py b/pince/GUI/TrackWatchpointWidget.py similarity index 97% rename from GUI/TrackWatchpointWidget.py rename to pince/GUI/TrackWatchpointWidget.py index 7791008d..49ccc0c0 100644 --- a/GUI/TrackWatchpointWidget.py +++ b/pince/GUI/TrackWatchpointWidget.py @@ -2,8 +2,7 @@ # Form implementation generated from reading ui file 'TrackWatchpointWidget.ui' # -# Created: Fri Dec 2 21:30:54 2016 -# by: PyQt5 UI code generator 5.2.1 +# Created by: PyQt5 UI code generator 5.8 # # WARNING! All changes made in this file will be lost! diff --git a/GUI/TrackWatchpointWidget.ui b/pince/GUI/TrackWatchpointWidget.ui similarity index 100% rename from GUI/TrackWatchpointWidget.ui rename to pince/GUI/TrackWatchpointWidget.ui diff --git a/GUI/__init__.py b/pince/GUI/__init__.py similarity index 100% rename from GUI/__init__.py rename to pince/GUI/__init__.py diff --git a/PINCE.py b/pince/PINCE.py similarity index 98% rename from PINCE.py rename to pince/PINCE.py index 75f17f98..49828563 100644 --- a/PINCE.py +++ b/pince/PINCE.py @@ -27,37 +27,37 @@ import sys import traceback -from libPINCE import GuiUtils, SysUtils, GDB_Engine, type_defs +from pince.libPINCE import GuiUtils, SysUtils, GDB_Engine, type_defs -from GUI.MainWindow import Ui_MainWindow as MainWindow -from GUI.SelectProcess import Ui_MainWindow as ProcessWindow -from GUI.AddAddressManuallyDialog import Ui_Dialog as ManualAddressDialog -from GUI.LoadingDialog import Ui_Dialog as LoadingDialog -from GUI.DialogWithButtons import Ui_Dialog as DialogWithButtons -from GUI.SettingsDialog import Ui_Dialog as SettingsDialog -from GUI.ConsoleWidget import Ui_Form as ConsoleWidget -from GUI.AboutWidget import Ui_TabWidget as AboutWidget +from pince.GUI.MainWindow import Ui_MainWindow as MainWindow +from pince.GUI.SelectProcess import Ui_MainWindow as ProcessWindow +from pince.GUI.AddAddressManuallyDialog import Ui_Dialog as ManualAddressDialog +from pince.GUI.LoadingDialog import Ui_Dialog as LoadingDialog +from pince.GUI.DialogWithButtons import Ui_Dialog as DialogWithButtons +from pince.GUI.SettingsDialog import Ui_Dialog as SettingsDialog +from pince.GUI.ConsoleWidget import Ui_Form as ConsoleWidget +from pince.GUI.AboutWidget import Ui_TabWidget as AboutWidget # If you are going to change the name "Ui_MainWindow_MemoryView", review GUI/CustomLabels/RegisterLabel.py as well -from GUI.MemoryViewerWindow import Ui_MainWindow_MemoryView as MemoryViewWindow -from GUI.BookmarkWidget import Ui_Form as BookmarkWidget -from GUI.FloatRegisterWidget import Ui_TabWidget as FloatRegisterWidget -from GUI.StackTraceInfoWidget import Ui_Form as StackTraceInfoWidget -from GUI.BreakpointInfoWidget import Ui_TabWidget as BreakpointInfoWidget -from GUI.TrackWatchpointWidget import Ui_Form as TrackWatchpointWidget -from GUI.TrackBreakpointWidget import Ui_Form as TrackBreakpointWidget -from GUI.TraceInstructionsPromptDialog import Ui_Dialog as TraceInstructionsPromptDialog -from GUI.TraceInstructionsWaitWidget import Ui_Form as TraceInstructionsWaitWidget -from GUI.TraceInstructionsWindow import Ui_MainWindow as TraceInstructionsWindow -from GUI.FunctionsInfoWidget import Ui_Form as FunctionsInfoWidget -from GUI.HexEditDialog import Ui_Dialog as HexEditDialog -from GUI.LibPINCEReferenceWidget import Ui_Form as LibPINCEReferenceWidget -from GUI.LogFileWidget import Ui_Form as LogFileWidget -from GUI.SearchOpcodeWidget import Ui_Form as SearchOpcodeWidget -from GUI.MemoryRegionsWidget import Ui_Form as MemoryRegionsWidget - -from GUI.CustomAbstractTableModels.HexModel import QHexModel -from GUI.CustomAbstractTableModels.AsciiModel import QAsciiModel +from pince.GUI.MemoryViewerWindow import Ui_MainWindow_MemoryView as MemoryViewWindow +from pince.GUI.BookmarkWidget import Ui_Form as BookmarkWidget +from pince.GUI.FloatRegisterWidget import Ui_TabWidget as FloatRegisterWidget +from pince.GUI.StackTraceInfoWidget import Ui_Form as StackTraceInfoWidget +from pince.GUI.BreakpointInfoWidget import Ui_TabWidget as BreakpointInfoWidget +from pince.GUI.TrackWatchpointWidget import Ui_Form as TrackWatchpointWidget +from pince.GUI.TrackBreakpointWidget import Ui_Form as TrackBreakpointWidget +from pince.GUI.TraceInstructionsPromptDialog import Ui_Dialog as TraceInstructionsPromptDialog +from pince.GUI.TraceInstructionsWaitWidget import Ui_Form as TraceInstructionsWaitWidget +from pince.GUI.TraceInstructionsWindow import Ui_MainWindow as TraceInstructionsWindow +from pince.GUI.FunctionsInfoWidget import Ui_Form as FunctionsInfoWidget +from pince.GUI.HexEditDialog import Ui_Dialog as HexEditDialog +from pince.GUI.LibPINCEReferenceWidget import Ui_Form as LibPINCEReferenceWidget +from pince.GUI.LogFileWidget import Ui_Form as LogFileWidget +from pince.GUI.SearchOpcodeWidget import Ui_Form as SearchOpcodeWidget +from pince.GUI.MemoryRegionsWidget import Ui_Form as MemoryRegionsWidget + +from pince.GUI.CustomAbstractTableModels.HexModel import QHexModel +from pince.GUI.CustomAbstractTableModels.AsciiModel import QAsciiModel selfpid = os.getpid() @@ -3202,8 +3202,3 @@ def tableWidget_MemoryRegions_item_double_clicked(self, index): self.parent().hex_dump_address(address_int) -if __name__ == "__main__": - app = QApplication(sys.argv) - window = MainForm() - window.show() - sys.exit(app.exec_()) diff --git a/__init__.py b/pince/__init__.py similarity index 100% rename from __init__.py rename to pince/__init__.py diff --git a/libPINCE/.gitignore b/pince/libPINCE/.gitignore similarity index 100% rename from libPINCE/.gitignore rename to pince/libPINCE/.gitignore diff --git a/libPINCE/GDB_Engine.py b/pince/libPINCE/GDB_Engine.py similarity index 100% rename from libPINCE/GDB_Engine.py rename to pince/libPINCE/GDB_Engine.py diff --git a/libPINCE/GuiUtils.py b/pince/libPINCE/GuiUtils.py similarity index 100% rename from libPINCE/GuiUtils.py rename to pince/libPINCE/GuiUtils.py diff --git a/libPINCE/Injection/.gitignore b/pince/libPINCE/Injection/.gitignore similarity index 100% rename from libPINCE/Injection/.gitignore rename to pince/libPINCE/Injection/.gitignore diff --git a/libPINCE/Injection/Notes.txt b/pince/libPINCE/Injection/Notes.txt similarity index 100% rename from libPINCE/Injection/Notes.txt rename to pince/libPINCE/Injection/Notes.txt diff --git a/libPINCE/Injection/example.c b/pince/libPINCE/Injection/example.c similarity index 100% rename from libPINCE/Injection/example.c rename to pince/libPINCE/Injection/example.c diff --git a/libPINCE/SysUtils.py b/pince/libPINCE/SysUtils.py similarity index 100% rename from libPINCE/SysUtils.py rename to pince/libPINCE/SysUtils.py diff --git a/libPINCE/__init__.py b/pince/libPINCE/__init__.py similarity index 100% rename from libPINCE/__init__.py rename to pince/libPINCE/__init__.py diff --git a/libPINCE/gdb_python_scripts/.gitignore b/pince/libPINCE/gdb_python_scripts/.gitignore similarity index 100% rename from libPINCE/gdb_python_scripts/.gitignore rename to pince/libPINCE/gdb_python_scripts/.gitignore diff --git a/libPINCE/gdb_python_scripts/GDBCommandExtensions.py b/pince/libPINCE/gdb_python_scripts/GDBCommandExtensions.py similarity index 99% rename from libPINCE/gdb_python_scripts/GDBCommandExtensions.py rename to pince/libPINCE/gdb_python_scripts/GDBCommandExtensions.py index 9dcb0d69..e7b9b251 100644 --- a/libPINCE/gdb_python_scripts/GDBCommandExtensions.py +++ b/pince/libPINCE/gdb_python_scripts/GDBCommandExtensions.py @@ -30,9 +30,9 @@ PINCE_PATH = gdbvalue.string() sys.path.append(PINCE_PATH) # Adds the PINCE directory to PYTHONPATH to import libraries from PINCE -from libPINCE.gdb_python_scripts import ScriptUtils -from libPINCE import SysUtils -from libPINCE import type_defs +from pince.libPINCE.gdb_python_scripts import ScriptUtils +from pince.libPINCE import SysUtils +from pince.libPINCE import type_defs inferior = gdb.selected_inferior() pid = inferior.pid diff --git a/libPINCE/gdb_python_scripts/ScriptUtils.py b/pince/libPINCE/gdb_python_scripts/ScriptUtils.py similarity index 99% rename from libPINCE/gdb_python_scripts/ScriptUtils.py rename to pince/libPINCE/gdb_python_scripts/ScriptUtils.py index 60ad808f..b77d11f6 100644 --- a/libPINCE/gdb_python_scripts/ScriptUtils.py +++ b/pince/libPINCE/gdb_python_scripts/ScriptUtils.py @@ -26,8 +26,8 @@ PINCE_PATH = gdbvalue.string() sys.path.append(PINCE_PATH) # Adds the PINCE directory to PYTHONPATH to import libraries from PINCE -from libPINCE import SysUtils -from libPINCE import type_defs +from pince.libPINCE import SysUtils +from pince.libPINCE import type_defs inferior = gdb.selected_inferior() pid = inferior.pid diff --git a/libPINCE/gdb_python_scripts/__init__.py b/pince/libPINCE/gdb_python_scripts/__init__.py similarity index 100% rename from libPINCE/gdb_python_scripts/__init__.py rename to pince/libPINCE/gdb_python_scripts/__init__.py diff --git a/libPINCE/gdb_python_scripts/tests/.gitignore b/pince/libPINCE/gdb_python_scripts/tests/.gitignore similarity index 100% rename from libPINCE/gdb_python_scripts/tests/.gitignore rename to pince/libPINCE/gdb_python_scripts/tests/.gitignore diff --git a/libPINCE/gdb_python_scripts/tests/Notes.txt b/pince/libPINCE/gdb_python_scripts/tests/Notes.txt similarity index 100% rename from libPINCE/gdb_python_scripts/tests/Notes.txt rename to pince/libPINCE/gdb_python_scripts/tests/Notes.txt diff --git a/libPINCE/gdb_python_scripts/tests/example.c b/pince/libPINCE/gdb_python_scripts/tests/example.c similarity index 100% rename from libPINCE/gdb_python_scripts/tests/example.c rename to pince/libPINCE/gdb_python_scripts/tests/example.c diff --git a/libPINCE/type_defs.py b/pince/libPINCE/type_defs.py similarity index 100% rename from libPINCE/type_defs.py rename to pince/libPINCE/type_defs.py diff --git a/pince-non-stop-files/InitialCodeInjections.c b/pince/pince-non-stop-files/InitialCodeInjections.c similarity index 100% rename from pince-non-stop-files/InitialCodeInjections.c rename to pince/pince-non-stop-files/InitialCodeInjections.c diff --git a/pince-non-stop-files/InitialCodeInjections.so b/pince/pince-non-stop-files/InitialCodeInjections.so similarity index 100% rename from pince-non-stop-files/InitialCodeInjections.so rename to pince/pince-non-stop-files/InitialCodeInjections.so diff --git a/pince-non-stop-files/old_gdbinit b/pince/pince-non-stop-files/old_gdbinit similarity index 100% rename from pince-non-stop-files/old_gdbinit rename to pince/pince-non-stop-files/old_gdbinit diff --git a/pince-non-stop-files/on_code_injection_failure b/pince/pince-non-stop-files/on_code_injection_failure similarity index 100% rename from pince-non-stop-files/on_code_injection_failure rename to pince/pince-non-stop-files/on_code_injection_failure diff --git a/pince-non-stop-files/pince-non-stop-mode.py b/pince/pince-non-stop-files/pince-non-stop-mode.py similarity index 100% rename from pince-non-stop-files/pince-non-stop-mode.py rename to pince/pince-non-stop-files/pince-non-stop-mode.py