add shortcut titles/processing
authorMaksym Veremeyenko <verem@m1stereo.tv>
Sat, 25 Jun 2011 08:32:15 +0000 (11:32 +0300)
committerMaksym Veremeyenko <verem@m1stereo.tv>
Sat, 25 Jun 2011 08:32:15 +0000 (11:32 +0300)
src/omnplay.cpp
src/ui.c
src/ui_buttons.c

index d1dc906..8213402 100644 (file)
@@ -1093,6 +1093,20 @@ static gboolean on_playlist_grid_key(GtkWidget *widget, GdkEventKey *event, gpoi
                 return TRUE;
             };
             break;
+        case GDK_KEY_uparrow:
+            if(event->state & GDK_CONTROL_MASK)
+            {
+                omnplay_playlist_item_swap(app, -1);
+                return TRUE;
+            };
+            break;
+        case GDK_KEY_downarrow:
+            if(event->state & GDK_CONTROL_MASK)
+            {
+                omnplay_playlist_item_swap(app, -1);
+                return TRUE;
+            };
+            break;
         case GDK_KEY_space:
             omnplay_ctl(app, BUTTON_PLAYER_PLAY);
             return TRUE;
@@ -1105,7 +1119,8 @@ static gboolean on_playlist_grid_key(GtkWidget *widget, GdkEventKey *event, gpoi
         case GDK_KEY_Delete:
             omnplay_playlist_item_del(app);
             return TRUE;
-        case GDK_KEY_BackSpace:
+        case GDK_E:
+        case GDK_e:
             omnplay_playlist_item_edit(app);
             return TRUE;
     };
@@ -1157,6 +1172,12 @@ static gboolean on_library_grid_key(GtkWidget *widget, GdkEventKey *event, gpoin
                 return TRUE;
             };
             break;
+        case GDK_KEY_BackSpace:
+            omnplay_library_add(app, 0);
+            return TRUE;
+        case GDK_KEY_F5:
+            omnplay_library_refresh(app);
+            return TRUE;
     };
 
     return FALSE;
index 50da745..674fcbc 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -720,8 +720,8 @@ void ui_library_refresh(omnplay_instance_t* app, GtkWidget **p_win, GtkWidget **
     win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
     gtk_window_set_title(GTK_WINDOW(win), _("Library refreshing..."));
     gtk_window_set_default_size(GTK_WINDOW(win), 250, 100);
-    gtk_window_set_modal(GTK_WINDOW(win), TRUE);
-    gtk_window_set_transient_for(GTK_WINDOW(win), GTK_WINDOW(app->window));
+//    gtk_window_set_modal(GTK_WINDOW(win), TRUE);
+//    gtk_window_set_transient_for(GTK_WINDOW(win), GTK_WINDOW(app->window));
 //    gtk_window_set_deletable(GTK_WINDOW(win), FALSE);
 //    gtk_window_set_resizable(GTK_WINDOW(win), FALSE);
 
index 4d0f35e..99b6a5b 100644 (file)
@@ -52,7 +52,7 @@ static const button_desc_t buttons[] =
 {
     {
         BUTTON_PLAYLIST_ITEM_ADD,
-        "Add item to playlist",
+        "Add item to playlist (Insert)",
         NULL,
         NULL,
         "button_playlist_add",
@@ -60,7 +60,7 @@ static const button_desc_t buttons[] =
     },
     {
         BUTTON_PLAYLIST_ITEM_EDIT,
-        "Edit item in playlist",
+        "Edit item in playlist (E)",
         NULL,
         NULL,
         "button_playlist_edit",
@@ -68,7 +68,7 @@ static const button_desc_t buttons[] =
     },
     {
         BUTTON_PLAYLIST_ITEM_DEL,
-        "Delete item from playlist",
+        "Delete item from playlist (Del)",
         NULL,
         NULL,
         "button_playlist_del",
@@ -76,7 +76,7 @@ static const button_desc_t buttons[] =
     },
     {
         BUTTON_PLAYLIST_ITEM_UP,
-        "Move item ebove",
+        "Move item ebove (Ctrl-UP)",
         NULL,
         NULL,
         "button_playlist_up",
@@ -84,7 +84,7 @@ static const button_desc_t buttons[] =
     },
     {
         BUTTON_PLAYLIST_ITEM_DOWN,
-        "Move item below",
+        "Move item below (Ctrl-DOWN)",
         NULL,
         NULL,
         "button_playlist_down",
@@ -92,7 +92,7 @@ static const button_desc_t buttons[] =
     },
     {
         BUTTON_PLAYLIST_LOAD,
-        "Load playlist",
+        "Load playlist (Ctrl-O)",
         NULL,
         NULL,
         "button_playlist_load",
@@ -100,7 +100,7 @@ static const button_desc_t buttons[] =
     },
     {
         BUTTON_PLAYLIST_SAVE,
-        "Save playlist",
+        "Save playlist (Ctrl-S)",
         NULL,
         NULL,
         "button_playlist_load",
@@ -124,7 +124,7 @@ static const button_desc_t buttons[] =
     },
     {
         BUTTON_PLAYER_CUE,
-        "Cue block",
+        "Cue block (Enter)",
         NULL,
         NULL,
         "button_playlist_cue",
@@ -132,7 +132,7 @@ static const button_desc_t buttons[] =
     },
     {
         BUTTON_PLAYER_PLAY,
-        "Play",
+        "Play (Space)",
         NULL,
         NULL,
         "button_playlist_play",
@@ -156,7 +156,7 @@ static const button_desc_t buttons[] =
     },
     {
         BUTTON_LIBRARY_ADD,
-        "Add to playlist",
+        "Add to playlist (Enter)",
         NULL,
         NULL,
         "button_library_add",
@@ -164,7 +164,7 @@ static const button_desc_t buttons[] =
     },
     {
         BUTTON_LIBRARY_REFRESH,
-        "Refresh library",
+        "Refresh library (F5)",
         NULL,
         NULL,
         "button_library_refresh",