[GME-commit] GMESRC/GME/Gme GME.rc, 1.163, 1.164 MainFrm.cpp, 1.40, 1.41 NewXmlbackendProjDlg.cpp, 1.4, 1.5

Log messages of CVS commits gme-commit at list.isis.vanderbilt.edu
Wed Feb 13 13:00:17 CST 2008


Update of /project/gme-repository/GMESRC/GME/Gme
In directory escher:/tmp/cvs-serv7319

Modified Files:
	GME.rc MainFrm.cpp NewXmlbackendProjDlg.cpp 
Log Message:
.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: NewXmlbackendProjDlg.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/NewXmlbackendProjDlg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NewXmlbackendProjDlg.cpp	7 Feb 2008 22:54:48 -0000	1.4
--- NewXmlbackendProjDlg.cpp	13 Feb 2008 19:00:15 -0000	1.5
***************
*** 301,304 ****
--- 301,306 ----
  BOOL CNewXmlbackendProjDlg::OnInitDialog()
  {
+ 	m_vssDatabase = "\\\\Atlantis\\project\\GME\\multiusertest\\AVSS\\srcsafe.ini";
+ 	m_vssPath     = "$/project";
  	m_svnUrl = "svn+ssh://zolmol@svn.isis.vanderbilt.edu/export/svn/testrepo/gme/zoli";
  	m_svnUrl = "https://svn.isis.vanderbilt.edu/testrepo/gme/zoli";

Index: GME.rc
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GME.rc,v
retrieving revision 1.163
retrieving revision 1.164
diff -C2 -d -r1.163 -r1.164
*** GME.rc	7 Feb 2008 22:54:48 -0000	1.163
--- GME.rc	13 Feb 2008 19:00:15 -0000	1.164
***************
*** 351,355 ****
              MENUITEM "&Active Users...",            ID_MULTIUSER_ACTIVEUSERS
              MENUITEM "&Subversion...",              ID_MULTIUSER_SUBVERSION
- 
          END
      END
--- 351,354 ----
***************
*** 742,764 ****
  END
  
! IDD_MGAOPEN DIALOGEX 0, 0, 167, 85
  STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Open"
  FONT 8, "MS Sans Serif", 0, 0, 0x0
  BEGIN
!     DEFPUSHBUTTON   "&Next >",IDC_NEXT,52,64,46,14
!     PUSHBUTTON      "Cancel",IDCANCEL,114,64,46,14
!     PUSHBUTTON      "< &Back",IDC_BACK,7,64,46,14,WS_DISABLED
      CONTROL         "Connect to database",IDC_RADIO1,"Button",
                      BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED | 
                      WS_GROUP | WS_TABSTOP,58,1,102,10
      CONTROL         "Open project file",IDC_RADIO2,"Button",
!                     BS_AUTORADIOBUTTON | WS_TABSTOP,58,15,102,10
      CONTROL         "Open ODBC data",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON | 
!                     WS_TABSTOP,58,30,102,10
      CONTROL         "Open multi user project",IDC_RADIO4,"Button",
!                     BS_AUTORADIOBUTTON | WS_TABSTOP,58,45,102,10
!     CONTROL         156,IDC_METAOPEN_BMP,"Static",SS_BITMAP,15,15,43,39
!     CONTROL         155,IDC_MGAOPEN_BMP,"Static",SS_BITMAP,7,15,43,39
  END
  
--- 741,763 ----
  END
  
! IDD_MGAOPEN DIALOGEX 0, 0, 167, 73
  STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "Open"
  FONT 8, "MS Sans Serif", 0, 0, 0x0
  BEGIN
!     DEFPUSHBUTTON   "&Next >",IDC_NEXT,52,52,46,14
!     PUSHBUTTON      "Cancel",IDCANCEL,114,52,46,14
!     PUSHBUTTON      "< &Back",IDC_BACK,7,52,46,14,WS_DISABLED
      CONTROL         "Connect to database",IDC_RADIO1,"Button",
                      BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_DISABLED | 
                      WS_GROUP | WS_TABSTOP,58,1,102,10
      CONTROL         "Open project file",IDC_RADIO2,"Button",
!                     BS_AUTORADIOBUTTON | WS_TABSTOP,58,18,102,10
      CONTROL         "Open ODBC data",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON | 
!                     NOT WS_VISIBLE | WS_DISABLED | WS_TABSTOP,58,6,102,10
      CONTROL         "Open multi user project",IDC_RADIO4,"Button",
!                     BS_AUTORADIOBUTTON | WS_TABSTOP,58,32,102,10
!     CONTROL         156,IDC_METAOPEN_BMP,"Static",SS_BITMAP,15,8,43,39
!     CONTROL         155,IDC_MGAOPEN_BMP,"Static",SS_BITMAP,7,8,43,39
  END
  
***************
*** 1005,1014 ****
  END
  
! IDD_NEW_MULTIUSER_PROJ_DLG DIALOGEX 0, 0, 373, 237
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
  CAPTION "New Multiuser Project"
  FONT 8, "MS Sans Serif", 0, 0, 0x0
  BEGIN
!     GROUPBOX        "",IDC_STATIC,4,3,362,51
      LTEXT           "&Project Location:",IDC_STATIC,13,17,85,8
      EDITTEXT        IDC_EDIT_LOCATION,98,14,241,14,ES_AUTOHSCROLL
--- 1004,1013 ----
  END
  
! IDD_NEW_MULTIUSER_PROJ_DLG DIALOGEX 0, 0, 374, 230
! STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
  CAPTION "New Multiuser Project"
  FONT 8, "MS Sans Serif", 0, 0, 0x0
  BEGIN
!     GROUPBOX        "",IDC_STATIC,4,3,363,51
      LTEXT           "&Project Location:",IDC_STATIC,13,17,85,8
      EDITTEXT        IDC_EDIT_LOCATION,98,14,241,14,ES_AUTOHSCROLL
***************
*** 1021,1025 ****
      COMBOBOX        IDC_COMBO_SPLITALG,327,36,31,38,CBS_DROPDOWN | CBS_SORT | 
                      WS_VSCROLL | WS_TABSTOP
!     GROUPBOX        "Source Control",IDC_STATIC,4,58,362,26
      CONTROL         "Visual SourceSafe",IDC_RADIO_VSS,"Button",
                      BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,68,68,80,10
--- 1020,1024 ----
      COMBOBOX        IDC_COMBO_SPLITALG,327,36,31,38,CBS_DROPDOWN | CBS_SORT | 
                      WS_VSCROLL | WS_TABSTOP
!     GROUPBOX        "Source Control",IDC_STATIC,4,58,363,26
      CONTROL         "Visual SourceSafe",IDC_RADIO_VSS,"Button",
                      BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,68,68,80,10
***************
*** 1030,1056 ****
      CONTROL         "None",IDC_RADIO_NONE,"Button",BS_AUTORADIOBUTTON,308,68,
                      36,10
!     GROUPBOX        "Visual SourceSafe",IDC_STATIC_VSS,4,85,362,67
!     LTEXT           "SourceSafe Database:",IDC_STATIC_VSSDB,13,102,70,8
      EDITTEXT        IDC_EDIT_VSSDATABASE,98,99,241,14,ES_AUTOHSCROLL
      PUSHBUTTON      "...",IDC_BUTTON_BROWSE_VSSDB,342,99,15,14
!     LTEXT           "SourceSafe Project (parent):\nEg.:$/projects",
!                     IDC_STATIC_VSSPROJ,13,121,78,27
      EDITTEXT        IDC_EDIT_VSSPATH,98,122,241,14,ES_AUTOHSCROLL
!     GROUPBOX        "Subversion",IDC_STATIC_SVN,4,154,362,58
!     EDITTEXT        IDC_EDIT_SVNDATABASE,37,165,302,14,ES_AUTOHSCROLL
!     PUSHBUTTON      "Try",IDC_BUTTON_SVNTRY,343,165,16,14
      LTEXT           "Examples: svn+ssh://username@svn.example.com/repository/projects",
!                     IDC_STATIC_SUBVERSION,13,181,224,8
      LTEXT           "https://svn.server.example.com/repository/projects",
!                     IDC_STATIC_SUBVERSION2,46,192,162,8
!     GROUPBOX        "Use Subversion Through",IDC_STATIC_SVN_SECTION1,245,180,
                      115,25
      CONTROL         "API",IDC_RADIO_SVNAPI,"Button",BS_AUTORADIOBUTTON | 
!                     WS_GROUP | WS_TABSTOP,259,191,27,10
      CONTROL         "CMD.exe",IDC_RADIO_SVNCMDL,"Button",BS_AUTORADIOBUTTON,
!                     302,192,45,10
!     DEFPUSHBUTTON   "OK",IDOK,129,216,50,14
!     PUSHBUTTON      "Cancel",IDCANCEL,194,216,50,14
!     LTEXT           "URL:",IDC_STATIC_SUBVERSION_URLLABEL,13,168,20,8
  END
  
--- 1029,1054 ----
      CONTROL         "None",IDC_RADIO_NONE,"Button",BS_AUTORADIOBUTTON,308,68,
                      36,10
!     GROUPBOX        "Visual SourceSafe",IDC_STATIC_VSS,4,85,363,57
!     LTEXT           "VSS Database:",IDC_STATIC_VSSDB,13,102,74,8
      EDITTEXT        IDC_EDIT_VSSDATABASE,98,99,241,14,ES_AUTOHSCROLL
      PUSHBUTTON      "...",IDC_BUTTON_BROWSE_VSSDB,342,99,15,14
!     LTEXT           "VSS Parent Project:",IDC_STATIC_VSSPROJ,13,121,75,10
      EDITTEXT        IDC_EDIT_VSSPATH,98,122,241,14,ES_AUTOHSCROLL
!     GROUPBOX        "Subversion",IDC_STATIC_SVN,4,144,363,58
!     EDITTEXT        IDC_EDIT_SVNDATABASE,37,155,302,14,ES_AUTOHSCROLL
!     PUSHBUTTON      "Try",IDC_BUTTON_SVNTRY,343,155,16,14
      LTEXT           "Examples: svn+ssh://username@svn.example.com/repository/projects",
!                     IDC_STATIC_SUBVERSION,13,171,224,8
      LTEXT           "https://svn.server.example.com/repository/projects",
!                     IDC_STATIC_SUBVERSION2,46,182,162,8
!     GROUPBOX        "Use Subversion Through",IDC_STATIC_SVN_SECTION1,245,170,
                      115,25
      CONTROL         "API",IDC_RADIO_SVNAPI,"Button",BS_AUTORADIOBUTTON | 
!                     WS_GROUP | WS_TABSTOP,259,181,27,10
      CONTROL         "CMD.exe",IDC_RADIO_SVNCMDL,"Button",BS_AUTORADIOBUTTON,
!                     302,182,45,10
!     DEFPUSHBUTTON   "OK",IDOK,129,206,50,14
!     PUSHBUTTON      "Cancel",IDCANCEL,194,206,50,14
!     LTEXT           "URL:",IDC_STATIC_SUBVERSION_URLLABEL,13,158,20,8
  END
  
***************
*** 1187,1191 ****
          VERTGUIDE, 58
          TOPMARGIN, 7
!         BOTTOMMARGIN, 78
      END
  
--- 1185,1189 ----
          VERTGUIDE, 58
          TOPMARGIN, 7
!         BOTTOMMARGIN, 66
      END
  
***************
*** 1278,1284 ****
      BEGIN
          LEFTMARGIN, 4
!         RIGHTMARGIN, 366
          TOPMARGIN, 7
!         BOTTOMMARGIN, 230
      END
  
--- 1276,1282 ----
      BEGIN
          LEFTMARGIN, 4
!         RIGHTMARGIN, 367
          TOPMARGIN, 7
!         BOTTOMMARGIN, 223
      END
  

Index: MainFrm.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/MainFrm.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** MainFrm.cpp	7 Feb 2008 22:54:48 -0000	1.40
--- MainFrm.cpp	13 Feb 2008 19:00:15 -0000	1.41
***************
*** 982,986 ****
  
  		wb->SetClues( CComBSTR( (LPCTSTR) theApp.connString()));
! 		wb->ShowDlg();
  	}
  	catch(...) { ASSERT(0); }
--- 982,986 ----
  
  		wb->SetClues( CComBSTR( (LPCTSTR) theApp.connString()));
! 		wb->ShowWorkBenchDlg();
  	}
  	catch(...) { ASSERT(0); }



More information about the GME-commit mailing list