Skip to content

Commit

Permalink
all changes by voldemort 20180317_1356
Browse files Browse the repository at this point in the history
  • Loading branch information
voldemortX committed Mar 17, 2018
1 parent 7961238 commit 91ae042
Show file tree
Hide file tree
Showing 72 changed files with 2,373 additions and 25 deletions.
Binary file modified build-hex03-Desktop_Qt_5_9_0_MinGW_32bit-Debug/debug/hex03.exe
Binary file not shown.
Binary file modified build-hex03-Desktop_Qt_5_9_0_MinGW_32bit-Debug/debug/hexboard.o
Binary file not shown.
Binary file modified build-hex03-Desktop_Qt_5_9_0_MinGW_32bit-Debug/debug/main.o
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 6 additions & 22 deletions build-hex03-Desktop_Qt_5_9_0_MinGW_32bit-Debug/ui_mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,9 @@
#include <QtWidgets/QHeaderView>
#include <QtWidgets/QLabel>
#include <QtWidgets/QMainWindow>
#include <QtWidgets/QMenu>
#include <QtWidgets/QMenuBar>
#include <QtWidgets/QPushButton>
#include <QtWidgets/QStatusBar>
#include <QtWidgets/QTextBrowser>
#include <QtWidgets/QToolBar>
#include <QtWidgets/QWidget>

QT_BEGIN_NAMESPACE
Expand Down Expand Up @@ -60,16 +57,15 @@ class Ui_MainWindow
QTextBrowser *redFile;
QTextBrowser *blueFile;
QTextBrowser *historyDisplay;
QMenuBar *menuBar;
QMenu *menuHEX;
QToolBar *mainToolBar;
QStatusBar *statusBar;

void setupUi(QMainWindow *MainWindow)
{
if (MainWindow->objectName().isEmpty())
MainWindow->setObjectName(QStringLiteral("MainWindow"));
MainWindow->resize(1242, 761);
MainWindow->setMinimumSize(QSize(1242, 761));
MainWindow->setMaximumSize(QSize(1242, 761));
centralWidget = new QWidget(MainWindow);
centralWidget->setObjectName(QStringLiteral("centralWidget"));
line = new QFrame(centralWidget);
Expand Down Expand Up @@ -251,7 +247,7 @@ class Ui_MainWindow
labelStatus->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
labelBoard = new QLabel(centralWidget);
labelBoard->setObjectName(QStringLiteral("labelBoard"));
labelBoard->setGeometry(QRect(20, 10, 900, 600));
labelBoard->setGeometry(QRect(0, 0, 900, 600));
buttonLoadRed = new QPushButton(centralWidget);
buttonLoadRed->setObjectName(QStringLiteral("buttonLoadRed"));
buttonLoadRed->setGeometry(QRect(990, 120, 81, 31));
Expand All @@ -266,29 +262,18 @@ class Ui_MainWindow
buttonLoadBlue->setFlat(false);
redFile = new QTextBrowser(centralWidget);
redFile->setObjectName(QStringLiteral("redFile"));
redFile->setGeometry(QRect(990, 40, 211, 61));
redFile->setGeometry(QRect(990, 40, 231, 61));
blueFile = new QTextBrowser(centralWidget);
blueFile->setObjectName(QStringLiteral("blueFile"));
blueFile->setGeometry(QRect(990, 230, 211, 61));
blueFile->setGeometry(QRect(990, 230, 231, 61));
historyDisplay = new QTextBrowser(centralWidget);
historyDisplay->setObjectName(QStringLiteral("historyDisplay"));
historyDisplay->setGeometry(QRect(990, 390, 231, 91));
historyDisplay->setGeometry(QRect(990, 400, 231, 81));
MainWindow->setCentralWidget(centralWidget);
menuBar = new QMenuBar(MainWindow);
menuBar->setObjectName(QStringLiteral("menuBar"));
menuBar->setGeometry(QRect(0, 0, 1242, 23));
menuHEX = new QMenu(menuBar);
menuHEX->setObjectName(QStringLiteral("menuHEX"));
MainWindow->setMenuBar(menuBar);
mainToolBar = new QToolBar(MainWindow);
mainToolBar->setObjectName(QStringLiteral("mainToolBar"));
MainWindow->addToolBar(Qt::TopToolBarArea, mainToolBar);
statusBar = new QStatusBar(MainWindow);
statusBar->setObjectName(QStringLiteral("statusBar"));
MainWindow->setStatusBar(statusBar);

menuBar->addAction(menuHEX->menuAction());

retranslateUi(MainWindow);

buttonStart->setDefault(false);
Expand All @@ -315,7 +300,6 @@ class Ui_MainWindow
labelBoard->setText(QString());
buttonLoadRed->setText(QApplication::translate("MainWindow", "Load", Q_NULLPTR));
buttonLoadBlue->setText(QApplication::translate("MainWindow", "Load", Q_NULLPTR));
menuHEX->setTitle(QApplication::translate("MainWindow", "HEX", Q_NULLPTR));
} // retranslateUi

};
Expand Down
21 changes: 21 additions & 0 deletions build-hex03-Desktop_Qt_5_9_0_MinGW_32bit-Release/.qmake.stash
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
QMAKE_CXX.INCDIRS = \
D:/sw/qt/Tools/mingw530_32/lib/gcc/i686-w64-mingw32/5.3.0/include \
D:/sw/qt/Tools/mingw530_32/lib/gcc/i686-w64-mingw32/5.3.0/include-fixed \
D:/sw/qt/Tools/mingw530_32/i686-w64-mingw32/include \
D:/sw/qt/Tools/mingw530_32/i686-w64-mingw32/include/c++ \
D:/sw/qt/Tools/mingw530_32/i686-w64-mingw32/include/c++/i686-w64-mingw32 \
D:/sw/qt/Tools/mingw530_32/i686-w64-mingw32/include/c++/backward
QMAKE_CXX.LIBDIRS = \
D:/sw/qt/Tools/mingw530_32/lib/gcc/i686-w64-mingw32/5.3.0 \
D:/sw/qt/Tools/mingw530_32/lib/gcc \
D:/sw/qt/Tools/mingw530_32/i686-w64-mingw32/lib \
D:/sw/qt/Tools/mingw530_32/lib
QMAKE_CXX.QT_COMPILER_STDCXX = 199711L
QMAKE_CXX.QT_GCC_MAJOR_VERSION = 5
QMAKE_CXX.QT_GCC_MINOR_VERSION = 3
QMAKE_CXX.QT_GCC_PATCH_VERSION = 0
QMAKE_CXX.COMPILER_MACROS = \
QT_COMPILER_STDCXX \
QT_GCC_MAJOR_VERSION \
QT_GCC_MINOR_VERSION \
QT_GCC_PATCH_VERSION
Loading

0 comments on commit 91ae042

Please sign in to comment.