Skip to content

Commit

Permalink
user manual changes, gui updates, background tool path generation, ru…
Browse files Browse the repository at this point in the history
…n status indication, version bump
  • Loading branch information
jcoffland committed Mar 16, 2014
1 parent 7a2127c commit ade51ba
Show file tree
Hide file tree
Showing 40 changed files with 1,020 additions and 487 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ build
config.log
package.txt

# Backup files
*~
5 changes: 3 additions & 2 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if not os.environ.get('CBANG_HOME'): os.environ['CBANG_HOME'] = './cbang'
cbang = os.environ.get('CBANG_HOME')

# Version
version = '0.2.0'
version = '0.2.1'
major, minor, revision = version.split('.')

# Setup
Expand Down Expand Up @@ -219,7 +219,7 @@ pkg = env.Packager(
rpm_group = 'Applications/Engineering',
rpm_requires = 'expat, bzip2-libs',

app_id = 'org.openscam',
app_id = 'org.openscam.pkg',
app_resources = [['osx/Resources', '.']],
pkg_resources = [['osx/Resources', '.']],
app_copyright = 'Copyright 2011-2014, Cauldron Development LLC',
Expand All @@ -228,6 +228,7 @@ pkg = env.Packager(
'CFBundleExecutable': 'openscam', # Overrides 'programs'
'CFBundleIconFile': 'openscam.icns',
},
app_finish_cmd = 'macdeployqt',
)

AlwaysBuild(pkg)
Expand Down
2 changes: 1 addition & 1 deletion doc/web/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ clean:
rm -rf http jade/{manual,main}/{template,menu}.jade

publish: http
rsync -av http/ [email protected]:/var/www/openscam.org/http/
rsync -Lav http/ [email protected]:/var/www/openscam.org/http/test/
12 changes: 6 additions & 6 deletions doc/web/jade/footer.jade
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
- var ggroup = 'http://groups.google.com/group/openscam-';

footer.bs-footer(role='contentinfo')
.container
.bs-social
ul.bs-social-buttons
li.github-star
li.github-fork
li
iframe.github-btn(src='http://ghbtns.com/github-btn.html?user=jcoffland&repo=OpenSCAM&type=watch&count=true', width='100', height='20', title='Star on GitHub')
li
iframe.github-btn(src='http://ghbtns.com/github-btn.html?user=jcoffland&repo=OpenSCAM&type=fork&count=true', width='102', height='20', title='Fork on GitHub')
li
a.footer-button(href='http://groups.google.com/group/openscam-announcements/boxsubscribe')
a.footer-button(href = ggroup + '-announcements/boxsubscribe')
h1 Subscribe
h2 to Email Updates
li
a.footer-button(href='http://groups.google.com/group/openscam-users/boxsubscribe')
a.footer-button(href = ggroup + '-users/boxsubscribe')
h1 Join
h2 the Users Forum

Expand Down
1 change: 1 addition & 0 deletions doc/web/jade/manual/overview.jade
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ a(href='images/manual/overview.png', rel='shadowbox')
img(src='images/manual/thumbs/overview.png')

h3 Tooltips
p
| All of the GUI components have tooltips which you can view by holding
| the mouse pointer over component for a few seconds. Tooltips explain
| the component's purpose.
14 changes: 14 additions & 0 deletions doc/web/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,18 @@ $(function() {

// Enable shadow box
Shadowbox.init({displayNav: true});

// Load GitHub iframes
var base = 'http://ghbtns.com/github-btn.html?' +
'user=CauldronDevelopmentLLC&repo=OpenSCAM&count=true'
$('<iframe>')
.attr({src: base + '&type=watch', title: 'Star on GitHub',
width: 100, height: 20})
.addClass('github-btn')
.appendTo('.github-star');
$('<iframe>')
.attr({src: base + '&type=fork', title: 'Fork on GitHub',
width: 100, height: 20})
.addClass('github-btn')
.appendTo('.github-fork');
});
1 change: 0 additions & 1 deletion examples/aztec_calendar/aztec_calendar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
</nc-files>

<!-- Project -->
<notes>This project has a lot of intricate detail which can take a very long time to simulate.</notes>
<units v='INCH'/>

<!-- Renderer -->
Expand Down
Binary file removed qt/icons/idle.gif
Binary file not shown.
Binary file modified qt/icons/running.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions qt/openscam.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,7 @@
<file>images/paypal_donate.gif</file>
<file>images/paypal.gif</file>
<file>icons/cut_surface.png</file>
<file>icons/running.gif</file>
<file>icons/idle.png</file>
</qresource>
</RCC>
Loading

0 comments on commit ade51ba

Please sign in to comment.