Changeset 41 for trunk/gui/printer

Timestamp:

May 31, 2013, 4:21:06 AM (12 years ago)

Author:

Alex Taylor

Message:

Various fixes and improvements.

Location:

trunk/gui/printer/manager

Files:

• PRINTOOL.RC (modified) (1 diff)
• PRINTOOL.VRX (modified) (11 diffs)
• PRINTOOL.VRY (modified) ( previous)
• create.ico (deleted)
• newprint.ico (added)
• readme.txt (modified) (1 diff)

trunk/gui/printer/manager/PRINTOOL.RC

@@ -9 +9 @@
 ICON 10  PRELOAD port_cups.ico
 */
-ICON 20  PRELOAD create.ico
+ICON 20  PRELOAD newprint.ico

trunk/gui/printer/manager/PRINTOOL.VRX

@@ -152 +152 @@
     END
     ELSE
-        CALL VRMethod 'MN_VIEW', 'Popup'
+        CALL VRMethod 'MN_CONTEXT', 'Popup'
 
 RETURN
@@ -173 +173 @@
     END
     ELSE DO
-        CALL VRMethod 'MN_VIEW', 'Popup'
+        CALL VRMethod 'MN_CONTEXT', 'Popup'
     END
 
@@ -214 +214 @@
     END
     ELSE
-        CALL VRMethod 'MN_VIEW', 'Popup'
+        CALL VRMethod 'MN_CONTEXT', 'Popup'
 
 RETURN
@@ -888 +888 @@
 LoadSettings: PROCEDURE EXPOSE globals.
 
-    globals.!version = '0.42'
+    globals.!version = '0.43'
     globals.!copyright = '2013'
 
@@ -954 +954 @@
 RETURN
 
-/*:VRX         MI_DETAILVIEW_Click
-*/
-MI_DETAILVIEW_Click: PROCEDURE EXPOSE globals.
+/*:VRX         MI_CONTEXT_DETAIL_Click
+*/
+MI_CONTEXT_DETAIL_Click: PROCEDURE EXPOSE globals.
+    CALL MI_DETAILVIEW_Click
+RETURN
+
+/*:VRX         MI_CONTEXT_ICON_Click
+*/
+MI_CONTEXT_ICON_Click: PROCEDURE EXPOSE globals.
+    CALL MI_ICONVIEW_Click
+RETURN
+
+
+/*:VRX         MI_CONTEXT_INSTALL_Click
+*/
+MI_CONTEXT_INSTALL_Click: PROCEDURE EXPOSE globals.
 
     _page = VRGet('TDL_MAIN', 'Selected')
@@ -964 +977 @@
 
     CALL VRSet _cnr, 'Source', 0
-    _set = VRGet('MI_DETAILVIEW', 'Checked')
-    IF _set == 1 THEN RETURN
-
-    CALL VRSet _cnr, 'View', 'Detail'
-    CALL VRSet _cnr, 'MiniIcons', 1
-
-    CALL VRSet 'MI_ICONVIEW',   'Checked', 0
-    CALL VRSet 'MI_DETAILVIEW', 'Checked', 1
-
-RETURN
-
-/*:VRX         MI_DRIVERS_INSTALL_Click
-*/
-MI_DRIVERS_INSTALL_Click:
-    CALL DriverAdd
-return
-
-/*:VRX         MI_DRIVERS_REMOVE_Click
-*/
-MI_DRIVERS_REMOVE_Click:
-    CALL DriverDelete
-return
-
-/*:VRX         MI_ICONVIEW_Click
-*/
-MI_ICONVIEW_Click: PROCEDURE EXPOSE globals.
+
+    SELECT
+        WHEN _cnr == 'CN_PRINTERS' THEN CALL PrinterWizard
+        WHEN _cnr == 'CN_PORTS' THEN CALL PortAdd
+        WHEN _cnr == 'CN_DEVICES' THEN CALL DriverAdd
+        OTHERWISE NOP
+    END
+
+RETURN
+
+/*:VRX         MI_CONTEXT_REFRESH_Click
+*/
+MI_CONTEXT_REFRESH_Click: PROCEDURE EXPOSE globals.
+    CALL MI_REFRESH_Click
+RETURN
+
+/*:VRX         MI_DETAILVIEW_Click
+*/
+MI_DETAILVIEW_Click: PROCEDURE EXPOSE globals.
 
     _page = VRGet('TDL_MAIN', 'Selected')
@@ -997 +1003 @@
 
     CALL VRSet _cnr, 'Source', 0
+    _set = VRGet('MI_DETAILVIEW', 'Checked')
+    IF _set == 1 THEN RETURN
+
+    CALL VRSet _cnr, 'View', 'Detail'
+    CALL VRSet _cnr, 'MiniIcons', 1
+
+    CALL VRSet 'MI_ICONVIEW',      'Checked', 0
+    CALL VRSet 'MI_CONTEXT_ICON',  'Checked', 0
+    CALL VRSet 'MI_DETAILVIEW',    'Checked', 1
+    CALL VRSet 'MI_CONTEXT_DETAIL','Checked', 1
+
+RETURN
+
+/*:VRX         MI_DRIVERS_INSTALL_Click
+*/
+MI_DRIVERS_INSTALL_Click:
+    CALL DriverAdd
+return
+
+/*:VRX         MI_DRIVERS_REMOVE_Click
+*/
+MI_DRIVERS_REMOVE_Click:
+    CALL DriverDelete
+return
+
+/*:VRX         MI_ICONVIEW_Click
+*/
+MI_ICONVIEW_Click: PROCEDURE EXPOSE globals.
+
+    _page = VRGet('TDL_MAIN', 'Selected')
+    _pagewin = VRMethod('TDL_MAIN', 'GetPageWindow', _page )
+    _cnr = VRGet( _pagewin, 'UserData')
+    IF _cnr == '' THEN RETURN
+
+    CALL VRSet _cnr, 'Source', 0
     _set = VRGet('MI_ICONVIEW', 'Checked')
     IF _set == 1 THEN RETURN
@@ -1003 +1044 @@
     CALL VRSet _cnr, 'MiniIcons', 0
 
-    CALL VRSet 'MI_ICONVIEW',   'Checked', 1
-    CALL VRSet 'MI_DETAILVIEW', 'Checked', 0
+    CALL VRSet 'MI_ICONVIEW',       'Checked', 1
+    CALL VRSet 'MI_CONTEXT_ICON',   'Checked', 1
+    CALL VRSet 'MI_DETAILVIEW',     'Checked', 0
+    CALL VRSet 'MI_CONTEXT_DETAIL', 'Checked', 0
 
 RETURN
@@ -2155 +2198 @@
     CALL NLSSetText 'MI_REFRESH',    'Caption', 63
 
+    CALL NLSSetText 'MI_CONTEXT_INSTALL', 'Caption', 8
+    CALL NLSSetText 'MI_CONTEXT_DETAIL',  'Caption', 61
+    CALL NLSSetText 'MI_CONTEXT_ICON',    'Caption', 62
+    CALL NLSSetText 'MI_CONTEXT_REFRESH', 'Caption', 63
+
     CALL NLSSetText 'MN_PRINTERPAK',  'Caption', 70
     CALL NLSSetText 'MI_PPAK_MODELS', 'Caption', 71
@@ -2806 +2854 @@
         CALL VRSet 'MI_ICONVIEW',   'Checked', 0
         CALL VRSet 'MI_DETAILVIEW', 'Checked', 1
+        CALL VRSet 'MI_CONTEXT_ICON',   'Checked', 0
+        CALL VRSet 'MI_CONTEXT_DETAIL', 'Checked', 1
     END
     ELSE DO
         CALL VRSet 'MI_ICONVIEW',   'Checked', 1
         CALL VRSet 'MI_DETAILVIEW', 'Checked', 0
-    END
-
+        CALL VRSet 'MI_CONTEXT_ICON',   'Checked', 1
+        CALL VRSet 'MI_CONTEXT_DETAIL', 'Checked', 0
+    END
+/*
     SELECT
         WHEN _cnr == 'CN_PRINTERS' THEN DO
@@ -2822 +2874 @@
         END
     END
-
+*/
 RETURN
 

trunk/gui/printer/manager/readme.txt

@@ -1 +1 @@
 PM Printer Manager
-Version 0.42
+Version 0.43
 
   Printer Manager is a new graphical printer management tool designed to