Revision: 2155 http://geany.svn.sourceforge.net/geany/?rev=2155&view=rev Author: ntrel Date: 2008-01-09 10:05:09 -0800 (Wed, 09 Jan 2008)

Log Message: ----------- Edit base path entry tooltip for clarity. Use stock close button in close project prompt. Allow the base path to be empty, so that users can use the current file's directory for the Make command (but still use project session support). In future, perhaps it would be good to have a separate Make path setting for projects.

Modified Paths: -------------- trunk/ChangeLog trunk/src/project.c

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-01-09 15:40:22 UTC (rev 2154) +++ trunk/ChangeLog 2008-01-09 18:05:09 UTC (rev 2155) @@ -1,3 +1,14 @@ +2008-01-09 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/project.c: + Edit base path entry tooltip for clarity. + Use stock close button in close project prompt. + Allow the base path to be empty, so that users can use the current + file's directory for the Make command (but still use project session + support). In future, perhaps it would be good to have a separate Make + path setting for projects. + + 2008-01-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>

* geany.glade, src/geanywraplabel.c, src/geanywraplabel.h,

Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2008-01-09 15:40:22 UTC (rev 2154) +++ trunk/src/project.c 2008-01-09 18:05:09 UTC (rev 2155) @@ -157,8 +157,8 @@ e->base_path = gtk_entry_new(); gtk_tooltips_set_tip(tooltips, e->base_path, _("Base directory of all files that make up the project. " - "This can be a new path, or an existing directory tree absolute " - "or relative to the project filename."), NULL); + "This can be a new path, or an existing directory tree. " + "You can use paths relative to the project filename."), NULL); bbox = ui_path_box_new(_("Choose Project Base Path"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_ENTRY(e->base_path));

@@ -412,8 +412,8 @@ e->base_path = gtk_entry_new(); gtk_tooltips_set_tip(tooltips, e->base_path, _("Base directory of all files that make up the project. " - "This can be a new path, or an existing directory tree absolute " - "or relative to the project filename."), NULL); + "This can be a new path, or an existing directory tree. " + "You can use paths relative to the project filename."), NULL); bbox = ui_path_box_new(_("Choose Project Base Path"), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, GTK_ENTRY(e->base_path)); gtk_table_attach(GTK_TABLE(table), bbox, 1, 2, 3, 4, @@ -523,7 +523,7 @@ { if (app->project != NULL) { - if (dialogs_show_question_full(NULL, GTK_STOCK_OK, GTK_STOCK_CANCEL, + if (dialogs_show_question_full(NULL, GTK_STOCK_CLOSE, GTK_STOCK_CANCEL, _("Do you want to close it before proceeding?"), _("The '%s' project is already open."), app->project->name)) { @@ -584,6 +584,8 @@ }

base_path = gtk_entry_get_text(GTK_ENTRY(e->base_path)); + /* For now, the base path can be empty, so that Make uses the current directory. + * In future, it would be best to add a Make path setting for projects. */ if (NZV(base_path)) { // check whether the given directory actually exists gchar *locale_path = utils_get_locale_from_utf8(base_path); @@ -629,7 +631,7 @@ p->file_name = g_strdup(file_name);

if (p->base_path != NULL) g_free(p->base_path); - p->base_path = g_strdup(NZV(base_path) ? base_path : "./"); // use "." if base_path is empty + p->base_path = g_strdup(base_path);

if (! new_project) // save properties specific fields {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.