diff options
author | gedit <gedit> | 1999-10-05 23:26:22 +0000 |
---|---|---|
committer | gedit <gedit> | 1999-10-05 23:26:22 +0000 |
commit | 0f7fa23e303b6882136f983d9580dd89575f7718 (patch) | |
tree | a48c2abae9d69ec3f94d9adb8b9261d6b6c7b729 | |
parent | bedfa59557751bde423ea736798e18315bcc90ec (diff) | |
download | gedit-0f7fa23e303b6882136f983d9580dd89575f7718.tar.gz |
Lots of stuff preparing for 0.5.5. various stability fixes, a about box logo, see ChangeLog
-rw-r--r-- | ChangeLog | 24 | ||||
-rw-r--r-- | README | 7 | ||||
-rw-r--r-- | gedit/Makefile.am | 3 | ||||
-rw-r--r-- | gedit/commands.c | 7 | ||||
-rw-r--r-- | gedit/gE_about.c | 16 | ||||
-rw-r--r-- | gedit/gE_plugin_api.c | 5 | ||||
-rw-r--r-- | gedit/gE_view.c | 75 | ||||
-rw-r--r-- | gedit/gedit-logo.png | bin | 0 -> 37654 bytes | |||
-rw-r--r-- | gedit/gedit.c | 4 | ||||
-rw-r--r-- | po/ChangeLog | 5 | ||||
-rw-r--r-- | po/POTFILES.in | 7 | ||||
-rw-r--r-- | po/cs.po | 30 | ||||
-rw-r--r-- | po/da.po | 78 | ||||
-rw-r--r-- | po/de.po | 30 | ||||
-rw-r--r-- | po/es.po | 30 | ||||
-rw-r--r-- | po/fr.po | 30 | ||||
-rw-r--r-- | po/ga.po | 30 | ||||
-rw-r--r-- | po/it.po | 30 | ||||
-rw-r--r-- | po/ja.po | 30 | ||||
-rw-r--r-- | po/ko.po | 30 | ||||
-rw-r--r-- | po/nl.po | 30 | ||||
-rw-r--r-- | po/no.po | 30 | ||||
-rw-r--r-- | po/pt.po | 30 | ||||
-rw-r--r-- | po/pt_BR.po | 30 | ||||
-rw-r--r-- | po/ru.po | 30 | ||||
-rw-r--r-- | po/sv.po | 30 | ||||
-rw-r--r-- | po/wa.po | 30 | ||||
-rw-r--r-- | po/zh_TW.Big5.po | 30 | ||||
-rw-r--r-- | src/Makefile.am | 3 | ||||
-rw-r--r-- | src/commands.c | 7 | ||||
-rw-r--r-- | src/gE_about.c | 16 | ||||
-rw-r--r-- | src/gE_plugin_api.c | 5 | ||||
-rw-r--r-- | src/gE_view.c | 75 | ||||
-rw-r--r-- | src/gedit-logo.png | bin | 0 -> 37654 bytes | |||
-rw-r--r-- | src/gedit.c | 4 |
35 files changed, 440 insertions, 381 deletions
@@ -1,3 +1,27 @@ +Mon Oct 4 16:29:40 BST 1999 Alex Roberts <bse@gedit.pn.org> + + * README: Updated for 0.5.5. + +Mon Oct 4 15:00:07 BST 1999 Alex Roberts <bse@gedit.pn.org> + + * src/gE_about.c: (gE_about_box) Tided up the authors section, and added + the gEdit logo. + + * src/Makefile.am: Added the gEdit logo to be installed. + +Mon Oct 4 14:45:56 BST 1999 Alex Roberts <bse@gedit.pn.org> + + * src/gE_plugin_api.c: (gE_plugin_text_insert) Get an accurate position, + for some reason get_point doesnt seem to return the proper postiion. + The insert time plugin now functions properly.. as does every other + plugin that inserts text. =) + +Sun Oct 3 21:15:27 BST 1999 Alex Roberts <bse@gedit.pn.org> + + * commands.c: (file_save_cb) (file_save_all_cb) Let's duplicate the + filename, string, instead of just pointing to it.. eh? g_free was + scking up the filename after saving. + Fri Sep 24 20:05:02 BST 1999 Alex Roberts <bse@gedit.pn.org> * commands.c: (recent_update) Removed g_free that was mucking everything up. @@ -14,13 +14,14 @@ features: * Cut/Copy/Paste and Select All text; * Complete integration with the GNOME Environment, including GnomeMDI; * Search and Replace; - * A complete preferences interface; + * Global search; +* A complete preferences interface; * Dynamically loading fonts; * Splitscreen Mode; * Printing support; * Configurable Plugins system; * Configurable window sizing; - * Dockable window items. + * Unlimited Undo/Redo. FEEDBACK -------- @@ -31,7 +32,7 @@ contact me on IRC - irc.mint.net in the #gedit channel. PLUGINS ------- -For information on the Plugins included with gEdit, plase read the +For information on the Plugins included with gEdit, please read the README.plugins file... To find out how to write your own Plugins, please read diff --git a/gedit/Makefile.am b/gedit/Makefile.am index 98863730b..99e537a8d 100644 --- a/gedit/Makefile.am +++ b/gedit/Makefile.am @@ -4,6 +4,9 @@ appicondir=$(datadir)/pixmaps appicon_DATA = gnome-gedit.png +applogodir=$(datadir)/pixmaps +applogo_DATA = gedit-logo.png + INCLUDES = -I$(includedir) -I$(top_srcdir) \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ diff --git a/gedit/commands.c b/gedit/commands.c index 4bb4bfca1..027940a52 100644 --- a/gedit/commands.c +++ b/gedit/commands.c @@ -467,7 +467,7 @@ void file_save_cb(GtkWidget *widget, gpointer cbdata) if (doc->changed) { - fname = doc->filename; + fname = g_strdup (doc->filename); if (fname == NULL) { @@ -511,7 +511,7 @@ file_save_all_cb(GtkWidget *widget, gpointer cbdata) doc = (gE_document *)g_list_nth_data (mdi->children, i); if (doc->changed) { - fname = doc->filename; + fname = g_strdup(doc->filename); if (fname == NULL) { @@ -625,7 +625,8 @@ static void file_save_all_as_ok_sel(GtkWidget *w, GtkFileSelection *fs) if (mdi->active_child == NULL) { - g_free (fname); return; + g_free (fname); + return; } doc = gE_document_current(); diff --git a/gedit/gE_about.c b/gedit/gE_about.c index 946403507..7b34bbf96 100644 --- a/gedit/gE_about.c +++ b/gedit/gE_about.c @@ -34,23 +34,23 @@ void gE_about_box(GtkWidget *w, gpointer cbdata) "http://gedit.pn.org", "", N_("With special thanks to:"), - " Will LaShell", - " Chris Lahey", - " Andy Kahn", - " Miguel de Icaza", - " Martin Baulig", - " Thomas Holmgren", - " Martijn van Beers", + " Will LaShell, Chris Lahey, Andy Kahn,", + " Miguel de Icaza, Martin Baulig,", + " Thomas Holmgren, Martijn van Beers", NULL }; + + about = gnome_about_new ("gEdit", VERSION, _("(C) 1998, 1999 Alex Roberts and Evan Lawrence"), authors, _("gEdit is a small and lightweight text editor for GNOME/Gtk+"), - NULL); + "gedit-logo.png"); gtk_widget_show (about); + /*gtk_widget_destroy (about); + g_free (authors); */ } diff --git a/gedit/gE_plugin_api.c b/gedit/gE_plugin_api.c index 7714ba970..67e510e85 100644 --- a/gedit/gE_plugin_api.c +++ b/gedit/gE_plugin_api.c @@ -137,9 +137,8 @@ gE_plugin_text_insert(gint docid, gchar * buffer, gint length, gint position) if (position >= gtk_text_get_length(GTK_TEXT(view->text))) position = gtk_text_get_length(GTK_TEXT(view->text)); - position = gE_view_get_position (view); - - gtk_text_freeze(GTK_TEXT(view->text)); + /*position = gE_view_get_position (view);*/ + position = GTK_TEXT(view->text)->cursor_pos_x/6; gtk_text_freeze(GTK_TEXT(view->text)); gtk_editable_insert_text (GTK_EDITABLE (view->text), buffer, length, &position); gtk_text_thaw(GTK_TEXT(view->text)); diff --git a/gedit/gE_view.c b/gedit/gE_view.c index 6b6ab08f6..d280199e9 100644 --- a/gedit/gE_view.c +++ b/gedit/gE_view.c @@ -158,6 +158,36 @@ void view_list_erase (gE_view *view, gE_data *data) } +gint insert_into_buffer (gE_document *doc, gchar *buffer, gint position) +{ + + if ((doc->buf->len > 0) && (position < doc->buf->len) && (position)) { + +#ifdef DEBUG + g_message ("g_string_insert"); +#endif + doc->buf = g_string_insert (doc->buf, position, buffer); + + } else if (position == 0) { + +#ifdef DEBUG + g_message ("g_string_prepend"); +#endif + doc->buf = g_string_prepend (doc->buf, buffer); + + } else { + +#ifdef DEBUG + g_message ("g_string_append"); +#endif + doc->buf = g_string_append (doc->buf, buffer); + + } + + return 0; + +} + void doc_insert_text_cb(GtkWidget *editable, const guchar *insertion_text, int length, int *pos, gE_view *view) @@ -213,28 +243,7 @@ doc_insert_text_cb(GtkWidget *editable, const guchar *insertion_text, int length g_message ("and the buffer is: %s, %d, %d.. buf->len %d", buffer, length, position, view->document->buf->len); #endif - if ((doc->buf->len > 0) && (position < doc->buf->len) && (position)) { - -#ifdef DEBUG - g_message ("g_string_insert"); -#endif - doc->buf = g_string_insert (doc->buf, position, buffer); - - } else if (position == 0) { - -#ifdef DEBUG - g_message ("g_string_prepend"); -#endif - doc->buf = g_string_prepend (doc->buf, buffer); - - } else { - -#ifdef DEBUG - g_message ("g_string_append"); -#endif - doc->buf = g_string_append (doc->buf, buffer); - - } + insert_into_buffer (doc, buffer, position); gE_undo_add (buffer, position, (position + length), INSERT, doc); @@ -255,7 +264,7 @@ doc_insert_text_cb(GtkWidget *editable, const guchar *insertion_text, int length g_free (data); - if (length > 96) + /*if (length > 96) */ g_free (buffer); } @@ -380,6 +389,7 @@ auto_indent_cb(GtkWidget *text, char *insertion_text, int length, gchar *buffer, *whitespace; gE_view *view = (gE_view *)cbdata; gE_document *doc; + gE_data *data; if ((length != 1) || (insertion_text[0] != '\n')) @@ -443,11 +453,13 @@ auto_indent_cb(GtkWidget *text, char *insertion_text, int length, if (strlen(whitespace) > 0) { i = *pos; - /*gtk_text_set_point (GTK_TEXT (text), i); + gtk_text_set_point (GTK_TEXT (text), i); gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, - whitespace, strlen (whitespace));*/ - gtk_editable_insert_text (GTK_EDITABLE (text), whitespace, - strlen(whitespace), &i); + whitespace, strlen (whitespace)); + + insert_into_buffer (doc, whitespace, i); + + } @@ -666,6 +678,11 @@ static void gE_view_init (gE_view *view) GTK_SIGNAL_FUNC (gE_event_key_press), 0); + + /* Handle Auto 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 of implementing undo/redo... @@ -678,10 +695,6 @@ 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); - /* gtk_signal_connect_after (GTK_OBJECT(view->text), "key_press_event", GTK_SIGNAL_FUNC(gE_event_button_press), NULL);*/ diff --git a/gedit/gedit-logo.png b/gedit/gedit-logo.png Binary files differnew file mode 100644 index 000000000..a2abe656a --- /dev/null +++ b/gedit/gedit-logo.png diff --git a/gedit/gedit.c b/gedit/gedit.c index 6d1486822..4472d3e89 100644 --- a/gedit/gedit.c +++ b/gedit/gedit.c @@ -220,7 +220,7 @@ int main (int argc, char **argv) win_int_to_pointer = g_hash_table_new (g_int_hash, g_int_equal); - data = g_malloc (sizeof (gE_data)); + /*data = g_malloc (sizeof (gE_data));*/ window_list = NULL; settings = g_malloc (sizeof (gE_preference)); @@ -297,7 +297,7 @@ int main (int argc, char **argv) } - g_free (data); + /*g_free (data);*/ gtk_main (); diff --git a/po/ChangeLog b/po/ChangeLog index 520155b62..a3ab27b32 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,8 @@ +Tue Oct 5 23:56:39 BST 1999 Alex Roberts <bse@gedit.pn.org> + + * POTFILES.in: Removed files no longer in the dist. and added new files that + are in (that is, as of 0.5.5). + 1999-08-18 Kjartan Maraas <kmaraas@online.no> * uk.po: Updated Ukrainian translation from diff --git a/po/POTFILES.in b/po/POTFILES.in index de754ff12..d30221e45 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -6,12 +6,9 @@ editor-plugins/browse.c editor-plugins/prm/maincode.c editor-plugins/prm/msgbox.c editor-plugins/spell.c -gmodule-plugins/launcher/main.c -gmodule-plugins/shell/main.c src/commands.c -src/dialog.c src/gE_about.c -src/gE_document.c +src/gE_window.c src/gE_files.c src/gE_mdi.c src/gE_plugin_api.c @@ -22,4 +19,4 @@ src/gedit.c src/main.h src/menus.c src/search.c -src/toolbar.c +src/gE_view.c @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: gedit-0.5.5\n" -"POT-Creation-Date: 1999-09-13 19:55+0100\n" +"POT-Creation-Date: 1999-10-05 21:46+0100\n" "PO-Revision-Date: 1999-08-09 20:17+0100\n" "Last-Translator: Unknown :-(\n" "Language-Team: \n" @@ -28,53 +28,53 @@ msgstr "" msgid "Shell" msgstr "" -#: src/commands.c:215 +#: src/commands.c:93 msgid "Could not save file!" msgstr "" -#: src/commands.c:550 +#: src/commands.c:426 msgid "Open File..." msgstr "" -#: src/commands.c:603 src/commands.c:645 +#: src/commands.c:480 src/commands.c:528 msgid "Read only file!" msgstr "" -#: src/commands.c:677 src/commands.c:742 +#: src/commands.c:567 src/commands.c:637 msgid "Error saving file!" msgstr "" -#: src/commands.c:706 +#: src/commands.c:597 #, c-format msgid "Save %s As..." msgstr "" -#: src/commands.c:774 +#: src/commands.c:670 #, c-format msgid "Save %s As ..." msgstr "" -#: src/commands.c:859 +#: src/commands.c:756 #, c-format msgid "" "Are you sure you wish to revert all changes?\n" "(%s)" msgstr "" -#: src/commands.c:907 +#: src/commands.c:804 msgid "Document Unchanged..." msgstr "" -#: src/commands.c:911 +#: src/commands.c:808 msgid "Document Unsaved..." msgstr "" -#: src/commands.c:1102 +#: src/commands.c:991 #, fuzzy msgid "_File/" msgstr "Soubor" -#: src/commands.c:1111 src/commands.c:1112 +#: src/commands.c:1000 src/commands.c:1001 #, fuzzy msgid "_File" msgstr "Soubor" @@ -83,11 +83,11 @@ msgstr "Soubor" msgid "With special thanks to:" msgstr "" -#: src/gE_about.c:49 +#: src/gE_about.c:47 msgid "(C) 1998, 1999 Alex Roberts and Evan Lawrence" msgstr "" -#: src/gE_about.c:51 +#: src/gE_about.c:49 msgid "gEdit is a small and lightweight text editor for GNOME/Gtk+" msgstr "" @@ -152,7 +152,7 @@ msgstr "" msgid "Remove view of the document" msgstr "" -#: src/gE_mdi.c:484 +#: src/gE_mdi.c:482 #, c-format msgid " '%s' has been modified. Do you wish to save it?" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gedit-0.5.5\n" -"POT-Creation-Date: 1999-09-11 23:29+0200\n" +"POT-Creation-Date: 1999-10-05 21:46+0100\n" "PO-Revision-Date: 1999-09-03 22:33+0100\n" "Last-Translator: Kenneth Christiansen <kenneth@ripen.dk>\n" "Language-Team: Dansk/Danish <sslug-locale@sslug.dk>\n" @@ -31,33 +31,33 @@ msgstr "Docid er %ld.\n" msgid "Shell" msgstr "Skal" -#: src/commands.c:215 +#: src/commands.c:93 msgid "Could not save file!" msgstr "Kunne ikke gemme fil!" -#: src/commands.c:550 +#: src/commands.c:426 msgid "Open File..." msgstr "Åbn fil..." -#: src/commands.c:603 src/commands.c:645 +#: src/commands.c:480 src/commands.c:528 msgid "Read only file!" msgstr "Skrivebeskyttet fil!" -#: src/commands.c:677 src/commands.c:742 +#: src/commands.c:567 src/commands.c:637 msgid "Error saving file!" msgstr "Gemning mislykkedes!" -#: src/commands.c:706 +#: src/commands.c:597 #, c-format msgid "Save %s As..." msgstr "Gem %s som..." -#: src/commands.c:774 +#: src/commands.c:670 #, c-format msgid "Save %s As ..." msgstr "Gem %s som..." -#: src/commands.c:859 +#: src/commands.c:756 #, c-format msgid "" "Are you sure you wish to revert all changes?\n" @@ -66,19 +66,19 @@ msgstr "" "Er du sikker på at du vil forkaste alle ændringer?\n" "(%s)" -#: src/commands.c:907 +#: src/commands.c:804 msgid "Document Unchanged..." msgstr "Dokument er uændret..." -#: src/commands.c:911 +#: src/commands.c:808 msgid "Document Unsaved..." msgstr "Dokument er ugemt..." -#: src/commands.c:1102 +#: src/commands.c:991 msgid "_File/" msgstr "_Filer/" -#: src/commands.c:1111 src/commands.c:1112 +#: src/commands.c:1000 src/commands.c:1001 msgid "_File" msgstr "_Filer" @@ -86,11 +86,11 @@ msgstr "_Filer" msgid "With special thanks to:" msgstr "Med særlig tak til:" -#: src/gE_about.c:49 +#: src/gE_about.c:47 msgid "(C) 1998, 1999 Alex Roberts and Evan Lawrence" msgstr "Ophavsret (C) 1998, 1999 Alex Roberts og Evan Lawrence" -#: src/gE_about.c:51 +#: src/gE_about.c:49 msgid "gEdit is a small and lightweight text editor for GNOME/Gtk+" msgstr "gEdit er en lille og hurtig teksteditor for GNOME/Gtk+" @@ -123,39 +123,39 @@ msgstr "Udskriv" msgid "Open (swap) .c/.h file" msgstr "Åbn (ombyt) .c/.h fil" -#: src/gE_mdi.c:69 +#: src/gE_mdi.c:76 msgid "Find _Line..." msgstr "Find _linie..." -#: src/gE_mdi.c:70 +#: src/gE_mdi.c:77 msgid "Search for a line" msgstr "Søg efter en linie" -#: src/gE_mdi.c:75 +#: src/gE_mdi.c:82 msgid "Find _In Files..." msgstr "Find _i filer..." -#: src/gE_mdi.c:76 +#: src/gE_mdi.c:83 msgid "Find text in all open files" msgstr "Find tekst i alle åbne filer" -#: src/gE_mdi.c:91 +#: src/gE_mdi.c:98 msgid "_Add View" msgstr "_Tilføj visning" -#: src/gE_mdi.c:92 +#: src/gE_mdi.c:99 msgid "Add a new view of the document" msgstr "Tilføj ny visning af dokumentet" -#: src/gE_mdi.c:93 +#: src/gE_mdi.c:100 msgid "_Remove View" msgstr "Fje_rn visning" -#: src/gE_mdi.c:94 +#: src/gE_mdi.c:101 msgid "Remove view of the document" msgstr "Fjern visning af dokumentet" -#: src/gE_mdi.c:468 +#: src/gE_mdi.c:482 #, c-format msgid " '%s' has been modified. Do you wish to save it?" msgstr " '%s' er blevet ændret. Ønsker du at gemme det?" @@ -505,19 +505,19 @@ msgstr "_Gem indstillinger" msgid "Save the current settings for future sessions" msgstr "Gem nuværende indstillinger for fremtidigt brug" -#: src/search.c:381 +#: src/search.c:412 msgid "Find In Files" msgstr "Find i filer" -#: src/search.c:382 src/search.c:716 +#: src/search.c:413 src/search.c:860 msgid "Search" msgstr "Søg" -#: src/search.c:386 src/search.c:721 src/search.c:749 +#: src/search.c:417 src/search.c:865 src/search.c:893 msgid "Search for:" msgstr "Søg efter:" -#: src/search.c:622 +#: src/search.c:766 #, c-format msgid "" "Total Lines: %i\n" @@ -526,51 +526,51 @@ msgstr "" "Linier ialt: %i\n" "Aktuel linie: %i" -#: src/search.c:644 +#: src/search.c:788 msgid "Go to line" msgstr "Gå til linie" -#: src/search.c:654 +#: src/search.c:798 msgid "Line number" msgstr "Linienummer" -#: src/search.c:677 +#: src/search.c:821 msgid "Search from cursor" msgstr "Søg fra markøren" -#: src/search.c:684 +#: src/search.c:828 msgid "Search from beginning of document" msgstr "Søg fra begyndelsen af dokumentet" -#: src/search.c:691 +#: src/search.c:835 msgid "Search from end of document" msgstr "Søg fra slutningen af dokumentet" -#: src/search.c:698 +#: src/search.c:842 msgid "Case sensitive" msgstr "Forskel på små og store bogstaver" -#: src/search.c:704 +#: src/search.c:848 msgid "Reverse search" msgstr "Baglæns søgning" -#: src/search.c:743 src/search.c:744 +#: src/search.c:887 src/search.c:888 msgid "Replace" msgstr "Erstat" -#: src/search.c:745 +#: src/search.c:889 msgid "Replace all" msgstr "Erstat alle" -#: src/search.c:759 +#: src/search.c:903 msgid "Replace with:" msgstr "Erstat med:" -#: src/search.c:770 +#: src/search.c:914 msgid "Ask before replacing" msgstr "Spørg før erstatning" -#: src/search.c:969 +#: src/search.c:1113 msgid "Replace?" msgstr "Erstat?" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gedit-0.5.5\n" -"POT-Creation-Date: 1999-09-13 19:55+0100\n" +"POT-Creation-Date: 1999-10-05 21:46+0100\n" "PO-Revision-Date: 1999-08-09 16:15+02:00\n" "Last-Translator: Matthias Warkus <mawa@iname.com>\n" "Language-Team: Matthias Warkus <mawa@iname.com>\n" @@ -30,33 +30,33 @@ msgstr "Dokument-ID ist %ld.\n" msgid "Shell" msgstr "Shell" -#: src/commands.c:215 +#: src/commands.c:93 msgid "Could not save file!" msgstr "" -#: src/commands.c:550 +#: src/commands.c:426 msgid "Open File..." msgstr "Datei öffnen..." -#: src/commands.c:603 src/commands.c:645 +#: src/commands.c:480 src/commands.c:528 msgid "Read only file!" msgstr "Schreibgeschützte datei!" -#: src/commands.c:677 src/commands.c:742 +#: src/commands.c:567 src/commands.c:637 msgid "Error saving file!" msgstr "Fehler beim Speichern der Datei!" -#: src/commands.c:706 +#: src/commands.c:597 #, fuzzy, c-format msgid "Save %s As..." msgstr "Speichern unter..." -#: src/commands.c:774 +#: src/commands.c:670 #, fuzzy, c-format msgid "Save %s As ..." msgstr "Speichern unter..." -#: src/commands.c:859 +#: src/commands.c:756 #, c-format msgid "" "Are you sure you wish to revert all changes?\n" @@ -65,19 +65,19 @@ msgstr "" "Sind Sie sicher, daß Sie alle Änderungen verwerfen wollen?\n" "(%s)" -#: src/commands.c:907 +#: src/commands.c:804 msgid "Document Unchanged..." msgstr "Dokument ungesichert..." -#: src/commands.c:911 +#: src/commands.c:808 msgid "Document Unsaved..." msgstr "Dokument ungesichert..." -#: src/commands.c:1102 +#: src/commands.c:991 msgid "_File/" msgstr "_Datei/" -#: src/commands.c:1111 src/commands.c:1112 +#: src/commands.c:1000 src/commands.c:1001 msgid "_File" msgstr "_Datei" @@ -85,11 +85,11 @@ msgstr "_Datei" msgid "With special thanks to:" msgstr "Besonderer Dank an:" -#: src/gE_about.c:49 +#: src/gE_about.c:47 msgid "(C) 1998, 1999 Alex Roberts and Evan Lawrence" msgstr "(C) 1998, 1999 Alex Roberts und Evan Lawrence" -#: src/gE_about.c:51 +#: src/gE_about.c:49 msgid "gEdit is a small and lightweight text editor for GNOME/Gtk+" msgstr "gEdit ist ein kleiner und handlicher Texteditor für GNOME/Gtk+" @@ -155,7 +155,7 @@ msgstr "Ansicht entfernen" msgid "Remove view of the document" msgstr "Ansicht auf das Dokument entfernen" -#: src/gE_mdi.c:484 +#: src/gE_mdi.c:482 #, c-format msgid " '%s' has been modified. Do you wish to save it?" msgstr " `%s' wurde geändert. Wollen Sie es speichern?" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gedit-0.5.5\n" -"POT-Creation-Date: 1999-09-13 19:55+0100\n" +"POT-Creation-Date: 1999-10-05 21:46+0100\n" "PO-Revision-Date: 1999-01-13 12:44+0100\n" "Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n" "Language-Team: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n" @@ -32,33 +32,33 @@ msgstr "Docid es %ld.\n" msgid "Shell" msgstr "Shell" -#: src/commands.c:215 +#: src/commands.c:93 msgid "Could not save file!" msgstr "¡No pude guardar el archivo!" -#: src/commands.c:550 +#: src/commands.c:426 msgid "Open File..." msgstr "Abrir un Archivo..." -#: src/commands.c:603 src/commands.c:645 +#: src/commands.c:480 src/commands.c:528 msgid "Read only file!" msgstr "¡Archivo en solo lectura!" -#: src/commands.c:677 src/commands.c:742 +#: src/commands.c:567 src/commands.c:637 msgid "Error saving file!" msgstr "¡Error al guardar el archivo!" -#: src/commands.c:706 +#: src/commands.c:597 #, c-format msgid "Save %s As..." msgstr "Guardar %s como..." -#: src/commands.c:774 +#: src/commands.c:670 #, c-format msgid "Save %s As ..." msgstr "Guardar %d como..." -#: src/commands.c:859 +#: src/commands.c:756 #, c-format msgid "" "Are you sure you wish to revert all changes?\n" @@ -67,19 +67,19 @@ msgstr "" "¿Está seguro que desea deshacer todos los cambios?\n" "(%s)" -#: src/commands.c:907 +#: src/commands.c:804 msgid "Document Unchanged..." msgstr "Documento no modificado..." -#: src/commands.c:911 +#: src/commands.c:808 msgid "Document Unsaved..." msgstr "Documento no guardado..." -#: src/commands.c:1102 +#: src/commands.c:991 msgid "_File/" msgstr "_Archivo/" -#: src/commands.c:1111 src/commands.c:1112 +#: src/commands.c:1000 src/commands.c:1001 msgid "_File" msgstr "_Archivo" @@ -87,11 +87,11 @@ msgstr "_Archivo" msgid "With special thanks to:" msgstr "Con agradecimientos especiales a:" -#: src/gE_about.c:49 +#: src/gE_about.c:47 msgid "(C) 1998, 1999 Alex Roberts and Evan Lawrence" msgstr "© 1998, 1999 Alex Roberts y Evan Lawrence" -#: src/gE_about.c:51 +#: src/gE_about.c:49 msgid "gEdit is a small and lightweight text editor for GNOME/Gtk+" msgstr "gEdit es un editor de texto pequeño y liviano para GNOME/Gtk+" @@ -156,7 +156,7 @@ msgstr "_Quitar vista" msgid "Remove view of the document" msgstr "Quitar una vista del documento" -#: src/gE_mdi.c:484 +#: src/gE_mdi.c:482 #, c-format msgid " '%s' has been modified. Do you wish to save it?" msgstr " '%s' fué modificado. ¿Desea guardarlo?" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gedit-0.5.5\n" -"POT-Creation-Date: 1999-09-13 19:55+0100\n" +"POT-Creation-Date: 1999-10-05 21:46+0100\n" "PO-Revision-Date: 1998-02-28 19:57+0100\n" "Last-Translator: Vincent Renardias <vincent@ldsol.com>\n" "Language-Team: Vincent Renardias <vincent@ldsol.com>\n" @@ -30,33 +30,33 @@ msgstr "Docid est %ld!\n" msgid "Shell" msgstr "Shell" -#: src/commands.c:215 +#: src/commands.c:93 msgid "Could not save file!" msgstr "Impossible d'enregistrer le fichier!" -#: src/commands.c:550 +#: src/commands.c:426 msgid "Open File..." msgstr "Ouvrir Fichier..." -#: src/commands.c:603 src/commands.c:645 +#: src/commands.c:480 src/commands.c:528 msgid "Read only file!" msgstr "Fichier en lecture seule!" -#: src/commands.c:677 src/commands.c:742 +#: src/commands.c:567 src/commands.c:637 msgid "Error saving file!" msgstr "Erreur lors de la sauvegarde du fichier!" -#: src/commands.c:706 +#: src/commands.c:597 #, c-format msgid "Save %s As..." msgstr "Enregistrer %s sous..." -#: src/commands.c:774 +#: src/commands.c:670 #, c-format msgid "Save %s As ..." msgstr "Enregistrer %s sous..." -#: src/commands.c:859 +#: src/commands.c:756 #, c-format msgid "" "Are you sure you wish to revert all changes?\n" @@ -65,19 +65,19 @@ msgstr "" "Voulez-vous vraiment annuler tous les changements?\n" "(%s)" -#: src/commands.c:907 +#: src/commands.c:804 msgid "Document Unchanged..." msgstr "Document non changé..." -#: src/commands.c:911 +#: src/commands.c:808 msgid "Document Unsaved..." msgstr "Document non sauvé..." -#: src/commands.c:1102 +#: src/commands.c:991 msgid "_File/" msgstr "_Fichier/" -#: src/commands.c:1111 src/commands.c:1112 +#: src/commands.c:1000 src/commands.c:1001 msgid "_File" msgstr "_Fichier" @@ -85,11 +85,11 @@ msgstr "_Fichier" msgid "With special thanks to:" msgstr "Remerciements spéciaux à:" -#: src/gE_about.c:49 +#: src/gE_about.c:47 msgid "(C) 1998, 1999 Alex Roberts and Evan Lawrence" msgstr "(C) 1998, 1999 Alex Roberts and Evan Lawrence" -#: src/gE_about.c:51 +#: src/gE_about.c:49 msgid "gEdit is a small and lightweight text editor for GNOME/Gtk+" msgstr "gEdit est un petit éditeur de texte pour GNOME/Gtk+" @@ -155,7 +155,7 @@ msgstr "Enleve_r vue" msgid "Remove view of the document" msgstr "Enlever la vue du document" -#: src/gE_mdi.c:484 +#: src/gE_mdi.c:482 #, c-format msgid " '%s' has been modified. Do you wish to save it?" msgstr " '%s' a été modifié. Voulez-vous l'enregistrer?" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: gedit-0.5.5\n" -"POT-Creation-Date: 1999-09-13 19:55+0100\n" +"POT-Creation-Date: 1999-10-05 21:46+0100\n" "PO-Revision-Date: 1999-08-09 20:17+0100\n" "Last-Translator: Unknown :-(\n" "Language-Team: \n" @@ -27,53 +27,53 @@ msgstr "" msgid "Shell" msgstr "" -#: src/commands.c:215 +#: src/commands.c:93 msgid "Could not save file!" msgstr "" -#: src/commands.c:550 +#: src/commands.c:426 msgid "Open File..." msgstr "" -#: src/commands.c:603 src/commands.c:645 +#: src/commands.c:480 src/commands.c:528 msgid "Read only file!" msgstr "" -#: src/commands.c:677 src/commands.c:742 +#: src/commands.c:567 src/commands.c:637 msgid "Error saving file!" msgstr "" -#: src/commands.c:706 +#: src/commands.c:597 #, fuzzy, c-format msgid "Save %s As..." msgstr "Sabhail" -#: src/commands.c:774 +#: src/commands.c:670 #, fuzzy, c-format msgid "Save %s As ..." msgstr "Sabhail" -#: src/commands.c:859 +#: src/commands.c:756 #, c-format msgid "" "Are you sure you wish to revert all changes?\n" "(%s)" msgstr "" -#: src/commands.c:907 +#: src/commands.c:804 msgid "Document Unchanged..." msgstr "" -#: src/commands.c:911 +#: src/commands.c:808 msgid "Document Unsaved..." msgstr "" -#: src/commands.c:1102 +#: src/commands.c:991 #, fuzzy msgid "_File/" msgstr "Comhad" -#: src/commands.c:1111 src/commands.c:1112 +#: src/commands.c:1000 src/commands.c:1001 #, fuzzy msgid "_File" msgstr "Comhad" @@ -82,11 +82,11 @@ msgstr "Comhad" msgid "With special thanks to:" msgstr "" -#: src/gE_about.c:49 +#: src/gE_about.c:47 msgid "(C) 1998, 1999 Alex Roberts and Evan Lawrence" msgstr "" -#: src/gE_about.c:51 +#: src/gE_about.c:49 msgid "gEdit is a small and lightweight text editor for GNOME/Gtk+" msgstr "" @@ -151,7 +151,7 @@ msgstr "" msgid "Remove view of the document" msgstr "" -#: src/gE_mdi.c:484 +#: src/gE_mdi.c:482 #, c-format msgid " '%s' has been modified. Do you wish to save it?" msgstr "" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: gedit-0.5.5\n" -"POT-Creation-Date: 1999-09-13 19:55+0100\n" +"POT-Creation-Date: 1999-10-05 21:46+0100\n" "PO-Revision-Date: 1999-08-09 20:17+0100\n" "Last-Translator: Unknown :-(\n" "Language-Team: \n" @@ -28,53 +28,53 @@ msgstr "" msgid "Shell" msgstr "" -#: src/commands.c:215 +#: src/commands.c:93 msgid "Could not save file!" msgstr "" -#: src/commands.c:550 +#: src/commands.c:426 msgid "Open File..." msgstr "" -#: src/commands.c:603 src/commands.c:645 +#: src/commands.c:480 src/commands.c:528 msgid "Read only file!" msgstr "" -#: src/commands.c:677 src/commands.c:742 +#: src/commands.c:567 src/commands.c:637 msgid "Error saving file!" msgstr "" -#: src/commands.c:706 +#: src/commands.c:597 #, fuzzy, c-format msgid "Save %s As..." msgstr "Salva" -#: src/commands.c:774 +#: src/commands.c:670 #, fuzzy, c-format msgid "Save %s As ..." msgstr "Salva" -#: src/commands.c:859 +#: src/commands.c:756 #, c-format msgid "" "Are you sure you wish to revert all changes?\n" "(%s)" msgstr "" -#: src/commands.c:907 +#: src/commands.c:804 msgid "Document Unchanged..." msgstr "" -#: src/commands.c:911 +#: src/commands.c:808 msgid "Document Unsaved..." msgstr "" -#: src/commands.c:1102 +#: src/commands.c:991 #, fuzzy msgid "_File/" msgstr "Archivio" -#: src/commands.c:1111 src/commands.c:1112 +#: src/commands.c:1000 src/commands.c:1001 #, fuzzy msgid "_File" msgstr "Archivio" @@ -83,11 +83,11 @@ msgstr "Archivio" msgid "With special thanks to:" msgstr "" -#: src/gE_about.c:49 +#: src/gE_about.c:47 msgid "(C) 1998, 1999 Alex Roberts and Evan Lawrence" msgstr "" -#: src/gE_about.c:51 +#: src/gE_about.c:49 msgid "gEdit is a small and lightweight text editor for GNOME/Gtk+" msgstr "" @@ -152,7 +152,7 @@ msgstr "" msgid "Remove view of the document" msgstr "" -#: src/gE_mdi.c:484 +#: src/gE_mdi.c:482 #, c-format msgid " '%s' has been modified. Do you wish to save it?" msgstr "" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gedit-0.5.5\n" -"POT-Creation-Date: 1999-09-13 19:55+0100\n" +"POT-Creation-Date: 1999-10-05 21:46+0100\n" "PO-Revision-Date: 1999-06-05 12:08+0900\n" "Last-Translator: Akira Higuchi <a-higuti@math.sci.hokudai.ac.jp>\n" "Language-Team: Japanese <LL@li.org>\n" @@ -30,52 +30,52 @@ msgstr "" msgid "Shell" msgstr "" -#: src/commands.c:215 +#: src/commands.c:93 msgid "Could not save file!" msgstr "" -#: src/commands.c:550 +#: src/commands.c:426 msgid "Open File..." msgstr "³«¤¯¥Õ¥¡¥¤¥ë̾..." -#: src/commands.c:603 src/commands.c:645 +#: src/commands.c:480 src/commands.c:528 msgid "Read only file!" msgstr "Æɤ߹þ¤ßÀìÍѤΥե¡¥¤¥ë¤Ç¤¹¡ª" -#: src/commands.c:677 src/commands.c:742 +#: src/commands.c:567 src/commands.c:637 msgid "Error saving file!" msgstr "ÊݸÃæ¤Ë¥¨¥é¡¼¤¬µ¯¤¤Þ¤·¤¿¡ª" -#: src/commands.c:706 +#: src/commands.c:597 #, fuzzy, c-format msgid "Save %s As..." msgstr "Êݸ¤¹¤ë¥Õ¥¡¥¤¥ë̾.." -#: src/commands.c:774 +#: src/commands.c:670 #, fuzzy, c-format msgid "Save %s As ..." msgstr "Êݸ¤¹¤ë¥Õ¥¡¥¤¥ë̾.." -#: src/commands.c:859 +#: src/commands.c:756 #, fuzzy, c-format msgid "" "Are you sure you wish to revert all changes?\n" "(%s)" msgstr "Êѹ¹¤òÁ´¤Æ¼è¤ê¾Ã¤·¤Æ¤¤¤¤¤Ç¤¹¤«¡©" -#: src/commands.c:907 +#: src/commands.c:804 msgid "Document Unchanged..." msgstr "¤³¤Îʸ½ñ¤ÏÊѹ¹¤µ¤ì¤Æ¤¤¤Þ¤»¤ó..." -#: src/commands.c:911 +#: src/commands.c:808 msgid "Document Unsaved..." msgstr "¤³¤Îʸ½ñ¤ÏÊݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó..." -#: src/commands.c:1102 +#: src/commands.c:991 msgid "_File/" msgstr "¥Õ¥¡¥¤¥ë(_F)/" -#: src/commands.c:1111 src/commands.c:1112 +#: src/commands.c:1000 src/commands.c:1001 msgid "_File" msgstr "¥Õ¥¡¥¤¥ë(_F)" @@ -83,11 +83,11 @@ msgstr "¥Õ¥¡¥¤¥ë(_F)" msgid "With special thanks to:" msgstr "" -#: src/gE_about.c:49 +#: src/gE_about.c:47 msgid "(C) 1998, 1999 Alex Roberts and Evan Lawrence" msgstr "" -#: src/gE_about.c:51 +#: src/gE_about.c:49 msgid "gEdit is a small and lightweight text editor for GNOME/Gtk+" msgstr "gEdit¤ÏGNOME/Gtk+ÍѤ˺î¤é¤ì¤¿¾®·¿·ÚÎ̤Υƥ¥¹¥È¥¨¥Ç¥£¥¿¤Ç¤¹" @@ -153,7 +153,7 @@ msgstr "¥Ó¥å¡¼¤òºï½ü" msgid "Remove view of the document" msgstr "ʸ½ñ¤Î¥Ó¥å¡¼¤òºï½ü¤¹¤ë" -#: src/gE_mdi.c:484 +#: src/gE_mdi.c:482 #, c-format msgid " '%s' has been modified. Do you wish to save it?" msgstr "'%s' ¤ÏÊѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Êݸ¤·¤Þ¤¹¤«¡©" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gedit-0.5.5\n" -"POT-Creation-Date: 1999-09-13 19:55+0100\n" +"POT-Creation-Date: 1999-10-05 21:46+0100\n" "PO-Revision-Date: 1999-06-09 13:27:10+0900\n" "Last-Translator: Sung-Hyun Nam <namsh@lgic.co.kr>\n" "Language-Team: Korean <ko@li.org>\n" @@ -30,53 +30,53 @@ msgstr "Docid´Â %ldÀÔ´Ï´Ù.\n" msgid "Shell" msgstr "½©" -#: src/commands.c:215 +#: src/commands.c:93 msgid "Could not save file!" msgstr "" -#: src/commands.c:550 +#: src/commands.c:426 msgid "Open File..." msgstr "ÆÄÀÏ ¿±â..." -#: src/commands.c:603 src/commands.c:645 +#: src/commands.c:480 src/commands.c:528 msgid "Read only file!" msgstr "Àбâ Àü¿ë ÆÄÀÏ!" -#: src/commands.c:677 src/commands.c:742 +#: src/commands.c:567 src/commands.c:637 msgid "Error saving file!" msgstr "ÆÄÀÏ ÀúÀå ¿¡·¯!" -#: src/commands.c:706 +#: src/commands.c:597 #, fuzzy, c-format msgid "Save %s As..." msgstr "´Ù¸¥ À̸§À¸·Î ÀúÀå..." -#: src/commands.c:774 +#: src/commands.c:670 #, fuzzy, c-format msgid "Save %s As ..." msgstr "´Ù¸¥ À̸§À¸·Î ÀúÀå..." -#: src/commands.c:859 +#: src/commands.c:756 #, fuzzy, c-format msgid "" "Are you sure you wish to revert all changes?\n" "(%s)" msgstr "Á¤¸»·Î ¸ðµç ¼öÁ¤À» Ãë¼ÒÇÏ°í ½ÍÀ¸¼¼¿ä?" -#: src/commands.c:907 +#: src/commands.c:804 msgid "Document Unchanged..." msgstr "¹®¼°¡ ¹Ù²îÁö ¾ÊÀ½..." -#: src/commands.c:911 +#: src/commands.c:808 msgid "Document Unsaved..." msgstr "¹®¼°¡ ÀúÀåµÇÁö ¾ÊÀ½..." -#: src/commands.c:1102 +#: src/commands.c:991 #, fuzzy msgid "_File/" msgstr "ÆÄÀÏ(_F)" -#: src/commands.c:1111 src/commands.c:1112 +#: src/commands.c:1000 src/commands.c:1001 msgid "_File" msgstr "ÆÄÀÏ(_F)" @@ -84,11 +84,11 @@ msgstr "ÆÄÀÏ(_F)" msgid "With special thanks to:" msgstr "With special thanks to:" -#: src/gE_about.c:49 +#: src/gE_about.c:47 msgid "(C) 1998, 1999 Alex Roberts and Evan Lawrence" msgstr "(C) 1998, 1999 Alex Roberts and Evan Lawrence" -#: src/gE_about.c:51 +#: src/gE_about.c:49 msgid "gEdit is a small and lightweight text editor for GNOME/Gtk+" msgstr "gEidtÀº ±×³ð/Gtk+¸¦ À§ÇÑ ÀÛ°í °¡º¯¿î ÅؽºÆ® ¿¡µðÅÍÀÔ´Ï´Ù." @@ -154,7 +154,7 @@ msgstr "º¸±ââ »èÁ¦(_R)" msgid "Remove view of the document" msgstr "¹®¼ÀÇ º¸±ââ »èÁ¦" -#: src/gE_mdi.c:484 +#: src/gE_mdi.c:482 #, c-format msgid " '%s' has been modified. Do you wish to save it?" msgstr " '%s'°¡ ¹Ù²î¾ú½À´Ï´Ù. ÀúÀåÇÒ±î¿ä?" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: gedit-0.5.5\n" -"POT-Creation-Date: 1999-09-13 19:55+0100\n" +"POT-Creation-Date: 1999-10-05 21:46+0100\n" "PO-Revision-Date: 1999-08-09 20:17+0100\n" "Last-Translator: Unknown :-(\n" "Language-Team: \n" @@ -28,54 +28,54 @@ msgstr "" msgid "Shell" msgstr "" -#: src/commands.c:215 +#: src/commands.c:93 msgid "Could not save file!" msgstr "" -#: src/commands.c:550 +#: src/commands.c:426 msgid "Open File..." msgstr "" -#: src/commands.c:603 src/commands.c:645 +#: src/commands.c:480 src/commands.c:528 msgid "Read only file!" msgstr "" -#: src/commands.c:677 src/commands.c:742 +#: src/commands.c:567 src/commands.c:637 msgid "Error saving file!" msgstr "" -#: src/commands.c:706 +#: src/commands.c:597 #, fuzzy, c-format msgid "Save %s As..." msgstr "Bewaren als.." -#: src/commands.c:774 +#: src/commands.c:670 #, fuzzy, c-format msgid "Save %s As ..." msgstr "Bewaren als.." -#: src/commands.c:859 +#: src/commands.c:756 #, c-format msgid "" "Are you sure you wish to revert all changes?\n" "(%s)" msgstr "" -#: src/commands.c:907 +#: src/commands.c:804 msgid "Document Unchanged..." msgstr "" -#: src/commands.c:911 +#: src/commands.c:808 #, fuzzy msgid "Document Unsaved..." msgstr "Document Tabs" -#: src/commands.c:1102 +#: src/commands.c:991 #, fuzzy msgid "_File/" msgstr "Bestand" -#: src/commands.c:1111 src/commands.c:1112 +#: src/commands.c:1000 src/commands.c:1001 msgid "_File" msgstr "Bestand" @@ -83,11 +83,11 @@ msgstr "Bestand" msgid "With special thanks to:" msgstr "" -#: src/gE_about.c:49 +#: src/gE_about.c:47 msgid "(C) 1998, 1999 Alex Roberts and Evan Lawrence" msgstr "" -#: src/gE_about.c:51 +#: src/gE_about.c:49 msgid "gEdit is a small and lightweight text editor for GNOME/Gtk+" msgstr "gEdit is een lichtgewicht text editor voor GNOME/Gtk" @@ -154,7 +154,7 @@ msgstr "" msgid "Remove view of the document" msgstr "" -#: src/gE_mdi.c:484 +#: src/gE_mdi.c:482 #, c-format msgid " '%s' has been modified. Do you wish to save it?" msgstr "" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gedit-0.5.5\n" -"POT-Creation-Date: 1999-09-14 00:26+0200\n" +"POT-Creation-Date: 1999-10-05 21:46+0100\n" "PO-Revision-Date: 1999-09-14 00:28+02:00\n" "Last-Translator: Kjartan Maraas <kmaraas@online.no>\n" "Language-Team: Norwegian <no@li.org>\n" @@ -30,33 +30,33 @@ msgstr "Dokid er %ld.\n" msgid "Shell" msgstr "Skall" -#: src/commands.c:215 +#: src/commands.c:93 msgid "Could not save file!" msgstr "Kunne ikke lagre filen!" -#: src/commands.c:550 +#: src/commands.c:426 msgid "Open File..." msgstr "Åpne Fil..." -#: src/commands.c:603 src/commands.c:645 +#: src/commands.c:480 src/commands.c:528 msgid "Read only file!" msgstr "Skrivebeskyttet fil!" -#: src/commands.c:677 src/commands.c:742 +#: src/commands.c:567 src/commands.c:637 msgid "Error saving file!" msgstr "Feil under lagring av fil!" -#: src/commands.c:706 +#: src/commands.c:597 #, c-format msgid "Save %s As..." msgstr "Lagre %s som..." -#: src/commands.c:774 +#: src/commands.c:670 #, c-format msgid "Save %s As ..." msgstr "Lagre %s som ..." -#: src/commands.c:859 +#: src/commands.c:756 #, c-format msgid "" "Are you sure you wish to revert all changes?\n" @@ -65,19 +65,19 @@ msgstr "" "Er du sikker på at du ønsker å forkaste alle endringer?\n" "(%s)" -#: src/commands.c:907 +#: src/commands.c:804 msgid "Document Unchanged..." msgstr "Dokumentet er uendret..." -#: src/commands.c:911 +#: src/commands.c:808 msgid "Document Unsaved..." msgstr "Dokumentet er ikke lagret..." -#: src/commands.c:1102 +#: src/commands.c:991 msgid "_File/" msgstr "_Fil/" -#: src/commands.c:1111 src/commands.c:1112 +#: src/commands.c:1000 src/commands.c:1001 msgid "_File" msgstr "_Fil" @@ -85,11 +85,11 @@ msgstr "_Fil" msgid "With special thanks to:" msgstr "Med spesiell takk til:" -#: src/gE_about.c:49 +#: src/gE_about.c:47 msgid "(C) 1998, 1999 Alex Roberts and Evan Lawrence" msgstr "(C) 1998, 1999 Alex Roberts og Evan Lawrence" -#: src/gE_about.c:51 +#: src/gE_about.c:49 msgid "gEdit is a small and lightweight text editor for GNOME/Gtk+" msgstr "gEdit er en liten lettvekt tekst editor for GNOME/Gtk+" @@ -154,7 +154,7 @@ msgstr "Fje_rn visning" msgid "Remove view of the document" msgstr "Fjern visning for dokumentet" -#: src/gE_mdi.c:484 +#: src/gE_mdi.c:482 #, c-format msgid " '%s' has been modified. Do you wish to save it?" msgstr " '%s' er endret. Vil du lagre det?" @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: gedit-0.5.5\n" -"POT-Creation-Date: 1999-09-13 19:55+0100\n" +"POT-Creation-Date: 1999-10-05 21:46+0100\n" "PO-Revision-Date: 1999-08-09 20:17+0100\n" "Last-Translator: Unknown :-(\n" "Language-Team: \n" @@ -31,52 +31,52 @@ msgstr "Docid é %ld.\n" msgid "Shell" msgstr "" -#: src/commands.c:215 +#: src/commands.c:93 msgid "Could not save file!" msgstr "" -#: src/commands.c:550 +#: src/commands.c:426 msgid "Open File..." msgstr "Abrir Arquivo..." -#: src/commands.c:603 src/commands.c:645 +#: src/commands.c:480 src/commands.c:528 msgid "Read only file!" msgstr "Arquivo somente para leitura!" -#: src/commands.c:677 src/commands.c:742 +#: src/commands.c:567 src/commands.c:637 msgid "Error saving file!" msgstr "Erro salvando arquivo!" -#: src/commands.c:706 +#: src/commands.c:597 #, fuzzy, c-format msgid "Save %s As..." msgstr "Gravar como" -#: src/commands.c:774 +#: src/commands.c:670 #, fuzzy, c-format msgid "Save %s As ..." msgstr "Gravar como" -#: src/commands.c:859 +#: src/commands.c:756 #, fuzzy, c-format msgid "" "Are you sure you wish to revert all changes?\n" "(%s)" msgstr "Você tem certeza que quer voltar atrás em todas as mudanças?" -#: src/commands.c:907 +#: src/commands.c:804 msgid "Document Unchanged..." msgstr "Documento não foi modifico..." -#: src/commands.c:911 +#: src/commands.c:808 msgid "Document Unsaved..." msgstr "Documento não foi salvo..." -#: src/commands.c:1102 +#: src/commands.c:991 msgid "_File/" msgstr "_Ficheiro/" -#: src/commands.c:1111 src/commands.c:1112 +#: src/commands.c:1000 src/commands.c:1001 msgid "_File" msgstr "_Ficheiro" @@ -84,11 +84,11 @@ msgstr "_Ficheiro" msgid "With special thanks to:" msgstr "Com agradecimentos especiais para:" -#: src/gE_about.c:49 +#: src/gE_about.c:47 msgid "(C) 1998, 1999 Alex Roberts and Evan Lawrence" msgstr "" -#: src/gE_about.c:51 +#: src/gE_about.c:49 msgid "gEdit is a small and lightweight text editor for GNOME/Gtk+" msgstr "gEdit é um editor de texto pequeno e leve para GNOME/Gtk+" @@ -154,7 +154,7 @@ msgstr "_Remover Visão" msgid "Remove view of the document" msgstr "Remover visão do documento" -#: src/gE_mdi.c:484 +#: src/gE_mdi.c:482 #, c-format msgid " '%s' has been modified. Do you wish to save it?" msgstr "'%s' foi modificado. Você desejá salvá-lo?" diff --git a/po/pt_BR.po b/po/pt_BR.po index e11a8733b..5593541a7 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gedit-0.5.5\n" -"POT-Creation-Date: 1999-09-13 19:55+0100\n" +"POT-Creation-Date: 1999-10-05 21:46+0100\n" "PO-Revision-Date: 1999-05-18 20:00-0300\n" "Last-Translator: Frederic L.W.Meunier <linux@urbi.com.br>\n" "Language-Team: pt_BR <pt_BR@li.org>\n" @@ -30,53 +30,53 @@ msgstr "Docid é %ld.\n" msgid "Shell" msgstr "" -#: src/commands.c:215 +#: src/commands.c:93 msgid "Could not save file!" msgstr "" -#: src/commands.c:550 +#: src/commands.c:426 msgid "Open File..." msgstr "Abrir Arquivo..." -#: src/commands.c:603 src/commands.c:645 +#: src/commands.c:480 src/commands.c:528 msgid "Read only file!" msgstr "Arquivo somente para leitura!" -#: src/commands.c:677 src/commands.c:742 +#: src/commands.c:567 src/commands.c:637 msgid "Error saving file!" msgstr "Erro salvando arquivo!" -#: src/commands.c:706 +#: src/commands.c:597 #, fuzzy, c-format msgid "Save %s As..." msgstr "Salvar como..." -#: src/commands.c:774 +#: src/commands.c:670 #, fuzzy, c-format msgid "Save %s As ..." msgstr "Salvar como..." -#: src/commands.c:859 +#: src/commands.c:756 #, fuzzy, c-format msgid "" "Are you sure you wish to revert all changes?\n" "(%s)" msgstr "Você tem certeza que quer voltar atrás em todas as mudanças?" -#: src/commands.c:907 +#: src/commands.c:804 msgid "Document Unchanged..." msgstr "Documento não foi modifico..." -#: src/commands.c:911 +#: src/commands.c:808 msgid "Document Unsaved..." msgstr "Documento não foi salvo..." -#: src/commands.c:1102 +#: src/commands.c:991 #, fuzzy msgid "_File/" msgstr "_Arquivo" -#: src/commands.c:1111 src/commands.c:1112 +#: src/commands.c:1000 src/commands.c:1001 msgid "_File" msgstr "_Arquivo" @@ -84,11 +84,11 @@ msgstr "_Arquivo" msgid "With special thanks to:" msgstr "Com agradecimentos especiais para:" -#: src/gE_about.c:49 +#: src/gE_about.c:47 msgid "(C) 1998, 1999 Alex Roberts and Evan Lawrence" msgstr "" -#: src/gE_about.c:51 +#: src/gE_about.c:49 msgid "gEdit is a small and lightweight text editor for GNOME/Gtk+" msgstr "gEdit é um pequeno e leve editor de texto para o GNOME/Gtk+" @@ -154,7 +154,7 @@ msgstr "_Remover Visão" msgid "Remove view of the document" msgstr "Remover visão do documento" -#: src/gE_mdi.c:484 +#: src/gE_mdi.c:482 #, c-format msgid " '%s' has been modified. Do you wish to save it?" msgstr "'%s' foi modificado. Você desejá salvá-lo?" @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: gedit-0.5.5\n" -"POT-Creation-Date: 1999-09-13 19:55+0100\n" +"POT-Creation-Date: 1999-10-05 21:46+0100\n" "PO-Revision-Date: 1998-11-18 14:49:47+0100\n" "Last-Translator: Martin Baulig,,,, <norwegen@voyager.uni-trier.de>\n" "Language-Team: \n" @@ -28,54 +28,54 @@ msgstr "" msgid "Shell" msgstr "" -#: src/commands.c:215 +#: src/commands.c:93 msgid "Could not save file!" msgstr "" -#: src/commands.c:550 +#: src/commands.c:426 msgid "Open File..." msgstr "" -#: src/commands.c:603 src/commands.c:645 +#: src/commands.c:480 src/commands.c:528 msgid "Read only file!" msgstr "" -#: src/commands.c:677 src/commands.c:742 +#: src/commands.c:567 src/commands.c:637 msgid "Error saving file!" msgstr "" -#: src/commands.c:706 +#: src/commands.c:597 #, fuzzy, c-format msgid "Save %s As..." msgstr "óÏÈÒÁÎÉÔØ ËÁË" -#: src/commands.c:774 +#: src/commands.c:670 #, fuzzy, c-format msgid "Save %s As ..." msgstr "óÏÈÒÁÎÉÔØ ËÁË" -#: src/commands.c:859 +#: src/commands.c:756 #, c-format msgid "" "Are you sure you wish to revert all changes?\n" "(%s)" msgstr "" -#: src/commands.c:907 +#: src/commands.c:804 msgid "Document Unchanged..." msgstr "" -#: src/commands.c:911 +#: src/commands.c:808 #, fuzzy msgid "Document Unsaved..." msgstr "òÕÞËÉ äÏËÕÍÅÎÔÏ×" -#: src/commands.c:1102 +#: src/commands.c:991 #, fuzzy msgid "_File/" msgstr "æÁÊÌ" -#: src/commands.c:1111 src/commands.c:1112 +#: src/commands.c:1000 src/commands.c:1001 #, fuzzy msgid "_File" msgstr "æÁÊÌ" @@ -84,11 +84,11 @@ msgstr "æÁÊÌ" msgid "With special thanks to:" msgstr "" -#: src/gE_about.c:49 +#: src/gE_about.c:47 msgid "(C) 1998, 1999 Alex Roberts and Evan Lawrence" msgstr "" -#: src/gE_about.c:51 +#: src/gE_about.c:49 msgid "gEdit is a small and lightweight text editor for GNOME/Gtk+" msgstr "gEdit -- ÍÁÌÅÎØËÉÊ É ÌÅÇËÉÊ ÔÅËÓÔÏ×ÙÊ ÒÅÄÁËÔÏÒ ÄÌÑ GNOME/Gtk+" @@ -155,7 +155,7 @@ msgstr "" msgid "Remove view of the document" msgstr "" -#: src/gE_mdi.c:484 +#: src/gE_mdi.c:482 #, c-format msgid " '%s' has been modified. Do you wish to save it?" msgstr "" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gedit-0.5.5\n" -"POT-Creation-Date: 1999-09-13 19:55+0100\n" +"POT-Creation-Date: 1999-10-05 21:46+0100\n" "PO-Revision-Date: 1999-09-07 04:20+0200\n" "Last-Translator: Martin Wahlen <mva@sslug.dk>\n" "Language-Team: Swedish <sv@li.org>\n" @@ -30,33 +30,33 @@ msgstr "Dokid't är %ld.\n" msgid "Shell" msgstr "Skal" -#: src/commands.c:215 +#: src/commands.c:93 msgid "Could not save file!" msgstr "" -#: src/commands.c:550 +#: src/commands.c:426 msgid "Open File..." msgstr "Öppna fil..." -#: src/commands.c:603 src/commands.c:645 +#: src/commands.c:480 src/commands.c:528 msgid "Read only file!" msgstr "Skrivskyddad fil!" -#: src/commands.c:677 src/commands.c:742 +#: src/commands.c:567 src/commands.c:637 msgid "Error saving file!" msgstr "Fel vid sparning av fil!" -#: src/commands.c:706 +#: src/commands.c:597 #, fuzzy, c-format msgid "Save %s As..." msgstr "Spara som..." -#: src/commands.c:774 +#: src/commands.c:670 #, fuzzy, c-format msgid "Save %s As ..." msgstr "Spara som..." -#: src/commands.c:859 +#: src/commands.c:756 #, c-format msgid "" "Are you sure you wish to revert all changes?\n" @@ -65,19 +65,19 @@ msgstr "" "Är du säker att du vill ångra alla förändringar?\n" "(%s)" -#: src/commands.c:907 +#: src/commands.c:804 msgid "Document Unchanged..." msgstr "Dokument oförändrat..." -#: src/commands.c:911 +#: src/commands.c:808 msgid "Document Unsaved..." msgstr "Dokument ej sparat..." -#: src/commands.c:1102 +#: src/commands.c:991 msgid "_File/" msgstr "_Arkiv/" -#: src/commands.c:1111 src/commands.c:1112 +#: src/commands.c:1000 src/commands.c:1001 msgid "_File" msgstr "_Arkiv" @@ -85,11 +85,11 @@ msgstr "_Arkiv" msgid "With special thanks to:" msgstr "Med extra tack till:" -#: src/gE_about.c:49 +#: src/gE_about.c:47 msgid "(C) 1998, 1999 Alex Roberts and Evan Lawrence" msgstr "(C) 1998, 1999 Alex Roberts och Evan Lawrence" -#: src/gE_about.c:51 +#: src/gE_about.c:49 msgid "gEdit is a small and lightweight text editor for GNOME/Gtk+" msgstr "gEdit är en liten och tunn texteditor för GNOME/Gtk+" @@ -155,7 +155,7 @@ msgstr "_Ta bort vy" msgid "Remove view of the document" msgstr "Tar bort en vy av dokumentet" -#: src/gE_mdi.c:484 +#: src/gE_mdi.c:482 #, c-format msgid " '%s' has been modified. Do you wish to save it?" msgstr " '%s' har ändrats. Vill du spara den?" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gedit 0.5.5\n" -"POT-Creation-Date: 1999-09-13 19:55+0100\n" +"POT-Creation-Date: 1999-10-05 21:46+0100\n" "PO-Revision-Date: 1999-03-18 23:11+0100\n" "Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n" "Language-Team: walon <linux-wa@chanae.alphanet.ch>\n" @@ -35,52 +35,52 @@ msgstr "Li docid est %ld.\n" msgid "Shell" msgstr "Shell" -#: src/commands.c:215 +#: src/commands.c:93 msgid "Could not save file!" msgstr "" -#: src/commands.c:550 +#: src/commands.c:426 msgid "Open File..." msgstr "Drovî on fitchî..." -#: src/commands.c:603 src/commands.c:645 +#: src/commands.c:480 src/commands.c:528 msgid "Read only file!" msgstr "" -#: src/commands.c:677 src/commands.c:742 +#: src/commands.c:567 src/commands.c:637 msgid "Error saving file!" msgstr "" -#: src/commands.c:706 +#: src/commands.c:597 #, c-format msgid "Save %s As..." msgstr "Schaper èt rlomer %s..." -#: src/commands.c:774 +#: src/commands.c:670 #, c-format msgid "Save %s As ..." msgstr "Schaper èt rlomer %s..." -#: src/commands.c:859 +#: src/commands.c:756 #, c-format msgid "" "Are you sure you wish to revert all changes?\n" "(%s)" msgstr "" -#: src/commands.c:907 +#: src/commands.c:804 msgid "Document Unchanged..." msgstr "Documint nén candji..." -#: src/commands.c:911 +#: src/commands.c:808 msgid "Document Unsaved..." msgstr "Documint nén schapé..." -#: src/commands.c:1102 +#: src/commands.c:991 msgid "_File/" msgstr "_Fitchî/" -#: src/commands.c:1111 src/commands.c:1112 +#: src/commands.c:1000 src/commands.c:1001 msgid "_File" msgstr "_Fitchî" @@ -88,11 +88,11 @@ msgstr "_Fitchî" msgid "With special thanks to:" msgstr "Gråces tot speciålmint a:" -#: src/gE_about.c:49 +#: src/gE_about.c:47 msgid "(C) 1998, 1999 Alex Roberts and Evan Lawrence" msgstr "© 1998, 1999 Alex Roberts eyèt Evan Lawrence" -#: src/gE_about.c:51 +#: src/gE_about.c:49 msgid "gEdit is a small and lightweight text editor for GNOME/Gtk+" msgstr "gEdit est on pitit èt ahessåve aspougneu di tekse po GNOME/Gtk+" @@ -157,7 +157,7 @@ msgstr "_Bodjî vuwe" msgid "Remove view of the document" msgstr "Bodjî ene vuwe foû do documint" -#: src/gE_mdi.c:484 +#: src/gE_mdi.c:482 #, c-format msgid " '%s' has been modified. Do you wish to save it?" msgstr " '%s' a sti candji. Voloz-ve li schaper ?" diff --git a/po/zh_TW.Big5.po b/po/zh_TW.Big5.po index 16a673357..05806f30d 100644 --- a/po/zh_TW.Big5.po +++ b/po/zh_TW.Big5.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: gedit-0.5.5\n" -"POT-Creation-Date: 1999-09-13 19:55+0100\n" +"POT-Creation-Date: 1999-10-05 21:46+0100\n" "PO-Revision-Date: 1999-02-12 20:21+0800\n" "Last-Translator: Cd Chen <cdchen@mail.about.net.tw>\n" "Language-Team: Chinese <zh@li.org>\n" @@ -29,55 +29,55 @@ msgstr "¤å¥ó§Ç¸¹ %ld.\n" msgid "Shell" msgstr "" -#: src/commands.c:215 +#: src/commands.c:93 msgid "Could not save file!" msgstr "" -#: src/commands.c:550 +#: src/commands.c:426 #, fuzzy msgid "Open File..." msgstr "¶}±Ò¤@ÓÀÉ®×" -#: src/commands.c:603 src/commands.c:645 +#: src/commands.c:480 src/commands.c:528 msgid "Read only file!" msgstr "" -#: src/commands.c:677 src/commands.c:742 +#: src/commands.c:567 src/commands.c:637 msgid "Error saving file!" msgstr "" -#: src/commands.c:706 +#: src/commands.c:597 #, fuzzy, c-format msgid "Save %s As..." msgstr " Àx¦s " -#: src/commands.c:774 +#: src/commands.c:670 #, fuzzy, c-format msgid "Save %s As ..." msgstr " Àx¦s " -#: src/commands.c:859 +#: src/commands.c:756 #, c-format msgid "" "Are you sure you wish to revert all changes?\n" "(%s)" msgstr "" -#: src/commands.c:907 +#: src/commands.c:804 msgid "Document Unchanged..." msgstr "" -#: src/commands.c:911 +#: src/commands.c:808 #, fuzzy msgid "Document Unsaved..." msgstr "¤å¥ó©w¦ì(_D)" -#: src/commands.c:1102 +#: src/commands.c:991 #, fuzzy msgid "_File/" msgstr "ÀÉ®×(_F)" -#: src/commands.c:1111 src/commands.c:1112 +#: src/commands.c:1000 src/commands.c:1001 msgid "_File" msgstr "ÀÉ®×(_F)" @@ -85,11 +85,11 @@ msgstr "ÀÉ®×(_F)" msgid "With special thanks to:" msgstr "" -#: src/gE_about.c:49 +#: src/gE_about.c:47 msgid "(C) 1998, 1999 Alex Roberts and Evan Lawrence" msgstr "" -#: src/gE_about.c:51 +#: src/gE_about.c:49 msgid "gEdit is a small and lightweight text editor for GNOME/Gtk+" msgstr "gEdiit ¬O¤@Ó GNOME/Gtk+ ªº¤p«¬»´¶q¯Åªº¤å¦r½s¿è¾¹" @@ -155,7 +155,7 @@ msgstr "" msgid "Remove view of the document" msgstr "" -#: src/gE_mdi.c:484 +#: src/gE_mdi.c:482 #, c-format msgid " '%s' has been modified. Do you wish to save it?" msgstr "" diff --git a/src/Makefile.am b/src/Makefile.am index 98863730b..99e537a8d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,6 +4,9 @@ appicondir=$(datadir)/pixmaps appicon_DATA = gnome-gedit.png +applogodir=$(datadir)/pixmaps +applogo_DATA = gedit-logo.png + INCLUDES = -I$(includedir) -I$(top_srcdir) \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ diff --git a/src/commands.c b/src/commands.c index 4bb4bfca1..027940a52 100644 --- a/src/commands.c +++ b/src/commands.c @@ -467,7 +467,7 @@ void file_save_cb(GtkWidget *widget, gpointer cbdata) if (doc->changed) { - fname = doc->filename; + fname = g_strdup (doc->filename); if (fname == NULL) { @@ -511,7 +511,7 @@ file_save_all_cb(GtkWidget *widget, gpointer cbdata) doc = (gE_document *)g_list_nth_data (mdi->children, i); if (doc->changed) { - fname = doc->filename; + fname = g_strdup(doc->filename); if (fname == NULL) { @@ -625,7 +625,8 @@ static void file_save_all_as_ok_sel(GtkWidget *w, GtkFileSelection *fs) if (mdi->active_child == NULL) { - g_free (fname); return; + g_free (fname); + return; } doc = gE_document_current(); diff --git a/src/gE_about.c b/src/gE_about.c index 946403507..7b34bbf96 100644 --- a/src/gE_about.c +++ b/src/gE_about.c @@ -34,23 +34,23 @@ void gE_about_box(GtkWidget *w, gpointer cbdata) "http://gedit.pn.org", "", N_("With special thanks to:"), - " Will LaShell", - " Chris Lahey", - " Andy Kahn", - " Miguel de Icaza", - " Martin Baulig", - " Thomas Holmgren", - " Martijn van Beers", + " Will LaShell, Chris Lahey, Andy Kahn,", + " Miguel de Icaza, Martin Baulig,", + " Thomas Holmgren, Martijn van Beers", NULL }; + + about = gnome_about_new ("gEdit", VERSION, _("(C) 1998, 1999 Alex Roberts and Evan Lawrence"), authors, _("gEdit is a small and lightweight text editor for GNOME/Gtk+"), - NULL); + "gedit-logo.png"); gtk_widget_show (about); + /*gtk_widget_destroy (about); + g_free (authors); */ } diff --git a/src/gE_plugin_api.c b/src/gE_plugin_api.c index 7714ba970..67e510e85 100644 --- a/src/gE_plugin_api.c +++ b/src/gE_plugin_api.c @@ -137,9 +137,8 @@ gE_plugin_text_insert(gint docid, gchar * buffer, gint length, gint position) if (position >= gtk_text_get_length(GTK_TEXT(view->text))) position = gtk_text_get_length(GTK_TEXT(view->text)); - position = gE_view_get_position (view); - - gtk_text_freeze(GTK_TEXT(view->text)); + /*position = gE_view_get_position (view);*/ + position = GTK_TEXT(view->text)->cursor_pos_x/6; gtk_text_freeze(GTK_TEXT(view->text)); gtk_editable_insert_text (GTK_EDITABLE (view->text), buffer, length, &position); gtk_text_thaw(GTK_TEXT(view->text)); diff --git a/src/gE_view.c b/src/gE_view.c index 6b6ab08f6..d280199e9 100644 --- a/src/gE_view.c +++ b/src/gE_view.c @@ -158,6 +158,36 @@ void view_list_erase (gE_view *view, gE_data *data) } +gint insert_into_buffer (gE_document *doc, gchar *buffer, gint position) +{ + + if ((doc->buf->len > 0) && (position < doc->buf->len) && (position)) { + +#ifdef DEBUG + g_message ("g_string_insert"); +#endif + doc->buf = g_string_insert (doc->buf, position, buffer); + + } else if (position == 0) { + +#ifdef DEBUG + g_message ("g_string_prepend"); +#endif + doc->buf = g_string_prepend (doc->buf, buffer); + + } else { + +#ifdef DEBUG + g_message ("g_string_append"); +#endif + doc->buf = g_string_append (doc->buf, buffer); + + } + + return 0; + +} + void doc_insert_text_cb(GtkWidget *editable, const guchar *insertion_text, int length, int *pos, gE_view *view) @@ -213,28 +243,7 @@ doc_insert_text_cb(GtkWidget *editable, const guchar *insertion_text, int length g_message ("and the buffer is: %s, %d, %d.. buf->len %d", buffer, length, position, view->document->buf->len); #endif - if ((doc->buf->len > 0) && (position < doc->buf->len) && (position)) { - -#ifdef DEBUG - g_message ("g_string_insert"); -#endif - doc->buf = g_string_insert (doc->buf, position, buffer); - - } else if (position == 0) { - -#ifdef DEBUG - g_message ("g_string_prepend"); -#endif - doc->buf = g_string_prepend (doc->buf, buffer); - - } else { - -#ifdef DEBUG - g_message ("g_string_append"); -#endif - doc->buf = g_string_append (doc->buf, buffer); - - } + insert_into_buffer (doc, buffer, position); gE_undo_add (buffer, position, (position + length), INSERT, doc); @@ -255,7 +264,7 @@ doc_insert_text_cb(GtkWidget *editable, const guchar *insertion_text, int length g_free (data); - if (length > 96) + /*if (length > 96) */ g_free (buffer); } @@ -380,6 +389,7 @@ auto_indent_cb(GtkWidget *text, char *insertion_text, int length, gchar *buffer, *whitespace; gE_view *view = (gE_view *)cbdata; gE_document *doc; + gE_data *data; if ((length != 1) || (insertion_text[0] != '\n')) @@ -443,11 +453,13 @@ auto_indent_cb(GtkWidget *text, char *insertion_text, int length, if (strlen(whitespace) > 0) { i = *pos; - /*gtk_text_set_point (GTK_TEXT (text), i); + gtk_text_set_point (GTK_TEXT (text), i); gtk_text_insert (GTK_TEXT (text), NULL, NULL, NULL, - whitespace, strlen (whitespace));*/ - gtk_editable_insert_text (GTK_EDITABLE (text), whitespace, - strlen(whitespace), &i); + whitespace, strlen (whitespace)); + + insert_into_buffer (doc, whitespace, i); + + } @@ -666,6 +678,11 @@ static void gE_view_init (gE_view *view) GTK_SIGNAL_FUNC (gE_event_key_press), 0); + + /* Handle Auto 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 of implementing undo/redo... @@ -678,10 +695,6 @@ 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); - /* gtk_signal_connect_after (GTK_OBJECT(view->text), "key_press_event", GTK_SIGNAL_FUNC(gE_event_button_press), NULL);*/ diff --git a/src/gedit-logo.png b/src/gedit-logo.png Binary files differnew file mode 100644 index 000000000..a2abe656a --- /dev/null +++ b/src/gedit-logo.png diff --git a/src/gedit.c b/src/gedit.c index 6d1486822..4472d3e89 100644 --- a/src/gedit.c +++ b/src/gedit.c @@ -220,7 +220,7 @@ int main (int argc, char **argv) win_int_to_pointer = g_hash_table_new (g_int_hash, g_int_equal); - data = g_malloc (sizeof (gE_data)); + /*data = g_malloc (sizeof (gE_data));*/ window_list = NULL; settings = g_malloc (sizeof (gE_preference)); @@ -297,7 +297,7 @@ int main (int argc, char **argv) } - g_free (data); + /*g_free (data);*/ gtk_main (); |