cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hide some items on the context menu, when not under plugin control

Browse Source 
(upstream svn revision r2401)
This commit is contained in:
dcoppa 2013-02-04 10:05:53 +00:00
parent e3e6f35472
commit 1f39860b66
2 changed files with 45 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome-mplayer/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.69 2013/01/31 11:56:36 dcoppa Exp $
# $OpenBSD: Makefile,v 1.70 2013/02/04 10:05:53 dcoppa Exp $
COMMENT = GTK+/GNOME frontend for MPlayer
V = 1.0.7
DISTNAME = gnome-mplayer-${V}
REVISION = 4
REVISION = 5
CATEGORIES = x11 multimedia

52
x11/gnome-mplayer/patches/patch-src_gui_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_gui_c,v 1.32 2013/01/31 11:56:36 dcoppa Exp $
$OpenBSD: patch-src_gui_c,v 1.33 2013/02/04 10:05:53 dcoppa Exp $
Fix some layout issues when playing audio only files
(upstream svn revision r2390)
@ -8,6 +8,9 @@ Clean up unused variable messages
Fix usage of symbolic icons
(upstream svn revisions r2357, r2363, r2364, r2381, r2383 and r2384)
Hide some items on the context menu, when not under plugin control
(upstream svn revision r2401)
Resize player when on 'videopresent' event
(upstream svn revision r2391)
@ -21,7 +24,7 @@ Don't monitor system volume when running in softvol mode
(upstream svn revision r2377)
--- src/gui.c.orig Fri Oct 26 19:22:31 2012
+++ src/gui.c Thu Jan 31 12:39:22 2013
+++ src/gui.c Mon Feb 4 10:46:36 2013
@@ -497,6 +497,7 @@ void adjust_layout()
gint total_width;
gint handle_size;
@ -489,7 +492,38 @@ Don't monitor system volume when running in softvol mode
#else
gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
#endif
@@ -7664,9 +7831,24 @@ GtkWidget *create_window(gint windowid)
@@ -7301,10 +7468,12 @@ GtkWidget *create_window(gint windowid)
gtk_widget_show(GTK_WIDGET(menuitem_copyurl));
menuitem_sep2 = GTK_MENU_ITEM(gtk_separator_menu_item_new());
gtk_menu_shell_append(GTK_MENU_SHELL(popup_menu), GTK_WIDGET(menuitem_sep2));
- gtk_widget_show(GTK_WIDGET(menuitem_sep2));
+ if (control_id != 0)
+ gtk_widget_show(GTK_WIDGET(menuitem_sep2));
menuitem_config = GTK_MENU_ITEM(gtk_image_menu_item_new_from_stock(GTK_STOCK_PREFERENCES, NULL));
gtk_menu_shell_append(GTK_MENU_SHELL(popup_menu), GTK_WIDGET(menuitem_config));
- gtk_widget_show(GTK_WIDGET(menuitem_config));
+ if (control_id != 0)
+ gtk_widget_show(GTK_WIDGET(menuitem_config));
menuitem_sep4 = GTK_MENU_ITEM(gtk_separator_menu_item_new());
gtk_menu_shell_append(GTK_MENU_SHELL(popup_menu), GTK_WIDGET(menuitem_sep4));
menuitem_save = GTK_MENU_ITEM(gtk_image_menu_item_new_from_stock(GTK_STOCK_SAVE, accel_group));
@@ -7319,10 +7488,13 @@ GtkWidget *create_window(gint windowid)
menuitem_sep3 = GTK_MENU_ITEM(gtk_separator_menu_item_new());
gtk_menu_shell_append(GTK_MENU_SHELL(popup_menu), GTK_WIDGET(menuitem_sep3));
- gtk_widget_show(GTK_WIDGET(menuitem_sep3));
+ if (control_id != 0)
+ gtk_widget_show(GTK_WIDGET(menuitem_sep3));
menuitem_quit = GTK_MENU_ITEM(gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT, accel_group));
gtk_menu_shell_append(GTK_MENU_SHELL(popup_menu), GTK_WIDGET(menuitem_quit));
- gtk_widget_show(GTK_WIDGET(menuitem_quit));
+ if (control_id != 0)
+ gtk_widget_show(GTK_WIDGET(menuitem_quit));
+
g_signal_connect(G_OBJECT(menuitem_open), "activate", G_CALLBACK(menuitem_open_callback), NULL);
g_signal_connect(G_OBJECT(menuitem_play), "activate", G_CALLBACK(menuitem_pause_callback), NULL);
g_signal_connect(G_OBJECT(menuitem_stop), "activate", G_CALLBACK(menuitem_stop_callback), NULL);
@@ -7664,9 +7836,24 @@ GtkWidget *create_window(gint windowid)
gtk_drag_dest_add_uri_targets(window);
//Connect the signal for DnD
g_signal_connect(G_OBJECT(window), "drag_data_received", G_CALLBACK(drop_callback), NULL);
@ -514,7 +548,7 @@ Don't monitor system volume when running in softvol mode
media = gmtk_media_player_new();
g_signal_connect_swapped(G_OBJECT(media), "media_state_changed",
G_CALLBACK(player_media_state_changed_callback), NULL);
@@ -7682,10 +7864,20 @@ GtkWidget *create_window(gint windowid)
@@ -7682,10 +7869,20 @@ GtkWidget *create_window(gint windowid)
media_label = gtk_label_new("");
gtk_widget_set_size_request(media_label, 300, 100);
gtk_label_set_ellipsize(GTK_LABEL(media_label), PANGO_ELLIPSIZE_END);
@ -535,7 +569,7 @@ Don't monitor system volume when running in softvol mode
details_table = gtk_table_new(20, 2, FALSE);
g_signal_connect(details_vbox, "show", G_CALLBACK(view_option_show_callback), NULL);
g_signal_connect(details_vbox, "size_allocate", G_CALLBACK(view_option_size_allocate_callback), NULL);
@@ -7717,7 +7909,12 @@ GtkWidget *create_window(gint windowid)
@@ -7717,7 +7914,12 @@ GtkWidget *create_window(gint windowid)
g_signal_connect(plvbox, "size_allocate", G_CALLBACK(view_option_size_allocate_callback), NULL);
//if (remember_loc)
// gtk_paned_set_position(GTK_PANED(pane),loc_panel_position);
@ -548,7 +582,7 @@ Don't monitor system volume when running in softvol mode
if (windowid == 0)
gtk_box_pack_start(GTK_BOX(vbox_master), menubar, FALSE, FALSE, 0);
gtk_widget_show(menubar);
@@ -7726,15 +7923,33 @@ GtkWidget *create_window(gint windowid)
@@ -7726,15 +7928,33 @@ GtkWidget *create_window(gint windowid)
gtk_container_add(GTK_CONTAINER(window), vbox_master);
icon_theme = gtk_icon_theme_get_default();
#ifdef GTK3_ENABLED
@ -591,7 +625,7 @@ Don't monitor system volume when running in softvol mode
#else
image_play = gtk_image_new_from_stock(GTK_STOCK_MEDIA_PLAY, button_size);
image_stop = gtk_image_new_from_stock(GTK_STOCK_MEDIA_STOP, button_size);
@@ -8390,6 +8605,10 @@ void show_fs_controls()
@@ -8390,6 +8610,10 @@ void show_fs_controls()
GdkScreen *screen;
GdkRectangle rect;
GtkAllocation alloc;
@ -602,7 +636,7 @@ Don't monitor system volume when running in softvol mode
if (fs_controls == NULL && fullscreen) {
fs_controls = gtk_window_new(GTK_WINDOW_POPUP);
gtk_widget_add_events(fs_controls, GDK_ENTER_NOTIFY_MASK);
@@ -8398,7 +8617,11 @@ void show_fs_controls()
@@ -8398,7 +8622,11 @@ void show_fs_controls()
g_signal_connect(G_OBJECT(fs_controls), "leave_notify_event", G_CALLBACK(fs_controls_left), NULL);
g_object_ref(hbox);
#ifdef GTK3_ENABLED
@ -615,7 +649,7 @@ Don't monitor system volume when running in softvol mode
#else
gtk_image_set_from_stock(GTK_IMAGE(image_fs), GTK_STOCK_LEAVE_FULLSCREEN, button_size);
#endif
@@ -8428,11 +8651,18 @@ void show_fs_controls()
@@ -8428,11 +8656,18 @@ void show_fs_controls()
void hide_fs_controls()
{