rpms/grig/devel grig-0.7.2-tooltip.patch, NONE, 1.1 grig.spec, 1.1, 1.2

Denis Leroy (denis) fedora-extras-commits at redhat.com
Mon Aug 20 13:01:41 UTC 2007


Author: denis

Update of /cvs/pkgs/rpms/grig/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31789

Modified Files:
	grig.spec 
Added Files:
	grig-0.7.2-tooltip.patch 
Log Message:
- Updated License tag
- Added patch for new GtkTooltip interface


grig-0.7.2-tooltip.patch:

--- NEW FILE grig-0.7.2-tooltip.patch ---
--- tmp/grig-0.7.2/src/rig-gui-vfo.c	2007-08-20 14:46:22.000000000 +0200
+++ grig-0.7.2/src/rig-gui-vfo.c	2007-08-20 14:52:41.000000000 +0200
@@ -101,7 +101,6 @@
 rig_gui_vfo_create_toggle ()
 {
 	GtkWidget   *button;
-	GtkTooltips *tips;
 	gint         sigid;
 	gint         vfos;
 	
@@ -112,16 +111,12 @@
 	vfos = rig_data_get_vfos ();
 	if (vfos & RIG_VFO_MAIN) {
 		button = gtk_button_new_with_label (_("Main / Sub"));
-		tips = gtk_tooltips_new ();
-		gtk_tooltips_set_tip (tips, button,
-				      _("Toggle active VFO"),
+		gtk_widget_set_tooltip_text (button,
 				      _("Toggle between the two available VFOs"));
 	}
 	else {
 		button = gtk_button_new_with_label (_("A / B"));
-		tips = gtk_tooltips_new ();
-		gtk_tooltips_set_tip (tips, button,
-				      _("Toggle VFO"),
+		gtk_widget_set_tooltip_text (button,
 				      _("Toggle between the two available VFOs"));
 	}
 
@@ -203,7 +198,6 @@
 rig_gui_vfo_create_eq_button ()
 {
 	GtkWidget   *button;
-	GtkTooltips *tips;
 	gint         sigid;
 	gint         vfos;
 	
@@ -214,17 +208,13 @@
 	vfos = rig_data_get_vfos ();
 	if (vfos & RIG_VFO_MAIN) {
 		button = gtk_button_new_with_label (_("Main = Sub"));
-		tips = gtk_tooltips_new ();
-		gtk_tooltips_set_tip (tips, button,
-				      _("Set Main VFO = Sub VFO"),
-				      NULL);
+		gtk_widget_set_tooltip_text (button,
+				      _("Set Main VFO = Sub VFO"));
 	}
 	else {
 		button = gtk_button_new_with_label (_("A = B"));
-		tips = gtk_tooltips_new ();
-		gtk_tooltips_set_tip (tips, button,
-				      _("Set VFO A = VFO B"),
-				      NULL);
+		gtk_widget_set_tooltip_text (button,
+				      _("Set VFO A = VFO B"));
 	}
 
 
@@ -282,7 +272,6 @@
 rig_gui_vfo_create_xchg_button ()
 {
 	GtkWidget   *button;
-	GtkTooltips *tips;
 	gint         sigid;
 	gint         vfos;
 	
@@ -293,17 +282,13 @@
 	vfos = rig_data_get_vfos ();
 	if (vfos & RIG_VFO_MAIN) {
 		button = gtk_button_new_with_label (_("Main\302\253\302\273Sub"));
-		tips = gtk_tooltips_new ();
-		gtk_tooltips_set_tip (tips, button,
-				      _("Exchange Main and sub VFOs"),
-				      NULL);
+		gtk_widget_set_tooltip_text (button,
+				      _("Exchange Main and sub VFOs"));
 	}
 	else {
 		button = gtk_button_new_with_label (_("A\302\253\302\273B"));
-		tips = gtk_tooltips_new ();
-		gtk_tooltips_set_tip (tips, button,
-				      _("Exchange VFO A and B"),
-				      NULL);
+		gtk_widget_set_tooltip_text (button,
+				      _("Exchange VFO A and B"));
 	}
 
 
@@ -362,7 +347,6 @@
 rig_gui_vfo_create_split_button ()
 {
 	GtkWidget   *button;
-	GtkTooltips *tips;
 	gint         sigid;
 
 	
@@ -371,10 +355,8 @@
            or Main<->Sub if the rig has those two.
         */
 	button = gtk_toggle_button_new_with_label (_("Split"));
-	tips = gtk_tooltips_new ();
-	gtk_tooltips_set_tip (tips, button,
-			      _("Toggle split mode operation"),
-			      NULL);
+	gtk_widget_set_tooltip_text (button,
+			      _("Toggle split mode operation"));
 
 	/* set button status before we do anything else */
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
--- tmp/grig-0.7.2/src/rig-gui-levels.c	2007-08-20 14:46:22.000000000 +0200
+++ grig-0.7.2/src/rig-gui-levels.c	2007-08-20 14:51:49.000000000 +0200
@@ -48,14 +48,11 @@
 rig_gui_levels_create ()
 {
 	GtkWidget *expander;
-	GtkTooltips *tips;
 	
 	expander = gtk_expander_new (_("Level Controls"));
 
 	/* add tooltips */
-	tips = gtk_tooltips_new ();
-	gtk_tooltips_set_tip (tips, expander,
-			      _("Show/hide level controls"),
+	gtk_widget_set_tooltip_text (expander,
 			      _("Show/hide level controls"));
 
 	return expander;
--- tmp/grig-0.7.2/src/grig-gtk-workarounds.c	2007-08-20 14:46:22.000000000 +0200
+++ grig-0.7.2/src/grig-gtk-workarounds.c	2007-08-20 14:50:19.000000000 +0200
@@ -96,13 +96,7 @@
 	/* if current child is a button we have BINGO! */
 	if (GTK_IS_BUTTON (combo)) {
 
-		GtkTooltips *tips;
-
-		tips = gtk_tooltips_new ();
-
-		gtk_tooltips_set_tip (tips, combo,
-				      (gchar *) text,
-				      NULL);
+		gtk_widget_set_tooltip_text (combo, (gchar *) text);
 	}
 
 }
--- tmp/grig-0.7.2/src/rig-gui-buttons.c	2007-08-20 14:46:22.000000000 +0200
+++ grig-0.7.2/src/rig-gui-buttons.c	2007-08-20 14:51:27.000000000 +0200
@@ -140,16 +140,12 @@
 rig_gui_buttons_create_power_button    ()
 {
 	GtkWidget   *button;
-	GtkTooltips *tips;
 	powerstat_t  pstat;
 	gint         sigid;
 	
 	/* create button widget */
 	button = gtk_toggle_button_new_with_label (_("Power"));
-	tips = gtk_tooltips_new ();
-	gtk_tooltips_set_tip (tips, button,
-			      _("Power status"),
-			      _("Turn the radio ON or OFF"));
+	gtk_widget_set_tooltip_text (button, _("Turn the radio ON or OFF"));
 
 	/* set correct state */
 	pstat = rig_data_get_pstat ();
@@ -190,16 +186,12 @@
 rig_gui_buttons_create_ptt_button    ()
 {
 	GtkWidget   *button;
-	GtkTooltips *tips;
 	ptt_t        ptt;
 	gint         sigid;
 	
 	/* create button widget */
 	button = gtk_toggle_button_new_with_label (_("PTT"));
-	tips = gtk_tooltips_new ();
-	gtk_tooltips_set_tip (tips, button,
-			      _("Push To Talk"),
-			      _("Switch between receive and transmit mode"));
+	gtk_widget_set_tooltip_text (button, _("Switch between receive and transmit mode"));
 
 	/* set correct state */
 	ptt = rig_data_get_ptt ();
@@ -239,16 +231,13 @@
 rig_gui_buttons_create_lock_button    ()
 {
 	GtkWidget   *button;
-	GtkTooltips *tips;
 	int          status;
 	gint         sigid;
 	
 	/* create button widget */
 	button = gtk_toggle_button_new_with_label (_("Lock"));
-	tips = gtk_tooltips_new ();
-	gtk_tooltips_set_tip (tips, button,
-			      _("Lock tuning dial"),
-			      _("Lock the main tuning dial on the radio panel"));
+	gtk_widget_set_tooltip_text (button,
+				     _("Lock the main tuning dial on the radio panel"));
 
 	/* set correct state */
 	status = rig_data_get_lock ();


Index: grig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grig/devel/grig.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grig.spec	21 Jun 2007 08:57:03 -0000	1.1
+++ grig.spec	20 Aug 2007 13:01:05 -0000	1.2
@@ -1,14 +1,15 @@
 
 Name:           grig
 Version:        0.7.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Ham Radio Control graphical user interface
 
 Group:          Applications/Communications
-License:        GPL
+License:        GPLv2+
 URL:            http://groundstation.sourceforge.net/grig/
 Source0:        http://prdownloads.sourceforge.net/groundstation/%{name}-%{version}.tar.gz
 Source1:        grig.desktop
+Patch0:         grig-0.7.2-tooltip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  hamlib-devel >= 1.2.5
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .tooltip
 
 
 %build
@@ -67,5 +69,9 @@
 
 
 %changelog
+* Mon Aug 20 2007 Denis Leroy <denis at poolshark.org> - 0.7.2-2
+- Updated License tag
+- Added patch for new GtkTooltip interface
+
 * Fri Dec 29 2006 Denis Leroy <denis at poolshark.org> - 0.7.2-1
 - First version




More information about the fedora-extras-commits mailing list