Commit History

Author SHA1 Message Date
  fieldOfView 97d7354839 Merge branch 'master' into feature_setting_visibility_profiles 6 years ago
  Lipu Fei 93190dde9b Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 6 years ago
  Diego Prado Gesto ae57e23eec Create a mouse area around the sidebar to avoid propagating mouse wheel events. 6 years ago
  Lipu Fei 6e5fed6b5e WIP: Fix quality name in SettingView 6 years ago
  Jack Ha c3349baf39 CURA-4606 fix bug concerning activeMaterialsCompatible; factor out activeQualityName 6 years ago
  Jack Ha ad6548a5dc CURA-4606 factored activeMaterialName out 6 years ago
  fieldOfView a17160f52d Merge branch 'master' into feature_setting_visibility_profiles 6 years ago
  Ghostkeeper ee9de1f11b Merge branch '3.2' 6 years ago
  Mark b531c0550d Change Math.floor to Math.round as a last try to fix garbled fonts 6 years ago
  Mark 12b2348309 Revert "Use QTQuick 2.2 to fix garbled fonts" 6 years ago
  Mark 0d5bb952ef Use QTQuick 2.2 to fix garbled fonts 6 years ago
  Mark 466926fecd Increased the version of QtQuick 6 years ago
  Mark 7493fae667 Fix to make sure margins cant have partial values 6 years ago
  Mark 7ea654df3d Fix to make sure margins cant have partial values 6 years ago
  Ghostkeeper 03b4213e92 Merge branch '3.2' 6 years ago
  Mark 461da709ff Checked all divisions (again..) and multiplications on rounding errors 6 years ago
  fieldOfView 74fe281e1d Sync currently selected preset between visibility-page and -menu 6 years ago
  fieldOfView f79e787f2c Refactor SettingVisibilityProfiles to SettingVisibilityPresets 6 years ago
  fieldOfView 080979caeb Move setting visibility presets into a model 6 years ago
  fieldOfView 872efd16b2 Fix selecting presets from menu 6 years ago
  fieldOfView 69d7bf4130 Merge branch 'master' into feature_setting_visibility_profiles 6 years ago
  Ghostkeeper e7c5120f9c Merge branch '3.2' 6 years ago
  Lipu Fei 616615067c Fix quality name in selected profile box 6 years ago
  Ian Paschal dac67ef2fc Merge pull request #3134 from Ultimaker/3.2 6 years ago
  Lipu Fei 03bd4d8d22 Fix profile menu text for custom profiles based on not supported 6 years ago
  Jaime van Kessel ed9634ebe0 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 6 years ago
  Lipu Fei 84adbc5f41 Use the 5.8 versions of QtQuick modules in QMLs 7 years ago
  fieldOfView 3f11b8a756 Merge branch 'master' into feature_setting_visibility_profiles 7 years ago
  Lipu Fei 392be23281 Fix SettingView stakc ID binding 7 years ago
  Lipu Fei f6168c07f0 Fix material_diameter bindings for metarial menu and page 7 years ago
  Diego Prado Gesto 4a211c6ac6 CURA-4495 Change property name and add default values 7 years ago
  ChrisTerBeke b74ebc57b4 Fix per extruder setting value depending on extruder count - CURA-4627 7 years ago
  ChrisTerBeke 657a91c525 Merge pull request #2685 from Ultimaker/container_stack_improvements 7 years ago
  fieldOfView 5638ebe8cf Tweak appearance of the menu button 7 years ago
  Chris ter Beke b95ba24530 Remove some changes, debugging - CURA-4451 7 years ago
  fieldOfView 078fd074e5 Add initial menu stub 7 years ago
  fieldOfView 4bb67fbd82 Add setting visibility profile menu button 7 years ago
  ChrisTerBeke 35684e0aa4 Move profiles dropdown text generator to separate method 7 years ago
  Mark eaa7b75f0e Changed parseInt to Math.floor 7 years ago
  Mark d4a8dbdee7 Change Text to Label and cast all sizes to int 7 years ago
  Mark 9a193ad5c5 Changing AGPLv3 to LGPLv3 7 years ago
  Lipu Fei 3d6648fc59 Rearrange quality profile slider and dropdown box 7 years ago
  Ghostkeeper 09a5cf1de2 Shift sidebar tooltips with the arrow outside of sidebar 7 years ago
  Ghostkeeper 11f8204644 Change margins in the side bar 7 years ago
  Ghostkeeper 078b9e8b66 Fix placeholder text colour 7 years ago
  Lipu Fei cf25515b90 Make SettingView update its value upon global stack change 7 years ago
  Lipu Fei 96f8e70e40 Update containerStackId for limit_to_extruder settings when active machine has been changed 7 years ago
  tsaaristo ad87f154f3 Speed up sidebar-settings scrolling 7 years ago
  fieldOfView 0f9cfa0304 Fix tab order after expanding categories or using search 7 years ago
  fieldOfView 8917762ed5 Animate scrolling focussed item into view 7 years ago