# HG changeset patch
# User Teemu Piippo <crimsondusk64@gmail.com>
# Date 1440901817 -10800
# Node ID d1b0aa40db9129211717e2497d0e3e07f57364ba
# Parent  70f6900a92d5a239392bc933ffd6377be0b76b34
MainWindow: "ui->" -> "ui."

diff -r 70f6900a92d5 -r d1b0aa40db91 src/configuration.cpp
--- a/src/configuration.cpp	Sun Aug 30 05:16:07 2015 +0300
+++ b/src/configuration.cpp	Sun Aug 30 05:30:17 2015 +0300
@@ -26,6 +26,7 @@
 #include <QDir>
 #include <QTextStream>
 #include <QSettings>
+#include <QApplication>
 #include "main.h"
 #include "configuration.h"
 #include "miscallenous.h"
diff -r 70f6900a92d5 -r d1b0aa40db91 src/dialogs/openprogressdialog.cpp
--- a/src/dialogs/openprogressdialog.cpp	Sun Aug 30 05:16:07 2015 +0300
+++ b/src/dialogs/openprogressdialog.cpp	Sun Aug 30 05:30:17 2015 +0300
@@ -17,7 +17,7 @@
  */
 
 #include "openprogressdialog.h"
-#include "ui_openprogress.h"
+#include "ui_openprogressdialog.h"
 #include "../main.h"
 
 OpenProgressDialog::OpenProgressDialog (QWidget* parent, Qt::WindowFlags f) :
diff -r 70f6900a92d5 -r d1b0aa40db91 src/mainwindow.cpp
--- a/src/mainwindow.cpp	Sun Aug 30 05:16:07 2015 +0300
+++ b/src/mainwindow.cpp	Sun Aug 30 05:30:17 2015 +0300
@@ -74,23 +74,23 @@
 // =============================================================================
 //
 MainWindow::MainWindow (QWidget* parent, Qt::WindowFlags flags) :
-	QMainWindow (parent, flags)
+	QMainWindow (parent, flags),
+	ui (*new Ui_MainWindow)
 {
 	g_win = this;
-	ui = new Ui_LDForgeUI;
-	ui->setupUi (this);
+	ui.setupUi (this);
 	m_updatingTabs = false;
 	m_renderer = new GLRenderer (this);
 	m_tabs = new QTabBar;
 	m_tabs->setTabsClosable (true);
-	ui->verticalLayout->insertWidget (0, m_tabs);
+	ui.verticalLayout->insertWidget (0, m_tabs);
 
 	// Stuff the renderer into its frame
-	QVBoxLayout* rendererLayout = new QVBoxLayout (ui->rendererFrame);
+	QVBoxLayout* rendererLayout = new QVBoxLayout (ui.rendererFrame);
 	rendererLayout->addWidget (R());
 
-	connect (ui->objectList, SIGNAL (itemSelectionChanged()), this, SLOT (slot_selectionChanged()));
-	connect (ui->objectList, SIGNAL (itemDoubleClicked (QListWidgetItem*)), this, SLOT (slot_editObject (QListWidgetItem*)));
+	connect (ui.objectList, SIGNAL (itemSelectionChanged()), this, SLOT (slot_selectionChanged()));
+	connect (ui.objectList, SIGNAL (itemDoubleClicked (QListWidgetItem*)), this, SLOT (slot_editObject (QListWidgetItem*)));
 	connect (m_tabs, SIGNAL (currentChanged(int)), this, SLOT (changeCurrentFile()));
 	connect (m_tabs, SIGNAL (tabCloseRequested (int)), this, SLOT (closeTab (int)));
 
@@ -122,8 +122,8 @@
 	loadShortcuts (Config::SettingsObject());
 	setMinimumSize (300, 200);
 	connect (qApp, SIGNAL (aboutToQuit()), this, SLOT (slot_lastSecondCleanup()));
-	connect (ui->ringToolHiRes, SIGNAL (clicked (bool)), this, SLOT (ringToolHiResClicked (bool)));
-	connect (ui->ringToolSegments, SIGNAL (valueChanged (int)),
+	connect (ui.ringToolHiRes, SIGNAL (clicked (bool)), this, SLOT (ringToolHiResClicked (bool)));
+	connect (ui.ringToolSegments, SIGNAL (valueChanged (int)),
 		this, SLOT (circleToolSegmentsChanged()));
 	circleToolSegmentsChanged(); // invoke it manually for initial label text
 
@@ -170,7 +170,7 @@
 void MainWindow::slot_lastSecondCleanup()
 {
 	delete m_renderer;
-	delete ui;
+	delete &ui;
 }
 
 // =============================================================================
@@ -191,7 +191,7 @@
 		QAction* recent = new QAction (GetIcon ("open-recent"), file, this);
 
 		connect (recent, SIGNAL (triggered()), this, SLOT (slot_recentFile()));
-		ui->menuOpenRecent->insertAction (first, recent);
+		ui.menuOpenRecent->insertAction (first, recent);
 		m_recentFiles << recent;
 		first = recent;
 	}
@@ -224,15 +224,15 @@
 void MainWindow::updateColorToolbar()
 {
 	m_colorButtons.clear();
-	ui->toolBarColors->clear();
-	ui->toolBarColors->addAction (ui->actionUncolor);
-	ui->toolBarColors->addSeparator();
+	ui.toolBarColors->clear();
+	ui.toolBarColors->addAction (ui.actionUncolor);
+	ui.toolBarColors->addSeparator();
 
 	for (LDQuickColor& entry : m_quickColors)
 	{
 		if (entry.isSeparator())
 		{
-			ui->toolBarColors->addSeparator();
+			ui.toolBarColors->addSeparator();
 		}
 		else
 		{
@@ -242,7 +242,7 @@
 			colorButton->setToolTip (entry.color().name());
 
 			connect (colorButton, SIGNAL (clicked()), this, SLOT (slot_quickColor()));
-			ui->toolBarColors->addWidget (colorButton);
+			ui.toolBarColors->addWidget (colorButton);
 			m_colorButtons << colorButton;
 
 			entry.setToolButton (colorButton);
@@ -257,9 +257,9 @@
 void MainWindow::updateGridToolBar()
 {
 	// Ensure that the current grid - and only the current grid - is selected.
-	ui->actionGridCoarse->setChecked (cfg::Grid == Grid::Coarse);
-	ui->actionGridMedium->setChecked (cfg::Grid == Grid::Medium);
-	ui->actionGridFine->setChecked (cfg::Grid == Grid::Fine);
+	ui.actionGridCoarse->setChecked (cfg::Grid == Grid::Coarse);
+	ui.actionGridMedium->setChecked (cfg::Grid == Grid::Medium);
+	ui.actionGridFine->setChecked (cfg::Grid == Grid::Fine);
 }
 
 // =============================================================================
@@ -327,10 +327,10 @@
 	// while this is done.
 	g_isSelectionLocked = true;
 
-	for (int i = 0; i < ui->objectList->count(); ++i)
-		delete ui->objectList->item (i);
+	for (int i = 0; i < ui.objectList->count(); ++i)
+		delete ui.objectList->item (i);
 
-	ui->objectList->clear();
+	ui.objectList->clear();
 
 	for (LDObject* obj : CurrentDocument()->objects())
 	{
@@ -433,7 +433,7 @@
 		}
 
 		obj->qObjListEntry = item;
-		ui->objectList->insertItem (ui->objectList->count(), item);
+		ui.objectList->insertItem (ui.objectList->count(), item);
 	}
 
 	g_isSelectionLocked = false;
@@ -449,7 +449,7 @@
 		return;
 
 	LDObject* obj = Selection().last();
-	ui->objectList->scrollToItem (obj->qObjListEntry);
+	ui.objectList->scrollToItem (obj->qObjListEntry);
 }
 
 // =============================================================================
@@ -463,7 +463,7 @@
 
 	// Get the objects from the object list selection
 	CurrentDocument()->clearSelection();
-	const QList<QListWidgetItem*> items = ui->objectList->selectedItems();
+	const QList<QListWidgetItem*> items = ui.objectList->selectedItems();
 
 	for (LDObject* obj : CurrentDocument()->objects())
 	{
@@ -573,7 +573,7 @@
 		if (obj->qObjListEntry == null)
 			continue;
 
-		int row = ui->objectList->row (obj->qObjListEntry);
+		int row = ui.objectList->row (obj->qObjListEntry);
 
 		if (top == -1)
 		{
@@ -583,8 +583,8 @@
 		{
 			if (row != bottom + 1)
 			{
-				itemselect.select (ui->objectList->model()->index (top, 0),
-					ui->objectList->model()->index (bottom, 0));
+				itemselect.select (ui.objectList->model()->index (top, 0),
+					ui.objectList->model()->index (bottom, 0));
 				top = -1;
 			}
 
@@ -594,11 +594,11 @@
 
 	if (top != -1)
 	{
-		itemselect.select (ui->objectList->model()->index (top, 0),
-			ui->objectList->model()->index (bottom, 0));
+		itemselect.select (ui.objectList->model()->index (top, 0),
+			ui.objectList->model()->index (bottom, 0));
 	}
 
-	ui->objectList->selectionModel()->select (itemselect, QItemSelectionModel::ClearAndSelect);
+	ui.objectList->selectionModel()->select (itemselect, QItemSelectionModel::ClearAndSelect);
 	g_isSelectionLocked = false;
 }
 
@@ -670,45 +670,45 @@
 
 	if (single and singleObj->type() != OBJ_Empty)
 	{
-		contextMenu->addAction (ui->actionEdit);
+		contextMenu->addAction (ui.actionEdit);
 		contextMenu->addSeparator();
 	}
 
-	contextMenu->addAction (ui->actionCut);
-	contextMenu->addAction (ui->actionCopy);
-	contextMenu->addAction (ui->actionPaste);
-	contextMenu->addAction (ui->actionDelete);
+	contextMenu->addAction (ui.actionCut);
+	contextMenu->addAction (ui.actionCopy);
+	contextMenu->addAction (ui.actionPaste);
+	contextMenu->addAction (ui.actionDelete);
 	contextMenu->addSeparator();
-	contextMenu->addAction (ui->actionSetColor);
+	contextMenu->addAction (ui.actionSetColor);
 
 	if (single)
-		contextMenu->addAction (ui->actionEditRaw);
+		contextMenu->addAction (ui.actionEditRaw);
 
-	contextMenu->addAction (ui->actionBorders);
-	contextMenu->addAction (ui->actionSetOverlay);
-	contextMenu->addAction (ui->actionClearOverlay);
+	contextMenu->addAction (ui.actionBorders);
+	contextMenu->addAction (ui.actionSetOverlay);
+	contextMenu->addAction (ui.actionClearOverlay);
 
 	if (hasSubfiles)
 	{
 		contextMenu->addSeparator();
-		contextMenu->addAction (ui->actionOpenSubfiles);
+		contextMenu->addAction (ui.actionOpenSubfiles);
 	}
 
 	contextMenu->addSeparator();
-	contextMenu->addAction (ui->actionModeSelect);
-	contextMenu->addAction (ui->actionModeDraw);
-	contextMenu->addAction (ui->actionModeCircle);
+	contextMenu->addAction (ui.actionModeSelect);
+	contextMenu->addAction (ui.actionModeDraw);
+	contextMenu->addAction (ui.actionModeCircle);
 
 	if (not Selection().isEmpty())
 	{
 		contextMenu->addSeparator();
-		contextMenu->addAction (ui->actionSubfileSelection);
+		contextMenu->addAction (ui.actionSubfileSelection);
 	}
 
 	if (R()->camera() != EFreeCamera)
 	{
 		contextMenu->addSeparator();
-		contextMenu->addAction (ui->actionSetDrawDepth);
+		contextMenu->addAction (ui.actionSetDrawDepth);
 	}
 
 	contextMenu->exec (pos);
@@ -737,12 +737,12 @@
 void MainWindow::updateEditModeActions()
 {
 	const EditModeType mode = R()->currentEditModeType();
-	ui->actionModeSelect->setChecked (mode == EditModeType::Select);
-	ui->actionModeDraw->setChecked (mode == EditModeType::Draw);
-	ui->actionModeRectangle->setChecked (mode == EditModeType::Rectangle);
-	ui->actionModeCircle->setChecked (mode == EditModeType::Circle);
-	ui->actionModeMagicWand->setChecked (mode == EditModeType::MagicWand);
-	ui->actionModeLinePath->setChecked (mode == EditModeType::LinePath);
+	ui.actionModeSelect->setChecked (mode == EditModeType::Select);
+	ui.actionModeDraw->setChecked (mode == EditModeType::Draw);
+	ui.actionModeRectangle->setChecked (mode == EditModeType::Rectangle);
+	ui.actionModeCircle->setChecked (mode == EditModeType::Circle);
+	ui.actionModeMagicWand->setChecked (mode == EditModeType::MagicWand);
+	ui.actionModeLinePath->setChecked (mode == EditModeType::LinePath);
 }
 
 // =============================================================================
@@ -999,11 +999,11 @@
 void MainWindow::refreshObjectList()
 {
 #if 0
-	ui->objectList->clear();
+	ui.objectList->clear();
 	LDDocument* f = getCurrentDocument();
 
 for (LDObject* obj : *f)
-		ui->objectList->addItem (obj->qObjListEntry);
+		ui.objectList->addItem (obj->qObjListEntry);
 
 #endif
 
@@ -1018,25 +1018,25 @@
 	{
 		History* his = CurrentDocument()->history();
 		int pos = his->position();
-		ui->actionUndo->setEnabled (pos != -1);
-		ui->actionRedo->setEnabled (pos < (long) his->getSize() - 1);
+		ui.actionUndo->setEnabled (pos != -1);
+		ui.actionRedo->setEnabled (pos < (long) his->getSize() - 1);
 	}
 
-	ui->actionWireframe->setChecked (cfg::DrawWireframe);
-	ui->actionAxes->setChecked (cfg::DrawAxes);
-	ui->actionBFCView->setChecked (cfg::BFCRedGreenView);
-	ui->actionRandomColors->setChecked (cfg::RandomColors);
-	ui->actionDrawAngles->setChecked (cfg::DrawAngles);
-	ui->actionDrawSurfaces->setChecked (cfg::DrawSurfaces);
-	ui->actionDrawEdgeLines->setChecked (cfg::DrawEdgeLines);
-	ui->actionDrawConditionalLines->setChecked (cfg::DrawConditionalLines);
+	ui.actionWireframe->setChecked (cfg::DrawWireframe);
+	ui.actionAxes->setChecked (cfg::DrawAxes);
+	ui.actionBFCView->setChecked (cfg::BFCRedGreenView);
+	ui.actionRandomColors->setChecked (cfg::RandomColors);
+	ui.actionDrawAngles->setChecked (cfg::DrawAngles);
+	ui.actionDrawSurfaces->setChecked (cfg::DrawSurfaces);
+	ui.actionDrawEdgeLines->setChecked (cfg::DrawEdgeLines);
+	ui.actionDrawConditionalLines->setChecked (cfg::DrawConditionalLines);
 }
 
 // =============================================================================
 //
 void MainWindow::updatePrimitives()
 {
-	PopulatePrimitives (ui->primitives);
+	PopulatePrimitives (ui.primitives);
 }
 
 // =============================================================================
@@ -1092,7 +1092,7 @@
 //
 QTreeWidget* MainWindow::getPrimitivesTree() const
 {
-	return ui->primitives;
+	return ui.primitives;
 }
 
 // =============================================================================
@@ -1106,14 +1106,14 @@
 //
 bool MainWindow::ringToolHiRes() const
 {
-	return ui->ringToolHiRes->isChecked();
+	return ui.ringToolHiRes->isChecked();
 }
 
 // =============================================================================
 //
 int MainWindow::ringToolSegments() const
 {
-	return ui->ringToolSegments->value();
+	return ui.ringToolSegments->value();
 }
 
 // =============================================================================
@@ -1122,13 +1122,13 @@
 {
 	if (checked)
 	{
-		ui->ringToolSegments->setMaximum (HighResolution);
-		ui->ringToolSegments->setValue (ui->ringToolSegments->value() * 3);
+		ui.ringToolSegments->setMaximum (HighResolution);
+		ui.ringToolSegments->setValue (ui.ringToolSegments->value() * 3);
 	}
 	else
 	{
-		ui->ringToolSegments->setValue (ui->ringToolSegments->value() / 3);
-		ui->ringToolSegments->setMaximum (LowResolution);
+		ui.ringToolSegments->setValue (ui.ringToolSegments->value() / 3);
+		ui.ringToolSegments->setMaximum (LowResolution);
 	}
 }
 
@@ -1136,10 +1136,10 @@
 //
 void MainWindow::circleToolSegmentsChanged()
 {
-	int numerator (ui->ringToolSegments->value());
-	int denominator (ui->ringToolHiRes->isChecked() ? HighResolution : LowResolution);
+	int numerator (ui.ringToolSegments->value());
+	int denominator (ui.ringToolHiRes->isChecked() ? HighResolution : LowResolution);
 	Simplify (numerator, denominator);
-	ui->ringToolSegmentsLabel->setText (format ("%1 / %2", numerator, denominator));
+	ui.ringToolSegmentsLabel->setText (format ("%1 / %2", numerator, denominator));
 }
 
 // =============================================================================
diff -r 70f6900a92d5 -r d1b0aa40db91 src/mainwindow.h
--- a/src/mainwindow.h	Sun Aug 30 05:16:07 2015 +0300
+++ b/src/mainwindow.h	Sun Aug 30 05:30:17 2015 +0300
@@ -34,7 +34,6 @@
 class GLRenderer;
 class QComboBox;
 class QProgressBar;
-class Ui_LDForgeUI;
 struct Primitive;
 
 class LDQuickColor
@@ -281,7 +280,7 @@
 	QList<QToolButton*>	m_colorButtons;
 	QList<QAction*>		m_recentFiles;
 	MessageManager*		m_msglog;
-	Ui_LDForgeUI*		ui;
+	class Ui_MainWindow& ui;
 	QTabBar*			m_tabs;
 	bool				m_updatingTabs;
 
diff -r 70f6900a92d5 -r d1b0aa40db91 src/mainwindow.ui
--- a/src/mainwindow.ui	Sun Aug 30 05:16:07 2015 +0300
+++ b/src/mainwindow.ui	Sun Aug 30 05:30:17 2015 +0300
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>LDForgeUI</class>
- <widget class="QMainWindow" name="LDForgeUI">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -14,7 +14,7 @@
    <string/>
   </property>
   <property name="windowIcon">
-   <iconset>
+   <iconset resource="../ldforge.qrc">
     <normaloff>:/icons/ldforge.png</normaloff>:/icons/ldforge.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
@@ -75,8 +75,8 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>234</width>
-           <height>402</height>
+           <width>218</width>
+           <height>124</height>
           </rect>
          </property>
          <attribute name="label">
@@ -157,8 +157,8 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>234</width>
-           <height>402</height>
+           <width>96</width>
+           <height>86</height>
           </rect>
          </property>
          <attribute name="label">
@@ -206,7 +206,7 @@
       <string>Open &amp;Recent...</string>
      </property>
      <property name="icon">
-      <iconset>
+      <iconset resource="../ldforge.qrc">
        <normaloff>:/icons/open-recent.png</normaloff>:/icons/open-recent.png</iconset>
      </property>
     </widget>
@@ -567,7 +567,7 @@
   </widget>
   <action name="actionNew">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/brick.png</normaloff>:/icons/brick.png</iconset>
    </property>
    <property name="text">
@@ -582,7 +582,7 @@
   </action>
   <action name="actionOpen">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/file-open.png</normaloff>:/icons/file-open.png</iconset>
    </property>
    <property name="text">
@@ -597,7 +597,7 @@
   </action>
   <action name="actionSave">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/file-save.png</normaloff>:/icons/file-save.png</iconset>
    </property>
    <property name="text">
@@ -615,7 +615,7 @@
   </action>
   <action name="actionSaveAs">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/file-save-as.png</normaloff>:/icons/file-save-as.png</iconset>
    </property>
    <property name="text">
@@ -630,7 +630,7 @@
   </action>
   <action name="actionInsertFrom">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/file-import.png</normaloff>:/icons/file-import.png</iconset>
    </property>
    <property name="text">
@@ -639,7 +639,7 @@
   </action>
   <action name="actionExportTo">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/file-export.png</normaloff>:/icons/file-export.png</iconset>
    </property>
    <property name="text">
@@ -648,7 +648,7 @@
   </action>
   <action name="actionSettings">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/settings.png</normaloff>:/icons/settings.png</iconset>
    </property>
    <property name="text">
@@ -663,7 +663,7 @@
   </action>
   <action name="actionSetLDrawPath">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/settings.png</normaloff>:/icons/settings.png</iconset>
    </property>
    <property name="text">
@@ -675,7 +675,7 @@
   </action>
   <action name="actionScanPrimitives">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/radial.png</normaloff>:/icons/radial.png</iconset>
    </property>
    <property name="text">
@@ -687,7 +687,7 @@
   </action>
   <action name="actionExit">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/exit.png</normaloff>:/icons/exit.png</iconset>
    </property>
    <property name="text">
@@ -710,7 +710,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/axes.png</normaloff>:/icons/axes.png</iconset>
    </property>
    <property name="text">
@@ -722,7 +722,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/wireframe.png</normaloff>:/icons/wireframe.png</iconset>
    </property>
    <property name="text">
@@ -734,7 +734,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/bfc-view.png</normaloff>:/icons/bfc-view.png</iconset>
    </property>
    <property name="text">
@@ -746,7 +746,7 @@
   </action>
   <action name="actionSetOverlay">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/overlay.png</normaloff>:/icons/overlay.png</iconset>
    </property>
    <property name="text">
@@ -755,7 +755,7 @@
   </action>
   <action name="actionClearOverlay">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/overlay-clear.png</normaloff>:/icons/overlay-clear.png</iconset>
    </property>
    <property name="text">
@@ -764,7 +764,7 @@
   </action>
   <action name="actionScreenshot">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/screencap.png</normaloff>:/icons/screencap.png</iconset>
    </property>
    <property name="text">
@@ -841,7 +841,7 @@
   </action>
   <action name="actionUndo">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/undo.png</normaloff>:/icons/undo.png</iconset>
    </property>
    <property name="text">
@@ -856,7 +856,7 @@
   </action>
   <action name="actionRedo">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/redo.png</normaloff>:/icons/redo.png</iconset>
    </property>
    <property name="text">
@@ -871,7 +871,7 @@
   </action>
   <action name="actionCut">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/cut.png</normaloff>:/icons/cut.png</iconset>
    </property>
    <property name="text">
@@ -886,7 +886,7 @@
   </action>
   <action name="actionCopy">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/copy.png</normaloff>:/icons/copy.png</iconset>
    </property>
    <property name="text">
@@ -904,7 +904,7 @@
   </action>
   <action name="actionPaste">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/paste.png</normaloff>:/icons/paste.png</iconset>
    </property>
    <property name="text">
@@ -919,7 +919,7 @@
   </action>
   <action name="actionDelete">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/delete.png</normaloff>:/icons/delete.png</iconset>
    </property>
    <property name="text">
@@ -934,7 +934,7 @@
   </action>
   <action name="actionSelectAll">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/select-all.png</normaloff>:/icons/select-all.png</iconset>
    </property>
    <property name="text">
@@ -946,7 +946,7 @@
   </action>
   <action name="actionSelectByColor">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/select-color.png</normaloff>:/icons/select-color.png</iconset>
    </property>
    <property name="text">
@@ -955,7 +955,7 @@
   </action>
   <action name="actionSelectByType">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/select-type.png</normaloff>:/icons/select-type.png</iconset>
    </property>
    <property name="text">
@@ -970,7 +970,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/mode-select.png</normaloff>:/icons/mode-select.png</iconset>
    </property>
    <property name="text">
@@ -985,7 +985,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/mode-draw.png</normaloff>:/icons/mode-draw.png</iconset>
    </property>
    <property name="text">
@@ -1002,7 +1002,7 @@
   </action>
   <action name="actionSetColor">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/palette.png</normaloff>:/icons/palette.png</iconset>
    </property>
    <property name="text">
@@ -1017,7 +1017,7 @@
   </action>
   <action name="actionAutocolor">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/autocolor.png</normaloff>:/icons/autocolor.png</iconset>
    </property>
    <property name="text">
@@ -1032,7 +1032,7 @@
   </action>
   <action name="actionUncolor">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/uncolorize.png</normaloff>:/icons/uncolorize.png</iconset>
    </property>
    <property name="text">
@@ -1047,7 +1047,7 @@
   </action>
   <action name="actionInline">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/inline.png</normaloff>:/icons/inline.png</iconset>
    </property>
    <property name="text">
@@ -1062,7 +1062,7 @@
   </action>
   <action name="actionInlineDeep">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/inline-deep.png</normaloff>:/icons/inline-deep.png</iconset>
    </property>
    <property name="text">
@@ -1077,7 +1077,7 @@
   </action>
   <action name="actionInvert">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/invert.png</normaloff>:/icons/invert.png</iconset>
    </property>
    <property name="text">
@@ -1089,7 +1089,7 @@
   </action>
   <action name="actionMakePrimitive">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/radial.png</normaloff>:/icons/radial.png</iconset>
    </property>
    <property name="text">
@@ -1098,7 +1098,7 @@
   </action>
   <action name="actionSplitQuads">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/quad-split.png</normaloff>:/icons/quad-split.png</iconset>
    </property>
    <property name="text">
@@ -1110,7 +1110,7 @@
   </action>
   <action name="actionEditRaw">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/set-contents.png</normaloff>:/icons/set-contents.png</iconset>
    </property>
    <property name="text">
@@ -1122,7 +1122,7 @@
   </action>
   <action name="actionBorders">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/make-borders.png</normaloff>:/icons/make-borders.png</iconset>
    </property>
    <property name="text">
@@ -1134,7 +1134,7 @@
   </action>
   <action name="actionRoundCoordinates">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/round-coords.png</normaloff>:/icons/round-coords.png</iconset>
    </property>
    <property name="text">
@@ -1146,7 +1146,7 @@
   </action>
   <action name="actionVisibilityToggle">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/visibility-toggle.png</normaloff>:/icons/visibility-toggle.png</iconset>
    </property>
    <property name="text">
@@ -1158,7 +1158,7 @@
   </action>
   <action name="actionReplaceCoords">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/replace-coords.png</normaloff>:/icons/replace-coords.png</iconset>
    </property>
    <property name="text">
@@ -1170,7 +1170,7 @@
   </action>
   <action name="actionFlip">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/flip.png</normaloff>:/icons/flip.png</iconset>
    </property>
    <property name="text">
@@ -1193,7 +1193,7 @@
   </action>
   <action name="actionYtruder">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/ytruder.png</normaloff>:/icons/ytruder.png</iconset>
    </property>
    <property name="text">
@@ -1205,7 +1205,7 @@
   </action>
   <action name="actionRectifier">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/rectifier.png</normaloff>:/icons/rectifier.png</iconset>
    </property>
    <property name="text">
@@ -1217,7 +1217,7 @@
   </action>
   <action name="actionIntersector">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/intersector.png</normaloff>:/icons/intersector.png</iconset>
    </property>
    <property name="text">
@@ -1229,7 +1229,7 @@
   </action>
   <action name="actionIsecalc">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/isecalc.png</normaloff>:/icons/isecalc.png</iconset>
    </property>
    <property name="text">
@@ -1241,7 +1241,7 @@
   </action>
   <action name="actionCoverer">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/coverer.png</normaloff>:/icons/coverer.png</iconset>
    </property>
    <property name="text">
@@ -1261,7 +1261,7 @@
     <bool>false</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/help.png</normaloff>:/icons/help.png</iconset>
    </property>
    <property name="text">
@@ -1273,7 +1273,7 @@
   </action>
   <action name="actionAbout">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/ldforge.png</normaloff>:/icons/ldforge.png</iconset>
    </property>
    <property name="text">
@@ -1290,7 +1290,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/grid-coarse.png</normaloff>:/icons/grid-coarse.png</iconset>
    </property>
    <property name="text">
@@ -1305,7 +1305,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/grid-medium.png</normaloff>:/icons/grid-medium.png</iconset>
    </property>
    <property name="text">
@@ -1317,7 +1317,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/grid-fine.png</normaloff>:/icons/grid-fine.png</iconset>
    </property>
    <property name="text">
@@ -1355,7 +1355,7 @@
   </action>
   <action name="actionMoveXNeg">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/move-x-neg.png</normaloff>:/icons/move-x-neg.png</iconset>
    </property>
    <property name="text">
@@ -1367,7 +1367,7 @@
   </action>
   <action name="actionMoveXPos">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/move-x-pos.png</normaloff>:/icons/move-x-pos.png</iconset>
    </property>
    <property name="text">
@@ -1379,7 +1379,7 @@
   </action>
   <action name="actionMoveYNeg">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/move-y-neg.png</normaloff>:/icons/move-y-neg.png</iconset>
    </property>
    <property name="text">
@@ -1391,7 +1391,7 @@
   </action>
   <action name="actionMoveYPos">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/move-y-pos.png</normaloff>:/icons/move-y-pos.png</iconset>
    </property>
    <property name="text">
@@ -1403,7 +1403,7 @@
   </action>
   <action name="actionMoveZNeg">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/move-z-neg.png</normaloff>:/icons/move-z-neg.png</iconset>
    </property>
    <property name="text">
@@ -1415,7 +1415,7 @@
   </action>
   <action name="actionMoveZPos">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/move-z-pos.png</normaloff>:/icons/move-z-pos.png</iconset>
    </property>
    <property name="text">
@@ -1501,7 +1501,7 @@
   </action>
   <action name="actionNewFile">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/file-new.png</normaloff>:/icons/file-new.png</iconset>
    </property>
    <property name="text">
@@ -1534,7 +1534,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/mode-circle.png</normaloff>:/icons/mode-circle.png</iconset>
    </property>
    <property name="text">
@@ -1546,7 +1546,7 @@
   </action>
   <action name="actionVisibilityHide">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/visibility-hide.png</normaloff>:/icons/visibility-hide.png</iconset>
    </property>
    <property name="text">
@@ -1558,7 +1558,7 @@
   </action>
   <action name="actionVisibilityReveal">
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/visibility-show.png</normaloff>:/icons/visibility-show.png</iconset>
    </property>
    <property name="text">
@@ -1578,7 +1578,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/mode-angle.png</normaloff>:/icons/mode-angle.png</iconset>
    </property>
    <property name="text">
@@ -1593,7 +1593,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/random-colors.png</normaloff>:/icons/random-colors.png</iconset>
    </property>
    <property name="text">
@@ -1654,7 +1654,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/mode-magicwand.png</normaloff>:/icons/mode-magicwand.png</iconset>
    </property>
    <property name="text">
@@ -1669,7 +1669,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/mode-rectangle.png</normaloff>:/icons/mode-rectangle.png</iconset>
    </property>
    <property name="text">
@@ -1684,7 +1684,7 @@
     <bool>true</bool>
    </property>
    <property name="icon">
-    <iconset>
+    <iconset resource="../ldforge.qrc">
      <normaloff>:/icons/line.png</normaloff>:/icons/line.png</iconset>
    </property>
    <property name="text">