[GME-commit] GMESRC/GME/GMEActiveBrowser AttachLibDlg.cpp, 1.4, 1.5 GMEActiveBrowser.rc, 1.18, 1.19 resource.h, 1.13, 1.14

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/GME/GMEActiveBrowser
In directory escher:/tmp/cvs-serv30779

Modified Files:
	AttachLibDlg.cpp GMEActiveBrowser.rc resource.h 
Log Message:
Allowing and showing Environment variables in library names.
It will be passed down unaltered to the MGA layer.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: resource.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/resource.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** resource.h	7 Mar 2007 21:29:05 -0000	1.13
--- resource.h	19 Mar 2007 19:32:55 -0000	1.14
***************
*** 40,43 ****
--- 40,44 ----
  #define IDI_LIBRARY                     218
  #define IDB_BITMAP1                     219
+ #define IDC_CONNSTR                     220
  #define IDC_COMBO_SEARCH_AGGREGATE      1001
  #define IDC_TREE_INHERITANCE            1002
***************
*** 78,83 ****
  #define ID_POPUP_SHOWINPARENT           32803
  #define ID_POPUP_LIBRARY_DEPENDENCIES   32804
- #define ID_POPUP_LIBRARY_AMBIGUITYCHK   32806
  #define ID_POPUP_READONLY               32805
  #define ID_POPUP_READWRITE              32807
  
--- 79,84 ----
  #define ID_POPUP_SHOWINPARENT           32803
  #define ID_POPUP_LIBRARY_DEPENDENCIES   32804
  #define ID_POPUP_READONLY               32805
+ #define ID_POPUP_LIBRARY_AMBIGUITYCHK   32806
  #define ID_POPUP_READWRITE              32807
  
***************
*** 88,92 ****
  #define _APS_NEXT_RESOURCE_VALUE        220
  #define _APS_NEXT_COMMAND_VALUE         32808
! #define _APS_NEXT_CONTROL_VALUE         219
  #define _APS_NEXT_SYMED_VALUE           104
  #endif
--- 89,93 ----
  #define _APS_NEXT_RESOURCE_VALUE        220
  #define _APS_NEXT_COMMAND_VALUE         32808
! #define _APS_NEXT_CONTROL_VALUE         221
  #define _APS_NEXT_SYMED_VALUE           104
  #endif

Index: AttachLibDlg.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/AttachLibDlg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AttachLibDlg.cpp	7 Mar 2007 21:29:05 -0000	1.4
--- AttachLibDlg.cpp	19 Mar 2007 19:32:55 -0000	1.5
***************
*** 13,16 ****
--- 13,19 ----
  #endif
  
+ #include <stdlib.h>
+ #include <stdio.h>
+ 
  /////////////////////////////////////////////////////////////////////////////
  // CAttachLibDlg dialog
***************
*** 76,79 ****
--- 79,105 ----
  	}
  	// end of special section // REMOVE later
+ 
+ 	// show the expanded path as a hint
+ 	// when env variable found
+ 	CString hint = m_strConnString;
+ 	pos = hint.Find( "%");
+ 	if( pos != -1) // found
+ 	{
+ 		int npos = hint.Find( "%", pos + 1); //next pos
+ 		if( npos != -1 && npos > pos + 1)
+ 		{
+ 			// get the value of the environment variable between the two %'s
+ 			char *value = getenv( hint.Mid( pos + 1, npos - pos - 1));
+ 			hint.Replace( "%" + hint.Mid( pos + 1, npos - pos - 1) + "%", value);
+ 		}
+ 	}
+ 
+ 	// show hint if needed: it differs from m_strConnString
+ 	CWnd *ptr = GetDlgItem( IDC_CONNSTR);
+ 	if( ptr && hint != m_strConnString)
+ 	{
+ 		// replace "Mga Connection String" with expanded path
+ 		ptr->SetWindowText( (LPCTSTR) hint);
+ 	}
  
  	CDialog::OnInitDialog();

Index: GMEActiveBrowser.rc
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/GMEActiveBrowser/GMEActiveBrowser.rc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** GMEActiveBrowser.rc	7 Mar 2007 21:29:05 -0000	1.18
--- GMEActiveBrowser.rc	19 Mar 2007 19:32:55 -0000	1.19
***************
*** 189,205 ****
  END
  
! IDD_ATTACH_LIB_DIALOG DIALOGEX 0, 0, 280, 74
  STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Attach Library"
  FONT 8, "MS Sans Serif", 0, 0, 0x0
  BEGIN
!     EDITTEXT        IDC_CONN_STRING,37,20,198,14,ES_AUTOHSCROLL
!     PUSHBUTTON      "...",IDC_BROWSE,245,20,14,14
      CONTROL         "Optimize (Ungroup Inner Libraries)",IDC_CHECKOPTIMIZED,
                      "Button",BS_AUTOCHECKBOX | WS_TABSTOP,38,36,122,12
!     DEFPUSHBUTTON   "OK",IDOK,76,53,50,14
!     PUSHBUTTON      "Cancel",IDCANCEL,153,53,50,14
!     LTEXT           "Mga Connection String:",IDC_STATIC,37,9,75,8
!     ICON            IDI_LIBRARY,IDC_STATIC,8,12,20,20
  END
  
--- 189,206 ----
  END
  
! IDD_ATTACH_LIB_DIALOG DIALOGEX 0, 0, 363, 74
  STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Attach Library"
  FONT 8, "MS Sans Serif", 0, 0, 0x0
  BEGIN
!     EDITTEXT        IDC_CONN_STRING,37,20,298,14,ES_AUTOHSCROLL
!     PUSHBUTTON      "...",IDC_BROWSE,342,20,14,14
      CONTROL         "Optimize (Ungroup Inner Libraries)",IDC_CHECKOPTIMIZED,
                      "Button",BS_AUTOCHECKBOX | WS_TABSTOP,38,36,122,12
!     DEFPUSHBUTTON   "OK",IDOK,111,53,50,14
!     PUSHBUTTON      "Cancel",IDCANCEL,204,53,50,14
!     LTEXT           "Mga Connection String:",IDC_CONNSTR,37,9,319,8,
!                     SS_ENDELLIPSIS
!     ICON            IDI_LIBRARY,IDC_STATIC,8,12,21,20
  END
  
***************
*** 263,267 ****
      BEGIN
          LEFTMARGIN, 7
!         RIGHTMARGIN, 273
          VERTGUIDE, 54
          TOPMARGIN, 7
--- 264,268 ----
      BEGIN
          LEFTMARGIN, 7
!         RIGHTMARGIN, 356
          VERTGUIDE, 54
          TOPMARGIN, 7