diff --git a/.hgsubstate b/.hgsubstate --- a/.hgsubstate +++ b/.hgsubstate @@ -1,2 +1,2 @@ -76535b5137d73f47f7eb79386dbdea3523817bc8 genericBinaryFiles +e0f25227d6283e833fbb70c5fc1bdc6c3ca8060e genericBinaryFiles a4274329c9f05c742b3eb9753e77c47d27e838e9 qhexedit diff --git a/execut.pro b/execut.pro --- a/execut.pro +++ b/execut.pro @@ -44,7 +44,8 @@ SOURCES += main.cpp\ genericBinaryFiles/BinFile/binaryfilewidget.cpp \ genericBinaryFiles/genericbinaryfilewidget.cpp \ genericBinaryFiles/qtablewidgetintitem.cpp \ - genericBinaryFiles/filelist.cpp + genericBinaryFiles/filelist.cpp \ + genericBinaryFiles/qvpushbutton.cpp HEADERS += mainwindow.h \ qhexedit/qhexedit_p.h \ @@ -62,7 +63,8 @@ HEADERS += mainwindow.h \ genericBinaryFiles/BinFile/binaryfilewidget.h \ genericBinaryFiles/genericbinaryfilewidget.h \ genericBinaryFiles/qtablewidgetintitem.h \ - genericBinaryFiles/filelist.h + genericBinaryFiles/filelist.h \ + genericBinaryFiles/qvpushbutton.h FORMS += mainwindow.ui \ genericBinaryFiles/elf/elffilewidget.ui \ diff --git a/mainwindow.cpp b/mainwindow.cpp --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -6,8 +6,7 @@ MainWindow::MainWindow(QWidget *parent) ui(new Ui::MainWindow) { ui->setupUi(this); - qApp->setStyleSheet( - "QGroupBox {\ + qApp->setStyleSheet("QGroupBox {\ border: 1px solid gray;\ border-radius: 9px;\ margin-top: 0.5em;\ @@ -17,11 +16,14 @@ MainWindow::MainWindow(QWidget *parent) subcontrol-origin: margin;\ left: 10px;\ padding: 0 3px 0 3px;\ - }\ - "); + }\ "); + layout()->setContentsMargins(0,0,0,0); + connect(this->ui->actionQuit,SIGNAL(triggered()),this,SLOT(close())); + connect(this->ui->actionOpen,SIGNAL(triggered()),this->ui->binFileWdgt,SLOT(openFile())); } MainWindow::~MainWindow() { delete ui; } + diff --git a/mainwindow.ui b/mainwindow.ui --- a/mainwindow.ui +++ b/mainwindow.ui @@ -16,10 +16,39 @@ - + + + + + 0 + 0 + 400 + 27 + + + + + File + + + + + + + + + + Open + + + + + Quit + +