Release 1.0.3

mathmech/mathmech/CMakeLists.txt

@@ -12,7 +12,6 @@ include (${PROJECT}.cmake)
 
 # additional options
 OPTION (WITH_DEBUG_MODE "Build with debug mode" OFF)
-OPTION (ADD_INCLUDE "Add include files" OFF)
 
 # set libraries
 set (LIBRARIES)

mathmech/mathmech/INSTALL

@@ -1,7 +1,8 @@
 CMakeFlags:
   -DCMAKE_INSTALL_PREFIX=         - install prefix (default is '/usr/local')
-  -DADD_INCLUDE=1                 - install include files (default is disable)
   -DWITH_DEBUG_MODE=1             - compile with flag '-g' (default is disable)
+  -DQWT_INCLUDE_PATH              - path to qwt includes
+  -DQWT_LIBRARY_PATH              - path to qwt library
 
 Install for Linux:
   mkdir build && cd build
@@ -11,4 +12,5 @@ Install for Linux:
 Install for Windows:
   create project file using 'cmake'
   compile project
+  copy QtCore4.dll, QtGui4.dll, QtOpenGL4.dll, QtSvg4.dll, qwt.dll to directory with mathmech
 You may also download compiled executable file for Win_x86.

mathmech/mathmech/README

@@ -1,3 +1,3 @@
 Mathematical Molecular Mechanics is GUI for "mm" program pack
-Version: 1.0.2
+Version: 1.0.3
 License: GPL

mathmech/mathmech/resources/res_icon.rc

@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "mathmech.ico" 

mathmech/mathmech/src/CMakeLists.txt

@@ -2,12 +2,15 @@
 file (GLOB SOURCES *.cpp)
 file (GLOB HEADERS *.h)
 file (GLOB FORMS *.ui)
+if (CMAKE_SYSTEM_NAME MATCHES Windows)
+  set (SOURCES ${SOURCES} ${PROJECT_RESOURCE_DIR}/res_icon.rc)
+endif ()
 # set library
 if (CMAKE_COMPILER_IS_GNUCXX)
   set (LIBRARIES m qwt)
 else ()
   set (LIBRARIES qwt)
-endif()
+endif ()
 set (LANGUAGES
      eng
      rus)
@@ -61,7 +64,11 @@ target_link_libraries (${PROJECT} ${LIBRARIES} ${QT_LIBRARIES} ${QT_QTMAIN_LIBRA
 
 # install properties
 install (TARGETS ${PROJECT} DESTINATION bin)
-install (FILES ../mathmech.desktop
-        DESTINATION share/applications/)
-install (FILES ../mathmech-logo.png
-        DESTINATION share/pixmaps/)
+if (CMAKE_SYSTEM_NAME MATCHES Linux)
+  install (FILES ../mathmech.desktop
+          DESTINATION share/applications/)
+  install (FILES ../mathmech-logo.png
+          DESTINATION share/pixmaps/)
+  install (FILES ../mathmech.png
+          DESTINATION share/icons/hicolor/32x32/apps/)
+endif ()

mathmech/mathmech/src/mainwindow.cpp

@@ -19,7 +19,7 @@ MainWindow::MainWindow(QWidget *parent) :
   ui(new Ui::MainWindow),
   clear_items(new Clear_items(this)),
   update_fields(new Update_fields(this))
-{
+{  
   ui->setupUi(this);
   statgen_crit = new float[10];
 

mathmech/mathmech/src/mainwindow.ui

@@ -3715,14 +3715,6 @@
    <addaction name="menuMenu"/>
    <addaction name="menuHelp"/>
   </widget>
-  <widget class="QToolBar" name="mainToolBar">
-   <attribute name="toolBarArea">
-    <enum>TopToolBarArea</enum>
-   </attribute>
-   <attribute name="toolBarBreak">
-    <bool>false</bool>
-   </attribute>
-  </widget>
   <widget class="QStatusBar" name="statusBar"/>
   <action name="actionExit">
    <property name="text">

mathmech/mathmech/src/mathmech.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 2.8.1, 2013-08-30T03:38:54. -->
+<!-- Written by QtCreator 2.8.1, 2013-08-30T19:09:45. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>