[Xfce4-commits] <xfce4-taskbar-plugin:master> Option is now customizable: Show instances list when hovering a button
Valentin Dudouyt
noreply at xfce.org
Sat Nov 10 06:28:01 CET 2012
Updating branch refs/heads/master
to 224aacca0c3ca7cd031200a03f905896d9bf1bfd (commit)
from 4197035e4619a2586deec6f6c56f51444172c8b7 (commit)
commit 224aacca0c3ca7cd031200a03f905896d9bf1bfd
Author: Valentin Dudouyt <valentin.dudouyt at gmail.com>
Date: Sat Nov 10 12:25:49 2012 +0700
Option is now customizable: Show instances list when hovering a button
taskbar-dialog.glade | 156 ++++++++++++++++++--------
taskbar-dialog_ui.h | 303 ++++++++++++++++++++++++++++----------------------
taskbar-widget.c | 14 ++-
taskbar.c | 2 +
4 files changed, 294 insertions(+), 181 deletions(-)
diff --git a/taskbar-dialog.glade b/taskbar-dialog.glade
index 83728a9..0ee317a 100644
--- a/taskbar-dialog.glade
+++ b/taskbar-dialog.glade
@@ -1,37 +1,84 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.14"/>
<!-- interface-requires libxfce4ui 0.0 -->
<!-- interface-naming-policy toplevel-contextual -->
<object class="XfceTitledDialog" id="dialog">
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Task Bar</property>
<property name="icon_name">gtk-properties</property>
<property name="type_hint">normal</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="close-button">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help-button">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="flat-buttons">
@@ -39,10 +86,13 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -52,22 +102,24 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
-
</object>
</child>
-
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Appearance</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -77,31 +129,36 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">12</property>
-
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -111,10 +168,13 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -124,13 +184,33 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="show-instances-on-hover">
+ <property name="label" translatable="yes">Show instances list when hovering a button</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0.51999998092651367</property>
+ <property name="yalign">0.51999998092651367</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -138,6 +218,7 @@
<child type="label">
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Behaviour</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -147,23 +228,26 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="include-all-workspaces">
@@ -171,10 +255,13 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -184,10 +271,13 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -197,10 +287,13 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -211,6 +304,7 @@
<child type="label">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Filtering</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -219,55 +313,18 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area2">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="close-button">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="help-button">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- <property name="secondary">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
</object>
</child>
<action-widgets>
@@ -275,4 +332,5 @@
<action-widget response="0">help-button</action-widget>
</action-widgets>
</object>
+ <object class="GtkListStore" id="liststore1"/>
</interface>
diff --git a/taskbar-dialog_ui.h b/taskbar-dialog_ui.h
index 7c6d5c0..8746046 100644
--- a/taskbar-dialog_ui.h
+++ b/taskbar-dialog_ui.h
@@ -10,138 +10,179 @@ static const char taskbar_dialog_ui[] =
"<?xml version=\"1.0\" ?><interface><requires lib=\"gtk+\" versio"
"n=\"2.14\"/><!-- interface-requires libxfce4ui 0.0 --><!-- inter"
"face-naming-policy toplevel-contextual --><object class=\"XfceTi"
- "tledDialog\" id=\"dialog\"><property name=\"title\" translatable"
- "=\"yes\">Task Bar</property><property name=\"icon_name\">gtk-pro"
- "perties</property><property name=\"type_hint\">normal</property>"
- "<child internal-child=\"vbox\"><object class=\"GtkVBox\" id=\"di"
- "alog-vbox2\"><property name=\"visible\">True</property><property"
- " name=\"orientation\">vertical</property><property name=\"spacin"
- "g\">2</property><child><object class=\"GtkVBox\" id=\"vbox1\"><p"
- "roperty name=\"visible\">True</property><property name=\"border_"
- "width\">6</property><property name=\"orientation\">vertical</pro"
- "perty><property name=\"spacing\">6</property><child><object clas"
- "s=\"GtkFrame\" id=\"frame3\"><property name=\"visible\">True</pr"
- "operty><property name=\"label_xalign\">0</property><property nam"
- "e=\"shadow_type\">none</property><child><object class=\"GtkAlign"
- "ment\" id=\"alignment3\"><property name=\"visible\">True</proper"
- "ty><property name=\"left_padding\">12</property><child><object c"
- "lass=\"GtkVBox\" id=\"vbox3\"><property name=\"visible\">True</p"
- "roperty><property name=\"border_width\">6</property><property na"
- "me=\"orientation\">vertical</property><property name=\"spacing\""
- ">6</property><child><object class=\"GtkCheckButton\" id=\"flat-b"
- "uttons\"><property name=\"label\" translatable=\"yes\">Show _fla"
- "t buttons</property><property name=\"visible\">True</property><p"
- "roperty name=\"can_focus\">True</property><property name=\"recei"
- "ves_default\">False</property><property name=\"use_underline\">T"
- "rue</property><property name=\"draw_indicator\">True</property><"
- "/object><packing><property name=\"position\">1</property></packi"
- "ng></child><child><object class=\"GtkCheckButton\" id=\"show-han"
- "dle\"><property name=\"label\" translatable=\"yes\">Show _handle"
- "</property><property name=\"visible\">True</property><property n"
- "ame=\"can_focus\">True</property><property name=\"receives_defau"
- "lt\">False</property><property name=\"use_underline\">True</prop"
- "erty><property name=\"draw_indicator\">True</property></object><"
- "packing><property name=\"position\">2</property></packing></chil"
- "d></object></child></object></child><child type=\"label\"><objec"
- "t class=\"GtkLabel\" id=\"label1\"><property name=\"visible\">Tr"
- "ue</property><property name=\"label\" translatable=\"yes\">Appea"
- "rance</property><attributes><attribute name=\"weight\" value=\"b"
- "old\"/></attributes></object></child></object><packing><property"
- " name=\"expand\">False</property><property name=\"position\">0</"
- "property></packing></child><child><object class=\"GtkFrame\" id="
- "\"frame1\"><property name=\"visible\">True</property><property n"
- "ame=\"label_xalign\">0</property><property name=\"shadow_type\">"
- "none</property><child><object class=\"GtkAlignment\" id=\"alignm"
- "ent1\"><property name=\"visible\">True</property><property name="
- "\"left_padding\">12</property><child><object class=\"GtkVBox\" i"
- "d=\"vbox2\"><property name=\"visible\">True</property><property "
- "name=\"border_width\">6</property><property name=\"orientation\""
- ">vertical</property><property name=\"spacing\">6</property><chil"
- "d><object class=\"GtkHBox\" id=\"hbox1\"><property name=\"visibl"
- "e\">True</property><property name=\"spacing\">12</property></obj"
- "ect><packing><property name=\"position\">0</property></packing><"
- "/child><child><object class=\"GtkCheckButton\" id=\"switch-works"
- "pace-on-unminimize\"><property name=\"label\" translatable=\"yes"
- "\">Restore minimized windows to current _workspace</property><pr"
- "operty name=\"visible\">True</property><property name=\"can_focu"
- "s\">True</property><property name=\"receives_default\">False</pr"
+ "tledDialog\" id=\"dialog\"><property name=\"can_focus\">False</p"
+ "roperty><property name=\"title\" translatable=\"yes\">Task Bar</"
+ "property><property name=\"icon_name\">gtk-properties</property><"
+ "property name=\"type_hint\">normal</property><child internal-chi"
+ "ld=\"vbox\"><object class=\"GtkVBox\" id=\"dialog-vbox2\"><prope"
+ "rty name=\"visible\">True</property><property name=\"can_focus\""
+ ">False</property><property name=\"spacing\">2</property><child i"
+ "nternal-child=\"action_area\"><object class=\"GtkHButtonBox\" id"
+ "=\"dialog-action_area2\"><property name=\"visible\">True</proper"
+ "ty><property name=\"can_focus\">False</property><property name=\""
+ "layout_style\">end</property><child><object class=\"GtkButton\" "
+ "id=\"close-button\"><property name=\"label\">gtk-close</property"
+ "><property name=\"visible\">True</property><property name=\"can_"
+ "focus\">True</property><property name=\"receives_default\">True<"
+ "/property><property name=\"use_action_appearance\">False</proper"
+ "ty><property name=\"use_stock\">True</property></object><packing"
+ "><property name=\"expand\">False</property><property name=\"fill"
+ "\">False</property><property name=\"position\">0</property></pac"
+ "king></child><child><object class=\"GtkButton\" id=\"help-button"
+ "\"><property name=\"label\">gtk-help</property><property name=\""
+ "visible\">True</property><property name=\"can_focus\">True</prop"
+ "erty><property name=\"receives_default\">True</property><propert"
+ "y name=\"use_action_appearance\">False</property><property name="
+ "\"use_stock\">True</property></object><packing><property name=\""
+ "expand\">False</property><property name=\"fill\">False</property"
+ "><property name=\"position\">1</property><property name=\"second"
+ "ary\">True</property></packing></child></object><packing><proper"
+ "ty name=\"expand\">False</property><property name=\"fill\">True<"
+ "/property><property name=\"pack_type\">end</property><property n"
+ "ame=\"position\">0</property></packing></child><child><object cl"
+ "ass=\"GtkVBox\" id=\"vbox1\"><property name=\"visible\">True</pr"
+ "operty><property name=\"can_focus\">False</property><property na"
+ "me=\"border_width\">6</property><property name=\"spacing\">6</pr"
+ "operty><child><object class=\"GtkFrame\" id=\"frame3\"><property"
+ " name=\"visible\">True</property><property name=\"can_focus\">Fa"
+ "lse</property><property name=\"label_xalign\">0</property><prope"
+ "rty name=\"shadow_type\">none</property><child><object class=\"G"
+ "tkAlignment\" id=\"alignment3\"><property name=\"visible\">True<"
+ "/property><property name=\"can_focus\">False</property><property"
+ " name=\"left_padding\">12</property><child><object class=\"GtkVB"
+ "ox\" id=\"vbox3\"><property name=\"visible\">True</property><pro"
+ "perty name=\"can_focus\">False</property><property name=\"border"
+ "_width\">6</property><property name=\"spacing\">6</property><chi"
+ "ld><object class=\"GtkCheckButton\" id=\"flat-buttons\"><propert"
+ "y name=\"label\" translatable=\"yes\">Show _flat buttons</proper"
+ "ty><property name=\"visible\">True</property><property name=\"ca"
+ "n_focus\">True</property><property name=\"receives_default\">Fal"
+ "se</property><property name=\"use_action_appearance\">False</pro"
+ "perty><property name=\"use_underline\">True</property><property "
+ "name=\"draw_indicator\">True</property></object><packing><proper"
+ "ty name=\"expand\">True</property><property name=\"fill\">True</"
+ "property><property name=\"position\">1</property></packing></chi"
+ "ld><child><object class=\"GtkCheckButton\" id=\"show-handle\"><p"
+ "roperty name=\"label\" translatable=\"yes\">Show _handle</proper"
+ "ty><property name=\"visible\">True</property><property name=\"ca"
+ "n_focus\">True</property><property name=\"receives_default\">Fal"
+ "se</property><property name=\"use_action_appearance\">False</pro"
+ "perty><property name=\"use_underline\">True</property><property "
+ "name=\"draw_indicator\">True</property></object><packing><proper"
+ "ty name=\"expand\">True</property><property name=\"fill\">True</"
+ "property><property name=\"position\">2</property></packing></chi"
+ "ld></object></child></object></child><child type=\"label\"><obje"
+ "ct class=\"GtkLabel\" id=\"label1\"><property name=\"visible\">T"
+ "rue</property><property name=\"can_focus\">False</property><prop"
+ "erty name=\"label\" translatable=\"yes\">Appearance</property><a"
+ "ttributes><attribute name=\"weight\" value=\"bold\"/></attribute"
+ "s></object></child></object><packing><property name=\"expand\">F"
+ "alse</property><property name=\"fill\">True</property><property "
+ "name=\"position\">0</property></packing></child><child><object c"
+ "lass=\"GtkFrame\" id=\"frame1\"><property name=\"visible\">True<"
+ "/property><property name=\"can_focus\">False</property><property"
+ " name=\"label_xalign\">0</property><property name=\"shadow_type\""
+ ">none</property><child><object class=\"GtkAlignment\" id=\"align"
+ "ment1\"><property name=\"visible\">True</property><property name"
+ "=\"can_focus\">False</property><property name=\"left_padding\">1"
+ "2</property><child><object class=\"GtkVBox\" id=\"vbox2\"><prope"
+ "rty name=\"visible\">True</property><property name=\"can_focus\""
+ ">False</property><property name=\"border_width\">6</property><pr"
+ "operty name=\"spacing\">6</property><child><object class=\"GtkHB"
+ "ox\" id=\"hbox1\"><property name=\"visible\">True</property><pro"
+ "perty name=\"can_focus\">False</property><property name=\"spacin"
+ "g\">12</property></object><packing><property name=\"expand\">Tru"
+ "e</property><property name=\"fill\">True</property><property nam"
+ "e=\"position\">0</property></packing></child><child><object clas"
+ "s=\"GtkCheckButton\" id=\"switch-workspace-on-unminimize\"><prop"
+ "erty name=\"label\" translatable=\"yes\">Restore minimized windo"
+ "ws to current _workspace</property><property name=\"visible\">Tr"
+ "ue</property><property name=\"can_focus\">True</property><proper"
+ "ty name=\"receives_default\">False</property><property name=\"us"
+ "e_action_appearance\">False</property><property name=\"use_under"
+ "line\">True</property><property name=\"draw_indicator\">True</pr"
+ "operty></object><packing><property name=\"expand\">True</propert"
+ "y><property name=\"fill\">True</property><property name=\"positi"
+ "on\">1</property></packing></child><child><object class=\"GtkChe"
+ "ckButton\" id=\"show-wireframes\"><property name=\"label\" trans"
+ "latable=\"yes\">D_raw window frame when hovering a button</prope"
+ "rty><property name=\"visible\">True</property><property name=\"c"
+ "an_focus\">True</property><property name=\"receives_default\">Fa"
+ "lse</property><property name=\"use_action_appearance\">False</pr"
"operty><property name=\"use_underline\">True</property><property"
" name=\"draw_indicator\">True</property></object><packing><prope"
- "rty name=\"position\">1</property></packing></child><child><obje"
- "ct class=\"GtkCheckButton\" id=\"show-wireframes\"><property nam"
- "e=\"label\" translatable=\"yes\">D_raw window frame when hoverin"
- "g a button</property><property name=\"visible\">True</property><"
- "property name=\"can_focus\">True</property><property name=\"rece"
- "ives_default\">False</property><property name=\"use_underline\">"
- "True</property><property name=\"draw_indicator\">True</property>"
- "</object><packing><property name=\"position\">2</property></pack"
- "ing></child></object></child></object></child><child type=\"labe"
- "l\"><object class=\"GtkLabel\" id=\"label3\"><property name=\"vi"
- "sible\">True</property><property name=\"label\" translatable=\"y"
- "es\">Behaviour</property><attributes><attribute name=\"weight\" "
- "value=\"bold\"/></attributes></object></child></object><packing>"
- "<property name=\"expand\">False</property><property name=\"posit"
- "ion\">1</property></packing></child><child><object class=\"GtkFr"
- "ame\" id=\"frame2\"><property name=\"visible\">True</property><p"
- "roperty name=\"label_xalign\">0</property><property name=\"shado"
- "w_type\">none</property><child><object class=\"GtkAlignment\" id"
- "=\"alignment2\"><property name=\"visible\">True</property><prope"
- "rty name=\"left_padding\">12</property><child><object class=\"Gt"
- "kVBox\" id=\"vbox4\"><property name=\"visible\">True</property><"
- "property name=\"border_width\">6</property><property name=\"orie"
- "ntation\">vertical</property><property name=\"spacing\">6</prope"
- "rty><child><object class=\"GtkCheckButton\" id=\"include-all-wor"
- "kspaces\"><property name=\"label\" translatable=\"yes\">Show win"
- "dows from _all workspaces or viewports</property><property name="
- "\"visible\">True</property><property name=\"can_focus\">True</pr"
- "operty><property name=\"receives_default\">False</property><prop"
- "erty name=\"use_underline\">True</property><property name=\"draw"
- "_indicator\">True</property></object><packing><property name=\"p"
- "osition\">0</property></packing></child><child><object class=\"G"
- "tkCheckButton\" id=\"show-only-minimized\"><property name=\"labe"
- "l\" translatable=\"yes\">Show only _minimized windows</property>"
- "<property name=\"visible\">True</property><property name=\"can_f"
- "ocus\">True</property><property name=\"receives_default\">False<"
- "/property><property name=\"use_underline\">True</property><prope"
- "rty name=\"draw_indicator\">True</property></object><packing><pr"
- "operty name=\"position\">1</property></packing></child><child><o"
- "bject class=\"GtkCheckButton\" id=\"include-all-monitors\"><prop"
- "erty name=\"label\" translatable=\"yes\">Show windows from all m"
- "o_nitors</property><property name=\"visible\">True</property><pr"
- "operty name=\"can_focus\">True</property><property name=\"receiv"
- "es_default\">False</property><property name=\"use_underline\">Tr"
- "ue</property><property name=\"draw_indicator\">True</property></"
- "object><packing><property name=\"position\">1</property></packin"
- "g></child></object></child></object></child><child type=\"label\""
- "><object class=\"GtkLabel\" id=\"label2\"><property name=\"visib"
- "le\">True</property><property name=\"label\" translatable=\"yes\""
- ">Filtering</property><attributes><attribute name=\"weight\" valu"
- "e=\"bold\"/></attributes></object></child></object><packing><pro"
- "perty name=\"position\">2</property></packing></child></object><"
- "packing><property name=\"expand\">False</property><property name"
- "=\"position\">1</property></packing></child><child internal-chil"
- "d=\"action_area\"><object class=\"GtkHButtonBox\" id=\"dialog-ac"
- "tion_area2\"><property name=\"visible\">True</property><property"
- " name=\"layout_style\">end</property><child><object class=\"GtkB"
- "utton\" id=\"close-button\"><property name=\"label\">gtk-close</"
- "property><property name=\"visible\">True</property><property nam"
- "e=\"can_focus\">True</property><property name=\"receives_default"
- "\">True</property><property name=\"use_stock\">True</property></"
- "object><packing><property name=\"expand\">False</property><prope"
- "rty name=\"fill\">False</property><property name=\"position\">0<"
- "/property></packing></child><child><object class=\"GtkButton\" i"
- "d=\"help-button\"><property name=\"label\">gtk-help</property><p"
- "roperty name=\"visible\">True</property><property name=\"can_foc"
- "us\">True</property><property name=\"receives_default\">True</pr"
- "operty><property name=\"use_stock\">True</property></object><pac"
- "king><property name=\"expand\">False</property><property name=\""
- "fill\">False</property><property name=\"position\">1</property><"
- "property name=\"secondary\">True</property></packing></child></o"
+ "rty name=\"expand\">True</property><property name=\"fill\">True<"
+ "/property><property name=\"position\">2</property></packing></ch"
+ "ild><child><object class=\"GtkCheckButton\" id=\"show-instances-"
+ "on-hover\"><property name=\"label\" translatable=\"yes\">Show in"
+ "stances list when hovering a button</property><property name=\"v"
+ "isible\">True</property><property name=\"can_focus\">True</prope"
+ "rty><property name=\"receives_default\">False</property><propert"
+ "y name=\"use_action_appearance\">False</property><property name="
+ "\"xalign\">0.51999998092651367</property><property name=\"yalign"
+ "\">0.51999998092651367</property><property name=\"draw_indicator"
+ "\">True</property></object><packing><property name=\"expand\">Tr"
+ "ue</property><property name=\"fill\">True</property><property na"
+ "me=\"position\">3</property></packing></child></object></child><"
+ "/object></child><child type=\"label\"><object class=\"GtkLabel\""
+ " id=\"label3\"><property name=\"visible\">True</property><proper"
+ "ty name=\"can_focus\">False</property><property name=\"label\" t"
+ "ranslatable=\"yes\">Behaviour</property><attributes><attribute n"
+ "ame=\"weight\" value=\"bold\"/></attributes></object></child></o"
"bject><packing><property name=\"expand\">False</property><proper"
- "ty name=\"pack_type\">end</property><property name=\"position\">"
- "0</property></packing></child></object></child><action-widgets><"
- "action-widget response=\"0\">close-button</action-widget><action"
- "-widget response=\"0\">help-button</action-widget></action-widge"
- "ts></object></interface>"
+ "ty name=\"fill\">True</property><property name=\"position\">1</p"
+ "roperty></packing></child><child><object class=\"GtkFrame\" id=\""
+ "frame2\"><property name=\"visible\">True</property><property nam"
+ "e=\"can_focus\">False</property><property name=\"label_xalign\">"
+ "0</property><property name=\"shadow_type\">none</property><child"
+ "><object class=\"GtkAlignment\" id=\"alignment2\"><property name"
+ "=\"visible\">True</property><property name=\"can_focus\">False</"
+ "property><property name=\"left_padding\">12</property><child><ob"
+ "ject class=\"GtkVBox\" id=\"vbox4\"><property name=\"visible\">T"
+ "rue</property><property name=\"can_focus\">False</property><prop"
+ "erty name=\"border_width\">6</property><property name=\"spacing\""
+ ">6</property><child><object class=\"GtkCheckButton\" id=\"includ"
+ "e-all-workspaces\"><property name=\"label\" translatable=\"yes\""
+ ">Show windows from _all workspaces or viewports</property><prope"
+ "rty name=\"visible\">True</property><property name=\"can_focus\""
+ ">True</property><property name=\"receives_default\">False</prope"
+ "rty><property name=\"use_action_appearance\">False</property><pr"
+ "operty name=\"use_underline\">True</property><property name=\"dr"
+ "aw_indicator\">True</property></object><packing><property name=\""
+ "expand\">True</property><property name=\"fill\">True</property><"
+ "property name=\"position\">0</property></packing></child><child>"
+ "<object class=\"GtkCheckButton\" id=\"show-only-minimized\"><pro"
+ "perty name=\"label\" translatable=\"yes\">Show only _minimized w"
+ "indows</property><property name=\"visible\">True</property><prop"
+ "erty name=\"can_focus\">True</property><property name=\"receives"
+ "_default\">False</property><property name=\"use_action_appearanc"
+ "e\">False</property><property name=\"use_underline\">True</prope"
+ "rty><property name=\"draw_indicator\">True</property></object><p"
+ "acking><property name=\"expand\">True</property><property name=\""
+ "fill\">True</property><property name=\"position\">1</property></"
+ "packing></child><child><object class=\"GtkCheckButton\" id=\"inc"
+ "lude-all-monitors\"><property name=\"label\" translatable=\"yes\""
+ ">Show windows from all mo_nitors</property><property name=\"visi"
+ "ble\">True</property><property name=\"can_focus\">True</property"
+ "><property name=\"receives_default\">False</property><property n"
+ "ame=\"use_action_appearance\">False</property><property name=\"u"
+ "se_underline\">True</property><property name=\"draw_indicator\">"
+ "True</property></object><packing><property name=\"expand\">True<"
+ "/property><property name=\"fill\">True</property><property name="
+ "\"position\">1</property></packing></child></object></child></ob"
+ "ject></child><child type=\"label\"><object class=\"GtkLabel\" id"
+ "=\"label2\"><property name=\"visible\">True</property><property "
+ "name=\"can_focus\">False</property><property name=\"label\" tran"
+ "slatable=\"yes\">Filtering</property><attributes><attribute name"
+ "=\"weight\" value=\"bold\"/></attributes></object></child></obje"
+ "ct><packing><property name=\"expand\">True</property><property n"
+ "ame=\"fill\">True</property><property name=\"position\">2</prope"
+ "rty></packing></child></object><packing><property name=\"expand\""
+ ">False</property><property name=\"fill\">True</property><propert"
+ "y name=\"position\">1</property></packing></child></object></chi"
+ "ld><action-widgets><action-widget response=\"0\">close-button</a"
+ "ction-widget><action-widget response=\"0\">help-button</action-w"
+ "idget></action-widgets></object><object class=\"GtkListStore\" i"
+ "d=\"liststore1\"/></interface>"
};
-static const unsigned taskbar_dialog_ui_length = 8666u;
+static const unsigned taskbar_dialog_ui_length = 11302u;
diff --git a/taskbar-widget.c b/taskbar-widget.c
index c4d8876..0c38b1b 100644
--- a/taskbar-widget.c
+++ b/taskbar-widget.c
@@ -69,6 +69,7 @@ enum
PROP_SHOW_ONLY_MINIMIZED,
PROP_SHOW_WIREFRAMES,
PROP_SHOW_HANDLE,
+ PROP_SHOW_INSTANCES_HOVER,
};
@@ -141,6 +142,7 @@ struct _XfceTaskBar
/* dummy properties */
guint show_handle : 1;
+ guint show_instances_hover;
guint unique_id_counter ;
@@ -312,6 +314,7 @@ static void xfce_taskbar_class_init (XfceTaskBarClass *klass)
g_object_class_install_property (gobject_class, PROP_SHOW_ONLY_MINIMIZED, g_param_spec_boolean ("show-only-minimized", NULL, NULL, FALSE, EXO_PARAM_READWRITE));
g_object_class_install_property (gobject_class, PROP_SHOW_WIREFRAMES, g_param_spec_boolean ("show-wireframes", NULL, NULL, FALSE, EXO_PARAM_READWRITE));
g_object_class_install_property (gobject_class, PROP_SHOW_HANDLE, g_param_spec_boolean ("show-handle", NULL, NULL, TRUE, EXO_PARAM_READWRITE));
+ g_object_class_install_property (gobject_class, PROP_SHOW_INSTANCES_HOVER, g_param_spec_boolean ("show-instances-on-hover", NULL, NULL, TRUE, EXO_PARAM_READWRITE));
gtk_widget_class_install_style_property (gtkwidget_class, g_param_spec_int ("max-button-length", NULL, "The maximum length of a window button", -1, G_MAXINT, DEFAULT_MAX_BUTTON_LENGTH, EXO_PARAM_READABLE));
gtk_widget_class_install_style_property (gtkwidget_class, g_param_spec_int ("min-button-length", NULL, "The minumum length of a window button", 1, G_MAXINT, DEFAULT_MIN_BUTTON_LENGTH, EXO_PARAM_READABLE));
@@ -396,6 +399,10 @@ static void xfce_taskbar_get_property (GObject *object, guint prop_id, GValue *v
g_value_set_boolean (value, taskbar->show_handle);
break;
+ case PROP_SHOW_INSTANCES_HOVER:
+ g_value_set_boolean (value, taskbar->show_instances_hover);
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -432,6 +439,10 @@ static void xfce_taskbar_set_property (GObject *object, guint prop_id, const GVa
taskbar->show_handle = g_value_get_boolean (value);
break;
+ case PROP_SHOW_INSTANCES_HOVER:
+ taskbar->show_instances_hover = g_value_get_boolean (value);
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -2461,7 +2472,8 @@ static gboolean xfce_taskbar_group_button_hover_timeout(gpointer group_ptr)
group->hover_visible_timestamp += GROUP_ICON_HOVER_TIMEOUT ;
//Attach the menu widget to the button widget
- xfce_taskbar_activate_hover_menu(menu_widget, group, LEFTMOUSE);
+ if(group->taskbar->show_instances_hover)
+ xfce_taskbar_activate_hover_menu(menu_widget, group, LEFTMOUSE);
return FALSE ;
}
diff --git a/taskbar.c b/taskbar.c
index c4debdb..51adab2 100644
--- a/taskbar.c
+++ b/taskbar.c
@@ -101,6 +101,7 @@ static void taskbar_plugin_construct (XfcePanelPlugin *panel_plugin)
{ "show-only-minimized", G_TYPE_BOOLEAN },
{ "show-wireframes", G_TYPE_BOOLEAN },
{ "show-handle", G_TYPE_BOOLEAN },
+ { "show-instances-on-hover", G_TYPE_BOOLEAN },
{ NULL }
};
@@ -177,6 +178,7 @@ static void taskbar_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
TASKBAR_DIALOG_BIND ("show-only-minimized", "active")
TASKBAR_DIALOG_BIND ("show-wireframes", "active")
TASKBAR_DIALOG_BIND ("show-handle", "active")
+ TASKBAR_DIALOG_BIND ("show-instances-on-hover", "active")
#ifndef GDK_WINDOWING_X11
/* not functional in x11, so avoid confusion */
More information about the Xfce4-commits
mailing list