Skip to content

[Workbench] Add Rename Context Action #1569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WrapEarnPass wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[Workbench] Add Rename Context Action #1569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b29a498
Add util function for pretty icon menus
WrapEarnPass Jun 15, 2026
68f6d2d
Add rename wrapper from Projorg
WrapEarnPass Jun 15, 2026
f75f7fa
fix compile warning with wb_globals.h
WrapEarnPass Jun 15, 2026
bde2212
Rem unused vars
WrapEarnPass Jun 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion workbench/src/plugin_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <string.h>
#include <git2.h>

#include <wb_globals.h>
#include "wb_globals.h"

#include "sidebar.h"
#include "menu.h"
Expand Down
92 changes: 82 additions & 10 deletions workbench/src/popup_menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ static struct
GtkWidget *remove_bookmark;
GtkWidget *new_file;
GtkWidget *new_directory;
GtkWidget *rename;
GtkWidget *remove_file_or_dir;
} s_popup_menu;

Expand Down Expand Up @@ -98,6 +99,7 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event)
gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, FALSE);
gtk_widget_set_sensitive (s_popup_menu.new_file, FALSE);
gtk_widget_set_sensitive (s_popup_menu.new_directory, FALSE);
gtk_widget_set_sensitive (s_popup_menu.rename, FALSE);
gtk_widget_set_sensitive (s_popup_menu.remove_file_or_dir, FALSE);
break;
case POPUP_CONTEXT_DIRECTORY:
Expand All @@ -120,6 +122,7 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event)
gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, FALSE);
gtk_widget_set_sensitive (s_popup_menu.new_file, TRUE);
gtk_widget_set_sensitive (s_popup_menu.new_directory, TRUE);
gtk_widget_set_sensitive (s_popup_menu.rename, TRUE);
gtk_widget_set_sensitive (s_popup_menu.remove_file_or_dir, TRUE);
break;
case POPUP_CONTEXT_SUB_DIRECTORY:
Expand All @@ -142,6 +145,7 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event)
gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, TRUE);
gtk_widget_set_sensitive (s_popup_menu.new_file, TRUE);
gtk_widget_set_sensitive (s_popup_menu.new_directory, TRUE);
gtk_widget_set_sensitive (s_popup_menu.rename, TRUE);
gtk_widget_set_sensitive (s_popup_menu.remove_file_or_dir, TRUE);
break;
case POPUP_CONTEXT_FILE:
Expand All @@ -164,6 +168,7 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event)
gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, TRUE);
gtk_widget_set_sensitive (s_popup_menu.new_file, TRUE);
gtk_widget_set_sensitive (s_popup_menu.new_directory, TRUE);
gtk_widget_set_sensitive (s_popup_menu.rename, TRUE);
gtk_widget_set_sensitive (s_popup_menu.remove_file_or_dir, TRUE);
break;
case POPUP_CONTEXT_BACKGROUND:
Expand All @@ -186,6 +191,7 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event)
gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, FALSE);
gtk_widget_set_sensitive (s_popup_menu.new_file, FALSE);
gtk_widget_set_sensitive (s_popup_menu.new_directory, FALSE);
gtk_widget_set_sensitive (s_popup_menu.rename, FALSE);
gtk_widget_set_sensitive (s_popup_menu.remove_file_or_dir, FALSE);
break;
case POPUP_CONTEXT_WB_BOOKMARK:
Expand All @@ -208,6 +214,7 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event)
gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, FALSE);
gtk_widget_set_sensitive (s_popup_menu.new_file, FALSE);
gtk_widget_set_sensitive (s_popup_menu.new_directory, FALSE);
gtk_widget_set_sensitive (s_popup_menu.rename, FALSE);
gtk_widget_set_sensitive (s_popup_menu.remove_file_or_dir, FALSE);
break;
case POPUP_CONTEXT_PRJ_BOOKMARK:
Expand All @@ -230,6 +237,7 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event)
gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, FALSE);
gtk_widget_set_sensitive (s_popup_menu.new_file, FALSE);
gtk_widget_set_sensitive (s_popup_menu.new_directory, FALSE);
gtk_widget_set_sensitive (s_popup_menu.rename, FALSE);
gtk_widget_set_sensitive (s_popup_menu.remove_file_or_dir, FALSE);
break;
}
Expand Down Expand Up @@ -568,7 +576,7 @@ static void popup_menu_on_subdir_close_all (G_GNUC_UNUSED GtkMenuItem *menuitem,
}


/* Handle popup menu item "Create new file here..." */
/* Handle popup menu item "New File..." */
static void popup_menu_on_new_file(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data)
{
gchar *filename, *path = NULL, *abs_path = NULL;
Expand Down Expand Up @@ -622,7 +630,7 @@ static void popup_menu_on_new_file(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_U
}


/* Handle popup menu item "Create new directory here..." */
/* Handle popup menu item "New Directory..." */
static void popup_menu_on_new_directory(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data)
{
gchar *filename, *path = NULL, *abs_path = NULL;
Expand Down Expand Up @@ -659,7 +667,69 @@ static void popup_menu_on_new_directory(G_GNUC_UNUSED GtkMenuItem *menuitem, G_G
}


/* Handle popup menu item "Remove..." */
/* Handle popup menu Rename */
static void popup_menu_on_rename(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data)
{
gchar *path = NULL, *abs_path = NULL;
SIDEBAR_CONTEXT context;

/* Check if a file, a sub-dir or a directory is selected. */
if (sidebar_file_view_get_selected_context(&context))
{
if (context.file != NULL)
{
path=g_path_get_dirname(context.file);
abs_path = g_strdup(context.file);
}
else if (context.subdir != NULL)
{
path = g_path_get_dirname(context.subdir);
abs_path = g_strdup(context.subdir);
}
else if (context.directory != NULL)
{
path = wb_project_dir_get_base_dir(context.directory);
abs_path = get_combined_path(wb_project_get_filename(context.project), path);
}
}

if (abs_path == NULL )
{
//this should be safe, as abs_path depends on path being non-null
return;
}

gchar *base_name = g_path_get_basename(abs_path);
gchar *newname = dialogs_show_input(_("Rename"), GTK_WINDOW(wb_globals.geany_plugin->geany_data->main_widgets->window),
_("New name:"), base_name);
g_free(base_name);
if (newname != NULL)
{
gchar *newpath = g_build_path(G_DIR_SEPARATOR_S, path, newname, NULL);
if (rename_file_or_dir(abs_path, newpath))
{
if (workbench_get_enable_live_update(wb_globals.opened_wb) == FALSE)
{
/* Live update is disabled. We need to update the file list and
the sidebar manually. */
wb_project_dir_rescan(context.project, context.directory);
sidebar_update(SIDEBAR_CONTEXT_DIRECTORY_RESCANNED, &context);
}
}
else
{
dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Cannot rename '%s' to '%s'."),
abs_path, newpath);
}
g_free(newpath);
g_free(newname);
}
g_free(abs_path);
g_free(path);
}


/* Handle popup menu item "Delete" */
static void popup_menu_on_remove_file_or_dir(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data)
{
gboolean remove_it, dir, removed_any = FALSE;
Expand Down Expand Up @@ -787,7 +857,7 @@ static void popup_menu_on_remove_file_or_dir(G_GNUC_UNUSED GtkMenuItem *menuitem
}

/* If anything was removed update the filelist and sidebar. */
if (removed_any)
if (removed_any && workbench_get_enable_live_update(wb_globals.opened_wb) == FALSE)
{
wb_project_dir_rescan(context.project, context.directory);
sidebar_update(SIDEBAR_CONTEXT_DIRECTORY_RESCANNED, &context);
Expand Down Expand Up @@ -941,20 +1011,22 @@ void popup_menu_init(void)
gtk_widget_show(item);
gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item);

item = gtk_menu_item_new_with_mnemonic(_("_Create file here..."));
gtk_widget_show(item);
item = menu_item_new("document-new", _("New File..."));
gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item);
g_signal_connect(item, "activate", G_CALLBACK(popup_menu_on_new_file), NULL);
s_popup_menu.new_file = item;

item = gtk_menu_item_new_with_mnemonic(_("_Create directory here..."));
gtk_widget_show(item);
item = menu_item_new("folder-new", _("New Directory..."));
gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item);
g_signal_connect(item, "activate", G_CALLBACK(popup_menu_on_new_directory), NULL);
s_popup_menu.new_directory = item;

item = gtk_menu_item_new_with_mnemonic(_("_Remove..."));
gtk_widget_show(item);
item = menu_item_new("document-save-as", _("Rename..."));
gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item);
g_signal_connect((gpointer) item, "activate", G_CALLBACK(popup_menu_on_rename), NULL);
s_popup_menu.rename = item;

item = menu_item_new("edit-delete", _("Delete"));
gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item);
g_signal_connect(item, "activate", G_CALLBACK(popup_menu_on_remove_file_or_dir), NULL);
s_popup_menu.remove_file_or_dir = item;
Expand Down
58 changes: 57 additions & 1 deletion workbench/src/utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,11 @@ void close_all_files_in_list(GPtrArray *list)
}
}


/** Check if a given path has a .git
*
* @param path gchar* containing a directory path.
*
**/
gboolean is_git_repository(gchar *path)
{
gboolean is_git_repo;
Expand All @@ -305,3 +309,55 @@ gboolean is_git_repository(gchar *path)

return is_git_repo;
}


/** Helper function to assemble a gtk_image_menu, auto sets show.
*
* @param icon_name gchar* containing an icon name.
* @param label gchar* with the label to use (supports mnemonic).
*
**/
GtkWidget *menu_item_new(const gchar *icon_name, const gchar *label)
{
GtkWidget *item = gtk_image_menu_item_new_with_mnemonic(label);

if (icon_name != NULL)
{
GtkWidget *image = gtk_image_new_from_icon_name(icon_name, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
gtk_widget_show(image);
}
gtk_widget_show(item);
return item;
}


/** Helper function to rename a file/directory
*
* @param utf8_oldname gchar* existing GeanyDoc path, or raw file, directory path
* @param utf8_newname gchar* target new name
*
**/
gboolean rename_file_or_dir(gchar *utf8_oldname, gchar *utf8_newname)
{
GeanyDocument *doc = document_find_by_filename(utf8_oldname);
if (doc)
{
/* This is a geany doc, and per
https://www.geany.org/manual/reference/document_8h.html#a7b93bc4d0551af19c8852df52f9c126c
both functions have to be called to update geany's model */
document_rename_file(doc, utf8_newname);
return document_save_file_as(doc, utf8_newname);
}
else
{
/* this request is for a non-opened doc or directory.
use the g_rename os wrapper */
gchar *oldname = utils_get_locale_from_utf8(utf8_oldname);
gchar *newname = utils_get_locale_from_utf8(utf8_newname);
gint res = g_rename(oldname, newname);
g_free(oldname);
g_free(newname);
return res == 0;
}
}
2 changes: 2 additions & 0 deletions workbench/src/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,7 @@ gchar *get_any_relative_path (const gchar *base, const gchar *target);
void open_all_files_in_list(GPtrArray *list);
void close_all_files_in_list(GPtrArray *list);
gboolean is_git_repository(gchar *path);
GtkWidget *menu_item_new(const gchar *icon_name, const gchar *label);
gboolean rename_file_or_dir(gchar *utf8_oldname, gchar *utf8_newname);

#endif
2 changes: 1 addition & 1 deletion workbench/src/wb_project.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#endif

#include <geanyplugin.h>
#include <../../utils/src/filelist.h>
#include <utils/src/filelist.h>
#include "wb_globals.h"
#include "wb_project.h"
#include "sidebar.h"
Expand Down