GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 13:49:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,028 Commits 287 Branches 260 Tags
Commit Graph

513 Commits

Author SHA1 Message Date
Diego Prado Gesto
8df3eb33d4 Minor changes: remove empty lines, small changes in the anchors, ... 
Contributes to CURA-5772.
 2018-10-18 16:51:32 +02:00
Diego Prado Gesto
1cc7e0e586 Set the height of the stage menu in the theme instead of hardcoded. 
I also adjusted a bit the design to fulfill the requirments from UX/UI
team.

Contributes to CURA-5772.
 2018-10-18 16:33:13 +02:00
Ghostkeeper
1bcd134f85
Fix code style 
Most stuff here was recently changed. Some of it was where I found a pattern in something that was likely copy-pasted from somewhere else, so I did a global search and replace on that.

Contributes to issue CURA-5784.
 2018-10-18 14:30:33 +02:00
Diego Prado Gesto
7fb72a1a58 Change Skeleton folder name to MainWindow. 
This folder is intended to store the files that construct the main
window. All the parts. The rest of the components are stored in more
specific folders.

Contributes to CURA-5784.
 2018-10-17 16:13:43 +02:00
Jaime van Kessel
304a9e11f3 Moved view selection back into Cura QML 
It didn't make a whole lot of sense for it to be a seperate component, since it's probably going to change in the future

CURA-5772
 2018-10-17 09:50:24 +02:00
Jaime van Kessel
553e29b9b8 Fix QML warnings 
CURA-5772
 2018-10-15 15:42:17 +02:00
Jaime van Kessel
2455961ac7 Vertically allign the toolbar 
CURA-5772
 2018-10-15 15:16:28 +02:00
Jaime van Kessel
1c70a62df6 Fix typo 
Derp. CURA-5772
 2018-10-15 15:10:50 +02:00
Jaime van Kessel
a7edd893d7 Change the order in which ViewOrientationControls and ProgressAndSaveWidget are drawn. 
This will ensure that if a stage sets a mainComponent that it won't have any other items drawn over it.

CURA-5772
 2018-10-15 15:08:58 +02:00
Jaime van Kessel
a473a46a35 Add a bit more documentation to explain what the elements do 
CURA-5772
 2018-10-15 15:07:46 +02:00
Jaime van Kessel
62c9980438 Move SidebarTooltip so that it's no longer ocluded by other objects 
CURA-5772
 2018-10-15 14:07:01 +02:00
Jaime van Kessel
d2baef97c4 Fix tooltips for settings 
CURA-5772
 2018-10-15 11:07:03 +02:00
Jaime van Kessel
8cac5e1de2 Removed the components qml dir 
We can consider putting components into their own folder, but we first should have a clear definition of what they are / should be.

CURA-5772
 2018-10-15 10:34:19 +02:00
Jaime van Kessel
fc1faf79f5 Cleanup unused code 
CURA-5772
 2018-10-15 09:52:48 +02:00
Jaime van Kessel
11a08d0e47 Move whole bunch of QML components to their new locations 
The tooltips are still not working correctly, it might be that it needs rework

CURA-5772
 2018-10-12 13:32:23 +02:00
Ghostkeeper
bb75821599
Fix some code style 
Contributes to issue CURA-5784.
 2018-10-11 15:29:28 +02:00
Jaime van Kessel
85436c1469 Move machine selector to own component & new location 
This also simplifies & cleans up the actually used QML

CURA-5772
 2018-10-11 10:29:59 +02:00
Jaime van Kessel
1ed3558b9a Move ViewOrientationControl to lower left corner 
This also renames the component to better reflect what it is (the old name implied that it
had something to do with orientation views, wheres it's actually a set of controls to change orientation)

CURA-5772
 2018-10-10 14:21:09 +02:00
Jaime van Kessel
b3fc76092d Removed unused EngineLog 2018-10-10 14:01:34 +02:00
Diego Prado Gesto
49e96980f1 Store the dialogs in a folder called Dialogs. 
Contributes to CURA-5784.
 2018-10-09 17:11:01 +02:00
Diego Prado Gesto
77a1b08f38 Add the callout panel to the account panel, with the two components that 
will show up when the user is logged in or when not.

Contributes to CURA-5784.
 2018-10-09 15:58:13 +02:00
Diego Prado Gesto
41add97b13 Add Toolbox shortcut to the TopHeader and align the stage tabs to the 
center.

Contributes to CURA-5784.
 2018-10-08 14:50:13 +02:00
Diego Prado Gesto
075a9a161f Create a component for the Views selector. This component contains the 
list of the views and also the shortcuts for the camera position.

The theme colors, sizes and the styles have been updated.

Contributes to CURA-5784.
 2018-10-08 12:57:16 +02:00
Diego Prado Gesto
3acfdadd12 Organize the components in a Column. Separate the TopHeader and place it 
below the application menu, using all the width.

Contributes to CURA-5784.
 2018-10-08 11:31:53 +02:00
Diego Prado Gesto
8bdd27183f Move TopBar to the Skeleton folder. 
Clean up the Cura.qml even more by moving some components to the
ApplicationMenu, where they are called.

Contributes to CURA-5784.
 2018-10-08 10:59:46 +02:00
Diego Prado Gesto
193f113851 Clean up Cura.qml: 
- Create a Skeleton folder where the main parts of the application will
be stored.
- Separate the top menus to a different file.

Contributes to CURA-5784.
 2018-10-08 10:33:01 +02:00
Jaime van Kessel
081b2a28fe Expose Account API to QML 
This is done by adding the API as an SingletonType to Cura.

CURA-5744
 2018-09-21 17:23:30 +02:00
Jaime van Kessel
a809575bc8 Add bunch of ID's to qml components so it's easier to test them. 
CURA-5618
 2018-09-11 16:05:53 +02:00
Jaime van Kessel
4cde6c05ae Switch most usages of containerStackId to containerStack for settingPropertyProvider 
This mostly makes the code a bit more logic and also decreases the number of searches in the registry
 2018-09-07 15:23:09 +02:00
Aleksei S
27c112d4db Fix duplicated shortcut keys in all languages 
CURA-5642
 2018-09-06 16:06:45 +02:00
Lipu Fei
6cceebb117 Revert "Remove double shortcut buttons" 
CURA-5642

This breaks translations and doesn't fix the shortcut key problem.
 2018-08-31 15:14:12 +02:00
Mark
baef0350cd Cleaned up MIME types 2018-08-29 14:41:38 +02:00
Aleksei S
3e3f1cb03d Remove double shortcut buttons 
CURA-5642
 2018-08-28 09:31:05 +02:00
Ian Paschal
f6b43bd9ab Merge branch 'master' into feature_favorite_materials 
Contributes to CURA-5162, CURA-5378
 2018-08-23 17:24:39 +02:00
Lipu Fei
29180740de Fix missed names 2018-08-22 13:36:17 +02:00
Ian Paschal
00eb8e6788 Organize material preferences 
Contributes to CURA-5378
 2018-08-22 12:34:38 +02:00
Diego Prado Gesto
b1c073aab6 CURA-5570 Expose the CuraSDKVersion to qml and show the buildplate 
selector only when "dev" version is selected.
 2018-08-13 11:50:50 +02:00
Lipu Fei
cc39ca09b8 Enable build plate selection menu 2018-08-02 17:16:16 +02:00
Lipu Fei
28eaf50bac Fix exit application 
Typo...
 2018-07-17 10:26:14 +02:00
Lipu Fei
6d34d77b6b Reset confirm exit dialog text upon close 
CURA-5384
 2018-07-13 11:10:40 +02:00
Lipu Fei
c0b7e40b0d Add on-exit callback management and check for active USB printing 
CURA-5384
 2018-07-13 09:16:11 +02:00
Lipu Fei
ac3d3bc5c0 Revert "Added signal to prevent window closing if USB printer is printing" 
This reverts commit 596a7b7169b9c7e41cd4751f99eea656f67ed2b7.
 2018-07-13 08:08:56 +02:00
Diego Prado Gesto
395c5d3a8b CURA-5458 Add three dots in the options that will open a new window. 
Add the Save option together with the New and Open, and then separate it
from the Export options.
 2018-07-12 15:16:01 +02:00
Mark
e53e62ccab CURA-5458 Use Save and Export 2018-07-12 14:54:10 +02:00
Aleksei S
596a7b7169 Added signal to prevent window closing if USB printer is printing 
CURA-5384
 2018-07-11 13:23:30 +02:00
fieldOfView
756288bbb4 Fix a bright line/gap between the viewport and sidebar due to rounding 2018-06-26 22:34:06 +02:00
Ghostkeeper
b33bbde2bb
Also open data folder when opening Resources folder 
So now it opens two folders. It could be slightly more annoying to some but usually it's much more useful.

Fixes #1490.
 2018-06-20 09:03:18 +02:00
Lipu Fei
3a7a1dbc6d Fix inconsistent curaproject mimetype definition 
CURA-5334

 - In project file writer, it says the mime type is "application/x-curaproject+xml",
   and we decided to use this as THE mime type.
 - Pass preferred_mimetype to save project file dialog so it
   automatically adds the file extension upon open.
 2018-06-07 12:51:54 +02:00
Jack Ha
96f2e6e1ed CURA-5402 hopefully solved merge conflicts 2018-06-06 14:39:53 +02:00
Jack Ha
a616e92367 CURA-5357 fix boo boo, rename variable 2018-05-30 09:44:33 +02:00