Added dependencies / build scripts for nex export dialog

CMakeLists.txt

@@ -1,6 +1,6 @@
 PROJECT(qucs-suite CXX C)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-cmake_policy(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+cmake_policy(VERSION 2.8)
 
 FIND_PACKAGE( Qt4 REQUIRED )
 
@@ -37,5 +37,19 @@ ADD_SUBDIRECTORY( qucs-filter )
 ADD_SUBDIRECTORY( qucs-help )
 ADD_SUBDIRECTORY( qucs-lib )
 ADD_SUBDIRECTORY( qucs-transcalc )
-
 #ADD_SUBDIRECTORY( examples )
+
+
+
+SET(LANGUAGES ar;ca;cs;de;es;fr;he;hu;it;jp;kk;pl;pt;ro;ru;sv;tr;uk)
+SET(LANGUAGE_TS_FILES)
+FOREACH(LANGUAGE ${LANGUAGES})
+ SET(TS_FILE "${CMAKE_CURRENT_SOURCE_DIR}/qucs/qucs_${LANGUAGE}.ts")
+ SET(LANGUAGE_TS_FILES ${LANGUAGE_TS_FILES} ${TS_FILE})
+ SET_SOURCE_FILES_PROPERTIES(${TS_FILE} PROPERTIES OUTPUT_LOCATION
+   "${CMake_BINARY_DIR}${CMAKE_DATA_DIR}")
+ENDFOREACH(LANGUAGE ${LANGUAGES})
+IF(LANGUAGE_TS_FILES)
+ QT4_CREATE_TRANSLATION(qm_files ${SRCS} ${LANGUAGE_TS_FILES})
+ENDIF(LANGUAGE_TS_FILES)
+

configure.ac

@@ -153,7 +153,7 @@ case $host_os in
       /usr/X11R6/include/qt4 $prefix/include/qt4"
     for path in $paths; do
       if test -f "$path/Qt/qapplication.h"; then
-        QT_INCLUDES="$path -I$path/Qt -I$path/QtGui -I$path/QtCore -I$path/Qt3Support"
+        QT_INCLUDES="$path -I$path/Qt -I$path/QtGui -I$path/QtCore -I$path/Qt3Support -I$path/QtSvg"
         QT_VER=4
         break
       fi
@@ -178,7 +178,7 @@ case $host_os in
        fi])
     if test "$enable_mt" = yes; then
       QT_LDF=""
-      QT_LIB="-lQtCore -lQtGui -lQtXml -lQt3Support"
+      QT_LIB="-lQtCore -lQtGui -lQtXml -lQt3Support -lQtSvg"
       QT_INC="$QT_DEF -DQT3_SUPPORT -DQT_THREAD_SUPPORT -D_REENTRANT"
       [case $host_os in
         *freebsd4*) QT_LIB="$QT_LIB -pthread" ;;
@@ -188,13 +188,13 @@ case $host_os in
       QT_MTS="multi-threaded"
     else
       QT_LDF=""
-      QT_LIB="-lQtCore -lQtGui -lQtXml -lQt3Support"
+      QT_LIB="-lQtCore -lQtGui -lQtXml -lQt3Support -lQtSvg"
       QT_INC="$QT_DEF"
       QT_MTS="non-threaded"
     fi
     case $host_os in
       *mingw*)
-      QT_LIB="$QT_LIB  -lQtCore -lQtGui -lQtXml -lQt3Support"
+      QT_LIB="$QT_LIB  -lQtCore -lQtGui -lQtXml -lQt3Support -lQtSvg"
       QT_INC="$QT_INC -DQT_DLL -DUNICODE"
       QT_LDF="$QT_LDF -mwindows"
       ;;
@@ -249,12 +249,12 @@ case $host_os in
     with_qt=no
     dnl Check for Qt with pkg-config
     dnl Set QT_CFLAGS and QT_LIBS
-    PKG_CHECK_MODULES(QT, [QtCore QtGui QtXml Qt3Support],
+    PKG_CHECK_MODULES(QT, [QtCore QtGui QtXml Qt3Support QtSvg],
         [with_qt=yes
         QT_MOC=`$PKG_CONFIG --variable=moc_location QtCore`],
         AC_MSG_NOTICE([pkg-config could not find Qt]))
     if test "x${with_qt}" = xyes ; then
-      AC_CHECK_HEADERS([QtGui/QtGui QtCore/QtCore QtXml/QtXml],[],[])
+      AC_CHECK_HEADERS([QtGui/QtGui QtCore/QtCore QtXml/QtXml QtSvg/QtSvg],[],[])
     fi
     dnl Official Qt has no pkg-config files on OSX
     dnl Look on standart location
@@ -265,6 +265,7 @@ case $host_os in
       CPPFLAGS="$CPPFLAGS -I/Library/Frameworks/QtGui.framework/Headers"
       CPPFLAGS="$CPPFLAGS -I/Library/Frameworks/QtXml.framework/Headers"
       CPPFLAGS="$CPPFLAGS -I/Library/Frameworks/Qt3Support.framework/Headers"
+      CPPFLAGS="$CPPFLAGS -I/Library/Frameworks/QtSvg.framework/Headers"      
       AC_CHECK_HEADERS(QApplication, [with_qt=yes])
       if test "x${with_qt}" = xyes ; then
         AC_PATH_PROG(QT_MOC, moc)
@@ -273,7 +274,7 @@ case $host_os in
           with_qt=no
         else
           QT_CFLAGS="$CPPFLAGS"
-          QT_LIBS="-framework QtGui -framework QtCore -framework QtXml -framework Qt3Support"
+          QT_LIBS="-framework QtGui -framework QtCore -framework QtXml -framework Qt3Support  -framework QtSvg"
           dnl Define Qt3Support
           QT_DEF="$QT_DEF -DQT_SHARED -DQT3_SUPPORT"
         fi

contrib/release.sh

@@ -110,7 +110,7 @@ sed -i 's/# RELEASEDIRS="$RELEASEDIRS asco"/RELEASEDIRS="$RELEASEDIRS asco"/g' c
 make distclean
 rm -rf autom4te.cache
 
-
+libtoolize
 cd qucs-core
 ./bootstrap.sh
 ./configure --enable-maintainer-mode
@@ -128,7 +128,9 @@ cd ..
 
 echo creating source archive...
 
-tar -zcvf qucs-$RELEASE.tar.gz qucs-$RELEASE
+tar -zcvhf qucs-$RELEASE.tar.gz qucs-$RELEASE
+rm -rf qucs-$RELEASE
+tar -zxvf qucs-$RELEASE.tar.gz #make the symbolic links actual files
 
 DISTS="precise quantal raring saucy"
 

debian/changelog

@@ -1,3 +1,27 @@
+qucs (0.0.18.131121-4) saucy; urgency=low
+
+  * snapshot
+
+ -- Frans Schreuder <fransschreuder@gmail.com>  Thu, 21 Nov 2013 14:21:16 +0100
+
+qucs (0.0.18.131121-3) raring; urgency=low
+
+  * snapshot
+
+ -- Frans Schreuder <fransschreuder@gmail.com>  Thu, 21 Nov 2013 14:20:44 +0100
+
+qucs (0.0.18.131121-2) quantal; urgency=low
+
+  * snapshot
+
+ -- Frans Schreuder <fransschreuder@gmail.com>  Thu, 21 Nov 2013 14:20:05 +0100
+
+qucs (0.0.18.131121-1) precise; urgency=low
+
+  * snapshot
+
+ -- Frans Schreuder <fransschreuder@gmail.com> Thu, 21 Nov 2013 14:19:26 +0100
+
 qucs (0.0.18.130925-4) saucy; urgency=low
 
   * snapshot

qucs/dialogs/CMakeLists.txt

@@ -11,12 +11,14 @@ digisettingsdialog.cpp		qucssettingsdialog.cpp vtabbar.cpp
 importdialog.cpp		savedialog.cpp vtabbeddockwidget.cpp
 labeldialog.cpp			searchdialog.cpp vtabbutton.cpp
 librarydialog.cpp		settingsdialog.cpp vtabwidget.cpp
-matchdialog.cpp			simmessage.cpp newprojdialog.cpp		sweepdialog.cpp
+matchdialog.cpp			simmessage.cpp newprojdialog.cpp		
+sweepdialog.cpp         exportdiagramdialog.cpp
 )
 
 SET(DIALOGS_MOC_HDRS
 changedialog.h
 digisettingsdialog.h
+exportdiagramdialog.h
 importdialog.h
 labeldialog.h
 librarydialog.h

qucs/dialogs/Makefile.am

@@ -28,7 +28,8 @@ MOCHEADERS = settingsdialog.h simmessage.h qucssettingsdialog.h      \
      labeldialog.h changedialog.h matchdialog.h digisettingsdialog.h \
      sweepdialog.h searchdialog.h librarydialog.h importdialog.h     \
      packagedialog.h savedialog.h vasettingsdialog.h                 \
-     vtabbutton.h vtabbar.h vtabwidget.h vtabbeddockwidget.h
+     vtabbutton.h vtabbar.h vtabwidget.h vtabbeddockwidget.h        \
+     exportdiagramdialog.h
 
 MOCFILES = $(MOCHEADERS:.h=.moc.cpp)
 
@@ -37,7 +38,8 @@ libdialogs_a_SOURCES = settingsdialog.cpp newprojdialog.cpp \
      matchdialog.cpp sweepdialog.cpp digisettingsdialog.cpp searchdialog.cpp \
      librarydialog.cpp importdialog.cpp packagedialog.cpp \
      savedialog.cpp vasettingsdialog.cpp \
-     vtabbutton.cpp vtabbar.cpp vtabwidget.cpp vtabbeddockwidget.cpp
+     vtabbutton.cpp vtabbar.cpp vtabwidget.cpp vtabbeddockwidget.cpp \
+     exportdiagramdialog.cpp
 
 nodist_libdialogs_a_SOURCES = $(MOCFILES)