summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorleo2005-10-02 02:18:05 +0000
committerleo2005-10-02 02:18:05 +0000
commit97727601bdc6d93d1576ea80a01b820cc34e3fb1 (patch)
tree6af826de935c47448a1f927a9094c791cde5e98d /win
parentaf794d98734dc8477c5aff9eb297479f01ba8ecc (diff)
Made Region Select part of regular selection.
git-svn-id: http://svn.leocad.org/trunk@424 c7d43263-9d01-0410-8a33-9dba5d9f93d6
Diffstat (limited to 'win')
-rw-r--r--win/LeoCAD.rc2
-rw-r--r--win/System.cpp16
-rw-r--r--win/res/toolsbar.bmpbin2518 -> 2398 bytes
-rw-r--r--win/resource.h3
4 files changed, 17 insertions, 4 deletions
diff --git a/win/LeoCAD.rc b/win/LeoCAD.rc
index 7438ce5..1be254e 100644
--- a/win/LeoCAD.rc
+++ b/win/LeoCAD.rc
@@ -143,7 +143,6 @@ BEGIN
BUTTON ID_ACTION_CAMERA
SEPARATOR
BUTTON ID_ACTION_SELECT
- BUTTON ID_ACTION_SELECT_REGION
BUTTON ID_ACTION_MOVE
BUTTON ID_ACTION_ROTATE
BUTTON ID_ACTION_REMOVE
@@ -2053,7 +2052,6 @@ END
STRINGTABLE DISCARDABLE
BEGIN
ID_ACTION_SELECT "Select objects with the mouse\nSelect"
- ID_ACTION_SELECT_REGION "Select objects with the mouse\nSelect Region"
ID_ACTION_INSERT "Add pieces to the project\nInsert"
ID_ACTION_LIGHT "Add a positional light source\nPositional Light"
ID_ACTION_SPOTLIGHT "Add a spotlight\nSpotlight"
diff --git a/win/System.cpp b/win/System.cpp
index 6406017..2c29db4 100644
--- a/win/System.cpp
+++ b/win/System.cpp
@@ -27,6 +27,7 @@
#include "LibDlg.h"
#include "EdGrpDlg.h"
#include "AboutDlg.h"
+#include "categdlg.h"
#include "cadbar.h"
#include "mainfrm.h"
@@ -1528,6 +1529,21 @@ bool SystemDoDialog(int nMode, void* param)
}
} break;
+ case LC_DLG_EDITCATEGORY:
+ {
+ CCategoryDlg Dlg;
+ LC_CATEGORYDLG_OPTS* Opts = (LC_CATEGORYDLG_OPTS*)param;
+
+ Dlg.m_Keywords = Opts->Keywords;
+ Dlg.m_Name = Opts->Name;
+
+ if (Dlg.DoModal() == IDOK)
+ {
+ Opts->Keywords = Dlg.m_Keywords;
+ Opts->Name = Dlg.m_Name;
+ }
+ } break;
+
case LC_DLG_ABOUT:
{
CAboutDlg dlg;
diff --git a/win/res/toolsbar.bmp b/win/res/toolsbar.bmp
index 721346d..84ad134 100644
--- a/win/res/toolsbar.bmp
+++ b/win/res/toolsbar.bmp
Binary files differ
diff --git a/win/resource.h b/win/resource.h
index f32e81e..19f4f51 100644
--- a/win/resource.h
+++ b/win/resource.h
@@ -458,8 +458,7 @@
#define ID_VIEW_STEP_PREVIOUS 32783
#define ID_VIEW_STEP_CHOOSE 32784
#define ID_VIEW_STEP_INSERT 32785
-#define ID_ACTION_SELECT 32788
-#define ID_ACTION_SELECT_REGION 32789
+#define ID_ACTION_SELECT 32789
#define ID_ACTION_INSERT 32790
#define ID_ACTION_LIGHT 32791
#define ID_ACTION_SPOTLIGHT 32792