Commit graph

295 commits

Author SHA1 Message Date
Lars Brubaker
7edb7c7dde Make change to page close children
Set correct wizardwindow when rebuilding content
Make sure click events are running on uithread
2016-12-09 12:09:28 -08:00
Lars Brubaker
9896346610 Get the starting color set correctly
Made the android printer select window fix its colors on change
2016-12-09 10:40:01 -08:00
Lars Brubaker
dbd2c20398 Merge branch '1.6'
# Conflicts:
#	SlicerConfiguration/Settings/ProfileManager.cs
#	Tests/MatterControl.AutomationTests/PrintQueueTests.cs
#	Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
2016-12-07 16:14:56 -08:00
Lars Brubaker
35c475b43a Make sure we close if multiple printers 2016-12-07 15:49:06 -08:00
Lars Brubaker
0b88351365 Only close if we don't need to select a printer 2016-12-07 14:53:48 -08:00
John Lewin
c4bdc41b3e Ensure 'Import Printers' window appears after authentication
- Simplify wizard - move external code into button events
- Migrate from user specific constructor to static Load('user')
- Actually deserialize profile during Load
2016-11-30 13:44:31 -08:00
Lars Brubaker
f401a3323c Moved Mocros to the top of the controls window
Putting in Macro Menu
Changed closeButton back to cancelButton
2016-11-30 13:31:19 -08:00
Lars Brubaker
7c9128c01c Merge branch 'master' of https://github.com/MatterHackers/MatterControl 2016-11-29 14:18:03 -08:00
Lars Brubaker
06b1512698 Load and Unload Macros working better.
Fixed colors on redeem purchase disabled button
2016-11-29 14:17:37 -08:00
Matt Moening
b6d34bcdf7 Converted hard coded strings to SettingsKey 2016-11-29 12:17:36 -08:00
Matt Moening
701dd0bf48 Added Network Printing checks in Edit Printer Settings Page 2016-11-29 10:57:44 -08:00
Lars Brubaker
b0fe261832 Made the disabled state better. 2016-11-15 13:51:12 -08:00
Lars Brubaker
cac5d69c76 Getting Enter Share Code Window themed correctly. 2016-11-15 13:08:16 -08:00
Lars Brubaker
bfa1d735fc Moved redeem code into ApplicationController 2016-11-14 16:51:01 -08:00
Lars Brubaker
313b3b901e fixed the redeem share code
MatterHackers/MCCentral#817
Redeem Purchase/Share code are non functional
2016-11-14 15:58:24 -08:00
John Lewin
61c509fecc Close application on EULA cancel 2016-11-09 15:14:22 -08:00
John Lewin
c09fcc479e Cleanup whitespace 2016-11-09 13:26:49 -08:00
Lars Brubaker
dc923538be Moved the redeem buttons for T7 2016-11-09 10:24:43 -08:00
Lars Brubaker
ba0970434a Make sure we can raise keyboard on wizard windows 2016-11-08 14:56:42 -08:00
Lars Brubaker
bc640c003e Refactor name 2016-11-08 12:20:25 -08:00
Lars Brubaker
f623c4edf9 Show sign in status message on android 2016-11-08 11:32:58 -08:00
Lars Brubaker
ff0c2738d8 Made importing a quality setting set the name correctly. 2016-11-07 12:41:05 -08:00
John Lewin
cced08d2d4 Track sync calling context 2016-10-31 10:51:24 -07:00
Lars Brubaker
6509b8f287 Change wording to 'Restore Settings' 2016-10-28 16:32:00 -07:00
Lars Brubaker
1f00e57088 Created new ReloadAllRequested event 2016-10-27 13:43:34 -07:00
John Lewin
42cc88b9d4 Refactor ProfileManager to prefer isolated instances
- Replace DB nomenclatures with ProfilesDoc/Profiles terms
- Convert SetLastProfile() to LastProfileID property
- Remove LoadLastProfileWithoutRecovery function
  - Use LoadWithoutRecovery(LastProfileID)
  - One caller, far more clear with only one LoadWithout function
- Move safe FileSystem UserName to AuthenticationData, like UserName
- Skip importing guest profiles that are missing PrinterSettings files
2016-10-21 13:00:53 -07:00
Lars Brubaker
37d917eb9e Triyng to make this message a bit clearer. 2016-10-07 17:52:55 -07:00
Lars Brubaker
01db79e75e Make it possible to dismiss the Copy profiles page with a "don't remind me again" 2016-10-06 17:49:54 -07:00
Lars Brubaker
aa2fde82fb Import Settings now working
Moved merge into PrinterSettings
With test
2016-10-05 14:57:37 -07:00
Lars Brubaker
231aadc554 Always set make and model on imported printers
Made the import printer get non-colliding names
MatterHackers/MCCentral#417
MatterControl is unable to upload imported printers
2016-10-04 17:54:57 -07:00
Lars Brubaker
cf09c15e2c Improvements to UI language 2016-10-04 16:39:07 -07:00
Lars Brubaker
bb17896181 Changing migrate to copy 2016-10-03 09:58:51 -07:00
Lars Brubaker
68ca0442f9 Make sure we can add a printer on android when signed out. 2016-09-29 15:51:08 -07:00
John Lewin
87316dadff Revise ClientToken use for multi-instanced MatterControl
- Add public const EnvironmentName for Services environment
- Remove GetSessionUsername method
- Remove ClearCachedCredentials
- Pull in AuthData type
- Add system to store and use ClientTokens
- Add using statements for common namespaces
2016-09-29 11:47:06 -07:00
larsbrubaker
a8749a4edc Changing to "Migrate Printers" description
MatterHackers/MCCentral#489
Inconsistent action description
2016-09-24 10:57:40 -07:00
larsbrubaker
b0d9d52564 Changed the button name to "Close" as it does not cancel the operation. 2016-09-24 10:46:47 -07:00
Lars Brubaker
92f01f894e Make settings history consistent across references
Revert ChangeID code
2016-09-07 15:53:52 -07:00
Lars Brubaker
fbe9b17f46 Improved printer edit pop-up 2016-09-07 12:08:03 -07:00
Lars Brubaker
dbf5fd9eeb Spelling 2016-09-02 15:28:19 -07:00
Lars Brubaker
2dadb72271 Changed Login -> Sign in & Logout -> Sign Out 2016-08-29 17:13:45 -07:00
Lars Brubaker
0be1c9d540 Makeing Profile History update request server side 2016-08-23 14:58:56 -07:00
Matt Moening
2f68e99449 Sync printer page updates progress of syncing operations
- Both private and public profiles report
 - public profiles are not called to report but can be later
2016-08-22 16:42:55 -07:00
John Lewin
7183cbf919 Rebuild printers droplist on ProfilesListChanged event
- Fixes list not refreshing after import
 - Issue MatterHackers/MCCentral#288
2016-08-19 09:27:57 -07:00
Lars Brubaker
b397480b56 Removing unneeded files
adding link to main static data.
2016-08-17 18:20:52 -07:00
Lars Brubaker
c6658eaf2a Make the EULA come up faster. 2016-08-12 15:07:04 -07:00
John Lewin
d0ce7a5600 Move recovery orchestration into ProfileManager.LoadProfileAsync 2016-08-12 13:29:22 -07:00
Matt Moening
5b42eac301 Fixed import to not rely on layer_height validation
- Import preset no longer checks for slicer and will validate import on weather or not any settigns were valid
 - calling Import from MenuOptionFIle will cause the same error message as importing a printer form the settings import page
 - Import to new printer now attempts to load values and validates success on importing a valid setting
2016-08-11 14:59:33 -07:00
Matt Moening
5b8ff5cd29 Changed TryGetValue to ContainsKey for clarity 2016-08-11 13:01:34 -07:00
Matt Moening
bdf3e8f2a5 Importing a printer/settings from a file will now notify the user if the file contains no valid user settings
- ImportFomEisting now returns a bool of whether or not it succeeded
 - PrinterSettings now has a Contains method
 - merging or importing quality/material settings check to make sure at least one setting was importable and notifies user if not
2016-08-10 16:39:08 -07:00
Lars Brubaker
b18f8fc889 Made the name save in settings editor
changed layername to a settings key
2016-08-10 14:04:33 -07:00