Commits May 2007

commits@lists.geany.org

3 participants
94 discussions

SF.net SVN: geany: [1498] trunk
by ntrel＠users.sourceforge.net 01 May '07

01 May '07

Revision: 1498 http://svn.sourceforge.net/geany/?rev=1498&view=rev Author: ntrel Date: 2007-05-01 08:48:53 -0700 (Tue, 01 May 2007) Log Message: ----------- Allow a blank project base path to use the default Make All command. Update the 'project already open' & 'base path not found' dialogs. Modified Paths: -------------- trunk/ChangeLog trunk/src/project.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-01 12:27:56 UTC (rev 1497) +++ trunk/ChangeLog 2007-05-01 15:48:53 UTC (rev 1498) @@ -8,6 +8,9 @@ * src/build.c, src/project.c: Allow run for any file (with a path) when a valid project run command is set. + * src/project.c: + Allow a blank project base path to use the default Make All command. + Update the 'project already open' & 'base path not found' dialogs. 2007-04-30 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2007-05-01 12:27:56 UTC (rev 1497) +++ trunk/src/project.c 2007-05-01 15:48:53 UTC (rev 1498) @@ -381,6 +381,9 @@ gtk_misc_set_alignment(GTK_MISC(label), 1, 0); e->base_path = gtk_entry_new(); + gtk_tooltips_set_tip(tooltips, e->base_path, + _("Directory to run Make All from. " + "Leave blank to use the default command."), NULL); button = gtk_button_new(); g_signal_connect((gpointer) button, "clicked", G_CALLBACK(on_folder_open_button_clicked), e->base_path); @@ -496,11 +499,9 @@ { if (app->project != NULL) { - gchar *msg = - _("The '%s' project is already open. " - "Do you want to close it before proceeding?"); - - if (dialogs_show_question(msg, app->project->name)) + if (dialogs_show_question_full(GTK_STOCK_OK, GTK_STOCK_CANCEL, + _("Do you want to close it before proceeding?"), + _("The '%s' project is already open. "), app->project->name)) { project_close(); return TRUE; @@ -548,19 +549,15 @@ } base_path = gtk_entry_get_text(GTK_ENTRY(e->base_path)); - if (strlen(base_path) == 0) - { - SHOW_ERR(_("You have specified an invalid project base path.")); - gtk_widget_grab_focus(e->base_path); - return FALSE; - } - else + if (NZV(base_path)) { // check whether the given directory actually exists gchar *locale_path = utils_get_locale_from_utf8(base_path); if (! g_file_test(locale_path, G_FILE_TEST_IS_DIR)) { - if (dialogs_show_question( - _("The specified project base path does not exist. Should it be created?"))) + if (dialogs_show_question_full(GTK_STOCK_OK, GTK_STOCK_CANCEL, + _("Create the project's base path directory?"), + _("The path \"%s\" does not exist."), + base_path)) { utils_mkdir(locale_path, TRUE); } @@ -894,7 +891,7 @@ const gchar *project_get_make_dir() { - if (app->project != NULL) + if (app->project != NULL && NZV(app->project->base_path)) return app->project->base_path; else return NULL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1497] trunk
by ntrel＠users.sourceforge.net 01 May '07

01 May '07

Revision: 1497 http://svn.sourceforge.net/geany/?rev=1497&view=rev Author: ntrel Date: 2007-05-01 05:27:56 -0700 (Tue, 01 May 2007) Log Message: ----------- Allow run for any file (with a path) when a valid project run command is set. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/project.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-01 11:47:06 UTC (rev 1496) +++ trunk/ChangeLog 2007-05-01 12:27:56 UTC (rev 1497) @@ -5,6 +5,9 @@ rebuilding of files dependent on support.h. * src/project.c: Hide the unused File Patterns field in the project properties dialog. + * src/build.c, src/project.c: + Allow run for any file (with a path) when a valid project run command + is set. 2007-04-30 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2007-05-01 11:47:06 UTC (rev 1496) +++ trunk/src/build.c 2007-05-01 12:27:56 UTC (rev 1497) @@ -1600,7 +1600,7 @@ void build_menu_update(gint idx) { filetype *ft; - gboolean have_path, can_build, can_make, can_run, can_set_args, have_errors; + gboolean have_path, can_build, can_make, can_run, can_stop, can_set_args, have_errors; BuildMenuItems *menu_items; if (idx == -1) @@ -1654,13 +1654,20 @@ if (menu_items->item_make_object) gtk_widget_set_sensitive(menu_items->item_make_object, can_make); - can_run = have_path && run_info.pid <= (GPid) 1; - /* can_run only applies item_exec2 - * item_exec is enabled for both run and stop commands */ + if (app->project && NZV(app->project->run_cmd)) + can_run = have_path; // for now run is disabled for all untitled files + else + can_run = have_path && ft->actions->can_exec; + + can_stop = run_info.pid > (GPid) 1; + can_run &= ! can_stop; + + /* item_exec is enabled for both run and stop commands */ if (menu_items->item_exec) - gtk_widget_set_sensitive(menu_items->item_exec, have_path && ft->actions->can_exec); + gtk_widget_set_sensitive(menu_items->item_exec, can_run || can_stop); + /* item_exec2 is disabled if there's a running process already */ if (menu_items->item_exec2) - gtk_widget_set_sensitive(menu_items->item_exec2, can_run && ft->actions->can_exec); + gtk_widget_set_sensitive(menu_items->item_exec2, can_run); can_set_args = ((ft->actions->can_compile || @@ -1671,11 +1678,12 @@ gtk_widget_set_sensitive(menu_items->item_set_args, can_set_args); gtk_widget_set_sensitive(app->compile_button, can_build && ft->actions->can_compile); - gtk_widget_set_sensitive(app->run_button, have_path && ft->actions->can_exec); + gtk_widget_set_sensitive(app->run_button, can_run || can_stop); // show the stop command if a program is running, otherwise show run command - set_stop_button(run_info.pid > (GPid) 1); + set_stop_button(can_stop); + // simply enable next error command if the compiler window has any items have_errors = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(msgwindow.store_compiler), NULL) > 0; gtk_widget_set_sensitive(menu_items->item_next_error, have_errors); Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2007-05-01 11:47:06 UTC (rev 1496) +++ trunk/src/project.c 2007-05-01 12:27:56 UTC (rev 1497) @@ -39,6 +39,7 @@ #ifdef G_OS_WIN32 # include "win32.h" #endif +#include "build.h" ProjectPrefs project_prefs = {NULL}; @@ -298,6 +299,8 @@ g_free(app->project); app->project = NULL; + + build_menu_update(-1); } @@ -474,8 +477,12 @@ retry: response = gtk_dialog_run(GTK_DIALOG(e->dialog)); if (response == GTK_RESPONSE_OK) + { if (! update_config(e)) goto retry; + // successfully updated properties + build_menu_update(-1); + } gtk_widget_destroy(e->dialog); g_free(e); @@ -839,6 +846,7 @@ g_key_file_free(config); + build_menu_update(-1); return TRUE; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1496] trunk
by ntrel＠users.sourceforge.net 01 May '07

01 May '07

Revision: 1496 http://svn.sourceforge.net/geany/?rev=1496&view=rev Author: ntrel Date: 2007-05-01 04:47:06 -0700 (Tue, 01 May 2007) Log Message: ----------- Hide the unused File Patterns field in the project properties dialog. Modified Paths: -------------- trunk/ChangeLog trunk/src/project.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-05-01 11:32:52 UTC (rev 1495) +++ trunk/ChangeLog 2007-05-01 11:47:06 UTC (rev 1496) @@ -3,6 +3,8 @@ * geany.gladep: Don't regenerate the support.[hc] files, to prevent unnecessary rebuilding of files dependent on support.h. + * src/project.c: + Hide the unused File Patterns field in the project properties dialog. 2007-04-30 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2007-05-01 11:32:52 UTC (rev 1495) +++ trunk/src/project.c 2007-05-01 11:47:06 UTC (rev 1496) @@ -413,6 +413,7 @@ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); +#if 0 label = gtk_label_new(_("File patterns:")); // <small>Separate multiple patterns by a new line</small> gtk_table_attach(GTK_TABLE(table), label, 0, 1, 5, 6, @@ -429,6 +430,7 @@ gtk_table_attach(GTK_TABLE(table), swin, 1, 2, 5, 6, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); +#endif gtk_container_add(GTK_CONTAINER(vbox), table); @@ -441,6 +443,7 @@ gtk_text_buffer_set_text(buffer, p->description, -1); } +#if 0 if (p->file_patterns != NULL) { // set the file patterns gint i; @@ -459,6 +462,7 @@ gtk_text_buffer_set_text(buffer, str->str, -1); g_string_free(str, TRUE); } +#endif gtk_entry_set_text(GTK_ENTRY(e->file_name), p->file_name); gtk_entry_set_text(GTK_ENTRY(e->base_path), p->base_path); @@ -590,7 +594,7 @@ if (! new_project) // save properties specific fields { GtkTextIter start, end; - gchar *tmp; + //gchar *tmp; GtkTextBuffer *buffer; if (p->run_cmd != NULL) g_free(p->run_cmd); @@ -603,6 +607,7 @@ g_free(p->description); p->description = gtk_text_buffer_get_text(buffer, &start, &end, FALSE); +#if 0 // get and set the project file patterns buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(e->patterns)); gtk_text_buffer_get_start_iter(buffer, &start); @@ -611,6 +616,7 @@ g_strfreev(p->file_patterns); p->file_patterns = g_strsplit(tmp, "\n", -1); g_free(tmp); +#endif } write_config(); if (new_project) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1495] trunk
by ntrel＠users.sourceforge.net 01 May '07

01 May '07

Revision: 1495 http://svn.sourceforge.net/geany/?rev=1495&view=rev Author: ntrel Date: 2007-05-01 04:32:52 -0700 (Tue, 01 May 2007) Log Message: ----------- Don't regenerate the support.[hc] files, to prevent unnecessary rebuilding of files dependent on support.h. Modified Paths: -------------- trunk/ChangeLog trunk/geany.gladep Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-04-30 16:16:49 UTC (rev 1494) +++ trunk/ChangeLog 2007-05-01 11:32:52 UTC (rev 1495) @@ -1,3 +1,10 @@ +2007-05-01 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * geany.gladep: + Don't regenerate the support.[hc] files, to prevent unnecessary + rebuilding of files dependent on support.h. + + 2007-04-30 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/symbols.c: Modified: trunk/geany.gladep =================================================================== --- trunk/geany.gladep 2007-04-30 16:16:49 UTC (rev 1494) +++ trunk/geany.gladep 2007-05-01 11:32:52 UTC (rev 1495) @@ -5,5 +5,6 @@ <name>geany</name> <program_name>geany</program_name> <gnome_support>FALSE</gnome_support> + <output_support_files>FALSE</output_support_files> <backup_source_files>FALSE</backup_source_files> </glade-project> 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 2007