##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » ExeCut
RSS
GUI improvments
Jeandet Alexis -
r8:c57c8cceddbf default
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,2 +1,2
1 76535b5137d73f47f7eb79386dbdea3523817bc8 genericBinaryFiles
1 e0f25227d6283e833fbb70c5fc1bdc6c3ca8060e genericBinaryFiles
2 a4274329c9f05c742b3eb9753e77c47d27e838e9 qhexedit
2 a4274329c9f05c742b3eb9753e77c47d27e838e9 qhexedit
Show file before | Show file after | Hide comments
@@ -1,74 +1,76
1 #-------------------------------------------------
1 #-------------------------------------------------
2 #
2 #
3 # Project created by QtCreator 2014-06-18T00:07:59
3 # Project created by QtCreator 2014-06-18T00:07:59
4 #
4 #
5 #-------------------------------------------------
5 #-------------------------------------------------
6
6
7 QT += core gui
7 QT += core gui
8
8
9 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
9 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
10
10
11 TARGET = execut
11 TARGET = execut
12 TEMPLATE = app
12 TEMPLATE = app
13 MOC_DIR = moc
13 MOC_DIR = moc
14 RCC_DIR = resources
14 RCC_DIR = resources
15 OBJECTS_DIR = obj
15 OBJECTS_DIR = obj
16
16
17 win32:CONFIG += dll
17 win32:CONFIG += dll
18 win32:CONFIG -= static
18 win32:CONFIG -= static
19
19
20 win32:INCLUDEPATH += $${PWD}/genericBinaryFiles/elf/libelfWin32/include
20 win32:INCLUDEPATH += $${PWD}/genericBinaryFiles/elf/libelfWin32/include
21 win32:INCLUDEPATH += $${PWD}/genericBinaryFiles/elf/libelfWin32/include/libelf
21 win32:INCLUDEPATH += $${PWD}/genericBinaryFiles/elf/libelfWin32/include/libelf
22 win32:DEFINES+=_ELF_WINDOWS_
22 win32:DEFINES+=_ELF_WINDOWS_
23 DEFINES+=RS232_debug
23 DEFINES+=RS232_debug
24 INCLUDEPATH += qhexedit genericBinaryFiles genericBinaryFiles/srec genericBinaryFiles/BinFile
24 INCLUDEPATH += qhexedit genericBinaryFiles genericBinaryFiles/srec genericBinaryFiles/BinFile
25
25
26
26
27 win32:LIBS += $${PWD}/genericBinaryFiles/elf/libelfWin32/bin/libelf.a
27 win32:LIBS += $${PWD}/genericBinaryFiles/elf/libelfWin32/bin/libelf.a
28 unix:LIBS += -lelf
28 unix:LIBS += -lelf
29
29
30 SOURCES += main.cpp\
30 SOURCES += main.cpp\
31 mainwindow.cpp \
31 mainwindow.cpp \
32 qhexedit/qhexedit_p.cpp \
32 qhexedit/qhexedit_p.cpp \
33 qhexedit/qhexedit.cpp \
33 qhexedit/qhexedit.cpp \
34 qhexedit/xbytearray.cpp \
34 qhexedit/xbytearray.cpp \
35 qhexedit/commands.cpp \
35 qhexedit/commands.cpp \
36 genericBinaryFiles/elf/elfinfowdgt.cpp \
36 genericBinaryFiles/elf/elfinfowdgt.cpp \
37 genericBinaryFiles/elf/elfparser.cpp \
37 genericBinaryFiles/elf/elfparser.cpp \
38 genericBinaryFiles/elf/elffile.cpp \
38 genericBinaryFiles/elf/elffile.cpp \
39 genericBinaryFiles/elf/elffilewidget.cpp \
39 genericBinaryFiles/elf/elffilewidget.cpp \
40 genericBinaryFiles/srec/srecfile.cpp \
40 genericBinaryFiles/srec/srecfile.cpp \
41 genericBinaryFiles/srec/srecfilewidget.cpp \
41 genericBinaryFiles/srec/srecfilewidget.cpp \
42 genericBinaryFiles/abstractbinfile.cpp \
42 genericBinaryFiles/abstractbinfile.cpp \
43 genericBinaryFiles/BinFile/binaryfile.cpp \
43 genericBinaryFiles/BinFile/binaryfile.cpp \
44 genericBinaryFiles/BinFile/binaryfilewidget.cpp \
44 genericBinaryFiles/BinFile/binaryfilewidget.cpp \
45 genericBinaryFiles/genericbinaryfilewidget.cpp \
45 genericBinaryFiles/genericbinaryfilewidget.cpp \
46 genericBinaryFiles/qtablewidgetintitem.cpp \
46 genericBinaryFiles/qtablewidgetintitem.cpp \
47 genericBinaryFiles/filelist.cpp
47 genericBinaryFiles/filelist.cpp \
48 genericBinaryFiles/qvpushbutton.cpp
48
49
49 HEADERS += mainwindow.h \
50 HEADERS += mainwindow.h \
50 qhexedit/qhexedit_p.h \
51 qhexedit/qhexedit_p.h \
51 qhexedit/qhexedit.h \
52 qhexedit/qhexedit.h \
52 qhexedit/xbytearray.h \
53 qhexedit/xbytearray.h \
53 qhexedit/commands.h \
54 qhexedit/commands.h \
54 genericBinaryFiles/elf/elfinfowdgt.h \
55 genericBinaryFiles/elf/elfinfowdgt.h \
55 genericBinaryFiles/elf/elfparser.h \
56 genericBinaryFiles/elf/elfparser.h \
56 genericBinaryFiles/elf/elffile.h \
57 genericBinaryFiles/elf/elffile.h \
57 genericBinaryFiles/elf/elffilewidget.h \
58 genericBinaryFiles/elf/elffilewidget.h \
58 genericBinaryFiles/srec/srecfile.h \
59 genericBinaryFiles/srec/srecfile.h \
59 genericBinaryFiles/srec/srecfilewidget.h \
60 genericBinaryFiles/srec/srecfilewidget.h \
60 genericBinaryFiles/abstractbinfile.h \
61 genericBinaryFiles/abstractbinfile.h \
61 genericBinaryFiles/BinFile/binaryfile.h \
62 genericBinaryFiles/BinFile/binaryfile.h \
62 genericBinaryFiles/BinFile/binaryfilewidget.h \
63 genericBinaryFiles/BinFile/binaryfilewidget.h \
63 genericBinaryFiles/genericbinaryfilewidget.h \
64 genericBinaryFiles/genericbinaryfilewidget.h \
64 genericBinaryFiles/qtablewidgetintitem.h \
65 genericBinaryFiles/qtablewidgetintitem.h \
65 genericBinaryFiles/filelist.h
66 genericBinaryFiles/filelist.h \
67 genericBinaryFiles/qvpushbutton.h
66
68
67 FORMS += mainwindow.ui \
69 FORMS += mainwindow.ui \
68 genericBinaryFiles/elf/elffilewidget.ui \
70 genericBinaryFiles/elf/elffilewidget.ui \
69 genericBinaryFiles/srec/srecfilewidget.ui \
71 genericBinaryFiles/srec/srecfilewidget.ui \
70 genericBinaryFiles/BinFile/binaryfilewidget.ui \
72 genericBinaryFiles/BinFile/binaryfilewidget.ui \
71 genericBinaryFiles/genericbinaryfilewidget.ui
73 genericBinaryFiles/genericbinaryfilewidget.ui
72
74
73 RESOURCES += \
75 RESOURCES += \
74 genericBinaryFiles/genericBinaryFiles.qrc
76 genericBinaryFiles/genericBinaryFiles.qrc
Show file before | Show file after | Hide comments
@@ -1,27 +1,29
1 #include "mainwindow.h"
1 #include "mainwindow.h"
2 #include "ui_mainwindow.h"
2 #include "ui_mainwindow.h"
3
3
4 MainWindow::MainWindow(QWidget *parent) :
4 MainWindow::MainWindow(QWidget *parent) :
5 QMainWindow(parent),
5 QMainWindow(parent),
6 ui(new Ui::MainWindow)
6 ui(new Ui::MainWindow)
7 {
7 {
8 ui->setupUi(this);
8 ui->setupUi(this);
9 qApp->setStyleSheet(
9 qApp->setStyleSheet("QGroupBox {\
10 "QGroupBox {\
11 border: 1px solid gray;\
10 border: 1px solid gray;\
12 border-radius: 9px;\
11 border-radius: 9px;\
13 margin-top: 0.5em;\
12 margin-top: 0.5em;\
14 }\
13 }\
15 \
14 \
16 QGroupBox::title {\
15 QGroupBox::title {\
17 subcontrol-origin: margin;\
16 subcontrol-origin: margin;\
18 left: 10px;\
17 left: 10px;\
19 padding: 0 3px 0 3px;\
18 padding: 0 3px 0 3px;\
20 }\
19 }\ ");
21 ");
20 layout()->setContentsMargins(0,0,0,0);
21 connect(this->ui->actionQuit,SIGNAL(triggered()),this,SLOT(close()));
22 connect(this->ui->actionOpen,SIGNAL(triggered()),this->ui->binFileWdgt,SLOT(openFile()));
22 }
23 }
23
24
24 MainWindow::~MainWindow()
25 MainWindow::~MainWindow()
25 {
26 {
26 delete ui;
27 delete ui;
27 }
28 }
29
Show file before | Show file after | Hide comments
@@ -1,35 +1,64
1 <?xml version="1.0" encoding="UTF-8"?>
1 <?xml version="1.0" encoding="UTF-8"?>
2 <ui version="4.0">
2 <ui version="4.0">
3 <class>MainWindow</class>
3 <class>MainWindow</class>
4 <widget class="QMainWindow" name="MainWindow">
4 <widget class="QMainWindow" name="MainWindow">
5 <property name="geometry">
5 <property name="geometry">
6 <rect>
6 <rect>
7 <x>0</x>
7 <x>0</x>
8 <y>0</y>
8 <y>0</y>
9 <width>400</width>
9 <width>400</width>
10 <height>300</height>
10 <height>300</height>
11 </rect>
11 </rect>
12 </property>
12 </property>
13 <property name="windowTitle">
13 <property name="windowTitle">
14 <string>ExeCut</string>
14 <string>ExeCut</string>
15 </property>
15 </property>
16 <widget class="QWidget" name="centralWidget">
16 <widget class="QWidget" name="centralWidget">
17 <layout class="QGridLayout" name="gridLayout">
17 <layout class="QGridLayout" name="gridLayout">
18 <item row="0" column="0">
18 <item row="0" column="0">
19 <widget class="genericBinaryFileWidget" name="widget" native="true"/>
19 <widget class="genericBinaryFileWidget" name="binFileWdgt" native="true"/>
20 </item>
20 </item>
21 </layout>
21 </layout>
22 </widget>
22 </widget>
23 <widget class="QMenuBar" name="menuBar">
24 <property name="geometry">
25 <rect>
26 <x>0</x>
27 <y>0</y>
28 <width>400</width>
29 <height>27</height>
30 </rect>
31 </property>
32 <widget class="QMenu" name="menuFile">
33 <property name="title">
34 <string>File</string>
35 </property>
36 <addaction name="actionOpen"/>
37 <addaction name="separator"/>
38 <addaction name="actionQuit"/>
39 </widget>
40 <addaction name="menuFile"/>
41 </widget>
42 <action name="actionOpen">
43 <property name="text">
44 <string>Open</string>
45 </property>
46 </action>
47 <action name="actionQuit">
48 <property name="text">
49 <string>Quit</string>
50 </property>
51 </action>
23 </widget>
52 </widget>
24 <layoutdefault spacing="6" margin="11"/>
53 <layoutdefault spacing="6" margin="11"/>
25 <customwidgets>
54 <customwidgets>
26 <customwidget>
55 <customwidget>
27 <class>genericBinaryFileWidget</class>
56 <class>genericBinaryFileWidget</class>
28 <extends>QWidget</extends>
57 <extends>QWidget</extends>
29 <header location="global">genericbinaryfilewidget.h</header>
58 <header location="global">genericbinaryfilewidget.h</header>
30 <container>1</container>
59 <container>1</container>
31 </customwidget>
60 </customwidget>
32 </customwidgets>
61 </customwidgets>
33 <resources/>
62 <resources/>
34 <connections/>
63 <connections/>
35 </ui>
64 </ui>
General Comments 0
You need to be logged in to leave comments. Login now