Skip to content
This repository was archived by the owner on Nov 14, 2017. It is now read-only.

Merge both projects#4

Open
malublu wants to merge 59 commits intomalublu:masterfrom
engor:master
Open

Merge both projects#4
malublu wants to merge 59 commits intomalublu:masterfrom
engor:master

Conversation

@malublu
Copy link
Owner

@malublu malublu commented Mar 21, 2016

No description provided.

engor added 30 commits August 29, 2014 16:08
Conflicts:
	jentos_ide.pro.user
…mserver - you can see you html5 game always in one window inside the ide, not in every-time-new-browser-tab.
a) add parsing of properties ('property' keyword);
b) add parsing of private section of a classes.
2. Editor
a) not add chars " ' ) ] if they already were under cursor;
b) add settings option "show autocomplete list after X typed chars" (it was 3);
c) remove "lock targets" button, because disable comboboxes without it;
3. Rename app to "Jentos.Code".
* Icons - new icons.
* Add "Class Info" button to Source dock panel.
*  Add Undo/Redo buttons into Toolbar.
*! Add "Add property dialog" - to context menu in editor and in View item. It makes property addition very fast.
* Ctrl+E - remove line under cursor.
* Open Paths section in options dialog when monkey path isn't set (usually, on first start).
*! Fixed: Slow down when restore window from minimized - Oh! showEvent is emitted on restore, but it have overhead - show splash with 2 sec waiting, parse all monkey modules.
…qt can't load from github via https (need to add ssl dll).
* Fix: nullpointer occured when fill autocomplete list. it was not totally tested new function.
…ons -- Analyzer).

* Refactor for theme adjusting.
start to add new save-on-close dialog.
add "save on close" dialog - it allow to select files to be saved.
if try to set incorrect theme - it changed to default NetBeans.
Fix: crashed when type " ' ) ] at the end of line.
not set default theme colors automatically.
combine panels Editor and Themes in Options.
…y from color chooser dialog; some redesign.

* Themes: set qt_creator by default.
…cursor to mouse pos, so it does not interfere to ctrl+c/v/x operations.

Fix for add property - forgot to add 'Property' keyword.
ToolTip: add (property) instead of (method) for properties.
engor and others added 26 commits March 17, 2016 19:13
…ut must only selected in list.

New: show autocomplete after typing 'New_' (here: _ is space). if ident in line has type - list will contain this word, else - all classes names.
Improve parsing of := , including eachin case.
…caps while we are typing word. add options - so you can disable it.

Add switch to Insert / Overwrite mode by pressing Insert key.
…rect type Bool / Int / Float / String - including funcs and params names.

Remove snippets logic from autoformat function - here is a bad place for it.
Fix: app crash after closing file when a few files is opened.
change tab index when open Options for setting monkey path.
fixed: autocaps first letter - for empty line produce crash.
… blocks.

* fixed insertion of :Void for methods. and now not add it if method contains short type (#,$,%,?).
* Open images by double-click in project area. write function to show image. use it for context menu action and for double click event.
small and big are types in cpp
enabled rdp for debuggin
@engor engor deleted the master branch September 1, 2016 05:05
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants