From 081fadccbe6dc3b1add83e8745748fd941a8dc4a Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Thu, 2 Jul 2015 09:45:53 -0700 Subject: [PATCH] Moving the Queue, Library and History to not have Print pre-pended. --- AboutPage/ContactForm.cs | 2 +- {PrintHistory => History}/PrintHistoryData.cs | 0 {PrintHistory => History}/PrintHistoryDataView.cs | 0 {PrintHistory => History}/PrintHistoryListItem.cs | 0 {PrintHistory => History}/PrintHistoryWidget.cs | 0 {PrintLibrary => Library}/CreateFolderWindow.cs | 0 {PrintLibrary => Library}/ExportLibraryItemWindow.cs.rej | 0 {PrintLibrary => Library}/LibraryDataView.cs | 0 {PrintLibrary => Library}/LibraryRowItem.cs | 0 {PrintLibrary => Library}/LibraryRowItemCollection.cs | 0 {PrintLibrary => Library}/LibraryRowItemPart.cs | 0 {PrintLibrary => Library}/PrintLibraryWidget.cs | 0 {PrintLibrary => Library}/Provider/LibraryProvider.cs | 0 .../Provider/LibraryProviderFileSystem.cs | 0 {PrintLibrary => Library}/Provider/LibraryProviderPlugin.cs | 0 {PrintLibrary => Library}/Provider/LibraryProviderSelector.cs | 3 ++- {PrintLibrary => Library}/Provider/LibraryProviderSqlite.cs | 0 {PrintLibrary => Library}/Provider/LibrarySQLiteData.cs | 0 .../OptionsMenu/ExportToFolderFeedbackWindow.cs | 0 {PrintQueue => Queue}/OptionsMenu/ExportToFolderProcess.cs | 0 .../OptionsMenu/ExportToSdCardFeedbackWindow.cs | 0 {PrintQueue => Queue}/OptionsMenu/PartsSheetCreator.cs | 0 {PrintQueue => Queue}/OptionsMenu/QueueOptionsMenu.cs | 0 {PrintQueue => Queue}/PrintItemWrapper.cs | 0 {PrintQueue => Queue}/QueueData.cs | 0 {PrintQueue => Queue}/QueueDataView.cs | 0 {PrintQueue => Queue}/QueueDataWidget.cs | 0 {PrintQueue => Queue}/QueueRowItem.cs | 0 StaticData/Translations/Master.txt | 3 +++ 29 files changed, 6 insertions(+), 2 deletions(-) rename {PrintHistory => History}/PrintHistoryData.cs (100%) rename {PrintHistory => History}/PrintHistoryDataView.cs (100%) rename {PrintHistory => History}/PrintHistoryListItem.cs (100%) rename {PrintHistory => History}/PrintHistoryWidget.cs (100%) rename {PrintLibrary => Library}/CreateFolderWindow.cs (100%) rename {PrintLibrary => Library}/ExportLibraryItemWindow.cs.rej (100%) rename {PrintLibrary => Library}/LibraryDataView.cs (100%) rename {PrintLibrary => Library}/LibraryRowItem.cs (100%) rename {PrintLibrary => Library}/LibraryRowItemCollection.cs (100%) rename {PrintLibrary => Library}/LibraryRowItemPart.cs (100%) rename {PrintLibrary => Library}/PrintLibraryWidget.cs (100%) rename {PrintLibrary => Library}/Provider/LibraryProvider.cs (100%) rename {PrintLibrary => Library}/Provider/LibraryProviderFileSystem.cs (100%) rename {PrintLibrary => Library}/Provider/LibraryProviderPlugin.cs (100%) rename {PrintLibrary => Library}/Provider/LibraryProviderSelector.cs (99%) rename {PrintLibrary => Library}/Provider/LibraryProviderSqlite.cs (100%) rename {PrintLibrary => Library}/Provider/LibrarySQLiteData.cs (100%) rename {PrintQueue => Queue}/OptionsMenu/ExportToFolderFeedbackWindow.cs (100%) rename {PrintQueue => Queue}/OptionsMenu/ExportToFolderProcess.cs (100%) rename {PrintQueue => Queue}/OptionsMenu/ExportToSdCardFeedbackWindow.cs (100%) rename {PrintQueue => Queue}/OptionsMenu/PartsSheetCreator.cs (100%) rename {PrintQueue => Queue}/OptionsMenu/QueueOptionsMenu.cs (100%) rename {PrintQueue => Queue}/PrintItemWrapper.cs (100%) rename {PrintQueue => Queue}/QueueData.cs (100%) rename {PrintQueue => Queue}/QueueDataView.cs (100%) rename {PrintQueue => Queue}/QueueDataWidget.cs (100%) rename {PrintQueue => Queue}/QueueRowItem.cs (100%) diff --git a/AboutPage/ContactForm.cs b/AboutPage/ContactForm.cs index a7d95926f..385c24f24 100644 --- a/AboutPage/ContactForm.cs +++ b/AboutPage/ContactForm.cs @@ -68,7 +68,7 @@ namespace MatterHackers.MatterControl.ContactForm SetButtonAttributes(); AnchorAll(); - cancelButton = textImageButtonFactory.Generate(LocalizedString.Get("Cancel")); + cancelButton = textImageButtonFactory.Generate("Cancel".Localize()); submitButton = textImageButtonFactory.Generate(LocalizedString.Get("Submit")); doneButton = textImageButtonFactory.Generate(LocalizedString.Get("Done")); doneButton.Visible = false; diff --git a/PrintHistory/PrintHistoryData.cs b/History/PrintHistoryData.cs similarity index 100% rename from PrintHistory/PrintHistoryData.cs rename to History/PrintHistoryData.cs diff --git a/PrintHistory/PrintHistoryDataView.cs b/History/PrintHistoryDataView.cs similarity index 100% rename from PrintHistory/PrintHistoryDataView.cs rename to History/PrintHistoryDataView.cs diff --git a/PrintHistory/PrintHistoryListItem.cs b/History/PrintHistoryListItem.cs similarity index 100% rename from PrintHistory/PrintHistoryListItem.cs rename to History/PrintHistoryListItem.cs diff --git a/PrintHistory/PrintHistoryWidget.cs b/History/PrintHistoryWidget.cs similarity index 100% rename from PrintHistory/PrintHistoryWidget.cs rename to History/PrintHistoryWidget.cs diff --git a/PrintLibrary/CreateFolderWindow.cs b/Library/CreateFolderWindow.cs similarity index 100% rename from PrintLibrary/CreateFolderWindow.cs rename to Library/CreateFolderWindow.cs diff --git a/PrintLibrary/ExportLibraryItemWindow.cs.rej b/Library/ExportLibraryItemWindow.cs.rej similarity index 100% rename from PrintLibrary/ExportLibraryItemWindow.cs.rej rename to Library/ExportLibraryItemWindow.cs.rej diff --git a/PrintLibrary/LibraryDataView.cs b/Library/LibraryDataView.cs similarity index 100% rename from PrintLibrary/LibraryDataView.cs rename to Library/LibraryDataView.cs diff --git a/PrintLibrary/LibraryRowItem.cs b/Library/LibraryRowItem.cs similarity index 100% rename from PrintLibrary/LibraryRowItem.cs rename to Library/LibraryRowItem.cs diff --git a/PrintLibrary/LibraryRowItemCollection.cs b/Library/LibraryRowItemCollection.cs similarity index 100% rename from PrintLibrary/LibraryRowItemCollection.cs rename to Library/LibraryRowItemCollection.cs diff --git a/PrintLibrary/LibraryRowItemPart.cs b/Library/LibraryRowItemPart.cs similarity index 100% rename from PrintLibrary/LibraryRowItemPart.cs rename to Library/LibraryRowItemPart.cs diff --git a/PrintLibrary/PrintLibraryWidget.cs b/Library/PrintLibraryWidget.cs similarity index 100% rename from PrintLibrary/PrintLibraryWidget.cs rename to Library/PrintLibraryWidget.cs diff --git a/PrintLibrary/Provider/LibraryProvider.cs b/Library/Provider/LibraryProvider.cs similarity index 100% rename from PrintLibrary/Provider/LibraryProvider.cs rename to Library/Provider/LibraryProvider.cs diff --git a/PrintLibrary/Provider/LibraryProviderFileSystem.cs b/Library/Provider/LibraryProviderFileSystem.cs similarity index 100% rename from PrintLibrary/Provider/LibraryProviderFileSystem.cs rename to Library/Provider/LibraryProviderFileSystem.cs diff --git a/PrintLibrary/Provider/LibraryProviderPlugin.cs b/Library/Provider/LibraryProviderPlugin.cs similarity index 100% rename from PrintLibrary/Provider/LibraryProviderPlugin.cs rename to Library/Provider/LibraryProviderPlugin.cs diff --git a/PrintLibrary/Provider/LibraryProviderSelector.cs b/Library/Provider/LibraryProviderSelector.cs similarity index 99% rename from PrintLibrary/Provider/LibraryProviderSelector.cs rename to Library/Provider/LibraryProviderSelector.cs index 3c7c11071..37f6d0122 100644 --- a/PrintLibrary/Provider/LibraryProviderSelector.cs +++ b/Library/Provider/LibraryProviderSelector.cs @@ -34,6 +34,7 @@ using MatterHackers.PolygonMesh; using System; using System.Collections.Generic; using System.ComponentModel; +using MatterHackers.Localizations; using System.IO; namespace MatterHackers.MatterControl.PrintLibrary.Provider @@ -128,7 +129,7 @@ namespace MatterHackers.MatterControl.PrintLibrary.Provider { get { - return ".."; + return "Home".Localize(); } } diff --git a/PrintLibrary/Provider/LibraryProviderSqlite.cs b/Library/Provider/LibraryProviderSqlite.cs similarity index 100% rename from PrintLibrary/Provider/LibraryProviderSqlite.cs rename to Library/Provider/LibraryProviderSqlite.cs diff --git a/PrintLibrary/Provider/LibrarySQLiteData.cs b/Library/Provider/LibrarySQLiteData.cs similarity index 100% rename from PrintLibrary/Provider/LibrarySQLiteData.cs rename to Library/Provider/LibrarySQLiteData.cs diff --git a/PrintQueue/OptionsMenu/ExportToFolderFeedbackWindow.cs b/Queue/OptionsMenu/ExportToFolderFeedbackWindow.cs similarity index 100% rename from PrintQueue/OptionsMenu/ExportToFolderFeedbackWindow.cs rename to Queue/OptionsMenu/ExportToFolderFeedbackWindow.cs diff --git a/PrintQueue/OptionsMenu/ExportToFolderProcess.cs b/Queue/OptionsMenu/ExportToFolderProcess.cs similarity index 100% rename from PrintQueue/OptionsMenu/ExportToFolderProcess.cs rename to Queue/OptionsMenu/ExportToFolderProcess.cs diff --git a/PrintQueue/OptionsMenu/ExportToSdCardFeedbackWindow.cs b/Queue/OptionsMenu/ExportToSdCardFeedbackWindow.cs similarity index 100% rename from PrintQueue/OptionsMenu/ExportToSdCardFeedbackWindow.cs rename to Queue/OptionsMenu/ExportToSdCardFeedbackWindow.cs diff --git a/PrintQueue/OptionsMenu/PartsSheetCreator.cs b/Queue/OptionsMenu/PartsSheetCreator.cs similarity index 100% rename from PrintQueue/OptionsMenu/PartsSheetCreator.cs rename to Queue/OptionsMenu/PartsSheetCreator.cs diff --git a/PrintQueue/OptionsMenu/QueueOptionsMenu.cs b/Queue/OptionsMenu/QueueOptionsMenu.cs similarity index 100% rename from PrintQueue/OptionsMenu/QueueOptionsMenu.cs rename to Queue/OptionsMenu/QueueOptionsMenu.cs diff --git a/PrintQueue/PrintItemWrapper.cs b/Queue/PrintItemWrapper.cs similarity index 100% rename from PrintQueue/PrintItemWrapper.cs rename to Queue/PrintItemWrapper.cs diff --git a/PrintQueue/QueueData.cs b/Queue/QueueData.cs similarity index 100% rename from PrintQueue/QueueData.cs rename to Queue/QueueData.cs diff --git a/PrintQueue/QueueDataView.cs b/Queue/QueueDataView.cs similarity index 100% rename from PrintQueue/QueueDataView.cs rename to Queue/QueueDataView.cs diff --git a/PrintQueue/QueueDataWidget.cs b/Queue/QueueDataWidget.cs similarity index 100% rename from PrintQueue/QueueDataWidget.cs rename to Queue/QueueDataWidget.cs diff --git a/PrintQueue/QueueRowItem.cs b/Queue/QueueRowItem.cs similarity index 100% rename from PrintQueue/QueueRowItem.cs rename to Queue/QueueRowItem.cs diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index f4251416a..c9068c82a 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -3358,3 +3358,6 @@ Translated:Enter a Design Name Here English:Also save to Library Translated:Also save to Library +English:Home +Translated:Home +