GNOME.org
 

[gnome-commander/treeview: 150/150] Merge branch 'master' into treeview

commit ef893da8a448d032cc020a783fcaa19e8aa2e351
Merge: cb3c9bc efea9bd
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Sun Jul 3 14:16:16 2011 +0200

    Merge branch 'master' into treeview

 NEWS                                               |   12 +
 data/gnome-commander.spec.in                       |    4 +
 doc/C/gnome-commander.xml                          |   47 +-
 .../figures/gnome-commander_dialog_adv_rename.png  |  Bin 0 -> 93354 bytes
 .../figures/gnome-commander_dialog_application.png |  Bin 35699 -> 35559 bytes
 doc/cs/figures/gnome-commander_dialog_bookmark.png |  Bin 34205 -> 34064 bytes
 .../gnome-commander_dialog_file_permissions.png    |  Bin 39303 -> 39187 bytes
 .../gnome-commander_dialog_file_properties.png     |  Bin 50407 -> 50295 bytes
 doc/cs/figures/gnome-commander_dialog_search.png   |  Bin 48392 -> 48292 bytes
 .../gnome-commander_options_confirmation.png       |  Bin 39936 -> 39785 bytes
 doc/cs/figures/gnome-commander_options_devices.png |  Bin 35540 -> 35413 bytes
 doc/cs/figures/gnome-commander_options_filters.png |  Bin 44474 -> 44322 bytes
 doc/cs/figures/gnome-commander_options_format.png  |  Bin 49950 -> 49818 bytes
 doc/cs/figures/gnome-commander_options_general.png |  Bin 71694 -> 71553 bytes
 doc/cs/figures/gnome-commander_options_layout.png  |  Bin 65683 -> 65540 bytes
 doc/cs/figures/gnome-commander_options_network.png |  Bin 30382 -> 30284 bytes
 .../figures/gnome-commander_options_programs.png   |  Bin 54253 -> 54103 bytes
 doc/cs/figures/gnome-commander_window.png          |  Bin 0 -> 141308 bytes
 doc/de/de.po                                       | 7764 ++++++++++----------
 doc/es/es.po                                       | 6185 ++++++++--------
 libgcmd/gnome-cmd-dialog.cc                        |   23 +-
 libgcmd/gnome-cmd-dialog.h                         |   20 -
 libgcmd/libgcmd-widget-factory.cc                  |   11 +-
 libgcmd/libgcmd-widget-factory.h                   |   16 +-
 mkinstalldirs                                      |    8 +-
 plugins/cvs/cvs-plugin.cc                          |    4 +-
 plugins/cvs/interface.cc                           |    7 +-
 plugins/fileroller/file-roller-plugin.cc           |    4 +-
 po/POTFILES.in                                     |    9 +-
 po/cs.po                                           |  437 +-
 po/de.po                                           | 1662 +++--
 po/es.po                                           | 1686 +++--
 po/sl.po                                           | 2242 +++---
 src/Makefile.am                                    |    4 +-
 src/dialogs/Makefile.am                            |    5 +-
 src/dialogs/gnome-cmd-advrename-dialog.cc          |   40 +-
 src/dialogs/gnome-cmd-advrename-regex-dialog.cc    |    1 +
 src/dialogs/gnome-cmd-edit-profile-dialog.cc       |  138 -
 src/dialogs/gnome-cmd-edit-profile-dialog.h        |  128 +-
 src/dialogs/gnome-cmd-manage-profiles-dialog.cc    |  412 --
 src/dialogs/gnome-cmd-manage-profiles-dialog.h     |  400 +-
 src/dialogs/gnome-cmd-mkdir-dialog.cc              |    8 +-
 src/dialogs/gnome-cmd-search-dialog.cc             | 1185 +++
 src/{ => dialogs}/gnome-cmd-search-dialog.h        |   26 +-
 src/eggcellrendererkeys.cc                         |    2 +-
 ...cc => gnome-cmd-advrename-profile-component.cc} |  236 +-
 ...t.h => gnome-cmd-advrename-profile-component.h} |   28 +-
 src/gnome-cmd-cmdline.cc                           |    6 +-
 src/gnome-cmd-combo.cc                             |    2 +-
 src/gnome-cmd-con-list.cc                          |    6 +-
 src/gnome-cmd-data.cc                              |   49 +-
 src/gnome-cmd-data.h                               |   17 +-
 src/gnome-cmd-delete-dialog.cc                     |    4 +-
 src/gnome-cmd-dir-indicator.cc                     |    1 +
 src/gnome-cmd-dir.cc                               |    2 +-
 src/gnome-cmd-file-list.cc                         |    5 +-
 src/gnome-cmd-file-props-dialog.cc                 |   18 +-
 src/gnome-cmd-file-selector.cc                     |   19 +-
 src/gnome-cmd-main-menu.cc                         |   10 +-
 src/gnome-cmd-main-win.cc                          |    4 +
 src/gnome-cmd-main-win.h                           |    2 +
 src/gnome-cmd-menu-button.cc                       |    4 +-
 src/gnome-cmd-options-dialog.cc                    |   18 +-
 src/gnome-cmd-patternsel-dialog.cc                 |    6 +-
 src/gnome-cmd-remote-dialog.cc                     |    2 +-
 src/gnome-cmd-rename-dialog.cc                     |    2 +-
 src/gnome-cmd-search-dialog.cc                     |  897 ---
 src/gnome-cmd-selection-profile-component.cc       |  251 +
 src/gnome-cmd-selection-profile-component.h        |   62 +
 src/gnome-cmd-smb-path.cc                          |   14 +-
 src/gnome-cmd-smb-path.h                           |    1 -
 src/gnome-cmd-types.h                              |    1 +
 src/gnome-cmd-user-actions.cc                      |   31 +-
 src/gnome-cmd-user-actions.h                       |    1 +
 src/gnome-cmd-xfer.cc                              |   47 +-
 src/gnome-cmd-xml-config.cc                        |    2 +
 src/history.cc                                     |    7 +-
 src/history.h                                      |   20 +-
 src/intviewer/datapresentation.cc                  |    2 +-
 src/intviewer/datapresentation.h                   |    2 +-
 src/intviewer/fileops.cc                           |   12 +-
 src/intviewer/image-render.cc                      |   34 +-
 src/intviewer/inputmodes.cc                        |    8 +-
 src/intviewer/scroll-box.cc                        |   29 +-
 src/intviewer/search-dlg.cc                        |   11 +-
 src/intviewer/search-progress-dlg.cc               |   29 +-
 src/intviewer/searcher.cc                          |    3 -
 src/intviewer/text-render.cc                       |  276 +-
 src/intviewer/viewer-utils.cc                      |    2 +-
 src/intviewer/viewer-widget.cc                     |   39 +-
 src/intviewer/viewer-window.cc                     |   21 +-
 src/main.cc                                        |    2 +-
 src/plugin_manager.cc                              |    6 +-
 src/utils.cc                                       |   55 +-
 src/utils.h                                        |    7 +-
 tests/gviewer/viewerwindow.c                       |    2 +-
 96 files changed, 12836 insertions(+), 11969 deletions(-)
---
diff --cc po/POTFILES.in
index 736ea7d,b93961e..60b588b
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -10,16 -10,16 +10,18 @@@ plugins/test/test-plugin.c
  src/dialogs/gnome-cmd-advrename-dialog.cc
  src/dialogs/gnome-cmd-advrename-regex-dialog.cc
  src/dialogs/gnome-cmd-edit-bookmark-dialog.cc
- src/dialogs/gnome-cmd-edit-profile-dialog.cc
+ src/dialogs/gnome-cmd-edit-profile-dialog.h
  src/dialogs/gnome-cmd-key-shortcuts-dialog.cc
  src/dialogs/gnome-cmd-manage-bookmarks-dialog.cc
- src/dialogs/gnome-cmd-manage-profiles-dialog.cc
+ src/dialogs/gnome-cmd-manage-profiles-dialog.h
  src/dialogs/gnome-cmd-mkdir-dialog.cc
+ src/dialogs/gnome-cmd-search-dialog.cc
  src/dirlist.cc
  src/eggcellrendererkeys.cc
 +src/foldview/gnome-cmd-foldview-control.cc
 +src/foldview/gnome-cmd-foldview-view.cc
  src/gnome-cmd-about-plugin.cc
+ src/gnome-cmd-advrename-profile-component.cc
  src/gnome-cmd-chmod-component.cc
  src/gnome-cmd-chmod-dialog.cc
  src/gnome-cmd-chown-component.cc
diff --cc src/Makefile.am
index 5e69904,72f062f..f8a0259
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -20,15 -20,9 +20,16 @@@ gnome_commander_SOURCES = 
  	dirlist.h dirlist.cc \
  	eggcellrendererkeys.h eggcellrendererkeys.cc \
  	filter.h filter.cc \
 +	foldview/gnome-cmd-foldview.h \
 +	foldview/gnome-cmd-foldview-control.cc \
 +	foldview/gnome-cmd-foldview-gvfs.h gnome-cmd-foldview-gvfs.cc \
 +	foldview/gnome-cmd-foldview-model.cc \
 +	foldview/gnome-cmd-foldview-private.h  gnome-cmd-foldview.cc \
 +	foldview/gnome-cmd-foldview-treestore.h gnome-cmd-foldview-treestore.cc \
 +	foldview/gnome-cmd-foldview-view.cc \
  	gnome-cmd-about-plugin.h gnome-cmd-about-plugin.cc \
  	gnome-cmd-advrename-lexer.h gnome-cmd-advrename-lexer.ll \
+ 	gnome-cmd-advrename-profile-component.h gnome-cmd-advrename-profile-component.cc \
  	gnome-cmd-app.h gnome-cmd-app.cc \
  	gnome-cmd-chmod-component.h gnome-cmd-chmod-component.cc \
  	gnome-cmd-chmod-dialog.h gnome-cmd-chmod-dialog.cc \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]