rpms/bluez-gnome/devel 0001-Fixes-for-adapter-specific-buttons.patch, NONE, 1.1 0002-Move-the-adapter-button-list-to-the-side.patch, NONE, 1.1 0003-Fix-trust-button.patch, NONE, 1.1 bluez-gnome.spec, 1.65, 1.66
Bastien Nocera
hadess at fedoraproject.org
Tue Oct 14 19:04:45 UTC 2008
Author: hadess
Update of /cvs/pkgs/rpms/bluez-gnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11927
Modified Files:
bluez-gnome.spec
Added Files:
0001-Fixes-for-adapter-specific-buttons.patch
0002-Move-the-adapter-button-list-to-the-side.patch
0003-Fix-trust-button.patch
Log Message:
* Tue Oct 14 2008 - Bastien Nocera <bnocera at redhat.com> - 1.8-3
- Add patches to clean up the button list (#465398)
0001-Fixes-for-adapter-specific-buttons.patch:
--- NEW FILE 0001-Fixes-for-adapter-specific-buttons.patch ---
>From a394c15d8d1f904bbd4399aa2b7baf8db40d5b4c Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 14 Oct 2008 16:08:23 +0100
Subject: [PATCH] Fixes for adapter specific buttons
- Add labels to the adapter buttons, otherwise people
wonder what each one is for.
- Always show the buttons, just make sure they're
disabled if no devices is selected.
- Remove the difference in look for the extra buttons
---
properties/adapter.c | 43 +++++++++++++------------------------------
1 files changed, 13 insertions(+), 30 deletions(-)
diff --git a/properties/adapter.c b/properties/adapter.c
index 7ace35b..9de10e7 100644
--- a/properties/adapter.c
+++ b/properties/adapter.c
@@ -246,15 +246,8 @@ static void select_callback(GtkTreeSelection *selection, gpointer user_data)
update_buttons(adapter, paired, trusted, connected);
- if (selected == TRUE) {
- gtk_widget_show(adapter->button_disconnect);
- gtk_widget_show(adapter->button_trusted);
- gtk_widget_show(adapter->button_delete);
- } else {
- gtk_widget_hide(adapter->button_disconnect);
- gtk_widget_hide(adapter->button_trusted);
- gtk_widget_hide(adapter->button_delete);
- }
+ gtk_widget_set_sensitive(adapter->button_trusted, selected);
+ gtk_widget_set_sensitive(adapter->button_delete, selected);
}
static void row_callback(GtkTreeModel *model, GtkTreePath *path,
@@ -646,61 +639,51 @@ static void create_adapter(struct adapter_data *adapter)
gtk_box_set_homogeneous(GTK_BOX(buttonbox), FALSE);
gtk_box_pack_start(GTK_BOX(vbox), buttonbox, FALSE, FALSE, 0);
- button = gtk_button_new();
+ button = gtk_button_new_with_label(_("Setup new device..."));
image = gtk_image_new_from_stock(GTK_STOCK_ADD,
GTK_ICON_SIZE_BUTTON);
- gtk_container_add(GTK_CONTAINER(button), image);
- gtk_container_set_border_width(GTK_CONTAINER(button), 0);
+ gtk_button_set_image(GTK_BUTTON(button), image);
gtk_box_pack_start(GTK_BOX(buttonbox), button, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(wizard_callback), adapter);
- button = gtk_button_new();
- gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+ button = gtk_button_new_with_label(_("Disconnect"));
image = gtk_image_new_from_stock(GTK_STOCK_DISCONNECT,
GTK_ICON_SIZE_BUTTON);
- gtk_container_add(GTK_CONTAINER(button), image);
- gtk_container_set_border_width(GTK_CONTAINER(button), 0);
- gtk_widget_set_no_show_all(button, TRUE);
- gtk_widget_show(image);
+ gtk_button_set_image(GTK_BUTTON(button), image);
gtk_box_pack_end(GTK_BOX(buttonbox), button, FALSE, FALSE, 0);
gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(buttonbox),
button, TRUE);
+ gtk_widget_set_sensitive(button, FALSE);
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(disconnect_callback), adapter);
adapter->button_disconnect = button;
- button = gtk_button_new();
- gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+ button = gtk_button_new_with_label(_("Add to Trusted"));
image = gtk_image_new_from_stock(GTK_STOCK_ABOUT,
GTK_ICON_SIZE_BUTTON);
- gtk_container_add(GTK_CONTAINER(button), image);
- gtk_container_set_border_width(GTK_CONTAINER(button), 0);
- gtk_widget_set_no_show_all(button, TRUE);
- gtk_widget_show(image);
+ gtk_button_set_image(GTK_BUTTON(button), image);
gtk_box_pack_end(GTK_BOX(buttonbox), button, FALSE, FALSE, 0);
gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(buttonbox),
button, TRUE);
+ gtk_widget_set_sensitive(button, FALSE);
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(trusted_callback), adapter);
adapter->button_trusted = button;
- button = gtk_button_new();
- gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+ button = gtk_button_new_with_label(_("Delete"));
image = gtk_image_new_from_stock(GTK_STOCK_DELETE,
GTK_ICON_SIZE_BUTTON);
- gtk_container_add(GTK_CONTAINER(button), image);
- gtk_container_set_border_width(GTK_CONTAINER(button), 0);
- gtk_widget_set_no_show_all(button, TRUE);
- gtk_widget_show(image);
+ gtk_button_set_image(GTK_BUTTON(button), image);
gtk_box_pack_end(GTK_BOX(buttonbox), button, FALSE, FALSE, 0);
gtk_button_box_set_child_secondary(GTK_BUTTON_BOX(buttonbox),
button, TRUE);
+ gtk_widget_set_sensitive(button, FALSE);
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(delete_callback), adapter);
--
1.5.5.2
0002-Move-the-adapter-button-list-to-the-side.patch:
--- NEW FILE 0002-Move-the-adapter-button-list-to-the-side.patch ---
>From 161b2023faa95b6d777c3cbaac902365548babf3 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 14 Oct 2008 17:37:51 +0100
Subject: [PATCH] Move the adapter button list to the side
This makes the dialogue wider, rather than tall, which is
useful for computers with small displays.
---
properties/adapter.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/properties/adapter.c b/properties/adapter.c
index 9de10e7..0174716 100644
--- a/properties/adapter.c
+++ b/properties/adapter.c
@@ -437,6 +437,7 @@ static void create_adapter(struct adapter_data *adapter)
GtkWidget *mainbox;
GtkWidget *vbox;
+ GtkWidget *table;
GtkWidget *label;
GtkWidget *image;
GtkWidget *button;
@@ -602,18 +603,20 @@ static void create_adapter(struct adapter_data *adapter)
g_signal_connect(G_OBJECT(entry), "focus-out-event",
G_CALLBACK(focus_callback), adapter);
- vbox = gtk_vbox_new(FALSE, 6);
- gtk_box_pack_start(GTK_BOX(mainbox), vbox, TRUE, TRUE, 0);
+ table = gtk_table_new(2, 2, FALSE);
+ gtk_box_pack_start(GTK_BOX(mainbox), table, TRUE, TRUE, 0);
label = create_label(_("Known devices"));
- gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+ gtk_table_attach(GTK_TABLE(table), label, 0, 2, 0, 1,
+ GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 6);
scrolled = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled),
GTK_SHADOW_OUT);
- gtk_container_add(GTK_CONTAINER(vbox), scrolled);
+ gtk_table_attach(GTK_TABLE(table), scrolled, 0, 1, 1, 2,
+ GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 6, 6);
model = bluetooth_client_get_device_filter_model(client,
adapter->proxy, device_filter, NULL, NULL);
@@ -632,12 +635,13 @@ static void create_adapter(struct adapter_data *adapter)
gtk_container_add(GTK_CONTAINER(scrolled), tree);
- buttonbox = gtk_hbutton_box_new();
+ buttonbox = gtk_vbutton_box_new();
gtk_button_box_set_layout(GTK_BUTTON_BOX(buttonbox),
GTK_BUTTONBOX_START);
gtk_box_set_spacing(GTK_BOX(buttonbox), 6);
gtk_box_set_homogeneous(GTK_BOX(buttonbox), FALSE);
- gtk_box_pack_start(GTK_BOX(vbox), buttonbox, FALSE, FALSE, 0);
+ gtk_table_attach(GTK_TABLE(table), buttonbox, 1, 2, 1, 2,
+ GTK_FILL, GTK_FILL, 6, 6);
button = gtk_button_new_with_label(_("Setup new device..."));
image = gtk_image_new_from_stock(GTK_STOCK_ADD,
--
1.5.5.2
0003-Fix-trust-button.patch:
--- NEW FILE 0003-Fix-trust-button.patch ---
>From a99222b4c0b505f5a0fc2a564977bf3be71a6c86 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Tue, 14 Oct 2008 17:59:58 +0100
Subject: [PATCH] Fix trust button
The trust button toggles the trust for a device, so the label
should reflect the action to take when clicked. Changed the label
to "Trust"/"Distrust" to avoid the widgets moving about when
toggling the trust status.
---
properties/adapter.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/properties/adapter.c b/properties/adapter.c
index 0174716..b744a20 100644
--- a/properties/adapter.c
+++ b/properties/adapter.c
@@ -216,6 +216,11 @@ static gboolean focus_callback(GtkWidget *editable,
static void update_buttons(struct adapter_data *adapter, gboolean bonded,
gboolean trusted, gboolean connected)
{
+ if (trusted) {
+ gtk_button_set_label(GTK_BUTTON(adapter->button_trusted), _("Distrust"));
+ } else {
+ gtk_button_set_label(GTK_BUTTON(adapter->button_trusted), _("Trust"));
+ }
gtk_widget_set_sensitive(adapter->button_delete, bonded);
gtk_widget_set_sensitive(adapter->button_disconnect, connected);
}
@@ -666,7 +671,7 @@ static void create_adapter(struct adapter_data *adapter)
adapter->button_disconnect = button;
- button = gtk_button_new_with_label(_("Add to Trusted"));
+ button = gtk_button_new_with_label(_("Trust"));
image = gtk_image_new_from_stock(GTK_STOCK_ABOUT,
GTK_ICON_SIZE_BUTTON);
gtk_button_set_image(GTK_BUTTON(button), image);
--
1.5.5.2
Index: bluez-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bluez-gnome/devel/bluez-gnome.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- bluez-gnome.spec 10 Oct 2008 09:15:21 -0000 1.65
+++ bluez-gnome.spec 14 Oct 2008 19:04:14 -0000 1.66
@@ -1,6 +1,6 @@
Name: bluez-gnome
Version: 1.8
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Bluetooth pairing and control applet
Group: Applications/System
@@ -11,6 +11,11 @@
Patch0: bluetooth-sendto-ods-svn.patch
# http://thread.gmane.org/gmane.linux.bluez.kernel/535
Patch1: 0001-Fix-PS3-BD-remote-pairing.patch
+# http://thread.gmane.org/gmane.linux.bluez.kernel/559
+Patch2: 0001-Fixes-for-adapter-specific-buttons.patch
+Patch3: 0002-Move-the-adapter-button-list-to-the-side.patch
+Patch4: 0003-Fix-trust-button.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +55,9 @@
%setup -q
%patch0 -p1 -b .ods-svn
%patch1 -p1 -b .ps3-bd
+%patch2 -p1 -b .button
+%patch3 -p1 -b .move
+%patch4 -p1 -b .trust
%build
%configure --disable-mime-update --disable-desktop-update --disable-icon-update
@@ -141,6 +149,9 @@
%{_mandir}/man1/bluetooth-analyzer.1.gz
%changelog
+* Tue Oct 14 2008 - Bastien Nocera <bnocera at redhat.com> - 1.8-3
+- Add patches to clean up the button list (#465398)
+
* Fri Oct 10 2008 - Bastien Nocera <bnocera at redhat.com> - 1.8-2
- Add patch to make the PS3 BD remote work
More information about the fedora-extras-commits
mailing list