Browse files

Prepare for release 2.0b

  • Loading branch information...
1 parent ee3e101 commit 6d1a4b4e24501f1c197e2200bf5306579ef8da18 Alexander Stigsen committed Oct 7, 2010
Showing with 17 additions and 112 deletions.
  1. +1 −0 ecore/Catalyst.h
  2. BIN ecore/ecore.lib
  3. BIN ecore/ecored.lib
  4. +2 −2 src/SettingsDlg.cpp
  5. +2 −2 src/e-exe/e-exe.vcproj
  6. +2 −2 src/e.iss
  7. +0 −100 src/e.vcproj
  8. +5 −4 src/eAbout.cpp
  9. +3 −0 src/eAbout.h
  10. +2 −2 src/eApp.cpp
View
1 ecore/Catalyst.h
@@ -387,6 +387,7 @@ class Catalyst {
// Registration functions
bool IsRegistered() const;
+ bool NeedLicenseUpdate() const;
bool IsExpired() const;
int DaysLeftOfTrial() const;
int TotalDays() const;
View
BIN ecore/ecore.lib
Binary file not shown.
View
BIN ecore/ecored.lib
Binary file not shown.
View
4 src/SettingsDlg.cpp
@@ -427,7 +427,7 @@ void SettingsDlg::OnCheckBom(wxCommandEvent& event) {
void SettingsDlg::OnButtonOk(wxCommandEvent& WXUNUSED(event)) {
// Check if name & profile pic changed.
- wxString name = m_ctrlUserName->GetLabel();
+ /*wxString name = m_ctrlUserName->GetLabel();
cxLOCK_READ(m_catalyst)
if (name == catalyst.GetUserName(0)) name.clear(); // empty string means no change
cxENDLOCK
@@ -438,7 +438,7 @@ void SettingsDlg::OnButtonOk(wxCommandEvent& WXUNUSED(event)) {
cxLOCK_WRITE(m_catalyst)
catalyst.SetProfile(name, m_userImage);
cxENDLOCK
- }
+ }*/
if (m_envPage->VarsChanged()) {
m_settings.env.clear();
View
4 src/e-exe/e-exe.vcproj
@@ -139,10 +139,10 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libcmt.lib libcpmt.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib wxbase28u.lib wxbase28u_net.lib wxmsw28u_core.lib wxmsw28u_adv.lib wxmsw28u_aui.lib wxpng.lib wxjpeg.lib wxzlib.lib wxregexu.lib mk4vc60s.lib libtommath.lib libtomcrypt.lib pcre.lib tinyxml.lib dbghelp.lib libcurl.lib winmm.lib e.lib"
+ AdditionalDependencies="libcmt.lib libcpmt.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib wxbase28u.lib wxbase28u_net.lib wxmsw28u_core.lib wxmsw28u_adv.lib wxmsw28u_aui.lib wxpng.lib wxjpeg.lib wxzlib.lib wxregexu.lib mk4vc60s.lib libtommath.lib libtomcrypt.lib pcre.lib tinyxml.lib dbghelp.lib libcurl.lib winmm.lib e.lib ecore.lib"
OutputFile="$(OutDir)\e.exe"
LinkIncremental="1"
- AdditionalLibraryDirectories="..\..\external\wxwidgets\lib\vc_lib;..\..\external\pcre;..\..\external\libtomcrypt;..\..\external\libtommath;..\..\external\tinyxml\Release;..\..\external\curl\lib\Release;..\..\external\metakit\builds;..\Release;..\..\external\boost\stage\lib"
+ AdditionalLibraryDirectories="..\..\external\wxwidgets\lib\vc_lib;..\..\external\pcre;..\..\external\libtomcrypt;..\..\external\libtommath;..\..\external\tinyxml\Release;..\..\external\curl\lib\Release;..\..\external\metakit\builds;..\Release;..\..\external\boost\stage\lib;..\..\ecore"
IgnoreAllDefaultLibraries="false"
IgnoreDefaultLibraryNames="libc.lib,MSVCRTD.lib,msvcrt.lib"
GenerateDebugInformation="true"
View
4 src/e.iss
@@ -9,7 +9,7 @@
[Setup]
AppName=e
-AppVerName=e - v1.0.43
+AppVerName=e - v2.0b
AppMutex=eApp
OutputBaseFilename=e_setup
AppPublisherURL=http://www.e-texteditor.com/
@@ -67,7 +67,7 @@ Name: "{userdesktop}\e - texteditor"; Filename: "{app}\e.exe"; Tasks: desktopico
Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\e - texteditor"; Filename: "{app}\e.exe"; Tasks: quicklaunchicon
[Registry]
-Root: HKCU; Subkey: "Software\e"; ValueType: string; ValueName: "version"; ValueData: "1.0.43 (211)"
+Root: HKCU; Subkey: "Software\e"; ValueType: string; ValueName: "version"; ValueData: "2.0b (216)"
Root: HKCU; Subkey: "Software\e"; ValueType: string; ValueName: "path"; ValueData: "{app}\e.exe"
Root: HKCR; Subkey: "txtfile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\e.exe,1"; Tasks: associate
Root: HKCR; Subkey: "txtfile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\e.exe"" ""%1"""; Tasks: associate
View
100 src/e.vcproj
@@ -1258,46 +1258,6 @@
>
</File>
<File
- RelativePath=".\Catalyst.cpp"
- >
- </File>
- <File
- RelativePath=".\Catalyst.h"
- >
- </File>
- <File
- RelativePath=".\cData.cpp"
- >
- </File>
- <File
- RelativePath=".\cData.h"
- >
- </File>
- <File
- RelativePath=".\cDataBool.h"
- >
- </File>
- <File
- RelativePath=".\cDataList.cpp"
- >
- </File>
- <File
- RelativePath=".\cDataList.h"
- >
- </File>
- <File
- RelativePath=".\cDataNum.h"
- >
- </File>
- <File
- RelativePath=".\cDataText.cpp"
- >
- </File>
- <File
- RelativePath=".\cDataText.h"
- >
- </File>
- <File
RelativePath="Cell.cpp"
>
</File>
@@ -1342,38 +1302,6 @@
>
</File>
<File
- RelativePath=".\cxInternal.cpp"
- >
- </File>
- <File
- RelativePath=".\cxInternal.h"
- >
- </File>
- <File
- RelativePath=".\DataList.cpp"
- >
- </File>
- <File
- RelativePath=".\DataList.h"
- >
- </File>
- <File
- RelativePath=".\DataText.cpp"
- >
- </File>
- <File
- RelativePath=".\DataText.h"
- >
- </File>
- <File
- RelativePath=".\diff.cpp"
- >
- </File>
- <File
- RelativePath=".\diff.h"
- >
- </File>
- <File
RelativePath="diff.xpm"
>
</File>
@@ -1394,14 +1322,6 @@
>
</File>
<File
- RelativePath=".\doc_byte_iter.cpp"
- >
- </File>
- <File
- RelativePath=".\doc_byte_iter.h"
- >
- </File>
- <File
RelativePath="DocHistory.cpp"
>
</File>
@@ -1550,10 +1470,6 @@
>
</File>
<File
- RelativePath=".\Fletcher.h"
- >
- </File>
- <File
RelativePath="Fold.cpp"
>
</File>
@@ -1586,14 +1502,6 @@
>
</File>
<File
- RelativePath=".\HashStream.cpp"
- >
- </File>
- <File
- RelativePath=".\HashStream.h"
- >
- </File>
- <File
RelativePath="HtmlOutputPane.cpp"
>
</File>
@@ -1698,14 +1606,6 @@
>
</File>
<File
- RelativePath=".\RegisterDlg.cpp"
- >
- </File>
- <File
- RelativePath=".\RegisterDlg.h"
- >
- </File>
- <File
RelativePath="RemoteThread.cpp"
>
</File>
View
9 src/eAbout.cpp
@@ -26,7 +26,7 @@ END_EVENT_TABLE()
eAbout::eAbout(wxWindow *parent, const Catalyst& cat)
: wxDialog (parent, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE) {
const bool isregistered = cat.IsRegistered();
- const bool needLicenseUpdate = cat.NeedLicenseUpdate();
+ m_needLicenseUpdate = cat.NeedLicenseUpdate();
const wxString& versionName = wxGetApp().VersionName();
SetTitle (_("About e"));
@@ -49,7 +49,7 @@ eAbout::eAbout(wxWindow *parent, const Catalyst& cat)
wxString infotext = _("e is a fast and elegant text editor with many innovative features.\n\n");
if (isregistered) infotext += _("Thanks for your registration of this unique tool.");
- else if (needLicenseUpdate) infotext += _("Thanks for your use of this unique tool.");
+ else if (m_needLicenseUpdate) infotext += _("Thanks for your use of this unique tool.");
else infotext += _("This is your 30 days evaluation of this unique tool.");
infotext += _(" We hope you will have a lot of fun using it.\n\nWe are not a big corporation so we can assure you the fee you paid for the registration will go directly to the future software development.\n\nAgain thanks for your support.");
@@ -73,7 +73,7 @@ eAbout::eAbout(wxWindow *parent, const Catalyst& cat)
infopane->Add (okButton, 0, wxALIGN_RIGHT|wxALIGN_BOTTOM|wxLEFT|wxBOTTOM, 10);
}
else {
- if (needLicenseUpdate) {
+ if (m_needLicenseUpdate) {
infopane->Add(new wxStaticText(this, -1, _("Your license is not valid for this release.")), 0, wxALIGN_CENTER);
infopane->Add(new wxStaticText(this, -1, _("But it does qualify for an update at a reduced price.")), 0, wxALIGN_CENTER);
}
@@ -129,7 +129,8 @@ eAbout::eAbout(wxWindow *parent, const Catalyst& cat)
}
void eAbout::OnBuy(wxCommandEvent& WXUNUSED(event)) {
- wxLaunchDefaultBrowser(wxT("http://www.e-texteditor.com/order.html"));
+ if (m_needLicenseUpdate) wxLaunchDefaultBrowser(wxT("https://www.plimus.com/jsp/buynow.jsp?contractId=2862706"));
+ else wxLaunchDefaultBrowser(wxT("http://www.e-texteditor.com/order.html"));
}
void eAbout::OnRegister(wxCommandEvent& WXUNUSED(event)) {
View
3 src/eAbout.h
@@ -45,6 +45,9 @@ class eAbout : public wxDialog {
// Member variables
wxBitmap bitmap;
};
+
+ // Member variables
+ bool m_needLicenseUpdate;
};
#endif // __EABOUT_H_
View
4 src/eApp.cpp
@@ -141,8 +141,8 @@ bool eApp::OnInit() {
// App info
const wxString appId = wxString::Format(wxT("eApp-%s"), wxGetUserId().c_str());
- m_version_id = 211; // <-------------- INTERNAL VERSION NUMBER
- m_version_name = wxT("1.0.43"); // <-- VERSION NAME
+ m_version_id = 216; // <-------------- INTERNAL VERSION NUMBER
+ m_version_name = wxT("2.0b"); // <-- VERSION NAME
// Option vars
m_lineNum = 0;

0 comments on commit 6d1a4b4

Please sign in to comment.