Plugins-Commits January 2018

plugins-commits@lists.geany.org

1 participants
44 discussions

[geany/geany-plugins] aead2f: GeanyVC: Remember the commit dialog size
by Enrico Tröger 20 Jan '18

20 Jan '18

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sat, 20 Jan 2018 12:40:40 UTC Commit: aead2f13c7a63548da0cf8079496ba98a8eb3257 https://github.com/geany/geany-plugins/commit/aead2f13c7a63548da0cf8079496b… Log Message: ----------- GeanyVC: Remember the commit dialog size Modified Paths: -------------- geanyvc/src/geanyvc.c Modified: geanyvc/src/geanyvc.c 21 lines changed, 21 insertions(+), 0 deletions(-) =================================================================== @@ -82,6 +82,8 @@ static gboolean set_maximize_commit_dialog; static gboolean set_external_diff; static gboolean set_editor_menu_entries; static gboolean set_menubar_entry; +static gint commit_dialog_width = 0; +static gint commit_dialog_height = 0; static gchar *config_file; @@ -1598,6 +1600,8 @@ vccommit_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer else { gtk_widget_set_size_request(commit, 700, 500); + gtk_window_set_default_size(GTK_WINDOW(commit), + commit_dialog_width, commit_dialog_height); } gtk_widget_show_now(commit); @@ -1635,6 +1639,9 @@ vccommit_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer } g_free(message); } + /* remember commit dialog widget size */ + gtk_window_get_size(GTK_WINDOW(commit), + &commit_dialog_width, &commit_dialog_height); gtk_widget_destroy(commit); free_commit_list(lst); @@ -1812,6 +1819,14 @@ save_config(void) g_key_file_set_string(config, "VC", "spellchecking_language", lang); #endif + if (commit_dialog_width > 0 && commit_dialog_height > 0) + { + g_key_file_set_integer(config, "CommitDialog", + "commit_dialog_width", commit_dialog_width); + g_key_file_set_integer(config, "CommitDialog", + "commit_dialog_height", commit_dialog_height); + } + if (!g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils_mkdir(config_dir, TRUE) != 0) { @@ -2034,6 +2049,11 @@ load_config(void) } #endif + commit_dialog_width = utils_get_setting_integer(config, "CommitDialog", + "commit_dialog_width", 700); + commit_dialog_height = utils_get_setting_integer(config, "CommitDialog", + "commit_dialog_height", 500); + g_key_file_free(config); } @@ -2382,6 +2402,7 @@ plugin_init(G_GNUC_UNUSED GeanyData * data) void plugin_cleanup(void) { + save_config(); external_diff_viewer_deinit(); remove_menuitems_from_editor_menu(); gtk_widget_destroy(menu_entry); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 33042d: GeanyVC: move configuration file saving to separate function
by Enrico Tröger 20 Jan '18

20 Jan '18

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sat, 20 Jan 2018 12:32:50 UTC Commit: 33042dc1b7ce419bfa9615a954ec1e0fb249c71e https://github.com/geany/geany-plugins/commit/33042dc1b7ce419bfa9615a954ec1… Log Message: ----------- GeanyVC: move configuration file saving to separate function Modified Paths: -------------- geanyvc/src/geanyvc.c Modified: geanyvc/src/geanyvc.c 90 lines changed, 47 insertions(+), 43 deletions(-) =================================================================== @@ -1785,16 +1785,58 @@ static struct } widgets; +static void +save_config(void) +{ + GKeyFile *config = g_key_file_new(); + gchar *config_dir = g_path_get_dirname(config_file); + + g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); + + g_key_file_set_boolean(config, "VC", "set_changed_flag", set_changed_flag); + g_key_file_set_boolean(config, "VC", "set_add_confirmation", set_add_confirmation); + g_key_file_set_boolean(config, "VC", "set_external_diff", set_external_diff); + g_key_file_set_boolean(config, "VC", "set_maximize_commit_dialog", + set_maximize_commit_dialog); + g_key_file_set_boolean(config, "VC", "set_editor_menu_entries", set_editor_menu_entries); + g_key_file_set_boolean(config, "VC", "attach_to_menubar", set_menubar_entry); + + g_key_file_set_boolean(config, "VC", "enable_cvs", enable_cvs); + g_key_file_set_boolean(config, "VC", "enable_git", enable_git); + g_key_file_set_boolean(config, "VC", "enable_svn", enable_svn); + g_key_file_set_boolean(config, "VC", "enable_svk", enable_svk); + g_key_file_set_boolean(config, "VC", "enable_bzr", enable_bzr); + g_key_file_set_boolean(config, "VC", "enable_hg", enable_hg); + +#ifdef USE_GTKSPELL + g_key_file_set_string(config, "VC", "spellchecking_language", lang); +#endif + + if (!g_file_test(config_dir, G_FILE_TEST_IS_DIR) + && utils_mkdir(config_dir, TRUE) != 0) + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, + _ + ("Plugin configuration directory could not be created.")); + } + else + { + /* write config to file */ + gchar *data = g_key_file_to_data(config, NULL, NULL); + utils_write_file(config_file, data); + g_free(data); + } + + g_free(config_dir); + g_key_file_free(config); +} + static void on_configure_response(G_GNUC_UNUSED GtkDialog * dialog, gint response, G_GNUC_UNUSED gpointer user_data) { if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) { - GKeyFile *config = g_key_file_new(); - gchar *data; - gchar *config_dir = g_path_get_dirname(config_file); - set_changed_flag = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets.cb_changed_flag)); set_add_confirmation = @@ -1822,51 +1864,13 @@ on_configure_response(G_GNUC_UNUSED GtkDialog * dialog, gint response, lang = g_strdup(gtk_entry_get_text(GTK_ENTRY(widgets.spellcheck_lang_textbox))); #endif - g_key_file_load_from_file(config, config_file, G_KEY_FILE_NONE, NULL); - - g_key_file_set_boolean(config, "VC", "set_changed_flag", set_changed_flag); - g_key_file_set_boolean(config, "VC", "set_add_confirmation", set_add_confirmation); - g_key_file_set_boolean(config, "VC", "set_external_diff", set_external_diff); - g_key_file_set_boolean(config, "VC", "set_maximize_commit_dialog", - set_maximize_commit_dialog); - g_key_file_set_boolean(config, "VC", "set_editor_menu_entries", set_editor_menu_entries); - g_key_file_set_boolean(config, "VC", "attach_to_menubar", set_menubar_entry); - - g_key_file_set_boolean(config, "VC", "enable_cvs", enable_cvs); - g_key_file_set_boolean(config, "VC", "enable_git", enable_git); - g_key_file_set_boolean(config, "VC", "enable_svn", enable_svn); - g_key_file_set_boolean(config, "VC", "enable_svk", enable_svk); - g_key_file_set_boolean(config, "VC", "enable_bzr", enable_bzr); - g_key_file_set_boolean(config, "VC", "enable_hg", enable_hg); - -#ifdef USE_GTKSPELL - g_key_file_set_string(config, "VC", "spellchecking_language", lang); -#endif - - if (!g_file_test(config_dir, G_FILE_TEST_IS_DIR) - && utils_mkdir(config_dir, TRUE) != 0) - { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, - _ - ("Plugin configuration directory could not be created.")); - } - else - { - /* write config to file */ - data = g_key_file_to_data(config, NULL, NULL); - utils_write_file(config_file, data); - g_free(data); - } + save_config(); if (set_editor_menu_entries == FALSE) remove_menuitems_from_editor_menu(); else add_menuitems_to_editor_menu(); - - g_free(config_dir); - g_key_file_free(config); - registrate(); } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 67ba90: Merge pull request #678 from LarsGit223/wb-dir-names
by Frank Lanitz 18 Jan '18

18 Jan '18

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Thu, 18 Jan 2018 22:25:33 UTC Commit: 67ba90d4f01d5c73fe46f67a075655d75a53f4aa https://github.com/geany/geany-plugins/commit/67ba90d4f01d5c73fe46f67a07565… Log Message: ----------- Merge pull request #678 from LarsGit223/wb-dir-names workbench: renamed "folder" to "sub-directory" Modified Paths: -------------- workbench/README workbench/src/popup_menu.c workbench/src/popup_menu.h workbench/src/sidebar.c workbench/src/sidebar.h workbench/src/wb_project.c Modified: workbench/README 12 lines changed, 6 insertions(+), 6 deletions(-) =================================================================== @@ -83,9 +83,9 @@ These are the available items: **Add directory** Add a directory to the project. It is only available if you right clicked inside of a project. After selecting it a dialog - will be opened. Chosse the directory which shall be added. After that + will be opened. Choose the directory which shall be added. After that the directory will be shown inside the project folder. After adding a - new directory, all files and folders beneath the directory will be + new directory, all files and sub-directories beneath the directory will be displayed. See "Directory settings" for more information. **Remove directory** @@ -101,18 +101,18 @@ These are the available items: **Directory settings** Select this item to change the directory settings. It is only available if you right clicked inside of a project directory. In the directory - settings you can set a filter which controls the files and folders - that shall be displayed or not. + settings you can set a filter which controls the files and sub-directories + that will be displayed or not. **Fold/unfold directory** Fold or unfold the items belonging to the directory. It is only available if you right clicked inside of a directory. **Unfold All** - Select this item to unfold all projects, directories and folders. + Select this item to unfold all projects, directories and sub-directories. **Collapse All** - Select this item to collpase/fold all projects, directories and folders. + Select this item to collpase/fold all projects, directories and sub-directories. **Add to Workbench Bookmarks** Add the file to the Workbench Bookmarks. It is only available Modified: workbench/src/popup_menu.c 58 lines changed, 29 insertions(+), 29 deletions(-) =================================================================== @@ -50,8 +50,8 @@ static struct GtkWidget *fold_unfold_directory; GtkWidget *directory_open_all; GtkWidget *directory_close_all; - GtkWidget *folder_open_all; - GtkWidget *folder_close_all; + GtkWidget *subdir_open_all; + GtkWidget *subdir_close_all; GtkWidget *expand_all; GtkWidget *collapse_all; GtkWidget *add_wb_bookmark; @@ -89,8 +89,8 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event) gtk_widget_set_sensitive (s_popup_menu.add_wb_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.add_prj_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.remove_bookmark, FALSE); - gtk_widget_set_sensitive (s_popup_menu.folder_open_all, FALSE); - gtk_widget_set_sensitive (s_popup_menu.folder_close_all, FALSE); + gtk_widget_set_sensitive (s_popup_menu.subdir_open_all, FALSE); + gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, FALSE); break; case POPUP_CONTEXT_DIRECTORY: gtk_widget_set_sensitive (s_popup_menu.add_project, TRUE); @@ -108,10 +108,10 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event) gtk_widget_set_sensitive (s_popup_menu.add_wb_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.add_prj_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.remove_bookmark, FALSE); - gtk_widget_set_sensitive (s_popup_menu.folder_open_all, FALSE); - gtk_widget_set_sensitive (s_popup_menu.folder_close_all, FALSE); + gtk_widget_set_sensitive (s_popup_menu.subdir_open_all, FALSE); + gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, FALSE); break; - case POPUP_CONTEXT_FOLDER: + case POPUP_CONTEXT_SUB_DIRECTORY: gtk_widget_set_sensitive (s_popup_menu.add_project, TRUE); gtk_widget_set_sensitive (s_popup_menu.remove_project, TRUE); gtk_widget_set_sensitive (s_popup_menu.fold_unfold_project, TRUE); @@ -127,8 +127,8 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event) gtk_widget_set_sensitive (s_popup_menu.add_wb_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.add_prj_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.remove_bookmark, FALSE); - gtk_widget_set_sensitive (s_popup_menu.folder_open_all, TRUE); - gtk_widget_set_sensitive (s_popup_menu.folder_close_all, TRUE); + gtk_widget_set_sensitive (s_popup_menu.subdir_open_all, TRUE); + gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, TRUE); break; case POPUP_CONTEXT_FILE: gtk_widget_set_sensitive (s_popup_menu.add_project, TRUE); @@ -146,8 +146,8 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event) gtk_widget_set_sensitive (s_popup_menu.add_wb_bookmark, TRUE); gtk_widget_set_sensitive (s_popup_menu.add_prj_bookmark, TRUE); gtk_widget_set_sensitive (s_popup_menu.remove_bookmark, FALSE); - gtk_widget_set_sensitive (s_popup_menu.folder_open_all, TRUE); - gtk_widget_set_sensitive (s_popup_menu.folder_close_all, TRUE); + gtk_widget_set_sensitive (s_popup_menu.subdir_open_all, TRUE); + gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, TRUE); break; case POPUP_CONTEXT_BACKGROUND: gtk_widget_set_sensitive (s_popup_menu.add_project, TRUE); @@ -165,8 +165,8 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event) gtk_widget_set_sensitive (s_popup_menu.add_wb_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.add_prj_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.remove_bookmark, FALSE); - gtk_widget_set_sensitive (s_popup_menu.folder_open_all, FALSE); - gtk_widget_set_sensitive (s_popup_menu.folder_close_all, FALSE); + gtk_widget_set_sensitive (s_popup_menu.subdir_open_all, FALSE); + gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, FALSE); break; case POPUP_CONTEXT_WB_BOOKMARK: gtk_widget_set_sensitive (s_popup_menu.add_project, TRUE); @@ -184,8 +184,8 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event) gtk_widget_set_sensitive (s_popup_menu.add_wb_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.add_prj_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.remove_bookmark, TRUE); - gtk_widget_set_sensitive (s_popup_menu.folder_open_all, FALSE); - gtk_widget_set_sensitive (s_popup_menu.folder_close_all, FALSE); + gtk_widget_set_sensitive (s_popup_menu.subdir_open_all, FALSE); + gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, FALSE); break; case POPUP_CONTEXT_PRJ_BOOKMARK: gtk_widget_set_sensitive (s_popup_menu.add_project, TRUE); @@ -203,8 +203,8 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event) gtk_widget_set_sensitive (s_popup_menu.add_wb_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.add_prj_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.remove_bookmark, TRUE); - gtk_widget_set_sensitive (s_popup_menu.folder_open_all, FALSE); - gtk_widget_set_sensitive (s_popup_menu.folder_close_all, FALSE); + gtk_widget_set_sensitive (s_popup_menu.subdir_open_all, FALSE); + gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, FALSE); break; } gtk_menu_popup(GTK_MENU(s_popup_menu.widget), NULL, NULL, NULL, NULL, @@ -478,12 +478,12 @@ static void popup_menu_on_remove_from_bookmarks(G_GNUC_UNUSED GtkMenuItem *menui } -/* Handle popup menu item "Open all files" (folder) */ -static void popup_menu_on_folder_open_all (G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) +/* Handle popup menu item "Open all files" (sub-directory) */ +static void popup_menu_on_subdir_open_all (G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) { GPtrArray *list; - list = sidebar_get_selected_folder_filelist(); + list = sidebar_get_selected_subdir_filelist(); if (list != NULL) { open_all_files_in_list(list); @@ -492,12 +492,12 @@ static void popup_menu_on_folder_open_all (G_GNUC_UNUSED GtkMenuItem *menuitem, } -/* Handle popup menu item "Close all files" (folder) */ -static void popup_menu_on_folder_close_all (G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) +/* Handle popup menu item "Close all files" (sub-directory) */ +static void popup_menu_on_subdir_close_all (G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) { GPtrArray *list; - list = sidebar_get_selected_folder_filelist(); + list = sidebar_get_selected_subdir_filelist(); if (list != NULL) { close_all_files_in_list(list); @@ -601,17 +601,17 @@ 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(_("_Open all files in folder")); + item = gtk_menu_item_new_with_mnemonic(_("_Open all files in sub-directory")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); - g_signal_connect(item, "activate", G_CALLBACK(popup_menu_on_folder_open_all), NULL); - s_popup_menu.folder_open_all = item; + g_signal_connect(item, "activate", G_CALLBACK(popup_menu_on_subdir_open_all), NULL); + s_popup_menu.subdir_open_all = item; - item = gtk_menu_item_new_with_mnemonic(_("_Close all files in folder")); + item = gtk_menu_item_new_with_mnemonic(_("_Close all files in sub-directory")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); - g_signal_connect(item, "activate", G_CALLBACK(popup_menu_on_folder_close_all), NULL); - s_popup_menu.folder_close_all = item; + g_signal_connect(item, "activate", G_CALLBACK(popup_menu_on_subdir_close_all), NULL); + s_popup_menu.subdir_close_all = item; item = gtk_separator_menu_item_new(); gtk_widget_show(item); Modified: workbench/src/popup_menu.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -25,7 +25,7 @@ typedef enum { POPUP_CONTEXT_PROJECT, POPUP_CONTEXT_DIRECTORY, - POPUP_CONTEXT_FOLDER, + POPUP_CONTEXT_SUB_DIRECTORY, POPUP_CONTEXT_FILE, POPUP_CONTEXT_BACKGROUND, POPUP_CONTEXT_WB_BOOKMARK, Modified: workbench/src/sidebar.c 28 lines changed, 14 insertions(+), 14 deletions(-) =================================================================== @@ -41,7 +41,7 @@ enum DATA_ID_PRJ_BOOKMARK, DATA_ID_DIRECTORY, DATA_ID_NO_DIRS, - DATA_ID_FOLDER, + DATA_ID_SUB_DIRECTORY, DATA_ID_FILE, }; @@ -90,7 +90,7 @@ static void sidebar_remove_children(GtkTreeIter *parent) } -/* Create a branch for a folder */ +/* Create a branch for a sub-directory */ static void sidebar_create_branch(gint level, const gchar *abs_base_dir, GSList *leaf_list, GtkTreeIter *parent) { GSList *dir_list = NULL; @@ -185,7 +185,7 @@ static void sidebar_create_branch(gint level, const gchar *abs_base_dir, GSList gtk_tree_store_insert_with_values(sidebar.file_store, &iter, parent, 0, FILEVIEW_COLUMN_ICON, icon_dir, FILEVIEW_COLUMN_NAME, last_dir_name, - FILEVIEW_COLUMN_DATA_ID, DATA_ID_FOLDER, + FILEVIEW_COLUMN_DATA_ID, DATA_ID_SUB_DIRECTORY, -1); sidebar_create_branch(level+1, abs_base_dir, tmp_list, &iter); @@ -201,7 +201,7 @@ static void sidebar_create_branch(gint level, const gchar *abs_base_dir, GSList gtk_tree_store_insert_with_values(sidebar.file_store, &iter, parent, 0, FILEVIEW_COLUMN_ICON, icon_dir, FILEVIEW_COLUMN_NAME, last_dir_name, - FILEVIEW_COLUMN_DATA_ID, DATA_ID_FOLDER, + FILEVIEW_COLUMN_DATA_ID, DATA_ID_SUB_DIRECTORY, -1); sidebar_create_branch(level+1, abs_base_dir, tmp_list, &iter); @@ -225,7 +225,7 @@ static int rev_strcmp(const char *str1, const char *str2) } -/* Insert given directory/folder into the sidebar file tree */ +/* Insert given directory/sub-directory into the sidebar file tree */ static void sidebar_insert_project_directory(WB_PROJECT *prj, WB_PROJECT_DIR *directory, GtkTreeIter *parent) { GSList *lst = NULL; @@ -757,9 +757,9 @@ static gboolean sidebar_file_view_on_button_release(G_GNUC_UNUSED GtkWidget * wi { popup_context = POPUP_CONTEXT_FILE; } - else if (context.folder != NULL) + else if (context.subdir != NULL) { - popup_context = POPUP_CONTEXT_FOLDER; + popup_context = POPUP_CONTEXT_SUB_DIRECTORY; } else if (context.directory != NULL) { @@ -960,8 +960,8 @@ gboolean sidebar_file_view_get_selected_context(SIDEBAR_CONTEXT *context) case DATA_ID_NO_DIRS: /* Has not got any data. */ break; - case DATA_ID_FOLDER: - context->folder = data; + case DATA_ID_SUB_DIRECTORY: + context->subdir = data; break; case DATA_ID_FILE: context->file = data; @@ -999,7 +999,7 @@ static void sidebar_get_filelist_for_iter(GPtrArray *list, GtkTreeIter iter) g_ptr_array_add(list, g_strdup(filename)); break; case DATA_ID_DIRECTORY: - case DATA_ID_FOLDER: + case DATA_ID_SUB_DIRECTORY: if (gtk_tree_model_iter_children(model, &childs, &iter) == TRUE) { sidebar_get_filelist_for_iter(list, childs); @@ -1013,7 +1013,7 @@ static void sidebar_get_filelist_for_iter(GPtrArray *list, GtkTreeIter iter) /* Get the lkist of files belonging to the current selection for - id (id = project, directory, folder) */ + id (id = project, directory, sub-directory) */ static GPtrArray *sidebar_get_selected_filelist (guint id) { GtkTreeModel *model; @@ -1057,14 +1057,14 @@ GPtrArray *sidebar_get_selected_directory_filelist (void) } -/** Get the list of files corresponding to the selected folder. +/** Get the list of files corresponding to the selected sub-directory. * * @return GPtrArray containing file names or NULL. * **/ -GPtrArray *sidebar_get_selected_folder_filelist (void) +GPtrArray *sidebar_get_selected_subdir_filelist (void) { - return sidebar_get_selected_filelist(DATA_ID_FOLDER); + return sidebar_get_selected_filelist(DATA_ID_SUB_DIRECTORY); } /** Setup the sidebar. Modified: workbench/src/sidebar.h 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -26,7 +26,7 @@ typedef struct { WB_PROJECT *project; WB_PROJECT_DIR *directory; - gchar *folder; + gchar *subdir; gchar *file; gchar *wb_bookmark; gchar *prj_bookmark; @@ -74,6 +74,6 @@ gboolean sidebar_file_view_get_selected_context(SIDEBAR_CONTEXT *context); GPtrArray *sidebar_get_selected_project_filelist (void); GPtrArray *sidebar_get_selected_directory_filelist (void); -GPtrArray *sidebar_get_selected_folder_filelist (void); +GPtrArray *sidebar_get_selected_subdir_filelist (void); #endif Modified: workbench/src/wb_project.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -54,7 +54,7 @@ struct S_WB_PROJECT_DIR gchar **ignored_dirs_patterns; gchar **ignored_file_patterns; guint file_count; - guint folder_count; + guint subdir_count; GHashTable *file_table; /* contains all file names within base_dir, maps file_name->TMSourceFile */ gboolean is_prj_base_dir; }; @@ -527,8 +527,8 @@ static guint wb_project_dir_rescan_int(WB_PROJECT *prj, WB_PROJECT_DIR *root) searchdir = get_combined_path(prj->filename, root->base_dir); root->file_count = 0; - root->folder_count = 0; - lst = gp_filelist_scan_directory(&(root->file_count), &(root->folder_count), + root->subdir_count = 0; + lst = gp_filelist_scan_directory(&(root->file_count), &(root->subdir_count), searchdir, file_patterns, root->ignored_dirs_patterns, root->ignored_file_patterns); g_free(searchdir); @@ -978,7 +978,7 @@ gchar *wb_project_dir_get_info (WB_PROJECT_DIR *dir) g_string_append(temp, "\n"); } - g_string_append_printf(temp, _("Number of Sub-Folders: %u\n"), dir->folder_count); + g_string_append_printf(temp, _("Number of Sub-Directories: %u\n"), dir->subdir_count); g_string_append_printf(temp, _("Number of Files: %u\n"), dir->file_count); /* Steal string content */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 91a000: workbench: fixed typos in README
by LarsDW223 18 Jan '18

18 Jan '18

Branch: refs/heads/master Author: LarsDW223 <lars_paulsen(a)web.de> Committer: LarsDW223 <lars_paulsen(a)web.de> Date: Thu, 18 Jan 2018 17:45:14 UTC Commit: 91a000f781205d5e9eca9ccdd298763890c99396 https://github.com/geany/geany-plugins/commit/91a000f781205d5e9eca9ccdd2987… Log Message: ----------- workbench: fixed typos in README Modified Paths: -------------- workbench/README Modified: workbench/README 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -83,7 +83,7 @@ These are the available items: **Add directory** Add a directory to the project. It is only available if you right clicked inside of a project. After selecting it a dialog - will be opened. Chosse the directory which shall be added. After that + will be opened. Choose the directory which shall be added. After that the directory will be shown inside the project folder. After adding a new directory, all files and sub-directories beneath the directory will be displayed. See "Directory settings" for more information. @@ -102,7 +102,7 @@ These are the available items: Select this item to change the directory settings. It is only available if you right clicked inside of a project directory. In the directory settings you can set a filter which controls the files and sub-directories - that shall be displayed or not. + that will be displayed or not. **Fold/unfold directory** Fold or unfold the items belonging to the directory. It is only available -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 0dc3f7: workbench: renamed "folder" to "sub-directory"
by LarsDW223 17 Jan '18

17 Jan '18

Branch: refs/heads/master Author: LarsDW223 <lars_paulsen(a)web.de> Committer: LarsDW223 <lars_paulsen(a)web.de> Date: Wed, 17 Jan 2018 20:04:03 UTC Commit: 0dc3f7e8861ace761174c05a1f84cc63dff8a698 https://github.com/geany/geany-plugins/commit/0dc3f7e8861ace761174c05a1f84c… Log Message: ----------- workbench: renamed "folder" to "sub-directory" Modified Paths: -------------- workbench/README workbench/src/popup_menu.c workbench/src/popup_menu.h workbench/src/sidebar.c workbench/src/sidebar.h workbench/src/wb_project.c Modified: workbench/README 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -85,7 +85,7 @@ These are the available items: if you right clicked inside of a project. After selecting it a dialog will be opened. Chosse the directory which shall be added. After that the directory will be shown inside the project folder. After adding a - new directory, all files and folders beneath the directory will be + new directory, all files and sub-directories beneath the directory will be displayed. See "Directory settings" for more information. **Remove directory** @@ -101,18 +101,18 @@ These are the available items: **Directory settings** Select this item to change the directory settings. It is only available if you right clicked inside of a project directory. In the directory - settings you can set a filter which controls the files and folders + settings you can set a filter which controls the files and sub-directories that shall be displayed or not. **Fold/unfold directory** Fold or unfold the items belonging to the directory. It is only available if you right clicked inside of a directory. **Unfold All** - Select this item to unfold all projects, directories and folders. + Select this item to unfold all projects, directories and sub-directories. **Collapse All** - Select this item to collpase/fold all projects, directories and folders. + Select this item to collpase/fold all projects, directories and sub-directories. **Add to Workbench Bookmarks** Add the file to the Workbench Bookmarks. It is only available Modified: workbench/src/popup_menu.c 58 lines changed, 29 insertions(+), 29 deletions(-) =================================================================== @@ -50,8 +50,8 @@ static struct GtkWidget *fold_unfold_directory; GtkWidget *directory_open_all; GtkWidget *directory_close_all; - GtkWidget *folder_open_all; - GtkWidget *folder_close_all; + GtkWidget *subdir_open_all; + GtkWidget *subdir_close_all; GtkWidget *expand_all; GtkWidget *collapse_all; GtkWidget *add_wb_bookmark; @@ -89,8 +89,8 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event) gtk_widget_set_sensitive (s_popup_menu.add_wb_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.add_prj_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.remove_bookmark, FALSE); - gtk_widget_set_sensitive (s_popup_menu.folder_open_all, FALSE); - gtk_widget_set_sensitive (s_popup_menu.folder_close_all, FALSE); + gtk_widget_set_sensitive (s_popup_menu.subdir_open_all, FALSE); + gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, FALSE); break; case POPUP_CONTEXT_DIRECTORY: gtk_widget_set_sensitive (s_popup_menu.add_project, TRUE); @@ -108,10 +108,10 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event) gtk_widget_set_sensitive (s_popup_menu.add_wb_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.add_prj_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.remove_bookmark, FALSE); - gtk_widget_set_sensitive (s_popup_menu.folder_open_all, FALSE); - gtk_widget_set_sensitive (s_popup_menu.folder_close_all, FALSE); + gtk_widget_set_sensitive (s_popup_menu.subdir_open_all, FALSE); + gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, FALSE); break; - case POPUP_CONTEXT_FOLDER: + case POPUP_CONTEXT_SUB_DIRECTORY: gtk_widget_set_sensitive (s_popup_menu.add_project, TRUE); gtk_widget_set_sensitive (s_popup_menu.remove_project, TRUE); gtk_widget_set_sensitive (s_popup_menu.fold_unfold_project, TRUE); @@ -127,8 +127,8 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event) gtk_widget_set_sensitive (s_popup_menu.add_wb_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.add_prj_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.remove_bookmark, FALSE); - gtk_widget_set_sensitive (s_popup_menu.folder_open_all, TRUE); - gtk_widget_set_sensitive (s_popup_menu.folder_close_all, TRUE); + gtk_widget_set_sensitive (s_popup_menu.subdir_open_all, TRUE); + gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, TRUE); break; case POPUP_CONTEXT_FILE: gtk_widget_set_sensitive (s_popup_menu.add_project, TRUE); @@ -146,8 +146,8 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event) gtk_widget_set_sensitive (s_popup_menu.add_wb_bookmark, TRUE); gtk_widget_set_sensitive (s_popup_menu.add_prj_bookmark, TRUE); gtk_widget_set_sensitive (s_popup_menu.remove_bookmark, FALSE); - gtk_widget_set_sensitive (s_popup_menu.folder_open_all, TRUE); - gtk_widget_set_sensitive (s_popup_menu.folder_close_all, TRUE); + gtk_widget_set_sensitive (s_popup_menu.subdir_open_all, TRUE); + gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, TRUE); break; case POPUP_CONTEXT_BACKGROUND: gtk_widget_set_sensitive (s_popup_menu.add_project, TRUE); @@ -165,8 +165,8 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event) gtk_widget_set_sensitive (s_popup_menu.add_wb_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.add_prj_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.remove_bookmark, FALSE); - gtk_widget_set_sensitive (s_popup_menu.folder_open_all, FALSE); - gtk_widget_set_sensitive (s_popup_menu.folder_close_all, FALSE); + gtk_widget_set_sensitive (s_popup_menu.subdir_open_all, FALSE); + gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, FALSE); break; case POPUP_CONTEXT_WB_BOOKMARK: gtk_widget_set_sensitive (s_popup_menu.add_project, TRUE); @@ -184,8 +184,8 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event) gtk_widget_set_sensitive (s_popup_menu.add_wb_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.add_prj_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.remove_bookmark, TRUE); - gtk_widget_set_sensitive (s_popup_menu.folder_open_all, FALSE); - gtk_widget_set_sensitive (s_popup_menu.folder_close_all, FALSE); + gtk_widget_set_sensitive (s_popup_menu.subdir_open_all, FALSE); + gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, FALSE); break; case POPUP_CONTEXT_PRJ_BOOKMARK: gtk_widget_set_sensitive (s_popup_menu.add_project, TRUE); @@ -203,8 +203,8 @@ void popup_menu_show(POPUP_CONTEXT context, GdkEventButton *event) gtk_widget_set_sensitive (s_popup_menu.add_wb_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.add_prj_bookmark, FALSE); gtk_widget_set_sensitive (s_popup_menu.remove_bookmark, TRUE); - gtk_widget_set_sensitive (s_popup_menu.folder_open_all, FALSE); - gtk_widget_set_sensitive (s_popup_menu.folder_close_all, FALSE); + gtk_widget_set_sensitive (s_popup_menu.subdir_open_all, FALSE); + gtk_widget_set_sensitive (s_popup_menu.subdir_close_all, FALSE); break; } gtk_menu_popup(GTK_MENU(s_popup_menu.widget), NULL, NULL, NULL, NULL, @@ -478,12 +478,12 @@ static void popup_menu_on_remove_from_bookmarks(G_GNUC_UNUSED GtkMenuItem *menui } -/* Handle popup menu item "Open all files" (folder) */ -static void popup_menu_on_folder_open_all (G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) +/* Handle popup menu item "Open all files" (sub-directory) */ +static void popup_menu_on_subdir_open_all (G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) { GPtrArray *list; - list = sidebar_get_selected_folder_filelist(); + list = sidebar_get_selected_subdir_filelist(); if (list != NULL) { open_all_files_in_list(list); @@ -492,12 +492,12 @@ static void popup_menu_on_folder_open_all (G_GNUC_UNUSED GtkMenuItem *menuitem, } -/* Handle popup menu item "Close all files" (folder) */ -static void popup_menu_on_folder_close_all (G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) +/* Handle popup menu item "Close all files" (sub-directory) */ +static void popup_menu_on_subdir_close_all (G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer user_data) { GPtrArray *list; - list = sidebar_get_selected_folder_filelist(); + list = sidebar_get_selected_subdir_filelist(); if (list != NULL) { close_all_files_in_list(list); @@ -601,17 +601,17 @@ 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(_("_Open all files in folder")); + item = gtk_menu_item_new_with_mnemonic(_("_Open all files in sub-directory")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); - g_signal_connect(item, "activate", G_CALLBACK(popup_menu_on_folder_open_all), NULL); - s_popup_menu.folder_open_all = item; + g_signal_connect(item, "activate", G_CALLBACK(popup_menu_on_subdir_open_all), NULL); + s_popup_menu.subdir_open_all = item; - item = gtk_menu_item_new_with_mnemonic(_("_Close all files in folder")); + item = gtk_menu_item_new_with_mnemonic(_("_Close all files in sub-directory")); gtk_widget_show(item); gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item); - g_signal_connect(item, "activate", G_CALLBACK(popup_menu_on_folder_close_all), NULL); - s_popup_menu.folder_close_all = item; + g_signal_connect(item, "activate", G_CALLBACK(popup_menu_on_subdir_close_all), NULL); + s_popup_menu.subdir_close_all = item; item = gtk_separator_menu_item_new(); gtk_widget_show(item); Modified: workbench/src/popup_menu.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -25,7 +25,7 @@ typedef enum { POPUP_CONTEXT_PROJECT, POPUP_CONTEXT_DIRECTORY, - POPUP_CONTEXT_FOLDER, + POPUP_CONTEXT_SUB_DIRECTORY, POPUP_CONTEXT_FILE, POPUP_CONTEXT_BACKGROUND, POPUP_CONTEXT_WB_BOOKMARK, Modified: workbench/src/sidebar.c 28 lines changed, 14 insertions(+), 14 deletions(-) =================================================================== @@ -41,7 +41,7 @@ enum DATA_ID_PRJ_BOOKMARK, DATA_ID_DIRECTORY, DATA_ID_NO_DIRS, - DATA_ID_FOLDER, + DATA_ID_SUB_DIRECTORY, DATA_ID_FILE, }; @@ -90,7 +90,7 @@ static void sidebar_remove_children(GtkTreeIter *parent) } -/* Create a branch for a folder */ +/* Create a branch for a sub-directory */ static void sidebar_create_branch(gint level, const gchar *abs_base_dir, GSList *leaf_list, GtkTreeIter *parent) { GSList *dir_list = NULL; @@ -185,7 +185,7 @@ static void sidebar_create_branch(gint level, const gchar *abs_base_dir, GSList gtk_tree_store_insert_with_values(sidebar.file_store, &iter, parent, 0, FILEVIEW_COLUMN_ICON, icon_dir, FILEVIEW_COLUMN_NAME, last_dir_name, - FILEVIEW_COLUMN_DATA_ID, DATA_ID_FOLDER, + FILEVIEW_COLUMN_DATA_ID, DATA_ID_SUB_DIRECTORY, -1); sidebar_create_branch(level+1, abs_base_dir, tmp_list, &iter); @@ -201,7 +201,7 @@ static void sidebar_create_branch(gint level, const gchar *abs_base_dir, GSList gtk_tree_store_insert_with_values(sidebar.file_store, &iter, parent, 0, FILEVIEW_COLUMN_ICON, icon_dir, FILEVIEW_COLUMN_NAME, last_dir_name, - FILEVIEW_COLUMN_DATA_ID, DATA_ID_FOLDER, + FILEVIEW_COLUMN_DATA_ID, DATA_ID_SUB_DIRECTORY, -1); sidebar_create_branch(level+1, abs_base_dir, tmp_list, &iter); @@ -225,7 +225,7 @@ static int rev_strcmp(const char *str1, const char *str2) } -/* Insert given directory/folder into the sidebar file tree */ +/* Insert given directory/sub-directory into the sidebar file tree */ static void sidebar_insert_project_directory(WB_PROJECT *prj, WB_PROJECT_DIR *directory, GtkTreeIter *parent) { GSList *lst = NULL; @@ -757,9 +757,9 @@ static gboolean sidebar_file_view_on_button_release(G_GNUC_UNUSED GtkWidget * wi { popup_context = POPUP_CONTEXT_FILE; } - else if (context.folder != NULL) + else if (context.subdir != NULL) { - popup_context = POPUP_CONTEXT_FOLDER; + popup_context = POPUP_CONTEXT_SUB_DIRECTORY; } else if (context.directory != NULL) { @@ -960,8 +960,8 @@ gboolean sidebar_file_view_get_selected_context(SIDEBAR_CONTEXT *context) case DATA_ID_NO_DIRS: /* Has not got any data. */ break; - case DATA_ID_FOLDER: - context->folder = data; + case DATA_ID_SUB_DIRECTORY: + context->subdir = data; break; case DATA_ID_FILE: context->file = data; @@ -999,7 +999,7 @@ static void sidebar_get_filelist_for_iter(GPtrArray *list, GtkTreeIter iter) g_ptr_array_add(list, g_strdup(filename)); break; case DATA_ID_DIRECTORY: - case DATA_ID_FOLDER: + case DATA_ID_SUB_DIRECTORY: if (gtk_tree_model_iter_children(model, &childs, &iter) == TRUE) { sidebar_get_filelist_for_iter(list, childs); @@ -1013,7 +1013,7 @@ static void sidebar_get_filelist_for_iter(GPtrArray *list, GtkTreeIter iter) /* Get the lkist of files belonging to the current selection for - id (id = project, directory, folder) */ + id (id = project, directory, sub-directory) */ static GPtrArray *sidebar_get_selected_filelist (guint id) { GtkTreeModel *model; @@ -1057,14 +1057,14 @@ GPtrArray *sidebar_get_selected_directory_filelist (void) } -/** Get the list of files corresponding to the selected folder. +/** Get the list of files corresponding to the selected sub-directory. * * @return GPtrArray containing file names or NULL. * **/ -GPtrArray *sidebar_get_selected_folder_filelist (void) +GPtrArray *sidebar_get_selected_subdir_filelist (void) { - return sidebar_get_selected_filelist(DATA_ID_FOLDER); + return sidebar_get_selected_filelist(DATA_ID_SUB_DIRECTORY); } /** Setup the sidebar. Modified: workbench/src/sidebar.h 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -26,7 +26,7 @@ typedef struct { WB_PROJECT *project; WB_PROJECT_DIR *directory; - gchar *folder; + gchar *subdir; gchar *file; gchar *wb_bookmark; gchar *prj_bookmark; @@ -74,6 +74,6 @@ gboolean sidebar_file_view_get_selected_context(SIDEBAR_CONTEXT *context); GPtrArray *sidebar_get_selected_project_filelist (void); GPtrArray *sidebar_get_selected_directory_filelist (void); -GPtrArray *sidebar_get_selected_folder_filelist (void); +GPtrArray *sidebar_get_selected_subdir_filelist (void); #endif Modified: workbench/src/wb_project.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -54,7 +54,7 @@ struct S_WB_PROJECT_DIR gchar **ignored_dirs_patterns; gchar **ignored_file_patterns; guint file_count; - guint folder_count; + guint subdir_count; GHashTable *file_table; /* contains all file names within base_dir, maps file_name->TMSourceFile */ gboolean is_prj_base_dir; }; @@ -527,8 +527,8 @@ static guint wb_project_dir_rescan_int(WB_PROJECT *prj, WB_PROJECT_DIR *root) searchdir = get_combined_path(prj->filename, root->base_dir); root->file_count = 0; - root->folder_count = 0; - lst = gp_filelist_scan_directory(&(root->file_count), &(root->folder_count), + root->subdir_count = 0; + lst = gp_filelist_scan_directory(&(root->file_count), &(root->subdir_count), searchdir, file_patterns, root->ignored_dirs_patterns, root->ignored_file_patterns); g_free(searchdir); @@ -978,7 +978,7 @@ gchar *wb_project_dir_get_info (WB_PROJECT_DIR *dir) g_string_append(temp, "\n"); } - g_string_append_printf(temp, _("Number of Sub-Folders: %u\n"), dir->folder_count); + g_string_append_printf(temp, _("Number of Sub-Directories: %u\n"), dir->subdir_count); g_string_append_printf(temp, _("Number of Files: %u\n"), dir->file_count); /* Steal string content */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 35736f: webhelper: Port link hovering functionality to webkit2gtk
by Chow Loong Jin 17 Jan '18

17 Jan '18

Branch: refs/heads/master Author: Chow Loong Jin <hyperair(a)debian.org> Committer: Chow Loong Jin <hyperair(a)debian.org> Date: Wed, 17 Jan 2018 14:45:20 UTC Commit: 35736fbce11d74755cc9308ce9db7aac0c394fd5 https://github.com/geany/geany-plugins/commit/35736fbce11d74755cc9308ce9db7… Log Message: ----------- webhelper: Port link hovering functionality to webkit2gtk Modified Paths: -------------- webhelper/src/gwh-browser.c Modified: webhelper/src/gwh-browser.c 20 lines changed, 13 insertions(+), 7 deletions(-) =================================================================== @@ -976,18 +976,24 @@ get_statusbar_context_id (GtkStatusbar *statusbar) } static void -on_web_view_hovering_over_link (WebKitWebView *view, - gchar *title, - gchar *uri, - GwhBrowser *self) +on_web_view_mouse_target_changed (WebKitWebView *view, + WebKitHitTestResult *hit_test_result, + guint modifiers, + GwhBrowser *self) { GtkStatusbar *statusbar = GTK_STATUSBAR (self->priv->statusbar); - + const gchar *uri; + if (self->priv->hovered_link) { gtk_statusbar_pop (statusbar, get_statusbar_context_id (statusbar)); g_free (self->priv->hovered_link); self->priv->hovered_link = NULL; } + + if (!webkit_hit_test_result_context_is_link (hit_test_result)) + return; + + uri = webkit_hit_test_result_get_link_uri (hit_test_result); if (uri && *uri) { self->priv->hovered_link = g_strdup (uri); gtk_statusbar_push (statusbar, get_statusbar_context_id (statusbar), @@ -1107,8 +1113,8 @@ gwh_browser_init (GwhBrowser *self) G_CALLBACK (on_web_view_context_menu), self); g_signal_connect (G_OBJECT (self->priv->web_view), "scroll-event", G_CALLBACK (on_web_view_scroll_event), self); - g_signal_connect (G_OBJECT (self->priv->web_view), "hovering-over-link", - G_CALLBACK (on_web_view_hovering_over_link), self); + g_signal_connect (G_OBJECT (self->priv->web_view), "mouse-target-changed", + G_CALLBACK (on_web_view_mouse_target_changed), self); g_signal_connect (G_OBJECT (self->priv->web_view), "leave-notify-event", G_CALLBACK (on_web_view_leave_notify_event), self); g_signal_connect (G_OBJECT (self->priv->web_view), "enter-notify-event", -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 336ac2: webhelper: Port inspector signal handlers to webkit2gtk
by Chow Loong Jin 17 Jan '18

17 Jan '18

Branch: refs/heads/master Author: Chow Loong Jin <hyperair(a)debian.org> Committer: Chow Loong Jin <hyperair(a)debian.org> Date: Wed, 17 Jan 2018 14:35:38 UTC Commit: 336ac2e65d1303e49dba34159de1e1ae11c1dc98 https://github.com/geany/geany-plugins/commit/336ac2e65d1303e49dba34159de1e… Log Message: ----------- webhelper: Port inspector signal handlers to webkit2gtk Modified Paths: -------------- webhelper/src/gwh-browser.c Modified: webhelper/src/gwh-browser.c 174 lines changed, 14 insertions(+), 160 deletions(-) =================================================================== @@ -134,10 +134,6 @@ G_DEFINE_TYPE_WITH_CODE (GwhBrowser, gwh_browser, GTK_TYPE_VBOX, G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE, NULL)) -static void inspector_set_detached (GwhBrowser *self, - gboolean detached); - - static void set_location_icon (GwhBrowser *self, const cairo_surface_t *icon_surface) @@ -251,17 +247,6 @@ on_settings_inspector_window_geometry_notify (GObject *object, g_free (geometry); } -static void -on_settings_inspector_detached_notify (GObject *object, - GParamSpec *pspec, - GwhBrowser *self) -{ - gboolean detached; - - g_object_get (object, pspec->name, &detached, NULL); - inspector_set_detached (self, detached); -} - static void on_settings_wm_windows_skip_taskbar_notify (GObject *object, GParamSpec *pspec, @@ -298,10 +283,10 @@ on_settings_wm_windows_type_notify (GObject *object, /* web inspector events handling */ #define INSPECTOR_DETACHED(self) \ - (gtk_bin_get_child (GTK_BIN ((self)->priv->inspector_window)) != NULL) + (webkit_web_inspector_is_attached ((self)->priv->inspector)) #define INSPECTOR_VISIBLE(self) \ - (gtk_widget_get_visible ((self)->priv->inspector_view)) + (webkit_web_inspector_get_web_view ((self)->priv->inspector) != NULL) static void inspector_set_visible (GwhBrowser *self, @@ -316,117 +301,22 @@ inspector_set_visible (GwhBrowser *self, } } -static void -inspector_hide_window (GwhBrowser *self) -{ - if (gtk_widget_get_visible (self->priv->inspector_window)) { - gtk_window_get_position (GTK_WINDOW (self->priv->inspector_window), - &self->priv->inspector_window_x, - &self->priv->inspector_window_y); - gtk_widget_hide (self->priv->inspector_window); - } -} - -static void -inspector_show_window (GwhBrowser *self) -{ - if (! gtk_widget_get_visible (self->priv->inspector_window)) { - gtk_widget_show (self->priv->inspector_window); - gtk_window_move (GTK_WINDOW (self->priv->inspector_window), - self->priv->inspector_window_x, - self->priv->inspector_window_y); - } -} - -static void -inspector_set_detached (GwhBrowser *self, - gboolean detached) -{ - if (detached != INSPECTOR_DETACHED (self)) { - if (detached) { - gtk_widget_reparent (self->priv->inspector_view, - self->priv->inspector_window); - if (INSPECTOR_VISIBLE (self)) { - inspector_show_window (self); - } - } else { - gtk_widget_reparent (self->priv->inspector_view, self->priv->paned); - inspector_hide_window (self); - } - g_object_set (self->priv->settings, "inspector-detached", detached, NULL); - } -} - -static WebKitWebView * -on_inspector_inspect_web_view (WebKitWebInspector *inspector, - WebKitWebView *view, - GwhBrowser *self) -{ - if (self->priv->inspector_web_view) { - gtk_widget_destroy (self->priv->inspector_web_view); - } - - self->priv->inspector_web_view = webkit_web_view_new (); - gtk_widget_show (self->priv->inspector_web_view); - gtk_container_add (GTK_CONTAINER (self->priv->inspector_view), - self->priv->inspector_web_view); - - return WEBKIT_WEB_VIEW (self->priv->inspector_web_view); -} - static gboolean -on_inspector_show_window (WebKitWebInspector *inspector, - GwhBrowser *self) +on_inspector_closed (WebKitWebInspector *inspector, + GwhBrowser *self) { - gtk_widget_show (self->priv->inspector_view); - if (INSPECTOR_DETACHED (self)) { - inspector_show_window (self); - } - gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (self->priv->item_inspector), - TRUE); - - return TRUE; -} - -static gboolean -on_inspector_close_window (WebKitWebInspector *inspector, - GwhBrowser *self) -{ - gtk_widget_hide (self->priv->inspector_view); - inspector_hide_window (self); gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (self->priv->item_inspector), FALSE); - gtk_widget_grab_focus (gtk_widget_get_toplevel (self->priv->web_view)); - - return TRUE; -} - -static gboolean -on_inspector_detach_window (WebKitWebInspector *inspector, - GwhBrowser *self) -{ - inspector_set_detached (self, TRUE); - - return TRUE; -} - -static gboolean -on_inspector_attach_window (WebKitWebInspector *inspector, - GwhBrowser *self) -{ - inspector_set_detached (self, FALSE); - - return TRUE; + return FALSE; } static gboolean -on_inspector_window_delete_event (GtkWidget *window, - GdkEvent *event, - GwhBrowser *self) +on_inspector_opened (WebKitWebInspector *inspector, + GwhBrowser *self) { - webkit_web_inspector_close (self->priv->inspector); - - return TRUE; + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (self->priv->item_inspector), + TRUE); + return FALSE; } /* web view events hanlding */ @@ -1073,33 +963,6 @@ create_toolbar (GwhBrowser *self) return toolbar; } -static GtkWidget * -create_inspector_window (GwhBrowser *self) -{ - gboolean skips_taskbar; - gboolean window_type; - - g_object_get (self->priv->settings, - "wm-secondary-windows-skip-taskbar", &skips_taskbar, - "wm-secondary-windows-type", &window_type, - NULL); - self->priv->inspector_window_x = self->priv->inspector_window_y = 0; - self->priv->inspector_window = g_object_new (GTK_TYPE_WINDOW, - "type", GTK_WINDOW_TOPLEVEL, - "skip-taskbar-hint", skips_taskbar, - "type-hint", window_type, - "title", _("Web inspector"), - NULL); - g_signal_connect (self->priv->inspector_window, "delete-event", - G_CALLBACK (on_inspector_window_delete_event), self); - g_signal_connect (self->priv->settings, "notify::wm-secondary-windows-skip-taskbar", - G_CALLBACK (on_settings_wm_windows_skip_taskbar_notify), self); - g_signal_connect (self->priv->settings, "notify::wm-secondary-windows-type", - G_CALLBACK (on_settings_wm_windows_type_notify), self); - - return self->priv->inspector_window; -} - static guint get_statusbar_context_id (GtkStatusbar *statusbar) { @@ -1207,7 +1070,6 @@ gwh_browser_init (GwhBrowser *self) GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); self->priv->inspector_web_view = NULL; - self->priv->inspector_window = create_inspector_window (self); gtk_container_add (GTK_CONTAINER (inspector_detached ? self->priv->inspector_window : self->priv->paned), @@ -1226,16 +1088,10 @@ gwh_browser_init (GwhBrowser *self) G_CALLBACK (on_orientation_notify), self); self->priv->inspector = webkit_web_view_get_inspector (WEBKIT_WEB_VIEW (self->priv->web_view)); - g_signal_connect (self->priv->inspector, "inspect-web-view", - G_CALLBACK (on_inspector_inspect_web_view), self); - g_signal_connect (self->priv->inspector, "show-window", - G_CALLBACK (on_inspector_show_window), self); - g_signal_connect (self->priv->inspector, "close-window", - G_CALLBACK (on_inspector_close_window), self); - g_signal_connect (self->priv->inspector, "detach-window", - G_CALLBACK (on_inspector_detach_window), self); - g_signal_connect (self->priv->inspector, "attach-window", - G_CALLBACK (on_inspector_attach_window), self); + g_signal_connect (self->priv->inspector, "bring-to-front", + G_CALLBACK (on_inspector_opened), self); + g_signal_connect (self->priv->inspector, "closed", + G_CALLBACK (on_inspector_closed), self); g_signal_connect (G_OBJECT (self->priv->web_view), "notify::progress", G_CALLBACK (on_web_view_progress_notify), self); @@ -1273,8 +1129,6 @@ gwh_browser_init (GwhBrowser *self) G_CALLBACK (on_settings_browser_bookmarks_notify), self); g_signal_connect (self->priv->settings, "notify::browser-orientation", G_CALLBACK (on_settings_browser_orientation_notify), self); - g_signal_connect (self->priv->settings, "notify::inspector-detached", - G_CALLBACK (on_settings_inspector_detached_notify), self); g_signal_connect (self->priv->settings, "notify::inspector-window-geometry", G_CALLBACK (on_settings_inspector_window_geometry_notify), self); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 5309ec: addons: fixed missing SCI_SETMOUSEDWELLTIME.
by LarsDW223 16 Jan '18

16 Jan '18

Branch: refs/heads/master Author: LarsDW223 <lars_paulsen(a)web.de> Committer: LarsDW223 <lars_paulsen(a)web.de> Date: Tue, 16 Jan 2018 20:04:03 UTC Commit: 5309ece1c53509f5a9fff03f8f9dec23835efce2 https://github.com/geany/geany-plugins/commit/5309ece1c53509f5a9fff03f8f9de… Log Message: ----------- addons: fixed missing SCI_SETMOUSEDWELLTIME. Modified Paths: -------------- addons/src/ao_colortip.c Modified: addons/src/ao_colortip.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -322,12 +322,14 @@ static void ao_color_tip_set_property(GObject *object, guint prop_id, void ao_color_tip_document_new(AoColorTip *colortip, GeanyDocument *document) { connect_document_button_press_signal_handler(colortip, document); + SSM(document->editor->sci, SCI_SETMOUSEDWELLTIME, 300, 0); } void ao_color_tip_document_open(AoColorTip *colortip, GeanyDocument *document) { connect_document_button_press_signal_handler(colortip, document); + SSM(document->editor->sci, SCI_SETMOUSEDWELLTIME, 300, 0); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] d7e345: addons: re-factored function 'get_color_value_at_current_doc_position()' (thanks to b4n).
by LarsDW223 16 Jan '18

16 Jan '18

Branch: refs/heads/master Author: LarsDW223 <lars_paulsen(a)web.de> Committer: LarsDW223 <lars_paulsen(a)web.de> Date: Tue, 16 Jan 2018 20:00:18 UTC Commit: d7e345e1556e5ee4116ced8fccebc1405a5bc24f https://github.com/geany/geany-plugins/commit/d7e345e1556e5ee4116ced8fccebc… Log Message: ----------- addons: re-factored function 'get_color_value_at_current_doc_position()' (thanks to b4n). Modified Paths: -------------- addons/src/ao_colortip.c Modified: addons/src/ao_colortip.c 68 lines changed, 28 insertions(+), 40 deletions(-) =================================================================== @@ -140,46 +140,34 @@ static gint contains_color_value(gchar *string, gint position, gint maxdist) static gint get_color_value_at_current_doc_position(void) { - gchar *subtext; - gint start, end, pos, max, color = -1; - GeanyDocument *doc = document_get_current(); - - g_return_val_if_fail(doc != NULL, FALSE); - - /* Is position valid? */ - pos = sci_get_current_position(doc->editor->sci); - if (pos < 0) - { - return color; - } - max = SSM(doc->editor->sci, SCI_GETTEXTLENGTH, 0, 0); - - /* Calculate range */ - start = pos; - if (start >= 7) - { - start -= 7; - } - else - { - start = 0; - } - end = pos + 7; - if (end > max) - { - end = max; - } - - /* Get text in range and examine it */ - subtext = sci_get_contents_range(doc->editor->sci, start, end); - if (subtext != NULL) - { - pos = pos - start; - color = contains_color_value(subtext, pos, 1); - g_free(subtext); - } - - return color; + gint color = -1; + GeanyDocument *doc = document_get_current(); + gchar *word = editor_get_word_at_pos(doc->editor, -1, "0123456789abcdefABCDEF"); + + if (word) + { + switch (strlen (word)) + { + case 3: + color = ((g_ascii_xdigit_value(word[0]) * 0x11) << 16 | + (g_ascii_xdigit_value(word[1]) * 0x11) << 8 | + (g_ascii_xdigit_value(word[2]) * 0x11) << 0); + break; + case 6: + color = (g_ascii_xdigit_value(word[0]) << 20 | + g_ascii_xdigit_value(word[1]) << 16 | + g_ascii_xdigit_value(word[2]) << 12 | + g_ascii_xdigit_value(word[3]) << 8 | + g_ascii_xdigit_value(word[4]) << 4 | + g_ascii_xdigit_value(word[5]) << 0); + break; + default: + /* invalid color or other format */ + break; + } + } + + return color; } static gboolean on_editor_button_press_event(GtkWidget *widget, GdkEventButton *event, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 4cff84: webhelper: Port context menu to WebKitContextMenu
by Chow Loong Jin 16 Jan '18

16 Jan '18

Branch: refs/heads/master Author: Chow Loong Jin <hyperair(a)debian.org> Committer: Chow Loong Jin <hyperair(a)debian.org> Date: Tue, 16 Jan 2018 18:11:33 UTC Commit: 4cff84632ca8f314e4438d6df5a88a24204784d4 https://github.com/geany/geany-plugins/commit/4cff84632ca8f314e4438d6df5a88… Log Message: ----------- webhelper: Port context menu to WebKitContextMenu Modified Paths: -------------- webhelper/src/gwh-browser.c webhelper/src/gwh-browser.h webhelper/src/gwh-plugin.c Modified: webhelper/src/gwh-browser.c 152 lines changed, 89 insertions(+), 63 deletions(-) =================================================================== @@ -27,6 +27,7 @@ #include <string.h> #include <glib.h> #include <glib/gi18n-lib.h> +#include <gio/gio.h> #include <gtk/gtk.h> #include <webkit2/webkit2.h> @@ -597,8 +598,9 @@ on_web_view_progress_notify (GObject *object, static void -on_item_flip_orientation_activate (GtkMenuItem *item, - GwhBrowser *self) +on_item_flip_orientation_activate (GSimpleAction *action, + GVariant *parameter, + GwhBrowser *self) { gtk_orientable_set_orientation (GTK_ORIENTABLE (self), gtk_orientable_get_orientation (GTK_ORIENTABLE (self)) == GTK_ORIENTATION_VERTICAL @@ -607,20 +609,24 @@ on_item_flip_orientation_activate (GtkMenuItem *item, } static void -on_item_zoom_100_activate (GtkMenuItem *item, - GwhBrowser *self) +on_item_zoom_100_activate (WebKitWebView *view) { - webkit_web_view_set_zoom_level (WEBKIT_WEB_VIEW (self->priv->web_view), 1.0); + webkit_web_view_set_zoom_level (view, 1.0); } static void -on_item_full_content_zoom_activate (GtkCheckMenuItem *item, - GwhBrowser *self) +on_item_full_content_zoom_activate (GSimpleAction *action, + GVariant *dummy_parameter, + GwhBrowser *self) { WebKitSettings *settings; + gboolean zoom_text_only; + settings = webkit_web_view_get_settings (WEBKIT_WEB_VIEW (self->priv->web_view)); - webkit_settings_set_zoom_text_only (settings, !gtk_check_menu_item_get_active (item)); + zoom_text_only = !webkit_settings_get_zoom_text_only (settings); + webkit_settings_set_zoom_text_only (settings, zoom_text_only); + g_simple_action_set_state (action, g_variant_new_boolean (!zoom_text_only)); } static void web_view_zoom (WebKitWebView *view, gdouble factor) @@ -639,68 +645,88 @@ static void web_view_zoom_out (WebKitWebView *view) web_view_zoom (view, zoom_out_factor); } -static void -on_web_view_populate_popup (WebKitWebView *view, - GtkMenu *menu, - GwhBrowser *self) +static gboolean +on_web_view_context_menu (WebKitWebView *view, + WebKitContextMenu *context_menu, + GdkEvent *event, + WebKitHitTestResult *hit_test_result, + GwhBrowser *self) { - GtkWidget *item; - GtkWidget *submenu; - - #define ADD_SEPARATOR(menu) \ - item = gtk_separator_menu_item_new (); \ - gtk_widget_show (item); \ - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item) - - ADD_SEPARATOR (menu); - + WebKitContextMenuItem *item; + WebKitContextMenu *submenu; + GAction *action; + GVariant *action_state; + + webkit_context_menu_append (context_menu, + webkit_context_menu_item_new_separator ()); + /* Zoom menu */ - submenu = gtk_menu_new (); - item = gtk_menu_item_new_with_mnemonic (_("_Zoom")); - gtk_widget_show (item); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + submenu = webkit_context_menu_new (); + item = webkit_context_menu_item_new_with_submenu (_("_Zoom"), submenu); + webkit_context_menu_append (context_menu, item); + /* zoom in */ - item = gtk_image_menu_item_new_from_stock (GTK_STOCK_ZOOM_IN, NULL); - g_signal_connect_swapped (item, "activate", + action = g_simple_action_new ("zoom-in", NULL); + g_signal_connect_swapped (action, "activate", G_CALLBACK (web_view_zoom_in), view); - gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item); + item = webkit_context_menu_item_new_from_gaction (action, _("Zoom _In"), + NULL); + webkit_context_menu_append (submenu, item); + /* zoom out */ - item = gtk_image_menu_item_new_from_stock (GTK_STOCK_ZOOM_OUT, NULL); - g_signal_connect_swapped (item, "activate", + action = g_simple_action_new ("zoom-out", NULL); + g_signal_connect_swapped (action, "activate", G_CALLBACK (web_view_zoom_out), view); - gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item); + item = webkit_context_menu_item_new_from_gaction (action, _("Zoom _Out"), + NULL); + webkit_context_menu_append (submenu, item); + /* zoom 1:1 */ - ADD_SEPARATOR (submenu); - item = gtk_image_menu_item_new_from_stock (GTK_STOCK_ZOOM_100, NULL); - g_signal_connect (item, "activate", - G_CALLBACK (on_item_zoom_100_activate), self); - gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item); + webkit_context_menu_append (submenu, + webkit_context_menu_item_new_separator ()); + action = g_simple_action_new ("zoom-reset", NULL); + g_signal_connect_swapped (action, "activate", + G_CALLBACK (on_item_zoom_100_activate), view); + item = webkit_context_menu_item_new_from_gaction (action, _("_Reset Zoom"), + NULL); + webkit_context_menu_append (submenu, item); + /* full content zoom */ - ADD_SEPARATOR (submenu); - item = gtk_check_menu_item_new_with_mnemonic (_("Full-_content zoom")); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), - !webkit_settings_get_zoom_text_only (webkit_web_view_get_settings(view))); - g_signal_connect (item, "activate", - G_CALLBACK (on_item_full_content_zoom_activate), self); - gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item); - /* show zoom sumbenu */ - gtk_widget_show_all (submenu); - - ADD_SEPARATOR (menu); - - item = gtk_menu_item_new_with_label (_("Flip panes orientation")); - g_signal_connect (item, "activate", - G_CALLBACK (on_item_flip_orientation_activate), self); - gtk_widget_show (item); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + webkit_context_menu_append (submenu, + webkit_context_menu_item_new_separator ()); + action_state = g_variant_new_boolean ( + webkit_settings_get_zoom_text_only (webkit_web_view_get_settings (view))); + + action = g_simple_action_new_stateful ( + "full-content-zoom", + NULL, + action_state + ); + item = webkit_context_menu_item_new_from_gaction (action, + _("Full-_content zoom"), + NULL); + g_simple_action_set_enabled (action, TRUE); + webkit_context_menu_append (submenu, item); + g_signal_connect (action, "activate", + on_item_full_content_zoom_activate, self); + + /* flip panes orientation */ + webkit_context_menu_append (context_menu, + webkit_context_menu_item_new_separator ()); + action = g_simple_action_new ("flip-panes", NULL); + g_signal_connect_swapped (action, "activate", + G_CALLBACK (on_item_flip_orientation_activate), + view); + item = webkit_context_menu_item_new_from_gaction ( + action, _("_Flip panes orientation"), NULL); + webkit_context_menu_append (context_menu, item); if (! INSPECTOR_VISIBLE (self) || INSPECTOR_DETACHED (self)) { - gtk_widget_set_sensitive (item, FALSE); + g_simple_action_set_enabled (action, FALSE); } - - #undef ADD_SEPARATOR - - g_signal_emit (self, signals[POPULATE_POPUP], 0, menu); + + g_signal_emit (self, signals[POPULATE_POPUP], 0, context_menu); + + return FALSE; } static gboolean @@ -905,7 +931,7 @@ gwh_browser_class_init (GwhBrowserClass *klass) G_STRUCT_OFFSET (GwhBrowserClass, populate_popup), NULL, NULL, g_cclosure_marshal_VOID__OBJECT, - G_TYPE_NONE, 1, GTK_TYPE_MENU); + G_TYPE_NONE, 1, WEBKIT_TYPE_CONTEXT_MENU); g_object_class_override_property (object_class, PROP_ORIENTATION, @@ -1221,8 +1247,8 @@ gwh_browser_init (GwhBrowser *self) G_CALLBACK (on_web_view_load_failed), self); g_signal_connect (G_OBJECT (self->priv->web_view), "notify::favicon", G_CALLBACK (on_web_view_favicon_notify), self); - g_signal_connect (G_OBJECT (self->priv->web_view), "populate-popup", - G_CALLBACK (on_web_view_populate_popup), self); + g_signal_connect (G_OBJECT (self->priv->web_view), "context-menu", + G_CALLBACK (on_web_view_context_menu), self); g_signal_connect (G_OBJECT (self->priv->web_view), "scroll-event", G_CALLBACK (on_web_view_scroll_event), self); g_signal_connect (G_OBJECT (self->priv->web_view), "hovering-over-link", Modified: webhelper/src/gwh-browser.h 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -56,8 +56,8 @@ struct _GwhBrowserClass { GtkVBoxClass parent_class; - void (*populate_popup) (GwhBrowser *browser, - GtkMenu *menu); + void (*populate_popup) (GwhBrowser *browser, + WebKitContextMenu *menu); }; Modified: webhelper/src/gwh-plugin.c 50 lines changed, 31 insertions(+), 19 deletions(-) =================================================================== @@ -240,33 +240,45 @@ on_document_save (GObject *obj, } static void -on_item_auto_reload_toggled (GtkCheckMenuItem *item, - gpointer dummy) +on_item_auto_reload_toggled (GAction *action, + GVariant *parameter, + gpointer dummy) { + gboolean browser_auto_reload; + + g_object_get (G_OBJECT (G_settings), + "browser-auto-reload", &browser_auto_reload, NULL); g_object_set (G_OBJECT (G_settings), "browser-auto-reload", - gtk_check_menu_item_get_active (item), NULL); + !browser_auto_reload, NULL); + g_simple_action_set_state (action, g_variant_new_boolean (browser_auto_reload)); } static void -on_browser_populate_popup (GwhBrowser *browser, - GtkMenu *menu, - gpointer dummy) +on_browser_populate_popup (GwhBrowser *browser, + WebKitContextMenu *menu, + gpointer dummy) { - GtkWidget *item; - gboolean auto_reload = FALSE; - - item = gtk_separator_menu_item_new (); - gtk_widget_show (item); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - + GAction *action; + gboolean auto_reload = FALSE; + GVariant *action_state; + WebKitContextMenuItem *item; + + webkit_context_menu_append (menu, + webkit_context_menu_item_new_separator ()); + g_object_get (G_OBJECT (G_settings), "browser-auto-reload", &auto_reload, NULL); - item = gtk_check_menu_item_new_with_mnemonic (_("Reload upon document saving")); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), auto_reload); - gtk_widget_show (item); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - g_signal_connect (item, "toggled", G_CALLBACK (on_item_auto_reload_toggled), - NULL); + action_state = g_variant_new_boolean (auto_reload); + action = g_simple_action_new_stateful ( + "browser-auto-reload", + NULL, + action_state + ); + item = webkit_context_menu_item_new_from_gaction ( + action, _("Reload upon document saving"), NULL); + webkit_context_menu_append (menu, item); + g_signal_connect (action, "activate", + on_item_auto_reload_toggled, NULL); } static void -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits January 2018