jepler/openscad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
6393 commits 74 branches 13 tags 46 MiB
Commit graph

6393 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marius Kintel
749c70bed2 Pass current date as version when building, change version messages STATUS messages 2017-03-24 00:29:10 -04:00
Marius Kintel
82e7e13e8e Display version of found libs 2017-03-23 23:57:08 -04:00
Marius Kintel
99e0761f71 cmake Info.plist template 2017-03-23 23:23:47 -04:00
Marius Kintel
c73bebe957 Mac build fixes, added a bunch of missing defines, resources 2017-03-23 23:23:02 -04:00
Marius Kintel
3daabccf85 Added missing cmake macros 2017-03-21 00:44:03 -04:00
Marius Kintel
dd7e04baa9 Larger cleanup 2017-03-21 00:43:29 -04:00
Marius Kintel
44e9da09bb Merge branch 'master' into cmake-build 2017-03-14 20:40:31 -04:00
Marius Kintel
3a7dd67970 Fix for build against QScintilla < 2.9 2017-03-12 17:57:07 -04:00
Marius Kintel
4af51a7443 Merge pull request #1947 from kipbits/master 
Find&Replace: Highlight match-words & Display find-count (FINAL)
 2017-03-08 22:38:22 -05:00
frankenstein
1b51e518f9 replaceAll handle scintilla bug(hope this is acceptable) 
replaceAll handle scintilla bug(hope this is acceptable)
 2017-03-04 09:14:33 -05:00
frankenstein
e0744a1361 quadruple spaces to indent 
quadruple spaces to indent
 2017-03-04 08:00:15 -05:00
frankenstein
d380fc8128 Merge remote-tracking branch 'openscad/master' 2017-03-04 07:55:53 -05:00
Marius Kintel
14322d78b2 Merge pull request #1958 from nophead/issue_1956 
Issue 1956
 2017-03-02 22:12:38 -05:00
Chris
ded204074a Update StatCache.cc 
Removed another empty structure initialiser to remove warnings.
 2017-03-02 07:43:48 +00:00
Chris Palmer
841155e84e Fixed missing structure initialiser warnings. 2017-03-01 19:27:27 +00:00
frankenstein
113a8a9efb Merge remote-tracking branch 'openscad/master' 2017-03-01 13:13:27 -05:00
Chris Palmer
099d637c88 Merge branch 'issue_1956' of https://github.com/nophead/openscad into issue_1956 2017-03-01 18:11:43 +00:00
Chris Palmer
8352592795 parse now always returns the module pointer to give the dependencies. 2017-03-01 17:26:58 +00:00
Chris
77e7c82fa8 Merge branch 'master' into issue_1956 2017-03-01 14:55:05 +00:00
Chris Palmer
433076b88d Fixed deleting the same module twice, introduced by "Minor style tweaks" 2017-03-01 14:49:33 +00:00
Marius Kintel
b8c3880fde Added test cases 2017-02-28 23:36:48 -05:00
Marius Kintel
7d205e730d Test fix: This file should have a syntax error 2017-02-28 23:13:05 -05:00
Marius Kintel
55d7c118de Test fix: This file should have a syntax error 2017-02-28 23:12:48 -05:00
Marius Kintel
db7c081191 Minor style tweaks 2017-02-28 22:56:54 -05:00
Marius Kintel
b2c44a881d Merge branch 'master' of github.com:openscad/openscad 2017-02-28 22:55:19 -05:00
Marius Kintel
58a0f9b47b Minor style tweaks 2017-02-28 22:53:33 -05:00
Marius Kintel
b579935d38 Merge branch 'issue_1956' of https://github.com/nophead/openscad 2017-02-28 22:29:01 -05:00
Marius Kintel
cd67b3f0f4 Remove erroneously committed generated files 2017-02-28 22:04:07 -05:00
frankenstein
1ddc32d613 Merge remote-tracking branch 'openscad/master' 2017-02-24 20:12:51 -05:00
Marius Kintel
04b09bcb84 Merge pull request #1962 from nophead/issue_1961 
Fix for #1961: Warnings and errors only shown five times
 2017-02-24 10:19:38 -05:00
Chris Palmer
f10bae8aee Fix for #1961: Warnings and errors only shown five times 2017-02-24 14:34:51 +00:00
Chris Palmer
2ab09079e1 Fixed tabs 2017-02-22 11:44:01 +00:00
Chris Palmer
25f0ffa011 Fix for issue #1956. 
A copy of the last successful parse is maintained in MainWindow
and ModuleCache::cache_entry so that includes can be checked for changes
after parse has returned null due to a syntax error.
 2017-02-22 11:40:56 +00:00
Marius Kintel
56d73a422a Merge pull request #1950 from hyperair/fix-underscore-word-movement 
Drop underscore from syntax table in scad-mode
 2017-02-19 23:03:08 -05:00
Chow Loong Jin
52daefb603 Drop underscore from syntax table in scad-mode 
This allows meta-b/f to work properly when navigating variable names that
contain underscores.
 2017-02-18 20:49:22 +08:00
frankenstein
af163944d2 fix openscad.pro 
fix openscad.pro
 2017-02-14 12:27:18 -05:00
frankenstein
e891833013 Find&Replace: Highlight match-words & Display find-count (FINAL) 
These changes are to implement highlighting of found matches for
enhanced find&replace functionality.

Highlighting was implemented by designating a new indicator number 9 to
represent all find-related-indicators, and are updated through the
addition of the following functions&variables:
ScintillaEditor::resetFindIndicators(
MainWindow::hideFind(
MainWindow::showFind(
MainWindow::showFindAndReplace(
& variable:
ScintillaEditor.findIndicatorNumber

A few other changes were made to current class member names to prevent
confusion with the new functionality, and to improve readability:
MainWindow::find(
   ->   MainWindow::showFind(
MainWindow::findAndReplace(
   ->   MainWindow::showFindAndReplace(
ScintillaEditor.indicatorNumber
   ->   ScintillaEditor.errorindicatorNumber

I also made a few adjustments to MainWindow.ui I tried to go for a
compromise of the original legacy design, and what changes have been
made to the design, I hope this astetic change is accepted along with
the find-highlight-functionality as 1 PR.

Also Note, resetFindIndicators( returns an int. this is a find count
number, and I still have plans to display a find count in my next PR.

Thankyou

Addition: this PR also include working find-count display

there was some confusion getting MCAD configured properly
reference PR's:
#1922
#1938
 2017-02-14 11:48:58 -05:00
Marius Kintel
382528011f Tagged more tests as heavy 2017-02-14 00:47:29 -05:00
Marius Kintel
4224818716 Green refactoring: Use the new EvalContext::resolveArguments() function 2017-02-14 00:31:09 -05:00
Marius Kintel
0321eb9ae5 #1923: Fix regression: Default argument values were looked up in the call scope instead of the lexical scope 2017-02-14 00:20:29 -05:00
Marius Kintel
e990ac49eb Used the qmake-defined OBJECTS_DIR rather than the Makefile-defined one to work around double slash issue with rpm 2017-02-11 13:52:18 -05:00
Marius Kintel
e4c6f0d821 Merge pull request #1929 from nophead/issue_1928 
Fix for issue #1928 Automatic Reload and Preview doesn't work properl…
 2017-02-11 12:28:52 -05:00
Marius Kintel
6a448c6174 Merge remote-tracking branch 'origin/master' into nophead-issue_1928 2017-02-11 12:25:44 -05:00
Marius Kintel
9171741494 Some tuning to adapt to changes in OpenSCAD 2017-02-11 12:25:10 -05:00
Marius Kintel
c5c3e7f5f2 Added missing file 2017-02-11 12:24:18 -05:00
Marius Kintel
730a8613e1 #1929 Added testcase 2017-02-11 11:40:35 -05:00
Marius Kintel
930a6ab87d Merge remote-tracking branch 'origin/master' into nophead-issue_1928 2017-02-11 11:22:25 -05:00
Marius Kintel
2ef5333d8d Merge pull request #1932 from openscad/issue1931 
Solves issue #1931
 2017-02-08 23:54:08 -05:00
Marius Kintel
a7e5ac4305 Merge pull request #1934 from openscad/keep-definition-order 
Keep definition order of modules and functions when exporting AST
 2017-02-08 23:42:53 -05:00
amarjeet
d9e8c687eb Added test case 2017-02-08 21:42:50 +05:30