Commits May 2010

commits@lists.geany.org

6 participants
110 discussions

SF.net SVN: geany:[4897] trunk
by eht16＠users.sourceforge.net 10 May '10

10 May '10

Revision: 4897 http://geany.svn.sourceforge.net/geany/?rev=4897&view=rev Author: eht16 Date: 2010-05-10 21:52:43 +0000 (Mon, 10 May 2010) Log Message: ----------- (Re-)Implement a (still basic) native Windows Save As dialog when compiled with GEANY_USE_WIN32_DIALOG. Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c trunk/src/win32.c trunk/src/win32.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-05-10 17:36:19 UTC (rev 4896) +++ trunk/ChangeLog 2010-05-10 21:52:43 UTC (rev 4897) @@ -2,6 +2,9 @@ * src/dialogs.c: Fix Cancel on Goto Line dialog (patch by Dimitar Zhekov, thanks). + * src/dialogs.c, src/win32.c, src/win32.h: + (Re-)Implement a (still basic) native Windows Save As dialog when + compiled with GEANY_USE_WIN32_DIALOG. 2010-05-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2010-05-10 17:36:19 UTC (rev 4896) +++ trunk/src/dialogs.c 2010-05-10 21:52:43 UTC (rev 4897) @@ -65,6 +65,10 @@ GEANY_RESPONSE_VIEW }; + +static gboolean handle_save_as(const gchar *utf8_filename, gboolean open_new_tab, + gboolean rename_file); + #if ! GEANY_USE_WIN32_DIALOG static GtkWidget *add_file_open_extra_widget(void); @@ -333,7 +337,6 @@ #endif -#if ! GEANY_USE_WIN32_DIALOG static gboolean handle_save_as(const gchar *utf8_filename, gboolean open_new_tab, gboolean rename_file) { GeanyDocument *doc = document_get_current(); @@ -366,6 +369,7 @@ } +#if ! GEANY_USE_WIN32_DIALOG static void on_file_save_dialog_response (GtkDialog *dialog, gint response, @@ -550,7 +554,10 @@ gboolean result; #if GEANY_USE_WIN32_DIALOG - result = win32_show_file_dialog(FALSE, utils_get_default_dir_utf8()); + GeanyDocument *doc = document_get_current(); + gchar *utf8_name = win32_show_document_save_as_dialog(GTK_WINDOW(main_widgets.window), + _("Save File"), DOC_FILENAME(doc)); + result = handle_save_as(utf8_name, FALSE, FALSE); #else result = gtk_show_save_as(); #endif Modified: trunk/src/win32.c =================================================================== --- trunk/src/win32.c 2010-05-10 17:36:19 UTC (rev 4896) +++ trunk/src/win32.c 2010-05-10 21:52:43 UTC (rev 4897) @@ -413,6 +413,62 @@ } +gchar *win32_show_document_save_as_dialog(GtkWindow *parent, const gchar *title, + const gchar *initial_file) +{ + OPENFILENAMEW of; + gint retval; + gchar tmp[MAX_PATH]; + wchar_t w_file[MAX_PATH]; + wchar_t w_title[512]; + guint x; + + w_file[0] = '\0'; + + if (initial_file != NULL) + MultiByteToWideChar(CP_UTF8, 0, initial_file, -1, w_file, sizeof(w_file)); + + MultiByteToWideChar(CP_UTF8, 0, title, -1, w_title, sizeof(w_title)); + + /* initialise file dialog info struct */ + memset(&of, 0, sizeof of); +#ifdef OPENFILENAME_SIZE_VERSION_400 + of.lStructSize = OPENFILENAME_SIZE_VERSION_400; +#else + of.lStructSize = sizeof of; +#endif + of.hwndOwner = GDK_WINDOW_HWND(GTK_WIDGET(parent)->window); + + of.lpstrFilter = get_file_filters(); + of.lpstrCustomFilter = NULL; + of.nFilterIndex = GEANY_FILETYPES_NONE + 1; + + of.lpstrFile = w_file; + of.nMaxFile = 2048; + of.lpstrFileTitle = NULL; + of.lpstrTitle = w_title; + of.lpstrDefExt = L""; + of.Flags = OFN_FILEMUSTEXIST | OFN_EXPLORER; + retval = GetSaveFileNameW(&of); + + if (! retval) + { + if (CommDlgExtendedError()) + { + gchar *error = g_strdup_printf( + "File dialog box error (%x)", (gint) CommDlgExtendedError()); + win32_message_dialog(NULL, GTK_MESSAGE_ERROR, error); + g_free(error); + } + return NULL; + } + + WideCharToMultiByte(CP_UTF8, 0, w_file, -1, tmp, sizeof(tmp), NULL, NULL); + + return g_strdup(tmp); +} + + /* initial_dir can be NULL to use the current working directory. * Returns: the selected filename */ gchar *win32_show_file_dialog(GtkWindow *parent, const gchar *title, const gchar *initial_file) Modified: trunk/src/win32.h =================================================================== --- trunk/src/win32.h 2010-05-10 17:36:19 UTC (rev 4896) +++ trunk/src/win32.h 2010-05-10 21:52:43 UTC (rev 4897) @@ -31,6 +31,9 @@ gboolean win32_show_document_open_dialog(gboolean file_open, const gchar *initial_dir); +gchar *win32_show_document_save_as_dialog(GtkWindow *parent, const gchar *title, + const gchar *initial_file); + void win32_show_font_dialog(void); void win32_show_color_dialog(const gchar *colour); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4896] trunk
by eht16＠users.sourceforge.net 10 May '10

10 May '10

Revision: 4896 http://geany.svn.sourceforge.net/geany/?rev=4896&view=rev Author: eht16 Date: 2010-05-10 17:36:19 +0000 (Mon, 10 May 2010) Log Message: ----------- Fix Cancel on Goto Line dialog (patch by Dimitar Zhekov, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-05-10 17:21:13 UTC (rev 4895) +++ trunk/ChangeLog 2010-05-10 17:36:19 UTC (rev 4896) @@ -1,3 +1,9 @@ +2010-05-10 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/dialogs.c: + Fix Cancel on Goto Line dialog (patch by Dimitar Zhekov, thanks). + + 2010-05-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * THANKS, src/about.c, plugins/classbuilder.c: Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2010-05-10 17:21:13 UTC (rev 4895) +++ trunk/src/dialogs.c 2010-05-10 17:36:19 UTC (rev 4896) @@ -930,7 +930,7 @@ /* ugly hack - user_data not supported for callback */ -gchar *dialog_input = NULL; +static gchar *dialog_input = NULL; static void on_dialog_input(const gchar *str) { @@ -948,7 +948,7 @@ } -/* Returns: newly allocated string - a copy of either the entry text or default_text. +/* Returns: newly allocated copy of the entry text or NULL on cancel. * Specialised variant for Goto Line dialog. */ gchar *dialogs_show_input_goto_line(const gchar *title, const gchar *label_text, const gchar *default_text) @@ -957,7 +957,7 @@ dialogs_show_input_full( title, label_text, default_text, FALSE, on_dialog_input, G_CALLBACK(ui_editable_insert_text_callback)); - return NVL(dialog_input, g_strdup(default_text)); + return dialog_input; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4895] trunk/src/ui_utils.c
by eht16＠users.sourceforge.net 10 May '10

10 May '10

Revision: 4895 http://geany.svn.sourceforge.net/geany/?rev=4895&view=rev Author: eht16 Date: 2010-05-10 17:21:13 +0000 (Mon, 10 May 2010) Log Message: ----------- Add missing header include Modified Paths: -------------- trunk/src/ui_utils.c Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2010-05-09 15:48:55 UTC (rev 4894) +++ trunk/src/ui_utils.c 2010-05-10 17:21:13 UTC (rev 4895) @@ -28,6 +28,7 @@ #include "geany.h" #include <string.h> +#include <ctype.h> #include <gdk/gdkkeysyms.h> #include "ui_utils.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4894] trunk
by eht16＠users.sourceforge.net 09 May '10

09 May '10

Revision: 4894 http://geany.svn.sourceforge.net/geany/?rev=4894&view=rev Author: eht16 Date: 2010-05-09 15:48:55 +0000 (Sun, 09 May 2010) Log Message: ----------- Allow '+<number' and '-<number>' as values for Goto Line inputs to jump relative to the current line (closes #2997238). Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/editor.c trunk/src/editor.h trunk/src/geanyentryaction.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-05-09 15:48:42 UTC (rev 4893) +++ trunk/ChangeLog 2010-05-09 15:48:55 UTC (rev 4894) @@ -5,9 +5,12 @@ * src/ui_utils.h, src/ui_utils.c: Add public, generic callback ui_editable_insert_text_callback() to restrict GtkEntry text inputs to +/- and numeric values only. - * src/dialogsh, src/dialogs.c: + * src/dialogs.h, src/dialogs.c: Add special variant dialogs_show_input_goto_line() to use a normal GtkEntry together with dialogs_show_input_goto_line() for text input. + * src/geanyentryaction.c, src/callbacks.c, src/editor.c, src/editor.h: + Allow '+<number' and '-<number>' as values for Goto Line inputs + to jump relative to the current line (closes #2997238). 2010-05-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2010-05-09 15:48:42 UTC (rev 4893) +++ trunk/src/callbacks.c 2010-05-09 15:48:55 UTC (rev 4894) @@ -1176,21 +1176,45 @@ } +static void get_line_and_offset_from_text(const gchar *text, gint *line_no, gint *offset) +{ + if (*text == '+' || *text == '-') + { + *line_no = atoi(text + 1); + *offset = (*text == '+') ? 1 : -1; + } + else + { + *line_no = atoi(text) - 1; + *offset = 0; + } +} + + void on_go_to_line_activate (GtkMenuItem *menuitem, gpointer user_data) { - static gdouble val = 1; + static gchar value[16] = ""; + gchar *result; - if (dialogs_show_input_numeric(_("Go to Line"), _("Enter the line you want to go to:"), - &val, 1, 100000000, 1)) + result = dialogs_show_input_goto_line( + _("Go to Line"), _("Enter the line you want to go to:"), value); + if (result != NULL) { GeanyDocument *doc = document_get_current(); + gint offset; + gint line_no; g_return_if_fail(doc != NULL); - if (! editor_goto_line(doc->editor, (gint) val - 1)) + get_line_and_offset_from_text(result, &line_no, &offset); + if (! editor_goto_line(doc->editor, line_no, offset)) utils_beep(); + /* remember value for future calls */ + g_snprintf(value, sizeof(value), "%s", result); + + g_free(result); } } @@ -1199,10 +1223,13 @@ on_toolbutton_goto_entry_activate(GtkAction *action, const gchar *text, gpointer user_data) { GeanyDocument *doc = document_get_current(); + gint offset; + gint line_no; g_return_if_fail(doc != NULL); - if (! editor_goto_line(doc->editor, atoi(text) - 1)) + get_line_and_offset_from_text(text, &line_no, &offset); + if (! editor_goto_line(doc->editor, line_no, offset)) utils_beep(); else keybindings_send_command(GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_EDITOR); Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2010-05-09 15:48:42 UTC (rev 4893) +++ trunk/src/editor.c 2010-05-09 15:48:55 UTC (rev 4894) @@ -4589,15 +4589,22 @@ /* Convenience function for editor_goto_pos() to pass in a line number. */ -gboolean editor_goto_line(GeanyEditor *editor, gint line) +gboolean editor_goto_line(GeanyEditor *editor, gint line_no, gint offset) { gint pos; g_return_val_if_fail(editor, FALSE); - if (line < 0 || line >= sci_get_line_count(editor->sci)) + if (line_no < 0 || line_no >= sci_get_line_count(editor->sci)) return FALSE; - pos = sci_get_position_from_line(editor->sci, line); + if (offset != 0) + { + gint current_line = sci_get_current_line(editor->sci); + line_no *= offset; + line_no = current_line + line_no; + } + + pos = sci_get_position_from_line(editor->sci, line_no); return editor_goto_pos(editor, pos, TRUE); } Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2010-05-09 15:48:42 UTC (rev 4893) +++ trunk/src/editor.h 2010-05-09 15:48:55 UTC (rev 4894) @@ -288,7 +288,7 @@ gboolean editor_goto_pos(GeanyEditor *editor, gint pos, gboolean mark); -gboolean editor_goto_line(GeanyEditor *editor, gint line_no); +gboolean editor_goto_line(GeanyEditor *editor, gint line_no, gint offset); void editor_set_indentation_guides(GeanyEditor *editor); Modified: trunk/src/geanyentryaction.c =================================================================== --- trunk/src/geanyentryaction.c 2010-05-09 15:48:42 UTC (rev 4893) +++ trunk/src/geanyentryaction.c 2010-05-09 15:48:55 UTC (rev 4894) @@ -93,21 +93,13 @@ } -static void entry_insert_text_cb(GtkEditable *editable, gchar *new_text, gint new_text_len, - gint *position, GeanyEntryAction *action) -{ - /* don't insert any text when it is not a digit */ - if (! isdigit(*new_text)) - g_signal_stop_emission_by_name(editable, "insert-text"); -} - - static void geany_entry_action_connect_proxy(GtkAction *action, GtkWidget *widget) { GeanyEntryActionPrivate *priv = GEANY_ENTRY_ACTION_GET_PRIVATE(action); if (priv->numeric) - g_signal_connect(priv->entry, "insert-text", G_CALLBACK(entry_insert_text_cb), action); + g_signal_connect(priv->entry, "insert-text", + G_CALLBACK(ui_editable_insert_text_callback), NULL); g_signal_connect(priv->entry, "changed", G_CALLBACK(delegate_entry_changed_cb), action); g_signal_connect(priv->entry, "activate", G_CALLBACK(delegate_entry_activate_cb), action); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4893] trunk
by eht16＠users.sourceforge.net 09 May '10

09 May '10

Revision: 4893 http://geany.svn.sourceforge.net/geany/?rev=4893&view=rev Author: eht16 Date: 2010-05-09 15:48:42 +0000 (Sun, 09 May 2010) Log Message: ----------- Add special variant dialogs_show_input_goto_line() to use a normal GtkEntry together with dialogs_show_input_goto_line() for text input. Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c trunk/src/dialogs.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-05-09 15:48:29 UTC (rev 4892) +++ trunk/ChangeLog 2010-05-09 15:48:42 UTC (rev 4893) @@ -5,6 +5,9 @@ * src/ui_utils.h, src/ui_utils.c: Add public, generic callback ui_editable_insert_text_callback() to restrict GtkEntry text inputs to +/- and numeric values only. + * src/dialogsh, src/dialogs.c: + Add special variant dialogs_show_input_goto_line() to use a normal + GtkEntry together with dialogs_show_input_goto_line() for text input. 2010-05-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2010-05-09 15:48:29 UTC (rev 4892) +++ trunk/src/dialogs.c 2010-05-09 15:48:42 UTC (rev 4893) @@ -838,7 +838,8 @@ static void add_input_widgets(GtkWidget *dialog, GtkWidget *vbox, - const gchar *label_text, const gchar *default_text, gboolean persistent) + const gchar *label_text, const gchar *default_text, gboolean persistent, + GCallback insert_text_cb) { GtkWidget *entry; @@ -873,6 +874,8 @@ gtk_entry_set_max_length(GTK_ENTRY(entry), 255); gtk_entry_set_width_chars(GTK_ENTRY(entry), 30); + if (insert_text_cb != NULL) + g_signal_connect(entry, "insert-text", insert_text_cb, NULL); g_signal_connect(entry, "activate", G_CALLBACK(on_input_entry_activate), dialog); g_signal_connect(dialog, "show", G_CALLBACK(on_input_dialog_show), entry); g_signal_connect(dialog, "response", G_CALLBACK(on_input_dialog_response), entry); @@ -886,7 +889,7 @@ * Returns: the dialog widget. */ static GtkWidget * dialogs_show_input_full(const gchar *title, const gchar *label_text, const gchar *default_text, - gboolean persistent, GeanyInputCallback input_cb) + gboolean persistent, GeanyInputCallback input_cb, GCallback insert_text_cb) { GtkWidget *dialog, *vbox; @@ -900,7 +903,7 @@ g_object_set_data(G_OBJECT(dialog), "has_combo", GINT_TO_POINTER(persistent)); g_object_set_data(G_OBJECT(dialog), "input_cb", (gpointer) input_cb); - add_input_widgets(dialog, vbox, label_text, default_text, persistent); + add_input_widgets(dialog, vbox, label_text, default_text, persistent, insert_text_cb); if (persistent) { @@ -922,7 +925,7 @@ dialogs_show_input_persistent(const gchar *title, const gchar *label_text, const gchar *default_text, GeanyInputCallback input_cb) { - return dialogs_show_input_full(title, label_text, default_text, TRUE, input_cb); + return dialogs_show_input_full(title, label_text, default_text, TRUE, input_cb, NULL); } @@ -940,11 +943,24 @@ const gchar *default_text) { dialog_input = NULL; - dialogs_show_input_full(title, label_text, default_text, FALSE, on_dialog_input); + dialogs_show_input_full(title, label_text, default_text, FALSE, on_dialog_input, NULL); return NVL(dialog_input, g_strdup(default_text)); } +/* Returns: newly allocated string - a copy of either the entry text or default_text. + * Specialised variant for Goto Line dialog. */ +gchar *dialogs_show_input_goto_line(const gchar *title, const gchar *label_text, + const gchar *default_text) +{ + dialog_input = NULL; + dialogs_show_input_full( + title, label_text, default_text, FALSE, on_dialog_input, + G_CALLBACK(ui_editable_insert_text_callback)); + return NVL(dialog_input, g_strdup(default_text)); +} + + /** * Shows an input box to enter a numerical value using a GtkSpinButton. * If the dialog is aborted, @a value remains untouched. Modified: trunk/src/dialogs.h =================================================================== --- trunk/src/dialogs.h 2010-05-09 15:48:29 UTC (rev 4892) +++ trunk/src/dialogs.h 2010-05-09 15:48:42 UTC (rev 4893) @@ -48,6 +48,9 @@ gchar *dialogs_show_input(const gchar *title, const gchar *label_text, const gchar *default_text); +gchar *dialogs_show_input_goto_line(const gchar *title, const gchar *label_text, + const gchar *default_text); + GtkWidget *dialogs_show_input_persistent(const gchar *title, const gchar *label_text, const gchar *default_text, GeanyInputCallback input_cb); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4892] trunk
by eht16＠users.sourceforge.net 09 May '10

09 May '10

Revision: 4892 http://geany.svn.sourceforge.net/geany/?rev=4892&view=rev Author: eht16 Date: 2010-05-09 15:48:29 +0000 (Sun, 09 May 2010) Log Message: ----------- Add public, generic callback ui_editable_insert_text_callback() to restrict GtkEntry text inputs to +/- and numeric values only. Modified Paths: -------------- trunk/ChangeLog trunk/src/ui_utils.c trunk/src/ui_utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-05-09 15:48:18 UTC (rev 4891) +++ trunk/ChangeLog 2010-05-09 15:48:29 UTC (rev 4892) @@ -2,6 +2,9 @@ * THANKS, src/about.c, plugins/classbuilder.c: Add support for creating PHP classes (patch by Ondrej Donek, thanks). + * src/ui_utils.h, src/ui_utils.c: + Add public, generic callback ui_editable_insert_text_callback() + to restrict GtkEntry text inputs to +/- and numeric values only. 2010-05-08 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2010-05-09 15:48:18 UTC (rev 4891) +++ trunk/src/ui_utils.c 2010-05-09 15:48:29 UTC (rev 4892) @@ -2267,3 +2267,25 @@ else return default_value; } + + +void ui_editable_insert_text_callback(GtkEditable *editable, gchar *new_text, + gint new_text_len, gint *position, gpointer data) +{ + gboolean stop_signal = FALSE; + const gchar c = *new_text; + + /* allow inserting '+' and '-' as the first character */ + if (position != NULL && *position == 0) + { + if (c != '+' && c != '-' && ! isdigit(c)) + stop_signal = TRUE; + } + /* don't insert any text when it is not a digit */ + else if (! isdigit(c)) + stop_signal = TRUE; + + if (stop_signal) + g_signal_stop_emission_by_name(editable, "insert-text"); +} + Modified: trunk/src/ui_utils.h =================================================================== --- trunk/src/ui_utils.h 2010-05-09 15:48:18 UTC (rev 4891) +++ trunk/src/ui_utils.h 2010-05-09 15:48:29 UTC (rev 4892) @@ -203,6 +203,8 @@ void ui_entry_add_clear_icon(GtkEntry *entry); +void ui_editable_insert_text_callback(GtkEditable *editable, gchar *new_text, + gint new_text_len, gint *position, gpointer data); #define ui_label_new_bold(text)\ ui_label_set_markup(GTK_LABEL(gtk_label_new(NULL)), "<b>%s</b>", text); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4891] trunk/plugins/classbuilder.c
by eht16＠users.sourceforge.net 09 May '10

09 May '10

Revision: 4891 http://geany.svn.sourceforge.net/geany/?rev=4891&view=rev Author: eht16 Date: 2010-05-09 15:48:18 +0000 (Sun, 09 May 2010) Log Message: ----------- Guard C++/GTK class generation specific code Modified Paths: -------------- trunk/plugins/classbuilder.c Modified: trunk/plugins/classbuilder.c =================================================================== --- trunk/plugins/classbuilder.c 2010-05-09 15:48:10 UTC (rev 4890) +++ trunk/plugins/classbuilder.c 2010-05-09 15:48:18 UTC (rev 4891) @@ -707,9 +707,12 @@ class_info->base_name = g_strdup(""); class_info->base_include = g_strdup(""); } - class_info->header = g_strdup(gtk_entry_get_text(GTK_ENTRY(cc_dlg->header_entry))); - class_info->header_guard = g_ascii_strup(class_info->header, -1); - g_strdelimit(class_info->header_guard, ".-", '_'); + if (cc_dlg->header_entry != NULL) + { + class_info->header = g_strdup(gtk_entry_get_text(GTK_ENTRY(cc_dlg->header_entry))); + class_info->header_guard = g_ascii_strup(class_info->header, -1); + g_strdelimit(class_info->header_guard, ".-", '_'); + } switch (class_info->type) { case GEANY_CLASS_TYPE_CPP: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4890] trunk/plugins/classbuilder.c
by eht16＠users.sourceforge.net 09 May '10

09 May '10

Revision: 4890 http://geany.svn.sourceforge.net/geany/?rev=4890&view=rev Author: eht16 Date: 2010-05-09 15:48:10 +0000 (Sun, 09 May 2010) Log Message: ----------- Minor fixes Modified Paths: -------------- trunk/plugins/classbuilder.c Modified: trunk/plugins/classbuilder.c =================================================================== --- trunk/plugins/classbuilder.c 2010-05-09 15:48:01 UTC (rev 4889) +++ trunk/plugins/classbuilder.c 2010-05-09 15:48:10 UTC (rev 4890) @@ -96,6 +96,7 @@ } CreateClassDialog; +/* TODO make these templates configurable */ static const gchar templates_cpp_class_header[] = "{fileheader}\n\n\ #ifndef {header_guard}\n\ #define {header_guard}\n\ @@ -542,7 +543,6 @@ gdk_beep(); } gtk_widget_destroy(cc_dlg->dialog); -/* g_object_unref(G_OBJECT(cc_dlg->dialog)); */ } @@ -579,8 +579,10 @@ else class_source = g_strconcat(class_name_down, ".c", NULL); - gtk_entry_set_text(GTK_ENTRY(cc_dlg->header_entry), class_header); - gtk_entry_set_text(GTK_ENTRY(cc_dlg->source_entry), class_source); + if (cc_dlg->header_entry != NULL) + gtk_entry_set_text(GTK_ENTRY(cc_dlg->header_entry), class_header); + if (cc_dlg->source_entry != NULL) + gtk_entry_set_text(GTK_ENTRY(cc_dlg->source_entry), class_source); g_free(class_name); g_free(class_name_down); @@ -825,7 +827,7 @@ class_info->implements_decl = g_strdup(""); g_free(tmp_str); - if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cc_dlg->create_constructor_box)) && + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cc_dlg->create_constructor_box)) && ! gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cc_dlg->create_isabstract_box))) { class_info->constructor_impl = g_strdup_printf("\n" @@ -919,8 +921,7 @@ g_free(text); } - if (! utils_str_equal(class_info->header, "") && - class_info->type != GEANY_CLASS_TYPE_PHP) + if (! utils_str_equal(class_info->header, "") && class_info->type != GEANY_CLASS_TYPE_PHP) { text = get_template_class_header(class_info); doc = document_new_file(class_info->header, NULL, NULL); @@ -928,7 +929,7 @@ g_free(text); } - free_pointers(17, tmp, class_info->class_name, class_info->class_name_up, + free_pointers(21, tmp, class_info->class_name, class_info->class_name_up, class_info->base_name, class_info->class_name_low, class_info->base_include, class_info->header, class_info->header_guard, class_info->source, class_info->base_decl, class_info->constructor_decl, class_info->constructor_impl, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4889] trunk/plugins/classbuilder.c
by eht16＠users.sourceforge.net 09 May '10

09 May '10

Revision: 4889 http://geany.svn.sourceforge.net/geany/?rev=4889&view=rev Author: eht16 Date: 2010-05-09 15:48:01 +0000 (Sun, 09 May 2010) Log Message: ----------- Replace C99 style comments Adjust plugin author information Fix shadowed variable Modified Paths: -------------- trunk/plugins/classbuilder.c Modified: trunk/plugins/classbuilder.c =================================================================== --- trunk/plugins/classbuilder.c 2010-05-09 15:47:49 UTC (rev 4888) +++ trunk/plugins/classbuilder.c 2010-05-09 15:48:01 UTC (rev 4889) @@ -27,14 +27,14 @@ #include "geanyplugin.h" -GeanyData *geany_data; +GeanyData *geany_data; GeanyFunctions *geany_functions; PLUGIN_VERSION_CHECK(GEANY_API_VERSION) PLUGIN_SET_INFO(_("Class Builder"), _("Creates source files for new class types."), VERSION, - "Alexander Rodin") + "Alexander Rodin, Ondrej Donek, the Geany developer team") static GtkWidget *main_menu_item = NULL; @@ -67,7 +67,7 @@ gchar *constructor_impl; gchar *destructor_impl; gchar *gtk_destructor_registration; - // These are needed only for PHP classes + /* These are needed only for PHP classes */ gchar *namespace_decl; gchar *implements_decl; gchar *abstract_decl; @@ -88,7 +88,7 @@ GtkWidget *create_constructor_box; GtkWidget *create_destructor_box; GtkWidget *gtk_constructor_type_entry; - // These are needed only for PHP classes + /* These are needed only for PHP classes */ GtkWidget *class_namespace_entry; GtkWidget *class_implements_entry; GtkWidget *create_isabstract_box; @@ -808,22 +808,22 @@ } case GEANY_CLASS_TYPE_PHP: { - gchar *tmp; + gchar *tmp_str; class_info->source = g_strdup(gtk_entry_get_text(GTK_ENTRY(cc_dlg->source_entry))); - tmp = g_strdup(gtk_entry_get_text(GTK_ENTRY(cc_dlg->class_namespace_entry))); - if (! utils_str_equal(tmp, "")) - class_info->namespace_decl = g_strdup_printf("namespace %s;", tmp); + tmp_str = g_strdup(gtk_entry_get_text(GTK_ENTRY(cc_dlg->class_namespace_entry))); + if (! utils_str_equal(tmp_str, "")) + class_info->namespace_decl = g_strdup_printf("namespace %s;", tmp_str); else class_info->namespace_decl = g_strdup(""); - tmp = g_strdup(gtk_entry_get_text(GTK_ENTRY(cc_dlg->class_implements_entry))); - if (! utils_str_equal(tmp, "")) - class_info->implements_decl = g_strdup_printf(" implements %s", tmp); + tmp_str = g_strdup(gtk_entry_get_text(GTK_ENTRY(cc_dlg->class_implements_entry))); + if (! utils_str_equal(tmp_str, "")) + class_info->implements_decl = g_strdup_printf(" implements %s", tmp_str); else class_info->implements_decl = g_strdup(""); - g_free(tmp); + g_free(tmp_str); if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cc_dlg->create_constructor_box)) && ! gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cc_dlg->create_isabstract_box))) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4888] trunk/plugins/classbuilder.c
by eht16＠users.sourceforge.net 09 May '10

09 May '10

Revision: 4888 http://geany.svn.sourceforge.net/geany/?rev=4888&view=rev Author: eht16 Date: 2010-05-09 15:47:49 +0000 (Sun, 09 May 2010) Log Message: ----------- Remove trailing spaces Modified Paths: -------------- trunk/plugins/classbuilder.c Modified: trunk/plugins/classbuilder.c =================================================================== --- trunk/plugins/classbuilder.c 2010-05-09 15:47:39 UTC (rev 4887) +++ trunk/plugins/classbuilder.c 2010-05-09 15:47:49 UTC (rev 4888) @@ -320,7 +320,7 @@ utils_string_replace_all(template, "{gtk_destructor_registration}", class_info->gtk_destructor_registration); break; - + case GEANY_CLASS_TYPE_PHP: fileheader = templates_get_template_fileheader(GEANY_FILETYPES_PHP, class_info->source); template = g_string_new(templates_php_class_source); @@ -368,25 +368,25 @@ g_signal_connect_swapped(cc_dlg->dialog, "destroy", G_CALLBACK(g_free), (gpointer)cc_dlg); main_box = ui_dialog_vbox_new(GTK_DIALOG(cc_dlg->dialog)); - + if (type == GEANY_CLASS_TYPE_PHP) { frame = ui_frame_new_with_alignment(_("Namespace"), &align); gtk_container_add(GTK_CONTAINER(main_box), frame); - + vbox = gtk_vbox_new(FALSE, 10); gtk_container_add(GTK_CONTAINER(align), vbox); - + hbox = gtk_hbox_new(FALSE, 10); gtk_container_add(GTK_CONTAINER(vbox), hbox); - + label = gtk_label_new(_("Namespace:")); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - + cc_dlg->class_namespace_entry = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(hbox), cc_dlg->class_namespace_entry, TRUE, TRUE, 0); } - + frame = ui_frame_new_with_alignment(_("Class"), &align); gtk_container_add(GTK_CONTAINER(main_box), frame); @@ -403,28 +403,28 @@ gtk_box_pack_start(GTK_BOX(hbox), cc_dlg->class_name_entry, TRUE, TRUE, 0); g_signal_connect(cc_dlg->class_name_entry, "changed", G_CALLBACK(cc_dlg_on_class_name_entry_changed), cc_dlg); - - if (type != GEANY_CLASS_TYPE_PHP) + + if (type != GEANY_CLASS_TYPE_PHP) { hbox = gtk_hbox_new(FALSE, 10); gtk_container_add(GTK_CONTAINER(vbox), hbox); - + label = gtk_label_new(_("Header file:")); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - + cc_dlg->header_entry = gtk_entry_new(); gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->header_entry); } - + hbox = gtk_hbox_new(FALSE, 10); gtk_container_add(GTK_CONTAINER(vbox), hbox); - + label = gtk_label_new(_("Source file:")); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - + cc_dlg->source_entry = gtk_entry_new(); gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->source_entry); - + frame = ui_frame_new_with_alignment(_("Inheritance"), &align); gtk_container_add(GTK_CONTAINER(main_box), frame); @@ -446,25 +446,25 @@ hbox = gtk_hbox_new(FALSE, 10); gtk_container_add(GTK_CONTAINER(vbox), hbox); - + if (type == GEANY_CLASS_TYPE_PHP) label = gtk_label_new(_("Base source:")); else label = gtk_label_new(_("Base header:")); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - + cc_dlg->base_header_entry = gtk_entry_new(); if (type == GEANY_CLASS_TYPE_GTK) gtk_entry_set_text(GTK_ENTRY(cc_dlg->base_header_entry), "glib-object.h"); gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->base_header_entry); - + if (type != GEANY_CLASS_TYPE_PHP) { cc_dlg->base_header_global_box = gtk_check_button_new_with_label(_("Global")); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cc_dlg->base_header_global_box), TRUE); gtk_box_pack_end(GTK_BOX(hbox), cc_dlg->base_header_global_box, FALSE, FALSE, 0); } - + if (type == GEANY_CLASS_TYPE_GTK) { hbox = gtk_hbox_new(FALSE, 10); @@ -477,19 +477,19 @@ gtk_entry_set_text(GTK_ENTRY(cc_dlg->base_gtype_entry), "G_TYPE_OBJECT"); gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->base_gtype_entry); } - + if (type == GEANY_CLASS_TYPE_PHP) { hbox = gtk_hbox_new(FALSE, 10); gtk_container_add(GTK_CONTAINER(vbox), hbox); - + label = gtk_label_new(_("Implements:")); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - + cc_dlg->class_implements_entry = gtk_entry_new(); gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->class_implements_entry); } - + frame = ui_frame_new_with_alignment(_("Options"), &align); gtk_container_add(GTK_CONTAINER(main_box), frame); @@ -505,19 +505,19 @@ cc_dlg->create_destructor_box = gtk_check_button_new_with_label(_("Create destructor")); gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->create_destructor_box); - + if (type == GEANY_CLASS_TYPE_PHP) { hbox = gtk_hbox_new(FALSE, 10); gtk_container_add(GTK_CONTAINER(vbox), hbox); - + cc_dlg->create_isabstract_box = gtk_check_button_new_with_label(_("Is abstract")); gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->create_isabstract_box); - + cc_dlg->create_issingleton_box = gtk_check_button_new_with_label(_("Is singleton")); gtk_container_add(GTK_CONTAINER(hbox), cc_dlg->create_issingleton_box); } - + if (type == GEANY_CLASS_TYPE_GTK) { hbox = gtk_hbox_new(FALSE, 10); @@ -581,7 +581,7 @@ gtk_entry_set_text(GTK_ENTRY(cc_dlg->header_entry), class_header); gtk_entry_set_text(GTK_ENTRY(cc_dlg->source_entry), class_source); - + g_free(class_name); g_free(class_name_down); g_free(class_header); @@ -618,7 +618,7 @@ g_return_if_fail(entry != NULL); g_return_if_fail(GTK_IS_ENTRY(entry)); g_return_if_fail(cc_dlg != NULL); - + base_name_splitted = str_case_split(gtk_entry_get_text(GTK_ENTRY(entry)), '_'); if (! g_ascii_strncasecmp(gtk_entry_get_text(GTK_ENTRY(entry)), "gtk", 3)) /*tmp = g_strconcat("gtk/", gtk_entry_get_text(GTK_ENTRY(entry)), ".h", NULL);*/ @@ -630,12 +630,12 @@ tmp = g_strconcat(gtk_entry_get_text(GTK_ENTRY(entry)), ".php", NULL); else tmp = g_strconcat(gtk_entry_get_text(GTK_ENTRY(entry)), ".h", NULL); - + if (cc_dlg->class_type == GEANY_CLASS_TYPE_PHP) base_header = g_strdup(tmp); else base_header = g_ascii_strdown(tmp, -1); - + g_free(tmp); gtk_entry_set_text(GTK_ENTRY(cc_dlg->base_header_entry), base_header); @@ -684,7 +684,7 @@ if (! utils_str_equal(gtk_entry_get_text(GTK_ENTRY(cc_dlg->base_name_entry)), "")) { class_info->base_name = g_strdup(gtk_entry_get_text(GTK_ENTRY(cc_dlg->base_name_entry))); - if (class_info->type != GEANY_CLASS_TYPE_PHP) + if (class_info->type != GEANY_CLASS_TYPE_PHP) { class_info->base_include = g_strdup_printf("\n#include %c%s%c\n", gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cc_dlg->base_header_global_box)) ? @@ -695,7 +695,7 @@ } else { - class_info->base_include = g_strdup_printf("\nrequire_once \"%s\";\n", + class_info->base_include = g_strdup_printf("\nrequire_once \"%s\";\n", gtk_entry_get_text(GTK_ENTRY(cc_dlg->base_header_entry))); class_info->base_decl = g_strdup_printf(" extends %s", class_info->base_name); } @@ -809,23 +809,23 @@ case GEANY_CLASS_TYPE_PHP: { gchar *tmp; - + class_info->source = g_strdup(gtk_entry_get_text(GTK_ENTRY(cc_dlg->source_entry))); - + tmp = g_strdup(gtk_entry_get_text(GTK_ENTRY(cc_dlg->class_namespace_entry))); if (! utils_str_equal(tmp, "")) class_info->namespace_decl = g_strdup_printf("namespace %s;", tmp); else class_info->namespace_decl = g_strdup(""); - + tmp = g_strdup(gtk_entry_get_text(GTK_ENTRY(cc_dlg->class_implements_entry))); if (! utils_str_equal(tmp, "")) class_info->implements_decl = g_strdup_printf(" implements %s", tmp); else class_info->implements_decl = g_strdup(""); g_free(tmp); - - if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cc_dlg->create_constructor_box)) && + + if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cc_dlg->create_constructor_box)) && ! gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cc_dlg->create_isabstract_box))) { class_info->constructor_impl = g_strdup_printf("\n" @@ -840,7 +840,7 @@ "\t}\n", class_info->class_name); } - else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cc_dlg->create_constructor_box)) && + else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cc_dlg->create_constructor_box)) && gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cc_dlg->create_isabstract_box))) { class_info->constructor_impl = g_strdup_printf("\n" @@ -855,9 +855,9 @@ "\t}\n", class_info->class_name); } - else + else class_info->constructor_impl = g_strdup(""); - + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cc_dlg->create_destructor_box))) { class_info->destructor_impl = g_strdup_printf("\n" @@ -874,12 +874,12 @@ } else class_info->destructor_impl = g_strdup(""); - + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cc_dlg->create_isabstract_box))) class_info->abstract_decl = g_strdup("abstract "); - else + else class_info->abstract_decl = g_strdup(""); - + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cc_dlg->create_issingleton_box))) { class_info->singleton_impl = g_strdup_printf("\n" @@ -900,8 +900,8 @@ "\t\t}\n" "\t\treturn self::$kInstance;\n" "\t}\n", - class_info->class_name, - class_info->class_name, + class_info->class_name, + class_info->class_name, class_info->class_name); } else @@ -909,7 +909,7 @@ break; } } - + /* only create the files if the filename is not empty */ if (! utils_str_equal(class_info->source, "")) { @@ -919,7 +919,7 @@ g_free(text); } - if (! utils_str_equal(class_info->header, "") && + if (! utils_str_equal(class_info->header, "") && class_info->type != GEANY_CLASS_TYPE_PHP) { text = get_template_class_header(class_info); @@ -933,8 +933,8 @@ class_info->header, class_info->header_guard, class_info->source, class_info->base_decl, class_info->constructor_decl, class_info->constructor_impl, class_info->gtk_destructor_registration, class_info->destructor_decl, - class_info->destructor_impl, class_info->base_gtype, - class_info->namespace_decl, class_info->implements_decl, + class_info->destructor_impl, class_info->base_gtype, + class_info->namespace_decl, class_info->implements_decl, class_info->abstract_decl, class_info->singleton_impl, class_info, NULL); return TRUE; } @@ -956,7 +956,7 @@ } -static void +static void on_menu_create_php_class_activate (GtkMenuItem *menuitem, gpointer user_data) { @@ -983,7 +983,7 @@ menu_create_gtk_class = gtk_menu_item_new_with_mnemonic (_("_GTK+ Class")); gtk_container_add (GTK_CONTAINER (menu_create_class1_menu), menu_create_gtk_class); - + menu_create_php_class = gtk_menu_item_new_with_mnemonic (_("_PHP Class")); gtk_container_add (GTK_CONTAINER (menu_create_class1_menu), menu_create_php_class); @@ -994,7 +994,7 @@ G_CALLBACK (on_menu_create_gtk_class_activate), NULL); g_signal_connect(menu_create_php_class, "activate", - G_CALLBACK (on_menu_create_php_class_activate), + G_CALLBACK (on_menu_create_php_class_activate), NULL); gtk_widget_show_all(menu_create_class1); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2010