[Xfce4-commits] [xfce/xfce4-panel] 01/01: launcher: Add 'New Link' button to properties (Bug #14855)
noreply at xfce.org
noreply at xfce.org
Sat Nov 17 22:55:52 CET 2018
This is an automated email from the git hooks/post-receive script.
o c h o s i p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository xfce/xfce4-panel.
commit 97ee249b27be03cecc22ca049bf8e4ed86c40e63
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date: Sat Nov 17 22:54:10 2018 +0100
launcher: Add 'New Link' button to properties (Bug #14855)
This action was previously hidden in the context menu of the treeview.
I also re-ordered the items in the properties dialog to match the order
of the items in the context menu, re-added the dialog button icons that
were lost with the GtkStock transition and made the move-up/down buttons
linked.
---
plugins/launcher/launcher-dialog.c | 12 +
plugins/launcher/launcher-dialog.glade | 506 ++++++++++++++++++---------------
2 files changed, 293 insertions(+), 225 deletions(-)
diff --git a/plugins/launcher/launcher-dialog.c b/plugins/launcher/launcher-dialog.c
index 1e63037..4a956e5 100644
--- a/plugins/launcher/launcher-dialog.c
+++ b/plugins/launcher/launcher-dialog.c
@@ -803,6 +803,15 @@ launcher_dialog_item_desktop_item_edit (GtkWidget *widget,
static void
+launcher_dialog_item_link_button_clicked (GtkWidget *button,
+ LauncherPluginDialog *dialog)
+{
+ launcher_dialog_item_desktop_item_edit (button, "Link", NULL, dialog);
+}
+
+
+
+static void
launcher_dialog_item_button_clicked (GtkWidget *button,
LauncherPluginDialog *dialog)
{
@@ -1200,6 +1209,9 @@ launcher_dialog_show (LauncherPlugin *plugin)
g_signal_connect (G_OBJECT (object), "clicked",
G_CALLBACK (launcher_dialog_item_button_clicked), dialog);
}
+ object = gtk_builder_get_object (builder, "item-link");
+ g_signal_connect (G_OBJECT (object), "clicked",
+ G_CALLBACK (launcher_dialog_item_link_button_clicked), dialog);
/* connect menu items */
for (i = 0; i < G_N_ELEMENTS (mi_names); i++)
diff --git a/plugins/launcher/launcher-dialog.glade b/plugins/launcher/launcher-dialog.glade
index ee1c4f9..74197fe 100644
--- a/plugins/launcher/launcher-dialog.glade
+++ b/plugins/launcher/launcher-dialog.glade
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
<interface>
<requires lib="gtk+" version="3.20"/>
<requires lib="libxfce4ui-2" version="4.12"/>
@@ -20,6 +20,184 @@
<object class="GtkTreeModelFilter" id="add-store-filter">
<property name="child_model">add-store</property>
</object>
+ <object class="GtkListStore" id="arrow-position-model">
+ <columns>
+ <!-- column-name title -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Default</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">North</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">West</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">East</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">South</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Inside Button</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkImage" id="image11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">accessories-text-editor</property>
+ <property name="icon_size">1</property>
+ </object>
+ <object class="GtkImage" id="image12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">edit-delete</property>
+ <property name="icon_size">1</property>
+ </object>
+ <object class="GtkImage" id="image13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">document-new</property>
+ <property name="icon_size">1</property>
+ </object>
+ <object class="GtkImage" id="image14">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">applications-internet</property>
+ <property name="icon_size">1</property>
+ </object>
+ <object class="GtkImage" id="image15">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">list-add</property>
+ <property name="icon_size">1</property>
+ </object>
+ <object class="GtkImage" id="image16">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">go-up</property>
+ <property name="icon_size">1</property>
+ </object>
+ <object class="GtkImage" id="image17">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">go-up</property>
+ </object>
+ <object class="GtkImage" id="image18">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">go-down</property>
+ <property name="icon_size">1</property>
+ </object>
+ <object class="GtkMenu" id="popup-menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkImageMenuItem" id="mi-move-up">
+ <property name="label">Up</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="image">image16</property>
+ <property name="use_stock">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="mi-move-down">
+ <property name="label">Down</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="image">image18</property>
+ <property name="use_stock">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="smi1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="mi-edit">
+ <property name="label" translatable="yes">_Edit Item</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image11</property>
+ <property name="use_stock">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="mi-delete">
+ <property name="label" translatable="yes">D_elete Item</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image12</property>
+ <property name="use_stock">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="smi2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="mi-add">
+ <property name="label" translatable="yes">Add Appli_cation</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image15</property>
+ <property name="use_stock">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparatorMenuItem" id="smi3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="mi-application">
+ <property name="label" translatable="yes">New _Application</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image13</property>
+ <property name="use_stock">False</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImageMenuItem" id="mi-link">
+ <property name="label" translatable="yes">New _Link</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="use_underline">True</property>
+ <property name="image">image14</property>
+ <property name="use_stock">False</property>
+ </object>
+ </child>
+ </object>
+ <object class="GtkImage" id="image19">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">list-add</property>
+ </object>
+ <object class="GtkImage" id="image6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">help-browser</property>
+ </object>
+ <object class="GtkImage" id="image7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">window-close</property>
+ </object>
<object class="XfceTitledDialog" id="dialog-add">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Add New Item</property>
@@ -48,6 +226,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="image">image19</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -62,6 +241,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="image">image7</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -180,161 +360,10 @@
<action-widget response="0">button5</action-widget>
</action-widgets>
</object>
- <object class="GtkListStore" id="arrow-position-model">
- <columns>
- <!-- column-name title -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Default</col>
- </row>
- <row>
- <col id="0" translatable="yes">North</col>
- </row>
- <row>
- <col id="0" translatable="yes">West</col>
- </row>
- <row>
- <col id="0" translatable="yes">East</col>
- </row>
- <row>
- <col id="0" translatable="yes">South</col>
- </row>
- <row>
- <col id="0" translatable="yes">Inside Button</col>
- </row>
- </data>
- </object>
- <object class="GtkImage" id="image11">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">accessories-text-editor</property>
- <property name="icon_size">1</property>
- </object>
- <object class="GtkImage" id="image12">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_size">1</property>
- <property name="icon_name">edit-delete</property>
- </object>
- <object class="GtkImage" id="image13">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_size">1</property>
- <property name="icon_name">document-new</property>
- </object>
- <object class="GtkImage" id="image14">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">applications-internet</property>
- <property name="icon_size">1</property>
- </object>
- <object class="GtkImage" id="image15">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_size">1</property>
- <property name="icon_name">list-add</property>
- </object>
- <object class="GtkImage" id="image16">
+ <object class="GtkImage" id="image8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon_size">1</property>
- <property name="icon_name">go-up</property>
- </object>
- <object class="GtkImage" id="image18">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_size">1</property>
- <property name="icon_name">go-down</property>
- </object>
- <object class="GtkMenu" id="popup-menu">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkImageMenuItem" id="mi-move-up">
- <property name="label">Up</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="image">image16</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="mi-move-down">
- <property name="label">Down</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="image">image18</property>
- </object>
- </child>
- <child>
- <object class="GtkSeparatorMenuItem" id="smi1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="mi-edit">
- <property name="label" translatable="yes">_Edit Item</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
- <property name="image">image11</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="mi-delete">
- <property name="label" translatable="yes">D_elete Item</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
- <property name="image">image12</property>
- </object>
- </child>
- <child>
- <object class="GtkSeparatorMenuItem" id="smi2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="mi-add">
- <property name="label" translatable="yes">Add Appli_cation</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
- <property name="image">image15</property>
- </object>
- </child>
- <child>
- <object class="GtkSeparatorMenuItem" id="smi3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="mi-application">
- <property name="label" translatable="yes">New _Application</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
- <property name="image">image13</property>
- </object>
- </child>
- <child>
- <object class="GtkImageMenuItem" id="mi-link">
- <property name="label" translatable="yes">New _Link</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
- <property name="image">image14</property>
- </object>
- </child>
- </object>
- <object class="GtkImage" id="image17">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">go-up</property>
+ <property name="icon_name">window-close</property>
</object>
<object class="GtkListStore" id="item-store">
<columns>
@@ -373,6 +402,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="image">image6</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -388,6 +418,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="image">image8</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -460,19 +491,16 @@
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkBox" id="vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="yalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="vbox3">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <property name="homogeneous">True</property>
<child>
<object class="GtkButton" id="item-move-up">
<property name="visible">True</property>
@@ -513,87 +541,115 @@
<property name="position">1</property>
</packing>
</child>
+ <style>
+ <class name="linked"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="item-edit">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes">Edit the currently selected item</property>
<child>
- <object class="GtkButton" id="item-add">
+ <object class="GtkImage" id="image1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Add one or more existing items to the launcher</property>
- <child>
- <object class="GtkImage" id="image4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">list-add</property>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="icon_name">accessories-text-editor</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">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="item-delete">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes">Delete the currently selected item</property>
<child>
- <object class="GtkButton" id="item-new">
+ <object class="GtkImage" id="image9">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Add a new empty item</property>
- <child>
- <object class="GtkImage" id="image10">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">document-new</property>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="icon_name">edit-delete</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="item-add">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes">Add one or more existing items to the launcher</property>
+ <child>
+ <object class="GtkImage" id="image4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">list-add</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="item-new">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes">Add a new empty item</property>
<child>
- <object class="GtkButton" id="item-delete">
+ <object class="GtkImage" id="image10">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Delete the currently selected item</property>
- <child>
- <object class="GtkImage" id="image9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">edit-delete</property>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="icon_name">document-new</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="item-link">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes">Add a new hyperlink</property>
<child>
- <object class="GtkButton" id="item-edit">
+ <object class="GtkImage" id="image5">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Edit the currently selected item</property>
- <child>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">accessories-text-editor</property>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="icon_name">applications-internet</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">5</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
</child>
</object>
<packing>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list