Revision: 4734
http://geany.svn.sourceforge.net/geany/?rev=4734&view=rev
Author: eht16
Date: 2010-03-07 17:57:45 +0000 (Sun, 07 Mar 2010)
Log Message:
-----------
Properly show/hide the mesages window when using the View menu item (closes #2961282).
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/callbacks.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-03-07 17:44:14 UTC (rev 4733)
+++ trunk/ChangeLog 2010-03-07 17:57:45 UTC (rev 4734)
@@ -30,6 +30,8 @@
* src/callbacks.c:
Focus the editor widget after hiding the sidebar when it had the
input focus (patch by Can Koy, thanks).
+ Properly show/hide the mesages window when using the View menu item
+ (closes #2961282).
2010-03-05 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c 2010-03-07 17:44:14 UTC (rev 4733)
+++ trunk/src/callbacks.c 2010-03-07 17:57:45 UTC (rev 4734)
@@ -984,10 +984,11 @@
on_show_messages_window1_toggled (GtkCheckMenuItem *checkmenuitem,
gpointer user_data)
{
- if (ignore_callback) return;
+ if (ignore_callback)
+ return;
ui_prefs.msgwindow_visible = (ui_prefs.msgwindow_visible) ? FALSE : TRUE;
- ui_widget_show_hide(ui_lookup_widget(main_widgets.window, "scrolledwindow1"), ui_prefs.msgwindow_visible);
+ msgwin_show_hide(ui_prefs.msgwindow_visible);
}
@@ -1664,9 +1665,11 @@
#if GTK_CHECK_VERSION(2, 14, 0)
/* if window has input focus, set it back to the editor before toggling off */
- if (ui_prefs.sidebar_visible == FALSE &&
+ if (! ui_prefs.sidebar_visible &&
gtk_container_get_focus_child(GTK_CONTAINER(main_widgets.sidebar_notebook)) != NULL)
+ {
keybindings_send_command(GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_EDITOR);
+ }
#endif
ui_sidebar_show_hide();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4733
http://geany.svn.sourceforge.net/geany/?rev=4733&view=rev
Author: eht16
Date: 2010-03-07 17:44:14 +0000 (Sun, 07 Mar 2010)
Log Message:
-----------
Focus the editor widget after hiding the sidebar when it had the input focus (patch by Can Koy, thanks).
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/callbacks.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-03-07 17:37:00 UTC (rev 4732)
+++ trunk/ChangeLog 2010-03-07 17:44:14 UTC (rev 4733)
@@ -27,6 +27,9 @@
When editing non-existent config files using the Tools->Configuration
Files menu, explicitly set the real_path to avoid presenting the Save
As dialog when saving the file (patch by Tony Rick, thanks).
+ * src/callbacks.c:
+ Focus the editor widget after hiding the sidebar when it had the
+ input focus (patch by Can Koy, thanks).
2010-03-05 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c 2010-03-07 17:37:00 UTC (rev 4732)
+++ trunk/src/callbacks.c 2010-03-07 17:44:14 UTC (rev 4733)
@@ -1662,6 +1662,13 @@
interface_prefs.sidebar_symbol_visible = TRUE;
}
+#if GTK_CHECK_VERSION(2, 14, 0)
+ /* if window has input focus, set it back to the editor before toggling off */
+ if (ui_prefs.sidebar_visible == FALSE &&
+ gtk_container_get_focus_child(GTK_CONTAINER(main_widgets.sidebar_notebook)) != NULL)
+ keybindings_send_command(GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_EDITOR);
+#endif
+
ui_sidebar_show_hide();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4732
http://geany.svn.sourceforge.net/geany/?rev=4732&view=rev
Author: eht16
Date: 2010-03-07 17:37:00 +0000 (Sun, 07 Mar 2010)
Log Message:
-----------
When editing non-existent config files using the Tools->Configuration Files menu, explicitly set the real_path to avoid presenting the Save As dialog when saving the file (patch by Tony Rick, thanks).
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/ui_utils.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-03-07 17:28:13 UTC (rev 4731)
+++ trunk/ChangeLog 2010-03-07 17:37:00 UTC (rev 4732)
@@ -23,6 +23,10 @@
* src/dialog.c:
Fix setting the icon for some dialogs if the parent itself is also
a dialog.
+ * src/ui_utils.c:
+ When editing non-existent config files using the Tools->Configuration
+ Files menu, explicitly set the real_path to avoid presenting the Save
+ As dialog when saving the file (patch by Tony Rick, thanks).
2010-03-05 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c 2010-03-07 17:28:13 UTC (rev 4731)
+++ trunk/src/ui_utils.c 2010-03-07 17:37:00 UTC (rev 4732)
@@ -1737,18 +1737,24 @@
document_open_file(file_name, FALSE, ft, NULL);
else
{
- gchar *utf8 = utils_get_utf8_from_locale(file_name);
+ gchar *utf8_filename = utils_get_utf8_from_locale(file_name);
gchar *base_name = g_path_get_basename(file_name);
gchar *global_file = g_build_filename(app->datadir, base_name, NULL);
gchar *global_content = NULL;
+ GeanyDocument *doc;
/* if the requested file doesn't exist in the user's config dir, try loading the file
* from the global data directory and use its contents for the newly created file */
if (g_file_test(global_file, G_FILE_TEST_EXISTS))
g_file_get_contents(global_file, &global_content, NULL, NULL);
- document_new_file(utf8, ft, global_content);
- utils_free_pointers(4, utf8, base_name, global_file, global_content, NULL);
+ doc = document_new_file(utf8_filename, ft, global_content);
+
+ /* Enforce config file override policy by populating doc->real_path, which in turn
+ * allows document to be saved directly to file_name location. */
+ doc->real_path = g_strdup(utf8_filename);
+
+ utils_free_pointers(4, utf8_filename, base_name, global_file, global_content, NULL);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4731
http://geany.svn.sourceforge.net/geany/?rev=4731&view=rev
Author: eht16
Date: 2010-03-07 17:28:13 +0000 (Sun, 07 Mar 2010)
Log Message:
-----------
Fix setting the icon for some dialogs if the parent itself is also a dialog.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/dialogs.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-03-07 17:13:54 UTC (rev 4730)
+++ trunk/ChangeLog 2010-03-07 17:28:13 UTC (rev 4731)
@@ -20,6 +20,9 @@
* src/prefs.c:
Correctly set the parent widget for the keybinding overwrite
confirmation dialog.
+ * src/dialog.c:
+ Fix setting the icon for some dialogs if the parent itself is also
+ a dialog.
2010-03-05 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: trunk/src/dialogs.c
===================================================================
--- trunk/src/dialogs.c 2010-03-07 17:13:54 UTC (rev 4730)
+++ trunk/src/dialogs.c 2010-03-07 17:28:13 UTC (rev 4731)
@@ -578,7 +578,7 @@
break;
}
gtk_window_set_title(GTK_WINDOW(dialog), title);
- if (parent == NULL)
+ if (parent == NULL || GTK_IS_DIALOG(parent))
{
GdkPixbuf *pb = ui_new_pixbuf_from_inline(GEANY_IMAGE_LOGO);
gtk_window_set_icon(GTK_WINDOW(dialog), pb);
@@ -1390,7 +1390,7 @@
GTK_BUTTONS_NONE, "%s", question_text);
gtk_widget_set_name(dialog, "GeanyDialog");
gtk_window_set_title(GTK_WINDOW(dialog), _("Question"));
- if (parent == NULL)
+ if (parent == NULL || GTK_IS_DIALOG(parent))
{
GdkPixbuf *pb = ui_new_pixbuf_from_inline(GEANY_IMAGE_LOGO);
gtk_window_set_icon(GTK_WINDOW(dialog), pb);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4728
http://geany.svn.sourceforge.net/geany/?rev=4728&view=rev
Author: eht16
Date: 2010-03-07 15:41:25 +0000 (Sun, 07 Mar 2010)
Log Message:
-----------
Fix broken 'Save' action in 'Resave missing file' dialog.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/document.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-03-07 15:32:34 UTC (rev 4727)
+++ trunk/ChangeLog 2010-03-07 15:41:25 UTC (rev 4728)
@@ -10,9 +10,10 @@
* src/dialogs.c:
Fix crashes when using Save As with no open files (closes #2964406).
* src/document.c:
- Fix duplicate mnemonics on 'resave missing file' dialog, also
+ Fix duplicate mnemonics on 'Resave missing file' dialog, also
move the question from the secondary to the main text to be
more compatible with the Gnome HIG.
+ Fix broken 'Save' action in 'Resave missing file' dialog.
2010-03-05 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c 2010-03-07 15:32:34 UTC (rev 4727)
+++ trunk/src/document.c 2010-03-07 15:41:25 UTC (rev 4728)
@@ -2946,6 +2946,7 @@
static gboolean monitor_resave_missing_file(GeanyDocument *doc)
{
gboolean want_reload = FALSE;
+ gboolean file_saved = FALSE;
gint ret;
ret = dialogs_show_prompt(NULL,
@@ -2957,14 +2958,14 @@
doc->file_name);
if (ret == GTK_RESPONSE_ACCEPT)
{
- dialogs_show_save_as();
+ file_saved = dialogs_show_save_as();
want_reload = TRUE;
}
else if (ret == GTK_RESPONSE_CLOSE)
{
document_close(doc);
}
- if (ret != GTK_RESPONSE_CLOSE)
+ if (ret != GTK_RESPONSE_CLOSE && ! file_saved)
{
/* file is missing - set unsaved state */
document_set_text_changed(doc, TRUE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4727
http://geany.svn.sourceforge.net/geany/?rev=4727&view=rev
Author: eht16
Date: 2010-03-07 15:32:34 +0000 (Sun, 07 Mar 2010)
Log Message:
-----------
Fix duplicate mnemonics on 'resave missing file' dialog, also move the question from the secondary to the main text to be more compatible with the Gnome HIG.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/document.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-03-07 11:08:19 UTC (rev 4726)
+++ trunk/ChangeLog 2010-03-07 15:32:34 UTC (rev 4727)
@@ -9,6 +9,10 @@
Fix wrong default response for the Debug Messages dialog.
* src/dialogs.c:
Fix crashes when using Save As with no open files (closes #2964406).
+ * src/document.c:
+ Fix duplicate mnemonics on 'resave missing file' dialog, also
+ move the question from the secondary to the main text to be
+ more compatible with the Gnome HIG.
2010-03-05 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c 2010-03-07 11:08:19 UTC (rev 4726)
+++ trunk/src/document.c 2010-03-07 15:32:34 UTC (rev 4727)
@@ -2949,11 +2949,12 @@
gint ret;
ret = dialogs_show_prompt(NULL,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
+ _("Close _without saving"), GTK_RESPONSE_CLOSE,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
- _("Try to resave the file?"),
- _("File \"%s\" was not found on disk!"), doc->file_name);
+ NULL,
+ _("File \"%s\" was not found on disk! Try to resave the file?"),
+ doc->file_name);
if (ret == GTK_RESPONSE_ACCEPT)
{
dialogs_show_save_as();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.