Lipu Fei d0740158b1 Merge branch 'master' into feature_extruder_buttons ...

CURA-4211

Resolve merge conflicts.

2017-09-04 08:29:26 +02:00

..

Menus

Fix setting variant of non-active extruder through menu

2017-08-08 11:41:15 +02:00

Preferences

Merge branch '2.7'

2017-08-28 16:21:40 +02:00

Settings

Merge branch 'master' into feature_extruder_buttons

2017-09-04 08:29:26 +02:00

AboutDialog.qml

Merge branch 'fix_system_text_rendering' of https://github.com/fieldOfView/Cura

2017-07-26 16:49:28 +02:00

Actions.qml

Multiply dialog now has focus on #, added shortcut Ctrl-M

2017-05-04 16:31:33 +02:00

AddMachineDialog.qml

Revert "Change Label to Text because of ugle font rendering"

2017-05-02 12:58:29 +02:00

AskOpenAsProjectOrModelsDialog.qml

Merge pull request #1910 from Ultimaker/fix_dialog_sizes

2017-06-13 13:14:44 +02:00

Cura.qml

Make opacity of print monitor themeable

2017-08-21 10:50:36 +02:00

DiscardOrKeepProfileChangesDialog.qml

Round fractional widths and heights in system-themed qml

2017-07-14 12:58:07 +02:00

EngineLog.qml

Refactoring; no longer use "Printer" to identify CuraApplication

2017-03-30 20:19:05 +02:00

ExtruderButton.qml

Change extruder button on the toolbar side

2017-08-31 17:49:23 +02:00

JobSpecs.qml

Use text colour specific to text in scene for job specs

2017-08-23 14:58:43 +02:00

MachineAction.qml

T466: Revert the previous commit since it messed up the file rights.

2016-12-23 15:53:15 -05:00

MonitorButton.qml

Forgotten sidebar margins

2017-08-23 17:58:05 +02:00

OpenFilesIncludingProjectsDialog.qml

Round fractional widths and heights in system-themed qml

2017-07-14 12:58:07 +02:00

PrintMonitor.qml

Merge branch 'feature_light_colours_icons'

2017-09-01 19:25:29 +02:00

SaveButton.qml

Forgotten sidebar margins

2017-08-23 17:58:05 +02:00

Sidebar.qml

Merge branch 'feature_light_colours_icons'

2017-09-01 19:25:29 +02:00

SidebarAdvanced.qml

T466: Revert the previous commit since it messed up the file rights.

2016-12-23 15:53:15 -05:00

SidebarContents.qml

T466: Revert the previous commit since it messed up the file rights.

2016-12-23 15:53:15 -05:00

SidebarHeader.qml

Merge branch 'master' into feature_extruder_buttons

2017-09-04 08:29:26 +02:00

SidebarSimple.qml

refix the alignmet of the support and adhesion chackboxes

2017-09-03 08:18:12 +02:00

SidebarTooltip.qml

Change all Label to Text so fonts are rendered correct

2017-04-14 13:16:48 +02:00

Toolbar.qml

Hide the extruder button for Custom FDM Printers with 1 extruder

2017-07-12 14:47:38 +02:00

Topbar.qml

Always show plain monitor icon, never with_status

2017-08-30 15:02:43 +02:00

WorkspaceSummaryDialog.qml

Move dont show again checkbox above the buttons

2017-08-16 16:07:02 +02:00