Permalink
Browse files

Move in all the changes from the old git branch.

Because individual patches did not apply, this is one big
commit the moving everything at once.
  • Loading branch information...
nschermer committed Aug 12, 2009
1 parent d7fce4e commit 375a246bf9f38733f368bfa05163734119b54168
Showing with 1,888 additions and 1,351 deletions.
  1. +9 −0 ChangeLog
  2. +0 −2 Makefile.am
  3. +0 −2 MousepadHelp.in
  4. +1 −0 TODO
  5. +0 −3 autogen.sh
  6. +1 −3 configure.in.in
  7. +1 −3 docs/Makefile.am
  8. +0 −2 docs/manual/C/Makefile.am
  9. +149 −50 docs/manual/C/Mousepad.xml.in
  10. +9 −3 docs/manual/C/images/Makefile.am
  11. BIN docs/manual/C/images/find-and-replace.png
  12. BIN docs/manual/C/images/go-to.png
  13. BIN docs/manual/C/images/main-window.png
  14. BIN docs/manual/C/images/other-tab-size.png
  15. BIN docs/manual/C/images/paste-from-history.png
  16. BIN docs/manual/C/images/tab-size-menu.png
  17. BIN docs/manual/C/images/typeahead-search.png
  18. +0 −2 docs/manual/Makefile.am
  19. +0 −2 icons/16x16/Makefile.am
  20. +0 −2 icons/24x24/Makefile.am
  21. +0 −2 icons/Makefile.am
  22. +0 −2 icons/scalable/Makefile.am
  23. +85 −97 mousepad/Makefile.am
  24. +2 −3 mousepad/main.c
  25. +12 −15 mousepad/mousepad-application.c
  26. +0 −1 mousepad/mousepad-application.h
  27. +0 −2 mousepad/mousepad-dbus-infos.xml
  28. +18 −20 mousepad/mousepad-dbus.c
  29. +0 −1 mousepad/mousepad-dbus.h
  30. +4 −5 mousepad/mousepad-dialogs.c
  31. +1 −2 mousepad/mousepad-dialogs.h
  32. +24 −27 mousepad/mousepad-document.c
  33. +0 −1 mousepad/mousepad-document.h
  34. +153 −187 mousepad/mousepad-encoding-dialog.c
  35. +8 −5 mousepad/mousepad-encoding-dialog.h
  36. +201 −0 mousepad/mousepad-encoding.c
  37. +125 −0 mousepad/mousepad-encoding.h
  38. +437 −284 mousepad/mousepad-file.c
  39. +15 −13 mousepad/mousepad-file.h
  40. +2 −5 mousepad/mousepad-preferences.c
  41. +0 −1 mousepad/mousepad-preferences.h
  42. +7 −10 mousepad/mousepad-print.c
  43. +0 −1 mousepad/mousepad-print.h
  44. +22 −13 mousepad/mousepad-private.h
  45. +3 −6 mousepad/mousepad-replace-dialog.c
  46. +0 −1 mousepad/mousepad-replace-dialog.h
  47. +11 −14 mousepad/mousepad-search-bar.c
  48. +0 −1 mousepad/mousepad-search-bar.h
  49. +3 −6 mousepad/mousepad-statusbar.c
  50. +0 −1 mousepad/mousepad-statusbar.h
  51. +25 −28 mousepad/mousepad-undo.c
  52. +0 −1 mousepad/mousepad-undo.h
  53. +38 −39 mousepad/mousepad-util.c
  54. +0 −1 mousepad/mousepad-util.h
  55. +50 −53 mousepad/mousepad-view.c
  56. +0 −1 mousepad/mousepad-view.h
  57. +2 −2 mousepad/mousepad-window-ui.xml
  58. +467 −422 mousepad/mousepad-window.c
  59. +3 −4 mousepad/mousepad-window.h
View
@@ -1,3 +1,12 @@
+2008-03-xx Nick Schermer <nick@xfce.org
+
+ * mousepad/mousepad-file.c: Use GMappedFile (mmap) for opening a
+ document. Also improve the line ending detection and avoid
+ a lot of gtk_text_buffer_insert() calls when opening unix or
+ mac line-ended files.
+ * Some internal renaming.
+
+
2008-03-10 Nick Schermer <nick@xfce.org>
* mousepad/mousepad-document.c: Swap the colors of readonly and
View
@@ -1,5 +1,3 @@
-# $Id$
-
SUBDIRS = \
icons \
mousepad \
View
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# $Id$
-#
# Copyright (c) 2004-2006 Benedikt Meurer <benny@xfce.org>
# Copyright (c) 2007 Nick Schermer <nick@xfce.org>
#
View
1 TODO
@@ -40,3 +40,4 @@ Testing and polishing
Feature
=======
- You'll never know. No promisses here...
+- GIO.
View
@@ -1,7 +1,4 @@
#!/bin/sh
-#
-# $Id$
-#
(type xdt-autogen) >/dev/null 2>&1 || {
cat >&2 <<EOF
View
@@ -1,5 +1,3 @@
-dnl $Id$
-
dnl ***************************
dnl *** Version information ***
dnl ***************************
@@ -24,7 +22,7 @@ AC_COPYRIGHT([Copyright (c) 2007-2008
AC_INIT([Mousepad], [mousepad_version], [http://bugzilla.xfce.org/], [mousepad])
AC_PREREQ([2.50])
AC_CANONICAL_TARGET()
-AC_REVISION([$Id$])
+AC_REVISION([])
dnl ***************************
dnl *** Initialize automake ***
View
@@ -1,6 +1,4 @@
-# $Id$
-
-SUBDIRS = \
+SUBDIRS = \
manual
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
@@ -1,5 +1,3 @@
-# $Id$
-
SUBDIRS = \
images
@@ -51,26 +51,27 @@
<title>Introduction</title>
<para>
- &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.
</para>
<para>
- &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.
</para>
</sect2>
<sect2 id="terminology">
<title>Terminology</title>
<para>
- 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.
</para>
<table frame="all">
@@ -101,84 +102,182 @@
</sect2>
</sect1>
- <sect1 id="mousepad">
- <title>Working With &application;</title>
-
- <sect2 id="window">
- <title>Main Window</title>
-
- <sect3 id="menu-bar">
- <title>Menu Bar</title>
- </sect3>
+ <sect1 id="working-with-text">
+ <title>Working With Text</title>
- <sect3 id="statusbar">
- <title>Statsbar</title>
- </sect3>
+ <sect2 id="keyboard-shortcuts">
+ <title>Keyboard Shortcuts</title>
</sect2>
- <sect2 id="navigation">
- <title>Navigation</title>
+ <sect2 id="undo-and-redo">
+ <title>Undo and Redo</title>
- <sect3 id="go-to-line">
- <title>Go To Line</title>
- </sect3>
- </sect2>
+ <para>
- <sect2 id="ordering-documents">
- <title>Ordering Documents</title>
+ </para>
</sect2>
- <sect2 id="documents">
- <title>Documents</title>
+ <sect2 id="copy-and-paste">
+ <title>Copy and Paste</title>
- <sect3 id="new-documents">
- <title>Creating New Documents</title>
- </sect3>
+ <para>
+ &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.
+ </para>
- <sect3 id="opening-documents">
- <title>Opening Documents</title>
- </sect3>
+ <para>
+ The primary clipboard can be accessed by the <guimenuitem>Cut</guimenuitem>,
+ <guimenuitem>Copy</guimenuitem> and <guimenuitem>Paste</guimenuitem> menu
+ items in the <guimenu>Edit</guimenu> menu. The keyboard shortcuts mentioned
+ above also work.
+ </para>
- <sect3 id="recent-documents">
- <title>Recent Documents</title>
+ <sect3 id="paste-from-history">
+ <title>Paste from History</title>
+
+ <screenshot>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/paste-from-history.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>Paste from History</phrase>
+ </textobject>
+
+ <caption>
+ <para>Screenshot of the history menu</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+
+ <para>
+ Each time you copy text in &application;, the text is pushed onto a stack.
+ When you choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Paste Special
+ </guimenuitem><guimenuitem>Paste from History</guimenuitem></menuchoice> a
+ menu will appear below the carret with the last 10 clipboard items.
+ </para>
+
+ <para>
+ 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.
+ </para>
</sect3>
- </sect2>
- </sect1>
- <sect1 id="text">
- <title>Working With Text</title>
+ <sect3 id="paste-as-column">
+ <title>Paste as Column</title>
- <sect2 id="keyboard-shortcuts">
- <title>Keyboard Shortcuts</title>
+ <para>
+ 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 <menuchoice><guimenu>Edit</guimenu><guimenuitem>Paste Special
+ </guimenuitem><guimenuitem>Paste as Column</guimenuitem></menuchoice>.
+ </para>
+ </sect3>
</sect2>
<sect2 id="auto-indent">
<title>Auto Indent</title>
+
</sect2>
<sect2 id="selections">
<title>Selecting Text</title>
<sect3 id="multi-and-column-selections">
- <title>Multi- And Column-Selections</title>
+ <title>Column-Selections</title>
</sect3>
<sect3 id="indentation">
<title>Indentation</title>
</sect3>
- </sect2>
- <sect2 id="clipboard">
- <title>Copy, Cut and Paste From The Clipboard</title>
+ <sect3 id="moving-selections">
+ <title>Moving Selections</title>
+ </sect3>
</sect2>
<sect2 id="search-and-replace">
<title>Search And Replace</title>
+
+ <sect3 id="typeahead-search">
+ <title>Typeahead Search</title>
+
+ <screenshot>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/typeahead-search.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>Typeahead search bar</phrase>
+ </textobject>
+
+ <caption>
+ <para>Screenshot of the typeahead search bar</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+ </sect3>
+
+ <sect3 id="replace-dialog">
+ <title>Search and Replace Dialog</title>
+
+ <screenshot>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/find-and-replace.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>Find and Replace Dialog</phrase>
+ </textobject>
+
+ <caption>
+ <para>Screenshot of the find and replace dialog</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+ </sect3>
</sect2>
<sect2 id="tabs">
<title>Tabs</title>
+ <screenshot>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/tab-size-menu.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>Tab Size menu</phrase>
+ </textobject>
+
+ <caption>
+ <para>Screenshot of the tabs size menu</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+
+ <screenshot>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/other-tab-size.png" format="PNG"/>
+ </imageobject>
+
+ <textobject>
+ <phrase>Other tab size</phrase>
+ </textobject>
+
+ <caption>
+ <para>Screenshot of the other tab size dialog</para>
+ </caption>
+ </mediaobject>
+ </screenshot>
+
<sect3 id="insert-spaces">
<title>Insert Spaces</title>
</sect3>
@@ -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)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -1,5 +1,3 @@
-# $Id$
-
SUBDIRS = \
C
View
@@ -1,5 +1,3 @@
-# $Id$
-
iconsdir = $(datadir)/icons/hicolor/16x16/apps
icons_DATA = \
Mousepad.png
View
@@ -1,5 +1,3 @@
-# $Id$
-
iconsdir = $(datadir)/icons/hicolor/24x24/apps
icons_DATA = \
Mousepad.png
View
@@ -1,5 +1,3 @@
-# $Id$
-
SUBDIRS = \
16x16 \
24x24 \
@@ -1,5 +1,3 @@
-# $Id$
-
iconsdir = $(datadir)/icons/hicolor/scalable/apps
icons_DATA = \
Mousepad.svg
Oops, something went wrong.

0 comments on commit 375a246

Please sign in to comment.