[gnome-commander/treeview: 269/269] Merge branch 'master' into treeview
- From: Piotr Eljasiak <epiotr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-commander/treeview: 269/269] Merge branch 'master' into treeview
- Date: Thu, 28 Apr 2011 20:09:33 +0000 (UTC)
commit dd1276b270b6aaa9e21a849d5282620fb8df8b68
Merge: 5db4500 e4d0a50
Author: Piotr Eljasiak <epiotr src gnome org>
Date: Thu Apr 28 22:07:18 2011 +0200
Merge branch 'master' into treeview
AUTHORS | 2 +
NEWS | 17 +-
README.in | 2 +-
TODO | 2 +-
data/gnome-commander.desktop.in.in | 1 -
data/gnome-commander.ebuild.in | 2 +-
doc/C/figures/gnome-commander_dialog_bookmark.png | Bin 4610 -> 27417 bytes
doc/C/gnome-commander.xml | 235 +-
doc/de/de.po | 6737 +++++++++--------
.../figures/gnome-commander_dialog_application.png | Bin 0 -> 26532 bytes
doc/de/figures/gnome-commander_dialog_bookmark.png | Bin 0 -> 23307 bytes
.../gnome-commander_dialog_file_permissions.png | Bin 0 -> 28692 bytes
.../gnome-commander_dialog_file_properties.png | Bin 0 -> 30850 bytes
doc/de/figures/gnome-commander_options_general.png | Bin 45949 -> 43174 bytes
doc/es/es.po | 6829 +++++++++--------
doc/fr/fr.po | 6861 +++++++++--------
doc/gnome-commander.1 | 2 +-
doc/keys.txt | 2 +-
git.mk | 17 +-
libgcmd/gnome-cmd-dialog.cc | 4 +-
libgcmd/gnome-cmd-dialog.h | 14 +-
libgcmd/gnome-cmd-file-info.cc | 64 +-
libgcmd/gnome-cmd-file-info.h | 22 +-
libgcmd/gnome-cmd-plugin.cc | 27 +-
libgcmd/gnome-cmd-plugin.h | 15 +-
libgcmd/gnome-cmd-state.h | 2 +-
libgcmd/gnome-cmd-string-dialog.cc | 8 +-
libgcmd/gnome-cmd-string-dialog.h | 14 +-
libgcmd/libgcmd-data.cc | 2 +-
libgcmd/libgcmd-data.h | 2 +-
libgcmd/libgcmd-deps.h | 2 +-
libgcmd/libgcmd-utils.cc | 2 +-
libgcmd/libgcmd-utils.h | 2 +-
libgcmd/libgcmd-widget-factory.cc | 9 +-
libgcmd/libgcmd-widget-factory.h | 2 +-
libgcmd/libgcmd.h | 2 +-
libgcmd/plugin-info.h | 2 +-
pixmaps/Makefile.am | 4 +-
pixmaps/pin.png | Bin 0 -> 406 bytes
pixmaps/unpin.png | Bin 0 -> 284 bytes
plugins/cvs/cvs-plugin.cc | 8 +-
plugins/cvs/cvs-plugin.h | 2 +-
plugins/cvs/interface.cc | 2 +-
plugins/cvs/interface.h | 2 +-
plugins/cvs/parser.h | 2 +-
plugins/cvs/parser.ll | 2 +-
plugins/fileroller/file-roller-plugin.cc | 10 +-
plugins/fileroller/file-roller-plugin.h | 2 +-
plugins/python/md5sum/md5sum.py | 4 +-
plugins/python/sha1sum/sha1sum.py | 4 +-
plugins/test/test-plugin.cc | 8 +-
plugins/test/test-plugin.h | 2 +-
po/cs.po | 1051 ++--
po/de.po | 1495 ++--
po/eo.po | 8423 ++++++++++----------
po/es.po | 950 ++--
po/fr.po | 1087 ++--
po/pt_BR.po | 2938 ++++----
po/sl.po | 937 ++--
po/sv.po | 4120 +++++-----
po/zh_CN.po | 1141 ++--
po/zh_TW.po | 2 +-
src/Makefile.am | 3 +-
src/block.cc | 2 +-
src/cap.cc | 8 +-
src/cap.h | 2 +-
src/dialogs/gnome-cmd-advrename-dialog.cc | 2 +-
src/dialogs/gnome-cmd-advrename-dialog.h | 12 +-
src/dialogs/gnome-cmd-advrename-regex-dialog.cc | 2 +-
src/dialogs/gnome-cmd-advrename-regex-dialog.h | 2 +-
src/dialogs/gnome-cmd-edit-bookmark-dialog.cc | 2 +-
src/dialogs/gnome-cmd-edit-bookmark-dialog.h | 2 +-
src/dialogs/gnome-cmd-edit-profile-dialog.cc | 2 +-
src/dialogs/gnome-cmd-edit-profile-dialog.h | 2 +-
src/dialogs/gnome-cmd-key-shortcuts-dialog.cc | 4 +-
src/dialogs/gnome-cmd-key-shortcuts-dialog.h | 2 +-
src/dialogs/gnome-cmd-manage-bookmarks-dialog.cc | 31 +-
src/dialogs/gnome-cmd-manage-bookmarks-dialog.h | 2 +-
src/dialogs/gnome-cmd-manage-profiles-dialog.cc | 2 +-
src/dialogs/gnome-cmd-manage-profiles-dialog.h | 2 +-
src/dialogs/gnome-cmd-mkdir-dialog.cc | 4 +-
src/dialogs/gnome-cmd-mkdir-dialog.h | 2 +-
src/dict.h | 2 +-
src/dirlist.cc | 17 +-
src/dirlist.h | 2 +-
src/eggcellrendererkeys.cc | 2 +-
src/eggcellrendererkeys.h | 14 +-
src/filter.cc | 2 +-
src/filter.h | 2 +-
src/gnome-cmd-about-plugin.cc | 2 +-
src/gnome-cmd-about-plugin.h | 2 +-
src/gnome-cmd-advrename-lexer.h | 2 +-
src/gnome-cmd-advrename-lexer.ll | 2 +-
src/gnome-cmd-app.cc | 132 +-
src/gnome-cmd-app.h | 20 +-
src/gnome-cmd-chmod-component.cc | 4 +-
src/gnome-cmd-chmod-component.h | 14 +-
src/gnome-cmd-chmod-dialog.cc | 66 +-
src/gnome-cmd-chmod-dialog.h | 19 +-
src/gnome-cmd-chown-component.cc | 4 +-
src/gnome-cmd-chown-component.h | 14 +-
src/gnome-cmd-chown-dialog.cc | 84 +-
src/gnome-cmd-chown-dialog.h | 19 +-
src/gnome-cmd-clist.cc | 68 +-
src/gnome-cmd-clist.h | 19 +-
src/gnome-cmd-cmdline.cc | 4 +-
src/gnome-cmd-cmdline.h | 14 +-
src/gnome-cmd-collection.h | 57 +
src/gnome-cmd-combo.h | 10 +-
src/gnome-cmd-con-device.cc | 71 +-
src/gnome-cmd-con-device.h | 14 +-
src/gnome-cmd-con-dialog.cc | 6 +-
src/gnome-cmd-con-dialog.h | 2 +-
src/gnome-cmd-con-ftp.cc | 24 +-
src/gnome-cmd-con-ftp.h | 14 +-
src/gnome-cmd-con-home.cc | 17 +-
src/gnome-cmd-con-home.h | 14 +-
src/gnome-cmd-con-list.cc | 9 +-
src/gnome-cmd-con-list.h | 14 +-
src/gnome-cmd-con-smb.cc | 31 +-
src/gnome-cmd-con-smb.h | 25 +-
src/gnome-cmd-con.cc | 83 +-
src/gnome-cmd-con.h | 29 +-
src/gnome-cmd-convert.cc | 2 +-
src/gnome-cmd-convert.h | 2 +-
src/gnome-cmd-data.cc | 25 +-
src/gnome-cmd-data.h | 16 +-
src/gnome-cmd-delete-dialog.cc | 2 +-
src/gnome-cmd-delete-dialog.h | 2 +-
src/gnome-cmd-dir-indicator.cc | 13 +-
src/gnome-cmd-dir-indicator.h | 14 +-
src/gnome-cmd-dir.cc | 169 +-
src/gnome-cmd-dir.h | 28 +-
src/gnome-cmd-file-collection.cc | 2 +-
src/gnome-cmd-file-collection.h | 2 +-
src/gnome-cmd-file-list.cc | 107 +-
src/gnome-cmd-file-list.h | 19 +-
src/gnome-cmd-file-popmenu.cc | 7 +-
src/gnome-cmd-file-popmenu.h | 14 +-
src/gnome-cmd-file-props-dialog.cc | 2 +-
src/gnome-cmd-file-props-dialog.h | 2 +-
src/gnome-cmd-file-selector.cc | 275 +-
src/gnome-cmd-file-selector.h | 23 +-
src/gnome-cmd-file.cc | 122 +-
src/gnome-cmd-file.h | 23 +-
src/gnome-cmd-hintbox.cc | 2 +-
src/gnome-cmd-hintbox.h | 2 +-
src/gnome-cmd-includes.h | 2 +-
src/gnome-cmd-list-popmenu.cc | 4 +-
src/gnome-cmd-list-popmenu.h | 14 +-
src/gnome-cmd-main-menu.cc | 4 +-
src/gnome-cmd-main-menu.h | 14 +-
src/gnome-cmd-main-win.cc | 30 +-
src/gnome-cmd-main-win.h | 12 +-
src/gnome-cmd-make-copy-dialog.cc | 14 +-
src/gnome-cmd-make-copy-dialog.h | 14 +-
src/gnome-cmd-menu-button.cc | 2 +-
src/gnome-cmd-menu-button.h | 2 +-
src/gnome-cmd-notebook.cc | 24 +-
src/gnome-cmd-notebook.h | 35 +-
src/gnome-cmd-options-dialog.cc | 456 +-
src/gnome-cmd-options-dialog.h | 42 +-
src/gnome-cmd-path.cc | 129 -
src/gnome-cmd-path.h | 40 +-
src/gnome-cmd-patternsel-dialog.cc | 8 +-
src/gnome-cmd-patternsel-dialog.h | 14 +-
src/gnome-cmd-pixmap.cc | 2 +-
src/gnome-cmd-pixmap.h | 2 +-
src/gnome-cmd-plain-path.cc | 119 +-
src/gnome-cmd-plain-path.h | 39 +-
src/gnome-cmd-prepare-copy-dialog.cc | 2 +-
src/gnome-cmd-prepare-copy-dialog.h | 2 +-
src/gnome-cmd-prepare-move-dialog.cc | 2 +-
src/gnome-cmd-prepare-move-dialog.h | 2 +-
src/gnome-cmd-prepare-xfer-dialog.cc | 10 +-
src/gnome-cmd-prepare-xfer-dialog.h | 11 +-
src/gnome-cmd-profile-component.cc | 6 +-
src/gnome-cmd-profile-component.h | 11 +-
src/gnome-cmd-python-plugin.cc | 2 +-
src/gnome-cmd-python-plugin.h | 2 +-
src/gnome-cmd-quicksearch-popup.cc | 4 +-
src/gnome-cmd-quicksearch-popup.h | 14 +-
src/gnome-cmd-regex.h | 2 +-
src/gnome-cmd-remote-dialog.cc | 71 +-
src/gnome-cmd-remote-dialog.h | 14 +-
src/gnome-cmd-rename-dialog.cc | 58 +-
src/gnome-cmd-rename-dialog.h | 17 +-
src/gnome-cmd-search-dialog.cc | 318 +-
src/gnome-cmd-search-dialog.h | 14 +-
src/gnome-cmd-smb-auth.cc | 2 +-
src/gnome-cmd-smb-auth.h | 2 +-
src/gnome-cmd-smb-net.cc | 2 +-
src/gnome-cmd-smb-net.h | 2 +-
src/gnome-cmd-smb-path.cc | 220 +-
src/gnome-cmd-smb-path.h | 63 +-
src/gnome-cmd-style.cc | 2 +-
src/gnome-cmd-style.h | 2 +-
src/gnome-cmd-treeview.cc | 2 +-
src/gnome-cmd-treeview.h | 2 +-
src/gnome-cmd-types.h | 2 +-
src/gnome-cmd-user-actions.cc | 100 +-
src/gnome-cmd-user-actions.h | 3 +-
src/gnome-cmd-xfer-progress-win.cc | 4 +-
src/gnome-cmd-xfer-progress-win.h | 14 +-
src/gnome-cmd-xfer.cc | 2 +-
src/gnome-cmd-xfer.h | 2 +-
src/gnome-cmd-xml-config.cc | 7 +-
src/gnome-cmd-xml-config.h | 2 +-
src/handle.h | 2 +-
src/history.cc | 2 +-
src/history.h | 2 +-
src/imageloader.cc | 2 +-
src/imageloader.h | 2 +-
src/intviewer/bm_byte.cc | 4 +-
src/intviewer/bm_byte.h | 2 +-
src/intviewer/bm_chartype.cc | 4 +-
src/intviewer/bm_chartype.h | 2 +-
src/intviewer/cp437.cc | 2 +-
src/intviewer/cp437.h | 2 +-
src/intviewer/datapresentation.cc | 2 +-
src/intviewer/datapresentation.h | 2 +-
src/intviewer/fileops.cc | 4 +-
src/intviewer/fileops.h | 2 +-
src/intviewer/gvtypes.h | 2 +-
src/intviewer/image-render.cc | 28 +-
src/intviewer/image-render.h | 2 +-
src/intviewer/inputmodes.cc | 2 +-
src/intviewer/inputmodes.h | 2 +-
src/intviewer/libgviewer.h | 2 +-
src/intviewer/scroll-box.cc | 4 +-
src/intviewer/scroll-box.h | 2 +-
src/intviewer/search-dlg.cc | 4 +-
src/intviewer/search-dlg.h | 2 +-
src/intviewer/search-progress-dlg.cc | 4 +-
src/intviewer/search-progress-dlg.h | 2 +-
src/intviewer/searcher.cc | 2 +-
src/intviewer/searcher.h | 2 +-
src/intviewer/text-render.cc | 25 +-
src/intviewer/text-render.h | 2 +-
src/intviewer/viewer-utils.cc | 4 +-
src/intviewer/viewer-utils.h | 2 +-
src/intviewer/viewer-widget.cc | 32 +-
src/intviewer/viewer-widget.h | 4 +-
src/intviewer/viewer-window.cc | 6 +-
src/intviewer/viewer-window.h | 4 +-
src/ls_colors.cc | 2 +-
src/ls_colors.h | 2 +-
src/main.cc | 22 +-
src/owner.cc | 2 +-
src/owner.h | 2 +-
src/plugin_manager.cc | 23 +-
src/plugin_manager.h | 2 +-
src/tags/gnome-cmd-tags-doc.cc | 2 +-
src/tags/gnome-cmd-tags-doc.h | 2 +-
src/tags/gnome-cmd-tags-exiv2.cc | 2 +-
src/tags/gnome-cmd-tags-exiv2.h | 2 +-
src/tags/gnome-cmd-tags-file.cc | 2 +-
src/tags/gnome-cmd-tags-file.h | 2 +-
src/tags/gnome-cmd-tags-poppler.cc | 2 +-
src/tags/gnome-cmd-tags-poppler.h | 2 +-
src/tags/gnome-cmd-tags-taglib.cc | 2 +-
src/tags/gnome-cmd-tags-taglib.h | 2 +-
src/tags/gnome-cmd-tags.cc | 2 +-
src/tags/gnome-cmd-tags.h | 2 +-
src/tuple.h | 2 +-
src/utils.cc | 13 +-
src/utils.h | 24 +-
src/widget-factory.h | 2 +-
tests/gviewer/bm_byte_test.c | 2 +-
tests/gviewer/bm_chartype_test.c | 2 +-
tests/gviewer/datapresentation.c | 2 +-
tests/gviewer/dualrenderer.c | 2 +-
tests/gviewer/fileops.c | 2 +-
tests/gviewer/imagerenderer.c | 2 +-
tests/gviewer/inputmodes.c | 2 +-
tests/gviewer/search_dlg_test.c | 2 +-
tests/gviewer/textrenderer.c | 2 +-
tests/gviewer/viewerwidget.c | 2 +-
tests/gviewer/viewerwindow.c | 2 +-
279 files changed, 24171 insertions(+), 23180 deletions(-)
---
diff --cc src/gnome-cmd-main-win.cc
index 2d79c1e,ebd9f45..217113e
--- a/src/gnome-cmd-main-win.cc
+++ b/src/gnome-cmd-main-win.cc
@@@ -36,12 -35,9 +35,10 @@@
#include "gnome-cmd-combo.h"
#include "gnome-cmd-dir.h"
#include "gnome-cmd-plain-path.h"
- #include "gnome-cmd-con.h"
#include "gnome-cmd-con-list.h"
+#include "gnome-cmd-foldview.h"
#include "owner.h"
#include "utils.h"
- #include "dialogs/gnome-cmd-manage-bookmarks-dialog.h"
#include "../pixmaps/copy_file_names.xpm"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
