Permalink
Browse files

Merge commit 'upstream/master' into linux

  • Loading branch information...
2 parents a24f244 + f37c22d commit 5c0bda659eff46089e7a10aee194d6311b5c60a3 @tea tea committed May 5, 2009
Showing with 6,616 additions and 8,415 deletions.
  1. +3 −46 ecore/Catalyst.h
  2. BIN ecore/ecore.lib
  3. BIN ecore/ecored.lib
  4. BIN ecore/libecore.so
  5. BIN ecore/libecore64.so
  6. BIN ecore/libecored.so
  7. BIN ecore/libecored64.so
  8. +1 −2 external/readme.txt
  9. +3 −0 linux-notes.txt
  10. +44 −2 readme.txt
  11. +0 −1,643 src/BundleEditor.cpp
  12. +0 −306 src/BundleEditor.h
  13. +13 −16 src/BundleManager.cpp
  14. +4 −1 src/BundleManager.h
  15. +1 −5 src/BundleMenu.cpp
  16. +0 −742 src/BundleMenuEditor.cpp
  17. +2 −3 src/BundlePane.cpp
  18. +1 −1 src/BundlePane.h
  19. +0 −1 src/CommitDlg.cpp
  20. +11 −19 src/CygwinDlg.cpp
  21. +2 −6 src/CygwinDlg.h
  22. +5 −3 src/Document.cpp
  23. +271 −671 src/EditorCtrl.cpp
  24. +18 −63 src/EditorCtrl.h
  25. +3,860 −4,028 src/EditorFrame.cpp
  26. +3 −10 src/EditorFrame.h
  27. +19 −6 src/EditorPrintout.cpp
  28. +3 −3 src/EditorPrintout.h
  29. +69 −5 src/Execute.cpp
  30. +3 −0 src/Execute.h
  31. +3 −3 src/FastDC.h
  32. +1 −0 src/FindCmdDlg.cpp
  33. +0 −1 src/FindCmdDlg.h
  34. +23 −0 src/FindFlags.h
  35. +31 −35 src/FixedLine.cpp
  36. +1 −3 src/FixedLine.h
  37. +2 −3 src/GutterCtrl.cpp
  38. +23 −0 src/IEditorDoAction.h
  39. +39 −0 src/IFoldingEditor.h
  40. +18 −0 src/IPrintableDocument.h
  41. +7 −18 src/LineListNoWrap.cpp
  42. +33 −33 src/LineListWrap.cpp
  43. +50 −53 src/Lines.cpp
  44. +3 −5 src/Lines.h
  45. +6 −0 src/Makefile
  46. +15 −28 src/PreviewDlg.cpp
  47. +3 −4 src/PreviewDlg.h
  48. +12 −14 src/ProjectPane.cpp
  49. +1 −0 src/ProjectPane.h
  50. +9 −25 src/RemoteProfileDlg.cpp
  51. +6 −4 src/RemoteProfileDlg.h
  52. +88 −38 src/SearchPanel.cpp
  53. +12 −6 src/SearchPanel.h
  54. +156 −78 src/SettingsDlg.cpp
  55. +25 −2 src/SettingsDlg.h
  56. +129 −0 src/ShellRunner.cpp
  57. +22 −0 src/ShellRunner.h
  58. +63 −64 src/SnippetHandler.cpp
  59. +2 −3 src/ThemeEditor.cpp
  60. +1 −1 src/ThemeEditor.h
  61. +67 −70 src/VersionTree.cpp
  62. +44 −66 src/e.vcproj
  63. +69 −51 src/eApp.cpp
  64. +9 −16 src/eApp.h
  65. +5 −0 src/eAppSettings.cpp
  66. +329 −0 src/eDocumentPath.cpp
  67. +44 −0 src/eDocumentPath.h
  68. +605 −0 src/eSettings.cpp
  69. +99 −0 src/eSettings.h
  70. +37 −0 src/jsonval.cpp
  71. +2 −0 src/jsonval.h
  72. +2 −0 src/jsonwriter.cpp
  73. +52 −58 src/matchers.cpp
  74. +27 −30 src/plistHandler.cpp
  75. +28 −34 src/styler_searchhl.cpp
  76. +1 −8 src/styler_searchhl.h
  77. +63 −69 src/styler_syntax.cpp
  78. +1 −2 src/styler_syntax.h
  79. +9 −6 src/tm_syntaxhandler.cpp
  80. +2 −2 src/tm_syntaxhandler.h
  81. +1 −0 building_win.txt → windows-notes.txt
View
@@ -64,6 +64,7 @@ class Document;
class SyncEvent;
class RemoteProfile;
class cxInternal;
+class eSettings;
// Type definitions
typedef int REVISION_ID; // DOCUMENT_ID
@@ -323,6 +324,7 @@ class Catalyst {
bool IsMirroredSpecific(const doc_id& di) const;
bool GetMirrorPaths(const doc_id& di, wxArrayString& paths) const;
bool GetMirrorPathsForDraft(const doc_id& di, wxArrayString& paths) const;
+ bool VerifyMirror(const wxString& path, const doc_id& di) const;
Dispatcher& GetDispatcher();
@@ -339,39 +341,7 @@ class Catalyst {
// Settings functions
const wxLongLong& GetId() const;
- int GetPageCount() const;
- void SetPageSettings(int page_id, const wxString& path, doc_id di, int pos, int topline, const wxString& syntax, const vector<unsigned int>& folds, const vector<cxBookmark>& bookmarks);
- void GetPageSettings(int page_id, wxString& path, doc_id& di, int& pos, int& topline, wxString& syntax, vector<unsigned int>& folds, vector<unsigned int>& bookmarks) const;
- wxString GetPagePath(unsigned int page_id) const;
- void DeletePageSettings(int page_id);
- void DeleteAllPageSettings();
- void ValidatePagesSettings();
- void SetSettingBool(const wxString& name, bool value);
- void SetSettingInt(const wxString& name, int value);
- void SetSettingLong(const wxString& name, wxLongLong value);
- void SetSettingString(const wxString& name, const wxString& value);
- bool GetSettingBool(const wxString& name, bool& value) const;
- bool GetSettingInt(const wxString& name, int& value) const;
- bool GetSettingLong(const wxString& name, wxLongLong& value) const;
- bool GetSettingString(const wxString& name, wxString& value) const;
- void RemoveSettingString(const wxString& name);
- void RemoveSettingInt(const wxString& name);
- void RemoveSettingBool(const wxString& name);
- void AddRecentFile(const wxString& path);
- void AddRecentProject(const wxString& path);
- void GetRecentFiles(wxArrayString& recentfiles) const;
- void GetRecentProjects(wxArrayString& recentprojects) const;
-
- // Remote profiles
- unsigned int GetRemoteProfileCount() const;
- wxString GetRemoteProfileName(unsigned int profile_id) const;
- unsigned int AddRemoteProfile(const RemoteProfile& profile);
- void SetRemoteProfile(unsigned int profile_id, const RemoteProfile& profile);
- const RemoteProfile* GetRemoteProfile(unsigned int profile_id);
- const RemoteProfile* GetRemoteProfileFromUrl(const wxString& url, bool withDir);
- void SetRemoteProfileLogin(const RemoteProfile* rp, const wxString& username, const wxString& pwd, bool toDb);
- //bool GetRemoteProfile(const wxString& url, RemoteProfile& profile) const;
- void DeleteRemoteProfile(unsigned int profile_id);
+ void MoveOldSettings(eSettings& settings);
// List of documents
void GetDocList(vector<doc_id>& doclist) const;
@@ -432,25 +402,12 @@ class Catalyst {
// Utility functions
wxLongLong GetRand64() const;
- // Remote profiles
- RemoteProfile* DoGetRemoteProfile(unsigned int profile_id);
- void SaveRemoteProfile(RemoteProfile* rp);
-
// Member variables
mutable RecursiveCriticalSection m_critSec;
cxInternal* m_i;
// Settings
wxLongLong m_id;
- c4_View m_vPages;
- c4_View m_v64hash;
- c4_View m_vInthash;
- c4_View m_vStringhash;
- c4_View m_vRecentFiles;
- c4_View m_vRecentPrj;
-
- c4_View m_vRemotes;
- auto_vector<RemoteProfile> m_tempRemotes;
friend class Document;
friend class cxInternal;
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
@@ -28,8 +28,7 @@ The libraries can be manually downloaded from the following sites:
tinyxml
http://sourceforge.net/projects/tinyxml
-They all need to be built as static libraries. If you have problems
-with any of these libs, you should be able to upgrade to a later version.
+They all need to be built as static libraries.
There are project files for Visual C++ in the subdir "build_msvc".
If you choose to use these, they will have to be copied into the source
View
@@ -28,6 +28,9 @@ Packages required by WebKit:
- sqlite3 (ubuntu: libsqlite3-dev)
- icu (ubuntu: libicu-dev)
- libjpeg (ubuntu: libjpeg62-dev)
+- bison
+- flex
+- gperf
== Bundling e into tar.gz, rpm or deb packages
View
@@ -1,8 +1,50 @@
This repository contains the source and binaries for the "e" text editor.
+= Links & Information =
Homepage: http://www.e-texteditor.com/
IRC: irc://freenode/etexteditor
+= Git notes =
+Windows users in particulary should take note of the Line Endings section.
-Additional dependencies and add-ons
-wxCocoaDialog: http://github.com/adamv/wxcocoadialog/tree/master
+== Line Endings ==
+This is a Liux/Windows cross-platform project. Because of this and git's behavior,
+file line-endings are important to get right and keep consistent.
+
+The default for all new files in this repo is to use UNIX-style "LF" endings.
+The only time Windows-style line endings "CRLF" should be used is if some
+Windows-specific file requires them to work properly.
+
+=== Git settings ===
+For Windows users, edit .git/config and under [core] add the setting:
+ autocrlf = false
+
+This will preserve line-endings as they exist in the repo.
+
+=== Visual Studio ===
+
+Visual Studio does *not* have a setting for "always use LF"; to save a file
+with different line ends you must use the "File | Advanced Save Options"
+dialog and then re-save the file.
+
+Always `git diff` before committing; if every line in a file is marked as
+changed then you probably converted CRLF to LF accidentally. Resave the file
+and re-diff before committing.
+
+
+= Building e =
+See `windows-notes.txt` or `linux-notes.txt` as appropriate.
+
+= Additional dependencies and add-ons =
+ * e Support folder & built-in themes and bundles: http://code.google.com/p/ebundles/
+ * wxCocoaDialog: http://github.com/adamv/wxcocoadialog/tree/master
+ * e-find-in-files: http://github.com/adamv/e-find-in-files/tree/master
+
+= Bugs, Build Problems and Feature Requests =
+GitHub now has an issue tracking feature. e itself already has several
+avenues for bug reports and feature requests, as can be found from the
+e homepage.
+
+Issues related to building and packaging e itself, or suggested code changes/
+refactorings may be placed in the GitHub issue tracker:
+ * http://github.com/etexteditor/e/issues
Oops, something went wrong.

0 comments on commit 5c0bda6

Please sign in to comment.