Revision: 519 Author: eht16 Date: 2006-07-01 08:04:41 -0700 (Sat, 01 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=519&view=rev
Log Message: ----------- Moved some default values to geany.h.
Modified Paths: -------------- trunk/ChangeLog trunk/src/geany.h trunk/src/keyfile.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-01 14:47:08 UTC (rev 518) +++ trunk/ChangeLog 2006-07-01 15:04:41 UTC (rev 519) @@ -3,6 +3,7 @@ * src/document.c, src/keybindings.c: Added shortcut for Select All. * src/main.c: Deiconify the main window when a new file is opened from the named pipe. + * src/geany.h, src/keyfile.c: Moved some default values to geany.h.
2006-07-01 Nick Treleaven nick.treleaven@btinternet.com
Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-07-01 14:47:08 UTC (rev 518) +++ trunk/src/geany.h 2006-07-01 15:04:41 UTC (rev 519) @@ -74,6 +74,15 @@ #define GEANY_WINDOW_MINIMAL_HEIGHT 440 #define GEANY_WINDOW_DEFAULT_WIDTH 900 #define GEANY_WINDOW_DEFAULT_HEIGHT 600 +// some default settings which are used at the very first start of Geany to fill configuration file +#define GEANY_DEFAULT_TOOLS_MAKE "make" +#define GEANY_DEFAULT_TOOLS_TERMINAL "xterm" +#define GEANY_DEFAULT_TOOLS_BROWSER "mozilla" +#define GEANY_DEFAULT_TOOLS_PRINTCMD "lpr" +#define GEANY_DEFAULT_MRU_LENGHTH 10 +#define GEANY_DEFAULT_FONT_SYMBOL_LIST "Cursor 8" +#define GEANY_DEFAULT_FONT_MSG_WINDOW "Cursor 8" +#define GEANY_DEFAULT_FONT_EDITOR "Courier New 9"
#ifndef DOCDIR # define DOCDIR PACKAGE_DATA_DIR"/doc/"PACKAGE"/html/"
Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2006-07-01 14:47:08 UTC (rev 518) +++ trunk/src/keyfile.c 2006-07-01 15:04:41 UTC (rev 519) @@ -207,7 +207,7 @@
app->toolbar_visible = utils_get_setting_boolean(config, PACKAGE, "toolbar_visible", TRUE); app->beep_on_errors = utils_get_setting_boolean(config, PACKAGE, "beep_on_errors", TRUE); - app->mru_length = utils_get_setting_integer(config, PACKAGE, "mru_length", 10); + app->mru_length = utils_get_setting_integer(config, PACKAGE, "mru_length", GEANY_DEFAULT_MRU_LENGHTH); app->toolbar_icon_style = utils_get_setting_integer(config, PACKAGE, "toolbar_icon_style", GTK_TOOLBAR_ICONS); app->toolbar_icon_size = utils_get_setting_integer(config, PACKAGE, "toolbar_icon_size", 2); app->long_line_type = utils_get_setting_integer(config, PACKAGE, "long_line_type", 0); @@ -231,9 +231,9 @@ app->switch_msgwin_pages = utils_get_setting_boolean(config, PACKAGE, "switch_msgwin_pages", FALSE); app->pref_editor_auto_close_xml_tags = utils_get_setting_boolean(config, PACKAGE, "auto_close_xml_tags", TRUE); app->pref_editor_auto_complete_constructs = utils_get_setting_boolean(config, PACKAGE, "auto_complete_constructs", TRUE); - app->editor_font = utils_get_setting_string(config, PACKAGE, "editor_font", "Courier New 9"); - app->tagbar_font = utils_get_setting_string(config, PACKAGE, "tagbar_font", "Cursor 8"); - app->msgwin_font = utils_get_setting_string(config, PACKAGE, "msgwin_font", "Cursor 8"); + app->editor_font = utils_get_setting_string(config, PACKAGE, "editor_font", GEANY_DEFAULT_FONT_EDITOR); + app->tagbar_font = utils_get_setting_string(config, PACKAGE, "tagbar_font", GEANY_DEFAULT_FONT_SYMBOL_LIST); + app->msgwin_font = utils_get_setting_string(config, PACKAGE, "msgwin_font", GEANY_DEFAULT_FONT_MSG_WINDOW); scribble_text = utils_get_setting_string(config, PACKAGE, "scribble_text", _("Type here what you want, use it as a notice/scratch board"));
@@ -287,19 +287,19 @@ app->pref_editor_new_line = utils_get_setting_boolean(config, PACKAGE, "pref_editor_new_line", TRUE); app->pref_editor_trail_space = utils_get_setting_boolean(config, PACKAGE, "pref_editor_trail_space", TRUE);
- tmp_string = g_find_program_in_path("make"); + tmp_string = g_find_program_in_path(GEANY_DEFAULT_TOOLS_MAKE); app->tools_make_cmd = utils_get_setting_string(config, "tools", "make_cmd", tmp_string); g_free(tmp_string);
- tmp_string = g_find_program_in_path("xterm"); + tmp_string = g_find_program_in_path(GEANY_DEFAULT_TOOLS_TERMINAL); app->tools_term_cmd = utils_get_setting_string(config, "tools", "term_cmd", tmp_string); g_free(tmp_string);
- tmp_string = g_find_program_in_path("mozilla"); + tmp_string = g_find_program_in_path(GEANY_DEFAULT_TOOLS_BROWSER); app->tools_browser_cmd = utils_get_setting_string(config, "tools", "browser_cmd", tmp_string); g_free(tmp_string);
- tmp_string2 = g_find_program_in_path("lpr"); + tmp_string2 = g_find_program_in_path(GEANY_DEFAULT_TOOLS_PRINTCMD); tmp_string = g_strconcat(tmp_string2, " %f", NULL); app->tools_print_cmd = utils_get_setting_string(config, "tools", "print_cmd", tmp_string); g_free(tmp_string);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.