Fix sensitivity of popup menus menuitems

dagargo · Jul 15, 2021 · 950d262 · 950d262
1 parent 5593f46
commit 950d262
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 23 deletions.
diff --git a/src/browser.h b/src/browser.h
@@ -33,7 +33,6 @@ struct browser
  gint (*delete) (const gchar *, const gchar);
  GSourceFunc load_dir;
  GSourceFunc check_selection;
- void (*set_up_menu) (gint);
  GtkTreeView *view;
  GtkWidget *up_button;
  GtkWidget *add_dir_button;

diff --git a/src/elektroid.c b/src/elektroid.c
@@ -912,23 +912,6 @@ elektroid_rename_item (GtkWidget * object, gpointer data)
  gtk_widget_hide (GTK_WIDGET (name_dialog));
 }
 
-void
-elektroid_local_menu_set_up (gint count)
-{
- gtk_widget_set_sensitive (local_show_menuitem, count <= 1 ? TRUE : FALSE);
- gtk_widget_set_sensitive (local_rename_menuitem, count == 1 ? TRUE : FALSE);
- gtk_widget_set_sensitive (local_delete_menuitem, count > 0 ? TRUE : FALSE);
- gtk_widget_set_sensitive (upload_menuitem, connector_check (&connector));
-}
-
-void
-elektroid_remote_menu_set_up (gint count)
-{
- gtk_widget_set_sensitive (remote_rename_menuitem,
- count == 1 ? TRUE : FALSE);
- gtk_widget_set_sensitive (remote_delete_menuitem, count > 0 ? TRUE : FALSE);
-}
-
 static gboolean
 elektroid_drag_begin (GtkWidget * widget,
  GdkDragContext * context, gpointer data)
@@ -1207,6 +1190,12 @@ elektroid_stop_task_thread ()
 static gboolean
 elektroid_remote_check_selection (gpointer data)
 {
+ gint count = browser_get_selected_items_count (&remote_browser);
+
+ gtk_widget_set_sensitive (remote_rename_menuitem, count == 1);
+ gtk_widget_set_sensitive (remote_delete_menuitem, count > 0 ? TRUE : FALSE);
+ gtk_widget_set_sensitive (download_menuitem, count > 0);
+
  return FALSE;
 }
 
@@ -1247,6 +1236,11 @@ elektroid_local_check_selection (gpointer data)
  g_free (name);
  }
 
+ gtk_widget_set_sensitive (local_show_menuitem, count <= 1);
+ gtk_widget_set_sensitive (local_rename_menuitem, count == 1);
+ gtk_widget_set_sensitive (local_delete_menuitem, count > 0);
+ gtk_widget_set_sensitive (upload_menuitem, count > 0);
+
  return FALSE;
 }
 
@@ -2448,7 +2442,6 @@ elektroid_common_key_press (GtkWidget * widget, GdkEventKey * event,
  if (event->keyval == GDK_KEY_Menu)
  {
  count = browser_get_selected_items_count (browser);
- browser->set_up_menu (count);
  gtk_widget_get_allocation (GTK_WIDGET (browser->view), &allocation);
  gdk_window = gtk_widget_get_window (GTK_WIDGET (browser->view));
  gtk_menu_popup_at_rect (browser->menu, gdk_window, &allocation,
@@ -3078,8 +3071,7 @@ elektroid_run (int argc, char *argv[], gchar * local_dir)
  .check_selection = elektroid_remote_check_selection,
  .rename = elektroid_remote_rename,
  .delete = elektroid_remote_delete,
- .mkdir = elektroid_remote_mkdir,
- .set_up_menu = elektroid_remote_menu_set_up
+ .mkdir = elektroid_remote_mkdir
  };
 
  g_signal_connect (gtk_tree_view_get_selection (remote_browser.view),
@@ -3153,8 +3145,7 @@ elektroid_run (int argc, char *argv[], gchar * local_dir)
  .check_selection = elektroid_local_check_selection,
  .rename = elektroid_local_rename,
  .delete = elektroid_local_delete,
- .mkdir = elektroid_local_mkdir,
- .set_up_menu = elektroid_local_menu_set_up
+ .mkdir = elektroid_local_mkdir
  };
 
  g_signal_connect (gtk_tree_view_get_selection (local_browser.view),