Commit 2032b1a6 authored by gedit's avatar gedit

WHEEEEE! 0.6.0 is almost here.. man, i should update cvs more often, instead...

WHEEEEE! 0.6.0 is almost here.. man, i should update cvs more often, instead of letting my code sit on my harddrive un commited.. like, anything could happen.. anyway, fixed buffer, tided up search stuff, prefernces propblems fixed, bug fixes, etc, etc..
parent 19697cbb
Wed Nov 17 16:36:35 GMT 1999 Alex Roberts <bse@gedit.pn.org>
* gedit.spec.in: Added FAQ and the new TODO file to the docs
list.. no wonder ppl keep emailing me with questions answered
in the FAQ. =]
Wed Nov 17 16:17:04 GMT 1999 Alex Roberts <bse@gedit.pn.org>
* makeconfig.pl: 0.6.0pre -> 0.6.0 .... we're almost there!
* README: Finally, we're at 0.6.0 =]
* NEWS: Added 0.6.0 ANNOUNCE message
Tue Nov 16 16:32:46 GMT 1999 Alex Roberts <bse@gedit.pn.org>
* TODO-road_to_1.0.0: Marked off "Remove legacy code" as done.
I thnk we're almost there for 0.6.0
* FAQ: Removed cruft from this file, and semi-answered the first
question
* makeconfig.pl: added gl to ALL_LINGUAS
Tue Nov 16 16:07:10 GMT 1999 Alex Roberts <bse@gedit.pn.org>
* Makefile.am: Added TODO-road_to_1.0.0 to the extra dist.
* commands.c: Removed all scrollbar setting code.. automatic
scrollbar is always used now
* menus.c: Removed scrollbar submenu form settings menu
(gE_set_menu_toggle_states), ({add,remove}_callback_data)
Removed now unused, legacy, functions.
(gE_menus_init) Tidied it up a bit
* gE_prefs.c: Remvoed scrollbar settings (they didnt save anyway,
probably due to the fact the setting isnt an integer, its an
enum).
Tue Nov 16 15:12:58 GMT 1999 Alex Roberts <bse@gedit.pn.org>
* ChangeLog: Fixed some of the earlier entries, the names seem to
have vanished. On another note of interest, i just did a grep
of this file and there are currently 370 entries.. eeek!
Tue Nov 16 14:54:40 GMT 1999 Alex Roberts <bse@gedit.pn.org>
* src/gE_prefs.h: Added a word_wrap flag to the preferences struct.
* src/gE_prefs.c: (gE_save_settings) (gE_get_settings) Save and load
word_wrap setting.
* src/gE_prefs_box.c: (gE_apply) Store the word_wrap setting
(gE_window_refresh) Refresh the word_wrap setting by calling te
gE_view set_word_wrap function.
(get_prefs) Get the word_wrap toggle state
* src/gE_view.c: (gE_view_set_word_wrap) Set both the main text pane
and hte split screen
(gE_view_init) Make the signal connection for the split screen
auto indent a regular signal conenction.
* KNOWNBUGS: Added note about auto indent and multiple views.
Sat Nov 13 14:17:38 GMT 1999 Alex Roberts <bse@gedit.pn.org>
* makeconfig.pl: Upped version number to 0.6.0pre
......@@ -3384,12 +3449,12 @@ Thu Aug 20 20:25:57 1998 Owen Taylor <otaylor@redhat.com>
* main.h: #included <stdio.h> to get declaration of size_t.
1998-05-28 <bse@dial.pipex.com>
1998-05-28 Alex Roberts <bse@dial.pipex.com>
* Thanx to Eli Miller (spooge, his IRC nick) gEdit will now
re-size smaller than its startup size :)
1998-05-26 <evan@worldpath.net>
1998-05-26 Evan Lawrence <evan@worldpath.net>
* Fixed >2 New file bug
......@@ -3400,7 +3465,7 @@ Thu Aug 20 20:25:57 1998 Owen Taylor <otaylor@redhat.com>
* Synced the Options menu between the GNOME and non-GNOME versions
1998-05-26 <bse@dial.pipex.com>
1998-05-26 Alex Roberts <bse@dial.pipex.com>
* Released 0.4.0 (Non-GNOME)
......@@ -3408,11 +3473,11 @@ Thu Aug 20 20:25:57 1998 Owen Taylor <otaylor@redhat.com>
Currently, it will keep the Tab Position, and if the Statusbar is
visible or not...
1998-05-15 <bse@dial.pipex.com>
1998-05-15 Alex Roberts <bse@dial.pipex.com>
* Print partially implemented...
1998-05-13 <bse@dial.pipex.com>
1998-05-13 Alex Roberts <bse@dial.pipex.com>
* Removed a piece of annoying debugging code...
......@@ -3420,25 +3485,25 @@ Thu Aug 20 20:25:57 1998 Owen Taylor <otaylor@redhat.com>
* Fixed some errors in man page...
1998-05-12 <bse@dial.pipex.com>
1998-05-12 Alex Roberts <bse@dial.pipex.com>
* Updated the README/AUTHORS files to my new email address
(bse@dial.pipex.com)
* Upped version number to 0.4, ready for next release
1998-05-10 <evan@worldpath.net>
1998-05-10 Evan Lawrence <evan@worldpath.net>
* Fixed the bug with gEdit not asking if you want to save modified files when you quit...
It's a bit of a hack, but I didn't feel like rewriting a lot of the code from the close routine..
1998-05-09 <bse@dial.pipex.com>
1998-05-09 Alex Roberts <bse@dial.pipex.com>
* Added GNOME version number to the title, it looks better with a version number i feel...
* Fixed segfault on startup when using GTK+ 1.1. Hopefully, the bug has gone...
1998-05-03 <bse@dial.pipex.com>
1998-05-03 Alex Roberts <bse@dial.pipex.com>
* Fixed the sigsegv when loading a file from the cmd line.
This does break the (already broken because of the .gnome/gtkrc) font settings
......@@ -3447,7 +3512,7 @@ Sun May 03 03:17:13 Kjartan Maraas <kmaraas@fib.hl.no>
* .cvsignore: New file. Added some files to it as well.
1998-05-02 <bse@dial.pipex.com>
1998-05-02 Alex Roberts <bse@dial.pipex.com>
* Improved the description of gEdit in the About Box...
......@@ -3459,12 +3524,12 @@ Sun May 03 03:17:13 Kjartan Maraas <kmaraas@fib.hl.no>
* robo@earthling.net -> bse@dial.pipex.com (robo doesn't work anymore)
1998-04-29 <evan@worldpath.net>
1998-04-29 Evan Lawrence <evan@worldpath.net>
* Several changes in the past few days - you can toggle autoindent,
wordwrap, the document tabs, and the statusbar now.. Other misc stuff...
1998-04-20 <evan@worldpath.net>
1998-04-20 Evan Lawrence <evan@worldpath.net>
* Made some more changes to the statusbar
......@@ -3473,12 +3538,12 @@ Sun Apr 19 17:03:15 1998 Havoc Pennington <hp@pobox.com>
* Makefile.in, configure, aclocal.m4: Removed automatically
generated files. Hope this is OK.
1998-04-19 <robo@earthling.net>
1998-04-19 Alex Roberts <robo@earthling.net>
* Changed application class to gEdit.gedit (from gedit.Gedit), to help with
window managers (e.g WindowMaker)
1998-04-19 <robo@earthling.net>
1998-04-19 Alex Roberts <robo@earthling.net>
* Fixed the configure.in script to include the GTK+ include directories,
(/usr/local/include/glib, etc), and YES we _are_ using gtk-config to
......@@ -3490,7 +3555,7 @@ Sun Apr 19 17:03:15 1998 Havoc Pennington <hp@pobox.com>
-* Flickering of the Line/Column fixed (evan@worldpath.net)
-* If file from command line doesn't exist, gEdit creates it (evan)
1998-04-16 <robo@earthling.net>
1998-04-16 Alex Roberts <robo@earthling.net>
* Implemented Line/Column display, buggy though, and the Line counter only counts up to the
height of the text box, so, it doesn't really work(probably to do with the Text Widget,
......@@ -3503,7 +3568,7 @@ Sun Apr 19 17:03:15 1998 Havoc Pennington <hp@pobox.com>
* Added gEdit.desktop for GNOME Panel, for a little GNOMEification of gEdit
1998-04-15 <robo@earthling.net>
1998-04-15 Alex Roberts <robo@earthling.net>
* Added keyboard shortcuts to the search and the
search and replace commands...
......@@ -3511,7 +3576,7 @@ Sun Apr 19 17:03:15 1998 Havoc Pennington <hp@pobox.com>
* Improved the About box: added homepage, and GTK Version
labels, and added gEdit icon...
1998-04-13 <robo@earthling.net>
1998-04-13 Alex Roberts <robo@earthling.net>
* Changed File Close shortcut to Alt-W...
......@@ -3519,11 +3584,11 @@ Sun Apr 19 17:03:15 1998 Havoc Pennington <hp@pobox.com>
(Which also fixes the Sigsegv when closing files from the command
line)...
1998-04-06 <robo@earthling.net>
1998-04-06 Alex Roberts <robo@earthling.net>
* Added statusbar code
1998-04-04 <robo@earthling.net>
1998-04-04 Alex Roberts <robo@earthling.net>
* Released 0.3.2
......@@ -3532,11 +3597,11 @@ Sun Apr 19 17:03:15 1998 Havoc Pennington <hp@pobox.com>
* Added 2 icons to distribution, one by me, and one by joatman
(joatman@base.org)
1998-04-01 <robo@earthling.net>
1998-04-01 Alex Roberts <robo@earthling.net>
* Added man page to distribution
1998-03-28 <robo@earthling.net>
1998-03-28 Alex Roberts <robo@earthling.net>
* Released 0.3.1
......@@ -3552,61 +3617,61 @@ Sun Apr 19 17:03:15 1998 Havoc Pennington <hp@pobox.com>
open a file using a command like 'gedit
/etc/resolv.conf' that's fixed...
1998-03-26 <robo@earthling.net>
1998-03-26 Alex Roberts <robo@earthling.net>
* A file opened from the commandline, the tab no longer shows the
'./' before the filename...
1998-03-25 <robo@earthling.net>
1998-03-25 Alex Roberts <robo@earthling.net>
* Released 0.3
* Fixed the command line opening bug, now it inserts a './' so when
it saves, all it erases from the tab is the './', instead of the
whole filename.
1998-03-24 <evan@worldpath.net>
1998-03-24 Evan Lawrence <evan@worldpath.net>
* It no longer dies a horrible death when you try to save empty
files (thanks to Taneli) and behaves quite normally when you open
a binary file...
1998-03-23 <evan@worldpath.net>
1998-03-23 Evan Lawrence <evan@worldpath.net>
* OK, I think I'm done with search and replace, it now
has the option to ask before replacing. Next up: fix the binary
file bug and apply the patch from Taneli...
1998-03-22 <evan@worldpath.net>
1998-03-22 Evan Lawrence <evan@worldpath.net>
* Just about done with search and replace, just a few niceties to
add..
1998-03-15 <evan@worldpath.net>
1998-03-15 Evan Lawrence <evan@worldpath.net>
* Close will now ask if you want to save
before closing a modified file...
1998-03-15 <robo@earthling.net>
1998-03-15 Alex Roberts <robo@earthling.net>
* Woohoo! preferences work!! Now it will read and write ~/.gedit!! :)
You can change the font of the text box (still need to restart
gEdit tho,and when you put the text font dialog box up, it puts
it back to the default!)
1998-03-13 <evan@worldpath.net>
1998-03-13 Evan Lawrence <evan@worldpath.net>
* Fixed the save bug... document->filename
was going out of scope...
1998-03-10 <evan@worldpath.net>
1998-03-10 Evan Lawrence <evan@worldpath.net>
* Fixed those incredibly annoying close bugs
1998-03-07 <robo@earthling.net>
1998-03-07 Alex Roberts <robo@earthling.net>
* Command line options added
1998-03-05 <robo@earthling.net>
1998-03-05 Alex Roberts <robo@earthling.net>
* 0.2 -> 0.2.1
......
gEdit 0.5.x FAQ
gEdit 0.6.x FAQ
Add stuff to this, it's not complete..
1) Q. I get a 'Broken Pipe' on startup, nothing happens.
A. <Needs answering..>
A. This seems to be related to using gnome-session, compelte gnome-session
integration is on the TODO list.
2) Q. I want syntax highlighting.. when will it be included?
A. Currently, the Gtk+ Text widget isn't suitable for this feature to be
......@@ -25,5 +26,3 @@ Add stuff to this, it's not complete..
5) Q. Are you really the 16 year old son of Janet Roberts?
A. YES!! I am!.. I am not a University student (yet.. hehe) (Alex)
6) <More Questions..>
\ No newline at end of file
......@@ -9,4 +9,4 @@ Known bugs in the current version of gEdit:
* Deleting a line will sometimes make the next line down dissappear,
until you highlight it.
* The Line counter has a problem with the first 2 lines of a docuemnt.
\ No newline at end of file
* There are issues with auto indent and multiple views of a document
\ No newline at end of file
......@@ -6,7 +6,7 @@ SUBDIRS = macros po intl src editor-plugins help
EXTRA_DIST = KNOWNBUGS FAQ ChangeLog README README.plugins \
INSTALL gedit.1 gE-icon-1.xpm gE-icon-2.xpm gedit.desktop \
ABOUT-NLS TODO gedit.spec.in gedit.keys
ABOUT-NLS TODO TODO-road_to_1.0.0 gedit.spec.in gedit.keys
man_MANS = gedit.1
......
ANNOUNCE 0.6.0 (Demanufacture) (1999-11-17)
------------------------------
gEdit 0.6.0 "Demanufacture" Is now Available.
And so begins the long awaited 0.6.x stable series.
0.5.5 had some major bugs, that have now been fixed and we're working on making
this series as stable as possible (as well as beginnign work on the 0.9 series,
otherwise known as "The Road To 1.0.0"). 0.6 will continue on as the main stable
platform of gEdit, until the 0.9 series has been completed and 1.0.0 is launched.
Changes
=======
* Minor overhaul of the buffer system, made it more reliable and
stable.
* Small code overhaul, removing now obsolete and un-used code.
* Updated plugins (Wordcount now sports a nice GTK+ based interface).
* Stability improving bug fixes for your pleasure
Downloads are available at http://gedit.pn.org
I hope you enjoy using thsi software, comments, suggestions and bug fixes are
appreciated. Informtaion on the mailing list is available at the above URL.
Thank you
- Alex Roberts <bse@gedit.pn.org>
ANNOUNCE 0.5.5 (Undead) (1999-10-20)
-----------------------
gEdit 0.5.5 "Undead" is now Available. Codenamed Undead because, well, i wanted
......
gEdit 0.5.5
gEdit 0.6.0
Alex Roberts and Evan Lawrence, 1998, 1999
INTRODUCTION
......
......@@ -7,9 +7,9 @@ Road to 1.0.0
(DONE) - Redo the buffer system, ie, only update it when it
is required (eg, adding views, saving, etc)
- Remove old, legacy, code; as far as possible
(DONE) - Remove old, legacy, code; as far as possible
- fix bugs! no really, i;m seeing it like this, if a
(DONE) - fix bugs! no really, i;m seeing it like this, if a
bug is there, and it can be fixed then we fix it; if
its either a non critical feature or something that
is a btich to fix - then we remove it entirely.
......
......@@ -60,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-, root, root)
%doc README COPYING ChangeLog NEWS TODO AUTHORS INSTALL THANKS
%doc README COPYING ChangeLog NEWS TODO AUTHORS INSTALL THANKS TODO-road_to_1.0.0 FAQ
%{prefix}/bin/gedit
%{prefix}/share/*
#%{prefix}/share/locale/*/*/*
......@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/lib/*
%changelog
* Wed Nov 17 16:35:29 GMT 1999 Alex Roberts <bse@gedit.pn.org>
- Updated doc's to be included in RPM
* Sat Feb 06 1999 Michael Johnson <johnsonm@redhat.com>
- Cleaned up a bit for Red Hat use
......
......@@ -184,73 +184,6 @@ tab_toggle_cb(GtkWidget *widget, gpointer cbwindow)
}
*/
/* Scrollbar Options */
void
scrollbar_none_cb (GtkWidget *widget, gpointer cbdata)
{
int c, w;
for (c = 0; c < g_list_length (mdi->children); c++) {
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (
((gE_view *) g_list_nth_data (mdi->children, c))->scrwindow[0]),
GTK_POLICY_NEVER,
GTK_POLICY_NEVER);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (
((gE_view *) g_list_nth_data (mdi->children, c))->scrwindow[1]),
GTK_POLICY_NEVER,
GTK_POLICY_NEVER);
}
settings->scrollbar = GTK_POLICY_NEVER;
}
void
scrollbar_always_cb (GtkWidget *widget, gpointer cbdata)
{
int c, w;
for (c = 0; c < g_list_length (mdi->children); c++) {
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (
((gE_view *) g_list_nth_data (mdi->children, c))->scrwindow[0]),
GTK_POLICY_NEVER,
GTK_POLICY_ALWAYS);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (
((gE_view *) g_list_nth_data (mdi->children, c))->scrwindow[1]),
GTK_POLICY_NEVER,
GTK_POLICY_ALWAYS);
}
settings->scrollbar = GTK_POLICY_ALWAYS;
}
void
scrollbar_auto_cb (GtkWidget *widget, gpointer cbdata)
{
int c, w;
for (c = 0; c < g_list_length (mdi->children); c++) {
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (
((gE_view *) g_list_nth_data (mdi->children, c))->scrwindow[0]),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (
((gE_view *) g_list_nth_data (mdi->children, c))->scrwindow[1]),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
}
settings->scrollbar = GTK_POLICY_NEVER;
}
/* ---- Auto-indent Callback(s) --- */
......
......@@ -36,6 +36,7 @@ gE_save_settings()
gnome_config_set_int ("tab pos", (gint) mdi->tab_pos);
gnome_config_set_int ("auto indent", (gboolean) settings->auto_indent);
gnome_config_set_int ("word wrap", (gboolean) settings->word_wrap);
gnome_config_set_int ("show statusbar", (gboolean) settings->show_status);
gnome_config_set_int ("toolbar", (gint) settings->have_toolbar);
gnome_config_set_int ("tb text", (gint) settings->have_tb_text);
......@@ -44,7 +45,6 @@ gE_save_settings()
gnome_config_set_int ("splitscreen", (gint) settings->splitscreen);
gnome_config_set_int ("close doc", (gint) settings->close_doc);
gnome_config_set_int ("mdi mode", mdiMode);
gnome_config_set_int ("scrollbar", settings->scrollbar);
gnome_config_set_string ("font", settings->font);
gnome_config_set_int ("width", (gint) settings->width);
gnome_config_set_int ("height", (gint) settings->height);
......@@ -69,6 +69,8 @@ void gE_get_settings()
gnome_config_push_prefix ("/gEdit/Global/");
mdi->tab_pos = gnome_config_get_int ("tab pos");
settings->auto_indent = gnome_config_get_int ("auto indent");
settings->word_wrap = gnome_config_get_int ("word wrap");
settings->run = gnome_config_get_int ("run");
settings->show_status = gnome_config_get_int ("show statusbar");
settings->have_toolbar = gnome_config_get_int ("toolbar");
......@@ -81,10 +83,6 @@ void gE_get_settings()
if (!mdiMode)
mdiMode = mdi_type[GNOME_MDI_NOTEBOOK];
settings->scrollbar = gnome_config_get_int ("scrollbar");
if (!settings->scrollbar)
settings->scrollbar = GTK_POLICY_AUTOMATIC;
settings->width = gnome_config_get_int ("width");
if (!settings->width)
settings->width = 630;
......
......@@ -26,6 +26,7 @@ extern void gE_rc_parse(void);
typedef struct _gE_preference {
guint auto_indent;
gint word_wrap;
gint show_tabs;
gint tab_pos;
guint show_status;
......@@ -40,7 +41,6 @@ typedef struct _gE_preference {
gint num_recent; /* Number of recently accessed documents in the
Recent Documents menu */
gint mdi_mode;
gint scrollbar;
gint width, height;
......
......@@ -163,6 +163,7 @@ void gE_window_refresh(gE_window *w)
nth_view = g_list_nth_data (doc->views, j);
gE_view_set_font (nth_view, settings->font);
gE_view_set_word_wrap (nth_view, settings->word_wrap);
}
......@@ -182,6 +183,7 @@ void gE_apply(GnomePropertyBox *pbox, gint page, gE_data *data)
settings->auto_indent = (GTK_TOGGLE_BUTTON (prefs->autoindent)->active);
settings->show_status = (GTK_TOGGLE_BUTTON (prefs->status)->active);
GE_VIEW (mdi->active_view)->splitscreen = (GTK_TOGGLE_BUTTON (prefs->split)->active);
settings->word_wrap = (GTK_TOGGLE_BUTTON (prefs->wordwrap)->active);
/* Print Settings */
settings->print_cmd = g_strdup (gtk_entry_get_text (GTK_ENTRY(prefs->pcmd)));
......@@ -244,6 +246,8 @@ void get_prefs(gE_data *data)
settings->show_status);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (prefs->split),
GE_VIEW (mdi->active_view)->splitscreen);
gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (prefs->wordwrap),
settings->word_wrap);
if (!settings->close_doc)
......
......@@ -665,7 +665,7 @@ static void gE_view_init (gE_view *view)
view->text = gtk_text_new(NULL, NULL);
gtk_text_set_editable(GTK_TEXT(view->text), !view->read_only);
gtk_text_set_word_wrap(GTK_TEXT(view->text), view->word_wrap);
gtk_text_set_word_wrap(GTK_TEXT(view->text), settings->word_wrap);
gtk_text_set_line_wrap(GTK_TEXT(view->text), view->line_wrap);
......@@ -679,8 +679,8 @@ static void gE_view_init (gE_view *view)
/* Handle Auto Indent */
gtk_signal_connect_after (GTK_OBJECT(view->text), "insert_text",
GTK_SIGNAL_FUNC(auto_indent_cb), view);
view->indent = gtk_signal_connect_after (GTK_OBJECT(view->text), "insert_text",
GTK_SIGNAL_FUNC(auto_indent_cb), view);
/*
I'm not even sure why these are here.. i'm sure there are much easier ways
......@@ -727,7 +727,7 @@ static void gE_view_init (gE_view *view)
view->split_screen = gtk_text_new(NULL, NULL);
gtk_text_set_editable(GTK_TEXT(view->split_screen), !view->read_only);
gtk_text_set_word_wrap(GTK_TEXT(view->split_screen), view->word_wrap);
gtk_text_set_word_wrap(GTK_TEXT(view->split_screen), settings->word_wrap);
gtk_text_set_line_wrap(GTK_TEXT(view->split_screen), view->line_wrap);
......@@ -748,8 +748,9 @@ static void gE_view_init (gE_view *view)
GTK_SIGNAL_FUNC(doc_delete_text_cb),
(gpointer) view);
gtk_signal_connect_after(GTK_OBJECT(view->split_screen),
"insert_text", GTK_SIGNAL_FUNC(auto_indent_cb), view);
view->s_indent = gtk_signal_connect (GTK_OBJECT(view->split_screen), "insert_text",
GTK_SIGNAL_FUNC(auto_indent_cb),
(gpointer) view);
gtk_container_add (GTK_CONTAINER (view->scrwindow[1]), view->split_screen);
......@@ -908,7 +909,8 @@ void gE_view_set_word_wrap (gE_view *view, gint word_wrap)
view->word_wrap = word_wrap;
gtk_text_set_word_wrap (GTK_TEXT (view->text), view->word_wrap);
gtk_text_set_word_wrap (GTK_TEXT (view->text), word_wrap);
gtk_text_set_word_wrap (GTK_TEXT (view->split_screen), word_wrap);
}
......@@ -973,7 +975,6 @@ void gE_view_set_font (gE_view *view, gchar *font)
}
void gE_view_set_position (gE_view *view, gint pos)
{
......
......@@ -145,24 +145,6 @@ GnomeUIInfo gedit_tab_menu []= {
};
GnomeUIInfo gedit_scrbar_menu []= {
{ GNOME_APP_UI_ITEM, N_("_None"),
N_("Don't have a scrollbar"),
scrollbar_none_cb, NULL },
{ GNOME_APP_UI_ITEM, N_("A_lways"),
N_("Always have the scrollbar"),
scrollbar_always_cb, NULL },
{ GNOME_APP_UI_ITEM, N_("_Automatic"),
N_("Only have scrollbar when it's needed"),
scrollbar_auto_cb, NULL },
GNOMEUIINFO_END
};
GnomeUIInfo gedit_settings_menu []= {
/* -- These settings are in the Preferences Box, and only need to be
......@@ -203,9 +185,6 @@ GnomeUIInfo gedit_settings_menu []= {
{ GNOME_APP_UI_SUBTREE, N_("_Document Tabs"),
N_("Change the placement of the document tabs"), &gedit_tab_menu },
{ GNOME_APP_UI_SUBTREE, N_("_Scrollbar"),
N_("Change visibility options of the scrollbar"), &gedit_scrbar_menu },
GNOMEUIINFO_SEPARATOR,
{ GNOME_APP_UI_ITEM, N_("Sa_ve Settings"),
......@@ -277,128 +256,8 @@ GnomeUIInfo gedit_menu [] = {
GnomeUIInfo * gE_menus_init (gE_window *window, gE_data *data)
{
/* add_callback_data (gedit_file_menu, GNOME_APP (mdi->active_window), data);
add_callback_data (gedit_edit_menu, GNOME_APP (mdi->active_window), data);
add_callback_data (gedit_tab_menu, window, data);
add_callback_data (gedit_settings_menu,GNOME_APP (mdi->active_window), data);
add_callback_data (gedit_window_menu, GNOME_APP (mdi->active_window), data);
add_callback_data (gedit_docs_menu, GNOME_APP (mdi->active_window), data);
add_callback_data (gedit_help_menu, GNOME_APP (mdi->active_window), data);
*/
gnome_app_create_menus (GNOME_APP (mdi->active_window), gedit_menu);
/* remove_callback_data (gedit_file_menu, GNOME_APP (mdi->active_window), data);
remove_callback_data (gedit_edit_menu, GNOME_APP (mdi->active_window), data);
remove_callback_data (gedit_tab_menu, GNOME_APP (mdi->active_window),data);