Branch: refs/heads/master
Author: Thomas Martitz <kugel(a)rockbox.org>
Committer: Thomas Martitz <kugel(a)rockbox.org>
Date: Sun, 29 Jun 2014 09:38:02 UTC
Commit: c8970e23316fb41f06a20af310f4b109f5f059d3
https://github.com/geany/geany/commit/c8970e23316fb41f06a20af310f4b109f5f05…
Log Message:
-----------
info bars: Show additional save button for the "reload file?" info bar
This allows overwriting the file right from the info bar.
Modified Paths:
--------------
src/document.c
Modified: src/document.c
8 lines changed, 5 insertions(+), 3 deletions(-)
===================================================================
@@ -3177,8 +3177,10 @@ static void on_monitor_reload_file_response(GtkWidget *bar, gint response_id, Ge
unprotect_document(doc);
doc->priv->info_bars[MSG_TYPE_RELOAD] = NULL;
- if (response_id == GTK_RESPONSE_ACCEPT)
+ if (response_id == GTK_RESPONSE_REJECT)
document_reload_file(doc, doc->encoding);
+ else if (response_id == GTK_RESPONSE_ACCEPT)
+ document_save_file(doc, FALSE);
}
static gboolean on_sci_key(GtkWidget *widget, GdkEventKey *event, gpointer data)
@@ -3227,9 +3229,9 @@ static void monitor_reload_file(GeanyDocument *doc)
GtkWidget *bar;
bar = document_show_message(doc, GTK_MESSAGE_QUESTION, on_monitor_reload_file_response,
- _("_Reload"), GTK_RESPONSE_ACCEPT,
+ _("_Reload"), GTK_RESPONSE_REJECT,
+ GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- NULL, GTK_RESPONSE_NONE,
_("Do you want to reload it?"),
_("The file '%s' on the disk is more recent than the current buffer."),
base_name);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Thomas Martitz <kugel(a)rockbox.org>
Committer: Thomas Martitz <kugel(a)rockbox.org>
Date: Sun, 29 Jun 2014 09:38:02 UTC
Commit: 0f7db113e7da5b15957754388af74992d738b100
https://github.com/geany/geany/commit/0f7db113e7da5b15957754388af74992d738b…
Log Message:
-----------
document.c: Restore lost document_set_text_changed(doc, TRUE) call
It got lost by accident in 5117940.
Modified Paths:
--------------
src/document.c
Modified: src/document.c
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -3236,6 +3236,7 @@ static void monitor_reload_file(GeanyDocument *doc)
_("The file '%s' on the disk is more recent than the current buffer."),
base_name);
+ document_set_text_changed(doc, TRUE);
protect_document(doc);
doc->priv->info_bars[MSG_TYPE_RELOAD] = bar;
enable_key_intercept(doc, bar);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Thomas Martitz <kugel(a)rockbox.org>
Committer: Thomas Martitz <kugel(a)rockbox.org>
Date: Sun, 29 Jun 2014 09:38:02 UTC
Commit: ffcec43d01609ea0cc8a8e25d77bd4325b5b1e27
https://github.com/geany/geany/commit/ffcec43d01609ea0cc8a8e25d77bd4325b5b1…
Log Message:
-----------
document.c: Immediately mark as changed when document is externally deleted
Before infobar it didn't matter because the dialog was modal and interaction
with the doc was impossible. Now that you can interact it the doc should
be marked changed immediately.
Modified Paths:
--------------
src/document.c
Modified: src/document.c
10 lines changed, 3 insertions(+), 7 deletions(-)
===================================================================
@@ -3256,13 +3256,6 @@ static void on_monitor_resave_missing_file_response(GtkWidget *bar,
if (response_id == GTK_RESPONSE_ACCEPT)
file_saved = dialogs_show_save_as();
- if (!file_saved)
- {
- document_set_text_changed(doc, TRUE);
- /* don't prompt more than once */
- SETPTR(doc->real_path, NULL);
- }
-
doc->priv->info_bars[MSG_TYPE_RESAVE] = NULL;
}
@@ -3286,6 +3279,9 @@ static void monitor_resave_missing_file(GeanyDocument *doc)
doc->file_name);
protect_document(doc);
+ document_set_text_changed(doc, TRUE);
+ /* don't prompt more than once */
+ SETPTR(doc->real_path, NULL);
doc->priv->info_bars[MSG_TYPE_RESAVE] = bar;
enable_key_intercept(doc, bar);
}
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Thomas Martitz <kugel(a)rockbox.org>
Committer: Thomas Martitz <kugel(a)rockbox.org>
Date: Sun, 29 Jun 2014 09:37:47 UTC
Commit: 4b8f42cd9e4206e672539dd559e9d41e831a39bd
https://github.com/geany/geany/commit/4b8f42cd9e4206e672539dd559e9d41e831a3…
Log Message:
-----------
info bars: Explicitely move focus back to the editor when closing
This does not seem to happen automatically, at least on GTK3.
Modified Paths:
--------------
src/document.c
Modified: src/document.c
2 lines changed, 2 insertions(+), 0 deletions(-)
===================================================================
@@ -3211,6 +3211,8 @@ static gboolean on_sci_key(GtkWidget *widget, GdkEventKey *event, gpointer data)
/* Sets up a signal handler to intercept some keys during the lifetime of the GtkInfoBar */
static void enable_key_intercept(GeanyDocument *doc, GtkWidget *bar)
{
+ /* automatically focus editor again on bar close */
+ g_signal_connect_swapped(bar, "unrealize", G_CALLBACK(document_grab_focus), doc);
g_signal_connect_object(doc->editor->sci, "key-press-event", G_CALLBACK(on_sci_key), bar, 0);
}
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Thomas Martitz <kugel(a)rockbox.org>
Committer: Thomas Martitz <kugel(a)rockbox.org>
Date: Sun, 29 Jun 2014 09:29:07 UTC
Commit: ab426623099dee3b8a187eefb662c7c022669b83
https://github.com/geany/geany/commit/ab426623099dee3b8a187eefb662c7c022669…
Log Message:
-----------
Fix racy glib assertion failure
Use g_signal_connect_object() to establish automatic and race-free signal
disconnection instead of the hand-crafted mechanism.
Modified Paths:
--------------
src/document.c
Modified: src/document.c
11 lines changed, 3 insertions(+), 8 deletions(-)
===================================================================
@@ -3207,19 +3207,14 @@ static gboolean on_sci_key(GtkWidget *widget, GdkEventKey *event, gpointer data)
}
}
-/* g_signal_handlers_disconnect_by_data is a macro that cannot be used as GCallback */
-static void on_bar_unrealize(GtkWidget *bar, ScintillaObject *sci)
-{
- g_signal_handlers_disconnect_by_func(sci, on_sci_key, bar);
-}
+/* Sets up a signal handler to intercept some keys during the lifetime of the GtkInfoBar */
static void enable_key_intercept(GeanyDocument *doc, GtkWidget *bar)
{
- g_signal_connect(doc->editor->sci, "key-press-event", G_CALLBACK(on_sci_key), bar);
- /* make the signal disconnect automatically */
- g_signal_connect(bar, "unrealize", G_CALLBACK(on_bar_unrealize), doc->editor->sci);
+ g_signal_connect_object(doc->editor->sci, "key-press-event", G_CALLBACK(on_sci_key), bar, 0);
}
+
static void monitor_reload_file(GeanyDocument *doc)
{
gchar *base_name = g_path_get_basename(doc->file_name);
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: danyalzia <catofdanyal(a)yahoo.com>
Committer: Nick Treleaven <nick.treleaven(a)btinternet.com>
Date: Sat, 28 Jun 2014 15:42:53 UTC
Commit: 0870b8663fa6a40d1870f1b015b87db5148ea37e
https://github.com/geany/geany/commit/0870b8663fa6a40d1870f1b015b87db5148ea…
Log Message:
-----------
Add remaining D keywords
Modified Paths:
--------------
data/filetypes.d
Modified: data/filetypes.d
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -22,7 +22,7 @@ commentdockeyworderror=comment_doc_keyword_error
[keywords]
# all items must be in one line
-primary=__FILE__ __LINE__ __DATA__ __TIME__ __TIMESTAMP__ abstract alias align asm assert auto body bool break byte case cast catch cdouble cent cfloat char class const continue creal dchar debug default delegate delete deprecated do double else enum export extern false final finally float for foreach foreach_reverse function goto idouble if ifloat immutable import in inout int interface invariant ireal is lazy long macro mixin module new nothrow null out override package pragma private protected public pure real ref return scope shared short static struct super switch synchronized template this throw true try typedef typeof ubyte ucent uint ulong union unittest ushort version void volatile wchar while with
+primary=__FILE__ __MODULE__ __LINE__ __FUNCTION__ __PRETTY_FUNCTION__ __gshared __traits __vector __parameters __DATE__ __EOF__ __TIME__ __TIMESTAMP__ __VENDOR__ __VERSION__ abstract alias align asm assert auto body bool break byte case cast catch cdouble cent cfloat char class const continue creal dchar debug default delegate delete deprecated do double else enum export extern false final finally float for foreach foreach_reverse function goto idouble if ifloat immutable import in inout int interface invariant ireal is lazy long macro mixin module new nothrow null out override package pragma private protected public pure real ref return scope shared short static struct super switch synchronized template this throw true try typedef typeid typeof ubyte ucent uint ulong union unittest ushort version void volatile wchar while with
secondary=
# documentation keywords for D, currently not working
docComment=Authors Bugs Copyright Date Deprecated Examples History License Macros Params Returns See_Also Standards Throws Version
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Thu, 26 Jun 2014 18:00:24 UTC
Commit: 6c804880374058fbc1ed44084f4768b6c20d0038
https://github.com/geany/geany/commit/6c804880374058fbc1ed44084f4768b6c20d0…
Log Message:
-----------
Make sure the current document is still the same after Save All
Save All updates the sidebar and title bar with the document that was
the current one when the action was triggered, but the action could
have changed the focused document if an non-file-backed file required
saving. So, make sure current document is the same after the action.
Modified Paths:
--------------
src/callbacks.c
Modified: src/callbacks.c
1 lines changed, 1 insertions(+), 0 deletions(-)
===================================================================
@@ -201,6 +201,7 @@ G_MODULE_EXPORT void on_save_all1_activate(GtkMenuItem *menuitem, gpointer user_
ui_set_statusbar(FALSE, ngettext("%d file saved.", "%d files saved.", count), count);
/* saving may have changed window title, sidebar for another doc, so update */
+ document_show_tab(cur_doc);
sidebar_update_tag_list(cur_doc, TRUE);
ui_set_window_title(cur_doc);
}
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).