Commit Graph
100 Commits
Author SHA1 Message Date
YuSanka 4eae6c0189 Changing of a type of a volume in the object list 2018-11-05 08:58:14 +01:00
YuSanka a9e7b5c645 Implemented adding of support enforcer/blocker to the object list 2018-11-05 08:58:14 +01:00
YuSanka 618d0e4910 Fixed splitting of the objects with instances 2018-11-01 16:24:20 +01:00
YuSanka 2200e42174 Fixed crashing after filament preset changing from Plater 2018-11-01 16:24:20 +01:00
YuSanka 7c673179f6 Temporary (for testing) crash fixing on get_label from PrusaDoubleSlider 2018-11-01 16:24:20 +01:00
YuSanka c135f4a1f8 After-merge bug fixing 2018-11-01 14:02:38 +01:00
YuSanka ba8a2e11b8 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-11-01 13:56:20 +01:00
YuSanka e62246d56c Fixed Info pane filling 2018-11-01 12:57:21 +01:00
YuSanka 5a4cef9ac1 Fixed part settings updating 2018-10-31 16:06:32 +01:00
YuSanka 7f08f460f1 Some code review 2018-10-31 12:58:35 +01:00
YuSanka d2844bc39d Ported show_sliced_info_sizer
+ some code-view changes
2018-10-31 12:58:35 +01:00
YuSanka cbb62142de Added "Set number of copies…" to the context menu 2018-10-25 21:13:45 +02:00
YuSanka 965236a9d9 Fixed OsX build fails 2018-10-25 19:10:14 +02:00
YuSanka 3f9fb575b8 Middle mode is changed to Advanced 2018-10-25 14:55:03 +02:00
YuSanka 3009439838 Ported System Info Dialog 2018-10-25 12:49:29 +02:00
YuSanka e3b4a7b206 Fixed incorrect m_wiping_dialog_button showing after appInit 2018-10-24 12:58:35 +02:00
YuSanka 3ecb65d62c Fixed mode updating under GTK 2018-10-22 15:18:33 +02:00
YuSanka 84de664fb5 Fixed TreeCtrl updating after mode change
+ Added another images for mode visualization
2018-10-22 12:08:30 +02:00
YuSanka 70f4ca3f5b Completed settings hiding according to view mode 2018-10-21 23:10:37 +02:00
YuSanka f47949504e Prototype of the hiding according to view mode
+ Added mode icon near option's label
+ Fixed segmentation fault on Linux
2018-10-21 23:10:36 +02:00
YuSanka 5557ee3cd2 Fixed object adding to list with same object's name
+ Added name for main object for complex objects
+ Fixed incorrect Instances and Settings deleting from ObjectList
2018-10-19 11:08:43 +02:00
YuSanka 7dea8b1c47 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-18 11:43:32 +02:00
YuSanka 80f79451f7 Merge remote-tracking branch 'origin/ys_dev_native' into dev_native 2018-10-18 11:41:29 +02:00
YuSanka 33a0f5beff Deleted "Copy" column from ObjectList 2018-10-18 11:28:31 +02:00
YuSanka e223120e7e Added instances to ObjectList 2018-10-18 10:40:26 +02:00
YuSanka 37a320c79e Changed logic of the PrusaObjectDataViewModelNode:
now each node has:
          * name,
          * type,
          * id (-1, if type == itSettings OR itInstanceRoot),
          * bmp,
          * action_bmp
          * extruder
2018-10-16 16:46:35 +02:00
YuSanka ce86fad28a Fixed assert "IsVisible(item)" failed in wxTreeCtrl::GetNextVisible() 2018-10-15 17:18:38 +02:00
YuSanka 404ef147b3 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-15 13:31:30 +02:00
YuSanka 317fc45522 Fixed wxASSERT( variant.GetType() == PrusaDataViewBitmapText ); 2018-10-15 13:25:22 +02:00
YuSanka b9b404dd2c Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-15 11:40:51 +02:00
YuSanka b413cf4ef9 Fixed OSX compilation : GetStringSelection for PresetComboBox is changed to GetString(GetSelection) 2018-10-15 11:39:48 +02:00
YuSanka 27fea879d3 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-15 10:54:20 +02:00
YuSanka d654e35975 Ported Plater->on_config_change 2018-10-15 10:53:47 +02:00
YuSanka b7980f6b9b Added correct deleting of the selected objects(parts, mix)
but only in "ObjectList->Scene" direction
2018-10-12 12:00:37 +02:00
YuSanka 0bc99f3f65 Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-11 16:17:43 +02:00
YuSanka 9cf80581d9 Added extended selection ObjectList -> to canvas3D 2018-10-11 16:13:23 +02:00
YuSanka 37dd32b62b Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-10 16:23:35 +02:00
YuSanka 30f3ec3d16 Changed mode of the OblectList to Multiple selection 2018-10-10 16:22:20 +02:00
YuSanka 05c016764f Merge branch 'dev_native' of https://github.com/prusa3d/Slic3r into dev_native 2018-10-10 13:54:56 +02:00
YuSanka 94da98c9c4 Ported on_extruders_change and filament_color_box_lmouse_down(like a lambda-f inside PresetComboBox) 2018-10-10 13:53:45 +02:00
YuSanka 1b93b952a2 Merge remote-tracking branch 'origin/ys_dev_native' into dev_native 2018-10-09 12:44:32 +02:00
YuSanka 085020a814 Ported show_preset_comboboxes function 2018-10-09 12:41:05 +02:00
YuSanka 9f1613bffb Merge remote-tracking branch 'origin/dev_native' into ys_dev_native 2018-10-09 08:30:48 +02:00
YuSanka 1006cd976e Fixed events OBJECT_SETTINGS_CHANGED_EVENT , OBJECT_REMOVE_EVENT and UPDATE_SCENE_EVENT
+ changed ctor of ObjList
+ deleted unusable code from Tab.cpp
2018-10-08 16:28:11 +02:00
YuSanka 42fd6bc7b5 Merge remote-tracking branch 'origin/dev_native' into ys_dev_native 2018-10-05 23:39:51 +02:00
YuSanka ea30385fd0 Completed split of the GUI_ObjectParts 2018-10-05 23:29:15 +02:00
YuSanka bcedd71e99 Start to Split GUI_ObjectParts:
+ created GUI_ObjectList & GUI_ObjectManipulation classes
2018-10-04 16:43:10 +02:00
YuSanka 7ed9ba5437 Merge remote-tracking branch 'origin/dev_native' into ys_dev_native 2018-10-03 15:22:13 +02:00
YuSanka 8f6e3cc43b Temporary changes and code cleaning 2018-10-03 15:14:52 +02:00
YuSanka 9ce9b87e81 Merge remote-tracking branch 'origin/dev_native' into ys_dev_native 2018-10-02 13:33:06 +02:00
YuSanka 40022861c8 Removed Localization to GUI_App
+ cleaned code from some global variables (App, AppConfig, PresetBundle, MainFrame, tab_panels..)
2018-10-02 13:30:59 +02:00
YuSanka 08c6905751 Moved functions and variables (for fonts and labels color) to GUI_App
+ corrected Sidebar layouts
+ deleted get_preset_bundle
+ actions with tabs_list moved to GUI_App
2018-10-01 16:31:36 +02:00
YuSanka 8b582bbcd1 Menu_bar and preset_tabs are in main window now 2018-09-21 01:35:25 +02:00
YuSanka e86f149cbd Moved back open_model to GUI_App 2018-09-20 13:12:35 +02:00
YuSanka bcbeb56217 Merge remote-tracking branch 'origin/dev_native' into ys_dev_native 2018-09-20 08:41:57 +02:00
YuSanka ebb6f47f50 Added GUI_App and MainFrame 2018-09-20 08:40:22 +02:00
YuSanka 2ea5c77e39 Merge remote-tracking branch 'origin/dev' into new_main_page_ui 2018-09-14 14:01:11 +02:00
YuSanka eb2b56a87f Fixed settings list for objects
+ fixed showing of an info_manifold_warning_icon
2018-09-14 13:59:56 +02:00
YuSanka 3903ca64d7 Added strings for correct volume selection 2018-09-13 16:20:16 +02:00
YuSanka a31ac857ef Merge remote-tracking branch 'origin/dev' into new_main_page_ui 2018-09-13 16:12:07 +02:00
YuSanka 06f395641b Object selection (from object list to 3DScene) 2018-09-13 16:09:57 +02:00
YuSanka 77e09e683d Fixed bug with PrusaDataViewBitmapText ctor on Linux
+ Cleaned code from unusable comments
2018-09-12 13:22:13 +02:00
YuSanka 6d499525ee Merge remote-tracking branch 'origin/dev' into new_main_page_ui 2018-09-12 11:33:38 +02:00
YuSanka fc5d62e76e Try to render wxBitmap instead of wxIcon in wxDataViewCtrl 2018-09-12 11:29:59 +02:00
YuSanka dbf18ed8d4 Another try to fix IconRendering on OSX 2018-09-11 12:44:27 +02:00
YuSanka 73ee3f77c3 Merge remote-tracking branch 'origin/dev' into new_main_page_ui 2018-09-11 11:49:36 +02:00
YuSanka 775b86a3d8 Fix to last commit (vertical expanding of the icon to correct rendering on OSX) 2018-09-11 11:39:13 +02:00
YuSanka e3bb829e42 Try to use PrusaIconTextRenderer(CustomRenderer) for IconText Rendering
+ experiments with button's color
+ removed "strange control part" from topLeft corner of the right panel
2018-09-11 09:51:56 +02:00
YuSanka 9c433f8e08 Try to fix AddSettingsChild on OSX 2018-09-10 13:59:44 +02:00
YuSanka e914a719f8 Added printfs for code debugging on OSX 2018-09-10 12:17:41 +02:00
YuSanka a59a84f237 Experiment with icon size 2018-09-10 09:28:37 +02:00
YuSanka b7effbde17 Fixed typo for last commit 2018-09-07 16:29:16 +02:00
YuSanka 810b48887d Fixed Adding generic modifiers on GTK & OSX
+ Try to fix correct settings adding on GTK & OSX
+ Fixed Linux compilation
2018-09-07 16:16:11 +02:00
YuSanka 125ece0aad Fixed #1204 2018-09-07 09:33:18 +02:00
YuSanka 2efc8c705e Try to fix 1204 2018-09-07 09:09:24 +02:00
YuSanka 27f196be59 Implement "Add generic" menu item like submenu instead of selection dialog 2018-09-06 16:36:10 +02:00
YuSanka 4e9e59fd80 Disable "Split" menu item for non-splittable objects 2018-09-06 10:15:57 +02:00
YuSanka 82838cc640 Final bug-fix for #1169 considering issue #971 2018-09-05 15:03:20 +02:00
YuSanka 8ba48f8dc5 fixed typo-bug 2018-09-05 12:33:04 +02:00
YuSanka f2563c4a22 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-09-05 12:02:52 +02:00
YuSanka e2830dc337 Fix to last commit 2018-09-05 12:02:34 +02:00
YuSanka f67060f012 Fixed bug from issue #1169 2018-09-05 09:47:36 +02:00
YuSanka f471362e86 Added SettingsDigest 2018-09-04 13:15:27 +02:00
YuSanka af6a312fea Fix to last commit 2018-09-04 09:25:54 +02:00
YuSanka fb3a4015f6 Implemented "Settings to modified" as a subobject for objects and parts 2018-09-03 16:21:08 +02:00
YuSanka 78cedb34d4 Fixed bug with no-slicing of some parts of the object
+ Removed text drawing for equal values in DoubleSlider
+ Added functions for adding of the settings item for objects
2018-09-03 09:58:35 +02:00
YuSanka 3075364da1 Fixed bug with crashing after part split for single material object 2018-08-31 14:15:26 +02:00
YuSanka a3c2c511f0 Reorganized right panel 2018-08-31 13:42:53 +02:00
YuSanka 1358c8efd2 Removed old sliders from 3DPreview 2018-08-30 15:30:31 +02:00
YuSanka 99aaedffc1 Added PrusaDoubleSlider on 3DPreview 2018-08-30 10:42:55 +02:00
YuSanka 6c1b52afa2 Deleted "scale" column from object list 2018-08-29 13:11:30 +02:00
YuSanka 7fd7d83470 Updated PrusaDoubleSlider icons 2018-08-29 11:21:22 +02:00
YuSanka b1d418a799 Merge remote-tracking branch 'origin/dev' into new_main_page_ui 2018-08-29 10:06:29 +02:00
YuSanka 2dcfd74579 Try to fix object_ctrl_context_menu on OS X 2018-08-29 09:33:56 +02:00
YuSanka a56ea9a616 Try to understand OSX crashing on context menu 2018-08-28 17:03:40 +02:00
YuSanka 5557e59d43 Reorganized object settings pane
+ Added new control - PrusaLockButton
2018-08-28 15:51:53 +02:00
YuSanka d4c8bc0720 Fixed post-merge compilation problem 2018-08-24 16:56:42 +02:00
YuSanka 02a325556d Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-24 16:28:34 +02:00
YuSanka 90fcdd4e5f Fixed post-commit compilation problems 2018-08-24 16:20:19 +02:00
YuSanka 8b148a4fe4 Merge remote-tracking branch 'origin/new_main_page_ui' into dev 2018-08-24 15:01:26 +02:00