diff --git a/ChangeLog b/ChangeLog index b864971..244a1da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-03-xx Nick Schermer * mousepad/mousepad-document.c: Swap the colors of readonly and diff --git a/Makefile.am b/Makefile.am index aafee93..e9d4098 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ - SUBDIRS = \ icons \ mousepad \ diff --git a/MousepadHelp.in b/MousepadHelp.in index 7da5051..bde651f 100644 --- a/MousepadHelp.in +++ b/MousepadHelp.in @@ -1,7 +1,5 @@ #!/bin/sh # -# $Id$ -# # Copyright (c) 2004-2006 Benedikt Meurer # Copyright (c) 2007 Nick Schermer # diff --git a/TODO b/TODO index 8c8887f..6976a23 100644 --- a/TODO +++ b/TODO @@ -40,3 +40,4 @@ Testing and polishing Feature ======= - You'll never know. No promisses here... +- GIO. diff --git a/autogen.sh b/autogen.sh index e8fcaae..852b2db 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,7 +1,4 @@ #!/bin/sh -# -# $Id$ -# (type xdt-autogen) >/dev/null 2>&1 || { cat >&2 <Introduction - &application; is the default text editor for the Xfce Desktop Environment. It has been design to be a - lightweight editor you would use for basic file editing. Therefore &application; starts quickly, but - also has features like editing multiple documents, vertical selection, type-ahead search, full tab - drag and drop and much more. + &application; is the default text editor for the Xfce Desktop Environment. It has + been design to be a lightweight editor you would use for basic file editing. + Therefore &application; starts quickly, but also has features like editing + multiple documents, vertical selection, type-ahead search, full tab drag and drop + and much more. - &application; started as a fork of Leafpad to provide printing support using Xfprint, but as of version - 0.3 is has been completely rewritten to add support for tabs and DBus. Although the rewrite added - a lot of new features, it is still as fast as the Leafpad based fork and therefore fits perfectly - in the Xfce philosophy. + &application; started as a fork of Leafpad to provide printing support using + Xfprint, but as of version 0.3 is has been completely rewritten to add support for + tabs and DBus. Although the rewrite added a lot of new features, it is still as + fast as the Leafpad based fork and therefore fits perfectly in the Xfce philosophy. @@ -69,8 +70,8 @@ Terminology - There might be a couple of words in this manual that could be the source of misunderstanding. The table - below will clarify those words. + There might be a couple of words in this manual that could be the source of + misunderstanding. The table below will clarify those words. @@ -101,84 +102,182 @@ - - Working With &application; - - - Main Window - - - Menu Bar - + + Working With Text - - Statsbar - + + Keyboard Shortcuts - - Navigation + + Undo and Redo - - Go To Line - - + - - Ordering Documents + - - Documents + + Copy and Paste - - Creating New Documents - + + &application; supports both the selection and primary clipboard. To paste + something from the seletion clipboard you can click with the middle mouse + button in the &application; window. + - - Opening Documents - + + The primary clipboard can be accessed by the Cut, + Copy and Paste menu + items in the Edit menu. The keyboard shortcuts mentioned + above also work. + - - Recent Documents + + Paste from History + + + + + + + + + Paste from History + + + + + + + + Each time you copy text in &application;, the text is pushed onto a stack. + When you choose EditPaste Special + Paste from History a + menu will appear below the carret with the last 10 clipboard items. + + + + You can choose an item from the list by clicking it, using the arrow keys + and press enter or by pressing the numeric keyboard accelerator. + - - - - Working With Text + + Paste as Column - - Keyboard Shortcuts + + When the content in the primary clipboard contains multiple lines, you can paste + the content in the same column. &application; will then try to paste each line + in the clipboard at the same x-coordinate. You can access this option by + choosing EditPaste Special + Paste as Column. + + Auto Indent + Selecting Text - Multi- And Column-Selections + Column-Selections Indentation - - - Copy, Cut and Paste From The Clipboard + + Moving Selections + Search And Replace + + + Typeahead Search + + + + + + + + + Typeahead search bar + + + + + + + + + Search and Replace Dialog + + + + + + + + + Find and Replace Dialog + + + + + + Tabs + + + + + + + + Tab Size menu + + + + + + + + + + + + + + Other tab size + + + + + + Insert Spaces diff --git a/docs/manual/C/images/Makefile.am b/docs/manual/C/images/Makefile.am index 0a63e5f..c329f2b 100644 --- a/docs/manual/C/images/Makefile.am +++ b/docs/manual/C/images/Makefile.am @@ -1,7 +1,13 @@ -# $Id$ - imagesdir = $(datadir)/doc/Mousepad/html/C/images -images_DATA = +images_DATA = \ + find-and-replace.png \ + go-to.png \ + main-window.png \ + Makefile.am \ + other-tab-size.png \ + paste-from-history.png \ + tab-size-menu.png \ + typeahead-search.png EXTRA_DIST = \ $(images_DATA) diff --git a/docs/manual/C/images/find-and-replace.png b/docs/manual/C/images/find-and-replace.png new file mode 100644 index 0000000..9e8648a Binary files /dev/null and b/docs/manual/C/images/find-and-replace.png differ diff --git a/docs/manual/C/images/go-to.png b/docs/manual/C/images/go-to.png new file mode 100644 index 0000000..4fe1d3c Binary files /dev/null and b/docs/manual/C/images/go-to.png differ diff --git a/docs/manual/C/images/main-window.png b/docs/manual/C/images/main-window.png new file mode 100644 index 0000000..2ac0a27 Binary files /dev/null and b/docs/manual/C/images/main-window.png differ diff --git a/docs/manual/C/images/other-tab-size.png b/docs/manual/C/images/other-tab-size.png new file mode 100644 index 0000000..651d095 Binary files /dev/null and b/docs/manual/C/images/other-tab-size.png differ diff --git a/docs/manual/C/images/paste-from-history.png b/docs/manual/C/images/paste-from-history.png new file mode 100644 index 0000000..dd2d757 Binary files /dev/null and b/docs/manual/C/images/paste-from-history.png differ diff --git a/docs/manual/C/images/tab-size-menu.png b/docs/manual/C/images/tab-size-menu.png new file mode 100644 index 0000000..942063c Binary files /dev/null and b/docs/manual/C/images/tab-size-menu.png differ diff --git a/docs/manual/C/images/typeahead-search.png b/docs/manual/C/images/typeahead-search.png new file mode 100644 index 0000000..2fc6664 Binary files /dev/null and b/docs/manual/C/images/typeahead-search.png differ diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am index d0ae330..817eaa6 100644 --- a/docs/manual/Makefile.am +++ b/docs/manual/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ - SUBDIRS = \ C diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am index 6cedaf6..a8e5cb7 100644 --- a/icons/16x16/Makefile.am +++ b/icons/16x16/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ - iconsdir = $(datadir)/icons/hicolor/16x16/apps icons_DATA = \ Mousepad.png diff --git a/icons/24x24/Makefile.am b/icons/24x24/Makefile.am index 0a73503..c22ae68 100644 --- a/icons/24x24/Makefile.am +++ b/icons/24x24/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ - iconsdir = $(datadir)/icons/hicolor/24x24/apps icons_DATA = \ Mousepad.png diff --git a/icons/Makefile.am b/icons/Makefile.am index e6cdc99..21932ab 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ - SUBDIRS = \ 16x16 \ 24x24 \ diff --git a/icons/scalable/Makefile.am b/icons/scalable/Makefile.am index b2a0019..2beabc7 100644 --- a/icons/scalable/Makefile.am +++ b/icons/scalable/Makefile.am @@ -1,5 +1,3 @@ -# $Id$ - iconsdir = $(datadir)/icons/hicolor/scalable/apps icons_DATA = \ Mousepad.svg diff --git a/mousepad/Makefile.am b/mousepad/Makefile.am index ebf6361..4c46a67 100644 --- a/mousepad/Makefile.am +++ b/mousepad/Makefile.am @@ -1,137 +1,125 @@ -# $Id$ - -INCLUDES = \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - -DBINDIR=\"$(bindir)\" \ - -DDATADIR=\"$(datadir)\" \ - -DLIBDIR=\"$(libdir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DG_LOG_DOMAIN=\"Mousepad\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ - -DG_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ + -DBINDIR=\"$(bindir)\" \ + -DDATADIR=\"$(datadir)\" \ + -DLIBDIR=\"$(libdir)\" \ + -DLIBEXECDIR=\"$(libexecdir)\" \ + -DG_LOG_DOMAIN=\"Mousepad\" \ + -DLIBEXECDIR=\"$(libexecdir)\" \ + -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ + -DG_DISABLE_DEPRECATED \ + -DGTK_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ + -DG_DISABLE_SINGLE_INCLUDES \ + -DPANGO_DISABLE_SINGLE_INCLUDES \ + -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \ + -DGTK_DISABLE_SINGLE_INCLUDES \ $(PLATFORM_CPPFLAGS) -bin_PROGRAMS = \ +bin_PROGRAMS = \ mousepad -mousepad_built_sources = \ - mousepad-marshal.c \ +mousepad_built_sources = \ + mousepad-marshal.c \ mousepad-marshal.h -mousepad_SOURCES = \ - $(mousepad_built_sources) \ - $(mousepad_dbus_sources) \ - main.c \ - mousepad-application.c \ - mousepad-application.h \ - mousepad-dialogs.c \ - mousepad-dialogs.h \ - mousepad-document.c \ - mousepad-document.h \ - mousepad-encoding-dialog.c \ - mousepad-encoding-dialog.h \ - mousepad-file.c \ - mousepad-file.h \ - mousepad-preferences.c \ - mousepad-preferences.h \ - mousepad-print.c \ - mousepad-print.h \ - mousepad-private.h \ - mousepad-replace-dialog.c \ - mousepad-replace-dialog.h \ - mousepad-search-bar.c \ - mousepad-search-bar.h \ - mousepad-statusbar.c \ - mousepad-statusbar.h \ - mousepad-view.c \ - mousepad-view.h \ - mousepad-undo.c \ - mousepad-undo.h \ - mousepad-util.c \ - mousepad-util.h \ - mousepad-window.c \ - mousepad-window.h \ +mousepad_SOURCES = \ + $(mousepad_built_sources) \ + $(mousepad_dbus_sources) \ + main.c \ + mousepad-application.c \ + mousepad-application.h \ + mousepad-dialogs.c \ + mousepad-dialogs.h \ + mousepad-document.c \ + mousepad-document.h \ + mousepad-encoding.c \ + mousepad-encoding.h \ + mousepad-encoding-dialog.c \ + mousepad-encoding-dialog.h \ + mousepad-file.c \ + mousepad-file.h \ + mousepad-preferences.c \ + mousepad-preferences.h \ + mousepad-print.c \ + mousepad-print.h \ + mousepad-private.h \ + mousepad-replace-dialog.c \ + mousepad-replace-dialog.h \ + mousepad-search-bar.c \ + mousepad-search-bar.h \ + mousepad-statusbar.c \ + mousepad-statusbar.h \ + mousepad-view.c \ + mousepad-view.h \ + mousepad-undo.c \ + mousepad-undo.h \ + mousepad-util.c \ + mousepad-util.h \ + mousepad-window.c \ + mousepad-window.h \ mousepad-window-ui.h -mousepad_CFLAGS = \ - $(GLIB_CFLAGS) \ - $(GTK_CFLAGS) \ - $(GTHREAD_CFLAGS) \ +mousepad_CFLAGS = \ + $(GLIB_CFLAGS) \ + $(GTK_CFLAGS) \ + $(GTHREAD_CFLAGS) \ $(PLATFORM_CFLAGS) -mousepad_LDFLAGS = \ - -no-undefined \ +mousepad_LDFLAGS = \ + -no-undefined \ $(PLATFORM_LDFLAGS) -mousepad_LDADD = \ - $(GLIB_LIBS) \ - $(GTK_LIBS) \ +mousepad_LDADD = \ + $(GLIB_LIBS) \ + $(GTK_LIBS) \ $(GTHREAD_LIBS) if HAVE_DBUS -mousepad_built_sources += \ +mousepad_built_sources += \ mousepad-dbus-infos.h -mousepad_dbus_sources = \ - mousepad-dbus.c \ +mousepad_dbus_sources = \ + mousepad-dbus.c \ mousepad-dbus.h -mousepad_CFLAGS += \ - -DDBUS_API_SUBJECT_TO_CHANGE \ +mousepad_CFLAGS += \ + -DDBUS_API_SUBJECT_TO_CHANGE \ $(DBUS_CFLAGS) -mousepad_LDADD += \ +mousepad_LDADD += \ $(DBUS_LIBS) endif if MAINTAINER_MODE -CLEANFILES = \ - xgen-mmc \ - xgen-mmh - -DISTCLEANFILES = \ - $(mousepad_built_sources) \ - stamp-mousepad-marshal.h \ +DISTCLEANFILES = \ + $(mousepad_built_sources) \ mousepad-window-ui.h -BUILT_SOURCES = \ - $(mousepad_built_sources) \ +BUILT_SOURCES = \ + $(mousepad_built_sources) \ mousepad-window-ui.h if HAVE_DBUS -mousepad-dbus-infos.h: $(srcdir)/mousepad-dbus-infos.xml Makefile - dbus-binding-tool --prefix=mousepad_dbus_service --mode=glib-server $(srcdir)/mousepad-dbus-infos.xml > mousepad-dbus-infos.h +mousepad-dbus-infos.h: mousepad-dbus-infos.xml Makefile + dbus-binding-tool --prefix=mousepad_dbus_service --mode=glib-server $< > $@ endif -mousepad-window-ui.h: Makefile $(srcdir)/mousepad-window-ui.xml - exo-csource --strip-comments --strip-content --static --name=mousepad_window_ui $(srcdir)/mousepad-window-ui.xml > mousepad-window-ui.h - -mousepad-marshal.h: stamp-mousepad-marshal.h - @true +mousepad-window-ui.h: mousepad-window-ui.xml Makefile + exo-csource --strip-comments --strip-content --static --name=mousepad_window_ui $< > $@ -stamp-mousepad-marshal.h: mousepad-marshal.list Makefile - ( cd $(srcdir) && glib-genmarshal \ - --prefix=_mousepad_marshal \ - --header mousepad-marshal.list ) >> xgen-mmh \ - && ( cmp -s xgen-mmh mousepad-marshal.h || cp xgen-mmh mousepad-marshal.h ) \ - && rm -f xgen-mmh \ - && echo timestamp > $(@F) +mousepad-marshal.h: mousepad-marshal.list Makefile + glib-genmarshal --header --prefix=_mousepad_marshal $< > $@ mousepad-marshal.c: mousepad-marshal.list Makefile - ( cd $(srcdir) && glib-genmarshal \ - --prefix=_mousepad_marshal \ - --body mousepad-marshal.list ) >> xgen-mmc \ - && cp xgen-mmc mousepad-marshal.c \ - && rm -f xgen-mmc + echo "#include " > $@ \ + && glib-genmarshal --body --prefix=_mousepad_marshal $< >> $@ endif -EXTRA_DIST = \ - mousepad-dbus-infos.xml \ - mousepad-marshal.list \ +EXTRA_DIST = \ + mousepad-dbus-infos.xml \ + mousepad-marshal.list \ mousepad-window-ui.xml # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: diff --git a/mousepad/main.c b/mousepad/main.c index 63d17a6..22e69eb 100644 --- a/mousepad/main.c +++ b/mousepad/main.c @@ -1,4 +1,3 @@ -/* $Id$ */ /* * 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 @@ -56,7 +55,7 @@ static const GOptionEntry option_entries[] = #endif { "version", 'v', 0, G_OPTION_ARG_NONE, &opt_version, N_("Print version information and exit"), NULL }, { G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &filenames, NULL, NULL }, - { NULL }, + { NULL } }; @@ -90,7 +89,7 @@ main (gint argc, gchar **argv) g_thread_init (NULL); /* initialize gtk+ */ - if (!gtk_init_with_args (&argc, &argv, _("[FILES...]"), (GOptionEntry *) option_entries, GETTEXT_PACKAGE, &error)) + if (!gtk_init_with_args (&argc, &argv, _("[FILES...]"), (GOptionEntry *) option_entries, (gchar *) GETTEXT_PACKAGE, &error)) { /* check if we have an error message */ if (G_LIKELY (error == NULL)) diff --git a/mousepad/mousepad-application.c b/mousepad/mousepad-application.c index 10e1250..cb7c778 100644 --- a/mousepad/mousepad-application.c +++ b/mousepad/mousepad-application.c @@ -1,4 +1,3 @@ -/* $Id$ */ /* * 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 @@ -27,8 +26,6 @@ -static void mousepad_application_class_init (MousepadApplicationClass *klass); -static void mousepad_application_init (MousepadApplication *application); static void mousepad_application_finalize (GObject *object); static void mousepad_application_window_destroyed (GtkWidget *window, MousepadApplication *application); @@ -153,7 +150,7 @@ mousepad_application_get (void) gboolean mousepad_application_has_windows (MousepadApplication *application) { - _mousepad_return_val_if_fail (MOUSEPAD_IS_APPLICATION (application), FALSE); + mousepad_return_val_if_fail (MOUSEPAD_IS_APPLICATION (application), FALSE); return (application->windows != NULL); } @@ -164,9 +161,9 @@ static void mousepad_application_window_destroyed (GtkWidget *window, MousepadApplication *application) { - _mousepad_return_if_fail (GTK_IS_WINDOW (window)); - _mousepad_return_if_fail (MOUSEPAD_IS_APPLICATION (application)); - _mousepad_return_if_fail (g_slist_find (application->windows, window) != NULL); + mousepad_return_if_fail (GTK_IS_WINDOW (window)); + mousepad_return_if_fail (MOUSEPAD_IS_APPLICATION (application)); + mousepad_return_if_fail (g_slist_find (application->windows, window) != NULL); /* remove the window from the list */ application->windows = g_slist_remove (application->windows, window); @@ -182,9 +179,9 @@ void mousepad_application_take_window (MousepadApplication *application, GtkWindow *window) { - _mousepad_return_if_fail (MOUSEPAD_IS_WINDOW (window)); - _mousepad_return_if_fail (MOUSEPAD_IS_APPLICATION (application)); - _mousepad_return_if_fail (g_slist_find (application->windows, window) == NULL); + mousepad_return_if_fail (MOUSEPAD_IS_WINDOW (window)); + mousepad_return_if_fail (MOUSEPAD_IS_APPLICATION (application)); + mousepad_return_if_fail (g_slist_find (application->windows, window) == NULL); /* connect to the "destroy" signal */ g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (mousepad_application_window_destroyed), application); @@ -225,9 +222,9 @@ mousepad_application_new_window_with_document (MousepadWindow *existing, GtkWidget *window; GdkScreen *screen; - _mousepad_return_if_fail (MOUSEPAD_IS_WINDOW (existing)); - _mousepad_return_if_fail (document == NULL || MOUSEPAD_IS_DOCUMENT (document)); - _mousepad_return_if_fail (MOUSEPAD_IS_APPLICATION (application)); + mousepad_return_if_fail (MOUSEPAD_IS_WINDOW (existing)); + mousepad_return_if_fail (document == NULL || MOUSEPAD_IS_DOCUMENT (document)); + mousepad_return_if_fail (MOUSEPAD_IS_APPLICATION (application)); /* create a new window (signals added and already hooked up) */ window = mousepad_application_create_window (application); @@ -274,8 +271,8 @@ mousepad_application_new_window_with_files (MousepadApplication *application, gboolean succeed = FALSE; MousepadDocument *document; - _mousepad_return_if_fail (MOUSEPAD_IS_APPLICATION (application)); - _mousepad_return_if_fail (screen == NULL || GDK_IS_SCREEN (screen)); + mousepad_return_if_fail (MOUSEPAD_IS_APPLICATION (application)); + mousepad_return_if_fail (screen == NULL || GDK_IS_SCREEN (screen)); /* create a new window (signals added and already hooked up) */ window = mousepad_application_create_window (application); diff --git a/mousepad/mousepad-application.h b/mousepad/mousepad-application.h index 9af3941..28e382c 100644 --- a/mousepad/mousepad-application.h +++ b/mousepad/mousepad-application.h @@ -1,4 +1,3 @@ -/* $Id$ */ /* * 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 diff --git a/mousepad/mousepad-dbus-infos.xml b/mousepad/mousepad-dbus-infos.xml index c356bb9..3f0fab1 100644 --- a/mousepad/mousepad-dbus-infos.xml +++ b/mousepad/mousepad-dbus-infos.xml @@ -1,8 +1,6 @@
+ Screenshot of the history menu + + Screenshot of the typeahead search bar + + Screenshot of the find and replace dialog + + Screenshot of the tabs size menu + + Screenshot of the other tab size dialog +