diff --git a/.hgsub b/.hgsub --- a/.hgsub +++ b/.hgsub @@ -1,2 +1,3 @@ genericBinaryFiles = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/genericBinaryFiles +qhexedit = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/QHexEdit diff --git a/.hgsubstate b/.hgsubstate --- a/.hgsubstate +++ b/.hgsubstate @@ -1,1 +1,2 @@ -acef0ecb71beb64a75c7184bad8b1943adbf88f4 genericBinaryFiles +00ff7d3b610fafd6408d2aabdcab6ae5ef618770 genericBinaryFiles +a4274329c9f05c742b3eb9753e77c47d27e838e9 qhexedit diff --git a/execut.pro b/execut.pro --- a/execut.pro +++ b/execut.pro @@ -10,6 +10,9 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += TARGET = execut TEMPLATE = app +MOC_DIR = moc +RCC_DIR = resources +OBJECTS_DIR = obj win32:CONFIG += dll win32:CONFIG -= static @@ -18,12 +21,18 @@ win32:INCLUDEPATH += $${PWD}/genericBina win32:INCLUDEPATH += $${PWD}/genericBinaryFiles/elf/libelfWin32/include/libelf win32:DEFINES+=_ELF_WINDOWS_ DEFINES+=RS232_debug +INCLUDEPATH += qhexedit genericBinaryFiles genericBinaryFiles/srec genericBinaryFiles/BinFile + win32:LIBS += $${PWD}/genericBinaryFiles/elf/libelfWin32/bin/libelf.a unix:LIBS += -lelf SOURCES += main.cpp\ mainwindow.cpp \ + qhexedit/qhexedit_p.cpp \ + qhexedit/qhexedit.cpp \ + qhexedit/xbytearray.cpp \ + qhexedit/commands.cpp \ genericBinaryFiles/elf/elfinfowdgt.cpp \ genericBinaryFiles/elf/elfparser.cpp \ genericBinaryFiles/elf/elffile.cpp \ @@ -33,9 +42,14 @@ SOURCES += main.cpp\ genericBinaryFiles/abstractbinfile.cpp \ genericBinaryFiles/BinFile/binaryfile.cpp \ genericBinaryFiles/BinFile/binaryfilewidget.cpp \ - genericBinaryFiles/genericbinaryfilewidget.cpp + genericBinaryFiles/genericbinaryfilewidget.cpp \ + genericBinaryFiles/qtablewidgetintitem.cpp HEADERS += mainwindow.h \ + qhexedit/qhexedit_p.h \ + qhexedit/qhexedit.h \ + qhexedit/xbytearray.h \ + qhexedit/commands.h \ genericBinaryFiles/elf/elfinfowdgt.h \ genericBinaryFiles/elf/elfparser.h \ genericBinaryFiles/elf/elffile.h \ @@ -45,10 +59,14 @@ HEADERS += mainwindow.h \ genericBinaryFiles/abstractbinfile.h \ genericBinaryFiles/BinFile/binaryfile.h \ genericBinaryFiles/BinFile/binaryfilewidget.h \ - genericBinaryFiles/genericbinaryfilewidget.h + genericBinaryFiles/genericbinaryfilewidget.h \ + genericBinaryFiles/qtablewidgetintitem.h FORMS += mainwindow.ui \ genericBinaryFiles/elf/elffilewidget.ui \ genericBinaryFiles/srec/srecfilewidget.ui \ genericBinaryFiles/BinFile/binaryfilewidget.ui \ genericBinaryFiles/genericbinaryfilewidget.ui + +RESOURCES += \ + genericBinaryFiles/genericBinaryFiles.qrc diff --git a/mainwindow.cpp b/mainwindow.cpp --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -6,6 +6,19 @@ MainWindow::MainWindow(QWidget *parent) ui(new Ui::MainWindow) { ui->setupUi(this); + qApp->setStyleSheet( + "QGroupBox {\ + border: 1px solid gray;\ + border-radius: 9px;\ + margin-top: 0.5em;\ + }\ + \ + QGroupBox::title {\ + subcontrol-origin: margin;\ + left: 10px;\ + padding: 0 3px 0 3px;\ + }\ + "); } MainWindow::~MainWindow() diff --git a/mainwindow.ui b/mainwindow.ui --- a/mainwindow.ui +++ b/mainwindow.ui @@ -1,7 +1,8 @@ + MainWindow - - + + 0 0 @@ -9,16 +10,26 @@ 300 - - MainWindow + + ExeCut - - - - + + + + + + + - - + + + + genericBinaryFileWidget + QWidget +
genericbinaryfilewidget.h
+ 1 +
+