diff --git a/ApplicationView/CompactSlidePanel.cs b/ApplicationView/CompactSlidePanel.cs index 38c5f1d47..61ac6ffbc 100644 --- a/ApplicationView/CompactSlidePanel.cs +++ b/ApplicationView/CompactSlidePanel.cs @@ -96,25 +96,24 @@ namespace MatterHackers.MatterControl mainControlsTabControl.TabBar.Margin = new BorderDouble(0, 0); mainControlsTabControl.TabBar.Padding = new BorderDouble(0, 2); - QueueTabPage = new TabPage(new QueueControlsWidget(), "Queue"); + QueueTabPage = new TabPage(new QueueControlsWidget(), "QUEUE"); NumQueueItemsChanged(this, null); - mainControlsTabControl.AddTab(new SimpleTextTabWidget(QueueTabPage, 18, + mainControlsTabControl.AddTab(new SimpleTextTabWidget(QueueTabPage, 16, ActiveTheme.Instance.PrimaryTextColor, new RGBA_Bytes(), unselectedTextColor, new RGBA_Bytes())); - //mainControlsTabControl.AddTab(new SimpleTextTabWidget(new TabPage(new GuiWidget(), "History"), 18, - // ActiveTheme.Instance.PrimaryTextColor, new RGBA_Bytes(), unselectedTextColor, new RGBA_Bytes())); + mainControlsTabControl.AddTab(new SimpleTextTabWidget(new TabPage(new GuiWidget(), LocalizedString.Get("HISTORY")), 16, + ActiveTheme.Instance.PrimaryTextColor, new RGBA_Bytes(), unselectedTextColor, new RGBA_Bytes())); - string libraryTabLabel = LocalizedString.Get("Library"); - - mainControlsTabControl.AddTab(new SimpleTextTabWidget(new TabPage(new PrintLibraryWidget(), libraryTabLabel), 18, + string libraryTabLabel = LocalizedString.Get("LIBRARY"); + mainControlsTabControl.AddTab(new SimpleTextTabWidget(new TabPage(new PrintLibraryWidget(), libraryTabLabel), 16, ActiveTheme.Instance.PrimaryTextColor, new RGBA_Bytes(), unselectedTextColor, new RGBA_Bytes())); - //mainControlsTabControl.AddTab(new SimpleTextTabWidget(new TabPage(new ToolsWidget(), "Tools"), 18, + //mainControlsTabControl.AddTab(new SimpleTextTabWidget(new TabPage(new ToolsWidget(), "Tools"), 16, //ActiveTheme.Instance.PrimaryTextColor, new RGBA_Bytes(), unselectedTextColor, new RGBA_Bytes())); - AboutTabPage = new TabPage(new AboutPage(), LocalizedString.Get("About")); - aboutTabView = new SimpleTextTabWidget(AboutTabPage, 18, + AboutTabPage = new TabPage(new AboutPage(), LocalizedString.Get("ABOUT")); + aboutTabView = new SimpleTextTabWidget(AboutTabPage, 16, ActiveTheme.Instance.PrimaryTextColor, new RGBA_Bytes(), unselectedTextColor, new RGBA_Bytes()); mainControlsTabControl.AddTab(aboutTabView); @@ -263,18 +262,18 @@ namespace MatterHackers.MatterControl manualPrinterControlsScrollArea.AddChild(manualPrinterControls); //Add the tab contents for 'Advanced Controls' - string printerControlsLabel = LocalizedString.Get("Controls"); - advancedControls.AddTab(new SimpleTextTabWidget(new TabPage(manualPrinterControlsScrollArea, printerControlsLabel), 18, + string printerControlsLabel = LocalizedString.Get("CONTROLS"); + advancedControls.AddTab(new SimpleTextTabWidget(new TabPage(manualPrinterControlsScrollArea, printerControlsLabel), 16, ActiveTheme.Instance.PrimaryTextColor, new RGBA_Bytes(), unselectedTextColor, new RGBA_Bytes())); - string sliceSettingsLabel = LocalizedString.Get("Slice Settings"); + string sliceSettingsLabel = LocalizedString.Get("SLICE SETTINGS"); sliceSettingsWidget = new SliceSettingsWidget(sliceSettingsUiState); - advancedControls.AddTab(new SimpleTextTabWidget(new TabPage(sliceSettingsWidget, sliceSettingsLabel), 18, + advancedControls.AddTab(new SimpleTextTabWidget(new TabPage(sliceSettingsWidget, sliceSettingsLabel), 16, ActiveTheme.Instance.PrimaryTextColor, new RGBA_Bytes(), unselectedTextColor, new RGBA_Bytes())); - string configurationLabel = LocalizedString.Get("Configuration"); + string configurationLabel = LocalizedString.Get("CONFIGURATION"); ScrollableWidget configurationControls = new ConfigurationPage(); - advancedControls.AddTab(new SimpleTextTabWidget(new TabPage(configurationControls, configurationLabel), 18, + advancedControls.AddTab(new SimpleTextTabWidget(new TabPage(configurationControls, configurationLabel), 16, ActiveTheme.Instance.PrimaryTextColor, new RGBA_Bytes(), unselectedTextColor, new RGBA_Bytes())); @@ -334,7 +333,7 @@ namespace MatterHackers.MatterControl { UpdateControl.NeedToCheckForUpdateFirstTimeEver = false; addedUpdateMark = new NotificationWidget(); - addedUpdateMark.OriginRelativeParent = new Vector2(63, 10); + addedUpdateMark.OriginRelativeParent = new Vector2(70, 10); aboutTabView.AddChild(addedUpdateMark); } #endif @@ -345,13 +344,13 @@ namespace MatterHackers.MatterControl { addedUpdateMark.Visible = false; } - AboutTabPage.Text = string.Format("About"); + AboutTabPage.Text = string.Format("ABOUT"); } } void NumQueueItemsChanged(object sender, EventArgs widgetEvent) { - string queueStringBeg = LocalizedString.Get("Queue"); + string queueStringBeg = LocalizedString.Get("QUEUE"); string queueString = string.Format("{1} ({0})", PrintQueue.PrintQueueControl.Instance.Count, queueStringBeg); QueueTabPage.Text = string.Format(queueString, PrintQueue.PrintQueueControl.Instance.Count); } diff --git a/ApplicationView/WidescreenPanel.cs b/ApplicationView/WidescreenPanel.cs index 565b03764..5f3160ae6 100644 --- a/ApplicationView/WidescreenPanel.cs +++ b/ApplicationView/WidescreenPanel.cs @@ -405,6 +405,7 @@ namespace MatterHackers.MatterControl TabPage QueueTabPage; TabPage LibraryTabPage; + TabPage HistoryTabPage; TabPage AboutTabPage; SimpleTextTabWidget AboutTabView; RGBA_Bytes unselectedTextColor = ActiveTheme.Instance.TabLabelUnselected; @@ -419,16 +420,20 @@ namespace MatterHackers.MatterControl this.Margin = new BorderDouble(top: 4); - QueueTabPage = new TabPage(new QueueControlsWidget(), "QUEUE"); - this.AddTab(new SimpleTextTabWidget(QueueTabPage, 16, + QueueTabPage = new TabPage(new QueueControlsWidget(), LocalizedString.Get("Queue").ToUpper()); + this.AddTab(new SimpleTextTabWidget(QueueTabPage, 15, ActiveTheme.Instance.TabLabelSelected, new RGBA_Bytes(), unselectedTextColor, new RGBA_Bytes())); - LibraryTabPage = new TabPage(new PrintLibraryWidget(), "LIBRARY"); - this.AddTab(new SimpleTextTabWidget(LibraryTabPage, 16, + LibraryTabPage = new TabPage(new PrintLibraryWidget(), LocalizedString.Get("Library").ToUpper()); + this.AddTab(new SimpleTextTabWidget(LibraryTabPage, 15, ActiveTheme.Instance.TabLabelSelected, new RGBA_Bytes(), unselectedTextColor, new RGBA_Bytes())); - AboutTabPage = new TabPage(new AboutPage(), "ABOUT"); - AboutTabView = new SimpleTextTabWidget(AboutTabPage, 16, + HistoryTabPage = new TabPage(new GuiWidget(), LocalizedString.Get("History").ToUpper()); + this.AddTab(new SimpleTextTabWidget(HistoryTabPage, 15, + ActiveTheme.Instance.TabLabelSelected, new RGBA_Bytes(), unselectedTextColor, new RGBA_Bytes())); + + AboutTabPage = new TabPage(new AboutPage(), LocalizedString.Get("About").ToUpper()); + AboutTabView = new SimpleTextTabWidget(AboutTabPage, 15, ActiveTheme.Instance.TabLabelSelected, new RGBA_Bytes(), unselectedTextColor, new RGBA_Bytes()); this.AddTab(AboutTabView); @@ -439,7 +444,7 @@ namespace MatterHackers.MatterControl void NumQueueItemsChanged(object sender, EventArgs widgetEvent) { - string queueStringBeg = LocalizedString.Get("QUEUE"); + string queueStringBeg = LocalizedString.Get("Queue").ToUpper(); string queueString = string.Format("{1} ({0})", PrintQueue.PrintQueueControl.Instance.Count, queueStringBeg); QueueTabPage.Text = string.Format(queueString, PrintQueue.PrintQueueControl.Instance.Count); } @@ -462,7 +467,7 @@ namespace MatterHackers.MatterControl { UpdateControl.NeedToCheckForUpdateFirstTimeEver = false; addedUpdateMark = new NotificationWidget(); - addedUpdateMark.OriginRelativeParent = new Vector2(72, 10); + addedUpdateMark.OriginRelativeParent = new Vector2(68, 7); AboutTabView.AddChild(addedUpdateMark); } #else @@ -475,7 +480,7 @@ namespace MatterHackers.MatterControl { addedUpdateMark.Visible = false; } - AboutTabPage.Text = string.Format("ABOUT"); + AboutTabPage.Text = string.Format("About").ToUpper(); } }