summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar waker <wakeroid@gmail.com>2012-09-11 21:18:21 +0200
committerGravatar waker <wakeroid@gmail.com>2012-09-11 21:18:21 +0200
commite3784e72ffa60e2acb893e401155663560ee68d0 (patch)
tree24b5d3a808fe4f2a0084321eacc41248f7a1e6d8
parent2095bdf4bc4ee8abdd056291131605a57ed631f5 (diff)
gtkui: disable global keyboard handler in trkproperties, fix editing using enter key, cancelling using esc key, clipboard using ctrl/shift+ins, etc
-rw-r--r--plugins/gtkui/ddbcellrenderertextmultiline.c2
-rw-r--r--plugins/gtkui/trkproperties.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/plugins/gtkui/ddbcellrenderertextmultiline.c b/plugins/gtkui/ddbcellrenderertextmultiline.c
index a6493f92..8dc913a2 100644
--- a/plugins/gtkui/ddbcellrenderertextmultiline.c
+++ b/plugins/gtkui/ddbcellrenderertextmultiline.c
@@ -126,7 +126,6 @@ static gboolean ddb_cell_editable_text_view_real_key_press_event (GtkWidget* bas
static void ddb_cell_editable_text_view_real_start_editing (GtkCellEditable* base, GdkEvent* event) {
DdbCellEditableTextView * self;
self = (DdbCellEditableTextView*) base;
- g_return_if_fail (event != NULL);
}
#if GTK_CHECK_VERSION(2,20,0)
@@ -373,7 +372,6 @@ static GtkCellEditable* ddb_cell_renderer_text_multiline_real_start_editing (Gtk
DdbCellEditableTextView* _tmp41_;
DdbCellEditableTextView* _tmp42_;
self = (DdbCellRendererTextMultiline*) base;
- g_return_val_if_fail (event != NULL, NULL);
g_return_val_if_fail (widget != NULL, NULL);
g_return_val_if_fail (path != NULL, NULL);
g_return_val_if_fail (background_area != NULL, NULL);
diff --git a/plugins/gtkui/trkproperties.c b/plugins/gtkui/trkproperties.c
index 74bd3a32..7d46e036 100644
--- a/plugins/gtkui/trkproperties.c
+++ b/plugins/gtkui/trkproperties.c
@@ -196,18 +196,23 @@ on_trackproperties_key_press_event (GtkWidget *widget,
GdkEventKey *event,
gpointer user_data)
{
+#if 0
if (event->keyval == GDK_Escape) {
+ printf ("trkproperties esc\n");
on_trackproperties_delete_event (trackproperties, NULL, NULL);
return TRUE;
}
else if (event->keyval == GDK_Delete) {
+ printf ("trkproperties del\n");
on_remove_field_activate (NULL, NULL);
return FALSE;
}
else if (event->keyval == GDK_Insert) {
+ printf ("trkproperties ins\n");
on_add_field_activate (NULL, NULL);
return TRUE;
}
+#endif
return FALSE;
}