diff options
| author | Brian Helfrich <helfrich9000@gmail.com> | 2008-01-22 18:55:21 +0000 |
|---|---|---|
| committer | Brian Helfrich <helfrich9000@gmail.com> | 2008-01-22 18:55:21 +0000 |
| commit | 9be186bef3a3a6d118093c9c5980ea1c6ae827a8 (patch) | |
| tree | 70bc65bd004c59d5b82deb2a53e9bfde9caa9e4e | |
| parent | b3e76f0cbac7a6a3e444c6dd025cea1357c96cdd (diff) | |
| download | nanoengineer-theirix-9be186bef3a3a6d118093c9c5980ea1c6ae827a8.tar.gz nanoengineer-theirix-9be186bef3a3a6d118093c9c5980ea1c6ae827a8.zip | |
Changed name to QuteMolX.
| -rw-r--r-- | cad/plugins/QuteMol/qutemol/src/MyTab.cpp | 4 | ||||
| -rw-r--r-- | cad/plugins/QuteMol/qutemol/src/main.cpp | 8 | ||||
| -rw-r--r-- | cad/plugins/QuteMol/qutemol/src/progress.cpp | 4 | ||||
| -rw-r--r-- | cad/plugins/QuteMol/qutemol/src/qutemol.dev | 28 |
4 files changed, 32 insertions, 12 deletions
diff --git a/cad/plugins/QuteMol/qutemol/src/MyTab.cpp b/cad/plugins/QuteMol/qutemol/src/MyTab.cpp index 06224f483..ce876d5e7 100644 --- a/cad/plugins/QuteMol/qutemol/src/MyTab.cpp +++ b/cad/plugins/QuteMol/qutemol/src/MyTab.cpp @@ -77,7 +77,7 @@ static wxRadioButton *buttonSetBallnstickBicolor, *buttonSetBallnstickConstantco static wxString qutemolwebsite = _T("http://qutemol.sourceforge.net/");
static wxString nanorexQuteMolWebsite =
- _T("http://www.nanoengineer-1.com/QuteMol");
+ _T("http://www.nanoengineer-1.com/QuteMolX");
static wxColor colDisabled, colSticks, colBg(255,255,255);
static float bgbrightness=0.5;
@@ -1285,7 +1285,7 @@ MyTab::MyTab(wxWindow *parent , int n): wxPanel( parent, wxID_ANY, wxDefaultPosi wxSizer *sizerA = new wxBoxSizer(wxVERTICAL);
sizerA->Add(new wxStaticText(this,
wxID_ANY,
- _T("This is the Nanorex branch of QuteMol"))
+ _T("This is QuteMolX, the Nanorex branch of QuteMol"))
,0, wxALIGN_CENTER );
sizerA->Add(new wxStaticText(this, wxID_ANY,_T("which integrates with NanoEngineer-1."))
,0, wxALIGN_CENTER );
diff --git a/cad/plugins/QuteMol/qutemol/src/main.cpp b/cad/plugins/QuteMol/qutemol/src/main.cpp index fafbd9465..f476b721f 100644 --- a/cad/plugins/QuteMol/qutemol/src/main.cpp +++ b/cad/plugins/QuteMol/qutemol/src/main.cpp @@ -359,7 +359,7 @@ bool MyApp::OnInit() wxImage::AddHandler(new wxJPEGHandler);
// Create the main frame window
- MyFrame *frame = new MyFrame(NULL, wxT("QuteMol"),
+ MyFrame *frame = new MyFrame(NULL, wxT("QuteMolX"),
// wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE //wxRESIZE_BORDER
#ifdef __DARWIN__
wxDefaultPosition, wxDefaultSize,wxDEFAULT_FRAME_STYLE| wxRESIZE_BORDER
@@ -696,7 +696,7 @@ void TestGLCanvas::OnPaint( wxPaintEvent& event ) wxString renderer = glGetString(GL_RENDERER);
if (!extensions.Contains("GL_EXT_framebuffer_object") ||
ProblematicRenderers.Contains(renderer))
- wxMessageBox(_T("QuteMol makes use of OpenGL extensions that are not implemented, or not stable for your video adapter. If you choose to continue, your computer may crash or freeze. Save your work."),
+ wxMessageBox(_T("QuteMolX makes use of OpenGL extensions that are not implemented, or not stable for your video adapter. If you choose to continue, your computer may crash or freeze. Save your work."),
_T("Warning: Potential video adapter problems"),
wxOK | wxICON_EXCLAMATION, this);
@@ -826,7 +826,7 @@ void TestGLCanvas::OnKeyDown( wxKeyEvent& event ){ }
- wxMessageBox(text, _T("QuteMol - file info"), wxOK | wxICON_INFORMATION, this);
+ wxMessageBox(text, _T("QuteMolX - file info"), wxOK | wxICON_INFORMATION, this);
}
if (event.GetKeyCode() == WXK_F6 ) {
@@ -1001,7 +1001,7 @@ void MyFrame::OnReadFile (wxString filename) MyTab::EnableGeom();
UpdateShadowmap();
wxString name( mol.GetMolName(), wxConvUTF8 );
- SetTitle( name.BeforeLast('.')+ _T(" - QuteMol") );
+ SetTitle( name.BeforeLast('.')+ _T(" - QuteMolX") );
m_tb->SetTitleText(name);
geoSettings.Apply();
diff --git a/cad/plugins/QuteMol/qutemol/src/progress.cpp b/cad/plugins/QuteMol/qutemol/src/progress.cpp index 19b127a9c..86e75be74 100644 --- a/cad/plugins/QuteMol/qutemol/src/progress.cpp +++ b/cad/plugins/QuteMol/qutemol/src/progress.cpp @@ -13,9 +13,9 @@ bool UpdateProgress(int i){ void StartProgress(char* str, int N){
EndProgress();
- wxString st; st.Printf("QuteMol: %s...",str);
+ wxString st; st.Printf("QuteMolX: %s...",str);
globalProgress= new wxProgressDialog(
- //_T("QuteMol"), st,
+ //_T("QuteMolX"), st,
st, _T(""),
N, NULL, wxPD_AUTO_HIDE|wxPD_APP_MODAL|wxPD_CAN_ABORT);
}
diff --git a/cad/plugins/QuteMol/qutemol/src/qutemol.dev b/cad/plugins/QuteMol/qutemol/src/qutemol.dev index 70833637e..1b374c445 100644 --- a/cad/plugins/QuteMol/qutemol/src/qutemol.dev +++ b/cad/plugins/QuteMol/qutemol/src/qutemol.dev @@ -1,6 +1,6 @@ [Project]
FileName=qutemol.dev
-Name=qutemol
+Name=qutemolx
UnitCount=41
Type=0
Ver=3
@@ -398,10 +398,10 @@ CompilerSettings=0001000001001000000000 Icon=
ExeOutput=Default Profile
ObjectOutput=Default Profile
-OverrideOutput=0
-OverrideOutputName=qutemol1.exe
+OverrideOutput=1
+OverrideOutputName=QuteMolX.exe
HostApplication=
-CommandLine="C:\Users\Brian Helfrich\Nanorex\temp\qutemol.pdb" -a "C:\Users\Brian Helfrich\Nanorex\temp\art.txt"
+CommandLine=testosterone.pdb
UseCustomMakefile=0
CustomMakefile=
IncludeVersionInfo=0
@@ -469,3 +469,23 @@ Priority=1000 OverrideBuildCmd=0
BuildCmd=
+[Unit43]
+FileName=glh\glh_genext.h
+CompileCpp=1
+Folder=glh
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit44]
+FileName=glh\wglext.h
+CompileCpp=1
+Folder=glh
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
|