[Date Prev][Date Next][Thread Prev][Thread Next][Thread Index]
[XaraXtreme-commits] Commit Complete
Commit by : luke
Repository : xara
Revision : 1554
Date : Wed Jul 26 15:06:06 BST 2006
Changed paths:
M /Trunk/XaraLX/wxOil/camelot.cpp
M /Trunk/XaraLX/wxOil/xrc/EN/imagemagick-strings.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/ollie-strings.xrc
M /Trunk/XaraLX/wxOil/xrc/EN/xaralxonly-strings.xrc
M /Trunk/XaraLX/wxOil/xrc/startup-lx.png
Change application branding
Diff:
Index: Trunk/XaraLX/wxOil/camelot.cpp
===================================================================
--- Trunk/XaraLX/wxOil/camelot.cpp (revision 1553)
+++ Trunk/XaraLX/wxOil/camelot.cpp (revision 1554)
@@ -463,7 +463,7 @@
wxString strMessage;
#if defined(__WXMSW__)
- strMessage = wxString::Format( wxT("Xara LX
Version: %s
CDraw Version: %d.%03d
"),
+ strMessage = wxString::Format( wxT("Xara Xtreme (Linux edition)
Version: %s
CDraw Version: %d.%03d
"),
g_pszAppVersion, HIWORD(GDraw_GetVersion()), LOWORD(GDraw_GetVersion()) );
#else
#if FALSE == wxUSE_UNICODE
@@ -472,7 +472,7 @@
TCHAR pszCDrawVer[32];
camMbstowcs( pszCDrawVer, GDraw_GetSvnVersion(), 31 );
#endif
- strMessage = wxString::Format( wxT("Xara LX
Version: %s (%s)
CDraw Version: %d.%03d (%s)
Build date: %s
"),
+ strMessage = wxString::Format( wxT("Xara Xtreme (Linux edition)
Version: %s (%s)
CDraw Version: %d.%03d (%s)
Build date: %s
"),
g_pszAppVersion, g_pszSvnVersion, HIWORD(GDraw_GetVersion()), LOWORD(GDraw_GetVersion()), pszCDrawVer, CAMELOT_BUILD_DATE );
#endif
@@ -686,7 +686,7 @@
}
TRACET(_T("CCamApp::Making Frame Window"));
- m_pMainFrame = new CCamFrame( m_docManager.get(), (wxFrame *)NULL, wxT("Xara LX"),
+ m_pMainFrame = new CCamFrame( m_docManager.get(), (wxFrame *)NULL, wxT("Xara Xtreme"),
WndRect.GetPosition(), WndRect.GetSize(), wxDEFAULT_FRAME_STYLE);
#if !defined(XARA_MENUGEN)
@@ -1065,7 +1065,7 @@
wxString strMessage;
#if defined(__WXMSW__)
- strMessage = wxString::Format( wxT("Xara LX
Version: %s
CDraw Version: %d.%03d
Usage: XaraLX.exe [xar-file...]"),
+ strMessage = wxString::Format( wxT("Xara Xtreme (Linux edition)
Version: %s
CDraw Version: %d.%03d
Usage: XaraLX.exe [xar-file...]"),
g_pszAppVersion, HIWORD(GDraw_GetVersion()), LOWORD(GDraw_GetVersion()) );
#else
#if FALSE == wxUSE_UNICODE
@@ -1074,11 +1074,11 @@
TCHAR pszCDrawVer[32];
camMbstowcs( pszCDrawVer, GDraw_GetSvnVersion(), 31 );
#endif
- strMessage = wxString::Format( wxT("Xara LX
Version: %s (%s)
CDraw Version: %d.%03d (%s)
Build date: %s
Built against: " wxVERSION_STRING "
" /*"wxWidgets linked to %s
" */ "Usage: XaraLX [xar-file...]"),
+ strMessage = wxString::Format( wxT("Xara Xtreme (Linux edition)
Version: %s (%s)
CDraw Version: %d.%03d (%s)
Build date: %s
Built against: " wxVERSION_STRING "
" /*"wxWidgets linked to %s
" */ "Usage: XaraLX [xar-file...]"),
g_pszAppVersion, g_pszSvnVersion, HIWORD(GDraw_GetVersion()), LOWORD(GDraw_GetVersion()), pszCDrawVer, CAMELOT_BUILD_DATE /*,_T("Unknown")*/ );
#endif
- (void)wxMessageBox( strMessage, wxT("About Xara LX") );
+ (void)wxMessageBox( strMessage, wxT("About Xara Xtreme") );
}
StringBase& CCamApp::GetResourceDirectory()
Index: Trunk/XaraLX/wxOil/xrc/startup-lx.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: Trunk/XaraLX/wxOil/xrc/EN/imagemagick-strings.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/imagemagick-strings.xrc (revision 1553)
+++ Trunk/XaraLX/wxOil/xrc/EN/imagemagick-strings.xrc (revision 1554)
@@ -13,7 +13,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_WARN_NOIMAGEMAGICK">
- <label>Xara LX cannot find ImageMagick version 6.0.0 or above. Various bitmap filters will be disabled. To install ImageMagick, either use the package manager supplied with your distribution, or visit http://www.imagemagick.org/</label>
+ <label>Xara Xtreme cannot find ImageMagick version 6.0.0 or above. Various bitmap filters will be disabled. To install ImageMagick, either use the package manager supplied with your distribution, or visit http://www.imagemagick.org/</label>
</object>
</object>
Index: Trunk/XaraLX/wxOil/xrc/EN/ollie-strings.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/ollie-strings.xrc (revision 1553)
+++ Trunk/XaraLX/wxOil/xrc/EN/ollie-strings.xrc (revision 1554)
@@ -13,7 +13,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_ABOUTDLG2">
- <label>&About Xara Xtreme LX;Information about Xara LX ;AboutOp</label>
+ <label>&About Xara Xtreme;Information about Xara Xtreme ;AboutOp</label>
</object>
</object>
<object class="sizeritem">
Index: Trunk/XaraLX/wxOil/xrc/EN/xaralxonly-strings.xrc
===================================================================
--- Trunk/XaraLX/wxOil/xrc/EN/xaralxonly-strings.xrc (revision 1553)
+++ Trunk/XaraLX/wxOil/xrc/EN/xaralxonly-strings.xrc (revision 1554)
@@ -296,19 +296,19 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_DOOMMESSAGE">
- <label>An extremely serious error has occurred. Xara LX may be not be able to recover. If possible, save your work under a different filename and exit immediately. Do you want to attempt to save your work before quitting?</label>
+ <label>An extremely serious error has occurred. Xara Xtreme may be not be able to recover. If possible, save your work under a different filename and exit immediately. Do you want to attempt to save your work before quitting?</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_DOOMMESSAGE2">
- <label>An extremely serious error has occurred. Xara LX must quit immediately.</label>
+ <label>An extremely serious error has occurred. Xara Xtrenm must quit immediately.</label>
</object>
</object>
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_DOOMTITLE">
- <label>Xara LX</label>
+ <label>Xara Xtreme</label>
</object>
</object>
<object class="sizeritem">
@@ -320,7 +320,7 @@
<object class="sizeritem">
<flag>wxALIGN_LEFT|wxALL|wxADJUST_MINSIZE</flag>
<object class="wxStaticText" name="IDS_DOOMQUITNOW">
- <label>&Exit XaraLX now</label>
+ <label>&Exit Xara Xtreme now</label>
</object>
</object>
<object class="sizeritem">
Xara