append only the mode for double click of fileslist

diff --git a/src/interface.c b/src/interface.c
index f28b2e6..d149f51 100644 (file)
--- a/src/interface.c
+++ b/src/interface.c
@@ -759,12 +759,6 @@ create_page_operate (void)
   GtkWidget *vbox8;
   GtkWidget *hbox26;
   GtkWidget *label_directory;
-  GtkWidget *optionmenu1;
-  GtkWidget *menu1;
-  GtkWidget *mode_0;
-  GtkWidget *mode_1;
-  GtkWidget *mode_2;
-  GtkWidget *mode_3;
   GtkWidget *hpaned1;
        GtkWidget *hpaned0;
        GtkWidget *frame1, *frame2;
@@ -808,31 +802,6 @@ create_page_operate (void)
   gtk_box_pack_start (GTK_BOX (hbox26), label_directory, TRUE, TRUE, 0);
   gtk_misc_set_alignment (GTK_MISC (label_directory), 0, 0.5);
 
-  optionmenu1 = gtk_option_menu_new ();
-  gtk_widget_show (optionmenu1);
-  gtk_box_pack_start (GTK_BOX (hbox26), optionmenu1, FALSE, FALSE, 0);
-  GTK_WIDGET_UNSET_FLAGS (optionmenu1, GTK_CAN_FOCUS);
-
-  menu1 = gtk_menu_new ();
-
-  mode_0 = gtk_menu_item_new_with_mnemonic (_("Play"));
-  gtk_widget_show (mode_0);
-  gtk_container_add (GTK_CONTAINER (menu1), mode_0);
-
-  mode_1 = gtk_menu_item_new_with_mnemonic (_("Load"));
-  gtk_widget_show (mode_1);
-  gtk_container_add (GTK_CONTAINER (menu1), mode_1);
-
-  mode_2 = gtk_menu_item_new_with_mnemonic (_("Append"));
-  gtk_widget_show (mode_2);
-  gtk_container_add (GTK_CONTAINER (menu1), mode_2);
-
-  mode_3 = gtk_menu_item_new_with_mnemonic (_("Insert"));
-  gtk_widget_show (mode_3);
-  gtk_container_add (GTK_CONTAINER (menu1), mode_3);
-
-  gtk_option_menu_set_menu (GTK_OPTION_MENU (optionmenu1), menu1);
-
   hpaned1 = gtk_hpaned_new ();
   gtk_widget_show (hpaned1);
   gtk_box_pack_start (GTK_BOX (vbox8), hpaned1, TRUE, TRUE, 0);
@@ -852,12 +821,6 @@ create_page_operate (void)
   GLADE_HOOKUP_OBJECT (page_clips, vbox8, "vbox8");
   GLADE_HOOKUP_OBJECT (page_clips, hbox26, "hbox26");
   GLADE_HOOKUP_OBJECT (page_clips, label_directory, "label_directory");
-  GLADE_HOOKUP_OBJECT (page_clips, optionmenu1, "optionmenu1");
-  GLADE_HOOKUP_OBJECT (page_clips, menu1, "menu1");
-  GLADE_HOOKUP_OBJECT (page_clips, mode_0, "mode_0");
-  GLADE_HOOKUP_OBJECT (page_clips, mode_1, "mode_1");
-  GLADE_HOOKUP_OBJECT (page_clips, mode_2, "mode_2");
-  GLADE_HOOKUP_OBJECT (page_clips, mode_3, "mode_3");
   GLADE_HOOKUP_OBJECT (page_clips, hpaned1, "hpaned1");
 
   return page_clips;

diff --git a/src/page_clips.c b/src/page_clips.c
index eb7a088..1a69411 100644 (file)
--- a/src/page_clips.c
+++ b/src/page_clips.c
@@ -43,10 +43,6 @@ typedef struct
        int unit;
        int generation;
        int clip;
-       
-       // TODO: This comes out later
-       int mode;
-       GtkWidget *modes[ 4 ];
 
        struct page_t *parent_page;
 }
@@ -266,35 +262,7 @@ static gboolean on_ok( GtkWidget *dummy, gpointer data )
                        char *temp = malloc( strlen( this->path ) + strlen( text ) + 1 );
                        strcpy( temp, this->path );
                        strcat( temp, text );
-                       switch( this->mode )
-                       {
-                               case 0:
-                                       mvcp_unit_load_back( this->dv, dv1394app_get_selected_unit( this->app ), temp );
-                                       mvcp_unit_play( this->dv, dv1394app_get_selected_unit( this->app ) );
-                                       break;
-                               case 1: 
-                                       mvcp_unit_load( this->dv, dv1394app_get_selected_unit( this->app ), temp );
-                                       break;
-                               case 2: 
-                                       mvcp_unit_append( this->dv, dv1394app_get_selected_unit( this->app ), temp, -1, -1 );
-                                       break;
-                               case 3:
-                               {
-                                       GtkWidget *widget = lookup_widget( this_page_get_widget( this ), "treeview1" );
-                                       GtkTreeSelection *select = gtk_tree_view_get_selection( GTK_TREE_VIEW( widget ) );
-                                       GtkTreeModel *model;
-                                       GtkTreeIter iter;
-                                       int clip;
-                                       
-                                       if ( gtk_tree_selection_get_selected( select, &model, &iter ) )
-                                       {
-                                               gtk_tree_model_get( model, &iter, 5, &clip,     -1 );
-                                               mvcp_unit_clip_insert( this->dv, dv1394app_get_selected_unit( this->app ), mvcp_absolute, clip, temp, -1, -1 );
-                                       }
-                                       break;
-                               }
-                       }
-                       
+                       mvcp_unit_append( this->dv, dv1394app_get_selected_unit( this->app ), temp, -1, -1 );
                        free( temp );
                }
                        
@@ -476,18 +444,6 @@ static gboolean on_clean( GtkWidget *dummy, gpointer data )
        return TRUE;
 }
 
-void on_mode_change( GtkMenuItem *menuitem, gpointer data )
-{
-       page_clips this = data;
-       int index = 0;
-       
-       for ( index = 0; index < 4; index ++ )
-               if ( GTK_WIDGET( menuitem ) == this->modes[ index ] )
-                       break;
-       
-       this->mode = index;
-}
-
 static GtkWidget *this_page_get_widget( page_clips this )
 {
        if ( this->widget == NULL )
@@ -540,7 +496,6 @@ page page_clips_init( dv1394app app, struct page_t *parent_page)
 {
        page_clips this = calloc( 1, sizeof( page_clips_t ) );
        GtkWidget *widget;
-       int index = 0;
 
        this->parent_page = parent_page;
        this->parent.get_widget = ( GtkWidget *(*)( page ) )this_page_get_widget;
@@ -579,14 +534,5 @@ page page_clips_init( dv1394app app, struct page_t *parent_page)
        g_signal_connect( G_OBJECT( widget ), "button-press-event", G_CALLBACK( on_queue_selected ), this );
        g_signal_connect( G_OBJECT( widget ), "key-press-event", G_CALLBACK( on_queue_key_press ), this );
 
-       for ( index = 0; index < 4; index ++ )
-       {
-               char item[ 256 ];
-               sprintf( item, "mode_%d", index );
-               widget = lookup_widget( this_page_get_widget( this ), item );
-               gtk_signal_connect( GTK_OBJECT( widget ), "activate", GTK_SIGNAL_FUNC( on_mode_change ), this );
-               this->modes[ index ] = widget;
-       }
-       
        return ( page )this;
 }