[gnote: 3/21] Merge in master
- From: Aurimas Černius <aurimasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnote: 3/21] Merge in master
- Date: Tue, 20 Jun 2017 20:15:10 +0000 (UTC)
commit e9d0545d65b604c647046160b055e546b6963cf2
Merge: d5601c9 043c570
Author: Aurimas Černius <aurisc4 gmail com>
Date: Sat Apr 1 21:04:17 2017 +0300
Merge in master
.gitignore | 11 +
Makefile.am | 8 +-
NEWS | 291 ++
autogen.sh | 30 +-
configure.ac | 54 +-
data/Makefile.am | 2 +-
data/org.gnome.Gnote.service.in | 2 +-
data/org.gnome.gnote.gschema.xml.in | 21 +-
data/ui/Makefile.am | 8 +
data/ui/shortcuts-gnote.ui | 239 ++
help/C/figures/add-to-notebook.png | Bin 33315 -> 68081 bytes
help/C/figures/gnote-new-note.png | Bin 13633 -> 10214 bytes
help/C/figures/gnote-preferences-hotkeys.png | Bin 31538 -> 0 bytes
help/C/figures/gnote-template-note.png | Bin 28786 -> 25933 bytes
help/C/gnote-addin-tableofcontents.page | 9 +-
help/C/gnote-addins-preferences.page | 6 +-
help/C/gnote-common-problems.page | 6 +-
help/C/gnote-hotkeys.page | 43 -
help/C/gnote-notes-preferences.page | 2 +-
help/C/gnote-searching-notes.page | 2 +-
help/C/gnote-working-with-notebooks.page | 4 +-
help/Makefile.am | 4 +-
help/cs/cs.po | 381 +--
help/de/de.po | 765 ++--
help/de/figures/add-notebook-search.png | Bin 42013 -> 32881 bytes
help/de/figures/add-to-notebook.png | Bin 35586 -> 142590 bytes
help/de/figures/delete-notebook.png | Bin 0 -> 43186 bytes
help/de/figures/gnote-addin-table-of-contents.png | Bin 0 -> 39960 bytes
help/de/figures/gnote-new-note.png | Bin 21239 -> 10695 bytes
help/de/figures/gnote-preferences-editing.png | Bin 53829 -> 38789 bytes
help/de/figures/gnote-search-all-notes.png | Bin 0 -> 26532 bytes
help/de/figures/gnote-sync-progress.png | Bin 0 -> 44909 bytes
help/de/figures/gnote-syncprefs-advanced.png | Bin 0 -> 23369 bytes
help/de/figures/gnote-template-note.png | Bin 45459 -> 32588 bytes
help/de/figures/note-template.png | Bin 0 -> 43295 bytes
help/el/el.po | 519 ++--
help/es/es.po | 447 +--
help/hu/hu.po | 1083 +++---
help/lt/figures/add-to-notebook.png | Bin 30848 -> 74130 bytes
help/lt/figures/gnote-new-note.png | Bin 14498 -> 10658 bytes
help/lt/figures/gnote-template-note.png | Bin 30979 -> 27999 bytes
help/lt/lt.po | 557 +--
help/sv/sv.po | 3938 ++++++++++++-------
libtomboy/Makefile.am | 27 -
libtomboy/eggaccelerators.c | 657 ---
libtomboy/eggaccelerators.h | 86 -
libtomboy/tomboykeybinder.c | 344 --
libtomboy/tomboykeybinder.h | 48 -
libtomboy/tomboyutil.c | 166 -
libtomboy/tomboyutil.h | 39 -
m4/ax_cxx_compile_stdcxx.m4 | 562 +++
m4/ax_cxx_compile_stdcxx_11.m4 | 124 +-
m4/ax_require_defined.m4 | 37 +
m4/boost.m4 | 1239 ------
po/LINGUAS | 3 +
po/POTFILES.in | 16 +-
po/POTFILES.skip | 22 +-
po/as.po | 989 +++---
po/bg.po | 1 +
po/bn_IN.po | 2791 ++++++++------
po/bs.po | 2651 ++++++++++++
po/ca.po | 4067 ++++++++++++-------
po/ca valencia po | 1 +
po/cs.po | 1462 ++++----
po/da.po | 3581 +++++++++++------
po/de.po | 1638 ++++-----
po/el.po | 1232 +++---
po/eo.po | 1 +
po/es.po | 1352 ++++---
po/eu.po | 653 ++--
po/fr.po | 6 +-
po/gu.po | 1946 ++++++---
po/hi.po | 1972 ++++++----
po/hu.po | 1611 ++++-----
po/id.po | 1721 ++++----
po/it.po | 3906 ++++++++++--------
po/kn.po | 2321 +++++++----
po/ko.po | 2 +-
po/lt.po | 1716 +++++----
po/ml.po | 2 +-
po/mr.po | 2004 ++++++----
po/nb.po | 2 +-
po/oc.po | 3033 ++++++++++++++
po/pl.po | 1838 +++++-----
po/pt.po | 3884 ++++++++++++-------
po/pt_BR.po | 1774 +++++----
po/ro.po | 2 +-
po/ru.po | 6 +-
po/sk.po | 3365 ++++++++++++++++
po/sl.po | 2 +-
po/sr.po | 1554 ++++----
po/sr latin po | 1554 ++++----
po/sv.po | 3208 ++++++++++-----
po/ta.po | 782 ++--
po/te.po | 2123 +++++++----
po/th.po | 1 +
po/tr.po | 4216 ++++++++++++--------
po/zh_CN.po | 2 +-
po/zh_HK.po | 2 +-
src/Makefile.am | 74 +-
src/actionmanager.cpp | 169 +-
src/actionmanager.hpp | 53 +-
src/addininfo.cpp | 44 +-
src/addininfo.hpp | 51 +-
src/addinmanager.cpp | 95 +-
src/addinmanager.hpp | 60 +-
src/addins/backlinks/Makefile.am | 5 +-
src/addins/backlinks/backlinkmenuitem.cpp | 107 -
src/addins/backlinks/backlinkmenuitem.hpp | 72 -
src/addins/backlinks/backlinks.desktop.in.in | 7 +-
src/addins/backlinks/backlinksnoteaddin.cpp | 88 +-
src/addins/backlinks/backlinksnoteaddin.hpp | 15 +-
src/addins/bugzilla/Makefile.am | 4 +-
src/addins/bugzilla/bugzilla.desktop.in.in | 2 +-
src/addins/bugzilla/bugzillalink.cpp | 18 +-
src/addins/bugzilla/bugzillalink.hpp | 10 +-
src/addins/bugzilla/bugzillanoteaddin.cpp | 17 +-
src/addins/bugzilla/bugzillanoteaddin.hpp | 8 +-
src/addins/bugzilla/bugzillapreferences.cpp | 52 +-
src/addins/bugzilla/bugzillapreferences.hpp | 22 +-
src/addins/bugzilla/insertbugaction.cpp | 3 +-
src/addins/bugzilla/insertbugaction.hpp | 7 +-
src/addins/exporttogtg/Makefile.am | 4 +-
src/addins/exporttogtg/exporttogtg.desktop.in.in | 7 +-
src/addins/exporttogtg/exporttogtgnoteaddin.cpp | 33 +-
src/addins/exporttogtg/exporttogtgnoteaddin.hpp | 5 +-
src/addins/exporttohtml/Makefile.am | 6 +-
src/addins/exporttohtml/exporttohtml.desktop.in.in | 7 +-
src/addins/exporttohtml/exporttohtmldialog.cpp | 10 +-
src/addins/exporttohtml/exporttohtmldialog.hpp | 7 +-
src/addins/exporttohtml/exporttohtmlnoteaddin.cpp | 49 +-
src/addins/exporttohtml/exporttohtmlnoteaddin.hpp | 11 +-
src/addins/filesystemsyncservice/Makefile.am | 4 +-
.../filesystemsyncservice.desktop.in.in | 2 +-
.../filesystemsyncserviceaddin.cpp | 47 +-
.../filesystemsyncserviceaddin.hpp | 10 +-
src/addins/fixedwidth/Makefile.am | 5 +-
src/addins/fixedwidth/fixedwidth.desktop.in.in | 6 +-
src/addins/fixedwidth/fixedwidthmenuitem.cpp | 87 -
src/addins/fixedwidth/fixedwidthmenuitem.hpp | 61 -
src/addins/fixedwidth/fixedwidthnoteaddin.cpp | 68 +-
src/addins/fixedwidth/fixedwidthnoteaddin.hpp | 10 +-
src/addins/fixedwidth/fixedwidthtag.hpp | 4 +-
src/addins/inserttimestamp/Makefile.am | 4 +-
.../inserttimestamp/inserttimestamp.desktop.in.in | 6 +-
.../inserttimestamp/inserttimestampnoteaddin.cpp | 47 +-
.../inserttimestamp/inserttimestampnoteaddin.hpp | 10 +-
.../inserttimestamp/inserttimestamppreferences.cpp | 20 +-
.../inserttimestamp/inserttimestamppreferences.hpp | 8 +-
src/addins/notedirectorywatcher/Makefile.am | 4 +-
.../notedirectorywatcher.desktop.in.in | 2 +-
.../notedirectorywatcherapplicationaddin.cpp | 71 +-
.../notedirectorywatcherapplicationaddin.hpp | 14 +-
src/addins/noteoftheday/Makefile.am | 4 +-
src/addins/noteoftheday/noteoftheday.cpp | 33 +-
src/addins/noteoftheday/noteoftheday.desktop.in.in | 2 +-
src/addins/noteoftheday/noteoftheday.hpp | 16 +-
.../noteoftheday/noteofthedayapplicationaddin.cpp | 4 +-
src/addins/printnotes/Makefile.am | 4 +-
src/addins/printnotes/printnotes.desktop.in.in | 7 +-
src/addins/printnotes/printnotesnoteaddin.cpp | 61 +-
src/addins/printnotes/printnotesnoteaddin.hpp | 6 +-
src/addins/readonly/Makefile.am | 4 +-
src/addins/readonly/readonly.desktop.in.in | 5 +-
src/addins/readonly/readonlynoteaddin.cpp | 71 +-
src/addins/readonly/readonlynoteaddin.hpp | 9 +-
src/addins/replacetitle/Makefile.am | 4 +-
src/addins/replacetitle/replacetitle.desktop.in.in | 6 +-
src/addins/replacetitle/replacetitlenoteaddin.cpp | 48 +-
src/addins/replacetitle/replacetitlenoteaddin.hpp | 6 +-
src/addins/specialnotes/Makefile.am | 4 +-
src/addins/specialnotes/specialnotes.desktop.in.in | 2 +-
.../specialnotes/specialnotesapplicationaddin.cpp | 4 +-
src/addins/statistics/Makefile.am | 4 +-
src/addins/statistics/statistics.desktop.in.in | 6 +-
.../statistics/statisticsapplicationaddin.cpp | 28 +-
.../statistics/statisticsapplicationaddin.hpp | 7 +-
src/addins/statistics/statisticswidget.cpp | 27 +-
src/addins/statistics/statisticswidget.hpp | 4 +-
src/addins/stickynoteimport/Makefile.am | 4 +-
.../stickynoteimport.desktop.in.in | 4 +-
.../stickynoteimport/stickynoteimportnoteaddin.cpp | 54 +-
.../stickynoteimport/stickynoteimportnoteaddin.hpp | 10 +-
src/addins/tableofcontents/Makefile.am | 8 +-
.../tableofcontents/tableofcontents.desktop.in.in | 8 +-
.../tableofcontents/tableofcontentsaction.cpp | 75 -
.../tableofcontents/tableofcontentsmenuitem.cpp | 17 +-
.../tableofcontents/tableofcontentsmenuitem.hpp | 5 +-
.../tableofcontents/tableofcontentsnoteaddin.cpp | 200 +-
.../tableofcontents/tableofcontentsnoteaddin.hpp | 22 +-
.../tableofcontents/tableofcontentsutils.cpp | 45 +
...contentsaction.hpp => tableofcontentsutils.hpp} | 28 +-
src/addins/todo/Makefile.am | 4 +-
src/addins/todo/todo.desktop.in.in | 2 +-
src/addins/todo/todonoteaddin.cpp | 10 +-
src/addins/todo/todonoteaddin.hpp | 3 +-
src/addins/tomboyimport/Makefile.am | 4 +-
src/addins/tomboyimport/tomboyimport.desktop.in.in | 2 +-
src/addins/tomboyimport/tomboyimportaddin.cpp | 9 +-
src/addins/tomboyimport/tomboyimportaddin.hpp | 7 +-
src/addins/underline/Makefile.am | 5 +-
src/addins/underline/underline.desktop.in.in | 8 +-
src/addins/underline/underlinemenuitem.cpp | 87 -
src/addins/underline/underlinenoteaddin.cpp | 60 +-
src/addins/underline/underlinenoteaddin.hpp | 10 +-
src/addins/underline/underlinetag.hpp | 4 +-
src/addins/webdavsyncservice/Makefile.am | 4 +-
.../webdavsyncservice.desktop.in.in | 4 +-
.../webdavsyncservice/webdavsyncserviceaddin.cpp | 75 +-
.../webdavsyncservice/webdavsyncserviceaddin.hpp | 28 +-
src/base/macros.hpp | 37 +-
src/dbus/remotecontrol-client-glue.cpp | 18 +-
src/dbus/remotecontrol-client-glue.hpp | 20 +-
src/dbus/remotecontrol-glue.cpp | 40 +-
src/dbus/remotecontrol-glue.hpp | 78 +-
src/dbus/remotecontrol.cpp | 84 +-
src/dbus/remotecontrol.hpp | 55 +-
src/dbus/remotecontrolclient.hpp | 8 +-
src/dbus/searchprovider.cpp | 28 +-
src/debug.cpp | 5 +-
src/debug.hpp | 2 +-
src/gnome_keyring/keyringexception.hpp | 8 +-
src/gnome_keyring/ring.cpp | 23 +-
src/gnome_keyring/ring.hpp | 17 +-
src/gnote.cpp | 222 +-
src/gnote.hpp | 60 +-
src/iactionmanager.hpp | 29 +-
src/iconmanager.cpp | 6 +-
src/iconmanager.hpp | 9 +-
src/ignote.cpp | 12 +-
src/ignote.hpp | 12 +-
src/itagmanager.hpp | 12 +-
src/mainwindow.cpp | 53 +-
src/mainwindow.hpp | 12 +-
src/mainwindowaction.cpp | 68 +
src/mainwindowaction.hpp | 65 +
src/mainwindowembeds.hpp | 18 +-
src/noncopyable.hpp | 43 +
src/note.cpp | 62 +-
src/note.hpp | 23 +-
src/noteaddin.cpp | 76 +-
src/noteaddin.hpp | 18 +-
src/notebase.cpp | 46 +-
src/notebase.hpp | 18 +-
src/notebooks/createnotebookdialog.cpp | 12 +-
src/notebooks/createnotebookdialog.hpp | 5 +-
src/notebooks/notebook.cpp | 25 +-
src/notebooks/notebook.hpp | 20 +-
src/notebooks/notebookapplicationaddin.cpp | 133 +-
src/notebooks/notebookapplicationaddin.hpp | 14 +-
src/notebooks/notebookmanager.cpp | 37 +-
src/notebooks/notebookmanager.hpp | 11 +-
src/notebooks/notebookmenuitem.cpp | 7 +-
src/notebooks/notebookmenuitem.hpp | 7 +-
src/notebooks/notebooknewnotemenuitem.cpp | 6 +-
src/notebooks/notebooknoteaddin.cpp | 239 +-
src/notebooks/notebooknoteaddin.hpp | 39 +-
src/notebooks/specialnotebooks.cpp | 10 +-
src/notebooks/specialnotebooks.hpp | 12 +-
src/notebuffer.cpp | 151 +-
src/notebuffer.hpp | 26 +-
src/noteeditor.cpp | 45 +-
src/noteeditor.hpp | 9 +-
src/notemanager.cpp | 47 +-
src/notemanager.hpp | 10 +-
src/notemanagerbase.cpp | 60 +-
src/notemanagerbase.hpp | 18 +-
src/noterenamedialog.cpp | 10 +-
src/noterenamedialog.hpp | 14 +-
src/notetag.cpp | 20 +-
src/notetag.hpp | 31 +-
src/notewindow.cpp | 624 ++--
src/notewindow.hpp | 93 +-
src/preferences.cpp | 7 +-
src/preferences.hpp | 8 +-
src/preferencesdialog.cpp | 220 +-
src/preferencesdialog.hpp | 21 +-
src/preferencetabaddin.hpp | 6 +-
src/prefskeybinder.cpp | 245 --
src/prefskeybinder.hpp | 76 -
src/recentchanges.cpp | 259 +-
src/recentchanges.hpp | 34 +-
src/remotecontrolproxy.cpp | 22 +-
src/search.cpp | 44 +-
src/search.hpp | 17 +-
src/searchnoteswidget.cpp | 104 +-
src/searchnoteswidget.hpp | 25 +-
src/sharp/addinstreemodel.cpp | 14 +-
src/sharp/addinstreemodel.hpp | 12 +-
src/sharp/datetime.cpp | 14 +-
src/sharp/datetime.hpp | 17 +-
src/sharp/directory.cpp | 30 +-
src/sharp/directory.hpp | 26 +-
src/sharp/dynamicmodule.cpp | 11 +-
src/sharp/dynamicmodule.hpp | 7 +-
src/sharp/exception.hpp | 9 +-
src/sharp/fileinfo.cpp | 20 +-
src/sharp/fileinfo.hpp | 14 +-
src/sharp/files.cpp | 79 +-
src/sharp/files.hpp | 23 +-
src/sharp/modulemanager.cpp | 13 +-
src/sharp/modulemanager.hpp | 13 +-
src/sharp/process.cpp | 8 +-
src/sharp/process.hpp | 23 +-
src/sharp/propertyeditor.cpp | 4 +-
src/sharp/propertyeditor.hpp | 4 +-
src/sharp/streamreader.cpp | 5 +-
src/sharp/streamreader.hpp | 9 +-
src/sharp/streamwriter.cpp | 6 +-
src/sharp/streamwriter.hpp | 10 +-
src/sharp/string.cpp | 185 +-
src/sharp/string.hpp | 33 +-
src/sharp/timespan.cpp | 17 +-
src/sharp/timespan.hpp | 8 +-
src/sharp/uri.cpp | 29 +-
src/sharp/uri.hpp | 19 +-
src/sharp/uuid.hpp | 6 +-
src/sharp/xml.cpp | 12 +-
src/sharp/xml.hpp | 14 +-
src/sharp/xmlconvert.cpp | 7 +-
src/sharp/xmlconvert.hpp | 7 +-
src/sharp/xmlreader.cpp | 35 +-
src/sharp/xmlreader.hpp | 28 +-
src/sharp/xmlwriter.cpp | 30 +-
src/sharp/xmlwriter.hpp | 28 +-
src/sharp/xsltargumentlist.cpp | 8 +-
src/sharp/xsltargumentlist.hpp | 9 +-
src/sharp/xsltransform.cpp | 4 +-
src/sharp/xsltransform.hpp | 5 +-
src/synchronization/filesystemsyncserver.cpp | 117 +-
src/synchronization/filesystemsyncserver.hpp | 36 +-
src/synchronization/fusesyncserviceaddin.cpp | 59 +-
src/synchronization/fusesyncserviceaddin.hpp | 22 +-
src/synchronization/gnotesyncclient.cpp | 38 +-
src/synchronization/gnotesyncclient.hpp | 20 +-
src/synchronization/isyncmanager.cpp | 8 +-
src/synchronization/isyncmanager.hpp | 25 +-
src/synchronization/silentui.cpp | 6 +-
src/synchronization/silentui.hpp | 6 +-
src/synchronization/syncdialog.cpp | 97 +-
src/synchronization/syncdialog.hpp | 20 +-
src/synchronization/syncmanager.cpp | 103 +-
src/synchronization/syncmanager.hpp | 10 +-
src/synchronization/syncserviceaddin.hpp | 6 +-
src/synchronization/syncui.cpp | 9 +-
src/synchronization/syncui.hpp | 11 +-
src/synchronization/syncutils.cpp | 56 +-
src/synchronization/syncutils.hpp | 23 +-
src/tag.cpp | 10 +-
src/tag.hpp | 19 +-
src/tagmanager.cpp | 32 +-
src/tagmanager.hpp | 16 +-
src/test/dttest.cpp | 92 -
src/test/fileinfotest.cpp | 62 -
src/test/filestest.cpp | 74 -
src/test/notemanagertest.cpp | 46 -
src/test/notetest.cpp | 50 -
src/{keybinder.hpp => test/runner.cpp} | 33 +-
src/test/stringtest.cpp | 98 -
src/test/testnotemanager.cpp | 4 +-
src/test/testsyncclient.hpp | 4 +-
src/test/testtagmanager.cpp | 20 +-
src/test/testtagmanager.hpp | 12 +-
src/test/trietest.cpp | 48 -
src/test/unit/datetimeutests.cpp | 81 +
src/test/unit/fileinfoutests.cpp | 56 +
src/test/unit/filesutests.cpp | 134 +
.../gnotesyncclientutests.cpp} | 40 +-
src/test/unit/notemanagerutests.cpp | 47 +
.../unit/noteutests.cpp} | 50 +-
src/test/unit/stringutests.cpp | 158 +
src/test/unit/trieutests.cpp | 148 +
src/test/unit/uriutests.cpp | 63 +
src/test/unit/xmlreaderutests.cpp | 111 +
src/test/uritest.cpp | 52 -
src/test/xmlreadertest.cpp | 81 -
src/tray.cpp | 593 ---
src/tray.hpp | 163 -
src/trie.hpp | 18 +-
src/triehit.hpp | 4 +-
src/undo.cpp | 67 +-
src/undo.hpp | 29 +-
src/utils.cpp | 192 +-
src/utils.hpp | 76 +-
src/watchers.cpp | 126 +-
src/watchers.hpp | 22 +-
src/xkeybinder.cpp | 107 -
src/xkeybinder.hpp | 57 -
388 files changed, 52602 insertions(+), 35700 deletions(-)
---
diff --cc src/Makefile.am
index a8a5b29,7c00646..10a3872
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -71,23 -35,20 +35,33 @@@ gnoteunittests_SOURCES =
test/testnotemanager.cpp test/testnotemanager.hpp \
test/testsyncclient.hpp test/testsyncclient.cpp \
test/testtagmanager.cpp test/testtagmanager.hpp \
- synchronization/gnotesyncclient.hpp synchronization/gnotesyncclient.cpp \
+ test/unit/datetimeutests.cpp \
+ test/unit/filesutests.cpp \
+ test/unit/fileinfoutests.cpp \
+ test/unit/gnotesyncclientutests.cpp \
+ test/unit/noteutests.cpp \
+ test/unit/notemanagerutests.cpp \
+ test/unit/stringutests.cpp \
+ test/unit/trieutests.cpp \
+ test/unit/uriutests.cpp \
+ test/unit/xmlreaderutests.cpp \
$(NULL)
- gnotesyncclienttest_LDADD = $(GNOTE_LIBS)
+ gnoteunittests_LDADD = libgnote.la @UNITTESTCPP_LIBS@
+ endif
+syncmanagertest_SOURCES = test/syncmanagertest.cpp \
+ test/testnote.cpp test/testnote.hpp \
+ test/testnotemanager.cpp test/testnotemanager.hpp \
+ test/testsyncaddin.cpp test/testsyncaddin.hpp \
+ test/testsyncclient.cpp test/testsyncclient.hpp \
+ test/testsyncmanager.cpp test/testsyncmanager.hpp \
+ test/testtagmanager.cpp test/testtagmanager.hpp \
+ synchronization/gnotesyncclient.hpp synchronization/gnotesyncclient.cpp \
+ synchronization/silentui.hpp synchronization/silentui.cpp \
+ synchronization/syncmanager.hpp synchronization/syncmanager.cpp \
+ $(NULL)
+syncmanagertest_LDADD = $(GNOTE_LIBS)
+
SUBDIRS += dbus
DBUS_SOURCES=remotecontrolproxy.hpp remotecontrolproxy.cpp \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
