Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Sat, 20 Feb 2016 21:55:04 UTC
Commit: 19ccd0baa7d0b4cc661cc160a5631d0ee23cedb0
https://github.com/geany/geany-plugins/commit/19ccd0baa7d0b4cc661cc160a5631…
Log Message:
-----------
tableconvert: Drop use of the most obvious deprecated Geany API
Modified Paths:
--------------
tableconvert/src/tableconvert_ui.c
Modified: tableconvert/src/tableconvert_ui.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -39,7 +39,7 @@ void init_menuentries(void)
/* Build up menu entry for table_convert based on global file type*/
main_menu_item = gtk_menu_item_new_with_mnemonic(_("_Convert to table"));
gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), main_menu_item);
- ui_widget_set_tooltip_text(main_menu_item,
+ gtk_widget_set_tooltip_text(main_menu_item,
_("Converts current marked list to a table."));
g_signal_connect(G_OBJECT(main_menu_item), "activate", G_CALLBACK(cb_table_convert), NULL);
gtk_widget_show_all(main_menu_item);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Sat, 20 Feb 2016 17:44:03 UTC
Commit: 3ffb00fee6d77b12f87df6ce2586fab7db38a111
https://github.com/geany/geany-plugins/commit/3ffb00fee6d77b12f87df6ce2586f…
Log Message:
-----------
geanygendoc: Drop use of the most obvious deprecated Geany API
Modified Paths:
--------------
geanygendoc/src/ggd-plugin.c
Modified: geanygendoc/src/ggd-plugin.c
10 lines changed, 5 insertions(+), 5 deletions(-)
===================================================================
@@ -457,7 +457,7 @@ menu_add_item (GtkMenuShell *menu,
gtk_image_new_from_stock (stock_image,
GTK_ICON_SIZE_MENU));
}
- ui_widget_set_tooltip_text (item, tooltip);
+ gtk_widget_set_tooltip_text (item, tooltip);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
if (activate_handler) {
g_signal_connect (item, "activate", activate_handler, activate_data);
@@ -623,7 +623,7 @@ plugin_configure (GtkDialog *dialog)
/* auto-save */
widget = gtk_check_button_new_with_mnemonic (_("_Save file before generating "
"documentation"));
- ui_widget_set_tooltip_text (widget,
+ gtk_widget_set_tooltip_text (widget,
_("Whether the current document should be saved to disc before generating "
"the documentation. This is a technical detail, but it is currently "
"needed to have an up-to-date tag list. If you disable this option and "
@@ -635,7 +635,7 @@ plugin_configure (GtkDialog *dialog)
gtk_box_pack_start (GTK_BOX (box2), widget, FALSE, FALSE, 0);
/* indent */
widget = gtk_check_button_new_with_mnemonic (_("_Indent inserted documentation"));
- ui_widget_set_tooltip_text (widget,
+ gtk_widget_set_tooltip_text (widget,
_("Whether the inserted documentation should be indented to fit the "
"indentation at the insertion position."));
ggd_opt_group_set_proxy_gtktogglebutton (plugin->config, &GGD_OPT_indent,
@@ -652,7 +652,7 @@ plugin_configure (GtkDialog *dialog)
ggd_doctype_selector_set_doctype (GGD_DOCTYPE_SELECTOR (GGD_W_doctype_selector),
i, GGD_OPT_doctype[i]);
}
- ui_widget_set_tooltip_text (GGD_W_doctype_selector,
+ gtk_widget_set_tooltip_text (GGD_W_doctype_selector,
_("Choose the documentation type to use with each file type. The special "
"language \"All\" on top of the list is used to choose the default "
"documentation type, used for all languages that haven't one set."));
@@ -660,7 +660,7 @@ plugin_configure (GtkDialog *dialog)
/* Environ editor */
widget = ggd_frame_new (_("Global environment"));
- ui_widget_set_tooltip_text (widget,
+ gtk_widget_set_tooltip_text (widget,
_("Global environment overrides and additions. This environment will be "
"merged with the file-type-specific ones."));
{
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Sat, 20 Feb 2016 16:28:52 UTC
Commit: f28010e78d1870c85176e04e10b7ea8d255657bc
https://github.com/geany/geany-plugins/commit/f28010e78d1870c85176e04e10b7e…
Log Message:
-----------
addons: Drop use of the most obvious deprecated Geany API
Modified Paths:
--------------
addons/src/addons.c
addons/src/ao_openuri.c
Modified: addons/src/addons.c
10 lines changed, 5 insertions(+), 5 deletions(-)
===================================================================
@@ -463,17 +463,17 @@ GtkWidget *plugin_configure(GtkDialog *dialog)
g_signal_connect(check_doclist, "toggled", G_CALLBACK(ao_configure_doclist_toggled_cb), dialog);
radio_doclist_name = gtk_radio_button_new_with_mnemonic(NULL, _("Sort documents by _name"));
- ui_widget_set_tooltip_text(radio_doclist_name,
+ gtk_widget_set_tooltip_text(radio_doclist_name,
_("Sort the documents in the list by their filename"));
radio_doclist_tab_order = gtk_radio_button_new_with_mnemonic_from_widget(
GTK_RADIO_BUTTON(radio_doclist_name), _("Sort documents by _occurrence"));
- ui_widget_set_tooltip_text(radio_doclist_tab_order,
+ gtk_widget_set_tooltip_text(radio_doclist_tab_order,
_("Sort the documents in the order of the document tabs"));
radio_doclist_tab_order_reversed = gtk_radio_button_new_with_mnemonic_from_widget(
GTK_RADIO_BUTTON(radio_doclist_name), _("Sort documents by _occurrence (reversed)"));
- ui_widget_set_tooltip_text(radio_doclist_tab_order_reversed,
+ gtk_widget_set_tooltip_text(radio_doclist_tab_order_reversed,
_("Sort the documents in the order of the document tabs (reversed)"));
switch (ao_info->doclist_sort_mode)
@@ -516,14 +516,14 @@ GtkWidget *plugin_configure(GtkDialog *dialog)
_("Show tasks of all documents"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_tasks_scan_mode),
ao_info->tasks_scan_all_documents);
- ui_widget_set_tooltip_text(check_tasks_scan_mode,
+ gtk_widget_set_tooltip_text(check_tasks_scan_mode,
_("Whether to show the tasks of all open documents in the list or only those of the current document."));
entry_tasks_tokens = gtk_entry_new();
if (!EMPTY(ao_info->tasks_token_list))
gtk_entry_set_text(GTK_ENTRY(entry_tasks_tokens), ao_info->tasks_token_list);
ui_entry_add_clear_icon(GTK_ENTRY(entry_tasks_tokens));
- ui_widget_set_tooltip_text(entry_tasks_tokens,
+ gtk_widget_set_tooltip_text(entry_tasks_tokens,
_("Specify a semicolon separated list of search tokens."));
label_tasks_tokens = gtk_label_new_with_mnemonic(_("Search tokens:"));
Modified: addons/src/ao_openuri.c
6 lines changed, 1 insertions(+), 5 deletions(-)
===================================================================
@@ -244,11 +244,7 @@ void ao_open_uri_update_menu(AoOpenUri *openuri, GeanyDocument *doc, gint pos)
/* if we have a selection, prefer it over the current word */
if (sci_has_selection(doc->editor->sci))
- {
- gint len = sci_get_selected_text_length(doc->editor->sci);
- text = g_malloc0((guint)len + 1);
- sci_get_selected_text(doc->editor->sci, text);
- }
+ text = sci_get_selection_contents(doc->editor->sci);
else
text = editor_get_word_at_pos(doc->editor, pos, GEANY_WORDCHARS"@.://-?&%#=~+,;");
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Thu, 18 Feb 2016 22:05:13 UTC
Commit: 47d07f6c4053a9942f23604eca944a04c2de7e4f
https://github.com/geany/geany-plugins/commit/47d07f6c4053a9942f23604eca944…
Log Message:
-----------
Merge pull request #351 from techee/tags_are_symbols
projectorganizer: Use the word "symbol" instead of "tag"
Modified Paths:
--------------
projectorganizer/README
projectorganizer/src/prjorg-menu.c
projectorganizer/src/prjorg-project.c
projectorganizer/src/prjorg-sidebar.c
Modified: projectorganizer/README
32 lines changed, 16 insertions(+), 16 deletions(-)
===================================================================
@@ -9,7 +9,7 @@ About
Project Organizer is an extension of Geany's project management displaying a tree of
files belonging to the project in the sidebar. In addition, it enables complete indexing
-of the project files (and having code completion, syntax highlighting and tag
+of the project files (and having code completion, syntax highlighting and symbol
definition/declaration jumps for the whole project) quick swapping between header
and source files, improved opening of includes, searching project files by name
and more. External directories can be attached to the project to extend the plugin's
@@ -93,12 +93,12 @@ In addition, you can define patterns for files and directories that should be ig
searching for files belonging to the project. These will typically be various binary
files and VCS or hidden directories.
-Finally, you can specify whether the tag manager should be used to index all the project
-files or not. The default settings is Auto which means that if the total number
-of project (and external directory) files is less than 500, tags are generated.
+Finally, you can specify whether all the project files should be indexed or not.
+The default settings is Auto which means that if the total number
+of project (and external directory) files is less than 300, indexing is performed.
This is a rather conservative number, at least for an SSD disk - Project Organizer
was tested with tens of thousands project files and even though the initial scanning
-may take some time (for the linux kernel with 35000 files and 2300000 tags it takes
+may take some time (for the linux kernel with 35000 files and 2300000 symbols it takes
about 20s with an SSD disk), the work with the project is completely normal afterwards.
However, with ordinary HDD expect only around 100 scanned files per second because
of slow random access time.
@@ -116,21 +116,21 @@ files. When a sidebar item is right-clicked, a context menu appears:
to the clicked directory
* Find file - opens the Find file dialog and sets the search directory to the
clicked directory
-* Find tag - opens the Find tag dialog and sets the search directory to the
+* Find symbol - opens the Find symbol dialog and sets the search directory to the
clicked directory
* Remove external directory - removes a previously added external directory from
the project
The following actions can be invoked from the sidebar's toolbar:
-* Reload all - reloads the project file tree and reindexes the files (if tag generation
+* Reload all - reloads the project file tree and reindexes the files (if symbol generation
enabled). This is useful when files were added, modified externally or removed from
the project.
* Add external directory - adds an additional directory related to the project (e.g.
it is useful to have the geany project as an external directory for the geany-plugins
- project). External directories are indexed using the tag manager, and basically
+ project). External directories are indexed, and basically
all Project Organizer features work with external directories too (find file or
- find in files from the context menu, swap header/source, open selected file, tag
+ find in files from the context menu, swap header/source, open selected file, symbol
definition/declaration jumps, and active editor following). Apart from adding related
projects, one of the possible uses is the addition of system header directories,
e.g. /usr/include/gtk-2.0, and having them indexed for code completion and syntax
@@ -150,7 +150,7 @@ Project Organizer adds some extra entries under the Project menu:
to the base directory of the project
* Find Project File - opens the Find file dialog which can be used to find files
within the project or external directories
-* Find Project Tag - opens the Find tag dialog which can be used to find tags
+* Find Project Symbol - opens the Find symbol dialog which can be used to find symbols
within the project or external directories
* Swap Header/Source - if the current file matches one of the source patterns from
the properties, it opens a project file with the same base name (without extension)
@@ -172,18 +172,18 @@ The following search properties are configurable:
* Search in full path - when not checked, the search is performed in the file
name only (excluding path); when checked, the search is performed in the full path
-Find tag dialog
+Find symbol dialog
----------------
-The Find tag dialog can be invoked either from the Project menu or from the
+The Find symbol dialog can be invoked either from the Project menu or from the
sidebar's context menu. Searches are performed within the "Search inside" directory.
There are several search types:
-* prefix (default) - finds all tags with the specified prefix
-* exact - finds all tags matching the name exactly
-* pattern - finds all tags matching the provided glob pattern
+* prefix (default) - finds all symbols with the specified prefix
+* exact - finds all symbols matching the name exactly
+* pattern - finds all symbols matching the provided glob pattern
-By default, tag definitions are searched; to search tag declarations, select the
+By default, symbol definitions are searched; to search symbol declarations, select the
Declaration option.
Editor context menu
Modified: projectorganizer/src/prjorg-menu.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -403,13 +403,13 @@ void prjorg_menu_init(void)
image = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
gtk_widget_show(image);
- s_ft_item = gtk_image_menu_item_new_with_mnemonic(_("Find Project Tag..."));
+ s_ft_item = gtk_image_menu_item_new_with_mnemonic(_("Find Project Symbol..."));
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(s_ft_item), image);
gtk_widget_show(s_ft_item);
gtk_container_add(GTK_CONTAINER(geany->main_widgets->project_menu), s_ft_item);
g_signal_connect((gpointer) s_ft_item, "activate", G_CALLBACK(on_find_tag), NULL);
keybindings_set_item(key_group, KB_FIND_TAG, NULL,
- 0, 0, "find_tag", _("Find project tag"), s_ft_item);
+ 0, 0, "find_tag", _("Find project symbol"), s_ft_item);
s_shs_item = gtk_menu_item_new_with_mnemonic(_("Swap Header/Source"));
gtk_widget_show(s_shs_item);
Modified: projectorganizer/src/prjorg-project.c
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -620,16 +620,16 @@ gint prjorg_project_add_properties_tab(GtkWidget *notebook)
gtk_entry_set_text(GTK_ENTRY(e->ignored_dirs_patterns), str);
g_free(str);
- label = gtk_label_new(_("Generate tags for all project files:"));
+ label = gtk_label_new(_("Index all project files:"));
gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
e->generate_tag_prefs = gtk_combo_box_text_new();
- gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(e->generate_tag_prefs), _("Auto (generate if less than 300 files)"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(e->generate_tag_prefs), _("Auto (index if less than 300 files)"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(e->generate_tag_prefs), _("Yes"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(e->generate_tag_prefs), _("No"));
gtk_combo_box_set_active(GTK_COMBO_BOX(e->generate_tag_prefs), prj_org->generate_tag_prefs);
ui_table_add_row(GTK_TABLE(table), 4, label, e->generate_tag_prefs, NULL);
ui_widget_set_tooltip_text(e->generate_tag_prefs,
- _("Generate tag list for all project files instead of only for the currently opened files. "
+ _("Generate symbol list for all project files instead of only for the currently opened files. "
"Might be slow for big projects."));
gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 6);
Modified: projectorganizer/src/prjorg-sidebar.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -440,7 +440,7 @@ static void create_dialog_find_tag(void)
return;
s_ft_dialog.widget = gtk_dialog_new_with_buttons(
- _("Find Tag"), GTK_WINDOW(geany->main_widgets->window),
+ _("Find Symbol"), GTK_WINDOW(geany->main_widgets->window),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL);
gtk_dialog_add_button(GTK_DIALOG(s_ft_dialog.widget), "gtk-find", GTK_RESPONSE_ACCEPT);
@@ -1389,7 +1389,7 @@ void prjorg_sidebar_init(void)
image = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_MENU);
gtk_widget_show(image);
- item = gtk_image_menu_item_new_with_mnemonic(_("Find Tag..."));
+ item = gtk_image_menu_item_new_with_mnemonic(_("Find Symbol..."));
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image);
gtk_widget_show(item);
gtk_container_add(GTK_CONTAINER(s_popup_menu.widget), item);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).