[Xfce4-commits] <xfce4-taskbar-plugin:master> Reworked the glade compilation pipeline.
Gearoid Murphy
noreply at xfce.org
Sat Oct 13 15:16:01 CEST 2012
Updating branch refs/heads/master
to f0249629886d40abf9f0b713870e3a86cbf4ae92 (commit)
from 0e3991035fa31030cbb546c2d6b587055fda5ae9 (commit)
commit f0249629886d40abf9f0b713870e3a86cbf4ae92
Author: Gearoid Murphy <gearoid at murphy.com>
Date: Sat Oct 13 14:14:46 2012 +0100
Reworked the glade compilation pipeline.
convertGladeToC.py | 51 +++++++
taskbar-dialog.glade | 137 +------------------
taskbar-dialog.xml | 371 --------------------------------------------------
taskbar-dialog_ui.h | 263 +++++++++++++++++++-----------------
taskbar-widget.c | 1 -
taskbar.c | 3 +-
6 files changed, 193 insertions(+), 633 deletions(-)
diff --git a/convertGladeToC.py b/convertGladeToC.py
new file mode 100755
index 0000000..66dfacb
--- /dev/null
+++ b/convertGladeToC.py
@@ -0,0 +1,51 @@
+#!/usr/bin/python
+
+import xml.dom.minidom
+
+header = """#ifdef __SUNPRO_C
+#pragma align 4 (taskbar_dialog_ui)
+#endif
+#ifdef __GNUC__
+static const char taskbar_dialog_ui[] __attribute__ ((__aligned__ (4))) =
+#else
+static const char taskbar_dialog_ui[] =
+#endif
+{
+"""
+
+footer = """};
+static const unsigned taskbar_dialog_ui_length = %iu;
+"""
+
+class XmlWriter:
+ def __init__(self):
+ self.snippets = []
+ def write(self, data):
+ if data.isspace(): return
+ self.snippets.append(data)
+ def __str__(self):
+ return ''.join(self.snippets)
+
+if __name__ == "__main__":
+ writer = XmlWriter()
+ xml = xml.dom.minidom.parse("taskbar-dialog.glade")
+ xml.writexml(writer)
+ strippedXml = ("%s" % (writer)).replace('"', '\\"')
+
+ byteCount = len(strippedXml)
+ baseOffset=0
+ stripSize=64
+
+ output = open("taskbar-dialog_ui.h", 'w')
+ output.write(header)
+
+ while baseOffset < byteCount:
+ skipTrailingQuote = 0
+ if baseOffset+stripSize < byteCount and strippedXml[baseOffset+stripSize] == '"':
+ skipTrailingQuote = 1
+ output.write(' "%s"\n' % (strippedXml[baseOffset:baseOffset+stripSize+skipTrailingQuote]))
+ baseOffset += stripSize + skipTrailingQuote
+
+ output.write(footer % (byteCount))
+ output.close()
+
diff --git a/taskbar-dialog.glade b/taskbar-dialog.glade
index 835449e..83728a9 100644
--- a/taskbar-dialog.glade
+++ b/taskbar-dialog.glade
@@ -4,7 +4,7 @@
<!-- interface-requires libxfce4ui 0.0 -->
<!-- interface-naming-policy toplevel-contextual -->
<object class="XfceTitledDialog" id="dialog">
- <property name="title" translatable="yes">Window Buttons</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">
@@ -34,19 +34,6 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkCheckButton" id="show-labels">
- <property name="label" translatable="yes">Show button _labels</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<object class="GtkCheckButton" id="flat-buttons">
<property name="label" translatable="yes">Show _flat buttons</property>
<property name="visible">True</property>
@@ -72,58 +59,10 @@
<property name="position">2</property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="rotate-vertically">
- <property name="label" translatable="yes">Ro_tate buttons in vertical panel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Sorting _order:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">sort-order</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="sort-order">
- <property name="visible">True</property>
- <property name="model">sort-order-model</property>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">4</property>
- </packing>
- </child>
+
</object>
</child>
+
</object>
</child>
<child type="label">
@@ -160,35 +99,7 @@
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Window _grouping:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">grouping</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="grouping">
- <property name="visible">True</property>
- <property name="model">grouping-model</property>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext2"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+
</object>
<packing>
<property name="position">0</property>
@@ -364,44 +275,4 @@
<action-widget response="0">help-button</action-widget>
</action-widgets>
</object>
- <object class="GtkListStore" id="grouping-model">
- <columns>
- <!-- column-name title -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Never</col>
- </row>
- <row>
- <col id="0" translatable="yes">Always</col>
- </row>
- <row>
- <col id="0" translatable="yes">When space is limited</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="sort-order-model">
- <columns>
- <!-- column-name title -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Timestamp</col>
- </row>
- <row>
- <col id="0" translatable="yes">Group title and timestamp</col>
- </row>
- <row>
- <col id="0" translatable="yes">Window title</col>
- </row>
- <row>
- <col id="0" translatable="yes">Group title and window title</col>
- </row>
- <row>
- <col id="0" translatable="yes">None, allow drag-and-drop</col>
- </row>
- </data>
- </object>
</interface>
diff --git a/taskbar-dialog.xml b/taskbar-dialog.xml
deleted file mode 100644
index f3c9bf7..0000000
--- a/taskbar-dialog.xml
+++ /dev/null
@@ -1,371 +0,0 @@
-<?xml version="1.0"?>
-<interface>
- <!-- interface-requires libxfce4ui 0.0 -->
- <!-- interface-naming-policy toplevel-contextual -->
- <object class="XfceTitledDialog" id="dialog">
- <property name="title" translatable="yes">Window Buttons</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="spacing">2</property>
- <child>
- <object class="GtkVBox" id="vbox1">
- <property name="visible">True</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="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment3">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkVBox" id="vbox3">
- <property name="visible">True</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="flat-buttons">
- <property name="label" translatable="yes">Show _flat buttons</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="show-handle">
- <property name="label" translatable="yes">Show _handle</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="rotate-vertically">
- <property name="label" translatable="yes">Ro_tate buttons in vertical panel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Sorting _order:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">sort-order</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="sort-order">
- <property name="visible">True</property>
- <property name="model">sort-order-model</property>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">4</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Appearance</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </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 name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkVBox" id="vbox2">
- <property name="visible">True</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="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Window _grouping:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">grouping</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="grouping">
- <property name="visible">True</property>
- <property name="model">grouping-model</property>
- <child>
- <object class="GtkCellRendererText" id="cellrenderertext2"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="switch-workspace-on-unminimize">
- <property name="label" translatable="yes">Restore minimized windows to current _workspace</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="show-wireframes">
- <property name="label" translatable="yes">D_raw window frame 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_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Behaviour</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame2">
- <property name="visible">True</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="left_padding">12</property>
- <child>
- <object class="GtkVBox" id="vbox4">
- <property name="visible">True</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">
- <property name="label" translatable="yes">Show windows from _all workspaces or viewports</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="show-only-minimized">
- <property name="label" translatable="yes">Show only _minimized windows</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="include-all-monitors">
- <property name="label" translatable="yes">Show windows from all mo_nitors</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Filtering</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</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>
- <action-widget response="0">close-button</action-widget>
- <action-widget response="0">help-button</action-widget>
- </action-widgets>
- </object>
- <object class="GtkListStore" id="grouping-model">
- <columns>
- <!-- column-name title -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Never</col>
- </row>
- <row>
- <col id="0" translatable="yes">Always</col>
- </row>
- <row>
- <col id="0" translatable="yes">When space is limited</col>
- </row>
- </data>
- </object>
-</interface>
-
diff --git a/taskbar-dialog_ui.h b/taskbar-dialog_ui.h
index 86a1fd8..7c6d5c0 100644
--- a/taskbar-dialog_ui.h
+++ b/taskbar-dialog_ui.h
@@ -1,4 +1,3 @@
-/* automatically generated from taskbar-dialog.glade */
#ifdef __SUNPRO_C
#pragma align 4 (taskbar_dialog_ui)
#endif
@@ -8,129 +7,141 @@ static const char taskbar_dialog_ui[] __attribute__ ((__aligned__ (4))) =
static const char taskbar_dialog_ui[] =
#endif
{
- "<?xml version=\"1.0\"?><interface><requires lib=\"gtk+\" version=\"2.14"
- "\"/><object class=\"XfceTitledDialog\" id=\"dialog\"><property name=\"t"
- "itle\" translatable=\"yes\">Window Buttons</property><property name=\"i"
- "con_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 na"
- "me=\"orientation\">vertical</property><property name=\"spacing\">2</pro"
- "perty><child><object class=\"GtkVBox\" id=\"vbox1\"><property name=\"vi"
- "sible\">True</property><property name=\"border_width\">6</property><pro"
- "perty name=\"orientation\">vertical</property><property name=\"spacing\""
- ">6</property><child><object class=\"GtkFrame\" id=\"frame3\"><property "
- "name=\"visible\">True</property><property name=\"label_xalign\">0</prop"
- "erty><property name=\"shadow_type\">none</property><child><object class"
- "=\"GtkAlignment\" id=\"alignment3\"><property name=\"visible\">True</pr"
- "operty><property name=\"left_padding\">12</property><child><object clas"
- "s=\"GtkVBox\" id=\"vbox3\"><property name=\"visible\">True</property><p"
- "roperty name=\"border_width\">6</property><property name=\"orientation\""
- ">vertical</property><property name=\"spacing\">6</property><child><object class=\"GtkCheckButton\" id="
- "\"show-handle\"><property name=\"label\" translatable=\"yes\">Show _han"
- "dle</property><property name=\"visible\">True</property><property name="
- "\"can_focus\">True</property><property name=\"receives_default\">False<"
- "/property><property name=\"use_underline\">True</property><property nam"
- "e=\"draw_indicator\">True</property></object><packing><property name=\""
- "position\">2</property></packing></child></object></child></object></child><child type=\"label\"><o"
- "bject class=\"GtkLabel\" id=\"label1\"><property name=\"visible\">True<"
- "/property><property name=\"label\" translatable=\"yes\">Appearance</pro"
- "perty><attributes><attribute name=\"weight\" value=\"bold\"/></attribut"
- "es></object></child></object><packing><property name=\"expand\">False</"
- "property><property name=\"position\">0</property></packing></child><chi"
- "ld><object class=\"GtkFrame\" id=\"frame1\"><property name=\"visible\">"
- "True</property><property name=\"label_xalign\">0</property><property na"
- "me=\"shadow_type\">none</property><child><object class=\"GtkAlignment\""
- " id=\"alignment1\"><property name=\"visible\">True</property><property "
- "name=\"left_padding\">12</property><child><object class=\"GtkVBox\" id="
- "\"vbox2\"><property name=\"visible\">True</property><property name=\"bo"
- "rder_width\">6</property><property name=\"orientation\">vertical</prope"
- "rty><property name=\"spacing\">6</property><child><object class=\"GtkHB"
- "ox\" id=\"hbox1\"><property name=\"visible\">True</property><property n"
- "ame=\"spacing\">12</property>"
- "</object><packing><property name=\"position\">0</property></packing>"
- "</child><child><object class=\"GtkCheckButton\" id=\"switch-workspace-o"
- "n-unminimize\"><property name=\"label\" translatable=\"yes\">Restore mi"
- "nimized windows to current _workspace</property><property name=\"visibl"
- "e\">True</property><property name=\"can_focus\">True</property><propert"
- "y name=\"receives_default\">False</property><property name=\"use_underl"
- "ine\">True</property><property name=\"draw_indicator\">True</property><"
- "/object><packing><property name=\"position\">1</property></packing></ch"
- "ild><child><object class=\"GtkCheckButton\" id=\"show-wireframes\"><pro"
- "perty name=\"label\" translatable=\"yes\">D_raw window frame when hover"
- "ing a button</property><property name=\"visible\">True</property><prope"
- "rty name=\"can_focus\">True</property><property name=\"receives_default"
- "\">False</property><property name=\"use_underline\">True</property><pro"
- "perty name=\"draw_indicator\">True</property></object><packing><propert"
- "y name=\"position\">2</property></packing></child></object></child></ob"
- "ject></child><child type=\"label\"><object class=\"GtkLabel\" id=\"labe"
- "l3\"><property name=\"visible\">True</property><property name=\"label\""
- " translatable=\"yes\">Behaviour</property><attributes><attribute name=\""
- "weight\" value=\"bold\"/></attributes></object></child></object><packin"
- "g><property name=\"expand\">False</property><property name=\"position\""
- ">1</property></packing></child><child><object class=\"GtkFrame\" id=\"f"
- "rame2\"><property name=\"visible\">True</property><property name=\"labe"
- "l_xalign\">0</property><property name=\"shadow_type\">none</property><c"
- "hild><object class=\"GtkAlignment\" id=\"alignment2\"><property name=\""
- "visible\">True</property><property name=\"left_padding\">12</property><"
- "child><object class=\"GtkVBox\" id=\"vbox4\"><property name=\"visible\""
- ">True</property><property name=\"border_width\">6</property><property n"
- "ame=\"orientation\">vertical</property><property name=\"spacing\">6</pr"
- "operty><child><object class=\"GtkCheckButton\" id=\"include-all-workspa"
- "ces\"><property name=\"label\" translatable=\"yes\">Show windows from _"
- "all workspaces or viewports</property><property name=\"visible\">True</"
- "property><property name=\"can_focus\">True</property><property name=\"r"
- "eceives_default\">False</property><property name=\"use_underline\">True"
- "</property><property name=\"draw_indicator\">True</property></object><p"
- "acking><property name=\"position\">0</property></packing></child><child"
- "><object class=\"GtkCheckButton\" id=\"show-only-minimized\"><property "
- "name=\"label\" translatable=\"yes\">Show only _minimized windows</prope"
- "rty><property name=\"visible\">True</property><property name=\"can_focu"
- "s\">True</property><property name=\"receives_default\">False</property>"
- "<property name=\"use_underline\">True</property><property name=\"draw_i"
- "ndicator\">True</property></object><packing><property name=\"position\""
- ">1</property></packing></child><child><object class=\"GtkCheckButton\" "
- "id=\"include-all-monitors\"><property name=\"label\" translatable=\"yes"
- "\">Show windows from all mo_nitors</property><property name=\"visible\""
- ">True</property><property name=\"can_focus\">True</property><property n"
- "ame=\"receives_default\">False</property><property name=\"use_underline"
- "\">True</property><property name=\"draw_indicator\">True</property></ob"
- "ject><packing><property name=\"position\">1</property></packing></child"
- "></object></child></object></child><child type=\"label\"><object class="
- "\"GtkLabel\" id=\"label2\"><property name=\"visible\">True</property><p"
- "roperty name=\"label\" translatable=\"yes\">Filtering</property><attrib"
- "utes><attribute name=\"weight\" value=\"bold\"/></attributes></object><"
- "/child></object><packing><property name=\"position\">2</property></pack"
- "ing></child></object><packing><property name=\"expand\">False</property"
- "><property name=\"position\">1</property></packing></child><child inter"
- "nal-child=\"action_area\"><object class=\"GtkHButtonBox\" id=\"dialog-a"
- "ction_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 n"
- "ame=\"visible\">True</property><property name=\"can_focus\">True</prope"
- "rty><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=\"GtkBu"
- "tton\" id=\"help-button\"><property name=\"label\">gtk-help</property><"
- "property name=\"visible\">True</property><property name=\"can_focus\">T"
- "rue</property><property name=\"receives_default\">True</property><prope"
- "rty name=\"use_stock\">True</property></object><packing><property name="
- "\"expand\">False</property><property name=\"fill\">False</property><pro"
- "perty 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 na"
- "me=\"position\">0</property></packing></child></object></child><action-"
- "widgets><action-widget response=\"0\">close-button</action-widget><acti"
- "on-widget response=\"0\">help-button</action-widget></action-widgets></"
- "object><object class=\"GtkListStore\" id=\"s"
- "ort-order-model\"><columns><column type=\"gchararray\"/></columns><data"
- "><row><col id=\"0\" translatable=\"yes\">Timestamp</col></row><row><col"
- " id=\"0\" translatable=\"yes\">Group title and timestamp</col></row><ro"
- "w><col id=\"0\" translatable=\"yes\">Window title</col></row><row><col "
- "id=\"0\" translatable=\"yes\">Group title and window title</col></row><"
- "row><col id=\"0\" translatable=\"yes\">None, allow drag-and-drop</col><"
- "/row></data></object></interface>"
+ "<?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"
+ "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"
+ "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>"
};
-
-static const unsigned taskbar_dialog_ui_length = 7795u;
-
+static const unsigned taskbar_dialog_ui_length = 8666u;
diff --git a/taskbar-widget.c b/taskbar-widget.c
index 878c991..05230bb 100644
--- a/taskbar-widget.c
+++ b/taskbar-widget.c
@@ -254,7 +254,6 @@ static void cache_pinned_configuration (XfceTaskBar *taskba
//hover menu functions
static gboolean trigger_hover_menu_timeout(GtkWidget *widget, GdkEvent *event, gpointer menu_ptr);
-static gboolean trigger_hover_menu_timeout(GtkWidget *widget, GdkEvent *event, gpointer menu_ptr);
static gboolean hover_menu_leave(GtkWidget *widget, GdkEvent *event, gpointer menu_ptr);
static gboolean hover_menu_enter(GtkWidget *widget, GdkEvent *event, gpointer menu_ptr);
static gboolean xfce_taskbar_hover_menu_timeout(gpointer menu_ptr);
diff --git a/taskbar.c b/taskbar.c
index 9486701..bdd7ca1 100644
--- a/taskbar.c
+++ b/taskbar.c
@@ -154,8 +154,7 @@ static void taskbar_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
/* setup the dialog */
PANEL_UTILS_LINK_4UI
- builder = panel_utils_builder_new (panel_plugin, taskbar_dialog_ui,
- taskbar_dialog_ui_length, &dialog);
+ builder = panel_utils_builder_new (panel_plugin, taskbar_dialog_ui, -1, &dialog);
if (G_UNLIKELY (builder == NULL))
return;
More information about the Xfce4-commits
mailing list