From 5ae0e60620b5961a0ab6adcd0558263501073fbd Mon Sep 17 00:00:00 2001 From: Alexey Yakovenko Date: Thu, 31 Dec 2009 14:53:44 +0100 Subject: tweaks to track properties window --- plugins/gtkui/callbacks.c | 11 +++++++++++ plugins/gtkui/callbacks.h | 5 +++++ plugins/gtkui/deadbeef.glade | 26 +++++++++++++------------- plugins/gtkui/interface.c | 18 ++++++++++++++++-- 4 files changed, 45 insertions(+), 15 deletions(-) diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c index f73548a9..b6d03c97 100644 --- a/plugins/gtkui/callbacks.c +++ b/plugins/gtkui/callbacks.c @@ -2367,6 +2367,17 @@ on_properties1_activate (GtkMenuItem *menuitem, gtk_widget_show (widget); } +gboolean +on_trackproperties_key_press_event (GtkWidget *widget, + GdkEventKey *event, + gpointer user_data) +{ + if (event->keyval == GDK_Escape) { + gtk_widget_destroy (widget); + } + return FALSE; +} + void diff --git a/plugins/gtkui/callbacks.h b/plugins/gtkui/callbacks.h index 0ce5cf49..d6332190 100644 --- a/plugins/gtkui/callbacks.h +++ b/plugins/gtkui/callbacks.h @@ -769,3 +769,8 @@ gboolean on_searchwin_window_state_event (GtkWidget *widget, GdkEventWindowState *event, gpointer user_data); + +gboolean +on_trackproperties_key_press_event (GtkWidget *widget, + GdkEventKey *event, + gpointer user_data); diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade index f3df317f..1ed6b1d5 100644 --- a/plugins/gtkui/deadbeef.glade +++ b/plugins/gtkui/deadbeef.glade @@ -1344,8 +1344,8 @@ True True True - False - False + True + True GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST True @@ -1395,8 +1395,8 @@ True False True - False - False + True + True GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST True @@ -2525,8 +2525,8 @@ SOCKS5_HOSTNAME True True True - False - False + True + True GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST True @@ -2628,8 +2628,8 @@ SOCKS5_HOSTNAME True False True - False - False + True + True GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST True @@ -2835,16 +2835,17 @@ Example: %a - %t [%l] Track Properties GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE - True + False True - False + True True - False - False + True + True GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST True False + @@ -3281,7 +3282,6 @@ Example: %a - %t [%l] 6 7 fill - diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c index 27795a21..b4a8a0ed 100644 --- a/plugins/gtkui/interface.c +++ b/plugins/gtkui/interface.c @@ -1182,6 +1182,8 @@ create_helpwindow (void) gtk_window_set_title (GTK_WINDOW (helpwindow), "Help"); gtk_window_set_modal (GTK_WINDOW (helpwindow), TRUE); gtk_window_set_destroy_with_parent (GTK_WINDOW (helpwindow), TRUE); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (helpwindow), TRUE); + gtk_window_set_skip_pager_hint (GTK_WINDOW (helpwindow), TRUE); scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL); gtk_widget_show (scrolledwindow1); @@ -1262,6 +1264,8 @@ create_prefwin (void) gtk_widget_set_size_request (prefwin, 642, 372); gtk_window_set_title (GTK_WINDOW (prefwin), "Preferences"); gtk_window_set_modal (GTK_WINDOW (prefwin), TRUE); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (prefwin), TRUE); + gtk_window_set_skip_pager_hint (GTK_WINDOW (prefwin), TRUE); notebook2 = gtk_notebook_new (); gtk_widget_show (notebook2); @@ -1781,6 +1785,8 @@ create_addlocation (void) gtk_window_set_title (GTK_WINDOW (addlocation), "Add Location"); gtk_window_set_modal (GTK_WINDOW (addlocation), TRUE); gtk_window_set_destroy_with_parent (GTK_WINDOW (addlocation), TRUE); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (addlocation), TRUE); + gtk_window_set_skip_pager_hint (GTK_WINDOW (addlocation), TRUE); vbox7 = gtk_vbox_new (FALSE, 0); gtk_widget_show (vbox7); @@ -1847,6 +1853,8 @@ create_inputformat (void) inputformat = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (inputformat), "Column Format"); gtk_window_set_modal (GTK_WINDOW (inputformat), TRUE); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (inputformat), TRUE); + gtk_window_set_skip_pager_hint (GTK_WINDOW (inputformat), TRUE); gtk_window_set_type_hint (GTK_WINDOW (inputformat), GDK_WINDOW_TYPE_HINT_DIALOG); vbox8 = gtk_vbox_new (FALSE, 0); @@ -1954,7 +1962,9 @@ create_trackproperties (void) trackproperties = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (trackproperties), "Track Properties"); - gtk_window_set_modal (GTK_WINDOW (trackproperties), TRUE); + gtk_window_set_destroy_with_parent (GTK_WINDOW (trackproperties), TRUE); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (trackproperties), TRUE); + gtk_window_set_skip_pager_hint (GTK_WINDOW (trackproperties), TRUE); table7 = gtk_table_new (7, 2, FALSE); gtk_widget_show (table7); @@ -2088,7 +2098,7 @@ create_trackproperties (void) gtk_widget_show (scrolledwindow4); gtk_table_attach (GTK_TABLE (table7), scrolledwindow4, 1, 2, 6, 7, (GtkAttachOptions) (GTK_FILL), - (GtkAttachOptions) (0), 0, 0); + (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), 0, 0); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow4), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow4), GTK_SHADOW_IN); @@ -2097,6 +2107,10 @@ create_trackproperties (void) gtk_container_add (GTK_CONTAINER (scrolledwindow4), comment); gtk_text_view_set_editable (GTK_TEXT_VIEW (comment), FALSE); + g_signal_connect ((gpointer) trackproperties, "key_press_event", + G_CALLBACK (on_trackproperties_key_press_event), + NULL); + /* Store pointers to all widgets, for use by lookup_widget(). */ GLADE_HOOKUP_OBJECT_NO_REF (trackproperties, trackproperties, "trackproperties"); GLADE_HOOKUP_OBJECT (trackproperties, table7, "table7"); -- cgit v1.2.3