--- h6-udlånssystem.rc	2006/08/30 21:57:57	9
+++ h6-udlånssystem.rc	2006/09/01 02:25:17	22
@@ -89,10 +89,24 @@
 // Dialog
 //
 
-IDD_SEARCH DIALOGEX 0, 0, 249, 119
+IDD_SEARCH DIALOGEX 0, 0, 291, 172
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
+    EDITTEXT        IDC_BARCODE,140,42,73,14,ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "Barcode",IDC_STATIC,81,43,27,8
+    LTEXT           "Equipment name",IDC_STATIC,81,61,54,8
+    EDITTEXT        IDC_NAME,140,59,73,14,ES_AUTOHSCROLL
+    LTEXT           "Person initials",IDC_STATIC,81,79,44,8
+    EDITTEXT        IDC_INITS,140,76,73,14,ES_AUTOHSCROLL
+    CONTROL         "Available",IDC_AVAILABLE,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,84,106,45,10
+    CONTROL         "Deposited",IDC_DEPOSITED,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,84,118,48,10
+    CONTROL         "Reserved",IDC_RESERVED,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,84,131,47,10
+    DEFPUSHBUTTON   "Search",IDC_SEARCH,165,106,50,14
+    PUSHBUTTON      "Clear",IDC_CLEAR,165,125,50,14
 END
 
 IDD_ADMIN DIALOGEX 0, 0, 319, 179
@@ -117,10 +131,14 @@
     PUSHBUTTON      "Delete",IDC_DELETE,34,107,50,14,NOT WS_VISIBLE
 END
 
-IDD_RESULT DIALOGEX 0, 0, 186, 95
+IDD_RESULT DIALOGEX 0, 0, 323, 180
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
+    CONTROL         "",IDC_LIST,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | 
+                    WS_BORDER | WS_TABSTOP,14,17,293,123
+    LTEXT           "Found 0 items",IDC_COUNTER,23,151,46,8
+    PUSHBUTTON      "Details",IDC_DETAILS,129,150,50,14
 END
 
 IDD_USEREDIT DIALOGEX 0, 0, 214, 124
@@ -129,17 +147,17 @@
 CAPTION "User edit"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,157,7,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,157,24,50,14
-    LTEXT           "Initials",IDC_STATIC,12,14,22,8
     EDITTEXT        IDC_INITS,61,11,82,14,ES_AUTOHSCROLL
     EDITTEXT        IDC_NAME,61,30,82,14,ES_AUTOHSCROLL
-    LTEXT           "Name",IDC_STATIC,12,33,19,8
     CONTROL         "Administrative user",IDC_ADMIN,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,62,49,77,10
+    EDITTEXT        IDC_PASSWORD1,62,66,82,14,ES_PASSWORD | ES_AUTOHSCROLL
+    EDITTEXT        IDC_PASSWORD2,62,83,82,14,ES_PASSWORD | ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,157,7,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,157,24,50,14
+    LTEXT           "Initials",IDC_STATIC,12,14,22,8
+    LTEXT           "Name",IDC_STATIC,12,33,19,8
     LTEXT           "New password",IDC_STATIC,12,67,48,8
-    EDITTEXT        IDC_PASSWORD2,62,83,82,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_PASSWORD1,62,66,82,14,ES_AUTOHSCROLL
     LTEXT           "Repeat",IDC_STATIC,12,85,24,8
 END
 
@@ -152,14 +170,43 @@
     DEFPUSHBUTTON   "OK",IDOK,195,7,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,195,24,50,14
     LTEXT           "Barcode",IDC_STATIC,12,16,27,8
-    EDITTEXT        IDC_BARCODE,48,15,98,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_BARCODE,48,15,98,14,ES_AUTOHSCROLL | ES_NUMBER
     LTEXT           "Name",IDC_STATIC,12,35,19,8
     EDITTEXT        IDC_NAME,48,33,98,14,ES_AUTOHSCROLL
     LTEXT           "Placement",IDC_STATIC,12,54,34,8
     EDITTEXT        IDC_PLACEMENT,48,51,98,14,ES_AUTOHSCROLL
     LTEXT           "Description",IDC_STATIC,12,71,36,8
     EDITTEXT        IDC_DESCRIPTION,48,70,185,46,ES_MULTILINE | 
-                    ES_AUTOHSCROLL
+                    ES_AUTOHSCROLL | ES_WANTRETURN | WS_VSCROLL
+END
+
+IDD_RESULTDETAILS DIALOGEX 0, 0, 397, 284
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
+    WS_SYSMENU
+CAPTION "Eqipment details"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT           "Barcode",IDC_STATIC,15,15,27,8
+    EDITTEXT        IDC_BARCODE,72,13,94,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_NAME,72,32,94,14,ES_AUTOHSCROLL
+    LTEXT           "Equipment name",IDC_STATIC,16,35,54,8
+    LTEXT           "Description",IDC_STATIC,17,67,36,8
+    EDITTEXT        IDC_DESCRIPTION,72,65,181,42,ES_MULTILINE | 
+                    ES_AUTOHSCROLL | WS_VSCROLL
+    EDITTEXT        IDC_PLACEMENT,71,49,94,14,ES_AUTOHSCROLL
+    LTEXT           "Placement",IDC_STATIC,16,52,34,8
+    EDITTEXT        IDC_STATUS,72,113,94,14,ES_AUTOHSCROLL
+    LTEXT           "Status",IDC_STATIC,15,115,22,8
+    LTEXT           "Deposits",IDC_STATIC,85,151,28,8
+    LTEXT           "Reservations",IDC_STATIC,268,150,43,8
+    CONTROL         "",IDC_CHECKOUTS,"SysListView32",LVS_REPORT | 
+                    LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,19,162,171,83
+    CONTROL         "",IDC_RESERVATIONS,"SysListView32",LVS_REPORT | 
+                    LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,207,162,171,83
+    PUSHBUTTON      "Close",IDC_CLOSE,175,256,50,14
+    PUSHBUTTON      "Checkout",IDC_CHECKOUT,312,65,63,14
+    PUSHBUTTON      "Reserve",IDC_RESERVE,312,85,63,14
+    PUSHBUTTON      "Return",IDC_RETURN,312,105,63,14
 END
 
 
@@ -174,9 +221,9 @@
     IDD_SEARCH, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 242
+        RIGHTMARGIN, 284
         TOPMARGIN, 7
-        BOTTOMMARGIN, 112
+        BOTTOMMARGIN, 165
     END
 
     IDD_ADMIN, DIALOG
@@ -190,9 +237,9 @@
     IDD_RESULT, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 179
+        RIGHTMARGIN, 316
         TOPMARGIN, 7
-        BOTTOMMARGIN, 88
+        BOTTOMMARGIN, 173
     END
 
     IDD_USEREDIT, DIALOG
@@ -210,6 +257,14 @@
         TOPMARGIN, 7
         BOTTOMMARGIN, 132
     END
+
+    IDD_RESULTDETAILS, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 389
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 277
+    END
 END
 #endif    // APSTUDIO_INVOKED