chiark
/
gitweb
/
~ianmdlvl
/
cura.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
9b26b5b
)
Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine
13.05
author
daid303
<daid303@gmail.com>
Tue, 21 May 2013 08:07:17 +0000
(10:07 +0200)
committer
daid303
<daid303@gmail.com>
Tue, 21 May 2013 08:07:17 +0000
(10:07 +0200)
53 files changed:
Cura/gui/sceneView.py
patch
|
blob
|
history
Cura/resources/images/all-at-once-off.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/all-at-once-on.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/autoplace.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/copy.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/cut-mesh.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/info-off.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/info-on.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/move-down.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/move-up.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-3d-off.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-3d-on.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-add.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-max-size.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-mirror-x-off.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-mirror-x-on.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-mirror-y-off.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-mirror-y-on.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-mirror-z-off.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-mirror-z-on.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-mul-x-add.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-mul-x-sub.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-mul-y-add.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-mul-y-sub.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-remove.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-rotate.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-scale.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-swap-xz-off.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-swap-xz-on.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-swap-yz-off.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-swap-yz-on.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-top-off.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/object-top-on.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/open.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/preferences.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/save-combination.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/save.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/set-profile.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/slice.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/steepOverhang-off.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/steepOverhang-on.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/view-border-off.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/view-border-on.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/view-gcode-off.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/view-gcode-on.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/view-mixed-off.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/view-mixed-on.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/view-normal-off.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/view-normal-on.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/view-transparent-off.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/view-transparent-on.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/view-xray-off.png
[deleted file]
patch
|
blob
|
history
Cura/resources/images/view-xray-on.png
[deleted file]
patch
|
blob
|
history
diff --git
a/Cura/gui/sceneView.py
b/Cura/gui/sceneView.py
index f69657438a3844142e4a23df1be80afee9cd677a..df87676dcbb16126d95d4bff8b57d8a86cba5614 100644
(file)
--- a/
Cura/gui/sceneView.py
+++ b/
Cura/gui/sceneView.py
@@
-450,6
+450,8
@@
class SceneView(openglGui.glGuiPanel):
self.layerSelect.setValue(self.layerSelect.getMaxValue())
else:
self.layerSelect.setRange(1, len(self._gcode.layerList) - 1)
+ if self.viewMode == 'gcode':
+ self._queueRefresh()
return False
def loadScene(self, fileList):
diff --git
a/Cura/resources/images/all-at-once-off.png
b/Cura/resources/images/all-at-once-off.png
deleted file mode 100644
(file)
index
4dcfe3b
..0000000
Binary files a/Cura/resources/images/all-at-once-off.png and /dev/null differ
diff --git
a/Cura/resources/images/all-at-once-on.png
b/Cura/resources/images/all-at-once-on.png
deleted file mode 100644
(file)
index
11987f0
..0000000
Binary files a/Cura/resources/images/all-at-once-on.png and /dev/null differ
diff --git
a/Cura/resources/images/autoplace.png
b/Cura/resources/images/autoplace.png
deleted file mode 100644
(file)
index
440295c
..0000000
Binary files a/Cura/resources/images/autoplace.png and /dev/null differ
diff --git
a/Cura/resources/images/copy.png
b/Cura/resources/images/copy.png
deleted file mode 100644
(file)
index
5cdeb5f
..0000000
Binary files a/Cura/resources/images/copy.png and /dev/null differ
diff --git
a/Cura/resources/images/cut-mesh.png
b/Cura/resources/images/cut-mesh.png
deleted file mode 100644
(file)
index
f702874
..0000000
Binary files a/Cura/resources/images/cut-mesh.png and /dev/null differ
diff --git
a/Cura/resources/images/info-off.png
b/Cura/resources/images/info-off.png
deleted file mode 100644
(file)
index
d7c44e1
..0000000
Binary files a/Cura/resources/images/info-off.png and /dev/null differ
diff --git
a/Cura/resources/images/info-on.png
b/Cura/resources/images/info-on.png
deleted file mode 100644
(file)
index
fca912c
..0000000
Binary files a/Cura/resources/images/info-on.png and /dev/null differ
diff --git
a/Cura/resources/images/move-down.png
b/Cura/resources/images/move-down.png
deleted file mode 100644
(file)
index
5891219
..0000000
Binary files a/Cura/resources/images/move-down.png and /dev/null differ
diff --git
a/Cura/resources/images/move-up.png
b/Cura/resources/images/move-up.png
deleted file mode 100644
(file)
index
b3d9cef
..0000000
Binary files a/Cura/resources/images/move-up.png and /dev/null differ
diff --git
a/Cura/resources/images/object-3d-off.png
b/Cura/resources/images/object-3d-off.png
deleted file mode 100644
(file)
index
b9361e4
..0000000
Binary files a/Cura/resources/images/object-3d-off.png and /dev/null differ
diff --git
a/Cura/resources/images/object-3d-on.png
b/Cura/resources/images/object-3d-on.png
deleted file mode 100644
(file)
index
9a8b1c1
..0000000
Binary files a/Cura/resources/images/object-3d-on.png and /dev/null differ
diff --git
a/Cura/resources/images/object-add.png
b/Cura/resources/images/object-add.png
deleted file mode 100644
(file)
index
1b362da
..0000000
Binary files a/Cura/resources/images/object-add.png and /dev/null differ
diff --git
a/Cura/resources/images/object-max-size.png
b/Cura/resources/images/object-max-size.png
deleted file mode 100644
(file)
index
c836294
..0000000
Binary files a/Cura/resources/images/object-max-size.png and /dev/null differ
diff --git
a/Cura/resources/images/object-mirror-x-off.png
b/Cura/resources/images/object-mirror-x-off.png
deleted file mode 100644
(file)
index
302b2b2
..0000000
Binary files a/Cura/resources/images/object-mirror-x-off.png and /dev/null differ
diff --git
a/Cura/resources/images/object-mirror-x-on.png
b/Cura/resources/images/object-mirror-x-on.png
deleted file mode 100644
(file)
index
4d07b34
..0000000
Binary files a/Cura/resources/images/object-mirror-x-on.png and /dev/null differ
diff --git
a/Cura/resources/images/object-mirror-y-off.png
b/Cura/resources/images/object-mirror-y-off.png
deleted file mode 100644
(file)
index
5f72a43
..0000000
Binary files a/Cura/resources/images/object-mirror-y-off.png and /dev/null differ
diff --git
a/Cura/resources/images/object-mirror-y-on.png
b/Cura/resources/images/object-mirror-y-on.png
deleted file mode 100644
(file)
index
f7dfc62
..0000000
Binary files a/Cura/resources/images/object-mirror-y-on.png and /dev/null differ
diff --git
a/Cura/resources/images/object-mirror-z-off.png
b/Cura/resources/images/object-mirror-z-off.png
deleted file mode 100644
(file)
index
801fa98
..0000000
Binary files a/Cura/resources/images/object-mirror-z-off.png and /dev/null differ
diff --git
a/Cura/resources/images/object-mirror-z-on.png
b/Cura/resources/images/object-mirror-z-on.png
deleted file mode 100644
(file)
index
c599670
..0000000
Binary files a/Cura/resources/images/object-mirror-z-on.png and /dev/null differ
diff --git
a/Cura/resources/images/object-mul-x-add.png
b/Cura/resources/images/object-mul-x-add.png
deleted file mode 100644
(file)
index
dda2ef3
..0000000
Binary files a/Cura/resources/images/object-mul-x-add.png and /dev/null differ
diff --git
a/Cura/resources/images/object-mul-x-sub.png
b/Cura/resources/images/object-mul-x-sub.png
deleted file mode 100644
(file)
index
dc8345d
..0000000
Binary files a/Cura/resources/images/object-mul-x-sub.png and /dev/null differ
diff --git
a/Cura/resources/images/object-mul-y-add.png
b/Cura/resources/images/object-mul-y-add.png
deleted file mode 100644
(file)
index
b9d4ca4
..0000000
Binary files a/Cura/resources/images/object-mul-y-add.png and /dev/null differ
diff --git
a/Cura/resources/images/object-mul-y-sub.png
b/Cura/resources/images/object-mul-y-sub.png
deleted file mode 100644
(file)
index
e5c155b
..0000000
Binary files a/Cura/resources/images/object-mul-y-sub.png and /dev/null differ
diff --git
a/Cura/resources/images/object-remove.png
b/Cura/resources/images/object-remove.png
deleted file mode 100644
(file)
index
064e523
..0000000
Binary files a/Cura/resources/images/object-remove.png and /dev/null differ
diff --git
a/Cura/resources/images/object-rotate.png
b/Cura/resources/images/object-rotate.png
deleted file mode 100644
(file)
index
c54160e
..0000000
Binary files a/Cura/resources/images/object-rotate.png and /dev/null differ
diff --git
a/Cura/resources/images/object-scale.png
b/Cura/resources/images/object-scale.png
deleted file mode 100644
(file)
index
6927afe
..0000000
Binary files a/Cura/resources/images/object-scale.png and /dev/null differ
diff --git
a/Cura/resources/images/object-swap-xz-off.png
b/Cura/resources/images/object-swap-xz-off.png
deleted file mode 100644
(file)
index
830570e
..0000000
Binary files a/Cura/resources/images/object-swap-xz-off.png and /dev/null differ
diff --git
a/Cura/resources/images/object-swap-xz-on.png
b/Cura/resources/images/object-swap-xz-on.png
deleted file mode 100644
(file)
index
c594954
..0000000
Binary files a/Cura/resources/images/object-swap-xz-on.png and /dev/null differ
diff --git
a/Cura/resources/images/object-swap-yz-off.png
b/Cura/resources/images/object-swap-yz-off.png
deleted file mode 100644
(file)
index
19abb42
..0000000
Binary files a/Cura/resources/images/object-swap-yz-off.png and /dev/null differ
diff --git
a/Cura/resources/images/object-swap-yz-on.png
b/Cura/resources/images/object-swap-yz-on.png
deleted file mode 100644
(file)
index
bb60079
..0000000
Binary files a/Cura/resources/images/object-swap-yz-on.png and /dev/null differ
diff --git
a/Cura/resources/images/object-top-off.png
b/Cura/resources/images/object-top-off.png
deleted file mode 100644
(file)
index
70de029
..0000000
Binary files a/Cura/resources/images/object-top-off.png and /dev/null differ
diff --git
a/Cura/resources/images/object-top-on.png
b/Cura/resources/images/object-top-on.png
deleted file mode 100644
(file)
index
3e5c281
..0000000
Binary files a/Cura/resources/images/object-top-on.png and /dev/null differ
diff --git
a/Cura/resources/images/open.png
b/Cura/resources/images/open.png
deleted file mode 100644
(file)
index
32ec3ed
..0000000
Binary files a/Cura/resources/images/open.png and /dev/null differ
diff --git
a/Cura/resources/images/preferences.png
b/Cura/resources/images/preferences.png
deleted file mode 100644
(file)
index
dab6b51
..0000000
Binary files a/Cura/resources/images/preferences.png and /dev/null differ
diff --git
a/Cura/resources/images/save-combination.png
b/Cura/resources/images/save-combination.png
deleted file mode 100644
(file)
index
a633824
..0000000
Binary files a/Cura/resources/images/save-combination.png and /dev/null differ
diff --git
a/Cura/resources/images/save.png
b/Cura/resources/images/save.png
deleted file mode 100644
(file)
index
8072aea
..0000000
Binary files a/Cura/resources/images/save.png and /dev/null differ
diff --git
a/Cura/resources/images/set-profile.png
b/Cura/resources/images/set-profile.png
deleted file mode 100644
(file)
index
a9f8c9e
..0000000
Binary files a/Cura/resources/images/set-profile.png and /dev/null differ
diff --git
a/Cura/resources/images/slice.png
b/Cura/resources/images/slice.png
deleted file mode 100644
(file)
index
e217245
..0000000
Binary files a/Cura/resources/images/slice.png and /dev/null differ
diff --git
a/Cura/resources/images/steepOverhang-off.png
b/Cura/resources/images/steepOverhang-off.png
deleted file mode 100644
(file)
index
f1426aa
..0000000
Binary files a/Cura/resources/images/steepOverhang-off.png and /dev/null differ
diff --git
a/Cura/resources/images/steepOverhang-on.png
b/Cura/resources/images/steepOverhang-on.png
deleted file mode 100644
(file)
index
73d474d
..0000000
Binary files a/Cura/resources/images/steepOverhang-on.png and /dev/null differ
diff --git
a/Cura/resources/images/view-border-off.png
b/Cura/resources/images/view-border-off.png
deleted file mode 100644
(file)
index
3019205
..0000000
Binary files a/Cura/resources/images/view-border-off.png and /dev/null differ
diff --git
a/Cura/resources/images/view-border-on.png
b/Cura/resources/images/view-border-on.png
deleted file mode 100644
(file)
index
2d27e29
..0000000
Binary files a/Cura/resources/images/view-border-on.png and /dev/null differ
diff --git
a/Cura/resources/images/view-gcode-off.png
b/Cura/resources/images/view-gcode-off.png
deleted file mode 100644
(file)
index
714e92e
..0000000
Binary files a/Cura/resources/images/view-gcode-off.png and /dev/null differ
diff --git
a/Cura/resources/images/view-gcode-on.png
b/Cura/resources/images/view-gcode-on.png
deleted file mode 100644
(file)
index
e8eb43e
..0000000
Binary files a/Cura/resources/images/view-gcode-on.png and /dev/null differ
diff --git
a/Cura/resources/images/view-mixed-off.png
b/Cura/resources/images/view-mixed-off.png
deleted file mode 100644
(file)
index
7bc0942
..0000000
Binary files a/Cura/resources/images/view-mixed-off.png and /dev/null differ
diff --git
a/Cura/resources/images/view-mixed-on.png
b/Cura/resources/images/view-mixed-on.png
deleted file mode 100644
(file)
index
3aacec1
..0000000
Binary files a/Cura/resources/images/view-mixed-on.png and /dev/null differ
diff --git
a/Cura/resources/images/view-normal-off.png
b/Cura/resources/images/view-normal-off.png
deleted file mode 100644
(file)
index
268b737
..0000000
Binary files a/Cura/resources/images/view-normal-off.png and /dev/null differ
diff --git
a/Cura/resources/images/view-normal-on.png
b/Cura/resources/images/view-normal-on.png
deleted file mode 100644
(file)
index
674aa58
..0000000
Binary files a/Cura/resources/images/view-normal-on.png and /dev/null differ
diff --git
a/Cura/resources/images/view-transparent-off.png
b/Cura/resources/images/view-transparent-off.png
deleted file mode 100644
(file)
index
1482327
..0000000
Binary files a/Cura/resources/images/view-transparent-off.png and /dev/null differ
diff --git
a/Cura/resources/images/view-transparent-on.png
b/Cura/resources/images/view-transparent-on.png
deleted file mode 100644
(file)
index
1f63f2d
..0000000
Binary files a/Cura/resources/images/view-transparent-on.png and /dev/null differ
diff --git
a/Cura/resources/images/view-xray-off.png
b/Cura/resources/images/view-xray-off.png
deleted file mode 100644
(file)
index
9e89835
..0000000
Binary files a/Cura/resources/images/view-xray-off.png and /dev/null differ
diff --git
a/Cura/resources/images/view-xray-on.png
b/Cura/resources/images/view-xray-on.png
deleted file mode 100644
(file)
index
8b7ff82
..0000000
Binary files a/Cura/resources/images/view-xray-on.png and /dev/null differ