← Back to branch summary

~ubuntu-branches/ubuntu/saucy/filezilla/saucy-proposed

~ubuntu-branches/ubuntu/saucy/filezilla/saucy-proposed

« back to all changes in this revision

Viewing changes to src/interface/settings/settingsdialog.h

Committer: Package Import Robot
Author(s): Adrien Cunin
Date: 2012-12-07 17:17:17 UTC
mfrom: (1.1.31)
Revision ID: package-import@ubuntu.com-20121207171717-nt6as62u4pa1uv11

Tags: 3.6.0.2-1ubuntu1

* Merge from Debian experimental. Remaining Ubuntu change:
- Added debian/patches/11_use-decimal-si-by-default.patch in order to
comply with UnitsPolicy

files added:
locales/ky.po

m4/icopyhookw.m4

src/engine/rtt.cpp

src/engine/rtt.h

src/interface/asksavepassworddialog.cpp

src/interface/asksavepassworddialog.h

src/interface/resources/filezilla.svg

src/interface/resources/lone/16x16/bookmark.png

src/interface/resources/lone/32x32/bookmark.png

src/interface/resources/lone/48x48/bookmark.png

src/interface/resources/opencrystal/16x16/bookmark.png

src/interface/resources/opencrystal/32x32/bookmark.png

src/interface/resources/opencrystal/48x48/bookmark.png

src/interface/resources/tango

src/interface/resources/tango/16x16

src/interface/resources/tango/16x16/ascii.png

src/interface/resources/tango/16x16/auto.png

src/interface/resources/tango/16x16/binary.png

src/interface/resources/tango/16x16/bookmark.png

src/interface/resources/tango/16x16/cancel.png

src/interface/resources/tango/16x16/compare.png

src/interface/resources/tango/16x16/disconnect.png

src/interface/resources/tango/16x16/download.png

src/interface/resources/tango/16x16/downloadadd.png

src/interface/resources/tango/16x16/file.png

src/interface/resources/tango/16x16/filter.png

src/interface/resources/tango/16x16/find.png

src/interface/resources/tango/16x16/folder.png

src/interface/resources/tango/16x16/folderclosed.png

src/interface/resources/tango/16x16/localtreeview.png

src/interface/resources/tango/16x16/lock.png

src/interface/resources/tango/16x16/logview.png

src/interface/resources/tango/16x16/processqueue.png

src/interface/resources/tango/16x16/queueview.png

src/interface/resources/tango/16x16/reconnect.png

src/interface/resources/tango/16x16/refresh.png

src/interface/resources/tango/16x16/remotetreeview.png

src/interface/resources/tango/16x16/server.png

src/interface/resources/tango/16x16/sitemanager.png

src/interface/resources/tango/16x16/synchronize.png

src/interface/resources/tango/16x16/unknown.png

src/interface/resources/tango/16x16/upload.png

src/interface/resources/tango/16x16/uploadadd.png

src/interface/resources/tango/32x32

src/interface/resources/tango/32x32/ascii.png

src/interface/resources/tango/32x32/auto.png

src/interface/resources/tango/32x32/binary.png

src/interface/resources/tango/32x32/bookmark.png

src/interface/resources/tango/32x32/cancel.png

src/interface/resources/tango/32x32/compare.png

src/interface/resources/tango/32x32/disconnect.png

src/interface/resources/tango/32x32/download.png

src/interface/resources/tango/32x32/downloadadd.png

src/interface/resources/tango/32x32/file.png

src/interface/resources/tango/32x32/filter.png

src/interface/resources/tango/32x32/find.png

src/interface/resources/tango/32x32/folder.png

src/interface/resources/tango/32x32/folderclosed.png

src/interface/resources/tango/32x32/localtreeview.png

src/interface/resources/tango/32x32/lock.png

src/interface/resources/tango/32x32/logview.png

src/interface/resources/tango/32x32/processqueue.png

src/interface/resources/tango/32x32/queueview.png

src/interface/resources/tango/32x32/reconnect.png

src/interface/resources/tango/32x32/refresh.png

src/interface/resources/tango/32x32/remotetreeview.png

src/interface/resources/tango/32x32/server.png

src/interface/resources/tango/32x32/sitemanager.png

src/interface/resources/tango/32x32/synchronize.png

src/interface/resources/tango/32x32/unknown.png

src/interface/resources/tango/32x32/upload.png

src/interface/resources/tango/32x32/uploadadd.png

src/interface/resources/tango/48x48

src/interface/resources/tango/48x48/ascii.png

src/interface/resources/tango/48x48/auto.png

src/interface/resources/tango/48x48/binary.png

src/interface/resources/tango/48x48/bookmark.png

src/interface/resources/tango/48x48/cancel.png

src/interface/resources/tango/48x48/compare.png

src/interface/resources/tango/48x48/disconnect.png

src/interface/resources/tango/48x48/download.png

src/interface/resources/tango/48x48/downloadadd.png

src/interface/resources/tango/48x48/file.png

src/interface/resources/tango/48x48/filter.png

src/interface/resources/tango/48x48/find.png

src/interface/resources/tango/48x48/folder.png

src/interface/resources/tango/48x48/folderclosed.png

src/interface/resources/tango/48x48/localtreeview.png

src/interface/resources/tango/48x48/lock.png

src/interface/resources/tango/48x48/logview.png

src/interface/resources/tango/48x48/processqueue.png

src/interface/resources/tango/48x48/queueview.png

src/interface/resources/tango/48x48/reconnect.png

src/interface/resources/tango/48x48/refresh.png

src/interface/resources/tango/48x48/remotetreeview.png

src/interface/resources/tango/48x48/server.png

src/interface/resources/tango/48x48/sitemanager.png

src/interface/resources/tango/48x48/synchronize.png

src/interface/resources/tango/48x48/unknown.png

src/interface/resources/tango/48x48/upload.png

src/interface/resources/tango/48x48/uploadadd.png

src/interface/resources/tango/Makefile.am

src/interface/resources/tango/Makefile.in

src/interface/resources/tango/theme.xml

files removed:
.pc/02_fix-ftbfs.patch

.pc/02_fix-ftbfs.patch/src

.pc/02_fix-ftbfs.patch/src/engine

.pc/02_fix-ftbfs.patch/src/engine/directorylistingparser.cpp

debian/filezilla.svg

debian/patches/02_fix-ftbfs.patch

src/interface/resources/lone/16x16/bookmarks.png

src/interface/resources/lone/32x32/bookmarks.png

src/interface/resources/lone/48x48/bookmarks.png

src/interface/resources/opencrystal/16x16/bookmarks.png

src/interface/resources/opencrystal/32x32/bookmarks.png

src/interface/resources/opencrystal/48x48/bookmarks.png

files modified:
.pc/01_remove-xdg-check.patch/configure

.pc/01_remove-xdg-check.patch/configure.in

.pc/11_use-decimal-si-by-default.patch/src/interface/Options.cpp

.pc/applied-patches

AUTHORS

INSTALL

Makefile.in

NEWS

README

aclocal.m4

configure

configure.in

data/Makefile.in

data/install.nsi.in

data/process_running.nsh

debian/changelog

debian/compat

debian/control

debian/filezilla-common.install

debian/patches/series

docs/iconspecs.htm

locales/Makefile.in

locales/ar.po

locales/bg_BG.po

locales/da_DK.po

locales/de.po

locales/el.po

locales/et_EE.po

locales/fi_FI.po

locales/filezilla.pot

locales/fr.po

locales/gl_ES.po

locales/he_IL.po

locales/hu_HU.po

locales/id_ID.po

locales/it.po

locales/ja_JP.po

locales/ku.po

locales/lt_LT.po

locales/lv_LV.po

locales/nn_NO.po

locales/pt_PT.po

locales/ro_RO.po

locales/ru.po

locales/sv.po

locales/th_TH.po

locales/tr.po

locales/uk_UA.po

locales/vi_VN.po

locales/zh_CN.po

locales/zh_TW.po

m4/check_cxx0x.m4

src/Makefile.in

src/dbus/Makefile.in

src/dbus/desktop_notification.h

src/dbus/power_management_inhibitor.cpp

src/dbus/session_manager.cpp

src/dbus/wxdbusconnection.cpp

src/dbus/wxdbusconnection.h

src/dbus/wxdbusmessage.cpp

src/dbus/wxdbusmessage.h

src/engine/ControlSocket.cpp

src/engine/ControlSocket.h

src/engine/FileZillaEngine.cpp

src/engine/Makefile.am

src/engine/Makefile.in

src/engine/backend.cpp

src/engine/directorycache.cpp

src/engine/directorycache.h

src/engine/directorylisting.cpp

src/engine/directorylistingparser.cpp

src/engine/directorylistingparser.h

src/engine/engineprivate.cpp

src/engine/externalipresolver.cpp

src/engine/ftpcontrolsocket.cpp

src/engine/ftpcontrolsocket.h

src/engine/httpcontrolsocket.cpp

src/engine/httpcontrolsocket.h

src/engine/iothread.cpp

src/engine/iothread.h

src/engine/local_filesys.cpp

src/engine/logging.cpp

src/engine/misc.cpp

src/engine/option_change_event_handler.cpp

src/engine/pathcache.cpp

src/engine/pathcache.h

src/engine/proxy.cpp

src/engine/proxy.h

src/engine/ratelimiter.cpp

src/engine/ratelimiter.h

src/engine/server.cpp

src/engine/servercapabilities.h

src/engine/serverpath.cpp

src/engine/sftpcontrolsocket.cpp

src/engine/sftpcontrolsocket.h

src/engine/socket.cpp

src/engine/string_coalescer.cpp

src/engine/timeex.cpp

src/engine/tlssocket.cpp

src/engine/tlssocket.h

src/engine/transfersocket.cpp

src/fzshellext/Makefile.in

src/fzshellext/shellext.cpp

src/fzshellext/shellext.h

src/include/FileZillaEngine.h

src/include/Makefile.in

src/include/commands.h

src/include/config.h.in

src/include/directorylisting.h

src/include/engineprivate.h

src/include/externalipresolver.h

src/include/local_filesys.h

src/include/local_path.h

src/include/misc.h

src/include/notification.h

src/include/option_change_event_handler.h

src/include/optionsbase.h

src/include/server.h

src/include/socket.h

src/include/threadex.h

src/include/timeex.h

src/interface/FileZilla.cpp

src/interface/LocalListView.cpp

src/interface/LocalTreeView.cpp

src/interface/Mainfrm.cpp

src/interface/Mainfrm.h

src/interface/Makefile.am

src/interface/Makefile.in

src/interface/Options.cpp

src/interface/Options.h

src/interface/QueueView.cpp

src/interface/QueueView.h

src/interface/RemoteListView.cpp

src/interface/RemoteListView.h

src/interface/RemoteTreeView.cpp

src/interface/StatusView.cpp

src/interface/aboutdialog.cpp

src/interface/aboutdialog.h

src/interface/asyncrequestqueue.cpp

src/interface/aui_notebook_ex.cpp

src/interface/auto_ascii_files.cpp

src/interface/bookmarks_dialog.cpp

src/interface/bookmarks_dialog.h

src/interface/buildinfo.cpp

src/interface/buildinfo.h

src/interface/chmoddialog.cpp

src/interface/chmoddialog.h

src/interface/clearprivatedata.cpp

src/interface/clearprivatedata.h

src/interface/commandqueue.cpp

src/interface/conditionaldialog.cpp

src/interface/context_control.cpp

src/interface/context_control.h

src/interface/customheightlistctrl.cpp

src/interface/dndobjects.cpp

src/interface/dndobjects.h

src/interface/edithandler.cpp

src/interface/edithandler.h

src/interface/export.cpp

src/interface/fileexistsdlg.cpp

src/interface/fileexistsdlg.h

src/interface/filelistctrl.cpp

src/interface/filelistctrl.h

src/interface/filezillaapp.h

src/interface/filter.cpp

src/interface/filter.h

src/interface/filter_conditions_dialog.cpp

src/interface/filter_conditions_dialog.h

src/interface/filteredit.cpp

src/interface/filteredit.h

src/interface/import.cpp

src/interface/inputdialog.cpp

src/interface/inputdialog.h

src/interface/ipcmutex.cpp

src/interface/ipcmutex.h

src/interface/led.cpp

src/interface/listctrlex.cpp

src/interface/listctrlex.h

src/interface/listingcomparison.cpp

src/interface/listingcomparison.h

src/interface/locale_initializer.cpp

src/interface/loginmanager.cpp

src/interface/loginmanager.h

src/interface/manual_transfer.cpp

src/interface/menu_bar.cpp

src/interface/netconfwizard.cpp

src/interface/netconfwizard.h

src/interface/power_management.cpp

src/interface/power_management.h

src/interface/prefix.cpp

src/interface/queue.cpp

src/interface/queue.h

src/interface/queue_storage.cpp

src/interface/queueview_failed.cpp

src/interface/quickconnectbar.cpp

src/interface/recentserverlist.cpp

src/interface/recursive_operation.cpp

src/interface/recursive_operation.h

src/interface/resources/16x16/Makefile.in

src/interface/resources/32x32/Makefile.in

src/interface/resources/Makefile.am

src/interface/resources/Makefile.in

src/interface/resources/blukis/Makefile.in

src/interface/resources/cyril/16x16/Makefile.in

src/interface/resources/cyril/Makefile.in

src/interface/resources/dialogs.xrc

src/interface/resources/lone/Makefile.am

src/interface/resources/lone/Makefile.in

src/interface/resources/menus.xrc

src/interface/resources/minimal/Makefile.in

src/interface/resources/opencrystal/Makefile.am

src/interface/resources/opencrystal/Makefile.in

src/interface/resources/settings.xrc

src/interface/search.cpp

src/interface/settings/optionspage.h

src/interface/settings/optionspage_connection_active.cpp

src/interface/settings/optionspage_connection_sftp.cpp

src/interface/settings/optionspage_edit.cpp

src/interface/settings/optionspage_edit_associations.cpp

src/interface/settings/optionspage_fileexists.cpp

src/interface/settings/optionspage_filelists.cpp

src/interface/settings/optionspage_filetype.cpp

src/interface/settings/optionspage_interface.cpp

src/interface/settings/optionspage_language.cpp

src/interface/settings/optionspage_proxy.cpp

src/interface/settings/optionspage_themes.cpp

src/interface/settings/settingsdialog.cpp

src/interface/settings/settingsdialog.h

src/interface/sitemanager.cpp

src/interface/sitemanager_dialog.cpp

src/interface/splitter.cpp

src/interface/state.cpp

src/interface/statusbar.cpp

src/interface/statusbar.h

src/interface/statuslinectrl.cpp

src/interface/statuslinectrl.h

src/interface/systemimagelist.cpp

src/interface/systemimagelist.h

src/interface/themeprovider.cpp

src/interface/themeprovider.h

src/interface/toolbar.cpp

src/interface/treectrlex.cpp

src/interface/treectrlex.h

src/interface/updatewizard.cpp

src/interface/updatewizard.h

src/interface/verifycertdialog.cpp

src/interface/verifycertdialog.h

src/interface/verifyhostkeydialog.cpp

src/interface/view.cpp

src/interface/viewheader.cpp

src/interface/volume_enumerator.cpp

src/interface/welcome_dialog.cpp

src/interface/welcome_dialog.h

src/interface/window_state_manager.cpp

src/interface/wrapengine.cpp

src/interface/xh_menu_ex.cpp

src/interface/xh_menu_ex.h

src/interface/xh_text_ex.cpp

src/interface/xh_toolb_ex.cpp

src/interface/xh_toolb_ex.h

src/interface/xmlfunctions.cpp

src/interface/xmlfunctions.h

src/putty/Makefile.am

src/putty/Makefile.in

src/putty/unix/Makefile.in

src/putty/windows/Makefile.in

src/tinyxml/Makefile.in

tests/Makefile.in

tests/dirparsertest.cpp

tests/test.cpp

Show diffs side-by-side

added added

removed removed

src/interface/settings/settingsdialog.h

21

21

bool LoadPages();

22

22

23

23

COptions* m_pOptions;

24

24

25

25

COptionsPage* m_activePanel;

26

26

27

27

struct t_page

Older »