Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Thu, 09 Jun 2016 10:06:09 UTC Commit: 22dea9e5995ab98683b74afebb12a3e034c5bab0 https://github.com/geany/geany-plugins/commit/22dea9e5995ab98683b74afebb12a3...
Log Message: ----------- Merge branch 'geanyprj/less-deprecated' of https://github.com/b4n/geany-plugins
Conflicts: geanyprj/src/geanyprj.c
Modified Paths: -------------- geanyprj/src/geanyprj.c geanyprj/src/menu.c
Modified: geanyprj/src/geanyprj.c 8 lines changed, 5 insertions(+), 3 deletions(-) =================================================================== @@ -39,6 +39,7 @@ PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, "GeanyPrj", _("Alternative project support."), VERSION, "Yura Siamashka yurand2@gmail.com")
+GeanyPlugin *geany_plugin; GeanyData *geany_data;
@@ -53,8 +54,6 @@ enum KB_COUNT };
-PLUGIN_KEY_GROUP(geanyprj, KB_COUNT) -
static void reload_project(void) { @@ -210,6 +209,8 @@ static void on_configure_response(G_GNUC_UNUSED GtkDialog *dialog, G_GNUC_UNUSED /* Called by Geany to initialize the plugin */ void plugin_init(G_GNUC_UNUSED GeanyData *data) { + GeanyKeyGroup *key_group; + load_settings(); tools_menu_init();
@@ -218,7 +219,8 @@ void plugin_init(G_GNUC_UNUSED GeanyData *data) create_sidebar(); reload_project();
- keybindings_set_item(plugin_key_group, KB_FIND_IN_PROJECT, + key_group = plugin_set_key_group(geany_plugin, "geanyprj", KB_COUNT, NULL); + keybindings_set_item(key_group, KB_FIND_IN_PROJECT, kb_find_in_project, 0, 0, "find_in_project", _("Find a text in geanyprj's project"), NULL); }
Modified: geanyprj/src/menu.c 24 lines changed, 11 insertions(+), 13 deletions(-) =================================================================== @@ -28,10 +28,10 @@
#include "geanyprj.h"
-PluginFields *plugin_fields; - static struct { + GtkWidget *tools_item; + GtkWidget *new_project; GtkWidget *delete_project;
@@ -156,7 +156,7 @@ static PropertyDialogElements *build_properties_dialog(gboolean properties) gtk_misc_set_alignment(GTK_MISC(label), 1, 0);
e->base_path = gtk_entry_new(); - ui_widget_set_tooltip_text(e->base_path, + gtk_widget_set_tooltip_text(e->base_path, _("Base directory of all files that make up the project. " "This can be a new path, or an existing directory tree. " "You can use paths relative to the project filename.")); @@ -168,7 +168,7 @@ static PropertyDialogElements *build_properties_dialog(gboolean properties)
label = gtk_label_new(""); e->regenerate = gtk_check_button_new_with_label(_("Generate file list on load")); - ui_widget_set_tooltip_text(e->regenerate, + gtk_widget_set_tooltip_text(e->regenerate, _("Automatically add files that match project type on project load " "automatically. You can't manually add/remove files if " "you checked this option, since your modification will be lost on " @@ -362,16 +362,15 @@ void tools_menu_init(void) { GtkWidget *item, *image;
- GtkWidget *menu_prj = NULL; GtkWidget *menu_prj_menu = NULL;
- menu_prj = gtk_image_menu_item_new_with_mnemonic(_("_Project")); - gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), menu_prj); + menu_items.tools_item = gtk_image_menu_item_new_with_mnemonic(_("_Project")); + gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), menu_items.tools_item);
- g_signal_connect((gpointer) menu_prj, "activate", G_CALLBACK(update_menu_items), NULL); + g_signal_connect((gpointer) menu_items.tools_item, "activate", G_CALLBACK(update_menu_items), NULL);
menu_prj_menu = gtk_menu_new(); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_prj), menu_prj_menu); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_items.tools_item), menu_prj_menu);
image = gtk_image_new_from_stock(GTK_STOCK_NEW, GTK_ICON_SIZE_MENU); item = gtk_image_menu_item_new_with_mnemonic(_("New Project")); @@ -423,14 +422,13 @@ void tools_menu_init(void) g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_find_in_project), NULL); menu_items.find_in_files = item;
- gtk_widget_show_all(menu_prj); + gtk_widget_show_all(menu_items.tools_item);
- plugin_fields->menu_item = menu_prj; - plugin_fields->flags = PLUGIN_IS_DOCUMENT_SENSITIVE; + ui_add_document_sensitive(menu_items.tools_item); }
void tools_menu_uninit(void) { - gtk_widget_destroy(plugin_fields->menu_item); + gtk_widget_destroy(menu_items.tools_item); }
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).