Bring back subtitle with vendor name

Signed-off-by: Pavel Artsishevsky <polter.rnd@gmail.com>
polter-rnd · Mar 18, 2023 · a8cc1ae · a8cc1ae
1 parent 1f83b26
commit a8cc1ae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/bbswitch_gui/application.py b/bbswitch_gui/application.py
@@ -77,11 +77,11 @@ def update_bbswitch(self) -> None:
             self.window.reset()
 
         self._enabled_gpu = None
-        bus_id, enabled, device = '', False, ''
+        bus_id, enabled, device, vendor = '', False, '', ''
         try:
             bus_id, enabled = self.bbswitch.get_gpu_state()
-            _, device = PCIUtil.get_device_info(PCIUtil.get_vendor_id(bus_id),
-                                                PCIUtil.get_device_id(bus_id))
+            vendor, device = PCIUtil.get_device_info(PCIUtil.get_vendor_id(bus_id),
+                                                     PCIUtil.get_device_id(bus_id))
         except BBswitchMonitorException as err:
             message = str(err)
             logger.error(message)
@@ -98,7 +98,7 @@ def update_bbswitch(self) -> None:
             self.indicator.set_state(enabled)
 
         if self.window:
-            self.window.update_header(bus_id, enabled, device)
+            self.window.update_header(bus_id, enabled, vendor, device)
 
         if enabled:
             logger.debug('Adapter %s is ON', bus_id)

diff --git a/bbswitch_gui/ui/bbswitch-gui.glade b/bbswitch_gui/ui/bbswitch-gui.glade
@@ -532,7 +532,6 @@
         <property name="visible">True</property>
         <property name="can-focus">False</property>
         <property name="title" translatable="yes">Toggle NVIDIA GPU power state</property>
-        <property name="has-subtitle">False</property>
         <property name="show-close-button">True</property>
         <child>
           <object class="GtkSwitch" id="state_switch">

diff --git a/bbswitch_gui/window.py b/bbswitch_gui/window.py
@@ -90,7 +90,7 @@ def reset(self) -> None:
         self.toggle_button.set_sensitive(False)
         self.processes_store.clear()
 
-    def update_header(self, bus_id: str, enabled: bool, device: str) -> None:
+    def update_header(self, bus_id: str, enabled: bool, vendor: str, device: str) -> None:
         """Update headerbar for selected GPU.
 
         :param bus_id: PCI bus ID
@@ -112,6 +112,9 @@ def update_header(self, bus_id: str, enabled: bool, device: str) -> None:
             self.header_bar.set_title(
                 device[device.find('[') + 1:device.find(']')])  # type: ignore
 
+        if vendor is not None:
+            self.header_bar.set_subtitle(vendor)
+
     def update_monitor(self, gpu_info: NVidiaGpuInfo) -> None:
         """Update UI for selected GPU.