Commits August 2014

commits@lists.geany.org

1 participants
94 discussions

[geany/geany] 985cd9: Add "hackingdoc" as proper action and remove non-working --hackingdoc option
by Enrico Tröger 29 Aug '14

29 Aug '14

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Fri, 29 Aug 2014 12:13:57 UTC Commit: 985cd9146ffae3ab6022c5127946f6f594378a2e https://github.com/geany/geany/commit/985cd9146ffae3ab6022c5127946f6f594378… Log Message: ----------- Add "hackingdoc" as proper action and remove non-working --hackingdoc option Modified Paths: -------------- wscript Modified: wscript 14 lines changed, 11 insertions(+), 3 deletions(-) =================================================================== @@ -343,9 +343,6 @@ def options(opt): help='documentation root', dest='docdir') opt.add_option('--libdir', type='string', default='', help='object code libraries', dest='libdir') - # Actions - opt.add_option('--hackingdoc', action='store_true', default=False, - help='generate HTML documentation from HACKING file', dest='hackingdoc') def build(bld): @@ -690,6 +687,17 @@ def apidoc(ctx): os.chdir('..') +def hackingdoc(ctx): + """generate HACKING documentation""" + os.chdir('doc') + Logs.pprint('CYAN', 'Generating HACKING documentation') + cmd = _find_rst2html(ctx) + ret = ctx.exec_command('%s -stg --stylesheet=geany.css %s %s' % (cmd, '../HACKING', 'hacking.html')) + if ret != 0: + raise WafError('Generating HACKING documentation failed') + os.chdir('..') + + def _find_program(ctx, cmd, **kw): def noop(*args): pass -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 15c2fa: Update Waf to 1.7.16
by Enrico Tröger 29 Aug '14

29 Aug '14

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Fri, 29 Aug 2014 12:11:14 UTC Commit: 15c2fafff6b76cb6d7e2032840832bae14a5aa7b https://github.com/geany/geany/commit/15c2fafff6b76cb6d7e2032840832bae14a5a… Log Message: ----------- Update Waf to 1.7.16 Modified Paths: -------------- waf Modified: waf 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 8d5e66: Build HTML documentation automatically during the build process
by Enrico Tröger 29 Aug '14

29 Aug '14

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Fri, 29 Aug 2014 12:10:56 UTC Commit: 8d5e666d9eab5518f300b45a71295027b2e9047a https://github.com/geany/geany/commit/8d5e666d9eab5518f300b45a71295027b2e90… Log Message: ----------- Build HTML documentation automatically during the build process This is an improvement as requested in #322 to update the HTML docs after geany.txt or geany.css have changed. Also, with this change the resulting HTML will be generated in the outdir, not in srcdir/doc anymore. Modified Paths: -------------- wscript Modified: wscript 43 lines changed, 23 insertions(+), 20 deletions(-) =================================================================== @@ -232,6 +232,9 @@ def configure(conf): conf.env['minimum_gtk_version'] = minimum_gtk_version conf.env['use_gtk3'] = conf.options.use_gtk3 + # rst2html for the HTML manual + conf.env['RST2HTML'] = _find_rst2html(conf) + # Windows specials if is_win32: if conf.env['PREFIX'].lower() == tempfile.gettempdir().lower(): @@ -456,6 +459,18 @@ def build(bld): install_path = '${LOCALEDIR}', appname = 'geany') + # HTML documentation (build if it is not part of the tree already, as it is required for install) + html_doc_filename = os.path.join(bld.out_dir, 'doc', 'geany.html') + if bld.env['RST2HTML']: + rst2html = bld.env['RST2HTML'] + bld( + source = ['doc/geany.txt'], + deps = ['doc/geany.css'], + target = 'doc/geany.html', + name = 'geany.html', + cwd = os.path.join(bld.path.abspath(), 'doc'), + rule = '%s -stg --stylesheet=geany.css geany.txt %s' % (rst2html, html_doc_filename)) + # geany.pc if is_win32: # replace backward slashes by forward slashes as they could be interepreted as escape @@ -514,11 +529,6 @@ def build(bld): 'top_builddir': bld.out_dir, 'top_srcdir': bld.top_dir,}) - # build HTML documentation if it is not part of the tree already, as it is required for install - # FIXME: replace this with automatic building if source changed/destination is missing - if not bld.path.find_resource('doc/geany.html'): - htmldoc(bld) - ### # Install files ### @@ -541,18 +551,21 @@ def build(bld): # Docs base_dir = '${PREFIX}' if is_win32 else '${DOCDIR}' ext = '.txt' if is_win32 else '' - html_dir = '' if is_win32 else 'html/' - html_name = 'Manual.html' if is_win32 else 'index.html' for filename in 'AUTHORS ChangeLog COPYING README NEWS THANKS TODO'.split(): basename = _uc_first(filename, bld) destination_filename = '%s%s' % (basename, ext) destination = os.path.join(base_dir, destination_filename) bld.install_as(destination, filename) - start_dir = bld.path.find_dir('doc/images') - bld.install_files('${DOCDIR}/%simages' % html_dir, start_dir.ant_glob('*.png'), cwd=start_dir) + # install HTML documentation only if it exists, i.e. it was built before + if os.path.exists(html_doc_filename): + html_dir = '' if is_win32 else 'html/' + html_name = 'Manual.html' if is_win32 else 'index.html' + start_dir = bld.path.find_dir('doc/images') + bld.install_files('${DOCDIR}/%simages' % html_dir, start_dir.ant_glob('*.png'), cwd=start_dir) + bld.install_as('${DOCDIR}/%s%s' % (html_dir, html_name), 'doc/geany.html') + bld.install_as('${DOCDIR}/%s' % _uc_first('manual.txt', bld), 'doc/geany.txt') - bld.install_as('${DOCDIR}/%s%s' % (html_dir, html_name), 'doc/geany.html') bld.install_as('${DOCDIR}/ScintillaLicense.txt', 'scintilla/License.txt') if is_win32: bld.install_as('${DOCDIR}/ReadMe.I18n.txt', 'README.I18N') @@ -677,16 +690,6 @@ def apidoc(ctx): os.chdir('..') -def htmldoc(ctx): - """generate HTML documentation""" - # first try rst2html.py as it is the upstream default, fall back to rst2html - cmd = _find_rst2html(ctx) - os.chdir('doc') - Logs.pprint('CYAN', 'Generating HTML documentation') - ctx.exec_command('%s -stg --stylesheet=geany.css %s %s' % (cmd, 'geany.txt', 'geany.html')) - os.chdir('..') - - def _find_program(ctx, cmd, **kw): def noop(*args): pass -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 704715: Allow user to edit open dialog filename when file doesn't exist
by Nick Treleaven 29 Aug '14

29 Aug '14

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Fri, 29 Aug 2014 11:23:38 UTC Commit: 7047152a1f3ee79cd4e08dd77d1fe9039acc9834 https://github.com/geany/geany/commit/7047152a1f3ee79cd4e08dd77d1fe9039acc9… Log Message: ----------- Allow user to edit open dialog filename when file doesn't exist Modified Paths: -------------- src/dialogs.c Modified: src/dialogs.c 23 lines changed, 18 insertions(+), 5 deletions(-) =================================================================== @@ -123,8 +123,10 @@ static void file_chooser_set_filter_idx(GtkFileChooser *chooser, guint idx) } -static void open_file_dialog_handle_response(GtkWidget *dialog, gint response) +static gboolean open_file_dialog_handle_response(GtkWidget *dialog, gint response) { + gboolean ret = TRUE; + if (response == GTK_RESPONSE_ACCEPT || response == GEANY_RESPONSE_VIEW) { GSList *filelist; @@ -150,7 +152,18 @@ static void open_file_dialog_handle_response(GtkWidget *dialog, gint response) filelist = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog)); if (filelist != NULL) { - document_open_files(filelist, ro, ft, charset); + const gchar *first = filelist->data; + + // When there's only one filename it may have been typed manually + if (!filelist->next && !g_file_test(first, G_FILE_TEST_EXISTS)) + { + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("\"%s\" was not found."), first); + ret = FALSE; + } + else + { + document_open_files(filelist, ro, ft, charset); + } g_slist_foreach(filelist, (GFunc) g_free, NULL); /* free filenames */ } g_slist_free(filelist); @@ -158,6 +171,7 @@ static void open_file_dialog_handle_response(GtkWidget *dialog, gint response) if (app->project && !EMPTY(app->project->base_path)) gtk_file_chooser_remove_shortcut_folder(GTK_FILE_CHOOSER(dialog), app->project->base_path, NULL); + return ret; } @@ -456,7 +470,6 @@ void dialogs_show_open_file(void) #endif { GtkWidget *dialog = create_open_file_dialog(); - gint response; open_file_dialog_apply_settings(dialog); @@ -467,8 +480,8 @@ void dialogs_show_open_file(void) gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(dialog), app->project->base_path, NULL); - response = gtk_dialog_run(GTK_DIALOG(dialog)); - open_file_dialog_handle_response(dialog, response); + while (!open_file_dialog_handle_response(dialog, + gtk_dialog_run(GTK_DIALOG(dialog)))); gtk_widget_destroy(dialog); } g_free(initdir); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 82cd83: Merge branch 'doc/auto-enable-api'
by Colomban Wendling 27 Aug '14

27 Aug '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 27 Aug 2014 17:07:22 UTC Commit: 82cd83183c93f912c5610d58249a6a2f4afef70b https://github.com/geany/geany/commit/82cd83183c93f912c5610d58249a6a2f4afef… Log Message: ----------- Merge branch 'doc/auto-enable-api' Closes PR#324. Modified Paths: -------------- m4/geany-doxygen.m4 Modified: m4/geany-doxygen.m4 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -7,7 +7,7 @@ AC_DEFUN([GEANY_CHECK_DOXYGEN], [AS_HELP_STRING([--enable-api-docs], [generate API documentation using Doxygen [default=no]])], [geany_with_doxygen="$enableval"], - [geany_with_doxygen="no"]) + [geany_with_doxygen="auto"]) AC_ARG_VAR([DOXYGEN], [Path to Doxygen executable]) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 102169: Merge branch 'doc/untrack-geany.html'
by Colomban Wendling 27 Aug '14

27 Aug '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 27 Aug 2014 17:06:22 UTC Commit: 102169ee3200176178bfd2290ae5db45b545df4f https://github.com/geany/geany/commit/102169ee3200176178bfd2290ae5db45b545d… Log Message: ----------- Merge branch 'doc/untrack-geany.html' Closes PR#322. Modified Paths: -------------- .gitignore doc/Makefile.am doc/geany.html m4/geany-docutils.m4 wscript Modified: .gitignore 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -99,6 +99,7 @@ Makefile.in /doc/Doxyfile /doc/Doxyfile.stamp /doc/geany.1 +/doc/geany.html /doc/hacking.html /doc/*.pdf /doc/*.aux Modified: doc/Makefile.am 28 lines changed, 11 insertions(+), 17 deletions(-) =================================================================== @@ -56,16 +56,17 @@ geany.html: $(srcdir)/geany.css $(srcdir)/geany.txt hacking.html: $(srcdir)/geany.css $(top_srcdir)/HACKING $(AM_V_GEN)$(RST2HTML) -stg --stylesheet=$(srcdir)/geany.css $(top_srcdir)/HACKING $@ -all-html-local: geany.html hacking.html +all-local: geany.html hacking.html +# clean on 'maintainer-clean' rather than 'clean' in case it was not +# built by Make but rather part of the distribution. This is fine even +# then, as configure will properly require what is needed to build it +# again if it is missing. +maintainer-clean-local: clean-html-local clean-html-local: -rm -f hacking.html -# FIXME: why is the generated HTML manual checked-in to VCS? -# -rm -f geany.html + -rm -f geany.html -else -all-html-local:; -clean-html-local:; endif # PDF user manual @@ -74,14 +75,12 @@ if WITH_RST2PDF geany-$(VERSION).pdf: geany.txt $(AM_V_GEN)$(RST2PDF) $(srcdir)/geany.txt -o $@ -all-pdf-local: geany-$(VERSION).pdf +all-local: geany-$(VERSION).pdf +clean-local: clean-pdf-local clean-pdf-local: -rm -f geany-$(VERSION).pdf -else -all-pdf-local:; -clean-pdf-local:; endif # API Documentation @@ -100,19 +99,14 @@ doxygen_sources = \ Doxyfile.stamp: Doxyfile $(doxygen_sources) $(AM_V_GEN)$(DOXYGEN) Doxyfile && echo "" > $@ -all-api-docs-local: Doxyfile.stamp +all-local: Doxyfile.stamp +clean-local: clean-api-docs-local clean-api-docs-local: -rm -rf reference/ Doxyfile.stamp -else -all-api-docs-local:; -clean-api-docs-local:; endif -all-local: all-html-local all-pdf-local all-api-docs-local -clean-local: clean-html-local clean-pdf-local clean-api-docs-local - uninstall-local: rm -rf $(DOCDIR); Modified: doc/geany.html 6970 lines changed, 0 insertions(+), 6970 deletions(-) =================================================================== No diff available, check online Modified: m4/geany-docutils.m4 20 lines changed, 15 insertions(+), 5 deletions(-) =================================================================== @@ -12,11 +12,19 @@ dnl For HTML documentation generation dnl AC_DEFUN([GEANY_CHECK_DOCUTILS_HTML], [ + AC_REQUIRE([GEANY_CHECK_REVISION]) + + dnl we require rst2html by default unless we don't build from Git + dnl and already have the HTML manual built in-tree + html_docs_default=yes + AS_IF([test "$REVISION" = "-1" && test -f "$srcdir/doc/geany.html"], + [html_docs_default=auto]) + AC_ARG_ENABLE([html-docs], [AS_HELP_STRING([--enable-html-docs], - [generate HTML documentation using rst2html [default=no]])], + [generate HTML documentation using rst2html [default=auto]])], [geany_enable_html_docs="$enableval"], - [geany_enable_html_docs="no"]) + [geany_enable_html_docs="$html_docs_default"]) AC_ARG_VAR([RST2HTML], [Path to Docutils rst2html executable]) AS_IF([test "x$geany_enable_html_docs" != "xno"], [ @@ -26,7 +34,9 @@ dnl TODO: try rst2html.py first AS_IF([test "x$RST2HTML" != "xno"], [geany_enable_html_docs="yes"], [test "x$geany_enable_html_docs" = "xyes"], - [AC_MSG_ERROR([Documentation enabled but rst2html not found])], + [AC_MSG_ERROR([Documentation enabled but rst2html not found. +You can explicitly disable building of the HTML manual with --disable-html-docs, +but you then may not have a local copy of the HTML manual.])], [geany_enable_html_docs="no"]) ]) AM_CONDITIONAL([WITH_RST2HTML], [test "x$geany_enable_html_docs" != "xno"]) @@ -40,9 +50,9 @@ AC_DEFUN([GEANY_CHECK_DOCUTILS_PDF], [ AC_ARG_ENABLE([pdf-docs], [AS_HELP_STRING([--enable-pdf-docs], - [generate PDF documentation using rst2pdf [default=no]])], + [generate PDF documentation using rst2pdf [default=auto]])], [geany_enable_pdf_docs="$enableval"], - [geany_enable_pdf_docs="no"]) + [geany_enable_pdf_docs="auto"]) AC_ARG_VAR([RST2PDF], [Path to Docutils rst2pdf executable]) AS_IF([test "x$geany_enable_pdf_docs" != "xno"], [ Modified: wscript 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -514,6 +514,11 @@ def build(bld): 'top_builddir': bld.out_dir, 'top_srcdir': bld.top_dir,}) + # build HTML documentation if it is not part of the tree already, as it is required for install + # FIXME: replace this with automatic building if source changed/destination is missing + if not bld.path.find_resource('doc/geany.html'): + htmldoc(bld) + ### # Install files ### -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 64910a: Fix Waf build after HTML documentation untracking
by Colomban Wendling 27 Aug '14

27 Aug '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 27 Aug 2014 17:02:24 UTC Commit: 64910a4ea1f3f902ffa08dfdf6422c8e69ad98fd https://github.com/geany/geany/commit/64910a4ea1f3f902ffa08dfdf6422c8e69ad9… Log Message: ----------- Fix Waf build after HTML documentation untracking Modified Paths: -------------- wscript Modified: wscript 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -514,6 +514,11 @@ def build(bld): 'top_builddir': bld.out_dir, 'top_srcdir': bld.top_dir,}) + # build HTML documentation if it is not part of the tree already, as it is required for install + # FIXME: replace this with automatic building if source changed/destination is missing + if not bld.path.find_resource('doc/geany.html'): + htmldoc(bld) + ### # Install files ### -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2f6815: Merge pull request #256 from ntrel/doc-id
by Nick Treleaven 27 Aug '14

27 Aug '14

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Wed, 27 Aug 2014 15:19:33 UTC Commit: 2f6815841de2d0abea7fdb0629802a0dad54af14 https://github.com/geany/geany/commit/2f6815841de2d0abea7fdb0629802a0dad54a… Log Message: ----------- Merge pull request #256 from ntrel/doc-id Support pseudo-unique IDs for documents Modified Paths: -------------- plugins/geanyfunctions.h src/document.c src/document.h src/msgwindow.c src/plugindata.h src/plugins.c Modified: plugins/geanyfunctions.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -80,6 +80,8 @@ geany_functions->p_document->document_compare_by_tab_order #define document_compare_by_tab_order_reverse \ geany_functions->p_document->document_compare_by_tab_order_reverse +#define document_find_by_id \ + geany_functions->p_document->document_find_by_id #define editor_get_indent_prefs \ geany_functions->p_editor->editor_get_indent_prefs #define editor_create_widget \ Modified: src/document.c 45 lines changed, 42 insertions(+), 3 deletions(-) =================================================================== @@ -84,9 +84,11 @@ GeanyFilePrefs file_prefs; /** Dynamic array of GeanyDocument pointers. - * Once a pointer is added to this, it is never freed. This means you can keep a pointer - * to a document over time, but it may represent a different - * document later on, or may have been closed and become invalid. + * Once a pointer is added to this, it is never freed. This means the same document pointer + * can represent a different document later on, or it may have been closed and become invalid. + * For this reason, you should use document_find_by_id() instead of storing + * document pointers over time if there is a chance the user can close the + * document. * * @warning You must check @c GeanyDocument::is_valid when iterating over this array. * This is done automatically if you use the foreach_document() macro. @@ -110,6 +112,9 @@ typedef struct } undo_action; +static guint doc_id_counter = 0; + + 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); @@ -225,6 +230,38 @@ GeanyDocument *document_find_by_sci(ScintillaObject *sci) } +/** Lookup an old document by its ID. + * Useful when the corresponding document may have been closed since the + * ID was retrieved. + * @return @c NULL if the document is no longer open. + * + * Example: + * @code + * static guint id; + * GeanyDocument *doc = ...; + * id = doc->id; // store ID + * ... + * // time passes - the document may have been closed by now + * GeanyDocument *doc = document_find_by_id(id); + * gboolean still_open = (doc != NULL); + * @endcode + * @since 1.25. */ +GeanyDocument *document_find_by_id(guint id) +{ + guint i; + + if (!id) + return NULL; + + foreach_document(i) + { + if (documents[i]->id == id) + return documents[i]; + } + return NULL; +} + + /** Gets the notebook page index for a document. * @param doc The document. * @return The index. @@ -586,6 +623,7 @@ static GeanyDocument *document_create(const gchar *utf8_filename) /* initialize default document settings */ doc->priv = g_new0(GeanyDocumentPrivate, 1); + doc->id = ++doc_id_counter; doc->index = new_idx; doc->file_name = g_strdup(utf8_filename); doc->editor = editor_create(doc); @@ -648,6 +686,7 @@ static gboolean remove_page(guint page_num) ui_add_recent_document(doc); doc->is_valid = FALSE; + doc->id = 0; if (main_status.quitting) { Modified: src/document.h 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -118,6 +118,10 @@ typedef struct GeanyDocument * not be set elsewhere. * @see file_name. */ gchar *real_path; + /** A pseudo-unique ID for this document. + * @c 0 is reserved as an unused value. + * @see document_find_by_id(). */ + guint id; struct GeanyDocumentPrivate *priv; /* should be last, append fields before this item */ } @@ -208,6 +212,8 @@ GeanyDocument *document_index(gint idx); GeanyDocument *document_find_by_sci(ScintillaObject *sci); +GeanyDocument *document_find_by_id(guint id); + gint document_get_notebook_page(GeanyDocument *doc); GeanyDocument* document_get_from_page(guint page_num); Modified: src/msgwindow.c 40 lines changed, 31 insertions(+), 9 deletions(-) =================================================================== @@ -66,6 +66,15 @@ ParseData; MessageWindow msgwindow; +enum +{ + MSG_COL_LINE = 0, + MSG_COL_DOC_ID, + MSG_COL_COLOR, + MSG_COL_STRING, + MSG_COL_COUNT +}; + static void prepare_msg_tree_view(void); static void prepare_status_tree_view(void); @@ -177,8 +186,8 @@ static void prepare_msg_tree_view(void) GtkTreeViewColumn *column; GtkTreeSelection *selection; - /* line, doc, fg, str */ - msgwindow.store_msg = gtk_list_store_new(4, G_TYPE_INT, G_TYPE_POINTER, + /* line, doc id, fg, str */ + msgwindow.store_msg = gtk_list_store_new(MSG_COL_COUNT, G_TYPE_INT, G_TYPE_UINT, GDK_TYPE_COLOR, G_TYPE_STRING); gtk_tree_view_set_model(GTK_TREE_VIEW(msgwindow.tree_msg), GTK_TREE_MODEL(msgwindow.store_msg)); g_object_unref(msgwindow.store_msg); @@ -382,7 +391,9 @@ void msgwin_msg_add_string(gint msg_color, gint line, GeanyDocument *doc, const utf8_msg = tmp; gtk_list_store_append(msgwindow.store_msg, &iter); - gtk_list_store_set(msgwindow.store_msg, &iter, 0, line, 1, doc, 2, color, 3, utf8_msg, -1); + gtk_list_store_set(msgwindow.store_msg, &iter, + MSG_COL_LINE, line, MSG_COL_DOC_ID, doc ? doc->id : 0, MSG_COL_COLOR, + color, MSG_COL_STRING, utf8_msg, -1); g_free(tmp); if (utf8_msg != tmp) @@ -1069,17 +1080,28 @@ gboolean msgwin_goto_messages_file_line(gboolean focus_editor) if (gtk_tree_selection_get_selected(selection, &model, &iter)) { gint line; + guint id; gchar *string; GeanyDocument *doc; GeanyDocument *old_doc = document_get_current(); - gtk_tree_model_get(model, &iter, 0, &line, 1, &doc, 3, &string, -1); - /* doc may have been closed, so check doc->index: */ - if (line >= 0 && DOC_VALID(doc)) + gtk_tree_model_get(model, &iter, + MSG_COL_LINE, &line, MSG_COL_DOC_ID, &id, MSG_COL_STRING, &string, -1); + if (line >= 0 && id > 0) { - ret = navqueue_goto_line(old_doc, doc, line); - if (ret && focus_editor) - gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci)); + /* check doc is still open */ + doc = document_find_by_id(id); + if (!doc) + { + ui_set_statusbar(FALSE, _("The document has been closed.")); + utils_beep(); + } + else + { + ret = navqueue_goto_line(old_doc, doc, line); + if (ret && focus_editor) + gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci)); + } } else if (line < 0 && string != NULL) { Modified: src/plugindata.h 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -58,7 +58,7 @@ G_BEGIN_DECLS * @warning You should not test for values below 200 as previously * @c GEANY_API_VERSION was defined as an enum value, not a macro. */ -#define GEANY_API_VERSION 218 +#define GEANY_API_VERSION 219 /* hack to have a different ABI when built with GTK3 because loading GTK2-linked plugins * with GTK3-linked Geany leads to crash */ @@ -324,6 +324,7 @@ typedef struct DocumentFuncs gint (*document_compare_by_display_name) (gconstpointer a, gconstpointer b); gint (*document_compare_by_tab_order) (gconstpointer a, gconstpointer b); gint (*document_compare_by_tab_order_reverse) (gconstpointer a, gconstpointer b); + GeanyDocument* (*document_find_by_id)(guint id); } DocumentFuncs; Modified: src/plugins.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -111,7 +111,8 @@ static DocumentFuncs doc_funcs = { &document_get_notebook_page, &document_compare_by_display_name, &document_compare_by_tab_order, - &document_compare_by_tab_order_reverse + &document_compare_by_tab_order_reverse, + &document_find_by_id }; static EditorFuncs editor_funcs = { -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d62fd4: Merge pull request #315 from ntrel/move-session
by Nick Treleaven 27 Aug '14

27 Aug '14

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Wed, 27 Aug 2014 15:17:03 UTC Commit: d62fd48b44c5d404440e34143a74991b972ca427 https://github.com/geany/geany/commit/d62fd48b44c5d404440e34143a74991b972ca… Log Message: ----------- Merge pull request #315 from ntrel/move-session Properly handle existing session when creating new project Modified Paths: -------------- src/keyfile.c src/keyfile.h src/project.c src/project.h Modified: src/keyfile.c 56 lines changed, 38 insertions(+), 18 deletions(-) =================================================================== @@ -329,10 +329,23 @@ static gchar *get_session_file_string(GeanyDocument *doc) } +static void remove_session_files(GKeyFile *config) +{ + gchar **ptr; + gchar **keys = g_key_file_get_keys(config, "files", NULL, NULL); + + foreach_strv(ptr, keys) + { + if (g_str_has_prefix(*ptr, "FILE_NAME_")) + g_key_file_remove_key(config, "files", *ptr, NULL); + } + g_strfreev(keys); +} + + void configuration_save_session_files(GKeyFile *config) { gint npage; - gchar *tmp; gchar entry[16]; guint i = 0, j = 0, max; GeanyDocument *doc; @@ -340,6 +353,9 @@ void configuration_save_session_files(GKeyFile *config) npage = gtk_notebook_get_current_page(GTK_NOTEBOOK(main_widgets.notebook)); g_key_file_set_integer(config, "files", "current_page", npage); + // clear existing entries first as they might not all be overwritten + remove_session_files(config); + /* store the filenames in the notebook tab order to reopen them the next time */ max = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)); for (i = 0; i < max; i++) @@ -356,23 +372,6 @@ void configuration_save_session_files(GKeyFile *config) j++; } } - /* if open filenames less than saved session files, delete existing entries in the list */ - i = j; - while (TRUE) - { - g_snprintf(entry, sizeof(entry), "FILE_NAME_%d", i); - tmp = g_key_file_get_string(config, "files", entry, NULL); - if (G_UNLIKELY(tmp == NULL)) - { - break; - } - else - { - g_key_file_remove_key(config, "files", entry, NULL); - g_free(tmp); - i++; - } - } #ifdef HAVE_VTE if (vte_info.have_vte) @@ -1047,6 +1046,27 @@ void configuration_save_default_session(void) } +void configuration_clear_default_session(void) +{ + gchar *configfile = g_build_filename(app->configdir, "geany.conf", NULL); + gchar *data; + GKeyFile *config = g_key_file_new(); + + g_key_file_load_from_file(config, configfile, G_KEY_FILE_NONE, NULL); + + if (cl_options.load_session) + remove_session_files(config); + + /* write the file */ + data = g_key_file_to_data(config, NULL, NULL); + utils_write_file(configfile, data); + g_free(data); + + g_key_file_free(config); + g_free(configfile); +} + + /* * Only reload the session part of the default configuration */ Modified: src/keyfile.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -50,6 +50,8 @@ void configuration_reload_default_session(void); void configuration_save_default_session(void); +void configuration_clear_default_session(void); + void configuration_load_session_files(GKeyFile *config, gboolean read_recent_files); void configuration_save_session_files(GKeyFile *config); Modified: src/project.c 84 lines changed, 72 insertions(+), 12 deletions(-) =================================================================== @@ -89,6 +89,7 @@ static void on_entries_changed(GtkEditable *editable, PropertyDialogElements *e) static void on_radio_long_line_custom_toggled(GtkToggleButton *radio, GtkWidget *spin_long_line); static void apply_editor_prefs(void); static void init_stash_prefs(void); +static void destroy_project(gboolean open_default); #define SHOW_ERR(args) dialogs_show_msgbox(GTK_MESSAGE_ERROR, args) @@ -99,6 +100,16 @@ static void init_stash_prefs(void); #define PROJECT_DIR _("projects") +// returns whether we have working documents open +static gboolean have_session_docs(void) +{ + gint npages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)); + GeanyDocument *doc = document_get_current(); + + return npages > 1 || (npages == 1 && (doc->file_name || doc->changed)); +} + + /* TODO: this should be ported to Glade like the project preferences dialog, * then we can get rid of the PropertyDialogElements struct altogether as * widgets pointers can be accessed through ui_lookup_widget(). */ @@ -113,6 +124,27 @@ void project_new(void) gchar *tooltip; PropertyDialogElements e = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, FALSE }; + if (!app->project && project_prefs.project_session) + { + /* save session in case the dialog is cancelled */ + configuration_save_default_session(); + /* don't ask if the only doc is an unmodified new doc */ + if (have_session_docs()) + { + if (dialogs_show_question( + _("Move the current documents into the new project's session?"))) + { + // don't reload session on closing project + configuration_clear_default_session(); + } + else + { + if (!document_close_all()) + return; + } + } + } + if (! project_ask_close()) return; @@ -194,22 +226,42 @@ void project_new(void) gtk_widget_show_all(e.dialog); - while (gtk_dialog_run(GTK_DIALOG(e.dialog)) == GTK_RESPONSE_OK) + while (1) { + if (gtk_dialog_run(GTK_DIALOG(e.dialog)) != GTK_RESPONSE_OK) + { + // any open docs were meant to be moved into the project + // rewrite default session because it was cleared + if (have_session_docs()) + configuration_save_default_session(); + else + { + // reload any documents that were closed + configuration_reload_default_session(); + configuration_open_files(); + } + break; + } + // dialog confirmed if (update_config(&e, TRUE)) { + // app->project is now set if (!write_config(TRUE)) + { SHOW_ERR(_("Project file could not be written")); + destroy_project(FALSE); + } else { ui_set_statusbar(TRUE, _("Project \"%s\" created."), app->project->name); - ui_add_recent_project_file(app->project->file_name); break; } } } gtk_widget_destroy(e.dialog); + document_new_file_if_non_open(); + ui_focus_current_document(); } @@ -220,7 +272,6 @@ gboolean project_load_file_with_session(const gchar *locale_file_name) if (project_prefs.project_session) { configuration_open_files(); - /* open a new file if no other file was opened */ document_new_file_if_non_open(); ui_focus_current_document(); } @@ -328,6 +379,7 @@ static void update_ui(void) ui_set_window_title(NULL); build_menu_update(NULL); + // update project name sidebar_openfiles_update_all(); } @@ -346,11 +398,9 @@ static void remove_foreach_project_filetype(gpointer data, gpointer user_data) /* open_default will make function reload default session files on close */ -void project_close(gboolean open_default) +gboolean project_close(gboolean open_default) { - GSList *node; - - g_return_if_fail(app->project != NULL); + g_return_val_if_fail(app->project != NULL, FALSE); /* save project session files, etc */ if (!write_config(FALSE)) @@ -360,9 +410,19 @@ void project_close(gboolean open_default) { /* close all existing tabs first */ if (!document_close_all()) - return; + return FALSE; } ui_set_statusbar(TRUE, _("Project \"%s\" closed."), app->project->name); + destroy_project(open_default); + return TRUE; +} + + +static void destroy_project(gboolean open_default) +{ + GSList *node; + + g_return_if_fail(app->project != NULL); /* remove project filetypes build entries */ if (app->project->priv->build_filetypes_list != NULL) @@ -398,7 +458,6 @@ void project_close(gboolean open_default) { configuration_reload_default_session(); configuration_open_files(); - /* open a new file if no other file was opened */ document_new_file_if_non_open(); ui_focus_current_document(); } @@ -601,8 +660,7 @@ gboolean project_ask_close(void) _("Do you want to close it before proceeding?"), _("The '%s' project is open."), app->project->name)) { - project_close(FALSE); - return TRUE; + return project_close(FALSE); } else return FALSE; @@ -633,6 +691,7 @@ static GeanyProject *create_project(void) /* Verifies data for New & Properties dialogs. + * Creates app->project if NULL. * Returns: FALSE if the user needs to change any data. */ static gboolean update_config(const PropertyDialogElements *e, gboolean new_project) { @@ -1009,12 +1068,13 @@ static gboolean load_config(const gchar *filename) build_load_menu(config, GEANY_BCS_PROJ, (gpointer)p); if (project_prefs.project_session) { - /* save current (non-project) session (it could has been changed since program startup) */ + /* save current (non-project) session (it could have been changed since program startup) */ configuration_save_default_session(); /* now close all open files */ document_close_all(); /* read session files so they can be opened with configuration_open_files() */ configuration_load_session_files(config, FALSE); + document_new_file_if_non_open(); ui_focus_current_document(); } g_signal_emit_by_name(geany_object, "project-open", config); Modified: src/project.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -66,7 +66,7 @@ void project_new(void); void project_open(void); -void project_close(gboolean open_default); +gboolean project_close(gboolean open_default); void project_properties(void); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 355f0c: Fix GLib warning 'app->project == NULL failed'
by Nick Treleaven 27 Aug '14

27 Aug '14

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2014