Mercurial > ldforge / changeset

--- a/src/common.h	Wed May 22 20:51:45 2013 +0300
+++ b/src/common.h	Wed May 22 22:12:18 2013 +0300
@@ -40,7 +40,9 @@
 #define BUILD_ID BUILD_INTERNAL
 
 // =============================================
-#define RELEASE (BUILD_ID != BUILD_INTERNAL)
+#if (BUILD_ID != BUILD_INTERNAL)
+#define RELEASE
+#endif // BUILD_ID
 
 #define BUILD_INTERNAL	0
 #define BUILD_ALPHA		1

--- a/src/configDialog.cpp	Wed May 22 20:51:45 2013 +0300
+++ b/src/configDialog.cpp	Wed May 22 22:12:18 2013 +0300
@@ -43,8 +43,6 @@
 extern_cfg (bool, edit_schemanticinline);
 extern_cfg (bool, gl_blackedges);
 
-ConfigDialog* g_ConfigDialog = null;
-
 #define INIT_CHECKBOX(BOX, CFG) \
 	BOX->setCheckState (CFG ? Qt::Checked : Qt::Unchecked);
 
@@ -55,7 +53,6 @@
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
 ConfigDialog::ConfigDialog (ForgeWindow* parent) : QDialog (parent) {
-	g_ConfigDialog = this;
 	tabs = new QTabWidget;
 	
 	initMainTab ();
@@ -513,13 +510,6 @@
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
-ConfigDialog::~ConfigDialog () {
-	g_ConfigDialog = null;
-}
-
-// =============================================================================
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-// =============================================================================
 void ConfigDialog::pickColor (strconfig& cfg, QPushButton* qButton) {
 	QColorDialog dlg (QColor (cfg.value.chars()));
 	dlg.setWindowIcon (getIcon ("colorselect"));

--- a/src/configDialog.h	Wed May 22 20:51:45 2013 +0300
+++ b/src/configDialog.h	Wed May 22 22:12:18 2013 +0300
@@ -81,7 +81,6 @@
 	QDialogButtonBox* bbx_buttons;
 	
 	ConfigDialog (ForgeWindow* parent);
-	~ConfigDialog ();
 	static void staticDialog ();
 	
 private:

--- a/src/gui_editactions.cpp	Wed May 22 20:51:45 2013 +0300
+++ b/src/gui_editactions.cpp	Wed May 22 22:12:18 2013 +0300
@@ -310,8 +310,8 @@
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
-MAKE_ACTION (setColor, "Set Color", "palette", "Set the color on given objects.", KEY (F10)) {
-	if (g_win->sel ().size() <= 0)
+MAKE_ACTION (setColor, "Set Color", "palette", "Set the color on given objects.", KEY (C)) {
+	if (g_win->sel ().size () <= 0)
 		return;
 	
 	short colnum;