added desktop file and icon
This commit is contained in:
		@@ -167,14 +167,18 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
 | 
				
			|||||||
  AX_SUBST(BUILD_NUMBER)
 | 
					  AX_SUBST(BUILD_NUMBER)
 | 
				
			||||||
  BUILD_DATE=$(LANG= date +"%a, %d %b %Y %H:%M:%S %z")
 | 
					  BUILD_DATE=$(LANG= date +"%a, %d %b %Y %H:%M:%S %z")
 | 
				
			||||||
  AX_SUBST(BUILD_DATE)
 | 
					  AX_SUBST(BUILD_DATE)
 | 
				
			||||||
  if test -f "${PROJECT_NAME}-logo.png"; then
 | 
					  if test -f "${PACKAGE_NAME}.dektop.in"; then
 | 
				
			||||||
     PROJECT_LOGO="${PROJECT_NAME}-logo.png"
 | 
					     PACKAGE_DESKTOP="${PACKAGE_NAME}.dektop"
 | 
				
			||||||
  fi
 | 
					  fi
 | 
				
			||||||
  AX_SUBST(PROJECT_LOGO)
 | 
					  AX_SUBST(PACKAGE_DESKTOP)
 | 
				
			||||||
  if test -f "${PROJECT_NAME}-icon.png"; then
 | 
					  if test -f "${PACKAGE_NAME}-logo.png"; then
 | 
				
			||||||
     PROJECT_ICON="${PROJECT_NAME}-icon.png"
 | 
					     PACKAGE_LOGO="${PACKAGE_NAME}-logo.png"
 | 
				
			||||||
  fi
 | 
					  fi
 | 
				
			||||||
  AX_SUBST(PROJECT_ICON)
 | 
					  AX_SUBST(PACKAGE_LOGO)
 | 
				
			||||||
 | 
					  if test -f "${PACKAGE_NAME}-icon.png"; then
 | 
				
			||||||
 | 
					     PACKAGE_ICON="${PACKAGE_NAME}-icon.png"
 | 
				
			||||||
 | 
					  fi
 | 
				
			||||||
 | 
					  AX_SUBST(PACKAGE_ICON)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  AC_ARG_ENABLE(pedantic,
 | 
					  AC_ARG_ENABLE(pedantic,
 | 
				
			||||||
    [AS_HELP_STRING([--enable-pedantic],
 | 
					    [AS_HELP_STRING([--enable-pedantic],
 | 
				
			||||||
@@ -204,6 +208,10 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
 | 
				
			|||||||
    AM_CPPFLAGS="${AM_CPPFLAGS} -DQT_NO_DEBUG_OUTPUT -DQT_NO_DEBUG"
 | 
					    AM_CPPFLAGS="${AM_CPPFLAGS} -DQT_NO_DEBUG_OUTPUT -DQT_NO_DEBUG"
 | 
				
			||||||
  fi
 | 
					  fi
 | 
				
			||||||
  
 | 
					  
 | 
				
			||||||
 | 
					  if test -f ${PACKAGE_NAME}.desktop.in; then
 | 
				
			||||||
 | 
					    AC_CONFIG_FILES([${PACKAGE_NAME}.desktop])
 | 
				
			||||||
 | 
					  fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  AC_CONFIG_FILES([makefile])
 | 
					  AC_CONFIG_FILES([makefile])
 | 
				
			||||||
  AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-standard-project-targets], [makefile.in])
 | 
					  AX_ADD_MAKEFILE_TARGET_DEP([clean-am], [clean-standard-project-targets], [makefile.in])
 | 
				
			||||||
  AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-standard-project-targets], [makefile.in])
 | 
					  AX_ADD_MAKEFILE_TARGET_DEP([distclean-am], [distclean-standard-project-targets], [makefile.in])
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										23
									
								
								bootstrap.sh
									
									
									
									
									
								
							
							
						
						
									
										23
									
								
								bootstrap.sh
									
									
									
									
									
								
							@@ -706,10 +706,10 @@ namespace NAMESPACE {
 | 
				
			|||||||
    return README;
 | 
					    return README;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  std::string logo() {
 | 
					  std::string logo() {
 | 
				
			||||||
    return PROJECT_LOGO;
 | 
					    return PACKAGE_LOGO;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  std::string icon() {
 | 
					  std::string icon() {
 | 
				
			||||||
    return PROJECT_ICON;
 | 
					    return PACKAGE_ICON;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  const std::string WHAT("#(@) " PACKAGE_STRING);
 | 
					  const std::string WHAT("#(@) " PACKAGE_STRING);
 | 
				
			||||||
  const std::string IDENT("\$Id: " PACKAGE_STRING);
 | 
					  const std::string IDENT("\$Id: " PACKAGE_STRING);
 | 
				
			||||||
@@ -721,7 +721,7 @@ ${HEADER}dist_bin_SCRIPTS =
 | 
				
			|||||||
MAINTAINERCLEANFILES = makefile.in
 | 
					MAINTAINERCLEANFILES = makefile.in
 | 
				
			||||||
EOF
 | 
					EOF
 | 
				
			||||||
echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_DOXYGEN doc/makefile.am
 | 
					echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_DOXYGEN doc/makefile.am
 | 
				
			||||||
to --condition AX_BUILD_TEST test/runtests.sh < test/runtests.sh
 | 
					to --condition AX_BUILD_TEST test/runtests.sh < ${0%/*}/test/runtests.sh
 | 
				
			||||||
to --condition 'AX_BUILD_TEST|AX_USE_CPPUNIT' test/makefile.am <<EOF
 | 
					to --condition 'AX_BUILD_TEST|AX_USE_CPPUNIT' test/makefile.am <<EOF
 | 
				
			||||||
${HEADER}$(if testtag AX_USE_CXX; then
 | 
					${HEADER}$(if testtag AX_USE_CXX; then
 | 
				
			||||||
cat <<EOF2
 | 
					cat <<EOF2
 | 
				
			||||||
@@ -765,7 +765,7 @@ if testtag AX_USE_DOXYGEN; then
 | 
				
			|||||||
        doxyreplace PROJECT_NAME "@PACKAGE_NAME@"
 | 
					        doxyreplace PROJECT_NAME "@PACKAGE_NAME@"
 | 
				
			||||||
        doxyreplace PROJECT_NUMBER "@PACKAGE_VERSION@"
 | 
					        doxyreplace PROJECT_NUMBER "@PACKAGE_VERSION@"
 | 
				
			||||||
        doxyreplace PROJECT_BRIEF "@DESCRIPTION@"
 | 
					        doxyreplace PROJECT_BRIEF "@DESCRIPTION@"
 | 
				
			||||||
        doxyreplace PROJECT_LOGO "@PROJECT_LOGO@"
 | 
					        doxyreplace PROJECT_LOGO "@top_srcdir@/@PACKACE_LOGO@"
 | 
				
			||||||
        doxyreplace INLINE_INHERITED_MEMB YES
 | 
					        doxyreplace INLINE_INHERITED_MEMB YES
 | 
				
			||||||
        doxyreplace MULTILINE_CPP_IS_BRIEF YES
 | 
					        doxyreplace MULTILINE_CPP_IS_BRIEF YES
 | 
				
			||||||
        doxyreplace TAB_SIZE 2
 | 
					        doxyreplace TAB_SIZE 2
 | 
				
			||||||
@@ -887,6 +887,17 @@ ${HEADER}%:
 | 
				
			|||||||
EOF
 | 
					EOF
 | 
				
			||||||
    echo 7 | to debian/compat
 | 
					    echo 7 | to debian/compat
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					to ${PACKAGE_NAME}.desktop.in <<EOF
 | 
				
			||||||
 | 
					[Desktop Entry]
 | 
				
			||||||
 | 
					Type=Application
 | 
				
			||||||
 | 
					Name=${PACKAGE_NAME}
 | 
				
			||||||
 | 
					GenericName=${PACKAGE_NAME}
 | 
				
			||||||
 | 
					Comment=@DESCRIPTION@
 | 
				
			||||||
 | 
					Icon=@prefix@/share/@PACKAGE_NAME@/@PACKAGE_ICON@
 | 
				
			||||||
 | 
					Exec=${PACKAGE_NAME} %u
 | 
				
			||||||
 | 
					Terminal=false
 | 
				
			||||||
 | 
					Categories=Qt;Utility;
 | 
				
			||||||
 | 
					EOF
 | 
				
			||||||
to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME}.spec.in <<EOF
 | 
					to --condition AX_USE_RPM_PACKAGING ${PACKAGE_NAME}.spec.in <<EOF
 | 
				
			||||||
Summary: @DESCRIPTION@
 | 
					Summary: @DESCRIPTION@
 | 
				
			||||||
Name: @PACKAGE_NAME@
 | 
					Name: @PACKAGE_NAME@
 | 
				
			||||||
@@ -960,6 +971,7 @@ $(if testtag AX_USE_LIBTOOL; then
 | 
				
			|||||||
echo '/usr/%_lib/@PACKAGE_NAME@.so.*'
 | 
					echo '/usr/%_lib/@PACKAGE_NAME@.so.*'
 | 
				
			||||||
else
 | 
					else
 | 
				
			||||||
echo '/usr/bin/*'
 | 
					echo '/usr/bin/*'
 | 
				
			||||||
 | 
					echo '/usr/share/applications/*'
 | 
				
			||||||
fi)
 | 
					fi)
 | 
				
			||||||
%doc
 | 
					%doc
 | 
				
			||||||
$(if testtag AX_USE_LIBTOOL; then
 | 
					$(if testtag AX_USE_LIBTOOL; then
 | 
				
			||||||
@@ -1030,6 +1042,9 @@ done
 | 
				
			|||||||
to makefile.am<<EOF
 | 
					to makefile.am<<EOF
 | 
				
			||||||
${HEADER}SUBDIRS =${SUBDIRS}
 | 
					${HEADER}SUBDIRS =${SUBDIRS}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					desktopdir = ${datadir}/applications
 | 
				
			||||||
 | 
					desktop_DATA = @PACKAGE_DESKTOP@
 | 
				
			||||||
 | 
					pkgdata_DATA = @PACKAGE_ICON@
 | 
				
			||||||
doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
 | 
					doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
 | 
				
			||||||
 | 
					
 | 
				
			||||||
MAINTAINERCLEANFILES = makefile.in
 | 
					MAINTAINERCLEANFILES = makefile.in
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -2,7 +2,7 @@
 | 
				
			|||||||
##
 | 
					##
 | 
				
			||||||
## This file has been added:
 | 
					## This file has been added:
 | 
				
			||||||
##  - by bootstrap.sh
 | 
					##  - by bootstrap.sh
 | 
				
			||||||
##  -  on Wed, 11 November 2015 12:59:08 +0100
 | 
					##  -  on Wed, 11 November 2015 16:21:05 +0100
 | 
				
			||||||
## Feel free to change it or even remove and rebuild it, up to your needs
 | 
					## Feel free to change it or even remove and rebuild it, up to your needs
 | 
				
			||||||
##
 | 
					##
 | 
				
			||||||
##       1         2         3         4         5         6         7         8
 | 
					##       1         2         3         4         5         6         7         8
 | 
				
			||||||
@@ -10,6 +10,9 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
SUBDIRS = src doc
 | 
					SUBDIRS = src doc
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					desktopdir = /applications
 | 
				
			||||||
 | 
					desktop_DATA = @PACKAGE_DESKTOP@
 | 
				
			||||||
 | 
					pkgdata_DATA = @PACKAGE_ICON@
 | 
				
			||||||
doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
 | 
					doc_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog
 | 
				
			||||||
 | 
					
 | 
				
			||||||
MAINTAINERCLEANFILES = makefile.in
 | 
					MAINTAINERCLEANFILES = makefile.in
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,3 +6,4 @@
 | 
				
			|||||||
        <file>tokentool_en.qm</file>
 | 
					        <file>tokentool_en.qm</file>
 | 
				
			||||||
    </qresource>
 | 
					    </qresource>
 | 
				
			||||||
</RCC>
 | 
					</RCC>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										
											BIN
										
									
								
								src/resources/tokentool-icon.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								src/resources/tokentool-icon.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 30 KiB  | 
@@ -30,10 +30,10 @@ namespace NAMESPACE {
 | 
				
			|||||||
    return README;
 | 
					    return README;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  std::string logo() {
 | 
					  std::string logo() {
 | 
				
			||||||
    return PROJECT_LOGO;
 | 
					    return PACKAGE_LOGO;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  std::string icon() {
 | 
					  std::string icon() {
 | 
				
			||||||
    return PROJECT_ICON;
 | 
					    return PACKAGE_ICON;
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
  const std::string WHAT("#(@) " PACKAGE_STRING);
 | 
					  const std::string WHAT("#(@) " PACKAGE_STRING);
 | 
				
			||||||
  const std::string IDENT("$Id: " PACKAGE_STRING);
 | 
					  const std::string IDENT("$Id: " PACKAGE_STRING);
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										
											BIN
										
									
								
								tokentool-icon.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								tokentool-icon.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| 
		 After Width: | Height: | Size: 30 KiB  | 
							
								
								
									
										
											BIN
										
									
								
								tokentool-icon.xcf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								tokentool-icon.xcf
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										9
									
								
								tokentool.desktop.in
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								tokentool.desktop.in
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,9 @@
 | 
				
			|||||||
 | 
					[Desktop Entry]
 | 
				
			||||||
 | 
					Type=Application
 | 
				
			||||||
 | 
					Name=tokentool
 | 
				
			||||||
 | 
					GenericName=Token Tool
 | 
				
			||||||
 | 
					Comment=@DESCRIPTION@
 | 
				
			||||||
 | 
					Icon=@prefix@/share/@PACKAGE_NAME@/@PACKAGE_ICON@
 | 
				
			||||||
 | 
					Exec=tokentool
 | 
				
			||||||
 | 
					Terminal=false
 | 
				
			||||||
 | 
					Categories=Qt;Utility;Viewer;Security;
 | 
				
			||||||
		Reference in New Issue
	
	Block a user