Updating branch refs/heads/master
to 9a37941ca3c6cd55c31fd5171f6324891187c5c1 (commit)
from e50b87ae5721c8110ba86cc77d0acda18c7d88d6 (commit)
commit 9a37941ca3c6cd55c31fd5171f6324891187c5c1
Author: Sean Davis <smd.seanda...@gmail.com>
Date: Sun Feb 17 09:24:08 2013 -0500
GTK+3 Plugins dialog.
data/interfaces/Makefile.am | 8 +-
data/interfaces/{plugins.ui => plugins-3.ui} | 222 ++++++++++++--------------
data/interfaces/plugins.ui | 2 -
3 files changed, 105 insertions(+), 127 deletions(-)
diff --git a/data/interfaces/Makefile.am b/data/interfaces/Makefile.am
index 6a356fc..cad214a 100644
--- a/data/interfaces/Makefile.am
+++ b/data/interfaces/Makefile.am
@@ -18,8 +18,8 @@ interfaces = \
playlist.ui \
mediachooser-3.ui \
save-playlist.ui \
- plugins.ui \
- open-location.ui
+ plugins-3.ui \
+ open-location-3.ui
if MAINTAINER_MODE
BUILT_SOURCES = $(interfaces_h)
@@ -39,10 +39,10 @@ mediachooser_ui.h: mediachooser-3.ui
save-playlist_ui.h: save-playlist.ui
xdt-csource --static --strip-comments --strip-content
--name=save_playlist_ui $< > $@
-open-location_ui.h: open-location.ui
+open-location_ui.h: open-location-3.ui
xdt-csource --static --strip-comments --strip-content
--name=open_location_ui $< > $@
-plugins_ui.h: plugins.ui
+plugins_ui.h: plugins-3.ui
xdt-csource --static --strip-comments --strip-content --name=plugins_ui
$< > $@
endif
diff --git a/data/interfaces/plugins.ui b/data/interfaces/plugins-3.ui
similarity index 50%
copy from data/interfaces/plugins.ui
copy to data/interfaces/plugins-3.ui
index e900d09..efb68f7 100644
--- a/data/interfaces/plugins.ui
+++ b/data/interfaces/plugins-3.ui
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.24"/>
+ <!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires libxfce4ui 4.5 -->
- <!-- interface-naming-policy project-wide -->
<object class="XfceTitledDialog" id="dialog">
<property name="can_focus">False</property>
+ <property name="border_width">5</property>
<property name="title" translatable="yes">Parole Plugins</property>
<property name="default_width">600</property>
<property name="default_height">300</property>
@@ -16,12 +16,12 @@
<property name="subtitle" translatable="yes">Extend your media
player</property>
<signal name="response" handler="parole_plugins_manager_pref_response_cb"
swapped="no"/>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox2">
- <property name="visible">True</property>
+ <object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
<child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area2">
- <property name="visible">True</property>
+ <object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
@@ -33,12 +33,11 @@
<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="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -51,55 +50,48 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
- <object class="GtkViewport" id="viewport1">
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="resize_mode">queue</property>
- <property name="shadow_type">none</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <object class="GtkTreeView" id="treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">automatic</property>
+ <property name="model">liststore</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <signal name="cursor-changed"
handler="parole_plugins_manager_tree_cursor_changed_cb" swapped="no"/>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection1"/>
+ </child>
<child>
- <object class="GtkTreeView" id="treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="model">liststore</property>
- <property name="headers_clickable">False</property>
- <property name="search_column">0</property>
- <signal name="cursor-changed"
handler="parole_plugins_manager_tree_cursor_changed_cb" swapped="no"/>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+ <property name="title"
translatable="yes">Enabled</property>
<child>
- <object class="GtkTreeViewColumn"
id="treeviewcolumn1">
- <property name="resizable">True</property>
- <property name="title"
translatable="yes">Enabled</property>
- <property name="clickable">True</property>
- <child>
- <object class="GtkCellRendererToggle"
id="cellrenderertoggle">
- <signal name="toggled"
handler="parole_plugins_manager_cell_toggled_cb" swapped="no"/>
- </object>
- <attributes>
- <attribute name="active">0</attribute>
- </attributes>
- </child>
+ <object class="GtkCellRendererToggle"
id="cellrenderertoggle">
+ <signal name="toggled"
handler="parole_plugins_manager_cell_toggled_cb" swapped="no"/>
</object>
+ <attributes>
+ <attribute name="active">0</attribute>
+ </attributes>
</child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn2">
+ <property name="title"
translatable="yes">Plugin</property>
<child>
- <object class="GtkTreeViewColumn"
id="treeviewcolumn2">
- <property name="title"
translatable="yes">Plugin</property>
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext1"/>
- <attributes>
- <attribute name="text">1</attribute>
- </attributes>
- </child>
- </object>
+ <object class="GtkCellRendererText"
id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">1</attribute>
+ </attributes>
</child>
</object>
</child>
@@ -113,115 +105,103 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">10</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="left_padding">12</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="GtkLabel" id="description">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="wrap">True</property>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel" id="description">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes"><b>Description</b></property>
- <property name="use_markup">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="wrap">True</property>
</object>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</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"><b>Description</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</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="GtkFrame" id="frame2">
+ <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="left_padding">12</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="GtkLabel" id="author">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="wrap">True</property>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="author">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes"><b>Author</b></property>
- <property name="use_markup">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="wrap">True</property>
</object>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
- <child>
- <object class="GtkLinkButton" id="sitebutton">
- <property name="label" translatable="yes">Visit
Website</property>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="has_tooltip">True</property>
- <property name="use_action_appearance">False</property>
- <property name="relief">none</property>
- <property name="uri">http://goodies.xfce.org</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes"><b>Author</b></property>
+ <property name="use_markup">True</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkLinkButton" id="sitebutton">
+ <property name="label" translatable="yes">Visit
Website</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="relief">none</property>
+ <property name="uri">http://goodies.xfce.org</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox" id="buttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -231,7 +211,6 @@
<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>
<signal name="clicked"
handler="parole_plugins_manager_show_configure" swapped="no"/>
</object>
@@ -245,7 +224,8 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="pack_type">end</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
diff --git a/data/interfaces/plugins.ui b/data/interfaces/plugins.ui
index e900d09..5b5d696 100644
--- a/data/interfaces/plugins.ui
+++ b/data/interfaces/plugins.ui
@@ -77,9 +77,7 @@
<signal name="cursor-changed"
handler="parole_plugins_manager_tree_cursor_changed_cb" swapped="no"/>
<child>
<object class="GtkTreeViewColumn"
id="treeviewcolumn1">
- <property name="resizable">True</property>
<property name="title"
translatable="yes">Enabled</property>
- <property name="clickable">True</property>
<child>
<object class="GtkCellRendererToggle"
id="cellrenderertoggle">
<signal name="toggled"
handler="parole_plugins_manager_cell_toggled_cb" swapped="no"/>
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
