Skip to content

Commit 297c312

Browse files
committed
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
1 parent a140805 commit 297c312

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+120
-118
lines changed

Diff for: bin/pince-gui.py

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/usr/bin/env python3
2+
3+
import sys
4+
from PyQt5.QtWidgets import QApplication
5+
6+
import pince.PINCE as p
7+
8+
if __name__ == "__main__":
9+
app = QApplication(sys.argv)
10+
window = p.MainForm()
11+
window.show()
12+
sys.exit(app.exec_())

Diff for: GUI/AboutWidget.py renamed to pince/GUI/AboutWidget.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
# -*- coding: utf-8 -*-
22

3-
# Form implementation generated from reading ui file 'aboutwidget.ui'
3+
# Form implementation generated from reading ui file 'AboutWidget.ui'
44
#
5-
# Created: Wed Jun 29 16:34:26 2016
6-
# by: PyQt5 UI code generator 5.2.1
5+
# Created by: PyQt5 UI code generator 5.8
76
#
87
# WARNING! All changes made in this file will be lost!
98

@@ -16,6 +15,7 @@ def setupUi(self, TabWidget):
1615
self.tab_Contributors = QtWidgets.QWidget()
1716
self.tab_Contributors.setObjectName("tab_Contributors")
1817
self.gridLayout_2 = QtWidgets.QGridLayout(self.tab_Contributors)
18+
self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
1919
self.gridLayout_2.setObjectName("gridLayout_2")
2020
self.textBrowser_Contributors = QtWidgets.QTextBrowser(self.tab_Contributors)
2121
self.textBrowser_Contributors.setObjectName("textBrowser_Contributors")
@@ -24,6 +24,7 @@ def setupUi(self, TabWidget):
2424
self.tab_License = QtWidgets.QWidget()
2525
self.tab_License.setObjectName("tab_License")
2626
self.gridLayout = QtWidgets.QGridLayout(self.tab_License)
27+
self.gridLayout.setContentsMargins(0, 0, 0, 0)
2728
self.gridLayout.setObjectName("gridLayout")
2829
self.textBrowser_License = QtWidgets.QTextBrowser(self.tab_License)
2930
self.textBrowser_License.setObjectName("textBrowser_License")
File renamed without changes.

Diff for: GUI/AddAddressManuallyDialog.py renamed to pince/GUI/AddAddressManuallyDialog.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
# Form implementation generated from reading ui file 'AddAddressManuallyDialog.ui'
44
#
5-
# Created: Mon Dec 26 20:22:30 2016
6-
# by: PyQt5 UI code generator 5.2.1
5+
# Created by: PyQt5 UI code generator 5.8
76
#
87
# WARNING! All changes made in this file will be lost!
98

File renamed without changes.

Diff for: GUI/BookmarkWidget.py renamed to pince/GUI/BookmarkWidget.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
# -*- coding: utf-8 -*-
22

3-
# Form implementation generated from reading ui file 'bookmarkwidget.ui'
3+
# Form implementation generated from reading ui file 'BookmarkWidget.ui'
44
#
5-
# Created: Sat Jul 9 16:03:34 2016
6-
# by: PyQt5 UI code generator 5.2.1
5+
# Created by: PyQt5 UI code generator 5.8
76
#
87
# WARNING! All changes made in this file will be lost!
98

File renamed without changes.

Diff for: GUI/BreakpointInfoWidget.py renamed to pince/GUI/BreakpointInfoWidget.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
# Form implementation generated from reading ui file 'BreakpointInfoWidget.ui'
44
#
5-
# Created: Fri Dec 2 21:32:09 2016
6-
# by: PyQt5 UI code generator 5.2.1
5+
# Created by: PyQt5 UI code generator 5.8
76
#
87
# WARNING! All changes made in this file will be lost!
98

@@ -16,6 +15,7 @@ def setupUi(self, TabWidget):
1615
self.tab_BreakpointInfo = QtWidgets.QWidget()
1716
self.tab_BreakpointInfo.setObjectName("tab_BreakpointInfo")
1817
self.gridLayout_2 = QtWidgets.QGridLayout(self.tab_BreakpointInfo)
18+
self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
1919
self.gridLayout_2.setObjectName("gridLayout_2")
2020
self.tableWidget_BreakpointInfo = QtWidgets.QTableWidget(self.tab_BreakpointInfo)
2121
self.tableWidget_BreakpointInfo.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
@@ -45,6 +45,7 @@ def setupUi(self, TabWidget):
4545
self.tab_RawBreakpointInfo = QtWidgets.QWidget()
4646
self.tab_RawBreakpointInfo.setObjectName("tab_RawBreakpointInfo")
4747
self.gridLayout = QtWidgets.QGridLayout(self.tab_RawBreakpointInfo)
48+
self.gridLayout.setContentsMargins(0, 0, 0, 0)
4849
self.gridLayout.setObjectName("gridLayout")
4950
self.textBrowser_BreakpointInfo = QtWidgets.QTextBrowser(self.tab_RawBreakpointInfo)
5051
self.textBrowser_BreakpointInfo.setObjectName("textBrowser_BreakpointInfo")
File renamed without changes.

Diff for: GUI/ConsoleWidget.py renamed to pince/GUI/ConsoleWidget.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
# -*- coding: utf-8 -*-
22

3-
# Form implementation generated from reading ui file 'consolewidget.ui'
3+
# Form implementation generated from reading ui file 'ConsoleWidget.ui'
44
#
5-
# Created: Thu Jul 21 18:11:36 2016
6-
# by: PyQt5 UI code generator 5.2.1
5+
# Created by: PyQt5 UI code generator 5.8
76
#
87
# WARNING! All changes made in this file will be lost!
98

File renamed without changes.

Diff for: GUI/CustomAbstractTableModels/AsciiModel.py renamed to pince/GUI/CustomAbstractTableModels/AsciiModel.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from PyQt5.QtCore import QVariant, Qt
22
from PyQt5.QtGui import QColor
3-
from GUI.CustomAbstractTableModels.HexModel import QHexModel
3+
from pince.GUI.CustomAbstractTableModels.HexModel import QHexModel
44

5-
from libPINCE import SysUtils
5+
from pince.libPINCE import SysUtils
66

77

88
class QAsciiModel(QHexModel):

Diff for: GUI/CustomAbstractTableModels/HexModel.py renamed to pince/GUI/CustomAbstractTableModels/HexModel.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from PyQt5.QtCore import QAbstractTableModel, QVariant, Qt
22
from PyQt5.QtGui import QColor
33

4-
from libPINCE import GDB_Engine
4+
from pince.libPINCE import GDB_Engine
55

66

77
class QHexModel(QAbstractTableModel):

Diff for: GUI/CustomLabels/FlagRegisterLabel.py renamed to pince/GUI/CustomLabels/FlagRegisterLabel.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from PyQt5.QtWidgets import QLabel, QMessageBox
22
from PyQt5.QtGui import QCursor
33
from PyQt5.QtCore import Qt
4-
from libPINCE import GDB_Engine
5-
from PINCE import DialogWithButtonsForm
4+
from pince.libPINCE import GDB_Engine
5+
#from pince.PINCE import DialogWithButtonsForm
66

77

88
class QFlagRegisterLabel(QLabel):

Diff for: GUI/CustomLabels/RegisterLabel.py renamed to pince/GUI/CustomLabels/RegisterLabel.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from PyQt5.QtWidgets import QLabel, QMenu
22
from PyQt5.QtGui import QCursor
33
from PyQt5.QtCore import Qt
4-
from libPINCE import GDB_Engine
5-
from libPINCE import GuiUtils
6-
from PINCE import DialogWithButtonsForm
4+
from pince.libPINCE import GDB_Engine
5+
from pince.libPINCE import GuiUtils
6+
#from pince.PINCE import DialogWithButtonsForm
77

88

99
class QRegisterLabel(QLabel):

Diff for: GUI/CustomTableViews/AsciiView.py renamed to pince/GUI/CustomTableViews/AsciiView.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from GUI.CustomTableViews.HexView import QHexView
1+
from pince.GUI.CustomTableViews.HexView import QHexView
22

33
class QAsciiView(QHexView):
44
# data_array is returned from GDB_Engine.hex_dump()
File renamed without changes.

Diff for: GUI/DialogWithButtons.py renamed to pince/GUI/DialogWithButtons.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
# Form implementation generated from reading ui file 'DialogWithButtons.ui'
44
#
5-
# Created: Sat Oct 15 14:22:42 2016
6-
# by: PyQt5 UI code generator 5.2.1
5+
# Created by: PyQt5 UI code generator 5.8
76
#
87
# WARNING! All changes made in this file will be lost!
98

File renamed without changes.

Diff for: GUI/FloatRegisterWidget.py renamed to pince/GUI/FloatRegisterWidget.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
# -*- coding: utf-8 -*-
22

3-
# Form implementation generated from reading ui file 'floatregisterwidget.ui'
3+
# Form implementation generated from reading ui file 'FloatRegisterWidget.ui'
44
#
5-
# Created: Tue Jul 19 01:12:53 2016
6-
# by: PyQt5 UI code generator 5.2.1
5+
# Created by: PyQt5 UI code generator 5.8
76
#
87
# WARNING! All changes made in this file will be lost!
98

@@ -16,6 +15,7 @@ def setupUi(self, TabWidget):
1615
self.FPU = QtWidgets.QWidget()
1716
self.FPU.setObjectName("FPU")
1817
self.gridLayout = QtWidgets.QGridLayout(self.FPU)
18+
self.gridLayout.setContentsMargins(0, 0, 0, 0)
1919
self.gridLayout.setObjectName("gridLayout")
2020
self.tableWidget_FPU = QtWidgets.QTableWidget(self.FPU)
2121
self.tableWidget_FPU.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
@@ -35,6 +35,7 @@ def setupUi(self, TabWidget):
3535
self.XMM = QtWidgets.QWidget()
3636
self.XMM.setObjectName("XMM")
3737
self.gridLayout_2 = QtWidgets.QGridLayout(self.XMM)
38+
self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
3839
self.gridLayout_2.setObjectName("gridLayout_2")
3940
self.tableWidget_XMM = QtWidgets.QTableWidget(self.XMM)
4041
self.tableWidget_XMM.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
File renamed without changes.

Diff for: GUI/FunctionsInfoWidget.py renamed to pince/GUI/FunctionsInfoWidget.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
# Form implementation generated from reading ui file 'FunctionsInfoWidget.ui'
44
#
5-
# Created: Fri Dec 9 14:18:45 2016
6-
# by: PyQt5 UI code generator 5.2.1
5+
# Created by: PyQt5 UI code generator 5.8
76
#
87
# WARNING! All changes made in this file will be lost!
98

File renamed without changes.

Diff for: GUI/HexEditDialog.py renamed to pince/GUI/HexEditDialog.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
# Form implementation generated from reading ui file 'HexEditDialog.ui'
44
#
5-
# Created: Fri Dec 9 21:31:02 2016
6-
# by: PyQt5 UI code generator 5.2.1
5+
# Created by: PyQt5 UI code generator 5.8
76
#
87
# WARNING! All changes made in this file will be lost!
98

File renamed without changes.

Diff for: GUI/LibPINCEReferenceWidget.py renamed to pince/GUI/LibPINCEReferenceWidget.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
# Form implementation generated from reading ui file 'LibPINCEReferenceWidget.ui'
44
#
5-
# Created: Thu Feb 2 23:39:23 2017
6-
# by: PyQt5 UI code generator 5.2.1
5+
# Created by: PyQt5 UI code generator 5.8
76
#
87
# WARNING! All changes made in this file will be lost!
98

File renamed without changes.

Diff for: GUI/LoadingDialog.py renamed to pince/GUI/LoadingDialog.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
# Form implementation generated from reading ui file 'LoadingDialog.ui'
44
#
5-
# Created: Tue Feb 21 22:38:30 2017
6-
# by: PyQt5 UI code generator 5.2.1
5+
# Created by: PyQt5 UI code generator 5.8
76
#
87
# WARNING! All changes made in this file will be lost!
98

File renamed without changes.

Diff for: GUI/LogFileWidget.py renamed to pince/GUI/LogFileWidget.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
# Form implementation generated from reading ui file 'LogFileWidget.ui'
44
#
5-
# Created: Sat Feb 11 01:51:44 2017
6-
# by: PyQt5 UI code generator 5.2.1
5+
# Created by: PyQt5 UI code generator 5.8
76
#
87
# WARNING! All changes made in this file will be lost!
98

File renamed without changes.

Diff for: GUI/MainWindow.py renamed to pince/GUI/MainWindow.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
# Form implementation generated from reading ui file 'MainWindow.ui'
44
#
5-
# Created: Tue Feb 14 21:25:22 2017
6-
# by: PyQt5 UI code generator 5.2.1
5+
# Created by: PyQt5 UI code generator 5.8
76
#
87
# WARNING! All changes made in this file will be lost!
98

@@ -141,8 +140,8 @@ def setupUi(self, MainWindow):
141140
self.widget.setSizePolicy(sizePolicy)
142141
self.widget.setObjectName("widget")
143142
self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.widget)
144-
self.verticalLayout_2.setSpacing(0)
145143
self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
144+
self.verticalLayout_2.setSpacing(0)
146145
self.verticalLayout_2.setObjectName("verticalLayout_2")
147146
self.radioButton_Bits = QtWidgets.QRadioButton(self.widget)
148147
self.radioButton_Bits.setObjectName("radioButton_Bits")
@@ -200,8 +199,8 @@ def setupUi(self, MainWindow):
200199
self.widget_2 = QtWidgets.QWidget(self.QWidget_Toolbox)
201200
self.widget_2.setObjectName("widget_2")
202201
self.verticalLayout = QtWidgets.QVBoxLayout(self.widget_2)
203-
self.verticalLayout.setSpacing(0)
204202
self.verticalLayout.setContentsMargins(0, 0, 0, 0)
203+
self.verticalLayout.setSpacing(0)
205204
self.verticalLayout.setObjectName("verticalLayout")
206205
self.radioButton_RoundedDefault = QtWidgets.QRadioButton(self.widget_2)
207206
self.radioButton_RoundedDefault.setObjectName("radioButton_RoundedDefault")
File renamed without changes.

Diff for: GUI/MemoryRegionsWidget.py renamed to pince/GUI/MemoryRegionsWidget.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
# Form implementation generated from reading ui file 'MemoryRegionsWidget.ui'
44
#
5-
# Created: Wed Feb 15 17:56:42 2017
6-
# by: PyQt5 UI code generator 5.2.1
5+
# Created by: PyQt5 UI code generator 5.8
76
#
87
# WARNING! All changes made in this file will be lost!
98

File renamed without changes.

Diff for: GUI/MemoryViewerWindow.py renamed to pince/GUI/MemoryViewerWindow.py

+16-9
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
# Form implementation generated from reading ui file 'MemoryViewerWindow.ui'
44
#
5-
# Created: Wed Feb 15 17:57:59 2017
6-
# by: PyQt5 UI code generator 5.2.1
5+
# Created by: PyQt5 UI code generator 5.8
76
#
87
# WARNING! All changes made in this file will be lost!
98

@@ -73,9 +72,10 @@ def setupUi(self, MainWindow_MemoryView):
7372
self.scrollArea_Registers.setWidgetResizable(True)
7473
self.scrollArea_Registers.setObjectName("scrollArea_Registers")
7574
self.scrollAreaWidgetContents_Registers = QtWidgets.QWidget()
76-
self.scrollAreaWidgetContents_Registers.setGeometry(QtCore.QRect(0, 0, 358, 455))
75+
self.scrollAreaWidgetContents_Registers.setGeometry(QtCore.QRect(0, 0, 340, 440))
7776
self.scrollAreaWidgetContents_Registers.setObjectName("scrollAreaWidgetContents_Registers")
7877
self.gridLayout_8 = QtWidgets.QGridLayout(self.scrollAreaWidgetContents_Registers)
78+
self.gridLayout_8.setContentsMargins(0, 0, 0, 0)
7979
self.gridLayout_8.setObjectName("gridLayout_8")
8080
self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
8181
self.horizontalLayout_4.setObjectName("horizontalLayout_4")
@@ -98,6 +98,7 @@ def setupUi(self, MainWindow_MemoryView):
9898
self.registers_64 = QtWidgets.QWidget()
9999
self.registers_64.setObjectName("registers_64")
100100
self.gridLayout_7 = QtWidgets.QGridLayout(self.registers_64)
101+
self.gridLayout_7.setContentsMargins(0, 0, 0, 0)
101102
self.gridLayout_7.setObjectName("gridLayout_7")
102103
self.verticalLayout_17 = QtWidgets.QVBoxLayout()
103104
self.verticalLayout_17.setObjectName("verticalLayout_17")
@@ -226,6 +227,7 @@ def setupUi(self, MainWindow_MemoryView):
226227
self.registers_32 = QtWidgets.QWidget()
227228
self.registers_32.setObjectName("registers_32")
228229
self.gridLayout_6 = QtWidgets.QGridLayout(self.registers_32)
230+
self.gridLayout_6.setContentsMargins(0, 0, 0, 0)
229231
self.gridLayout_6.setObjectName("gridLayout_6")
230232
self.verticalLayout_14 = QtWidgets.QVBoxLayout()
231233
self.verticalLayout_14.setObjectName("verticalLayout_14")
@@ -535,9 +537,10 @@ def setupUi(self, MainWindow_MemoryView):
535537
self.scrollArea_Hex.setWidgetResizable(True)
536538
self.scrollArea_Hex.setObjectName("scrollArea_Hex")
537539
self.scrollAreaWidgetContents_2 = QtWidgets.QWidget()
538-
self.scrollAreaWidgetContents_2.setGeometry(QtCore.QRect(0, 0, 493, 181))
540+
self.scrollAreaWidgetContents_2.setGeometry(QtCore.QRect(0, 0, 516, 169))
539541
self.scrollAreaWidgetContents_2.setObjectName("scrollAreaWidgetContents_2")
540542
self.gridLayout_11 = QtWidgets.QGridLayout(self.scrollAreaWidgetContents_2)
543+
self.gridLayout_11.setContentsMargins(0, 0, 0, 0)
541544
self.gridLayout_11.setObjectName("gridLayout_11")
542545
self.horizontalLayout_5 = QtWidgets.QHBoxLayout()
543546
self.horizontalLayout_5.setObjectName("horizontalLayout_5")
@@ -582,6 +585,8 @@ def setupUi(self, MainWindow_MemoryView):
582585
self.line_6.setFrameShadow(QtWidgets.QFrame.Sunken)
583586
self.line_6.setObjectName("line_6")
584587
self.gridLayout_11.addWidget(self.line_6, 1, 0, 1, 1)
588+
self.label_HexView_Information.raise_()
589+
self.line_6.raise_()
585590
self.scrollArea_Hex.setWidget(self.scrollAreaWidgetContents_2)
586591
self.gridLayout.addWidget(self.scrollArea_Hex, 0, 0, 1, 1)
587592
self.verticalScrollBar_HexView = QtWidgets.QScrollBar(self.widget_HexView)
@@ -598,6 +603,7 @@ def setupUi(self, MainWindow_MemoryView):
598603
self.StackTrace = QtWidgets.QWidget()
599604
self.StackTrace.setObjectName("StackTrace")
600605
self.gridLayout_9 = QtWidgets.QGridLayout(self.StackTrace)
606+
self.gridLayout_9.setContentsMargins(0, 0, 0, 0)
601607
self.gridLayout_9.setObjectName("gridLayout_9")
602608
self.tableWidget_StackTrace = QtWidgets.QTableWidget(self.StackTrace)
603609
font = QtGui.QFont()
@@ -622,6 +628,7 @@ def setupUi(self, MainWindow_MemoryView):
622628
self.Stack = QtWidgets.QWidget()
623629
self.Stack.setObjectName("Stack")
624630
self.gridLayout_10 = QtWidgets.QGridLayout(self.Stack)
631+
self.gridLayout_10.setContentsMargins(0, 0, 0, 0)
625632
self.gridLayout_10.setObjectName("gridLayout_10")
626633
self.tableWidget_Stack = QtWidgets.QTableWidget(self.Stack)
627634
font = QtGui.QFont()
@@ -650,7 +657,7 @@ def setupUi(self, MainWindow_MemoryView):
650657
self.gridLayout_5.addWidget(self.splitter_MainMiddle, 0, 0, 1, 1)
651658
MainWindow_MemoryView.setCentralWidget(self.centralwidget)
652659
self.menubar = QtWidgets.QMenuBar(MainWindow_MemoryView)
653-
self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 22))
660+
self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 24))
654661
self.menubar.setObjectName("menubar")
655662
self.menuView = QtWidgets.QMenu(self.menubar)
656663
self.menuView.setObjectName("menuView")
@@ -835,7 +842,7 @@ def retranslateUi(self, MainWindow_MemoryView):
835842
self.actionSearch_Opcode.setText(_translate("MainWindow_MemoryView", "Search Opcode"))
836843
self.actionMemory_Regions.setText(_translate("MainWindow_MemoryView", "Memory Regions"))
837844

838-
from GUI.CustomTableViews.AsciiView import QAsciiView
839-
from GUI.CustomTableViews.HexView import QHexView
840-
from GUI.CustomLabels.RegisterLabel import QRegisterLabel
841-
from GUI.CustomLabels.FlagRegisterLabel import QFlagRegisterLabel
845+
from pince.GUI.CustomLabels.FlagRegisterLabel import QFlagRegisterLabel
846+
from pince.GUI.CustomLabels.RegisterLabel import QRegisterLabel
847+
from pince.GUI.CustomTableViews.AsciiView import QAsciiView
848+
from pince.GUI.CustomTableViews.HexView import QHexView

0 commit comments

Comments
 (0)