lists.geany.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
List overview
Commits
June 2014
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
commits@lists.geany.org
1 participants
35 discussions
Start a n
N
ew thread
[geany/geany] 0d03fa: Move date insert callbacks to the UI code where they belong
by Colomban Wendling
26 Jun '14
26 Jun '14
Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 26 Jun 2014 16:36:51 UTC Commit: 0d03fad7bf478b7bd7aeaee04b1d04be96eb8e86
https://github.com/geany/geany/commit/0d03fad7bf478b7bd7aeaee04b1d04be96eb8…
Log Message: ----------- Move date insert callbacks to the UI code where they belong Modified Paths: -------------- src/callbacks.c src/callbacks.h src/ui_utils.c Modified: src/callbacks.c 73 lines changed, 0 insertions(+), 73 deletions(-) =================================================================== @@ -1286,79 +1286,6 @@ G_MODULE_EXPORT void on_comments_fileheader_activate(GtkMenuItem *menuitem, gpoi } -static void insert_date(GeanyDocument *doc, gint pos, const gchar *date_style) -{ - const gchar *format = NULL; - gchar *time_str; - - g_return_if_fail(doc != NULL); - g_return_if_fail(pos == -1 || pos >= 0); - - if (pos == -1) - pos = sci_get_current_position(doc->editor->sci); - - /* set default value */ - if (utils_str_equal("", ui_prefs.custom_date_format)) - { - g_free(ui_prefs.custom_date_format); - ui_prefs.custom_date_format = g_strdup("%d.%m.%Y"); - } - - if (utils_str_equal(_("dd.mm.yyyy"), date_style)) - format = "%d.%m.%Y"; - else if (utils_str_equal(_("mm.dd.yyyy"), date_style)) - format = "%m.%d.%Y"; - else if (utils_str_equal(_("yyyy/mm/dd"), date_style)) - format = "%Y/%m/%d"; - else if (utils_str_equal(_("dd.mm.yyyy hh:mm:ss"), date_style)) - format = "%d.%m.%Y %H:%M:%S"; - else if (utils_str_equal(_("mm.dd.yyyy hh:mm:ss"), date_style)) - format = "%m.%d.%Y %H:%M:%S"; - else if (utils_str_equal(_("yyyy/mm/dd hh:mm:ss"), date_style)) - format = "%Y/%m/%d %H:%M:%S"; - else if (utils_str_equal(_("_Use Custom Date Format"), date_style)) - format = ui_prefs.custom_date_format; - else - { - gchar *str = dialogs_show_input(_("Custom Date Format"), GTK_WINDOW(main_widgets.window), - _("Enter here a custom date and time format. " - "You can use any conversion specifiers which can be used with the ANSI C strftime function."), - ui_prefs.custom_date_format); - if (str) - SETPTR(ui_prefs.custom_date_format, str); - return; - } - - time_str = utils_get_date_time(format, NULL); - if (time_str != NULL) - { - sci_start_undo_action(doc->editor->sci); - sci_insert_text(doc->editor->sci, pos, time_str); - sci_goto_pos(doc->editor->sci, pos + strlen(time_str), FALSE); - sci_end_undo_action(doc->editor->sci); - g_free(time_str); - } - else - { - utils_beep(); - ui_set_statusbar(TRUE, - _("Date format string could not be converted (possibly too long).")); - } -} - - -void on_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data) -{ - insert_date(document_get_current(), editor_info.click_pos, user_data); -} - - -void on_menu_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data) -{ - insert_date(document_get_current(), -1, user_data); -} - - G_MODULE_EXPORT void on_file_properties_activate(GtkMenuItem *menuitem, gpointer user_data) { GeanyDocument *doc = document_get_current(); Modified: src/callbacks.h 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -104,8 +104,6 @@ void on_toolbutton_compile_clicked(GtkAction *action, gpointer user_data); G_MODULE_EXPORT void on_line_wrapping1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); -void on_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data); - void on_toolbutton_goto_entry_activate(GtkAction *action, const gchar *text, gpointer user_data); void on_toolbutton_goto_clicked(GtkAction *action, gpointer user_data); @@ -132,8 +130,6 @@ G_MODULE_EXPORT void on_menu_toggle_line_commentation1_activate(GtkMenuItem *men G_MODULE_EXPORT void on_next_message1_activate(GtkMenuItem *menuitem, gpointer user_data); -void on_menu_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data); - G_MODULE_EXPORT void on_project_new1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_project_open1_activate(GtkMenuItem *menuitem, gpointer user_data); Modified: src/ui_utils.c 77 lines changed, 75 insertions(+), 2 deletions(-) =================================================================== @@ -679,6 +679,79 @@ void ui_create_insert_menu_items(void) } +static void insert_date(GeanyDocument *doc, gint pos, const gchar *date_style) +{ + const gchar *format = NULL; + gchar *time_str; + + g_return_if_fail(doc != NULL); + g_return_if_fail(pos == -1 || pos >= 0); + + if (pos == -1) + pos = sci_get_current_position(doc->editor->sci); + + /* set default value */ + if (utils_str_equal("", ui_prefs.custom_date_format)) + { + g_free(ui_prefs.custom_date_format); + ui_prefs.custom_date_format = g_strdup("%d.%m.%Y"); + } + + if (utils_str_equal(_("dd.mm.yyyy"), date_style)) + format = "%d.%m.%Y"; + else if (utils_str_equal(_("mm.dd.yyyy"), date_style)) + format = "%m.%d.%Y"; + else if (utils_str_equal(_("yyyy/mm/dd"), date_style)) + format = "%Y/%m/%d"; + else if (utils_str_equal(_("dd.mm.yyyy hh:mm:ss"), date_style)) + format = "%d.%m.%Y %H:%M:%S"; + else if (utils_str_equal(_("mm.dd.yyyy hh:mm:ss"), date_style)) + format = "%m.%d.%Y %H:%M:%S"; + else if (utils_str_equal(_("yyyy/mm/dd hh:mm:ss"), date_style)) + format = "%Y/%m/%d %H:%M:%S"; + else if (utils_str_equal(_("_Use Custom Date Format"), date_style)) + format = ui_prefs.custom_date_format; + else + { + gchar *str = dialogs_show_input(_("Custom Date Format"), GTK_WINDOW(main_widgets.window), + _("Enter here a custom date and time format. " + "You can use any conversion specifiers which can be used with the ANSI C strftime function."), + ui_prefs.custom_date_format); + if (str) + SETPTR(ui_prefs.custom_date_format, str); + return; + } + + time_str = utils_get_date_time(format, NULL); + if (time_str != NULL) + { + sci_start_undo_action(doc->editor->sci); + sci_insert_text(doc->editor->sci, pos, time_str); + sci_goto_pos(doc->editor->sci, pos + strlen(time_str), FALSE); + sci_end_undo_action(doc->editor->sci); + g_free(time_str); + } + else + { + utils_beep(); + ui_set_statusbar(TRUE, + _("Date format string could not be converted (possibly too long).")); + } +} + + +static void on_popup_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data) +{ + insert_date(document_get_current(), editor_info.click_pos, user_data); +} + + +static void on_menu_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data) +{ + insert_date(document_get_current(), -1, user_data); +} + + static void insert_date_items(GtkMenu *me, GtkMenu *mp, gchar *label) { GtkWidget *item; @@ -691,7 +764,7 @@ static void insert_date_items(GtkMenu *me, GtkMenu *mp, gchar *label) item = gtk_menu_item_new_with_mnemonic(label); gtk_container_add(GTK_CONTAINER(mp), item); gtk_widget_show(item); - g_signal_connect(item, "activate", G_CALLBACK(on_insert_date_activate), label); + g_signal_connect(item, "activate", G_CALLBACK(on_popup_insert_date_activate), label); } @@ -734,7 +807,7 @@ void ui_create_insert_date_menu_items(void) item = gtk_menu_item_new_with_mnemonic(str); gtk_container_add(GTK_CONTAINER(menu_popup), item); gtk_widget_show(item); - g_signal_connect(item, "activate", G_CALLBACK(on_insert_date_activate), str); + g_signal_connect(item, "activate", G_CALLBACK(on_popup_insert_date_activate), str); ui_hookup_widget(main_widgets.editor_menu, item, "insert_date_custom2"); insert_date_items(menu_edit, menu_popup, _("_Set Custom Date Format")); -------------- This E-Mail was brought to you by github_commit_mail.py (Source:
https://github.com/geany/infrastructure
).
1
0
0
0
[geany/geany] a51bc3: Move include insert callbacks to the UI code where they belong
by Colomban Wendling
26 Jun '14
26 Jun '14
Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 26 Jun 2014 16:36:49 UTC Commit: a51bc3d6545b48eddb18de3b10a4381dc459614c
https://github.com/geany/geany/commit/a51bc3d6545b48eddb18de3b10a4381dc4596…
Log Message: ----------- Move include insert callbacks to the UI code where they belong Modified Paths: -------------- src/callbacks.c src/callbacks.h src/ui_utils.c Modified: src/callbacks.c 44 lines changed, 0 insertions(+), 44 deletions(-) =================================================================== @@ -1359,50 +1359,6 @@ void on_menu_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data) } -/* @include include name or NULL for empty with cursor ready for typing it */ -static void insert_include(GeanyDocument *doc, gint pos, const gchar *include) -{ - gint pos_after = -1; - gchar *text; - - g_return_if_fail(doc != NULL); - g_return_if_fail(include != NULL); - g_return_if_fail(pos == -1 || pos >= 0); - - if (pos == -1) - pos = sci_get_current_position(doc->editor->sci); - - if (utils_str_equal(include, "blank")) - { - text = g_strdup("#include \"\"\n"); - pos_after = pos + 10; - } - else - { - text = g_strconcat("#include <", include, ">\n", NULL); - } - - sci_start_undo_action(doc->editor->sci); - sci_insert_text(doc->editor->sci, pos, text); - sci_end_undo_action(doc->editor->sci); - g_free(text); - if (pos_after >= 0) - sci_goto_pos(doc->editor->sci, pos_after, FALSE); -} - - -void on_insert_include_activate(GtkMenuItem *menuitem, gpointer user_data) -{ - insert_include(document_get_current(), editor_info.click_pos, user_data); -} - - -void on_menu_insert_include_activate(GtkMenuItem *menuitem, gpointer user_data) -{ - insert_include(document_get_current(), -1, user_data); -} - - G_MODULE_EXPORT void on_file_properties_activate(GtkMenuItem *menuitem, gpointer user_data) { GeanyDocument *doc = document_get_current(); Modified: src/callbacks.h 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -104,8 +104,6 @@ void on_toolbutton_compile_clicked(GtkAction *action, gpointer user_data); G_MODULE_EXPORT void on_line_wrapping1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); -void on_insert_include_activate(GtkMenuItem *menuitem, gpointer user_data); - void on_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data); void on_toolbutton_goto_entry_activate(GtkAction *action, const gchar *text, gpointer user_data); @@ -134,8 +132,6 @@ G_MODULE_EXPORT void on_menu_toggle_line_commentation1_activate(GtkMenuItem *men G_MODULE_EXPORT void on_next_message1_activate(GtkMenuItem *menuitem, gpointer user_data); -void on_menu_insert_include_activate(GtkMenuItem *menuitem, gpointer user_data); - void on_menu_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_project_new1_activate(GtkMenuItem *menuitem, gpointer user_data); Modified: src/ui_utils.c 51 lines changed, 46 insertions(+), 5 deletions(-) =================================================================== @@ -553,6 +553,49 @@ void ui_update_fold_items(void) } +/* @include include name or NULL for empty with cursor ready for typing it */ +static void insert_include(GeanyDocument *doc, gint pos, const gchar *include) +{ + gint pos_after = -1; + gchar *text; + + g_return_if_fail(doc != NULL); + g_return_if_fail(pos == -1 || pos >= 0); + + if (pos == -1) + pos = sci_get_current_position(doc->editor->sci); + + if (! include) + { + text = g_strdup("#include \"\"\n"); + pos_after = pos + 10; + } + else + { + text = g_strconcat("#include <", include, ">\n", NULL); + } + + sci_start_undo_action(doc->editor->sci); + sci_insert_text(doc->editor->sci, pos, text); + sci_end_undo_action(doc->editor->sci); + g_free(text); + if (pos_after >= 0) + sci_goto_pos(doc->editor->sci, pos_after, FALSE); +} + + +static void on_popup_insert_include_activate(GtkMenuItem *menuitem, gpointer user_data) +{ + insert_include(document_get_current(), editor_info.click_pos, user_data); +} + + +static void on_menu_insert_include_activate(GtkMenuItem *menuitem, gpointer user_data) +{ + insert_include(document_get_current(), -1, user_data); +} + + static void insert_include_items(GtkMenu *me, GtkMenu *mp, gchar **includes, gchar *label) { guint i = 0; @@ -577,7 +620,7 @@ static void insert_include_items(GtkMenu *me, GtkMenu *mp, gchar **includes, gch g_signal_connect(tmp_menu, "activate", G_CALLBACK(on_menu_insert_include_activate), (gpointer) includes[i]); g_signal_connect(tmp_popup, "activate", - G_CALLBACK(on_insert_include_activate), (gpointer) includes[i]); + G_CALLBACK(on_popup_insert_include_activate), (gpointer) includes[i]); i++; } gtk_widget_show_all(edit_menu_item); @@ -615,8 +658,7 @@ void ui_create_insert_menu_items(void) blank = gtk_menu_item_new_with_label("#include \"...\""); gtk_container_add(GTK_CONTAINER(menu_edit), blank); gtk_widget_show(blank); - g_signal_connect(blank, "activate", G_CALLBACK(on_menu_insert_include_activate), - (gpointer) "blank"); + g_signal_connect(blank, "activate", G_CALLBACK(on_menu_insert_include_activate), NULL); blank = gtk_separator_menu_item_new (); gtk_container_add(GTK_CONTAINER(menu_edit), blank); gtk_widget_show(blank); @@ -624,8 +666,7 @@ void ui_create_insert_menu_items(void) blank = gtk_menu_item_new_with_label("#include \"...\""); gtk_container_add(GTK_CONTAINER(menu_popup), blank); gtk_widget_show(blank); - g_signal_connect(blank, "activate", G_CALLBACK(on_insert_include_activate), - (gpointer) "blank"); + g_signal_connect(blank, "activate", G_CALLBACK(on_popup_insert_include_activate), NULL); blank = gtk_separator_menu_item_new(); gtk_container_add(GTK_CONTAINER(menu_popup), blank); gtk_widget_show(blank); -------------- This E-Mail was brought to you by github_commit_mail.py (Source:
https://github.com/geany/infrastructure
).
1
0
0
0
[geany/geany] 00ec17: Callbacks: get rid of the ugly `insert_callback_from_menu` global
by Colomban Wendling
26 Jun '14
26 Jun '14
Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 26 Jun 2014 16:28:48 UTC Commit: 00ec175d63931075fcf82c48497d9245a65da70b
https://github.com/geany/geany/commit/00ec175d63931075fcf82c48497d9245a65da…
Log Message: ----------- Callbacks: get rid of the ugly `insert_callback_from_menu` global Modified Paths: -------------- src/callbacks.c Modified: src/callbacks.c 191 lines changed, 96 insertions(+), 95 deletions(-) =================================================================== @@ -152,10 +152,6 @@ G_MODULE_EXPORT void on_detect_width_from_file_activate(GtkMenuItem *menuitem, g G_MODULE_EXPORT void on_clone1_activate(GtkMenuItem *menuitem, gpointer user_data); -/* flag to indicate that an insert callback was triggered from the file menu, - * so we need to store the current cursor position in editor_info.click_pos. */ -static gboolean insert_callback_from_menu = FALSE; - /* represents the state at switching a notebook page(in the left treeviews widget), to not emit * the selection-changed signal from tv.tree_openfiles */ /*static gboolean switch_tv_notebook_page = FALSE; */ @@ -176,18 +172,6 @@ static gboolean check_no_unsaved(void) } -/* set editor_info.click_pos to the current cursor position if insert_callback_from_menu is TRUE - * to prevent invalid cursor positions which can cause segfaults */ -static void verify_click_pos(GeanyDocument *doc) -{ - if (insert_callback_from_menu) - { - editor_info.click_pos = sci_get_current_position(doc->editor->sci); - insert_callback_from_menu = FALSE; - } -} - - /* should only be called from on_window_delete_event */ static void quit_app(void) { @@ -1180,60 +1164,85 @@ G_MODULE_EXPORT void on_comments_function_activate(GtkMenuItem *menuitem, gpoint } -G_MODULE_EXPORT void on_comments_multiline_activate(GtkMenuItem *menuitem, gpointer user_data) +static void insert_multiline_comment(GeanyDocument *doc, gint pos) { - GeanyDocument *doc = document_get_current(); + g_return_if_fail(doc != NULL); + g_return_if_fail(pos == -1 || pos >= 0); - if (doc == NULL || doc->file_type == NULL) + if (doc->file_type == NULL) { ui_set_statusbar(FALSE, _("Please set the filetype for the current file before using this function.")); return; } - verify_click_pos(doc); /* make sure that the click_pos is valid */ - if (doc->file_type->comment_open || doc->file_type->comment_single) + { + /* editor_insert_multiline_comment() uses editor_info.click_pos */ + if (pos == -1) + editor_info.click_pos = sci_get_current_position(doc->editor->sci); + else + editor_info.click_pos = pos; editor_insert_multiline_comment(doc->editor); + } else utils_beep(); } -G_MODULE_EXPORT void on_comments_gpl_activate(GtkMenuItem *menuitem, gpointer user_data) +G_MODULE_EXPORT void on_comments_multiline_activate(GtkMenuItem *menuitem, gpointer user_data) +{ + insert_multiline_comment(document_get_current(), editor_info.click_pos); +} + + +G_MODULE_EXPORT void on_menu_comments_multiline_activate(GtkMenuItem *menuitem, gpointer user_data) +{ + insert_multiline_comment(document_get_current(), -1); +} + + +static void insert_comment_template(GeanyDocument *doc, gint pos, guint template) { - GeanyDocument *doc = document_get_current(); gchar *text; g_return_if_fail(doc != NULL); + g_return_if_fail(pos == -1 || pos >= 0); + g_return_if_fail(template < GEANY_MAX_TEMPLATES); - text = templates_get_template_licence(doc, GEANY_TEMPLATE_GPL); + if (pos == -1) + pos = sci_get_current_position(doc->editor->sci); - verify_click_pos(doc); /* make sure that the click_pos is valid */ + text = templates_get_template_licence(doc, template); sci_start_undo_action(doc->editor->sci); - sci_insert_text(doc->editor->sci, editor_info.click_pos, text); + sci_insert_text(doc->editor->sci, pos, text); sci_end_undo_action(doc->editor->sci); g_free(text); } -G_MODULE_EXPORT void on_comments_bsd_activate(GtkMenuItem *menuitem, gpointer user_data) +G_MODULE_EXPORT void on_comments_gpl_activate(GtkMenuItem *menuitem, gpointer user_data) { - GeanyDocument *doc = document_get_current(); - gchar *text; + insert_comment_template(document_get_current(), editor_info.click_pos, GEANY_TEMPLATE_GPL); +} - g_return_if_fail(doc != NULL); - text = templates_get_template_licence(doc, GEANY_TEMPLATE_BSD); +G_MODULE_EXPORT void on_menu_comments_gpl_activate(GtkMenuItem *menuitem, gpointer user_data) +{ + insert_comment_template(document_get_current(), -1, GEANY_TEMPLATE_GPL); +} + - verify_click_pos(doc); /* make sure that the click_pos is valid */ +G_MODULE_EXPORT void on_comments_bsd_activate(GtkMenuItem *menuitem, gpointer user_data) +{ + insert_comment_template(document_get_current(), editor_info.click_pos, GEANY_TEMPLATE_BSD); +} - sci_start_undo_action(doc->editor->sci); - sci_insert_text(doc->editor->sci, editor_info.click_pos, text); - sci_end_undo_action(doc->editor->sci); - g_free(text); +G_MODULE_EXPORT void on_menu_comments_bsd_activate(GtkMenuItem *menuitem, gpointer user_data) +{ + insert_comment_template(document_get_current(), -1, GEANY_TEMPLATE_BSD); } @@ -1277,13 +1286,16 @@ G_MODULE_EXPORT void on_comments_fileheader_activate(GtkMenuItem *menuitem, gpoi } -void on_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data) +static void insert_date(GeanyDocument *doc, gint pos, const gchar *date_style) { - GeanyDocument *doc = document_get_current(); const gchar *format = NULL; gchar *time_str; g_return_if_fail(doc != NULL); + g_return_if_fail(pos == -1 || pos >= 0); + + if (pos == -1) + pos = sci_get_current_position(doc->editor->sci); /* set default value */ if (utils_str_equal("", ui_prefs.custom_date_format)) @@ -1292,19 +1304,19 @@ void on_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data) ui_prefs.custom_date_format = g_strdup("%d.%m.%Y"); } - if (utils_str_equal(_("dd.mm.yyyy"), (gchar*) user_data)) + if (utils_str_equal(_("dd.mm.yyyy"), date_style)) format = "%d.%m.%Y"; - else if (utils_str_equal(_("mm.dd.yyyy"), (gchar*) user_data)) + else if (utils_str_equal(_("mm.dd.yyyy"), date_style)) format = "%m.%d.%Y"; - else if (utils_str_equal(_("yyyy/mm/dd"), (gchar*) user_data)) + else if (utils_str_equal(_("yyyy/mm/dd"), date_style)) format = "%Y/%m/%d"; - else if (utils_str_equal(_("dd.mm.yyyy hh:mm:ss"), (gchar*) user_data)) + else if (utils_str_equal(_("dd.mm.yyyy hh:mm:ss"), date_style)) format = "%d.%m.%Y %H:%M:%S"; - else if (utils_str_equal(_("mm.dd.yyyy hh:mm:ss"), (gchar*) user_data)) + else if (utils_str_equal(_("mm.dd.yyyy hh:mm:ss"), date_style)) format = "%m.%d.%Y %H:%M:%S"; - else if (utils_str_equal(_("yyyy/mm/dd hh:mm:ss"), (gchar*) user_data)) + else if (utils_str_equal(_("yyyy/mm/dd hh:mm:ss"), date_style)) format = "%Y/%m/%d %H:%M:%S"; - else if (utils_str_equal(_("_Use Custom Date Format"), (gchar*) user_data)) + else if (utils_str_equal(_("_Use Custom Date Format"), date_style)) format = ui_prefs.custom_date_format; else { @@ -1320,11 +1332,9 @@ void on_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data) time_str = utils_get_date_time(format, NULL); if (time_str != NULL) { - verify_click_pos(doc); /* make sure that the click_pos is valid */ - sci_start_undo_action(doc->editor->sci); - sci_insert_text(doc->editor->sci, editor_info.click_pos, time_str); - sci_goto_pos(doc->editor->sci, editor_info.click_pos + strlen(time_str), FALSE); + sci_insert_text(doc->editor->sci, pos, time_str); + sci_goto_pos(doc->editor->sci, pos + strlen(time_str), FALSE); sci_end_undo_action(doc->editor->sci); g_free(time_str); } @@ -1337,33 +1347,59 @@ void on_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data) } -void on_insert_include_activate(GtkMenuItem *menuitem, gpointer user_data) +void on_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data) { - GeanyDocument *doc = document_get_current(); - gint pos = -1; + insert_date(document_get_current(), editor_info.click_pos, user_data); +} + + +void on_menu_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data) +{ + insert_date(document_get_current(), -1, user_data); +} + + +/* @include include name or NULL for empty with cursor ready for typing it */ +static void insert_include(GeanyDocument *doc, gint pos, const gchar *include) +{ + gint pos_after = -1; gchar *text; g_return_if_fail(doc != NULL); - g_return_if_fail(user_data != NULL); + g_return_if_fail(include != NULL); + g_return_if_fail(pos == -1 || pos >= 0); - verify_click_pos(doc); /* make sure that the click_pos is valid */ + if (pos == -1) + pos = sci_get_current_position(doc->editor->sci); - if (utils_str_equal(user_data, "blank")) + if (utils_str_equal(include, "blank")) { text = g_strdup("#include \"\"\n"); - pos = editor_info.click_pos + 10; + pos_after = pos + 10; } else { - text = g_strconcat("#include <", user_data, ">\n", NULL); + text = g_strconcat("#include <", include, ">\n", NULL); } sci_start_undo_action(doc->editor->sci); - sci_insert_text(doc->editor->sci, editor_info.click_pos, text); + sci_insert_text(doc->editor->sci, pos, text); sci_end_undo_action(doc->editor->sci); g_free(text); - if (pos >= 0) - sci_goto_pos(doc->editor->sci, pos, FALSE); + if (pos_after >= 0) + sci_goto_pos(doc->editor->sci, pos_after, FALSE); +} + + +void on_insert_include_activate(GtkMenuItem *menuitem, gpointer user_data) +{ + insert_include(document_get_current(), editor_info.click_pos, user_data); +} + + +void on_menu_insert_include_activate(GtkMenuItem *menuitem, gpointer user_data) +{ + insert_include(document_get_current(), -1, user_data); } @@ -1537,41 +1573,6 @@ G_MODULE_EXPORT void on_previous_message1_activate(GtkMenuItem *menuitem, gpoint } -G_MODULE_EXPORT void on_menu_comments_multiline_activate(GtkMenuItem *menuitem, gpointer user_data) -{ - insert_callback_from_menu = TRUE; - on_comments_multiline_activate(menuitem, user_data); -} - - -G_MODULE_EXPORT void on_menu_comments_gpl_activate(GtkMenuItem *menuitem, gpointer user_data) -{ - insert_callback_from_menu = TRUE; - on_comments_gpl_activate(menuitem, user_data); -} - - -G_MODULE_EXPORT void on_menu_comments_bsd_activate(GtkMenuItem *menuitem, gpointer user_data) -{ - insert_callback_from_menu = TRUE; - on_comments_bsd_activate(menuitem, user_data); -} - - -void on_menu_insert_include_activate(GtkMenuItem *menuitem, gpointer user_data) -{ - insert_callback_from_menu = TRUE; - on_insert_include_activate(menuitem, user_data); -} - - -void on_menu_insert_date_activate(GtkMenuItem *menuitem, gpointer user_data) -{ - insert_callback_from_menu = TRUE; - on_insert_date_activate(menuitem, user_data); -} - - G_MODULE_EXPORT void on_project_new1_activate(GtkMenuItem *menuitem, gpointer user_data) { project_new(); -------------- This E-Mail was brought to you by github_commit_mail.py (Source:
https://github.com/geany/infrastructure
).
1
0
0
0
[geany/geany] 721769: Fix build warning about missing return value.
by Thomas Martitz
24 Jun '14
24 Jun '14
Branch: refs/heads/master Author: Thomas Martitz <kugel(a)rockbox.org> Committer: Thomas Martitz <kugel(a)rockbox.org> Date: Tue, 24 Jun 2014 21:07:08 UTC Commit: 721769e682b142c0d07b12a3d7158695ccc3dacb
https://github.com/geany/geany/commit/721769e682b142c0d07b12a3d7158695ccc3d…
Log Message: ----------- Fix build warning about missing return value. Modified Paths: -------------- src/document.c Modified: src/document.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1394,7 +1394,7 @@ gboolean document_reload_prompt(GeanyDocument *doc, const gchar *forced_enc) gchar *base_name; gboolean result = FALSE; - g_return_if_fail(doc != NULL); + g_return_val_if_fail(doc != NULL, FALSE); /* No need to reload "untitled" (non-file-backed) documents */ if (doc->file_name == NULL) -------------- This E-Mail was brought to you by github_commit_mail.py (Source:
https://github.com/geany/infrastructure
).
1
0
0
0
[geany/geany] cc2f18: Add printf attribute to document_show_message() for better safety
by Colomban Wendling
24 Jun '14
24 Jun '14
Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 24 Jun 2014 16:30:54 UTC Commit: cc2f1879a83aeb95bd9aa6b0d6362b32016c0432
https://github.com/geany/geany/commit/cc2f1879a83aeb95bd9aa6b0d6362b32016c0…
Log Message: ----------- Add printf attribute to document_show_message() for better safety Add G_GNUC_PRINTF attribute to document_show_message() so some compilers can check the format arguments match the format string. Modified Paths: -------------- src/document.c Modified: src/document.c 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -112,6 +112,12 @@ typedef struct static void document_undo_clear(GeanyDocument *doc); static void document_redo_add(GeanyDocument *doc, guint type, gpointer data); static gboolean remove_page(guint page_num); +static GtkWidget* document_show_message(GeanyDocument *doc, GtkMessageType msgtype, + void (*response_cb)(GtkWidget *info_bar, gint response_id, GeanyDocument *doc), + const gchar *btn_1, GtkResponseType response_1, + const gchar *btn_2, GtkResponseType response_2, + const gchar *btn_3, GtkResponseType response_3, + const gchar *extra_text, const gchar *format, ...) G_GNUC_PRINTF(11, 12); /** -------------- This E-Mail was brought to you by github_commit_mail.py (Source:
https://github.com/geany/infrastructure
).
1
0
0
0
[geany/geany] 9bf647: Move on_clone1_activate() to callbacks.c
by Colomban Wendling
24 Jun '14
24 Jun '14
Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 24 Jun 2014 16:26:44 UTC Commit: 9bf647c5c3117d36c4ea7c99f05ad99e03106045
https://github.com/geany/geany/commit/9bf647c5c3117d36c4ea7c99f05ad99e03106…
Log Message: ----------- Move on_clone1_activate() to callbacks.c Modified Paths: -------------- src/callbacks.c src/document.c Modified: src/callbacks.c 11 lines changed, 11 insertions(+), 0 deletions(-) =================================================================== @@ -149,6 +149,7 @@ G_MODULE_EXPORT void on_reset_indentation1_activate(GtkMenuItem *menuitem, gpoin G_MODULE_EXPORT void on_mark_all1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_detect_type_from_file_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_detect_width_from_file_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_clone1_activate(GtkMenuItem *menuitem, gpointer user_data); /* flag to indicate that an insert callback was triggered from the file menu, @@ -240,6 +241,16 @@ G_MODULE_EXPORT void on_new1_activate(GtkMenuItem *menuitem, gpointer user_data) } +/* create a new file and copy file content and properties */ +G_MODULE_EXPORT void on_clone1_activate(GtkMenuItem *menuitem, gpointer user_data) +{ + GeanyDocument *old_doc = document_get_current(); + + if (old_doc) + document_clone(old_doc); +} + + G_MODULE_EXPORT void on_save1_activate(GtkMenuItem *menuitem, gpointer user_data) { gint cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(main_widgets.notebook)); Modified: src/document.c 10 lines changed, 0 insertions(+), 10 deletions(-) =================================================================== @@ -2957,16 +2957,6 @@ GeanyDocument *document_index(gint idx) } -/* create a new file and copy file content and properties */ -G_MODULE_EXPORT void on_clone1_activate(GtkMenuItem *menuitem, gpointer user_data) -{ - GeanyDocument *old_doc = document_get_current(); - - if (old_doc) - document_clone(old_doc); -} - - GeanyDocument *document_clone(GeanyDocument *old_doc) { gchar *text; -------------- This E-Mail was brought to you by github_commit_mail.py (Source:
https://github.com/geany/infrastructure
).
1
0
0
0
[geany/geany] 0b3222: Don't manually connect handlers Glade can connect for us
by Colomban Wendling
24 Jun '14
24 Jun '14
Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 24 Jun 2014 16:15:46 UTC Commit: 0b32227bf0892f8bf430d712cae1fa73741c906a
https://github.com/geany/geany/commit/0b32227bf0892f8bf430d712cae1fa73741c9…
Log Message: ----------- Don't manually connect handlers Glade can connect for us Don't bother manually connecting handlers that Glade can connect for us just as well. Modified Paths: -------------- data/geany.glade src/callbacks.c src/callbacks.h src/main.c Modified: data/geany.glade 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -6252,6 +6252,8 @@ <accel-groups> <group name="accelgroup1"/> </accel-groups> + <signal name="window-state-event" handler="on_window_state_event" swapped="no"/> + <signal name="delete-event" handler="on_window_delete_event" swapped="no"/> <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> @@ -8319,6 +8321,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="buffer">textbuffer1</property> + <signal name="motion-notify-event" handler="on_motion_event" swapped="no"/> </object> </child> </object> Modified: src/callbacks.c 6 lines changed, 4 insertions(+), 2 deletions(-) =================================================================== @@ -74,6 +74,7 @@ /* prototypes of Glade-only callback to let the compiler know they really are meant to be exported */ +G_MODULE_EXPORT gboolean on_window_delete_event(GtkWidget *widget, GdkEvent *event, gpointer gdata); G_MODULE_EXPORT void on_info1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_change_font1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_crlf_activate(GtkCheckMenuItem *menuitem, gpointer user_data); @@ -125,6 +126,7 @@ G_MODULE_EXPORT void on_debug_messages1_activate(GtkMenuItem *menuitem, gpointer G_MODULE_EXPORT void on_menu_show_white_space1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); G_MODULE_EXPORT void on_menu_show_line_endings1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); G_MODULE_EXPORT void on_menu_show_indentation_guides1_toggled(GtkCheckMenuItem *checkmenuitem, gpointer user_data); +G_MODULE_EXPORT gboolean on_window_state_event(GtkWidget *widget, GdkEventWindowState *event, gpointer user_data); G_MODULE_EXPORT void on_customize_toolbar1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_button_customize_toolbar_clicked(GtkButton *button, gpointer user_data); G_MODULE_EXPORT void on_cut_current_lines1_activate(GtkMenuItem *menuitem, gpointer user_data); @@ -202,7 +204,7 @@ static void quit_app(void) /* wrapper function to abort exit process if cancel button is pressed */ -gboolean on_window_delete_event(GtkWidget *widget, GdkEvent *event, gpointer gdata) +G_MODULE_EXPORT gboolean on_window_delete_event(GtkWidget *widget, GdkEvent *event, gpointer gdata) { main_status.quitting = TRUE; @@ -1952,7 +1954,7 @@ G_MODULE_EXPORT void on_send_selection_to_vte1_activate(GtkMenuItem *menuitem, g } -gboolean on_window_state_event(GtkWidget *widget, GdkEventWindowState *event, gpointer user_data) +G_MODULE_EXPORT gboolean on_window_state_event(GtkWidget *widget, GdkEventWindowState *event, gpointer user_data) { if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN) Modified: src/callbacks.h 6 lines changed, 1 insertions(+), 5 deletions(-) =================================================================== @@ -28,8 +28,6 @@ G_BEGIN_DECLS extern gboolean ignore_callback; -gboolean on_window_delete_event(GtkWidget *widget, GdkEvent *event, gpointer gdata); - G_MODULE_EXPORT void on_new1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_save1_activate(GtkMenuItem *menuitem, gpointer user_data); @@ -160,7 +158,7 @@ void on_toolbutton_back_activate(GtkAction *action, gpointer user_data); void on_toolbutton_forward_activate(GtkAction *action, gpointer user_data); -gboolean on_motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer user_data); +G_MODULE_EXPORT gboolean on_motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer user_data); G_MODULE_EXPORT gboolean on_escape_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data); @@ -176,8 +174,6 @@ G_MODULE_EXPORT void on_find_document_usage1_activate(GtkMenuItem *menuitem, gpo G_MODULE_EXPORT void on_send_selection_to_vte1_activate(GtkMenuItem *menuitem, gpointer user_data); -gboolean on_window_state_event(GtkWidget *widget, GdkEventWindowState *event, gpointer user_data); - G_MODULE_EXPORT void on_plugin_preferences1_activate(GtkMenuItem *menuitem, gpointer user_data); G_END_DECLS Modified: src/main.c 6 lines changed, 0 insertions(+), 6 deletions(-) =================================================================== @@ -1157,12 +1157,6 @@ gint main(gint argc, gchar **argv) symbols_init(); editor_snippets_init(); - /* registering some basic events */ - g_signal_connect(main_widgets.window, "delete-event", G_CALLBACK(on_window_delete_event), NULL); - g_signal_connect(main_widgets.window, "window-state-event", G_CALLBACK(on_window_state_event), NULL); - - g_signal_connect(msgwindow.scribble, "motion-notify-event", G_CALLBACK(on_motion_event), NULL); - #ifdef HAVE_VTE vte_init(); #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source:
https://github.com/geany/infrastructure
).
1
0
0
0
[geany/geany] ab3b7c: Use the appropriate prototype for the window's delete-event callback
by Colomban Wendling
24 Jun '14
24 Jun '14
Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 24 Jun 2014 16:11:34 UTC Commit: ab3b7ce49660cfec1b4b21e549257bf2b7b4a7a5
https://github.com/geany/geany/commit/ab3b7ce49660cfec1b4b21e549257bf2b7b4a…
Log Message: ----------- Use the appropriate prototype for the window's delete-event callback Modified Paths: -------------- src/callbacks.c src/callbacks.h src/main.c Modified: src/callbacks.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -185,7 +185,7 @@ static void verify_click_pos(GeanyDocument *doc) } -/* should only be called from on_exit_clicked */ +/* should only be called from on_window_delete_event */ static void quit_app(void) { configuration_save(); @@ -202,7 +202,7 @@ static void quit_app(void) /* wrapper function to abort exit process if cancel button is pressed */ -gboolean on_exit_clicked(GtkWidget *widget, gpointer gdata) +gboolean on_window_delete_event(GtkWidget *widget, GdkEvent *event, gpointer gdata) { main_status.quitting = TRUE; @@ -299,7 +299,7 @@ G_MODULE_EXPORT void on_close1_activate(GtkMenuItem *menuitem, gpointer user_dat G_MODULE_EXPORT void on_quit1_activate(GtkMenuItem *menuitem, gpointer user_data) { - on_exit_clicked(NULL, NULL); + on_window_delete_event(NULL, NULL, NULL); } Modified: src/callbacks.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -28,7 +28,7 @@ G_BEGIN_DECLS extern gboolean ignore_callback; -gboolean on_exit_clicked(GtkWidget *widget, gpointer gdata); +gboolean on_window_delete_event(GtkWidget *widget, GdkEvent *event, gpointer gdata); G_MODULE_EXPORT void on_new1_activate(GtkMenuItem *menuitem, gpointer user_data); Modified: src/main.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -788,13 +788,13 @@ static gint setup_config_dir(void) return mkdir_result; } -/* Signal handling removed since on_exit_clicked() uses functions that are +/* Signal handling removed since on_quit1_activate() uses functions that are * illegal in signal handlers static void signal_cb(gint sig) { if (sig == SIGTERM) { - on_exit_clicked(NULL, NULL); + on_quit1_activate(NULL, NULL); } } */ @@ -1158,7 +1158,7 @@ gint main(gint argc, gchar **argv) editor_snippets_init(); /* registering some basic events */ - g_signal_connect(main_widgets.window, "delete-event", G_CALLBACK(on_exit_clicked), NULL); + g_signal_connect(main_widgets.window, "delete-event", G_CALLBACK(on_window_delete_event), NULL); g_signal_connect(main_widgets.window, "window-state-event", G_CALLBACK(on_window_state_event), NULL); g_signal_connect(msgwindow.scribble, "motion-notify-event", G_CALLBACK(on_motion_event), NULL); -------------- This E-Mail was brought to you by github_commit_mail.py (Source:
https://github.com/geany/infrastructure
).
1
0
0
0
[geany/geany] 211353: Add two missing Glade-only prototypes
by Colomban Wendling
24 Jun '14
24 Jun '14
Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 24 Jun 2014 16:07:29 UTC Commit: 2113537e939aa7c73130c80ded791a698f05fbc1
https://github.com/geany/geany/commit/2113537e939aa7c73130c80ded791a698f05f…
Log Message: ----------- Add two missing Glade-only prototypes Modified Paths: -------------- src/callbacks.c Modified: src/callbacks.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -138,6 +138,8 @@ G_MODULE_EXPORT void on_go_to_next_marker1_activate(GtkMenuItem *menuitem, gpoin G_MODULE_EXPORT void on_go_to_previous_marker1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_reflow_lines_block1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_smart_line_indent1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_move_lines_up1_activate(GtkMenuItem *menuitem, gpointer user_data); +G_MODULE_EXPORT void on_move_lines_down1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_goto_tag_definition1(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_goto_tag_declaration1(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_indent_width_activate(GtkMenuItem *menuitem, gpointer user_data); -------------- This E-Mail was brought to you by github_commit_mail.py (Source:
https://github.com/geany/infrastructure
).
1
0
0
0
[geany/geany] a398b0: Remove redundant toolbar-specific callbacks
by Colomban Wendling
24 Jun '14
24 Jun '14
Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 24 Jun 2014 16:04:11 UTC Commit: a398b087da51db03f0b89c8883ea6a239b0af8bf
https://github.com/geany/geany/commit/a398b087da51db03f0b89c8883ea6a239b0af…
Log Message: ----------- Remove redundant toolbar-specific callbacks Modified Paths: -------------- src/callbacks.c src/callbacks.h src/toolbar.c Modified: src/callbacks.c 52 lines changed, 2 insertions(+), 50 deletions(-) =================================================================== @@ -74,7 +74,6 @@ /* prototypes of Glade-only callback to let the compiler know they really are meant to be exported */ -G_MODULE_EXPORT void on_new1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_info1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_change_font1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_crlf_activate(GtkCheckMenuItem *menuitem, gpointer user_data); @@ -460,13 +459,6 @@ G_MODULE_EXPORT void on_open1_activate(GtkMenuItem *menuitem, gpointer user_data } -/* quit toolbar button */ -void on_toolbutton_quit_clicked(GtkAction *action, gpointer user_data) -{ - on_exit_clicked(NULL, NULL); -} - - /* reload file */ G_MODULE_EXPORT void on_toolbutton_reload_clicked(GtkAction *action, gpointer user_data) { @@ -484,27 +476,6 @@ G_MODULE_EXPORT void on_change_font1_activate(GtkMenuItem *menuitem, gpointer us } -/* new file */ -void on_toolbutton_new_clicked(GtkAction *action, gpointer user_data) -{ - document_new_file(NULL, NULL, NULL); -} - - -/* open file */ -void on_toolbutton_open_clicked(GtkAction *action, gpointer user_data) -{ - dialogs_show_open_file(); -} - - -/* save file */ -void on_toolbutton_save_clicked(GtkAction *action, gpointer user_data) -{ - on_save1_activate(NULL, user_data); -} - - /* store text, clear search flags so we can use Search->Find Next/Previous */ static void setup_find(const gchar *text, gboolean backwards) { @@ -610,25 +581,6 @@ G_MODULE_EXPORT void on_normal_size1_activate(GtkMenuItem *menuitem, gpointer us } -/* close tab */ -void on_toolbutton_close_clicked(GtkAction *action, gpointer user_data) -{ - on_close1_activate(NULL, NULL); -} - - -void on_toolbutton_close_all_clicked(GtkAction *action, gpointer user_data) -{ - on_close_all1_activate(NULL, NULL); -} - - -void on_toolbutton_preferences_clicked(GtkAction *action, gpointer user_data) -{ - on_preferences1_activate(NULL, NULL); -} - - static gboolean delayed_check_disk_status(gpointer data) { document_check_disk_status(data, FALSE); @@ -1827,13 +1779,13 @@ G_MODULE_EXPORT void on_menu_toggle_all_additional_widgets1_activate(GtkMenuItem } -void on_forward_activate(GtkMenuItem *menuitem, gpointer user_data) +void on_toolbutton_forward_activate(GtkAction *menuitem, gpointer user_data) { navqueue_go_forward(); } -void on_back_activate(GtkMenuItem *menuitem, gpointer user_data) +void on_toolbutton_back_activate(GtkAction *menuitem, gpointer user_data) { navqueue_go_back(); } Modified: src/callbacks.h 20 lines changed, 4 insertions(+), 16 deletions(-) =================================================================== @@ -30,6 +30,8 @@ extern gboolean ignore_callback; gboolean on_exit_clicked(GtkWidget *widget, gpointer gdata); +G_MODULE_EXPORT void on_new1_activate(GtkMenuItem *menuitem, gpointer user_data); + G_MODULE_EXPORT void on_save1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_save_as1_activate(GtkMenuItem *menuitem, gpointer user_data); @@ -38,10 +40,6 @@ G_MODULE_EXPORT void on_quit1_activate(GtkMenuItem *menuitem, gpointer user_data G_MODULE_EXPORT void on_open1_activate(GtkMenuItem *menuitem, gpointer user_data); -void on_toolbutton_close_clicked(GtkAction *action, gpointer user_data); - -void on_toolbutton_close_all_clicked(GtkAction *action, gpointer user_data); - G_MODULE_EXPORT void on_save_all1_activate(GtkMenuItem *menuitem, gpointer user_data); G_MODULE_EXPORT void on_close1_activate(GtkMenuItem *menuitem, gpointer user_data); @@ -98,16 +96,6 @@ G_MODULE_EXPORT void on_replace1_activate(GtkMenuItem *menuitem, gpointer user_d G_MODULE_EXPORT void on_find_in_files1_activate(GtkMenuItem *menuitem, gpointer user_data); -void on_toolbutton_new_clicked(GtkAction *action, gpointer user_data); - -void on_toolbutton_open_clicked(GtkAction *action, gpointer user_data); - -void on_toolbutton_save_clicked(GtkAction *action, gpointer user_data); - -void on_toolbutton_quit_clicked(GtkAction *action, gpointer user_data); - -void on_toolbutton_preferences_clicked(GtkAction *action, gpointer user_data); - G_MODULE_EXPORT void on_toolbutton_reload_clicked(GtkAction *action, gpointer user_data); G_MODULE_EXPORT void on_go_to_line_activate(GtkMenuItem *menuitem, gpointer user_data); @@ -168,9 +156,9 @@ G_MODULE_EXPORT void on_context_action1_activate(GtkMenuItem *menuitem, gpointer G_MODULE_EXPORT void on_menu_toggle_all_additional_widgets1_activate(GtkMenuItem *menuitem, gpointer user_data); -void on_back_activate(GtkMenuItem *menuitem, gpointer user_data); +void on_toolbutton_back_activate(GtkAction *action, gpointer user_data); -void on_forward_activate(GtkMenuItem *menuitem, gpointer user_data); +void on_toolbutton_forward_activate(GtkAction *action, gpointer user_data); gboolean on_motion_event(GtkWidget *widget, GdkEventMotion *event, gpointer user_data); Modified: src/toolbar.c 18 lines changed, 9 insertions(+), 9 deletions(-) =================================================================== @@ -55,20 +55,20 @@ static GSList *plugin_items = NULL; * Fields: name, stock_id, label, accelerator, tooltip, callback */ static const GtkActionEntry ui_entries[] = { /* custom actions defined in toolbar_init(): "New", "Open", "SearchEntry", "GotoEntry", "Build" */ - { "Save", GTK_STOCK_SAVE, NULL, NULL, N_("Save the current file"), G_CALLBACK(on_toolbutton_save_clicked) }, + { "Save", GTK_STOCK_SAVE, NULL, NULL, N_("Save the current file"), G_CALLBACK(on_save1_activate) }, { "SaveAs", GTK_STOCK_SAVE_AS, NULL, NULL, N_("Save as"), G_CALLBACK(on_save_as1_activate) }, { "SaveAll", GEANY_STOCK_SAVE_ALL, NULL, NULL, N_("Save all open files"), G_CALLBACK(on_save_all1_activate) }, { "Reload", GTK_STOCK_REVERT_TO_SAVED, NULL, NULL, N_("Reload the current file from disk"), G_CALLBACK(on_toolbutton_reload_clicked) }, - { "Close", GTK_STOCK_CLOSE, NULL, NULL, N_("Close the current file"), G_CALLBACK(on_toolbutton_close_clicked) }, - { "CloseAll", GEANY_STOCK_CLOSE_ALL, NULL, NULL, N_("Close all open files"), G_CALLBACK(on_toolbutton_close_all_clicked) }, + { "Close", GTK_STOCK_CLOSE, NULL, NULL, N_("Close the current file"), G_CALLBACK(on_close1_activate) }, + { "CloseAll", GEANY_STOCK_CLOSE_ALL, NULL, NULL, N_("Close all open files"), G_CALLBACK(on_close_all1_activate) }, { "Cut", GTK_STOCK_CUT, NULL, NULL, N_("Cut the current selection"), G_CALLBACK(on_cut1_activate) }, { "Copy", GTK_STOCK_COPY, NULL, NULL, N_("Copy the current selection"), G_CALLBACK(on_copy1_activate) }, { "Paste", GTK_STOCK_PASTE, NULL, NULL, N_("Paste the contents of the clipboard"), G_CALLBACK(on_paste1_activate) }, { "Delete", GTK_STOCK_DELETE, NULL, NULL, N_("Delete the current selection"), G_CALLBACK(on_delete1_activate) }, { "Undo", GTK_STOCK_UNDO, NULL, NULL, N_("Undo the last modification"), G_CALLBACK(on_undo1_activate) }, { "Redo", GTK_STOCK_REDO, NULL, NULL, N_("Redo the last modification"), G_CALLBACK(on_redo1_activate) }, - { "NavBack", GTK_STOCK_GO_BACK, NULL, NULL, N_("Navigate back a location"), G_CALLBACK(on_back_activate) }, - { "NavFor", GTK_STOCK_GO_FORWARD, NULL, NULL, N_("Navigate forward a location"), G_CALLBACK(on_forward_activate) }, + { "NavBack", GTK_STOCK_GO_BACK, NULL, NULL, N_("Navigate back a location"), G_CALLBACK(on_toolbutton_back_activate) }, + { "NavFor", GTK_STOCK_GO_FORWARD, NULL, NULL, N_("Navigate forward a location"), G_CALLBACK(on_toolbutton_forward_activate) }, { "Compile", GTK_STOCK_CONVERT, N_("Compile"), NULL, N_("Compile the current file"), G_CALLBACK(on_toolbutton_compile_clicked) }, { "Run", GTK_STOCK_EXECUTE, NULL, NULL, N_("Run or view the current file"), G_CALLBACK(on_toolbutton_run_clicked) }, { "Color", GTK_STOCK_SELECT_COLOR, N_("Color Chooser"), NULL, N_("Open a color chooser dialog, to interactively pick colors from a palette"), G_CALLBACK(on_show_color_chooser1_activate) }, @@ -78,8 +78,8 @@ static const GtkActionEntry ui_entries[] = { { "Indent", GTK_STOCK_INDENT, NULL, NULL, N_("Increase indentation"), G_CALLBACK(on_menu_increase_indent1_activate) }, { "Search", GTK_STOCK_FIND, NULL, NULL, N_("Find the entered text in the current file"), G_CALLBACK(on_toolbutton_search_clicked) }, { "Goto", GTK_STOCK_JUMP_TO, NULL, NULL, N_("Jump to the entered line number"), G_CALLBACK(on_toolbutton_goto_clicked) }, - { "Preferences", GTK_STOCK_PREFERENCES, NULL, NULL, N_("Show the preferences dialog"), G_CALLBACK(on_toolbutton_preferences_clicked) }, - { "Quit", GTK_STOCK_QUIT, NULL, NULL, N_("Quit Geany"), G_CALLBACK(on_toolbutton_quit_clicked) }, + { "Preferences", GTK_STOCK_PREFERENCES, NULL, NULL, N_("Show the preferences dialog"), G_CALLBACK(on_preferences1_activate) }, + { "Quit", GTK_STOCK_QUIT, NULL, NULL, N_("Quit Geany"), G_CALLBACK(on_quit1_activate) }, { "Print", GTK_STOCK_PRINT, NULL, NULL, N_("Print document"), G_CALLBACK(on_print1_activate) }, { "Replace", GTK_STOCK_FIND_AND_REPLACE, NULL, NULL, N_("Replace text in the current document"), G_CALLBACK(on_replace1_activate) } }; @@ -360,7 +360,7 @@ GtkWidget *toolbar_init(void) _("Create a new file"), _("Create a new file from a template"), GTK_STOCK_NEW); - g_signal_connect(action_new, "button-clicked", G_CALLBACK(on_toolbutton_new_clicked), NULL); + g_signal_connect(action_new, "button-clicked", G_CALLBACK(on_new1_activate), NULL); gtk_action_group_add_action(group, action_new); action_open = geany_menu_button_action_new( @@ -368,7 +368,7 @@ GtkWidget *toolbar_init(void) _("Open an existing file"), _("Open a recent file"), GTK_STOCK_OPEN); - g_signal_connect(action_open, "button-clicked", G_CALLBACK(on_toolbutton_open_clicked), NULL); + g_signal_connect(action_open, "button-clicked", G_CALLBACK(on_open1_activate), NULL); gtk_action_group_add_action(group, action_open); action_build = geany_menu_button_action_new( -------------- This E-Mail was brought to you by github_commit_mail.py (Source:
https://github.com/geany/infrastructure
).
1
0
0
0
← Newer
1
2
3
4
Older →
Jump to page:
1
2
3
4
Results per page:
10
25
50
100
200