Commit Graph
100 Commits
Author SHA1 Message Date
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 125ece0aad Fixed #1204 2018-09-07 09:33:18 +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 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
YuSanka bb24ae9f03 Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev 2018-08-24 13:58:21 +02:00
YuSanka d90f5fa591 Added "one_layer" mode for PrusaDoubleSlider 2018-08-24 13:36:19 +02:00
YuSanka 774315fe07 Fixed after-merging compilation problems 2018-08-24 12:54:21 +02:00
YuSanka ada6970053 Merge remote-tracking branch 'origin/SLA_ui' into dev 2018-08-24 12:20:24 +02:00
YuSanka 2ec045a0fb Added SetSliderValues and GetActiveValue functions 2018-08-23 14:44:49 +02:00
YuSanka 2a7059edb3 Added active icon for selected tick 2018-08-23 13:01:18 +02:00
YuSanka 8a9bdc55ee Added functions for tick adding/deleting 2018-08-22 18:00:48 +02:00
YuSanka d2282c4bf9 Refactored code 2018-08-22 14:24:30 +02:00
YuSanka a5119a41a5 Added overriding of the DoGetBestSize() to correct control sizing on OSX and Linux/GTK 2018-08-22 10:44:11 +02:00
YuSanka 5cd4597d38 Fix for last commit 2018-08-22 08:54:07 +02:00
YuSanka bc64154f21 PrusaDoubleSlider improvement
+ OnKeyDown
+ marked selected thumb
+ marked selected control
...
2018-08-21 17:48:52 +02:00
YuSanka 1b26cd414d DoubleSlider prototype 2018-08-21 02:03:10 +02:00
YuSanka d10cdeb25f Delete previous experiments 2018-08-16 16:43:16 +02:00
YuSanka eae7752d30 Corrections for the last commit 2018-08-16 10:43:56 +02:00
YuSanka e6fce6e1f6 Try to handle wxEVT_KEY_DOWN on OSX 2018-08-16 09:46:34 +02:00
YuSanka 5de933b77e Try to fix evt_motion on OSX & GTK 2018-08-16 09:35:21 +02:00
YuSanka 3391ea050d Try to handle wxEVT_CHAR_HOOK on OSX 2018-08-16 09:12:24 +02:00
YuSanka 8c7cc73da6 Update extruder value for the object from the beginning 2018-08-15 13:59:33 +02:00
YuSanka 76249e5625 Fixed typo in LambdaObjectDialog. It was a reason of the wrong cube size updating for generic modifier "Cube".
+ some code cleaning
2018-08-15 12:47:46 +02:00
YuSanka 3e549c153d Improvement of extruder selection for the object/part according to the actually extruders count 2018-08-15 11:18:20 +02:00
YuSanka f0095d19be Some code refactoring 2018-08-15 10:09:05 +02:00
YuSanka 3c3b8ed76f fixed typo in update_extruder_in_config 2018-08-14 16:16:26 +02:00
YuSanka 92b578779e Test of update_extruder_in_config() 2018-08-14 16:10:58 +02:00
YuSanka 817fb5adb3 Test of item_changed_selection(obj_idx) 2018-08-14 15:35:54 +02:00
YuSanka 79f2801d2a One more try to understand OSX crashing on UnselectAll 2018-08-14 14:34:04 +02:00
YuSanka a2eff85fa8 Try to fix OSX crashing on UnselectAll 2018-08-14 14:13:07 +02:00
YuSanka acac6b0b44 Fixed DnD down-moving on GTK 2018-08-14 13:04:11 +02:00
YuSanka 13388f1caa Drag & Drop for sub-objects (parts of the object) 2018-08-13 14:15:43 +02:00
YuSanka 73ba96381e Drag&Drop test on Linux and OSX 2018-08-13 10:30:36 +02:00
YuSanka 9df6804835 next try 2018-08-10 14:55:34 +02:00
YuSanka 4b8d7bd7fa Fry to fix OSX-crashing on UnselectAll 2018-08-10 14:02:47 +02:00
YuSanka 0477d4d802 Fixed tooltip showing on Linux and OSX(maybe) 2018-08-10 12:19:35 +02:00
YuSanka a7c29b98bd Try to understand wxEVT_MOTION on OSX 2018-08-10 08:26:15 +02:00
YuSanka 1029a4c0e0 Experiments with tooltips 2018-08-09 17:53:34 +02:00
YuSanka 72c77a3592 Next experiment 2018-08-09 17:33:44 +02:00
YuSanka fede9e95ff Experiments with wxEVT_LEFT_DOWN/wxEVT_MOTION on OSX 2018-08-09 15:55:08 +02:00
YuSanka dc8cdcc2ba Added tooltips with manifold_warning information 2018-08-09 12:02:09 +02:00
YuSanka c1bef2f8de Added set_default_suppressed for sla_materials. 2018-08-09 09:25:23 +02:00
YuSanka 0210dcf3b6 Fixed build crashing 2018-08-08 18:17:19 +02:00
YuSanka 5dbc8fb427 Correct UI updating for SLA tabs 2018-08-08 17:47:59 +02:00
YuSanka adf003f0ed Correct preset/tabs updating according to the technology
+ some code refactoring
2018-08-08 16:22:56 +02:00
YuSanka da16b28c14 Correct show_preset_comboboxes 2018-08-08 11:17:56 +02:00
YuSanka 709b898eba Correct printer pages updating according to the printer_technology 2018-08-07 11:58:27 +02:00
YuSanka 2af2b05bd6 Correct switching between printer_technologies (show/hide according tabs) 2018-08-06 17:01:41 +02:00