remove server panel

servo · Jun 22, 2020 · 9371b72 · 9371b72
1 parent 8cf2f14
commit 9371b72
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/support/hololens/ServoApp/BrowserPage.cpp b/support/hololens/ServoApp/BrowserPage.cpp
@@ -325,14 +325,14 @@ void BrowserPage::OnDevtoolsButtonClicked(IInspectable const &,
     mDevtoolsClient->Run();
     std::wstring message =
         resourceLoader.GetString(L"devtoolsStatus/Running").c_str();
-    std::wstring formatted = format(message, port.c_str());
-    DevtoolsStatusMessage().Text(formatted);
+    hstring formatted{format(message, port.c_str())};
+    OnDevtoolsMessage(servo::DevtoolsMessageLevel::None, L"", formatted);
   } else if (mDevtoolsStatus == DevtoolsStatus::Failed) {
-    DevtoolsStatusMessage().Text(
-        resourceLoader.GetString(L"devtoolsStatus/Failed"));
+    auto body = resourceLoader.GetString(L"devtoolsStatus/Failed");
+    OnDevtoolsMessage(servo::DevtoolsMessageLevel::Error, L"", body);
   } else if (mDevtoolsStatus == DevtoolsStatus::Stopped) {
-    DevtoolsStatusMessage().Text(
-        resourceLoader.GetString(L"devtoolsStatus/Stopped"));
+    auto body = resourceLoader.GetString(L"devtoolsStatus/Stopped");
+    OnDevtoolsMessage(servo::DevtoolsMessageLevel::None, L"", body);
   }
 }
 

diff --git a/support/hololens/ServoApp/BrowserPage.xaml b/support/hololens/ServoApp/BrowserPage.xaml
@@ -186,9 +186,6 @@
                     <TextBox MinHeight="12" FontFamily="Consolas" FontSize="12" Grid.Row="1" IsTabStop="true" x:Name="JSInput" VerticalAlignment="Center" KeyUp="OnJSInputEdited" IsSpellCheckEnabled="False"/>
                 </Grid>
             </muxc:TabViewItem>
-            <muxc:TabViewItem x:Uid="devtoolsTabServer" IsClosable="False">
-                <TextBlock x:Name="DevtoolsStatusMessage" Margin="10"></TextBlock>
-            </muxc:TabViewItem>
             <muxc:TabViewItem x:Uid="devtoolsTabPrefs" IsClosable="False">
                 <Grid VerticalAlignment="Stretch">
                     <Grid.RowDefinitions>

diff --git a/support/hololens/ServoApp/Strings/en-US/Resources.resw b/support/hololens/ServoApp/Strings/en-US/Resources.resw
@@ -108,9 +108,6 @@
   <data name="urlTextbox.PlaceholderText" xml:space="preserve">
     <value>Type a URL</value>
   </data>
-  <data name="devtoolsTabServer.[using:Microsoft.UI.Xaml.Controls]TabViewItem.Header" xml:space="preserve">
-    <value>Devtools Server</value>
-  </data>
   <data name="devtoolsTabConsole.[using:Microsoft.UI.Xaml.Controls]TabViewItem.Header" xml:space="preserve">
     <value>Console</value>
   </data>

diff --git a/support/hololens/ServoApp/Strings/fr-FR/Resources.resw b/support/hololens/ServoApp/Strings/fr-FR/Resources.resw
@@ -104,9 +104,6 @@
   <data name="urlTextbox.PlaceholderText" xml:space="preserve">
     <value>Saisir une adresse</value>
   </data>
-  <data name="devtoolsTabServer.[using:Microsoft.UI.Xaml.Controls]TabViewItem.Header" xml:space="preserve">
-    <value>Serveur DevTools</value>
-  </data>
   <data name="devtoolsTabPrefs.[using:Microsoft.UI.Xaml.Controls]TabViewItem.Header" xml:space="preserve">
     <value>Préférences</value>
   </data>