Utils/MapEdit/MapEdit.rc

@@ -57,10 +57,8 @@ BEGIN
     SEPARATOR
     BUTTON      ID_APP_ABOUT
     SEPARATOR
-    BUTTON      ID_TOOLBAR_PARAMBAR
     BUTTON      ID_TOOLBAR_TILEPALETTE
-    SEPARATOR
-    BUTTON      ID_TOOLBAR_COMBO
+    BUTTON      ID_TOOLBAR_GRID
 END
 
 
@@ -415,81 +413,24 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 // 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
-
-IDD_TEST1 DIALOG DISCARDABLE  0, 0, 186, 94
+IDD_LAYER_LIST_DIALOG DIALOG DISCARDABLE  0, 0, 155, 94
 STYLE WS_CHILD | WS_BORDER
 FONT 8, "MS Sans Serif"
 BEGIN
-    GROUPBOX        "Static",IDC_STATIC,7,7,172,80
-    EDITTEXT        IDC_EDIT1,19,20,53,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT2,19,35,53,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT3,19,49,53,13,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT4,19,64,53,13,ES_AUTOHSCROLL
-    COMBOBOX        IDC_COMBO1,82,20,89,30,CBS_DROPDOWN | CBS_SORT | 
-                    WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_COMBO2,81,36,89,30,CBS_DROPDOWN | CBS_SORT | 
-                    WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_COMBO3,80,51,89,30,CBS_DROPDOWN | CBS_SORT | 
-                    WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_COMBO4,81,67,89,30,CBS_DROPDOWN | CBS_SORT | 
-                    WS_VSCROLL | WS_TABSTOP
-END
-
-IDD_TEST2 DIALOG DISCARDABLE  0, 0, 102, 86
-STYLE WS_CHILD | WS_BORDER
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "Check1",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,5,5,41,10
-    CONTROL         "Check1",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,5,15,41,10
-    CONTROL         "Check1",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,5,25,41,10
-    CONTROL         "Check1",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,5,35,41,10
-    CONTROL         "Check1",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,5,45,41,10
-    CONTROL         "Check1",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,5,55,41,10
-    CONTROL         "Check1",IDC_CHECK7,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,5,65,41,10
-    CONTROL         "Check1",IDC_CHECK8,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,5,75,41,10
-    CONTROL         "Check1",IDC_CHECK9,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,60,5,41,10
-    CONTROL         "Check1",IDC_CHECK10,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,60,15,41,10
-    CONTROL         "Check1",IDC_CHECK11,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,60,25,41,10
-    CONTROL         "Check1",IDC_CHECK12,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,60,35,41,10
-    CONTROL         "Check1",IDC_CHECK13,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,60,45,41,10
-    CONTROL         "Check1",IDC_CHECK14,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,60,55,41,10
-    CONTROL         "Check1",IDC_CHECK15,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,60,65,41,10
-    CONTROL         "Check1",IDC_CHECK16,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,60,75,41,10
-END
-
-IDD_LAYER_LIST_DIALOG DIALOG DISCARDABLE  0, 0, 106, 94
-STYLE WS_CHILD | WS_BORDER
-FONT 8, "MS Sans Serif"
-BEGIN
-    LISTBOX         IDC_LAYER_LIST,7,7,92,85,LBS_SORT | LBS_OWNERDRAWFIXED | 
+    LISTBOX         IDC_LAYER_LIST,5,5,145,85,LBS_SORT | LBS_OWNERDRAWFIXED | 
                     LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | 
                     WS_TABSTOP
 END
 
+IDD_TILESET_DIALOG DIALOG DISCARDABLE  0, 0, 151, 46
+STYLE WS_CHILD
+FONT 8, "MS Sans Serif"
+BEGIN
+    COMBOBOX        IDC_TILESETDLG_COMBO,7,7,138,322,CBS_DROPDOWNLIST | 
+                    WS_TABSTOP
+    PUSHBUTTON      "Update",IDC_TILESETDLG_BTN_UPDATE,5,25,140,15
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -499,37 +440,21 @@ END
 #ifdef APSTUDIO_INVOKED
 GUIDELINES DESIGNINFO DISCARDABLE 
 BEGIN
-    IDD_TRASHHEAP, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 179
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 88
-    END
-
-    IDD_TEST1, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 179
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 87
-    END
-
-    IDD_TEST2, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 95
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 79
-    END
-
     IDD_LAYER_LIST_DIALOG, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 99
+        RIGHTMARGIN, 148
         TOPMARGIN, 7
         BOTTOMMARGIN, 87
     END
+
+    IDD_TILESET_DIALOG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 144
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 39
+    END
 END
 #endif    // APSTUDIO_INVOKED