Commit Graph

83 Commits (ceae9d57d04cc24bdffb93646905ab77dde4ca4b)

Author SHA1 Message Date
Torsten Paul ceae9d57d0 Merge branch 'toolbar' of https://github.com/openscad/openscad into gui-updates
Conflicts:
	openscad.qrc
	src/MainWindow.ui
2015-01-09 19:09:22 +01:00
Torsten Paul 5943704194 Fix icon selection for dark theme. 2015-01-09 19:04:43 +01:00
Torsten Paul 166e3df850 Remove setting the font size for the warning/error bar. 2015-01-09 18:20:07 +01:00
Marius Kintel b893834c86 Merge remote-tracking branch 'origin/master' into warning-in-viewport 2015-01-07 23:51:45 -05:00
Torsten Paul dda527dabd Show error/warning status in viewport. 2015-01-07 03:14:46 +01:00
Tim Deagan 1068f61dc6 Add optional menu driven scaling tics to the large axes
Tim Deagan 12/26/2014

While add-on rulers can be extremely useful, there are many times that a quick scaling marker would be handy. This feature generates tics every 10 units, driven off the log10 of the l variable defining axes length.  As you zoom in or out, the tics automatically re-scale themselves.  Every tenth tic is slightly larger.  A menu item is added to the view menu to enable or disable the feature.

I experimented with menu driven scaling (.01, .1, 1, 10, etc.), but using small increments when zoomed out brought the app to it's knees.  Adding a visual indicator of the current scaling might be nice, but I'm nto sure where to put it (possibly below the small axes,) since it changes as zooming and would clutter the console.

 Changes to be committed:
	new file:   images/scalemarkers.png
	modified:   openscad.qrc
	modified:   src/GLView.cc
	modified:   src/GLView.h
	modified:   src/MainWindow.h
	modified:   src/MainWindow.ui
	modified:   src/QGLView.h
	modified:   src/mainwin.cc
2014-12-26 21:44:31 -06:00
shaina7837 1ba2216108 reset view icon added 2014-12-26 00:56:31 +05:30
shaina7837 295f257bf8 undo redo icons added 2014-12-26 00:35:13 +05:30
shaina7837 2654bf9575 unindent duplicate image removed 2014-12-25 23:44:41 +05:30
shaina7837 040aac5e8f Indent icon added 2014-12-25 23:34:28 +05:30
shaina7837 ed500abd39 indent unindent icons added 2014-12-25 23:12:32 +05:30
Marius Kintel 9da865604c #600 Tag menu action roles to allow translated menu items to move to the correct Mac OS X menu 2014-12-11 16:58:20 -05:00
Marius Kintel 1afb706461 Merge remote-tracking branch 'origin/master' into translation2 2014-11-17 21:55:19 -05:00
Torsten Paul 59c4dec623 Merge branch 'master' into translation2 2014-11-12 23:21:42 +01:00
Marius Kintel 40aae17c0e Move software update menu handling to AutoUpdater. This should fix #714 2014-11-10 15:01:34 -05:00
Torsten Paul 5078f401e9 Change console minimum size to 10x10. 2014-11-01 17:24:28 +01:00
Torsten Paul ebb7dde012 Fix status handling for docked windows.
Especially for the case where the windows are docked as tabs in the
same position, the "visibility-changed" signal does not work as close
indicator. The window is also treated as invisible when just the tab
is invisible, not only in case the window is closed.
2014-10-20 00:21:06 +02:00
Torsten Paul e4071472ad Rename for easier translation. 2014-10-19 01:25:23 +02:00
Marius Kintel 0993d5c9c2 Merge branch 'master' into scintilla-updates
Conflicts:
	src/MainWindow.ui
2014-10-02 02:10:55 -04:00
Marius Kintel 7343290ffc Removed empty toolbar subtypes 2014-09-30 17:25:01 -04:00
Marius Kintel a8e9f63928 Improved some variable naming 2014-09-30 17:18:40 -04:00
Marius Kintel 7a1737c09f toolBar -> viewerToolBar, indendation fixes 2014-09-30 16:47:14 -04:00
Marius Kintel 6ed2acf791 Merge remote-tracking branch 'origin/master' into Toolbar2 2014-09-29 11:46:45 -04:00
Torsten Paul 1776bcd460 Add menu entry to convert tabs to spaces. 2014-09-19 23:25:49 +02:00
Torsten Paul ecc5622e7f Reapply keyboard shortcut fix from #770. 2014-09-19 21:58:39 +02:00
Marius Kintel 42507526b6 minor cosmetics 2014-09-19 14:17:04 -04:00
Torsten Paul d039729878 Add "ViewAll" and remove "Crosshair" icon from toolbar. 2014-09-18 23:14:12 +02:00
Torsten Paul f9b0a7e9a9 Add more icons. 2014-09-14 21:39:15 +02:00
Torsten Paul c251683c20 Move ToolBar setup to GUI design file. 2014-09-14 21:17:27 +02:00
shaina7837 56ebdd92f1 Added toolbars in Designer, make search panel appear below toolbar 2014-09-14 20:40:29 +02:00
shaina7837 efb23fc9bd toolBar-subclass of QToolBar added 2014-09-14 20:39:05 +02:00
shaina7837 7345de27b1 toolbar set 2014-09-14 20:38:20 +02:00
Marius Kintel 9ef3349e4e #879 fixed some minor layout and shortcut issues 2014-09-03 14:52:41 -04:00
shaina7837 1ef69bb940 indent/unindent comment/uncomment menu items removed when scintilla editor is on 2014-08-11 20:09:50 +05:30
Marius Kintel 6270441341 Merge remote-tracking branch 'origin/master' into scintillaeditor
Conflicts:
	openscad.pro
	src/mainwin.cc
2014-07-17 15:07:42 -04:00
Marius Kintel d066648390 Added View->View All menu entry 2014-06-21 16:12:55 -04:00
Marius Kintel 22e884d08f Quick and dirty fixup 2014-06-07 17:43:52 +02:00
Torsten Paul c64360d372 Merge branch 'master' into text-module
Conflicts:
	tests/CMakeLists.txt
2014-05-20 21:36:51 +02:00
Torsten Paul c976f0725b Fix resizing constraints for the animation panel. 2014-05-12 22:47:47 +02:00
Torsten Paul 4fbbc09895 Make editor and console windows dockable and make MDI mode a runtime option. 2014-05-12 22:47:42 +02:00
Oskar Linde 75e66a531b Mac: Give document windows proper proxy icons 2014-05-03 19:15:36 +02:00
Marius Kintel 2cba2a1b55 Merge branch 'master' into text-module
Conflicts:
	scripts/macosx-build-homebrew.sh
	scripts/mingw-x-build-dependencies.sh
	scripts/uni-build-dependencies.sh
	scripts/uni-get-dependencies.sh
	src/GeometryEvaluator.h
	src/MainWindow.ui
	src/clipper-utils.h
	src/mainwin.cc
	tests/CMakeLists.txt
2014-04-26 22:08:31 -04:00
Torsten Paul 7a05fb40d8 Fix keyboard shortcuts in automatically generated actions (fixes #408).
Having our own "copy" menu did cause the automatically generated action
of the QTextEditor used as console to drop the CTRL+C link. Using the
WidgetWithChildrenShortcut settings seems to fix that for Qt4 and Qt5.
2014-04-26 23:04:09 +02:00
Marius Kintel 90b394015b Merge remote-tracking branch 'origin/master' into unstable
Conflicts:
	src/MainWindow.ui
	src/mainwin.cc
2014-04-22 01:13:20 -04:00
Sławomir Demeszko ff555d760b Preventing loosing keyboard focus by editor.
When you write your code in editor sometimes you want to rotate or move object
on 3D view, but due stealing focus by this widget it is quite tedious.
You need additional mouse click to return focus to editor and search line where
you last edited. This behavior is not neccessary as we can interpret keyboard
events globally (in MainWindow) and send commands to 3D view.

Console window need ClickFocus to show context menu.

Zoom In/Out 3D view is assigned to CTRL+[ and CTRL+]. Adding also additional
shortcut to zoom in editor font CTRL+= (with CTRL++ SHIFT is necessary).
2014-04-11 01:18:08 +02:00
Marius Kintel ff55dc026e Merge pull request #731 from openscad/amf-export
Amf export
2014-04-01 23:37:11 +02:00
Torsten Paul e04ab86803 Switch menu order back to File, Edit, Design, View, Help (fixes #733). 2014-04-01 19:26:32 +02:00
Mark Cooper cdab3e9ab8 Add AMF export. 2014-03-30 22:59:18 +02:00
Torsten Paul f84c5acada Add SVG export. 2014-03-02 19:26:17 +01:00
Marius Kintel bab951b344 Merge branch 'master' into unstable
Conflicts:
	src/CGALEvaluator.cc
	src/MainWindow.h
	src/MainWindow.ui
	src/import.cc
	src/mainwin.cc
	src/winconsole.c
	tests/CMakeLists.txt
2014-02-23 15:49:26 -05:00