diff --git a/win/LeoCAD.rc b/win/LeoCAD.rc index 73b55508..9f284412 100644 --- a/win/LeoCAD.rc +++ b/win/LeoCAD.rc @@ -361,13 +361,13 @@ BEGIN MENUITEM "Remove Category...", ID_PIECEBAR_REMOVECATEGORY MENUITEM "Edit Category...", ID_PIECEBAR_EDITCATEGORY MENUITEM SEPARATOR - MENUITEM "Show Numbers", ID_PIECEBAR_NUMBERS MENUITEM "Show Subparts", ID_PIECEBAR_SUBPARTS MENUITEM SEPARATOR MENUITEM "Standard", ID_VIEW_TOOLBAR MENUITEM "Drawing", ID_VIEW_TOOLS_BAR MENUITEM "Animation", ID_VIEW_ANIMATION_BAR MENUITEM "Pieces", ID_VIEW_PIECES_BAR + MENUITEM "Properties", ID_VIEW_PROPERTIES_BAR MENUITEM "Status Bar", ID_VIEW_STATUS_BAR END POPUP "1" @@ -823,124 +823,121 @@ BEGIN PUSHBUTTON "Cancel",IDCANCEL,122,24,41,14 END -IDD_PREFGENERAL DIALOG 0, 0, 245, 132 +IDD_PREFGENERAL DIALOGEX 0, 0, 285, 160 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "General" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - GROUPBOX "Saving",IDC_STATIC,7,7,130,70 - CONTROL "Autosave every",IDC_GENDLG_AUTOSAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,19,63,8 - EDITTEXT IDC_GENDLG_SAVETIME,77,18,20,12,ES_AUTOHSCROLL - LTEXT "minutes",IDC_STATIC,101,19,24,8 - CONTROL "Create backups",IDC_GENDLG_BACKUP,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,12,35,65,8 - LTEXT "Default projects folder:",IDC_STATIC,12,47,72,8 - EDITTEXT IDC_GENDLG_FOLDER,12,59,105,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_GENDLG_FOLDERBTN,121,59,8,10 - LTEXT "Default user:",IDC_STATIC,11,85,44,8 - EDITTEXT IDC_GENDLG_USER,57,83,75,12,ES_AUTOHSCROLL - LTEXT "Mouse sensitivity",IDC_STATIC,11,100,59,8 - CONTROL "Slider1",IDC_GENDLG_MOUSE,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,76,99,31,10 - GROUPBOX "Pieces Toolbar",IDC_STATIC,146,7,92,70 - CONTROL "Show sub-pieces",IDC_GENDLG_SUBPARTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,19,81,8 - CONTROL "Show piece numbers",IDC_GENDLG_NUMBERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,32,81,8 - CONTROL "Check for updates on startup",IDC_GENDLG_UPDATES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,113,119,8 + GROUPBOX "Saving",IDC_STATIC,10,10,265,81 + CONTROL "Autosave every",IDC_GENDLG_AUTOSAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,27,63,8 + EDITTEXT IDC_GENDLG_SAVETIME,85,26,24,12,ES_AUTOHSCROLL + LTEXT "minutes",IDC_STATIC,115,27,24,8 + CONTROL "Create backups",IDC_GENDLG_BACKUP,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,18,43,65,8 + LTEXT "Default projects folder:",IDC_STATIC,18,59,72,8 + EDITTEXT IDC_GENDLG_FOLDER,18,71,110,12,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_GENDLG_FOLDERBTN,131,69,10,14 + LTEXT "Default author name:",IDC_STATIC,18,100,72,8 + EDITTEXT IDC_GENDLG_USER,96,99,123,12,ES_AUTOHSCROLL + LTEXT "Mouse sensitivity",IDC_STATIC,17,118,59,8 + CONTROL "Slider1",IDC_GENDLG_MOUSE,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,96,116,50,12 + CONTROL "Check for updates on startup",IDC_GENDLG_UPDATES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,136,119,8 END -IDD_PREFDRAWING DIALOG 0, 0, 240, 114 +IDD_PREFDRAWING DIALOGEX 0, 0, 285, 160 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Drawing Aids" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - CONTROL "Base grid",IDC_AIDDLG_GRID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,41,8 - EDITTEXT IDC_AIDDLG_GRIDSIZE,52,6,20,10,ES_AUTOHSCROLL - LTEXT "units",IDC_STATIC,76,7,16,8 - CONTROL "Axis icon",IDC_AIDDLG_AXIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,20,42,8 - CONTROL "Centimeter units",IDC_AIDDLG_CENTIMETERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,33,70,8 - CONTROL "Snap X",IDC_AIDDLG_SNAPX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,46,42,8 - CONTROL "Snap Y",IDC_AIDDLG_SNAPY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,59,42,8 - CONTROL "Snap Z",IDC_AIDDLG_SNAPZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,42,8 - CONTROL "Angle snap",IDC_AIDDLG_SNAPA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,85,49,8 - EDITTEXT IDC_AIDDLG_ANGLE,57,84,20,10,ES_AUTOHSCROLL - LTEXT "degrees",IDC_STATIC,79,85,27,8 - CONTROL "Don't allow relative snap",IDC_AIDDLG_GLOBAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,122,7,111,8 - CONTROL "Switch to move after inserting",IDC_AIDDLG_MOVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,122,20,111,8 - CONTROL "Fixed direction keys",IDC_AIDDLG_FIXEDKEYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,122,33,111,8 - CONTROL "Lock X",IDC_AIDDLG_LOCKX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,122,46,111,8 - CONTROL "Lock Y",IDC_AIDDLG_LOCKY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,122,59,111,8 - CONTROL "Lock Z",IDC_AIDDLG_LOCKZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,122,72,111,8 + CONTROL "Base grid",IDC_AIDDLG_GRID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,11,41,8 + EDITTEXT IDC_AIDDLG_GRIDSIZE,54,10,24,12,ES_AUTOHSCROLL + LTEXT "units",IDC_STATIC,81,11,16,8 + CONTROL "Show axis icon",IDC_AIDDLG_AXIS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,27,120,8 + CONTROL "Centimeter units",IDC_AIDDLG_CENTIMETERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,43,130,8 + CONTROL "Snap X",IDC_AIDDLG_SNAPX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,59,130,8 + CONTROL "Snap Y",IDC_AIDDLG_SNAPY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,75,42,8 + CONTROL "Snap Z",IDC_AIDDLG_SNAPZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,91,42,8 + CONTROL "Angle snap",IDC_AIDDLG_SNAPA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,107,49,8 + EDITTEXT IDC_AIDDLG_ANGLE,63,105,24,12,ES_AUTOHSCROLL + LTEXT "degrees",IDC_STATIC,91,107,27,8 + CONTROL "Don't allow relative snap",IDC_AIDDLG_GLOBAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,11,130,8 + CONTROL "Switch to move after inserting",IDC_AIDDLG_MOVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,27,130,8 + CONTROL "Fixed direction keys",IDC_AIDDLG_FIXEDKEYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,43,130,8 + CONTROL "Lock X",IDC_AIDDLG_LOCKX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,59,130,8 + CONTROL "Lock Y",IDC_AIDDLG_LOCKY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,75,130,8 + CONTROL "Lock Z",IDC_AIDDLG_LOCKZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,91,130,8 END -IDD_PREFDETAIL DIALOG 0, 0, 245, 183 +IDD_PREFDETAIL DIALOGEX 0, 0, 285, 160 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Render" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - CONTROL "Draw edges",IDC_DETDLG_EDGES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,7,120,8 - CONTROL "Lighting",IDC_DETDLG_LIGHTING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,21,120,8 - CONTROL "Smooth shading",IDC_DETDLG_SMOOTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,35,120,8 - CONTROL "Anti-aliasing",IDC_DETDLG_ANTIALIAS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,49,120,8 - CONTROL "Fast rendering",IDC_DETDLG_FAST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,63,120,8 - LTEXT "Line width",IDC_STATIC,7,93,34,8 - EDITTEXT IDC_DETDLG_LINE,49,91,26,12,ES_AUTOHSCROLL + CONTROL "Draw edge lines",IDC_DETDLG_EDGES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,11,130,8 + CONTROL "Enable lighting",IDC_DETDLG_LIGHTING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,27,130,8 + CONTROL "Smooth shading",IDC_DETDLG_SMOOTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,43,130,8 + CONTROL "Anti-aliasing",IDC_DETDLG_ANTIALIAS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,59,130,8 + CONTROL "Fast rendering",IDC_DETDLG_FAST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,75,130,8 + LTEXT "Line width",IDC_STATIC,10,91,34,8 + EDITTEXT IDC_DETDLG_LINE,50,89,26,12,ES_AUTOHSCROLL END -IDD_PREFSCENE DIALOG 0, 0, 240, 114 +IDD_PREFSCENE DIALOGEX 0, 0, 285, 160 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Scene" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - GROUPBOX "Background",IDC_STATIC,7,7,140,99 - CONTROL "Solid Color",IDC_SCNDLG_SOLID,"Button",BS_AUTORADIOBUTTON | WS_GROUP,18,20,49,8 - CONTROL "Gradient",IDC_SCNDLG_GRADIENT,"Button",BS_AUTORADIOBUTTON,18,36,42,8 - CONTROL "Image",IDC_SCNDLG_IMAGE,"Button",BS_AUTORADIOBUTTON,18,52,42,8 - PUSHBUTTON "",IDC_SCNDLG_BGCOLOR,71,17,20,12,BS_BITMAP - PUSHBUTTON "",IDC_SCNDLG_GRAD1,71,34,20,12,BS_BITMAP - PUSHBUTTON "",IDC_SCNDLG_GRAD2,98,34,20,12,BS_BITMAP - CONTROL "Tile",IDC_SCNDLG_BGTILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,68,27,8 - EDITTEXT IDC_SCNDLG_BGIMAGE,24,84,107,10,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_SCNDLG_BGIMAGE_BROWSE,134,84,8,10 - GROUPBOX "Environment",IDC_STATIC,156,7,77,99 - CONTROL "Fog",IDC_SCNDLG_FOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,20,27,8 - PUSHBUTTON "",IDC_SCNDLG_FOGCOLOR,203,18,20,12,BS_BITMAP - LTEXT "Density",IDC_STATIC,173,36,25,8 - EDITTEXT IDC_SCNDLG_FOGDENSITY,203,35,20,10,ES_AUTOHSCROLL - LTEXT "Ambient light",IDC_STATIC,160,53,42,8 - PUSHBUTTON "",IDC_SCNDLG_AMBIENTLIGHT,203,51,20,12,BS_BITMAP - CONTROL "Draw Floor",IDC_SCNDLG_TERRAIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,75,62,8 + GROUPBOX "Background",IDC_STATIC,10,10,130,140 + CONTROL "Solid Color",IDC_SCNDLG_SOLID,"Button",BS_AUTORADIOBUTTON | WS_GROUP,18,27,49,8 + CONTROL "Gradient",IDC_SCNDLG_GRADIENT,"Button",BS_AUTORADIOBUTTON,18,49,42,8 + CONTROL "Image",IDC_SCNDLG_IMAGE,"Button",BS_AUTORADIOBUTTON,18,71,42,8 + PUSHBUTTON "",IDC_SCNDLG_BGCOLOR,71,23,30,16,BS_BITMAP + PUSHBUTTON "",IDC_SCNDLG_GRAD1,71,45,30,16,BS_BITMAP + PUSHBUTTON "",IDC_SCNDLG_GRAD2,104,45,30,16,BS_BITMAP + CONTROL "Tile",IDC_SCNDLG_BGTILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,111,96,8 + EDITTEXT IDC_SCNDLG_BGIMAGE,25,89,96,12,ES_AUTOHSCROLL + PUSHBUTTON "...",IDC_SCNDLG_BGIMAGE_BROWSE,123,88,10,14 + GROUPBOX "Environment",IDC_STATIC,150,10,125,140 + CONTROL "Fog",IDC_SCNDLG_FOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,27,49,8 + PUSHBUTTON "",IDC_SCNDLG_FOGCOLOR,217,23,30,16,BS_BITMAP + LTEXT "Density",IDC_STATIC,172,49,25,8 + EDITTEXT IDC_SCNDLG_FOGDENSITY,219,47,26,12,ES_AUTOHSCROLL + LTEXT "Ambient light",IDC_STATIC,159,71,42,8 + PUSHBUTTON "",IDC_SCNDLG_AMBIENTLIGHT,217,67,30,16,BS_BITMAP + CONTROL "Draw Floor",IDC_SCNDLG_TERRAIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,91,49,8 END -IDD_PREFPRINT DIALOG 0, 0, 240, 114 +IDD_PREFPRINT DIALOGEX 0, 0, 285, 160 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Print" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - LTEXT "Rows",IDC_STATIC,16,19,27,8 - EDITTEXT IDC_PRNDLG_INST_ROWS,48,18,20,10,ES_AUTOHSCROLL - LTEXT "Columns",IDC_STATIC,16,36,27,8 - EDITTEXT IDC_PRNDLG_INST_COLS,48,35,20,10,ES_AUTOHSCROLL - LTEXT "Header",IDC_STATIC,74,19,24,8 - EDITTEXT IDC_PRNDLG_HEADER,100,18,67,10,ES_AUTOHSCROLL - PUSHBUTTON "",IDC_PRNDLG_HEADERBTN,169,18,8,10,BS_BITMAP - LTEXT "Footer",IDC_STATIC,74,36,24,8 - EDITTEXT IDC_PRNDLG_FOOTER,100,35,67,10,ES_AUTOHSCROLL - PUSHBUTTON "",IDC_PRNDLG_FOOTERBTN,169,35,8,10,BS_BITMAP - CONTROL "Numbers",IDC_PRNDLG_NUMBERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,19,40,8 - CONTROL "Border",IDC_PRNDLG_BORDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,187,36,40,8 - GROUPBOX "Instructions",IDC_STATIC,7,7,226,47 - GROUPBOX "Catalog",IDC_STATIC,7,59,77,47 - LTEXT "Rows",IDC_STATIC,16,71,27,8 - EDITTEXT IDC_PRNDLG_CAT_ROWS,48,70,20,10,ES_AUTOHSCROLL - LTEXT "Columns",IDC_STATIC,16,88,27,8 - EDITTEXT IDC_PRNDLG_CAT_COLS,48,87,20,10,ES_AUTOHSCROLL - GROUPBOX "Margins (inches)",IDC_STATIC,109,59,124,47,WS_GROUP - LTEXT "&Left:",IDC_STATIC,120,72,24,8 - EDITTEXT IDC_PRNDLG_MARGIN_LEFT,147,71,20,10,ES_AUTOHSCROLL - LTEXT "&Right:",IDC_STATIC,176,72,24,8 - EDITTEXT IDC_PRNDLG_MARGIN_RIGHT,203,71,20,10,ES_AUTOHSCROLL - LTEXT "&Top:",IDC_STATIC,120,89,24,8 - EDITTEXT IDC_PRNDLG_MARGIN_TOP,147,88,20,10,ES_AUTOHSCROLL - LTEXT "&Bottom:",IDC_STATIC,176,89,24,8 - EDITTEXT IDC_PRNDLG_MARGIN_BOTTOM,203,88,20,10,ES_AUTOHSCROLL + LTEXT "Rows",IDC_STATIC,24,30,27,8 + EDITTEXT IDC_PRNDLG_INST_ROWS,62,28,28,12,ES_AUTOHSCROLL + LTEXT "Columns",IDC_STATIC,24,49,27,8 + EDITTEXT IDC_PRNDLG_INST_COLS,62,48,28,12,ES_AUTOHSCROLL + LTEXT "Header",IDC_STATIC,103,30,24,8 + EDITTEXT IDC_PRNDLG_HEADER,131,28,67,12,ES_AUTOHSCROLL + PUSHBUTTON "",IDC_PRNDLG_HEADERBTN,201,28,10,12,BS_BITMAP + LTEXT "Footer",IDC_STATIC,103,49,24,8 + EDITTEXT IDC_PRNDLG_FOOTER,131,47,67,12,ES_AUTOHSCROLL + PUSHBUTTON "",IDC_PRNDLG_FOOTERBTN,201,47,10,12,BS_BITMAP + CONTROL "Numbers",IDC_PRNDLG_NUMBERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,225,30,40,8 + CONTROL "Border",IDC_PRNDLG_BORDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,225,49,40,8 + GROUPBOX "Instructions",IDC_STATIC,10,10,265,65 + GROUPBOX "Catalog",IDC_STATIC,10,85,100,65 + LTEXT "Rows",IDC_STATIC,24,106,27,8 + EDITTEXT IDC_PRNDLG_CAT_ROWS,62,104,28,12,ES_AUTOHSCROLL + LTEXT "Columns",IDC_STATIC,24,126,27,8 + EDITTEXT IDC_PRNDLG_CAT_COLS,62,124,28,12,ES_AUTOHSCROLL + GROUPBOX "Margins (inches)",IDC_STATIC,120,85,155,65,WS_GROUP + LTEXT "&Left:",IDC_STATIC,132,106,24,8 + EDITTEXT IDC_PRNDLG_MARGIN_LEFT,160,104,28,12,ES_AUTOHSCROLL + LTEXT "&Right:",IDC_STATIC,207,106,24,8 + EDITTEXT IDC_PRNDLG_MARGIN_RIGHT,235,104,28,12,ES_AUTOHSCROLL + LTEXT "&Top:",IDC_STATIC,132,126,24,8 + EDITTEXT IDC_PRNDLG_MARGIN_TOP,160,124,28,12,ES_AUTOHSCROLL + LTEXT "&Bottom:",IDC_STATIC,207,126,24,8 + EDITTEXT IDC_PRNDLG_MARGIN_BOTTOM,235,124,28,12,ES_AUTOHSCROLL END IDD_OPENDLG_TEMPLATE DIALOGEX 0, 0, 77, 99 @@ -1118,23 +1115,23 @@ BEGIN PUSHBUTTON "Remove",ID_LIBTEX_REMOVE,169,41,50,14 END -IDD_PREFKEYBOARD DIALOG 0, 0, 246, 132 +IDD_PREFKEYBOARD DIALOGEX 0, 0, 285, 160 STYLE DS_SETFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Keyboard" -FONT 8, "MS Sans Serif" +FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN - LISTBOX IDC_KEYDLG_CMDLIST,7,7,85,113,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - LTEXT "Current shortcuts:",IDC_STATIC,100,7,82,8 - COMBOBOX IDC_KEYDLG_COMBO,100,19,90,40,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Remove",IDC_KEYDLG_REMOVE,197,18,42,14,WS_DISABLED - LTEXT "Press new shortcut:",IDC_STATIC,100,35,59,9 - EDITTEXT IDC_KEYDLG_KEYEDIT,100,47,90,12,ES_AUTOHSCROLL - PUSHBUTTON "Assign",IDC_KEYDLG_ASSIGN,197,46,42,14,WS_DISABLED - EDITTEXT IDC_KEYDLG_FILENAME,100,88,139,12,ES_AUTOHSCROLL - PUSHBUTTON "Save...",IDC_KEYDLG_SAVE,100,106,42,14 - PUSHBUTTON "Load...",IDC_KEYDLG_LOAD,148,106,42,14 - PUSHBUTTON "Reset",IDC_KEYDLG_RESET,197,106,42,14 - LTEXT "Shortcuts File:",IDC_STATIC,100,76,139,8 + LISTBOX IDC_KEYDLG_CMDLIST,10,10,95,140,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + LTEXT "Current shortcuts:",IDC_STATIC,120,10,82,8 + COMBOBOX IDC_KEYDLG_COMBO,120,22,100,40,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Remove",IDC_KEYDLG_REMOVE,227,20,48,16,WS_DISABLED + LTEXT "Press new shortcut:",IDC_STATIC,120,42,89,8 + EDITTEXT IDC_KEYDLG_KEYEDIT,120,54,100,12,ES_AUTOHSCROLL + PUSHBUTTON "Assign",IDC_KEYDLG_ASSIGN,227,52,48,16,WS_DISABLED + EDITTEXT IDC_KEYDLG_FILENAME,120,114,155,12,ES_AUTOHSCROLL + PUSHBUTTON "Save...",IDC_KEYDLG_SAVE,120,134,48,16 + PUSHBUTTON "Load...",IDC_KEYDLG_LOAD,173,134,48,16 + PUSHBUTTON "Reset",IDC_KEYDLG_RESET,227,134,48,16 + LTEXT "Shortcuts File:",IDC_STATIC,120,102,154,8 END IDD_TRANSFORM DIALOG 0, 0, 249, 84 @@ -1311,42 +1308,42 @@ BEGIN IDD_PREFGENERAL, DIALOG BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 238 - TOPMARGIN, 7 - BOTTOMMARGIN, 124 + LEFTMARGIN, 10 + RIGHTMARGIN, 275 + TOPMARGIN, 10 + BOTTOMMARGIN, 150 END IDD_PREFDRAWING, DIALOG BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 233 - TOPMARGIN, 7 - BOTTOMMARGIN, 106 + LEFTMARGIN, 10 + RIGHTMARGIN, 275 + TOPMARGIN, 10 + BOTTOMMARGIN, 150 END IDD_PREFDETAIL, DIALOG BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 233 - TOPMARGIN, 7 - BOTTOMMARGIN, 106 + LEFTMARGIN, 10 + RIGHTMARGIN, 275 + TOPMARGIN, 10 + BOTTOMMARGIN, 150 END IDD_PREFSCENE, DIALOG BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 233 - TOPMARGIN, 7 - BOTTOMMARGIN, 106 + LEFTMARGIN, 10 + RIGHTMARGIN, 275 + TOPMARGIN, 10 + BOTTOMMARGIN, 150 END IDD_PREFPRINT, DIALOG BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 233 - TOPMARGIN, 7 - BOTTOMMARGIN, 106 + LEFTMARGIN, 10 + RIGHTMARGIN, 275 + TOPMARGIN, 10 + BOTTOMMARGIN, 150 END IDD_IMAGE, DIALOG @@ -1415,10 +1412,10 @@ BEGIN IDD_PREFKEYBOARD, DIALOG BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 239 - TOPMARGIN, 7 - BOTTOMMARGIN, 124 + LEFTMARGIN, 10 + RIGHTMARGIN, 275 + TOPMARGIN, 10 + BOTTOMMARGIN, 150 END IDD_TRANSFORM, DIALOG diff --git a/win/Mainfrm.cpp b/win/Mainfrm.cpp index 8e21470e..9b21248c 100644 --- a/win/Mainfrm.cpp +++ b/win/Mainfrm.cpp @@ -536,7 +536,6 @@ LONG CMainFrame::UpdateSettings(UINT /*lParam*/, LONG /*wParam*/) { int i = theApp.GetProfileInt("Settings", "Piecebar Options", 0); m_wndPiecesBar.m_bSubParts = (i & PIECEBAR_SUBPARTS) != 0; - m_wndPiecesBar.m_bNumbers = (i & PIECEBAR_PARTNUMBERS) != 0; RECT rc; m_wndPiecesBar.GetClientRect(&rc); @@ -566,10 +565,6 @@ void CMainFrame::OnPieceBar(UINT nID) { switch (nID) { - case ID_PIECEBAR_NUMBERS: - { - m_wndPiecesBar.m_bNumbers = !m_wndPiecesBar.m_bNumbers; - } break; case ID_PIECEBAR_SUBPARTS: { m_wndPiecesBar.m_bSubParts = !m_wndPiecesBar.m_bSubParts; @@ -589,7 +584,6 @@ void CMainFrame::OnPieceBar(UINT nID) UINT u = 0; if (m_wndPiecesBar.m_bSubParts) u |= PIECEBAR_SUBPARTS; - if (m_wndPiecesBar.m_bNumbers) u |= PIECEBAR_PARTNUMBERS; theApp.WriteProfileInt("Settings", "Piecebar Options", u); } @@ -597,8 +591,6 @@ void CMainFrame::OnUpdatePieceBar(CCmdUI* pCmdUI) { switch (pCmdUI->m_nID) { - case ID_PIECEBAR_NUMBERS: - pCmdUI->SetCheck(m_wndPiecesBar.m_bNumbers); break; case ID_PIECEBAR_SUBPARTS: pCmdUI->SetCheck(m_wndPiecesBar.m_bSubParts); break; } diff --git a/win/Piecebar.cpp b/win/Piecebar.cpp index 41c56075..c9df8291 100644 --- a/win/Piecebar.cpp +++ b/win/Piecebar.cpp @@ -48,7 +48,6 @@ CPiecesBar::CPiecesBar() { int i = AfxGetApp()->GetProfileInt("Settings", "Piecebar Options", 0); m_bSubParts = (i & PIECEBAR_SUBPARTS) != 0; - m_bNumbers = (i & PIECEBAR_PARTNUMBERS) != 0; m_nPreviewHeight = AfxGetApp()->GetProfileInt("Settings", "Preview Height", 93); } diff --git a/win/Piecebar.h b/win/Piecebar.h index c054ed84..c2d6a8f6 100644 --- a/win/Piecebar.h +++ b/win/Piecebar.h @@ -41,7 +41,6 @@ protected: public: BOOL m_bSubParts; - BOOL m_bNumbers; int m_nPreviewHeight; CPiecePreview m_wndPiecePreview; diff --git a/win/Prefpage.cpp b/win/Prefpage.cpp index a98a7bc7..9e4d2545 100644 --- a/win/Prefpage.cpp +++ b/win/Prefpage.cpp @@ -29,7 +29,6 @@ CPreferencesGeneral::CPreferencesGeneral() : CPropertyPage(CPreferencesGeneral:: //{{AFX_DATA_INIT(CPreferencesGeneral) m_bSubparts = FALSE; m_nSaveTime = 0; - m_bNumbers = FALSE; m_strFolder = _T(""); m_bAutoSave = FALSE; m_strUser = _T(""); @@ -46,10 +45,8 @@ void CPreferencesGeneral::DoDataExchange(CDataExchange* pDX) CPropertyPage::DoDataExchange(pDX); //{{AFX_DATA_MAP(CPreferencesGeneral) DDX_Control(pDX, IDC_GENDLG_MOUSE, m_ctlMouse); - DDX_Check(pDX, IDC_GENDLG_SUBPARTS, m_bSubparts); DDX_Text(pDX, IDC_GENDLG_SAVETIME, m_nSaveTime); DDV_MinMaxInt(pDX, m_nSaveTime, 1, 60); - DDX_Check(pDX, IDC_GENDLG_NUMBERS, m_bNumbers); DDX_Text(pDX, IDC_GENDLG_FOLDER, m_strFolder); DDX_Check(pDX, IDC_GENDLG_AUTOSAVE, m_bAutoSave); DDX_Text(pDX, IDC_GENDLG_USER, m_strUser); @@ -87,7 +84,6 @@ void CPreferencesGeneral::SetOptions(int nSaveInterval, int nMouse, const char* m_Updates = AfxGetApp()->GetProfileInt("Settings", "CheckUpdates", 1); int i = AfxGetApp()->GetProfileInt("Settings", "Piecebar Options", 0); m_bSubparts = (i & PIECEBAR_SUBPARTS) != 0; - m_bNumbers = (i & PIECEBAR_PARTNUMBERS) != 0; } void CPreferencesGeneral::GetOptions(int* nSaveTime, int* nMouse, char* strFolder, char* strUser) @@ -100,7 +96,6 @@ void CPreferencesGeneral::GetOptions(int* nSaveTime, int* nMouse, char* strFolde int i = 0; if (m_bSubparts) i |= PIECEBAR_SUBPARTS; - if (m_bNumbers) i |= PIECEBAR_PARTNUMBERS; AfxGetApp()->WriteProfileInt("Settings", "Piecebar Options", i); AfxGetApp()->WriteProfileInt("Settings", "CheckUpdates", m_Updates); @@ -333,6 +328,8 @@ BEGIN_MESSAGE_MAP(CPreferencesScene, CPropertyPage) //}}AFX_MSG_MAP END_MESSAGE_MAP() +#define COLOR_BTN_WIDTH 30 +#define COLOR_BTN_HEIGHT 14 void CPreferencesScene::OnBackgroundBrowse() { @@ -352,7 +349,7 @@ void CPreferencesScene::OnBackgroundColor() if (dlg.DoModal() == IDOK) { m_crBackground = dlg.GetColor(); - DeleteObject(m_btnBackground.SetBitmap(CreateColorBitmap (20, 10, m_crBackground))); + DeleteObject(m_btnBackground.SetBitmap(CreateColorBitmap(COLOR_BTN_WIDTH, COLOR_BTN_HEIGHT, m_crBackground))); } } @@ -362,7 +359,7 @@ void CPreferencesScene::OnAmbientLight() if (dlg.DoModal() == IDOK) { m_crAmbient = dlg.GetColor(); - DeleteObject(m_btnAmbient.SetBitmap(CreateColorBitmap (20, 10, m_crAmbient))); + DeleteObject(m_btnAmbient.SetBitmap(CreateColorBitmap(COLOR_BTN_WIDTH, COLOR_BTN_HEIGHT, m_crAmbient))); } } @@ -372,7 +369,7 @@ void CPreferencesScene::OnFogColor() if (dlg.DoModal() == IDOK) { m_crFog = dlg.GetColor(); - DeleteObject(m_btnFog.SetBitmap(CreateColorBitmap (20, 10, m_crFog))); + DeleteObject(m_btnFog.SetBitmap(CreateColorBitmap(COLOR_BTN_WIDTH, COLOR_BTN_HEIGHT, m_crFog))); } } @@ -382,7 +379,7 @@ void CPreferencesScene::OnGradColor1() if (dlg.DoModal() == IDOK) { m_crGrad1 = dlg.GetColor(); - DeleteObject(m_btnGrad1.SetBitmap(CreateColorBitmap (20, 10, m_crGrad1))); + DeleteObject(m_btnGrad1.SetBitmap(CreateColorBitmap(COLOR_BTN_WIDTH, COLOR_BTN_HEIGHT, m_crGrad1))); } } @@ -392,7 +389,7 @@ void CPreferencesScene::OnGradColor2() if (dlg.DoModal() == IDOK) { m_crGrad2 = dlg.GetColor(); - DeleteObject(m_btnGrad2.SetBitmap(CreateColorBitmap (20, 10, m_crGrad2))); + DeleteObject(m_btnGrad2.SetBitmap(CreateColorBitmap(COLOR_BTN_WIDTH, COLOR_BTN_HEIGHT, m_crGrad2))); } } @@ -400,11 +397,11 @@ BOOL CPreferencesScene::OnInitDialog() { CPropertyPage::OnInitDialog(); - m_btnAmbient.SetBitmap(CreateColorBitmap (20, 10, m_crAmbient)); - m_btnBackground.SetBitmap(CreateColorBitmap (20, 10, m_crBackground)); - m_btnFog.SetBitmap(CreateColorBitmap (20, 10, m_crFog)); - m_btnGrad1.SetBitmap(CreateColorBitmap (20, 10, m_crGrad1)); - m_btnGrad2.SetBitmap(CreateColorBitmap (20, 10, m_crGrad2)); + m_btnAmbient.SetBitmap(CreateColorBitmap(COLOR_BTN_WIDTH, COLOR_BTN_HEIGHT, m_crAmbient)); + m_btnBackground.SetBitmap(CreateColorBitmap(COLOR_BTN_WIDTH, COLOR_BTN_HEIGHT, m_crBackground)); + m_btnFog.SetBitmap(CreateColorBitmap(COLOR_BTN_WIDTH, COLOR_BTN_HEIGHT, m_crFog)); + m_btnGrad1.SetBitmap(CreateColorBitmap(COLOR_BTN_WIDTH, COLOR_BTN_HEIGHT, m_crGrad1)); + m_btnGrad2.SetBitmap(CreateColorBitmap(COLOR_BTN_WIDTH, COLOR_BTN_HEIGHT, m_crGrad2)); return TRUE; } diff --git a/win/Prefpage.h b/win/Prefpage.h index c5a26fea..19f04fb0 100644 --- a/win/Prefpage.h +++ b/win/Prefpage.h @@ -26,7 +26,6 @@ public: CSliderCtrl m_ctlMouse; BOOL m_bSubparts; int m_nSaveTime; - BOOL m_bNumbers; CString m_strFolder; BOOL m_bAutoSave; CString m_bUser; diff --git a/win/Stdafx.h b/win/Stdafx.h index 811a0bfe..9a3c85cb 100644 --- a/win/Stdafx.h +++ b/win/Stdafx.h @@ -58,4 +58,4 @@ //#define PIECEBAR_GROUP 0x04 // Group pieces //#define PIECEBAR_ZOOMPREVIEW 0x08 // Zoom piece preview //#define PIECEBAR_COMBO 0x10 // Show combobox -#define PIECEBAR_PARTNUMBERS 0x20 // Show part numbers +//#define PIECEBAR_PARTNUMBERS 0x20 // Show part numbers