diff -Nru kkedit-0.4.0/autom4te.cache/output.0 kkedit-0.4.1/autom4te.cache/output.0 --- kkedit-0.4.0/autom4te.cache/output.0 2016-08-25 10:00:11.000000000 +0000 +++ kkedit-0.4.1/autom4te.cache/output.0 2016-08-26 09:41:39.000000000 +0000 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.69 for KKEdit 0.4.0. +@%:@ Generated by GNU Autoconf 2.69 for KKEdit 0.4.1. @%:@ @%:@ Report bugs to . @%:@ @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='KKEdit' PACKAGE_TARNAME='KKEdit' -PACKAGE_VERSION='0.4.0' -PACKAGE_STRING='KKEdit 0.4.0' +PACKAGE_VERSION='0.4.1' +PACKAGE_STRING='KKEdit 0.4.1' PACKAGE_BUGREPORT='PROJ' PACKAGE_URL='' @@ -1300,7 +1300,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures KKEdit 0.4.0 to adapt to many kinds of systems. +\`configure' configures KKEdit 0.4.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1370,7 +1370,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of KKEdit 0.4.0:";; + short | recursive ) echo "Configuration of KKEdit 0.4.1:";; esac cat <<\_ACEOF @@ -1495,7 +1495,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -KKEdit configure 0.4.0 +KKEdit configure 0.4.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1667,7 +1667,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by KKEdit $as_me 0.4.0, which was +It was created by KKEdit $as_me 0.4.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3104,7 +3104,7 @@ # Define the identity of the package. PACKAGE='KKEdit' - VERSION='0.4.0' + VERSION='0.4.1' cat >>confdefs.h <<_ACEOF @@ -5352,7 +5352,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by KKEdit $as_me 0.4.0, which was +This file was extended by KKEdit $as_me 0.4.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5418,7 +5418,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -KKEdit config.status 0.4.0 +KKEdit config.status 0.4.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -7554,7 +7554,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by KKEdit $as_me 0.4.0, which was +This file was extended by KKEdit $as_me 0.4.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7620,7 +7620,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -KKEdit config.status 0.4.0 +KKEdit config.status 0.4.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru kkedit-0.4.0/autom4te.cache/output.1 kkedit-0.4.1/autom4te.cache/output.1 --- kkedit-0.4.0/autom4te.cache/output.1 2016-08-25 10:00:12.000000000 +0000 +++ kkedit-0.4.1/autom4te.cache/output.1 2016-08-26 09:41:39.000000000 +0000 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.69 for KKEdit 0.4.0. +@%:@ Generated by GNU Autoconf 2.69 for KKEdit 0.4.1. @%:@ @%:@ Report bugs to . @%:@ @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='KKEdit' PACKAGE_TARNAME='KKEdit' -PACKAGE_VERSION='0.4.0' -PACKAGE_STRING='KKEdit 0.4.0' +PACKAGE_VERSION='0.4.1' +PACKAGE_STRING='KKEdit 0.4.1' PACKAGE_BUGREPORT='PROJ' PACKAGE_URL='' @@ -1300,7 +1300,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures KKEdit 0.4.0 to adapt to many kinds of systems. +\`configure' configures KKEdit 0.4.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1370,7 +1370,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of KKEdit 0.4.0:";; + short | recursive ) echo "Configuration of KKEdit 0.4.1:";; esac cat <<\_ACEOF @@ -1495,7 +1495,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -KKEdit configure 0.4.0 +KKEdit configure 0.4.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1667,7 +1667,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by KKEdit $as_me 0.4.0, which was +It was created by KKEdit $as_me 0.4.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3104,7 +3104,7 @@ # Define the identity of the package. PACKAGE='KKEdit' - VERSION='0.4.0' + VERSION='0.4.1' cat >>confdefs.h <<_ACEOF @@ -5352,7 +5352,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by KKEdit $as_me 0.4.0, which was +This file was extended by KKEdit $as_me 0.4.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5418,7 +5418,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -KKEdit config.status 0.4.0 +KKEdit config.status 0.4.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -7554,7 +7554,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by KKEdit $as_me 0.4.0, which was +This file was extended by KKEdit $as_me 0.4.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7620,7 +7620,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -KKEdit config.status 0.4.0 +KKEdit config.status 0.4.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru kkedit-0.4.0/autom4te.cache/requests kkedit-0.4.1/autom4te.cache/requests --- kkedit-0.4.0/autom4te.cache/requests 2016-08-25 10:00:13.000000000 +0000 +++ kkedit-0.4.1/autom4te.cache/requests 2016-08-26 09:41:40.000000000 +0000 @@ -35,54 +35,54 @@ 'configure.ac' ], { - '_PKG_SHORT_ERRORS_SUPPORTED' => 1, - 'AM_SANITY_CHECK' => 1, - 'PKG_CHECK_EXISTS' => 1, - 'PKG_NOARCH_INSTALLDIR' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'm4_pattern_forbid' => 1, - '_AM_SET_OPTIONS' => 1, - 'PKG_CHECK_MODULES' => 1, - '_m4_warn' => 1, - 'AM_MAKE_INCLUDE' => 1, + 'AM_RUN_LOG' => 1, + 'AM_PROG_INSTALL_SH' => 1, 'PKG_CHECK_VAR' => 1, - 'AM_SILENT_RULES' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + 'AM_SET_LEADING_DOT' => 1, 'AC_DEFUN_ONCE' => 1, - 'm4_include' => 1, - '_AM_SUBST_NOTMAKE' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + '_m4_warn' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, '_AM_SET_OPTION' => 1, - 'AM_SET_DEPDIR' => 1, + 'AM_PROG_CC_C_O' => 1, + 'm4_include' => 1, + 'AM_CONDITIONAL' => 1, '_AM_MANGLE_OPTION' => 1, - 'AM_MISSING_HAS_RUN' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - 'AM_SUBST_NOTMAKE' => 1, - '_AM_IF_OPTION' => 1, - 'AM_PROG_INSTALL_STRIP' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + '_AM_CONFIG_MACRO_DIRS' => 1, + 'AM_SANITY_CHECK' => 1, + 'AM_MAKE_INCLUDE' => 1, + '_AM_SUBST_NOTMAKE' => 1, 'AU_DEFUN' => 1, - '_AM_DEPENDENCIES' => 1, - 'AM_RUN_LOG' => 1, - 'AM_MISSING_PROG' => 1, + 'm4_pattern_forbid' => 1, + '_AM_PROG_CC_C_O' => 1, 'AM_DEP_TRACK' => 1, - 'm4_pattern_allow' => 1, - 'AM_AUX_DIR_EXPAND' => 1, + 'PKG_CHECK_EXISTS' => 1, + '_AM_SET_OPTIONS' => 1, 'AC_DEFUN' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - '_AM_PROG_CC_C_O' => 1, - 'AM_CONDITIONAL' => 1, - 'PKG_INSTALLDIR' => 1, - 'include' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, - 'AM_SET_LEADING_DOT' => 1, - 'AM_PROG_INSTALL_SH' => 1, - '_AM_AUTOCONF_VERSION' => 1, - 'PKG_PROG_PKG_CONFIG' => 1, - '_AM_CONFIG_MACRO_DIRS' => 1, + 'm4_pattern_allow' => 1, 'AC_CONFIG_MACRO_DIR' => 1, + '_AM_IF_OPTION' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, + 'AM_SET_DEPDIR' => 1, 'AM_INIT_AUTOMAKE' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, + '_AM_AUTOCONF_VERSION' => 1, + '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'AM_AUX_DIR_EXPAND' => 1, + 'PKG_PROG_PKG_CONFIG' => 1, + 'AM_MISSING_PROG' => 1, + 'PKG_CHECK_MODULES' => 1, + 'AM_SUBST_NOTMAKE' => 1, + 'AM_SILENT_RULES' => 1, + 'AM_MISSING_HAS_RUN' => 1, + '_PKG_SHORT_ERRORS_SUPPORTED' => 1, + 'PKG_NOARCH_INSTALLDIR' => 1, '_AM_PROG_TAR' => 1, - 'AM_PROG_CC_C_O' => 1 + 'PKG_INSTALLDIR' => 1, + '_AM_DEPENDENCIES' => 1, + 'include' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -97,65 +97,65 @@ 'configure.ac' ], { - 'AM_NLS' => 1, - 'AC_CANONICAL_TARGET' => 1, - 'AM_ENABLE_MULTILIB' => 1, 'AC_CONFIG_FILES' => 1, - '_AM_COND_ENDIF' => 1, - 'AC_REQUIRE_AUX_FILE' => 1, - 'AM_EXTRA_RECURSIVE_TARGETS' => 1, - 'AC_FC_PP_SRCEXT' => 1, - '_AM_COND_ELSE' => 1, - 'AM_PROG_AR' => 1, - 'm4_pattern_allow' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AM_GNU_GETTEXT' => 1, - 'LT_INIT' => 1, - 'AC_FC_PP_DEFINE' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, - 'm4_sinclude' => 1, - 'AC_CANONICAL_BUILD' => 1, - 'include' => 1, + 'AC_CANONICAL_HOST' => 1, + '_AM_SUBST_NOTMAKE' => 1, + '_AM_COND_IF' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, - 'AC_CONFIG_LINKS' => 1, - 'AM_CONDITIONAL' => 1, - 'AC_FC_FREEFORM' => 1, - 'AM_PROG_CC_C_O' => 1, - 'AM_PATH_GUILE' => 1, - 'AM_PROG_MKDIR_P' => 1, - 'AM_XGETTEXT_OPTION' => 1, - 'AC_CONFIG_HEADERS' => 1, - 'sinclude' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'AC_FC_SRCEXT' => 1, - 'AM_MAINTAINER_MODE' => 1, + 'AM_EXTRA_RECURSIVE_TARGETS' => 1, + '_AM_COND_ENDIF' => 1, + 'AC_CANONICAL_TARGET' => 1, + 'AM_POT_TOOLS' => 1, 'm4_pattern_forbid' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'AC_SUBST_TRACE' => 1, + 'AM_PROG_MKDIR_P' => 1, + 'AM_PROG_F77_C_O' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'AC_CONFIG_LINKS' => 1, + 'AC_CONFIG_SUBDIRS' => 1, + 'AM_AUTOMAKE_VERSION' => 1, '_m4_warn' => 1, 'AM_PROG_MOC' => 1, - 'AC_SUBST' => 1, - 'AM_PROG_CXX_C_O' => 1, - 'AC_CANONICAL_HOST' => 1, - 'AC_SUBST_TRACE' => 1, - 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + 'AM_XGETTEXT_OPTION' => 1, + 'm4_sinclude' => 1, + 'AC_FC_PP_SRCEXT' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, + 'AM_PROG_CC_C_O' => 1, + 'AM_NLS' => 1, 'm4_include' => 1, + 'AC_FC_PP_DEFINE' => 1, + 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + 'AM_CONDITIONAL' => 1, + 'AM_GNU_GETTEXT' => 1, + 'AH_OUTPUT' => 1, + 'AC_INIT' => 1, 'AC_CONFIG_LIBOBJ_DIR' => 1, - '_AM_SUBST_NOTMAKE' => 1, - '_AM_COND_IF' => 1, + 'AC_SUBST' => 1, + '_AM_COND_ELSE' => 1, + 'AM_ENABLE_MULTILIB' => 1, + 'AC_FC_SRCEXT' => 1, + 'AM_PROG_FC_C_O' => 1, 'AM_SILENT_RULES' => 1, + 'AM_PATH_GUILE' => 1, + 'include' => 1, 'AC_LIBSOURCE' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, + 'sinclude' => 1, + 'AC_CONFIG_AUX_DIR' => 1, + 'AC_CONFIG_HEADERS' => 1, + 'AC_CANONICAL_BUILD' => 1, 'AC_CANONICAL_SYSTEM' => 1, - 'AH_OUTPUT' => 1, - 'AM_PROG_F77_C_O' => 1, - 'AC_CONFIG_SUBDIRS' => 1, - 'AM_POT_TOOLS' => 1, + 'LT_INIT' => 1, + 'm4_pattern_allow' => 1, + 'AM_PROG_AR' => 1, 'LT_SUPPORTED_TAG' => 1, - 'AM_PROG_FC_C_O' => 1, - 'AC_CONFIG_AUX_DIR' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + 'AM_MAINTAINER_MODE' => 1, '_AM_MAKEFILE_INCLUDE' => 1, - 'AC_INIT' => 1, - '_LT_AC_TAGCONFIG' => 1 + 'AM_PROG_CXX_C_O' => 1, + 'AC_FC_FREEFORM' => 1, + 'AM_INIT_AUTOMAKE' => 1 } ], 'Autom4te::Request' ) ); diff -Nru kkedit-0.4.0/autom4te.cache/traces.1 kkedit-0.4.1/autom4te.cache/traces.1 --- kkedit-0.4.0/autom4te.cache/traces.1 2016-08-25 10:00:12.000000000 +0000 +++ kkedit-0.4.1/autom4te.cache/traces.1 2016-08-26 09:41:39.000000000 +0000 @@ -1,4 +1,4 @@ -m4trace:configure.ac:3: -1- AC_INIT([KKEdit], [0.4.0], [PROJ], [KKEdit]) +m4trace:configure.ac:3: -1- AC_INIT([KKEdit], [0.4.1], [PROJ], [KKEdit]) m4trace:configure.ac:3: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.ac:3: -1- m4_pattern_forbid([_AC_]) m4trace:configure.ac:3: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) diff -Nru kkedit-0.4.0/ChangeLog kkedit-0.4.1/ChangeLog --- kkedit-0.4.0/ChangeLog 2016-08-25 10:00:12.000000000 +0000 +++ kkedit-0.4.1/ChangeLog 2016-08-26 09:41:39.000000000 +0000 @@ -1,3 +1,8 @@ +0.4.1 +Fixed menu icons in gtk3 mucking up the text. +Fixed not showing bookmark in gtk3 when using hotkey. +Show menu icons in gtk3 now defaults to off. + 0.4.0 About window now modal. Corrected a few menu labels. diff -Nru kkedit-0.4.0/configure kkedit-0.4.1/configure --- kkedit-0.4.0/configure 2016-08-25 10:00:13.000000000 +0000 +++ kkedit-0.4.1/configure 2016-08-26 09:41:40.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for KKEdit 0.4.0. +# Generated by GNU Autoconf 2.69 for KKEdit 0.4.1. # # Report bugs to . # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='KKEdit' PACKAGE_TARNAME='KKEdit' -PACKAGE_VERSION='0.4.0' -PACKAGE_STRING='KKEdit 0.4.0' +PACKAGE_VERSION='0.4.1' +PACKAGE_STRING='KKEdit 0.4.1' PACKAGE_BUGREPORT='PROJ' PACKAGE_URL='' @@ -1300,7 +1300,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures KKEdit 0.4.0 to adapt to many kinds of systems. +\`configure' configures KKEdit 0.4.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1370,7 +1370,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of KKEdit 0.4.0:";; + short | recursive ) echo "Configuration of KKEdit 0.4.1:";; esac cat <<\_ACEOF @@ -1495,7 +1495,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -KKEdit configure 0.4.0 +KKEdit configure 0.4.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1667,7 +1667,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by KKEdit $as_me 0.4.0, which was +It was created by KKEdit $as_me 0.4.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3104,7 +3104,7 @@ # Define the identity of the package. PACKAGE='KKEdit' - VERSION='0.4.0' + VERSION='0.4.1' cat >>confdefs.h <<_ACEOF @@ -5352,7 +5352,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by KKEdit $as_me 0.4.0, which was +This file was extended by KKEdit $as_me 0.4.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5418,7 +5418,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -KKEdit config.status 0.4.0 +KKEdit config.status 0.4.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -7554,7 +7554,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by KKEdit $as_me 0.4.0, which was +This file was extended by KKEdit $as_me 0.4.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7620,7 +7620,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -KKEdit config.status 0.4.0 +KKEdit config.status 0.4.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru kkedit-0.4.0/configure.ac kkedit-0.4.1/configure.ac --- kkedit-0.4.0/configure.ac 2016-08-25 10:00:10.000000000 +0000 +++ kkedit-0.4.1/configure.ac 2016-08-26 09:41:36.000000000 +0000 @@ -1,6 +1,6 @@ # # -AC_INIT([KKEdit],[0.4.0],[PROJ],[KKEdit]) +AC_INIT([KKEdit],[0.4.1],[PROJ],[KKEdit]) AC_CONFIG_HEADER([config.h]) AC_PROG_CXX diff -Nru kkedit-0.4.0/debian/changelog kkedit-0.4.1/debian/changelog --- kkedit-0.4.0/debian/changelog 2016-08-25 10:56:46.000000000 +0000 +++ kkedit-0.4.1/debian/changelog 2016-08-26 10:04:14.000000000 +0000 @@ -1,8 +1,8 @@ -kkedit (0.4.0-1~webupd8~trusty0) trusty; urgency=medium +kkedit (0.4.1-1~webupd8~trusty0) trusty; urgency=medium * New upstream release - -- Alin Andrei Thu, 25 Aug 2016 13:55:24 +0200 + -- Alin Andrei Fri, 26 Aug 2016 13:04:21 +0200 kkedit (0.3.3-1~webupd8~vivid1) vivid; urgency=medium diff -Nru kkedit-0.4.0/KKEdit/src/bookmarks.cpp kkedit-0.4.1/KKEdit/src/bookmarks.cpp --- kkedit-0.4.0/KKEdit/src/bookmarks.cpp 2016-08-25 10:00:08.000000000 +0000 +++ kkedit-0.4.1/KKEdit/src/bookmarks.cpp 2016-08-26 09:41:34.000000000 +0000 @@ -101,13 +101,13 @@ if(page==NULL) return; - mark_type=MARK_TYPE_1; if(titer==NULL) { mark=gtk_text_buffer_get_insert((GtkTextBuffer*)page->buffer); gtk_text_buffer_get_iter_at_mark((GtkTextBuffer*)page->buffer,&siter,mark); - iter=&siter; + gtk_text_iter_set_line_offset(&siter,0); + iter=(GtkTextIter*)(&siter); } else iter=titer; @@ -143,6 +143,7 @@ ptr=g_list_next(ptr); } gtk_widget_show_all(bookMarkMenu); + //gtk_source_view_set_show_line_marks(page->view,showBMBar); g_slist_free(mark_list); } else diff -Nru kkedit-0.4.0/KKEdit/src/files.cpp kkedit-0.4.1/KKEdit/src/files.cpp --- kkedit-0.4.0/KKEdit/src/files.cpp 2016-08-25 10:00:08.000000000 +0000 +++ kkedit-0.4.1/KKEdit/src/files.cpp 2016-08-26 09:41:34.000000000 +0000 @@ -187,85 +187,6 @@ ERRDATA return(evbox); } -#if 0 - -const char *resetcss=" \ -* { \ - color: inherit; \ - font-size: inherit; \ - background-color: initial; \ - font-family: inherit; \ - font-style: inherit; \ - font-variant: inherit; \ - font-weight: inherit; \ - text-shadow: inherit; \ - icon-shadow: inherit; \ - box-shadow: initial; \ - margin-top: initial; \ - margin-left: initial; \ - margin-bottom: initial; \ - margin-right: initial; \ - padding-top: initial; \ - padding-left: initial; \ - padding-bottom: initial; \ - padding-right: initial; \ - border-top-style: initial; \ - border-top-width: initial; \ - border-left-style: initial; \ - border-left-width: initial; \ - border-bottom-style: initial; \ - border-bottom-width: initial; \ - border-right-style: initial; \ - border-right-width: initial; \ - border-top-left-radius: initial; \ - border-top-right-radius: initial; \ - border-bottom-right-radius: initial; \ - border-bottom-left-radius: initial; \ - outline-style: initial; \ - outline-width: initial; \ - outline-offset: initial; \ - background-clip: initial; \ - background-origin: initial; \ - background-size: initial; \ - background-position: initial; \ - border-top-color: initial; \ - border-right-color: initial; \ - border-bottom-color: initial; \ - border-left-color: initial; \ - outline-color: initial; \ - background-repeat: initial; \ - background-image: initial; \ - border-image-source: initial; \ - border-image-repeat: initial; \ - border-image-slice: initial; \ - border-image-width: initial; \ - transition-property: initial; \ - transition-duration: initial; \ - transition-timing-function: initial; \ - transition-delay: initial; \ - engine: initial; \ - gtk-key-bindings: initial; \ - \ - -GtkWidget-focus-line-width: 0; \ - -GtkWidget-focus-padding: 0; \ - -GtkNotebook-initial-gap: 0; \ -} \ - \ -* { \ - color: green; \ - font-family: Monospace; \ - border: 100px solid; \ -} \ - \ -:selected { \ - background-color: darkGreen; \ - color: black; \ -} \ - \ -"; - -#endif - void setFilePrefs(pageStruct *page) { ERRDATA diff -Nru kkedit-0.4.0/KKEdit/src/globals.cpp kkedit-0.4.1/KKEdit/src/globals.cpp --- kkedit-0.4.0/KKEdit/src/globals.cpp 2016-08-25 10:00:08.000000000 +0000 +++ kkedit-0.4.1/KKEdit/src/globals.cpp 2016-08-26 09:41:34.000000000 +0000 @@ -177,7 +177,7 @@ GtkWidget *rootCommandBox; GtkWidget *defaultBrowserBox; char *browserCommand=strdup("firefox"); -bool showMenuIcons; +bool showMenuIcons=false; #ifdef _USEGTK3_ GtkStyleProvider *provider; diff -Nru kkedit-0.4.0/KKEdit/src/guis.cpp kkedit-0.4.1/KKEdit/src/guis.cpp --- kkedit-0.4.0/KKEdit/src/guis.cpp 2016-08-25 10:00:08.000000000 +0000 +++ kkedit-0.4.1/KKEdit/src/guis.cpp 2016-08-26 09:41:34.000000000 +0000 @@ -88,7 +88,11 @@ {MENU_SHOW_TOOL_OP_LABEL,NULL,0,0,(void*)&toggleToolOutput,SHOWTOOLOUTMENUNAME,NULL}, {MENU_HIDE_STATUS_LABEL,NULL,0,0,(void*)&toggleStatusBar,SHOWSTATUSMENUNAME,NULL}, {MENU_SHOW_STATUS_LABEL,NULL,0,0,(void*)&toggleStatusBar,SHOWSTATUSMENUNAME,NULL}, +#ifdef _BUILDDOCVIEWER_ {MENU_SHOW_DOCVIEWER_LABEL,NULL,0,0,(void*)&toggleDocviewer,SHOWDOCVIEWERMENUNAME,NULL}, +#else + {"",NULL,0,0,NULL,NULL,NULL}, +#endif //toggles {MENU_SHOW_LINE_NUMBERS_LABEL,NULL,0,0,(void*)&toggleLineNumbers,VIEWSHOWLINENUMERS,NULL}, @@ -121,12 +125,21 @@ {CUSTOM_WORD_CONTEXT_LABEL,GTK_STOCK_EDIT,0,0,(void*)&addtoCustomWordList,NULL,NULL}, //other {"",NULL,0,0,NULL,NULL,NULL}, +#ifdef _ASPELL_ {CHECK_SPELLING_CONTEXT_LABEL,GTK_STOCK_SPELL_CHECK,0,0,(void*)&checkWord,NULL,NULL}, +#else + {"",NULL,0,0,NULL,NULL,NULL}, +#endif + //tab popups {COPY_FOLDER_PATH_LABEL,GTK_STOCK_COPY,0,0,(void*)&doTabMenu,NULL,NULL}, {COPY_FILE_PATH_LABEL,GTK_STOCK_COPY,0,0,(void*)&doTabMenu,NULL,NULL}, {COPY_FILE_NAME_LABEL,GTK_STOCK_COPY,0,0,(void*)&doTabMenu,NULL,NULL}, +#ifdef _ASPELL_ {SPELL_CHECK_LABEL,GTK_STOCK_SPELL_CHECK,0,0,(void*)&doSpellCheckDoc,NULL,NULL}, +#else + {NULL,NULL,0,0,NULL,NULL,NULL}, +#endif {SOURCE_HILITE_LABEL,GTK_STOCK_PREFERENCES,0,0,NULL,NULL,NULL}, {MENU_HIDE_TAB_LABEL,GTK_STOCK_REMOVE,0,0,(void*)&hideTab,NULL,NULL}, @@ -178,6 +191,7 @@ GtkWidget *pad; GtkWidget *image; GtkWidget *ritelabel; + char *labelwithspace; menu=gtk_menu_item_new_with_mnemonic(gettext(menuData[menunumber].menuLabel)); if((showMenuIcons==true) && (menuData[menunumber].stockID!=NULL)) @@ -190,8 +204,11 @@ image=gtk_image_new_from_icon_name(menuData[menunumber].stockID,GTK_ICON_SIZE_MENU); gtk_box_pack_start((GtkBox*)menuhbox,image,false,false,0); - gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new(" "),false,false,0); - gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new_with_mnemonic(gettext(menuData[menunumber].menuLabel)),false,false,0); + //gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new(" "),false,false,0); + asprintf(&labelwithspace," %s",gettext(menuData[menunumber].menuLabel)); +// gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new_with_mnemonic(gettext(menuData[menunumber].menuLabel)),false,false,0); + gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new_with_mnemonic(labelwithspace),false,false,0); + free(labelwithspace); gtk_box_pack_start(GTK_BOX(menuhbox),pad,true,true,0); ritelabel=gtk_label_new(keyStrBuffer); @@ -226,6 +243,7 @@ GtkWidget *pad; GtkWidget *image; GtkWidget *ritelabel; + char *labelwithspace; menu=gtk_menu_item_new_with_mnemonic(gettext(menuData[menunumber].menuLabel)); if(showMenuIcons==true) @@ -238,8 +256,11 @@ image=gtk_image_new_from_icon_name(menuData[menunumber].stockID,GTK_ICON_SIZE_MENU); gtk_box_pack_start((GtkBox*)menuhbox,image,false,false,0); - gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new(" "),false,false,0); - gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new_with_mnemonic(gettext(menuData[menunumber].menuLabel)),false,false,0); + //gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new(" "),false,false,0); + asprintf(&labelwithspace," %s",gettext(menuData[menunumber].menuLabel)); + //gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new_with_mnemonic(gettext(menuData[menunumber].menuLabel)),false,false,0); + gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new_with_mnemonic(labelwithspace),false,false,0); + free(labelwithspace); gtk_box_pack_start(GTK_BOX(menuhbox),pad,true,true,0); ritelabel=gtk_label_new(keyStrBuffer); @@ -276,6 +297,7 @@ GtkWidget *pad; GtkWidget *image; GtkWidget *ritelabel; + char *labelwithspace; menu=gtk_menu_item_new_with_mnemonic(gettext(menuData[menunumber].menuLabel)); if(showMenuIcons==true) @@ -288,8 +310,11 @@ image=gtk_image_new_from_file(menuData[menunumber].stockID); gtk_box_pack_start((GtkBox*)menuhbox,image,false,false,0); - gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new(" "),false,false,0); - gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new_with_mnemonic(gettext(menuData[menunumber].menuLabel)),false,false,0); + //gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new(" "),false,false,0); + asprintf(&labelwithspace," %s",gettext(menuData[menunumber].menuLabel)); +// gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new_with_mnemonic(gettext(menuData[menunumber].menuLabel)),false,false,0); + gtk_box_pack_start(GTK_BOX(menuhbox),gtk_label_new_with_mnemonic(labelwithspace),false,false,0); + free(labelwithspace); gtk_box_pack_start(GTK_BOX(menuhbox),pad,true,true,0); ritelabel=gtk_label_new(keyStrBuffer); @@ -2350,8 +2375,9 @@ gtk_container_add(GTK_CONTAINER(docView),vbox); gtk_widget_grab_focus(GTK_WIDGET(webView)); +#ifdef _BUILDDOCVIEWER_ g_signal_connect_object(G_OBJECT(docView),"delete-event",G_CALLBACK(toggleDocviewer),G_OBJECT(docView),G_CONNECT_SWAPPED); - +#endif const char *lang; if(strncmp(localeLang,"en",2)==0) diff -Nru kkedit-0.4.0/KKEdit/src/main.cpp kkedit-0.4.1/KKEdit/src/main.cpp --- kkedit-0.4.0/KKEdit/src/main.cpp 2016-08-25 10:00:08.000000000 +0000 +++ kkedit-0.4.1/KKEdit/src/main.cpp 2016-08-26 09:41:34.000000000 +0000 @@ -133,7 +133,7 @@ hightlightAll=true; maxFuncDefs=64; maxBMChars=64; - showMenuIcons=true; + showMenuIcons=false; openInThisTab=-1; loadingSession=false;