Merge lp:~elementary-pantheon/wingpanel-indicator-sound/mic-icon into lp:~wingpanel-devs/wingpanel-indicator-sound/trunk

[Danielle Foré]

* Create DisplayWidget.vala
* If the microphone is in use, show a mic icon in the panel

[lp:~elementary-pantheon/wingpanel-indicator-sound/mic-icon]

137. By Danielle Foré on 2016-12-21

show microphone icon when mic is on

[Corentin Noël (tintou)]

That's elegant

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-11-07 15:14:18 +0000
+++ src/CMakeLists.txt	2016-12-21 03:28:29 +0000
@@ -14,6 +14,7 @@
 # Add all your vala files and requires packages to the List below to include them in the build
 vala_precompile (VALA_C ${CMAKE_PROJECT_NAME}
   Indicator.vala
+  Widgets/DisplayWidget.vala
   Widgets/MaxWidthLabel.vala
   Widgets/Scale.vala
   Widgets/MprisGui.vala
 
=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2016-12-20 20:54:01 +0000
+++ src/Indicator.vala	2016-12-21 03:28:29 +0000
@@ -16,10 +16,10 @@
  */
 
 public class Sound.Indicator : Wingpanel.Indicator {
+    private DisplayWidget display_widget;
     private Gtk.Grid main_grid;
     private Widgets.Scale volume_scale;
     private Widgets.Scale mic_scale;
-    private Wingpanel.Widgets.OverlayIcon panel_icon;
     private Wingpanel.Widgets.Button settings_button;
     private Wingpanel.Widgets.Separator first_seperator;
     private Wingpanel.Widgets.Separator mic_seperator;
@@ -61,21 +61,6 @@
     }
 
     construct {
-        panel_icon = new Wingpanel.Widgets.OverlayIcon ("audio-output-none");
-
-        // toggle mute on middle click
-        panel_icon.button_press_event.connect ((e) => {
-            if (e.button == Gdk.BUTTON_MIDDLE) {
-                volume_control.toggle_mute ();
-                return Gdk.EVENT_STOP;
-            }
-
-            return Gdk.EVENT_PROPAGATE;
-        });
-
-        // change volume on scroll
-        panel_icon.scroll_event.connect (on_icon_scroll_event);
-
         var locale = Intl.setlocale (LocaleCategory.MESSAGES, null);
 
         volume_scale = new Widgets.Scale ("audio-volume-high-symbolic", true, 0.0, max_volume, 0.01);
@@ -112,7 +97,7 @@
     private void on_volume_change () {
         var volume = volume_control.volume.volume / this.max_volume;
         volume_scale.get_scale ().set_value (volume);
-        panel_icon.set_main_icon_name (get_volume_icon (volume));
+        display_widget.icon_name = get_volume_icon (volume);
     }
 
     private void on_mic_volume_change () {
@@ -124,7 +109,7 @@
         volume_scale.get_switch ().active = !volume_control.mute;
 
         string volume_icon = get_volume_icon (volume_control.volume.volume);
-        panel_icon.set_main_icon_name (volume_icon);
+        display_widget.icon_name = volume_icon;
 
         if (volume_control.mute) {
             volume_scale.set_icon ("audio-volume-muted-symbolic");
@@ -153,12 +138,12 @@
             this.sound_was_blocked_timeout_id = Timeout.add_seconds (5, () => {
                 this.mute_blocks_sound = false;
                 this.sound_was_blocked_timeout_id = 0;
-                panel_icon.set_main_icon_name (get_volume_icon (volume_control.volume.volume));
+                display_widget.icon_name = get_volume_icon (volume_control.volume.volume);
                 return false;
             });
         }
 
-        panel_icon.set_main_icon_name (get_volume_icon (volume_control.volume.volume));
+        display_widget.icon_name = get_volume_icon (volume_control.volume.volume);
     }
 
     private bool on_icon_scroll_event (Gdk.EventScroll e) {
@@ -201,11 +186,13 @@
             mic_scale.show_all();
             mic_seperator.no_show_all = false;
             mic_seperator.show ();
+            display_widget.show_mic = true;
         } else {
             mic_scale.no_show_all = true;
             mic_scale.hide();
             mic_seperator.no_show_all = true;
             mic_seperator.hide ();
+            display_widget.show_mic = false;
         }
     }
 
@@ -238,8 +225,21 @@
     }
 
     public override Gtk.Widget get_display_widget () {
-        panel_icon.set_main_icon_name (get_volume_icon (volume_control.volume.volume));
-        return panel_icon;
+        display_widget = new DisplayWidget ();
+        display_widget.icon_name = get_volume_icon (volume_control.volume.volume);
+
+        display_widget.button_press_event.connect ((e) => {
+            if (e.button == Gdk.BUTTON_MIDDLE) {
+                volume_control.toggle_mute ();
+                return Gdk.EVENT_STOP;
+            }
+
+            return Gdk.EVENT_PROPAGATE;
+        });
+
+        display_widget.scroll_event.connect (on_icon_scroll_event);
+
+        return display_widget;
     }
 
     public override Gtk.Widget? get_widget () {
 
=== added file 'src/Widgets/DisplayWidget.vala'
--- src/Widgets/DisplayWidget.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/DisplayWidget.vala	2016-12-21 03:28:29 +0000
@@ -0,0 +1,51 @@
+/*
+* Copyright (c) 2016 elementary LLC. (http://launchpad.net/wingpanel-indicator-sound)
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+* Boston, MA 02111-1307, USA.
+*/
+
+public class DisplayWidget : Gtk.Grid {
+    private Gtk.Image volume_icon;
+    private Gtk.Revealer mic_revealer;
+
+    public bool show_mic {
+        set {
+            mic_revealer.reveal_child = value;
+        }
+    }
+
+    public string icon_name {
+        set {
+            volume_icon.icon_name = value;
+        }
+    }
+
+    construct {
+        volume_icon = new Gtk.Image ();
+        volume_icon.icon_name = "audio-volume-high-symbolic";
+        volume_icon.icon_size = Gtk.IconSize.LARGE_TOOLBAR;
+
+        var mic_icon = new Gtk.Image.from_icon_name ("audio-input-microphone-symbolic", Gtk.IconSize.LARGE_TOOLBAR);
+        mic_icon.margin_start = 12;
+
+        mic_revealer = new Gtk.Revealer ();
+        mic_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_RIGHT;
+        mic_revealer.add (mic_icon);
+
+        add (volume_icon);
+        add (mic_revealer);
+    }
+}