Commit 128d1a37 authored by Naba Kumar's avatar Naba Kumar

Updated

	* src/about.c, THANKS: Updated

	* anjuta.glade, anjuta_dialogs_strings.c: Updated setup-dialog

	* src/an_file_view.c, src/project_dbase.c: Restores file-filters
	properly from the project session before updating the file
	view.

	* src/main_menubar_def.h, src/mainmenu_callbacks.[ch],
	an_file_view.[ch], main_menubar.[ch], controls.c: Removed windows
	dialog settings (as it will not be required once GDL is in place) and
	added file view filters in the settings sub-menu.
parent a17b5541
2003-04-18 Naba Kumar <naba@gnome.org>
* src/about.c, THANKS: Updated
* anjuta.glade, anjuta_dialogs_strings.c: Updated setup-dialog
* src/an_file_view.c, src/project_dbase.c: Restores file-filters
properly from the project session before updating the file
view.
* src/main_menubar_def.h, src/mainmenu_callbacks.[ch],
an_file_view.[ch], main_menubar.[ch], controls.c: Removed windows
dialog settings (as it will not be required once GDL is in place) and
added file view filters in the settings sub-menu.
2003-04-17 Biswapesh Chattopadhyay <biswapesh_chatterjee@tcscal.co.in>
* HACKING: Updated
* configure.in: Disable cast checks on final build.
......
......@@ -139,6 +139,8 @@ in translating the project.
- Gitte Wange <gitte@babytux.dk>, Göran Weinholt <weinholt@linux.nu>, and
Keld Simonsen <keld@dkuug.dk>, for their Danish translation,
- Martin Lacko <lacko@host.sk>, for his Slovak translation.
- Michael Tindal <etherscape@paradoxpoint.com>.
- Jakub Steiner <jimmac * ximian * com>
With warm regards,
......
......@@ -15874,7 +15874,7 @@
<widget class="GnomeDruidPageStandard" id="druidpagestandard1">
<property name="visible">True</property>
<property name="title" translatable="yes">Windows style</property>
<property name="logo_background">#c568084ce8fc</property>
<property name="logo_background">#c440084ceacc</property>
<property name="logo">applogo.png</property>
<child internal-child="vbox">
......@@ -15891,7 +15891,7 @@
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">0</property>
<property name="column_spacing">5</property>
<property name="column_spacing">10</property>
<child>
<widget class="GtkImage" id="image26">
......@@ -16011,7 +16011,7 @@ main window.</property>
</child>
<child>
<widget class="GtkRadioButton" id="radiobutton5">
<widget class="GtkRadioButton" id="dock_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Docked style</property>
......@@ -16032,7 +16032,7 @@ main window.</property>
</child>
<child>
<widget class="GtkRadioButton" id="dock_radio">
<widget class="GtkRadioButton" id="undock_radio">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Undocked style</property>
......@@ -16041,7 +16041,7 @@ main window.</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<property name="group">radiobutton5</property>
<property name="group">dock_radio</property>
</widget>
<packing>
<property name="left_attach">1</property>
......@@ -16064,54 +16064,13 @@ main window.</property>
</widget>
</child>
<child>
<widget class="GnomeDruidPageStandard" id="druidpagestandard2">
<property name="visible">True</property>
<property name="title" translatable="yes">Syntax highlighting style</property>
<property name="logo">applogo.png</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="druid-vbox2">
<property name="border_width">16</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
<placeholder/>
</child>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GnomeDruidPageStandard" id="druidpagestandard3">
<property name="visible">True</property>
<property name="title" translatable="yes">Helper applications</property>
<property name="logo">applogo.png</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="druid-vbox3">
<property name="border_width">16</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
<placeholder/>
</child>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GnomeDruidPageEdge" id="druidpagefinish1">
<property name="visible">True</property>
<property name="position">GNOME_EDGE_FINISH</property>
<property name="title" translatable="yes">Summary</property>
<property name="text" translatable="yes">Anjuta Dev Studio
<property name="text" translatable="yes">
Anjuta Dev Studio
Copyright (C) Naba Kumar
This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
......@@ -16119,8 +16078,7 @@ This program is free software; you can redistribute it and/or modify it under th
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
If you do not agree, click 'Cancel'.</property>
</property>
<property name="logo">applogo.png</property>
</widget>
</child>
......
......@@ -517,10 +517,9 @@ gchar *s = N_("Docked style presents Anjuta \n"
"main window.");
gchar *s = N_("Docked style");
gchar *s = N_("Undocked style");
gchar *s = N_("Syntax highlighting style");
gchar *s = N_("Helper applications");
gchar *s = N_("Summary");
gchar *s = N_("Anjuta Dev Studio\n"
gchar *s = N_("\n"
"Anjuta Dev Studio\n"
"Copyright (C) Naba Kumar\n"
"\n"
"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. \n"
......@@ -528,5 +527,4 @@ gchar *s = N_("Anjuta Dev Studio\n"
"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. \n"
"\n"
"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA \n"
"\n"
"If you do not agree, click 'Cancel'.");
"");
......@@ -27,14 +27,25 @@
#include "about.h"
static const char *authors[] = {
"Founder and lead developer:",
"Naba Kumar <naba@gnome.org>",
"Stephane Demurget <demurgets@free.fr>",
"Andy Piper <andy.piper@freeuk.com>",
"",
"Developers:",
"Biswapesh Chattopadhyay <biswapesh_chatterjee@tcscal.co.in>",
"Hector Rivera Falu <misha@phreaker.net>",
"Johannes Schmid <johannes.schmid@gmx.de>",
"Stephane Demurget <demurgets@free.fr>",
"Hector Rivera Falu <misha@phreaker.net> [Website]",
"Andy Piper <andy.piper@freeuk.com> [Retired]",
"",
"Contributors:",
"Jean-Noel Guiheneuf <jnoel@saudionline.com.sa>",
"Timothee Besset <timo@qeradiant.com>",
"Etay Meiri <etay-m@bezeqint.net>",
"Dan Elphick <dre00r@ecs.soton.ac.uk>",
"Michael Tindal <etherscape@paradoxpoint.com>",
"Jakub Steiner <jimmac * ximian * com>",
"Luca Bellonda <lbell@tsc4.com>",
"Rick Patel <rikul@bellsouth.net>",
"Johannes Schmid <johannes.schmid@gmx.de>",
"Max Blagai <maximblagai@yahoo.com>",
"Venugopal Gummuluru <vgummuluru@yahoo.com>",
"Archit Baweja <bighead@crosswinds.net>",
......@@ -44,23 +55,19 @@ static const char *authors[] = {
"Gregory Schmitt <gregory.schmitt@free.fr>",
"Yannick Koehler <yannick.koehler@colubris.com>",
"Giovanni Corriga <valkadesh@libero.it>",
"Dan Elphick <dre00r@ecs.soton.ac.uk>",
"Jens Georg <mail@jensgeorg.de>",
"Dick Knol <dknol@gmx.net>",
"Jason Williams <jason_williams@suth.com>",
"Philip Van Hoof <freax@pandora.be>",
"Vadim Berezniker <vadim@berezniker.com>",
"Rob Bradford <robster@debian.org>",
"Timothee Besset <timo@qeradiant.com>",
"Roel Vanhout <roel@stack.be>",
"Roy Wood <roy.wood@filogix.com>",
"Tina Hirsch <cevina@users.sourceforge.net>",
"Jeroen van der Vegt <A.J.vanderVegt@ITS.TUDelft.nl>",
"Ishan Chattopadhyaya <ichattopadhyaya@yahoo.com>",
"Todd Goyen <goyen@mbi-berlin.de>",
"Nick Dowell <nixx@nixx.org.uk>",
"Benke Laszlo <decike@freemail.hu>",
"Jean-Noel Guiheneuf <jnoel@saudionline.com.sa>",
"Pierre Sarrazin <sarrazip@sympatico.ca>",
"Kelly Bergougnoux <three3@users.sourceforge.net>",
"Dave Huseby <huseby@shockfusion.com>",
......@@ -71,7 +78,8 @@ static const char *authors[] = {
static const char *documentors[] = {
"Naba Kumar <naba@gnome.org>",
"Andy Piper <andy.piper@freeuk.com>",
"Andy Piper <andy.piper@freeuk.com> [Retired]",
"Ishan Chattopadhyaya <ichattopadhyaya@yahoo.com>",
"Biswapesh Chattopadhyay <biswapesh_chatterjee@tcscal.co.in>",
NULL
};
......
......@@ -26,6 +26,7 @@ enum {
};
static AnFileView *fv = NULL;
gboolean
anjuta_fv_open_file (const char *path,
gboolean use_anjuta)
......@@ -209,9 +210,6 @@ void fv_session_load (ProjectDBase *p)
gchar *key;
gpointer config_iterator;
if (!ff)
return;
config_iterator = session_get_iterator (p, SECSTR (SECTION_FILE_VIEW));
if (config_iterator != NULL)
{
......@@ -228,6 +226,8 @@ void fv_session_load (ProjectDBase *p)
szValue = NULL;
}
}
if (!ff)
fv_customize(FALSE);
fv_prefs_load();
}
......@@ -257,7 +257,7 @@ void on_file_filter_ok_button_clicked (GtkButton *button, gpointer user_data)
ff->xml, name); \
gtk_widget_ref((GtkWidget *) ff->var)
static void fv_customize(gboolean really_show)
void fv_customize(gboolean really_show)
{
if (NULL == ff)
{
......
......@@ -43,6 +43,7 @@ typedef struct _AnFileView {
AnFileView *fv_populate (gboolean full);
void fv_clear (void);
void fv_customize(gboolean really_show);
gboolean anjuta_fv_open_file (const char *path, gboolean use_anjuta);
void fv_session_save (ProjectDBase *p);
......
......@@ -232,6 +232,7 @@ update_main_menubar ()
BuildSubMenu *bm;
BookmarkSubMenu *mm;
DebugSubMenu *dm;
SettingsSubMenu *sm;
/* HelpSubMenu *hm; */
CVSSubMenu* cvs;
gboolean F, P, SF, L, G, A, R, Pr, UD, RD, Ld, C, I, FLD, UT, PCVS, notebook_has_editors;
......@@ -247,6 +248,7 @@ update_main_menubar ()
bm = &(app->widgets.menubar.build);
mm = &(app->widgets.menubar.bookmark);
dm = &(app->widgets.menubar.debug);
sm = &(app->widgets.menubar.settings);
/* hm = &(app->widgets.menubar.help); */
cvs = &(app->widgets.menubar.cvs);
P = app->project_dbase->project_is_open;
......@@ -452,6 +454,8 @@ update_main_menubar ()
gtk_widget_set_sensitive (cvs->diff_project, PCVS && !L);
gtk_widget_set_sensitive (cvs->login, !L);
gtk_widget_set_sensitive (sm->file_view_filters, P);
/* Read the comments in main_menubar.h */
/*
gtk_widget_set_sensitive(hm->gnome, app->has_devhelp);
......
......@@ -251,7 +251,7 @@ create_main_menubar (GtkWidget * ap, MainMenuBar * mb)
mb->settings.commands = settings1_menu_uiinfo[2].widget;
mb->settings.preferences = settings1_menu_uiinfo[4].widget;
mb->settings.style_editor = settings1_menu_uiinfo[5].widget;
mb->settings.windows_dialog = settings1_menu_uiinfo[6].widget;
mb->settings.file_view_filters = settings1_menu_uiinfo[6].widget;
mb->settings.user_properties = settings1_menu_uiinfo[7].widget;
mb->settings.default_preferences = settings1_menu_uiinfo[8].widget;
mb->settings.shortcuts = settings1_menu_uiinfo[9].widget;
......
......@@ -268,7 +268,7 @@ struct _SettingsSubMenu
GtkWidget *commands;
GtkWidget *preferences;
GtkWidget *style_editor;
GtkWidget *windows_dialog;
GtkWidget *file_view_filters;
GtkWidget *user_properties;
GtkWidget *default_preferences;
GtkWidget *shortcuts;
......
......@@ -1728,15 +1728,15 @@ static GnomeUIInfo settings1_menu_uiinfo[NUM_SETTINGS_SUBMENUS+1] = {
GNOME_APP_PIXMAP_STOCK, GTK_STOCK_PROPERTIES,
0, 0, NULL},
{/*5*/
GNOME_APP_UI_ITEM, N_("Syntax _highlighting ..."),
GNOME_APP_UI_ITEM, N_("_Editor colors and fonts ..."),
N_("Syntax highlighting settings"),
on_set_style_editor_activate, NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GTK_STOCK_PROPERTIES,
0, 0, NULL},
{/*6*/
GNOME_APP_UI_ITEM, N_("Windows settings ..."),
N_("Edit windows settings"),
on_windows_settings_activate, NULL, NULL,
GNOME_APP_UI_ITEM, N_("File view filters ..."),
N_("Edit file view filters"),
on_file_view_filters_activate, NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GTK_STOCK_PROPERTIES,
0, 0, NULL},
{/*7*/
......
......@@ -55,6 +55,7 @@
#include "Scintilla.h"
#include "ScintillaWidget.h"
#include "about.h"
#include "an_file_view.h"
#include "tm_tagmanager.h"
#include "file_history.h"
......@@ -1976,9 +1977,9 @@ on_set_style_editor_activate (GtkMenuItem * menuitem, gpointer user_data)
}
void
on_windows_settings_activate (GtkMenuItem * menuitem, gpointer user_data)
on_file_view_filters_activate (GtkMenuItem * menuitem, gpointer user_data)
{
gtk_widget_show (GTK_WIDGET (app->windows_dialog));
fv_customize(TRUE);
}
void
......
......@@ -201,7 +201,7 @@ void on_edit_user_properties1_activate (GtkMenuItem * menuitem,
gpointer user_data);
void on_set_preferences1_activate (GtkMenuItem * menuitem, gpointer user_data);
void on_set_style_editor_activate (GtkMenuItem * menuitem, gpointer user_data);
void on_windows_settings_activate (GtkMenuItem * menuitem, gpointer user_data);
void on_file_view_filters_activate (GtkMenuItem * menuitem, gpointer user_data);
void on_set_default_preferences1_activate (GtkMenuItem * menuitem,
gpointer user_data);
void on_start_with_dialog_activate (GtkMenuItem * menuitem, gpointer user_data);
......
......@@ -573,14 +573,26 @@ project_reload_session_files(ProjectDBase * p)
static void
project_dbase_reload_session (ProjectDBase * p)
{
AnjutaPreferences *pr = ANJUTA_PREFERENCES (app->preferences);
gboolean build_sv = anjuta_preferences_get_int (pr, BUILD_SYMBOL_BROWSER);
gboolean build_fv = anjuta_preferences_get_int (pr, BUILD_FILE_BROWSER);
gboolean auto_update = anjuta_preferences_get_int (pr, AUTOMATIC_TAGS_UPDATE);
g_return_if_fail( NULL != p );
debugger_reload_session_breakpoints(p);
project_reload_session_files(p);
fv_session_load (p);
if (auto_update)
project_dbase_update_tags_image(p, TRUE);
else
{
sv_populate(build_sv);
fv_populate(build_fv);
}
session_load_node_expansion_states (p);
find_replace_load_session( app->find_replace, p );
executer_load_session( app->executer, p );
find_in_files_load_session( app->find_in_files, p );
fv_session_load (p);
p->m_prj_ShowLocal = session_get_bool (p, SECSTR(SECTION_PROJECTDBASE),
szShowLocalsItem,
SHOW_LOCALS_DEFAULT );
......@@ -1317,13 +1329,13 @@ project_dbase_save_session (ProjectDBase * p)
{
debugger_save_session_breakpoints (p);
project_dbase_save_session_files (p);
fv_session_save (p);
session_save_node_expansion_states (p);
find_replace_save_session (app->find_replace, p);
executer_save_session (app->executer, p);
find_in_files_save_session (app->find_in_files, p);
fv_session_save (p);
session_save_bool (p, SECSTR (SECTION_PROJECTDBASE),
szShowLocalsItem, p->m_prj_ShowLocal );
session_save_node_expansion_states (p);
session_sync();
}
......@@ -2590,27 +2602,15 @@ go_error:
gboolean
project_dbase_load_project_finish (ProjectDBase * p, gboolean show_project)
{
AnjutaPreferences *pr = ANJUTA_PREFERENCES (app->preferences);
gboolean build_sv = anjuta_preferences_get_int (pr, BUILD_SYMBOL_BROWSER);
gboolean build_fv = anjuta_preferences_get_int (pr, BUILD_FILE_BROWSER);
gboolean auto_update = anjuta_preferences_get_int (pr, AUTOMATIC_TAGS_UPDATE);
/* Now Project setup */
project_dbase_update_tree (p);
if (show_project)
project_dbase_show (p);
extended_toolbar_update ();
if (auto_update)
project_dbase_update_tags_image(p, TRUE);
else
{
sv_populate(build_sv);
fv_populate(build_fv);
}
anjuta_update_app_status(FALSE, NULL);
anjuta_status (_("Project loaded successfully."));
anjuta_set_active ();
project_dbase_update_docked_status();
if (show_project)
project_dbase_show (p);
project_dbase_reload_session(p);
return TRUE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment