rpms/resapplet/devel resapplet-fix-novell-146622-rml-1.patch, NONE, 1.1 resapplet-i18n.patch, NONE, 1.1 resapplet-transparent-trayicon.patch, NONE, 1.1 resapplet.desktop.in, NONE, 1.1 resapplet.spec, NONE, 1.1 s-c-display.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Jindrich Novy (jnovy)
fedora-extras-commits at redhat.com
Wed Dec 20 10:10:32 UTC 2006
Author: jnovy
Update of /cvs/extras/rpms/resapplet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23304/devel
Modified Files:
.cvsignore sources
Added Files:
resapplet-fix-novell-146622-rml-1.patch resapplet-i18n.patch
resapplet-transparent-trayicon.patch resapplet.desktop.in
resapplet.spec s-c-display.patch
Log Message:
auto-import resapplet-0.1.1-4 on branch devel from resapplet-0.1.1-4.src.rpm
initial import of resapplet
resapplet-fix-novell-146622-rml-1.patch:
--- NEW FILE resapplet-fix-novell-146622-rml-1.patch ---
Index: src/resapplet.c
===================================================================
RCS file: /cvs/gnome/resapplet/src/resapplet.c,v
retrieving revision 1.36
diff -u -r1.36 resapplet.c
--- src/resapplet.c 21 Nov 2005 22:19:11 -0000 1.36
+++ src/resapplet.c 30 Jan 2006 20:12:47 -0000
@@ -246,7 +246,8 @@
Status status;
GdkWindow *root_window;
GdkScreen *screen;
- int new_res, new_rate;
+ int new_res;
+ short new_rate;
screen = gdk_display_get_screen (display, i);
root_window = gdk_screen_get_root_window (screen);
@@ -257,14 +258,25 @@
if (new_res != screen_info->current_size ||
new_rate != screen_info->current_rate) {
changed = TRUE;
- status = XRRSetScreenConfigAndRate (
- xdisplay,
- screen_info->config,
- gdk_x11_drawable_get_xid (GDK_DRAWABLE (root_window)),
- new_res,
- screen_info->current_rotation,
- new_rate,
- GDK_CURRENT_TIME);
+
+ /* only set the rate if it looks sane */
+ if (new_rate > 0 && new_rate < 120)
+ status = XRRSetScreenConfigAndRate (
+ xdisplay,
+ screen_info->config,
+ gdk_x11_drawable_get_xid (GDK_DRAWABLE (root_window)),
+ new_res,
+ screen_info->current_rotation,
+ new_rate,
+ GDK_CURRENT_TIME);
+ else
+ status = XRRSetScreenConfig (
+ xdisplay,
+ screen_info->config,
+ gdk_x11_drawable_get_xid (GDK_DRAWABLE (root_window)),
+ new_res,
+ screen_info->current_rotation,
+ GDK_CURRENT_TIME);
}
}
resapplet-i18n.patch:
--- NEW FILE resapplet-i18n.patch ---
--- resapplet-0.1.1/Makefile.am
+++ resapplet-0.1.1/Makefile.am
@@ -1,12 +1,22 @@
-SUBDIRS = icons src
+SUBDIRS = icons po src
desktopdir = $(datadir)/applications
-desktop_DATA = resapplet.desktop
+desktop_in_files = resapplet.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-icondir = $(datadir)/pixmaps
-icon_DATA = resapplet.png
+ at INTLTOOL_DESKTOP_RULE@
+
+CLEANFILES = \
+ $(desktop_DATA)
+
+DISTCLEANFILES = \
+ intltool-extract \
+ intltool-merge \
+ intltool-update
EXTRA_DIST = \
+ intltool-extract.in \
+ intltool-merge.in \
+ intltool-update.in \
resapplet.spec.in \
- $(desktop_DATA) \
- $(icon_DATA)
+ $(desktop_in_files)
--- resapplet-0.1.1/configure.in
+++ resapplet-0.1.1/configure.in
@@ -52,23 +52,21 @@
RESAPPLET_LIBS="$RESAPPLET_LIBS $RANDR_LIBS"
### Internationalization support
-AC_CHECK_FUNCS(ngettext, have_ngettext=yes)
-
-if test x"$have_ngettext" != "xyes"; then
- AC_MSG_ERROR([Your Gettext installation doesn't seem to support ngettext to handle translation of plural forms. Please install GNU Gettext])
-fi;
-
-ALL_LINGUAS="af am ar az be bg bn ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id is it ja ko lt lv mk ml mn ms nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr at Latn sv ta th tr uk vi wa zh_CN zh_TW"
GETTEXT_PACKAGE=resapplet
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
+ALL_LINGUAS="cs de es fi fr hu it ja pl pt_BR sk zh_CN zh_TW"
+AC_PROG_INTLTOOL([0.33])
+AM_GLIB_GNU_GETTEXT
+
### build makefiles
AC_OUTPUT([
resapplet.spec
Makefile
+po/Makefile.in
src/Makefile
icons/Makefile
icons/16x16/Makefile
--- resapplet-0.1.1/src/resapplet.c
+++ resapplet-0.1.1/src/resapplet.c
@@ -12,6 +12,7 @@
* Robert Love <rml at novell.com>
*/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -25,7 +27,6 @@
#include "clipboard.h"
#include "eggtrayicon.h"
-#include "config.h"
#define REVERT_COUNT 20
#define YAST2_ARGV { "/opt/gnome/bin/gnomesu", "/sbin/yast2", "x11", NULL }
@@ -684,7 +685,7 @@
rates = XRRConfigRates (si->config, current_size, &n_rates);
if ((si->n_sizes > 1 || n_rates > 1) && resapplet->di->n_screens > 1) {
- text = g_strdup_printf ("Screen %d", i);
+ text = g_strdup_printf (_("Screen %d"), i);
mi = gtk_menu_item_new_with_label (text);
g_free (text);
@@ -777,7 +778,7 @@
/* 'Configure Display Settings' item */
image = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES,
GTK_ICON_SIZE_MENU);
- mi = gtk_image_menu_item_new_with_mnemonic ("_Configure Display Settings");
+ mi = gtk_image_menu_item_new_with_mnemonic (_("_Configure Display Settings"));
gtk_image_menu_item_set_image ((GtkImageMenuItem *) mi, image);
gtk_menu_shell_append (GTK_MENU_SHELL (resapplet->popup_menu), mi);
gtk_widget_show (mi);
@@ -788,7 +789,7 @@
gtk_widget_show (mi);
gtk_menu_shell_append (GTK_MENU_SHELL (resapplet->popup_menu), mi);
- mi = gtk_image_menu_item_new_with_mnemonic ("_Remove From Panel");
+ mi = gtk_image_menu_item_new_with_mnemonic (_("_Remove From Panel"));
image = gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image ((GtkImageMenuItem *) mi, image);
gtk_menu_shell_append (GTK_MENU_SHELL (resapplet->popup_menu), mi);
@@ -970,6 +971,14 @@
GdkDisplay *display;
int event_base, error_base;
+ const char *domaindir, *codeset, *domain;
+
+#ifdef ENABLE_NLS
+ domaindir = bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+ codeset = bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ domain = textdomain (GETTEXT_PACKAGE);
+#endif
+
gnome_program_init ("resapplet", VERSION,
LIBGNOMEUI_MODULE,
argc, argv,
resapplet-transparent-trayicon.patch:
--- NEW FILE resapplet-transparent-trayicon.patch ---
--- src/eggtrayicon.c
+++ src/eggtrayicon.c
@@ -67,6 +67,9 @@
static void egg_tray_icon_realize (GtkWidget *widget);
static void egg_tray_icon_unrealize (GtkWidget *widget);
+static void egg_tray_icon_add (GtkContainer *container,
+ GtkWidget *widget);
+
#ifdef GDK_WINDOWING_X11
static void egg_tray_icon_update_manager_window (EggTrayIcon *icon,
gboolean dock_if_realized);
@@ -109,6 +112,7 @@
{
GObjectClass *gobject_class = (GObjectClass *)klass;
GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
+ GtkContainerClass *container_class = (GtkContainerClass *)klass;
parent_class = g_type_class_peek_parent (klass);
@@ -117,6 +121,8 @@
widget_class->realize = egg_tray_icon_realize;
widget_class->unrealize = egg_tray_icon_unrealize;
+ container_class->add = egg_tray_icon_add;
+
g_object_class_install_property (gobject_class,
PROP_ORIENTATION,
g_param_spec_enum ("orientation",
@@ -363,6 +369,36 @@
#endif
+static gboolean
+transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
+{
+ gdk_window_clear_area (widget->window, event->area.x, event->area.y,
+ event->area.width, event->area.height);
+ return FALSE;
+}
+
+static void
+make_transparent_again (GtkWidget *widget, GtkStyle *previous_style,
+ gpointer user_data)
+{
+ gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
+}
+
+static void
+make_transparent (GtkWidget *widget, gpointer user_data)
+{
+ if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
+ return;
+
+ gtk_widget_set_app_paintable (widget, TRUE);
+ gtk_widget_set_double_buffered (widget, FALSE);
+ gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
+ g_signal_connect (widget, "expose_event",
+ G_CALLBACK (transparent_expose_event), NULL);
+ g_signal_connect_after (widget, "style_set",
+ G_CALLBACK (make_transparent_again), NULL);
+}
+
static void
egg_tray_icon_realize (GtkWidget *widget)
{
@@ -377,6 +413,8 @@
if (GTK_WIDGET_CLASS (parent_class)->realize)
GTK_WIDGET_CLASS (parent_class)->realize (widget);
+ make_transparent (widget, NULL);
+
screen = gtk_widget_get_screen (widget);
display = gdk_screen_get_display (screen);
xdisplay = gdk_x11_display_get_xdisplay (display);
@@ -409,6 +447,14 @@
#endif
}
+static void
+egg_tray_icon_add (GtkContainer *container, GtkWidget *widget)
+{
+ g_signal_connect (widget, "realize",
+ G_CALLBACK (make_transparent), NULL);
+ GTK_CONTAINER_CLASS (parent_class)->add (container, widget);
+}
+
EggTrayIcon *
egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name)
{
--- src/resapplet.c
+++ src/resapplet.c
@@ -65,7 +65,6 @@
DisplayInfo *di;
EggTrayIcon *tray_icon;
- GtkWidget *menu_bar;
GtkWidget *event_box;
GtkWidget *icon;
GtkTooltips *tooltips;
@@ -109,9 +108,9 @@
if (resapplet->tooltips == NULL)
resapplet->tooltips = gtk_tooltips_new ();
- current_screen = & resapplet->di->screens [gdk_screen_get_number (gtk_widget_get_screen (resapplet->menu_bar))];
+ current_screen = & resapplet->di->screens [gdk_screen_get_number (gtk_widget_get_screen (resapplet->event_box))];
- root = gtk_widget_get_root_window (resapplet->menu_bar);
+ root = gtk_widget_get_root_window (resapplet->event_box);
gdk_window_get_geometry (root, NULL, NULL, NULL, NULL, &gdk_depth);
if (gdk_depth < 0)
@@ -474,7 +473,7 @@
timeout = g_timeout_add (1000, save_timeout_callback, & (resapplet->timeout_data));
- gtk_widget_set_sensitive (resapplet->menu_bar, FALSE);
+ gtk_widget_set_sensitive (resapplet->event_box, FALSE);
res = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -483,7 +482,7 @@
gtk_widget_destroy (dialog);
resapplet->timeout_data.dialog = NULL;
- gtk_widget_set_sensitive (resapplet->menu_bar, TRUE);
+ gtk_widget_set_sensitive (resapplet->event_box, TRUE);
return (res == GTK_RESPONSE_YES);
}
@@ -806,7 +805,7 @@
int icon_size;
gtk_window_get_size (
- GTK_WINDOW (gtk_widget_get_toplevel (resapplet->menu_bar)),
+ GTK_WINDOW (gtk_widget_get_toplevel (resapplet->event_box)),
&panel_w, &panel_h);
if (panel_h == resapplet->last_panel_height)
@@ -867,70 +866,69 @@
gtk_tooltips_enable (resapplet->tooltips);
}
+static void
+position_menu (GtkMenu *menu, int *x, int *y, gboolean *push_in, gpointer data)
+{
+ Resapplet *applet = (Resapplet *) data;
+ GtkRequisition req;
+ gint menu_xpos, menu_ypos;
+
+ gtk_widget_size_request (GTK_WIDGET (menu), &req);
+ gdk_window_get_origin (applet->event_box->window, &menu_xpos, &menu_ypos);
+
+ menu_xpos += applet->event_box->allocation.x;
+ menu_ypos += applet->event_box->allocation.y;
+
+ if (menu_ypos > gdk_screen_get_height (gtk_widget_get_screen (applet->event_box)) / 2)
+ menu_ypos -= req.height;
+ else
+ menu_ypos += applet->event_box->allocation.height;
+
+ *x = menu_xpos;
+ *y = menu_ypos;
+
+ *push_in = TRUE;
+}
+
static gboolean
-resapplet_create_tray_icon (gpointer data)
+button_press (GtkWidget *widget G_GNUC_UNUSED, GdkEventButton *event, gpointer data)
{
Resapplet *applet = (Resapplet *) data;
- GtkWidget *top_menu_item;
- GtkStyle *style;
- int i;
- const gchar *rcstyle = " \
- style \"MenuBar\" \n\
- { \n\
- GtkMenuBar::shadow_type = none \n\
- GtkMenuBar::internal-padding = 0 \n\
- } \n\
- style \"MenuItem\" \n\
- { \n\
- xthickness=0 \n\
- ythickness=0 \n\
- } \n\
- widget_class \"GtkMenuBar\" style \"MenuBar\"\n\
- widget \"*ToplevelMenu*\" style \"MenuItem\"\n";
- gtk_rc_parse_string (rcstyle);
+ if (event->button == 2)
+ return FALSE;
- /* Event box for tooltips */
- applet->event_box = gtk_event_box_new ();
- gtk_container_set_border_width (GTK_CONTAINER (applet->event_box), 0);
+ gtk_menu_popup (GTK_MENU (applet->popup_menu), NULL, NULL,
+ position_menu, applet, 0, event->time);
+ return TRUE;
+}
+
+static gboolean
+resapplet_create_tray_icon (gpointer data)
+{
+ Resapplet *applet = (Resapplet *) data;
applet->tray_icon = egg_tray_icon_new ("applet");
g_signal_connect (G_OBJECT (applet->tray_icon), "destroy",
G_CALLBACK (tray_icon_destroy_cb), NULL);
- applet->menu_bar = gtk_menu_bar_new ();
- style = gtk_style_new ();
- for (i = 0; i < 5; i++)
- style->bg_pixmap[i] = (GdkPixmap *) GDK_PARENT_RELATIVE;
- style->xthickness = style->ythickness = 0;
-
- gtk_widget_set_style (applet->menu_bar, style);
-
- top_menu_item = gtk_menu_item_new();
- gtk_widget_set_name (top_menu_item, "ToplevelMenu");
- gtk_container_set_border_width (GTK_CONTAINER (top_menu_item), 0);
-
- gtk_container_add (GTK_CONTAINER (applet->event_box),
- applet->menu_bar);
+ applet->event_box = gtk_event_box_new ();
+ gtk_container_set_border_width (GTK_CONTAINER (applet->event_box), 0);
gtk_container_add (GTK_CONTAINER (applet->tray_icon),
applet->event_box);
- gtk_widget_show_all (GTK_WIDGET (applet->event_box));
-
- g_signal_connect (top_menu_item, "size-allocate",
- G_CALLBACK (size_changed_cb), NULL);
+ g_signal_connect (applet->event_box, "button_press_event",
+ G_CALLBACK (button_press), applet);
applet->icon = gtk_image_new ();
- gtk_container_add (GTK_CONTAINER (top_menu_item), applet->icon);
- gtk_widget_show (applet->icon);
+ gtk_container_add (GTK_CONTAINER (applet->event_box),
+ applet->icon);
- gtk_menu_shell_append (GTK_MENU_SHELL (applet->menu_bar),
- top_menu_item);
+ gtk_widget_show_all (GTK_WIDGET (applet->event_box));
- gtk_widget_show (top_menu_item);
+ g_signal_connect (applet->tray_icon, "size-allocate",
+ G_CALLBACK (size_changed_cb), NULL);
applet->popup_menu = gtk_menu_new ();
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (top_menu_item),
- applet->popup_menu);
g_signal_connect (applet->popup_menu, "show",
G_CALLBACK (menu_show_cb), NULL);
g_signal_connect (applet->popup_menu, "hide",
--- NEW FILE resapplet.desktop.in ---
[Desktop Entry]
Name=Resolution Switcher
Comment=Change your screen resolution
Exec=resapplet
Icon=resapplet
Terminal=false
Type=Application
TryExec=resapplet
Categories=GNOME;Application;SystemTools;X-Ximian-System-Toplevel;
StartupNotify=false
Encoding=UTF-8
--- NEW FILE resapplet.spec ---
Summary: Resolution Switching Applet
Name: resapplet
Version: 0.1.1
Release: 4%{?dist}
License: GPL
Group: User Interface/Desktops
# Source obtained from OpenSuSE
Source: resapplet-%{version}.tar.bz2
Source1: resapplet-po.tar.bz2
Source2: resapplet.desktop.in
Patch0: resapplet-fix-novell-146622-rml-1.patch
Patch1: resapplet-transparent-trayicon.patch
Patch2: resapplet-i18n.patch
Patch3: s-c-display.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gnome-icon-theme gnome-themes libgnomeui-devel
BuildRequires: intltool, automake, gettext, desktop-file-utils
Requires: libgnomeui >= 2.2 gtk2 >= 2.4 gconf-editor >= 2.6
Requires: gnome-icon-theme, system-config-display
%description
Resapplet is a simple utility that sits in the system notification area
and allows switching the resolution and refresh rate. It uses the
xrandr extensions to switch the resolution on-the-fly and user
resolution preferences to save the resolution.
It works in both GNOME and KDE, because it uses the system notification
area.
%prep
%setup -q -a 1
cp -a %{S:2} . ; rm resapplet.desktop
if %version != 0.1.1 ; then
echo "Please remove Source2 and Source3 and verify, that translations work."
exit 1
fi
%patch0 -p0
%patch1 -p0
%patch2 -p1
%patch3 -p1
%build
glib-gettextize
intltoolize --force
aclocal
autoheader
automake
autoconf
export CFLAGS="$RPM_OPT_FLAGS"
%configure --datadir=%{_datadir} \
--libdir=%{_libdir} \
--localstatedir=%{_libdir} \
--prefix=%{_prefix}
make
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install --vendor fedora --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category System \
--add-category Utility \
--add-category X-Red-Hat-Base \
$RPM_BUILD_ROOT%{_datadir}/applications/resapplet.desktop
mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/
# install autostart file
cp $RPM_BUILD_ROOT%{_datadir}/applications/fedora-resapplet.desktop $RPM_BUILD_ROOT%{_datadir}/gnome/autostart/
%find_lang %name
%post
touch --no-create %{_datadir}/pixmaps/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
%postun
touch --no-create %{_datadir}/pixmaps/hicolor || :
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %name.lang
%defattr(-,root,root)
%doc COPYING README
%{_bindir}/resapplet
%{_datadir}/applications/fedora-resapplet.desktop
%{_datadir}/gnome/autostart/fedora-resapplet.desktop
%{_datadir}/icons/gnome/16x16/apps/resapplet.png
%{_datadir}/icons/gnome/32x32/apps/resapplet.png
%{_datadir}/icons/gnome/24x24/apps/resapplet.png
%{_datadir}/icons/gnome/48x48/apps/resapplet.png
%changelog
* Tue Dec 12 2006 Radek Vokál <rvokal at redhat.com> 0.1.1-4
- remove suse icons
- add scriplets
* Thu Dec 7 2006 Radek Vokál <rvokal at redhat.com> 0.1.1-3
- fix desktop file
* Wed Dec 6 2006 Radek Vokál <rvokal at redhat.com> 0.1.1-2
- spec file changes
* Wed Dec 6 2006 Radek Vokál <rvokal at redhat.com> 0.1.1-1
- initial Fedora built
s-c-display.patch:
--- NEW FILE s-c-display.patch ---
--- resapplet-0.1.1/src/resapplet.c.old 2006-12-06 12:41:45.000000000 +0100
+++ resapplet-0.1.1/src/resapplet.c 2006-12-06 12:44:21.000000000 +0100
@@ -28,7 +28,7 @@
#define REVERT_COUNT 20
-#define YAST2_ARGV { "/opt/gnome/bin/gnomesu", "/sbin/yast2", "x11", NULL }
+#define YAST2_ARGV { "/usr/bin/system-config-display", NULL }
typedef struct {
int current_width;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/resapplet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 20 Dec 2006 10:08:48 -0000 1.1
+++ .cvsignore 20 Dec 2006 10:10:02 -0000 1.2
@@ -0,0 +1,2 @@
+resapplet-0.1.1.tar.bz2
+resapplet-po.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/resapplet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 20 Dec 2006 10:08:48 -0000 1.1
+++ sources 20 Dec 2006 10:10:02 -0000 1.2
@@ -0,0 +1,2 @@
+0f1d30b02182ff1ec463b3bc37e9326c resapplet-0.1.1.tar.bz2
+8eccc3dcafef264829601ea06899ec70 resapplet-po.tar.bz2
More information about the scm-commits
mailing list