Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Daveo 2000-11-07 22:41:57 +00:00
parent 68b6716e0d
commit 59484b9b75
6 changed files with 155 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
Utils/MapEdit/MainFrm.cpp
View File

@ -5,6 +5,7 @@
#include "MapEdit.h"
#include "MainFrm.h"
#include "ExToolBar.h"
#ifdef _DEBUG
#define new DEBUG_NEW
@ -49,18 +50,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
if (CMDIFrameWnd::OnCreate(lpCreateStruct) == -1) return -1;
EnableDocking(CBRS_ALIGN_ANY);
// ToolBar
if (!m_wndToolBar.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_TOP | CBRS_GRIPPER | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC) || !m_wndToolBar.LoadToolBar(IDR_MAINFRAME))
{
TRACE0("Failed to create toolbar\n");
return -1; // fail to create
}
m_wndToolBar.SetWindowText("ToolBar");
m_wndToolBar.EnableDocking(CBRS_ALIGN_ANY);
DockControlBar(&m_wndToolBar);
/*
// TileBar
if (!m_wndTileBar.Create(this,IDD_TILEBAR,(CBRS_TOP | CBRS_SIZE_DYNAMIC | CBRS_FLOAT_MULTI ),IDD_TILEBAR))
{
@ -71,7 +61,7 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
m_wndTileBar.EnableDocking( CBRS_ALIGN_TOP);
m_wndTileBar.SetWindowText("TileBar");
DockControlBar(&m_wndTileBar);
*/
// Status Bar
if (!m_wndStatusBar.Create(this) || !m_wndStatusBar.SetIndicators(indicators,sizeof(indicators)/sizeof(UINT)))
@ -90,6 +80,50 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
m_wndLayerBar.EnableDocking( CBRS_ALIGN_ANY);
m_wndLayerBar.SetWindowText("Layer");
DockControlBar(&m_wndLayerBar);
// ToolBar (plus extra code for extra controls!!)
if (!m_wndToolBar.CreateEx(this, TBSTYLE_FLAT, WS_CHILD | WS_VISIBLE | CBRS_TOP | CBRS_GRIPPER | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC) || !m_wndToolBar.LoadToolBar(IDR_MAINFRAME))
{
TRACE0("Failed to create toolbar\n");
return -1; // fail to create
}
m_wndToolBar.SetWindowText("ToolBar");
m_wndToolBar.EnableDocking(CBRS_ALIGN_ANY);
DockControlBar(&m_wndToolBar);
#define SNAP_WIDTH 80 //the width of the combo box
//set up the ComboBox control as a snap mode select box
//
//First get the index of the placeholder's position in the toolbar
int index = 0;
RECT rect;
while (m_wndToolBar.GetItemID(index)!=ID_TOOLBAR_COMBO) index++;
//next convert that button to a seperator and get its position
m_wndToolBar.SetButtonInfo(index, ID_TOOLBAR_COMBO, TBBS_SEPARATOR, SNAP_WIDTH);
m_wndToolBar.GetItemRect(index, &rect);
//expand the rectangle to allow the combo box room to drop down
rect.top+=2;
rect.bottom += 200;
// then .Create the combo box and show it
if (!m_wndToolBar.m_Combo.Create(WS_CHILD|WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS ,rect, &m_wndToolBar, IDC_TOOLBAR_COMBO))
{
TRACE0("Failed to create combo-box\n");
return FALSE;
}
m_wndToolBar.m_Combo.SetFont(m_wndToolBar.GetFont()); // Set to nice font (not playskool font!!)
m_wndToolBar.m_Combo.ShowWindow(SW_SHOW);
//fill the combo box
m_wndToolBar.m_Combo.AddString("SNAP OFF");
m_wndToolBar.m_Combo.AddString("SNAP GRID");
m_wndToolBar.m_Combo.AddString("SNAP RASTER");
m_wndToolBar.m_Combo.AddString("SNAP VERTEX");
m_wndToolBar.m_Combo.AddString("SNAP LINE");
m_wndToolBar.m_Combo.SetCurSel(0);
return 0;
}

9
Utils/MapEdit/MainFrm.h
View File

@ -5,11 +5,12 @@
#if !defined(AFX_MAINFRM_H__CEC14D79_A1F2_4281_AA53_544F0924E7D8__INCLUDED_)
#define AFX_MAINFRM_H__CEC14D79_A1F2_4281_AA53_544F0924E7D8__INCLUDED_
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
#include "ExToolbar.h"
class CMainFrame : public CMDIFrameWnd
{
DECLARE_DYNAMIC(CMainFrame)
@ -20,7 +21,7 @@ public:
public:
CToolBar *GetToolBar() {return(&m_wndToolBar);}
CDialogBar *GetLayerBar() {return(&m_wndLayerBar);}
CDialogBar *GetTileBar() {return(&m_wndTileBar);}
// CDialogBar *GetTileBar() {return(&m_wndTileBar);}
CStatusBar *GetStatusBar() {return(&m_wndStatusBar);}
// Operations
public:
@ -41,9 +42,9 @@ public:
protected: // control bar embedded members
CStatusBar m_wndStatusBar;
CToolBar m_wndToolBar;
CExToolBar m_wndToolBar;
CDialogBar m_wndLayerBar;
CDialogBar m_wndTileBar;
// CDialogBar m_wndTileBar;
// Generated message map functions
protected:

63
Utils/MapEdit/MapEdit.clw
View File

@ -2,13 +2,13 @@
[General Info]
Version=1
LastClass=CAboutDlg
LastTemplate=CDialog
LastClass=CExToolBar
LastTemplate=CToolBarCtrl
NewFileInclude1=#include "stdafx.h"
NewFileInclude2=#include "mapedit.h"
LastPage=0
ClassCount=8
ClassCount=9
Class1=CChildFrame
Class2=CGLEnabledView
Class3=CListBoxEx
@ -18,13 +18,16 @@ Class6=CAboutDlg
Class7=CMapEditDoc
Class8=CMapEditView
ResourceCount=6
ResourceCount=8
Resource1=IDR_MAPEDITYPE (English (U.S.))
Resource2=IDD_ABOUTBOX (English (U.S.))
Resource2=IDD_TILEBAR (English (U.S.))
Resource3=IDD_LAYERBAR1 (English (U.S.))
Resource4=IDD_LAYERBAR (English (U.S.))
Resource5=IDR_MAINFRAME (English (U.S.))
Resource6=IDD_TILEBAR (English (U.S.))
Resource4=IDR_TOOLBAR (English (U.S.))
Resource5=IDD_ABOUTBOX (English (U.S.))
Class9=CExToolBar
Resource6=IDD_LAYERBAR (English (U.S.))
Resource7=IDR_MAINFRAME (English (U.S.))
Resource8=IDD_TRASHHEAP
[CLS:CChildFrame]
Type=0
@ -92,21 +95,6 @@ VirtualFilter=VWC
Type=1
Class=CAboutDlg
[TB:IDR_MAINFRAME (English (U.S.))]
Type=1
Class=?
Command1=ID_FILE_NEW
Command2=ID_FILE_OPEN
Command3=ID_FILE_SAVE
Command4=ID_EDIT_CUT
Command5=ID_EDIT_COPY
Command6=ID_EDIT_PASTE
Command7=ID_FILE_PRINT
Command8=ID_APP_ABOUT
Command9=ID_TOOLBAR_LAYERBAR
Command10=ID_TOOLBAR_TILEPALETTE
CommandCount=10
[MNU:IDR_MAINFRAME (English (U.S.))]
Type=1
Class=?
@ -192,3 +180,32 @@ Class=?
ControlCount=1
Control1=IDC_LAYERBAR_LIST,listbox,1352728833
[TB:IDR_TOOLBAR (English (U.S.))]
Type=1
Class=?
Command1=ID_FILE_NEW
Command2=ID_FILE_OPEN
Command3=ID_FILE_SAVE
Command4=ID_EDIT_CUT
Command5=ID_EDIT_COPY
Command6=ID_EDIT_PASTE
Command7=ID_FILE_PRINT
Command8=ID_APP_ABOUT
Command9=ID_TOOLBAR_LAYERBAR
Command10=ID_TOOLBAR_TILEPALETTE
Command11=ID_TOOLBAR_COMBO
CommandCount=11
[DLG:IDD_TRASHHEAP]
Type=1
Class=?
ControlCount=1
Control1=IDC_TOOLBAR_COMBO,combobox,1344340226
[CLS:CExToolBar]
Type=0
HeaderFile=extoolbar.h
ImplementationFile=extoolbar.cpp
BaseClass=CToolBar
LastObject=CExToolBar

8
Utils/MapEdit/MapEdit.dsp
View File

@ -170,6 +170,10 @@ SOURCE=.\ChildFrm.cpp
# End Source File
# Begin Source File
SOURCE=.\ExToolbar.cpp
# End Source File
# Begin Source File
SOURCE=.\GLEnabledView.cpp
# End Source File
# Begin Source File
@ -207,6 +211,10 @@ SOURCE=.\ChildFrm.h
# End Source File
# Begin Source File
SOURCE=.\ExToolbar.h
# End Source File
# Begin Source File
SOURCE=.\gl3d.h
# End Source File
# Begin Source File

88
Utils/MapEdit/MapEdit.rc
View File

@ -36,14 +36,14 @@ IDR_MAPEDITYPE ICON DISCARDABLE "res\\MapEditDoc.ico"
// Bitmap
//
IDR_MAINFRAME BITMAP MOVEABLE PURE "res\\Toolbar.bmp"
IDR_TOOLBAR BITMAP MOVEABLE PURE "res\\Toolbar.bmp"
/////////////////////////////////////////////////////////////////////////////
//
// Toolbar
//
IDR_MAINFRAME TOOLBAR DISCARDABLE 16, 15
IDR_TOOLBAR TOOLBAR DISCARDABLE 16, 15
BEGIN
BUTTON ID_FILE_NEW
BUTTON ID_FILE_OPEN
@ -59,6 +59,8 @@ BEGIN
SEPARATOR
BUTTON ID_TOOLBAR_LAYERBAR
BUTTON ID_TOOLBAR_TILEPALETTE
SEPARATOR
BUTTON ID_TOOLBAR_COMBO
END
@ -185,15 +187,6 @@ BEGIN
WS_VSCROLL | WS_TABSTOP
END
IDD_TILEBAR DIALOGEX 0, 0, 186, 12
STYLE WS_CHILD
EXSTYLE WS_EX_TOOLWINDOW
FONT 8, "MS Sans Serif"
BEGIN
COMBOBOX IDC_TILETOOLBAR_COMBO,0,0,170,14,CBS_DROPDOWNLIST |
CBS_SORT | WS_VSCROLL | WS_TABSTOP
END
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
@ -216,8 +209,9 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904B0"
BLOCK "040904b0"
BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "\0"
VALUE "FileDescription", "MapEdit MFC Application\0"
VALUE "FileVersion", "1, 0, 0, 1\0"
@ -225,8 +219,10 @@ BEGIN
VALUE "LegalCopyright", "Copyright (C) 2000\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "MapEdit.EXE\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MapEdit Application\0"
VALUE "ProductVersion", "1, 0, 0, 1\0"
VALUE "SpecialBuild", "\0"
END
END
BLOCK "VarFileInfo"
@ -261,39 +257,10 @@ BEGIN
TOPMARGIN, 7
BOTTOMMARGIN, 85
END
IDD_TILEBAR, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 179
TOPMARGIN, 7
BOTTOMMARGIN, 5
END
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Dialog Info
//
IDD_TILEBAR DLGINIT
BEGIN
IDC_TILETOOLBAR_COMBO, 0x403, 2, 0
0x0031,
IDC_TILETOOLBAR_COMBO, 0x403, 2, 0
0x0032,
IDC_TILETOOLBAR_COMBO, 0x403, 2, 0
0x0033,
IDC_TILETOOLBAR_COMBO, 0x403, 2, 0
0x0034,
IDC_TILETOOLBAR_COMBO, 0x403, 2, 0
0x0035,
0
END
/////////////////////////////////////////////////////////////////////////////
//
// String Table
@ -435,6 +402,11 @@ BEGIN
IDC_LAYERBAR_DOWN "Move Layer Down List"
END
STRINGTABLE DISCARDABLE
BEGIN
IDC_TOOLBAR_COMBO "TileSet Chooser\nWee Wee Wee"
END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
@ -448,6 +420,40 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_TRASHHEAP DIALOG DISCARDABLE 0, 0, 186, 95
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Dialog"
FONT 8, "MS Sans Serif"
BEGIN
COMBOBOX IDC_TOOLBAR_COMBO,7,7,87,34,CBS_DROPDOWN | CBS_SORT |
WS_VSCROLL | WS_TABSTOP
END
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_TRASHHEAP, DIALOG
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 179
TOPMARGIN, 7
BOTTOMMARGIN, 88
END
END
#endif // APSTUDIO_INVOKED
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//

12
Utils/MapEdit/resource.h
View File

@ -5,17 +5,21 @@
#define IDD_ABOUTBOX 100
#define IDD_LAYERBAR 103
#define IDD_TILETOOLBAR 104
#define IDD_TILEBAR 104
#define IDR_MAINFRAME 128
#define IDR_TOOLBAR 128
#define IDR_MAPEDITYPE 129
#define IDD_TRASHHEAP 142
#define IDC_LAYERBAR_NEW 1000
#define IDC_LAYERBAR_DELETE 1001
#define IDC_LAYERBAR_UP 1002
#define IDC_LAYERBAR_DOWN 1003
#define IDC_LAYERBAR_LIST 1011
#define IDC_TILETOOLBAR_COMBO 1013
#define IDC_TOOLBAR_COMBO 1018
#define ID_TOOLBAR_LAYERBAR 32773
#define ID_TOOLBAR_TILEPALETTE 32774
#define ID_TOOLBAR_COMBO 32777
#define ID_TOOLBAR_COMBOx 32777
#define ID_INDICATOR_CURSORXY 59142
// Next default values for new objects
@ -23,9 +27,9 @@
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 142
#define _APS_NEXT_COMMAND_VALUE 32775
#define _APS_NEXT_CONTROL_VALUE 1018
#define _APS_NEXT_RESOURCE_VALUE 143
#define _APS_NEXT_COMMAND_VALUE 32783
#define _APS_NEXT_CONTROL_VALUE 1019
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif