Skip to content

Commit 9af1a40

Browse files
spookyboospookyboo
committed
Final touches R0.5
- Removed constant.h; this file contained only one item, so it does not contribute to a proper project - Updated manual
1 parent 6299eef commit 9af1a40

19 files changed

+10
-83
lines changed

Diff for: ‎bin/magus.exe

-2.5 KB
Binary file not shown.

Diff for: ‎bin/magus.pdb

0 Bytes
Binary file not shown.

Diff for: ‎common/qt/project.ptp

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ ${modules}
33
${ogre_root}
44

55
HEADERS = \
6-
${project.header}constants.h \
76
${project.header}magus_core.h \
87
${project.header}mainwindow.h \
98
${project.additionalheader}

Diff for: ‎common/qt/source/header/constants.h

-30
This file was deleted.

Diff for: ‎common/qt/source/header/constants.htp

-30
This file was deleted.

Diff for: ‎common/qt/source/header/dockwidget.htp

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#define ${dockwidget.title}DOCWIDGET_H
2323

2424
#include <QtWidgets>
25-
#include "constants.h"
2625
${dockwidget.include}
2726

2827
QT_BEGIN_NAMESPACE

Diff for: ‎common/qt/source/header/mainwindow.htp

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
#include <QCloseEvent>
2525
#include <QMainWindow>
26-
#include "constants.h"
2726
${mainwindow.includes}
2827

2928
QT_BEGIN_NAMESPACE

Diff for: ‎common/qt/source/header/tool_resourcewidget_assets.h

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#define MAGUS_TOOL_RESOURCES_ASSETS_H
2323

2424
#include <QtWidgets>
25-
#include "constants.h"
2625
#include <QMenu>
2726
#include <QAction>
2827
#include <QMessageBox>

Diff for: ‎common/qt/source/header/tool_resourcewidget_collections.h

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#define MAGUS_TOOL_RESOURCES_COLLECTIONS_H
2323

2424
#include <QtWidgets>
25-
#include "constants.h"
2625
#include <QMenu>
2726
#include <QAction>
2827
#include <QMessageBox>

Diff for: ‎common/qt/source/header/tool_resourcewidget_main.h

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
#include <QCloseEvent>
2525
#include <QMainWindow>
26-
#include "constants.h"
2726
#include <QMenu>
2827
#include <QAction>
2928
#include <QMessageBox>

Diff for: ‎common/qt/source/header/tool_resourcewidget_sources.h

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#define MAGUS_TOOL_RESOURCES_SOURCES_H
2323

2424
#include <QtWidgets>
25-
#include "constants.h"
2625
#include <QMenu>
2726
#include <QAction>
2827
#include <QMessageBox>

Diff for: ‎common/qt/source/src/asset_curve_dialog.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
****************************************************************************/
2020

2121
// Include
22-
#include "constants.h"
2322
#include "asset_curve_dialog.h"
2423
#include <QBrush>
2524
#include <QFrame>
@@ -131,7 +130,6 @@ namespace Magus
131130
mHToolBar = new QToolBar();
132131
mHToolBar->setMovable(false);
133132
mInnerMain->addToolBar(Qt::TopToolBarArea, mHToolBar);
134-
//mHToolBar->setMinimumHeight(TB_ICON_AND_SPACING);
135133
mHToolBar->setMinimumHeight(64);
136134
mHToolBar->setMinimumWidth(CURVE_DIALOG_WIDTH);
137135
mHToolBar->addAction(mCurveFitHorToolbarAction);

Diff for: ‎common/qt/source/src/asset_dockwidget.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
// Include
2222
#include "mainwindow.h"
2323
#include "Asset_dockwidget.h"
24-
#include "constants.h"
2524

2625
//****************************************************************************/
2726
AssetDockWidget::AssetDockWidget(QString title, MainWindow* parent, Qt::WindowFlags flags) :

Diff for: ‎common/qt/source/src/tool_resourcewidget_main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ namespace Magus
9696
{
9797
mHToolBar = new QToolBar();
9898
addToolBar(Qt::TopToolBarArea, mHToolBar);
99-
mHToolBar->setMinimumHeight(TB_ICON_AND_SPACING);
100-
mHToolBar->setMinimumWidth(4 * TB_ICON_AND_SPACING);
99+
mHToolBar->setMinimumHeight(32);
100+
mHToolBar->setMinimumWidth(4 * 32);
101101
mHToolBar->addAction(mNewHToolbarAction);
102102
mHToolBar->addAction(mLoadHToolbarAction);
103103
mHToolBar->addAction(mSaveHToolbarAction);

Diff for: ‎docs/Magus manual.doc

-125 KB
Binary file not shown.

Diff for: ‎docs/Magus manual.pdf

633 KB
Binary file not shown.

Diff for: ‎source/header/qtbuilder.h

-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ static const QString PATH_QT_DLL_WINDOWS = QString("platforms/");
4747
static const QString FILE_MAGUS_CORE_H = QString("magus_core.h");
4848
static const QString FILE_MAIN_CTP = QString("main.ctp");
4949
static const QString FILE_MAIN_CPP = QString("main.cpp");
50-
static const QString FILE_CONSTANTS_HTP = QString("constants.htp");
51-
static const QString FILE_CONSTANTS_H = QString("constants.h");
5250
static const QString FILE_MAINWINDOW_CTP = QString("mainwindow.ctp");
5351
static const QString FILE_MAINWINDOW_CPP = QString("mainwindow.cpp");
5452
static const QString FILE_MAINWINDOW_HTP = QString("mainwindow.htp");

Diff for: ‎source/src/qtbuilder.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ void QtBuilder::build(ApplicationTemplate* applicationTemplate)
228228
// --------------------------------------------------------------------------------------------------------------------
229229
// Step 3: Copy the base files (that do not need to be changed)
230230
fileUtil.copy(mQtHeader + FILE_MAGUS_CORE_H, mFullOutputHeaderDir + FILE_MAGUS_CORE_H);
231-
fileUtil.copy(mQtHeader + FILE_CONSTANTS_HTP, mFullOutputHeaderDir + FILE_CONSTANTS_H);
232231
fileUtil.copy(mQtSrc + FILE_MAIN_CTP, mFullOutputSrcDir + FILE_MAIN_CPP);
233232
fileUtil.copy(mQtDir + STYLE_DARK, mFullOutputBinDir + STYLE_DARK);
234233

Diff for: ‎source/src/qtbuildertoolbar.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -135,15 +135,15 @@ QString QtToolbarBuilder::createToolbarsForMainWindow(WindowProperties* windowPr
135135
// Set the height of the toolbar to a fixed size
136136
str = str +
137137
TAB +
138-
QString("mHToolBar->setMinimumHeight(TB_ICON_AND_SPACING);") +
138+
QString("mHToolBar->setMinimumHeight(32);") +
139139
QString("\n");
140140

141141
// Set the width of the toolbar to a fixed size
142142
str = str +
143143
TAB +
144144
QString("mHToolBar->setMinimumWidth(") +
145145
QVariant(windowProperties->mHToolbarPropertiesList.size()).toString() +
146-
QString(" * TB_ICON_AND_SPACING);") +
146+
QString(" * 32);") +
147147
QString("\n");
148148
}
149149
if (!windowProperties->mHToolbarPropertiesList.empty())
@@ -201,13 +201,13 @@ QString QtToolbarBuilder::createToolbarsForMainWindow(WindowProperties* windowPr
201201
TAB +
202202
QString("mVToolBar->setMinimumHeight(") +
203203
QVariant(windowProperties->mVToolbarPropertiesList.size()).toString() +
204-
QString(" * TB_ICON_AND_SPACING);") +
204+
QString(" * 32);") +
205205
QString("\n");
206206

207207
// Set the width of the toolbar to a fixed size
208208
str = str +
209209
TAB +
210-
QString("mVToolBar->setMinimumWidth(TB_ICON_AND_SPACING);") +
210+
QString("mVToolBar->setMinimumWidth(32);") +
211211
QString("\n");
212212

213213
ToolbarProperties* toolbarProperties = 0;
@@ -272,15 +272,15 @@ QString QtToolbarBuilder::createToolbarsForDockWindow(WindowProperties* windowPr
272272
// Set the height of the toolbar to a fixed size
273273
str = str +
274274
TAB +
275-
QString("mHToolBar->setMinimumHeight(TB_ICON_AND_SPACING);") +
275+
QString("mHToolBar->setMinimumHeight(32);") +
276276
QString("\n");
277277

278278
// Set the width of the toolbar to a fixed size
279279
str = str +
280280
TAB +
281281
QString("mHToolBar->setMinimumWidth(") +
282282
QVariant(windowProperties->mHToolbarPropertiesList.size()).toString() +
283-
QString(" * TB_ICON_AND_SPACING);") +
283+
QString(" * 32);") +
284284
QString("\n");
285285
}
286286
if (!windowProperties->mHToolbarPropertiesList.empty())
@@ -338,13 +338,13 @@ QString QtToolbarBuilder::createToolbarsForDockWindow(WindowProperties* windowPr
338338
TAB +
339339
QString("mVToolBar->setMinimumHeight(") +
340340
QVariant(windowProperties->mVToolbarPropertiesList.size()).toString() +
341-
QString(" * TB_ICON_AND_SPACING);") +
341+
QString(" * 32);") +
342342
QString("\n");
343343

344344
// Set the width of the toolbar to a fixed size
345345
str = str +
346346
TAB +
347-
QString("mVToolBar->setMinimumWidth(TB_ICON_AND_SPACING);") +
347+
QString("mVToolBar->setMinimumWidth(32);") +
348348
QString("\n");
349349

350350
ToolbarProperties* toolbarProperties = 0;

0 commit comments

Comments
 (0)