Showing with 928 additions and 33,534 deletions.
  1. +2 −0 CMakeLists.txt
  2. +1 −1 cmake/modules/KstMacros.cmake
  3. +4 −2 misc/CMakeLists.txt
  4. BIN src/images/document-print.png
  5. +60 −39 src/images/icons.qrc
  6. BIN src/images/insert-image.png
  7. BIN src/images/svg_icons/application-exit.svgz
  8. +0 −1,315 src/images/svg_icons/application-x-kst.svg
  9. BIN src/images/svg_icons/application-x-kst.svgz
  10. +0 −230 src/images/svg_icons/arrow.svg
  11. +0 −1,100 src/images/svg_icons/changefile.svg
  12. +0 −1,258 src/images/svg_icons/changefile2.svg
  13. BIN src/images/svg_icons/changefile2.svgz
  14. +0 −921 src/images/svg_icons/changerange.svg
  15. BIN src/images/svg_icons/code-class.svgz
  16. BIN src/images/svg_icons/configure.svgz
  17. BIN src/images/svg_icons/data-manager.svgz
  18. +0 −769 src/images/svg_icons/data_manager.svg
  19. BIN src/images/svg_icons/data_manager.svgz
  20. +0 −366 src/images/svg_icons/data_wizard.svg
  21. +0 −676 src/images/svg_icons/datamode.svg
  22. +0 −718 src/images/svg_icons/datamode_old.svg
  23. BIN src/images/svg_icons/dialog-information.svgz
  24. BIN src/images/svg_icons/document-close.svgz
  25. BIN src/images/svg_icons/document-open-recent.svgz
  26. BIN src/images/svg_icons/document-open.svgz
  27. BIN src/images/svg_icons/document-print.svgz
  28. BIN src/images/svg_icons/document-save-as.svgz
  29. BIN src/images/svg_icons/document-save.svgz
  30. BIN src/images/svg_icons/draw-bezier-curves.svgz
  31. BIN src/images/svg_icons/edit-redo.svgz
  32. BIN src/images/svg_icons/edit-undo.svgz
  33. +0 −472 src/images/svg_icons/edit_equation.svg
  34. BIN src/images/svg_icons/edit_equation.svgz
  35. +0 −570 src/images/svg_icons/edit_matrix.svg
  36. +0 −498 src/images/svg_icons/edit_matrix2.svg
  37. +0 −470 src/images/svg_icons/edit_scalar.svg
  38. +0 −469 src/images/svg_icons/edit_string.svg
  39. +0 −462 src/images/svg_icons/edit_vector.svg
  40. +0 −607 src/images/svg_icons/end.svg
  41. BIN src/images/svg_icons/image-x-generic.svgz
  42. BIN src/images/svg_icons/insert-image.svgz
  43. BIN src/images/svg_icons/kbugbuster.svgz
  44. +0 −2,481 src/images/svg_icons/kst.svg
  45. BIN src/images/svg_icons/kst.svgz
  46. BIN src/images/svg_icons/kst_bold.svgz
  47. BIN src/images/svg_icons/kst_changefile.svgz
  48. BIN src/images/svg_icons/kst_changenpts.svgz
  49. BIN src/images/svg_icons/kst_datamode.svgz
  50. BIN src/images/svg_icons/kst_differentiatecurves.svgz
  51. BIN src/images/svg_icons/kst_downarrow.svgz
  52. BIN src/images/svg_icons/kst_gfx_arrow.svgz
  53. BIN src/images/svg_icons/kst_gfx_circle.svgz
  54. BIN src/images/svg_icons/kst_gfx_ellipse.svgz
  55. BIN src/images/svg_icons/kst_gfx_label.svgz
  56. BIN src/images/svg_icons/kst_gfx_line.svgz
  57. BIN src/images/svg_icons/kst_gfx_rectangle.svgz
  58. BIN src/images/svg_icons/kst_gfx_sharedaxisbox.svgz
  59. BIN src/images/svg_icons/kst_italic.svgz
  60. BIN src/images/svg_icons/kst_leftarrow.svgz
  61. BIN src/images/svg_icons/kst_matrixedit.svgz
  62. BIN src/images/svg_icons/kst_matrixnew.svgz
  63. +0 −1,315 src/images/svg_icons/kst_mime.svg
  64. BIN src/images/svg_icons/kst_mime.svgz
  65. BIN src/images/svg_icons/kst_newplot.svgz
  66. BIN src/images/svg_icons/kst_reload.svgz
  67. BIN src/images/svg_icons/kst_rightarrow.svgz
  68. BIN src/images/svg_icons/kst_scalaredit.svgz
  69. BIN src/images/svg_icons/kst_scalarnew.svgz
  70. BIN src/images/svg_icons/kst_stringedit.svgz
  71. BIN src/images/svg_icons/kst_stringnew.svgz
  72. +0 −1,551 src/images/svg_icons/kst_tiny.svg
  73. BIN src/images/svg_icons/kst_tiny.svgz
  74. BIN src/images/svg_icons/kst_uparrow.svgz
  75. BIN src/images/svg_icons/kst_vectoredit.svgz
  76. BIN src/images/svg_icons/kst_vectornew.svgz
  77. +0 −980 src/images/svg_icons/layoutmode.svg
  78. BIN src/images/svg_icons/layoutmode.svgz
  79. +0 −395 src/images/svg_icons/lr_arrow.svg
  80. +0 −2,856 src/images/svg_icons/magnifying_glass.svg
  81. BIN src/images/svg_icons/magnifying_glass.svgz
  82. BIN src/images/svg_icons/new-log-event.svgz
  83. +0 −481 src/images/svg_icons/new_curve.svg
  84. BIN src/images/svg_icons/new_curve.svgz
  85. +0 −477 src/images/svg_icons/new_curve2.svg
  86. BIN src/images/svg_icons/new_curve2.svgz
  87. +0 −456 src/images/svg_icons/new_equation.svg
  88. BIN src/images/svg_icons/new_equation.svgz
  89. +0 −550 src/images/svg_icons/new_matrix.svg
  90. +0 −454 src/images/svg_icons/new_scalar.svg
  91. +0 −453 src/images/svg_icons/new_string.svg
  92. +0 −450 src/images/svg_icons/new_vector.svg
  93. +0 −570 src/images/svg_icons/newplot.svg
  94. BIN src/images/svg_icons/page-previous.svgz
  95. +0 −676 src/images/svg_icons/plainplot.svg
  96. BIN src/images/svg_icons/plainplot.svgz
  97. +0 −800 src/images/svg_icons/plotdialog.svg
  98. BIN src/images/svg_icons/plotdialog.svgz
  99. BIN src/images/svg_icons/tab-close.svgz
  100. BIN src/images/svg_icons/tab-new.svgz
  101. BIN src/images/svg_icons/text-x-log.svgz
  102. +0 −2,876 src/images/svg_icons/tied-zoom.svg
  103. BIN src/images/svg_icons/tied-zoom.svgz
  104. +0 −316 src/images/svg_icons/tiedzoom.svg
  105. BIN src/images/svg_icons/tiedzoom.svgz
  106. BIN src/images/svg_icons/tools-wizard.svgz
  107. BIN src/images/svg_icons/transform-move.svgz
  108. BIN src/images/svg_icons/unused/arrow.svgz
  109. BIN src/images/svg_icons/unused/end.svgz
  110. BIN src/images/svg_icons/unused/lr_arrow.svgz
  111. BIN src/images/svg_icons/unused/zoomx.svgz
  112. BIN src/images/svg_icons/unused/zoomxy.svgz
  113. BIN src/images/svg_icons/unused/zoomy.svgz
  114. BIN src/images/svg_icons/unused/zoomzy.svgz
  115. BIN src/images/svg_icons/x-zoom.svgz
  116. BIN src/images/svg_icons/xy-zoom.svgz
  117. BIN src/images/svg_icons/y-zoom.svgz
  118. +0 −921 src/images/svg_icons/zoomx.svg
  119. +0 −965 src/images/svg_icons/zoomxy.svg
  120. +0 −951 src/images/svg_icons/zoomy.svg
  121. +0 −965 src/images/svg_icons/zoomzy.svg
  122. BIN src/images/{ → unused}/document-export.png
  123. BIN src/images/{ → unused}/draw-eraser.png
  124. BIN src/images/{ → unused}/kst_blank.png
  125. BIN src/images/{ → unused}/kst_choosecolor.png
  126. BIN src/images/{ → unused}/kst_csdnew.png
  127. BIN src/images/{ → unused}/kst_curvenew.png
  128. BIN src/images/{ → unused}/kst_datamanager.png
  129. BIN src/images/{ → unused}/kst_datawizard.png
  130. BIN src/images/{ → unused}/kst_editplots.png
  131. BIN src/images/{ → unused}/kst_equationedit.png
  132. BIN src/images/{ → unused}/kst_equationnew.png
  133. BIN src/images/{ → unused}/kst_eventnew.png
  134. BIN src/images/{ → unused}/kst_gfx_breaklayout.png
  135. BIN src/images/{ → unused}/kst_gfx_layout.png
  136. BIN src/images/{ → unused}/kst_gfx_picture.png
  137. BIN src/images/{ → unused}/kst_gfx_polygon.png
  138. BIN src/images/{ → unused}/kst_gfx_polyline.png
  139. BIN src/images/{ → unused}/kst_gfx_rounded_rectangle.png
  140. BIN src/images/{ → unused}/kst_graphics.png
  141. BIN src/images/{ → unused}/kst_histogramnew.png
  142. BIN src/images/{ → unused}/kst_imagenew.png
  143. BIN src/images/{ → unused}/kst_layoutmode.png
  144. BIN src/images/unused/kst_newplot.png
  145. BIN src/images/{ → unused}/kst_pluginnew.png
  146. BIN src/images/{ → unused}/kst_psdnew.png
  147. BIN src/images/{ → unused}/kst_quickcurves.png
  148. BIN src/images/{ → unused}/kst_quickpsd.png
  149. BIN src/images/{ → unused}/kst_viewmanager.png
  150. BIN src/images/{ → unused}/kst_zoomtie.png
  151. BIN src/images/{ → unused}/kst_zoomx.png
  152. BIN src/images/{ → unused}/kst_zoomxy.png
  153. BIN src/images/{ → unused}/kst_zoomy.png
  154. BIN src/images/{ → unused}/kstplot.png
  155. BIN src/images/{ → unused}/magnifying_glass.png
  156. BIN src/images/{ → unused}/no.png
  157. BIN src/images/{ → unused}/plainplot.png
  158. BIN src/images/{ → unused}/resource-group.png
  159. BIN src/images/{ → unused}/yes.png
  160. +7 −0 src/kst/main.cpp
  161. +3 −0 src/libkst/editablematrix.cpp
  162. +1 −0 src/libkst/editablevector.cpp
  163. +2 −2 src/libkstapp/CMakeLists.txt
  164. +0 −4 src/libkstapp/application.cpp
  165. +5 −4 src/libkstapp/contenttab.cpp
  166. +8 −4 src/libkstapp/datawizard.cpp
  167. +3 −3 src/libkstapp/datawizardpagedatasource.ui
  168. +5 −4 src/libkstapp/differentiatecurvesdialog.cpp
  169. +18 −5 src/libkstapp/equationtab.ui
  170. +11 −9 src/libkstapp/labelcreator.cpp
  171. +60 −43 src/libkstapp/labelcreator.ui
  172. +10 −8 src/libkstapp/labelpropertiestab.cpp
  173. +15 −6 src/libkstapp/labeltab.cpp
  174. +439 −341 src/libkstapp/labeltab.ui
  175. +14 −12 src/libkstapp/legendtab.cpp
  176. +50 −47 src/libkstapp/mainwindow.cpp
  177. +1 −0 src/libkstapp/mainwindow.h
  178. +10 −6 src/libkstapp/overridelabeltab.cpp
  179. +71 −73 src/libkstapp/overridelabeltab.ui
  180. +2 −2 src/libkstapp/svgitem.h
  181. +11 −8 src/libkstapp/themedialog.cpp
  182. +3 −2 src/libkstapp/viewvectordialog.cpp
  183. +3 −2 src/widgets/colorbutton.cpp
  184. +47 −54 src/widgets/curveappearance.cpp
  185. +12 −4 src/widgets/datasourceselector.cpp
  186. +2 −1 src/widgets/filerequester.cpp
  187. +29 −0 src/widgets/geticon.cpp
  188. +7 −0 src/widgets/geticon.h
  189. +3 −2 src/widgets/matrixselector.cpp
  190. +3 −2 src/widgets/scalarselector.cpp
  191. +3 −2 src/widgets/stringselector.cpp
  192. +3 −2 src/widgets/vectorselector.cpp
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,8 @@ if (kst_qt5)
use_qt5lib(Qt5Network)
use_qt5lib(Qt5Xml)
use_qt5lib(Qt5PrintSupport)
use_qt5lib(Qt5Svg)

add_definitions(-DQT5=1 -DQT_DISABLE_DEPRECATED_BEFORE)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_DEBUG")
include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS}) # Qt5 bug?
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/KstMacros.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ endmacro()
macro(kst_link)
target_link_libraries(${kst_name} ${ARGV})
if(kst_qt5)
qt5_use_modules(${kst_name} Widgets Xml Network PrintSupport)
qt5_use_modules(${kst_name} Widgets Xml Network PrintSupport Svg)
else()
target_link_libraries(${kst_name}
${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTNETWORK_LIBRARY})
Expand Down
6 changes: 4 additions & 2 deletions misc/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ if(WIN32)
${QT_BINARY_DIR}/Qt5Xml.dll
${QT_BINARY_DIR}/Qt5Network.dll
${QT_BINARY_DIR}/Qt5PrintSupport.dll
DESTINATION bin
${QT_BINARY_DIR}/Qt5Svg.dll
DESTINATION bin
CONFIGURATIONS Release)
install(FILES
${QT_BINARY_DIR}/../plugins/platforms/qminimal.dll
Expand All @@ -23,7 +24,8 @@ if(WIN32)
install(FILES
${QT_BINARY_DIR}/../plugins/imageformats/qgif.dll
${QT_BINARY_DIR}/../plugins/imageformats/qjpeg.dll
DESTINATION bin/imageformats
${QT_BINARY_DIR}/../plugins/imageformats/qsvg.dll
DESTINATION bin/imageformats
CONFIGURATIONS Release)
else()
install(FILES
Expand Down
Binary file modified src/images/document-print.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
99 changes: 60 additions & 39 deletions src/images/icons.qrc
View file
Original file line number Diff line number Diff line change
@@ -1,60 +1,26 @@
<RCC>
<qresource prefix="/">
<file>kstplot.png</file>
<file>plainplot.png</file>
<file>kst.png</file>
<file>kst_blank.png</file>
<file>kst_changefile.png</file>
<file>kst_changenpts.png</file>
<file>kst_choosecolor.png</file>
<file>kst_csdnew.png</file>
<file>kst_curvenew.png</file>
<file>kst_datamanager.png</file>
<file>kst_datamode.png</file>
<file>kst_datawizard.png</file>
<file>kst_differentiatecurves.png</file>
<file>kst_editplots.png</file>
<file>kst_equationedit.png</file>
<file>kst_equationnew.png</file>
<file>kst_error_1.png</file>
<file>kst_error_2.png</file>
<file>kst_eventnew.png</file>
<file>kst_gfx_label.png</file>
<file>kst_gfx_arrow.png</file>
<file>kst_gfx_ellipse.png</file>
<file>kst_gfx_line.png</file>
<file>kst_gfx_picture.png</file>
<file>kst_gfx_polygon.png</file>
<file>kst_gfx_polyline.png</file>
<file>kst_gfx_rectangle.png</file>
<file>kst_gfx_rounded_rectangle.png</file>
<file>kst_gfx_layout.png</file>
<file>kst_gfx_sharedaxisbox.png</file>
<file>kst_gfx_breaklayout.png</file>
<file>kst_graphics.png</file>
<file>kst_histogramnew.png</file>
<file>kst_imagenew.png</file>
<file>kst_layoutmode.png</file>
<file>kst_matrixedit.png</file>
<file>kst_matrixnew.png</file>
<file>kst_newplot.png</file>
<file>kst_pluginnew.png</file>
<file>kst_psdnew.png</file>
<file>kst_quickcurves.png</file>
<file>kst_quickpsd.png</file>
<file>kst_scalaredit.png</file>
<file>kst_scalarnew.png</file>
<file>kst_stringedit.png</file>
<file>kst_stringnew.png</file>
<file>kst_vectoredit.png</file>
<file>kst_vectornew.png</file>
<file>kst_viewmanager.png</file>
<file>kst_zoomtie.png</file>
<file>kst_zoomx.png</file>
<file>kst_zoomxy.png</file>
<file>kst_zoomy.png</file>
<file>no.png</file>
<file>yes.png</file>
<file>kst_rightarrow.png</file>
<file>kst_leftarrow.png</file>
<file>kst_uparrow.png</file>
Expand All @@ -76,14 +42,10 @@
<file>tools-wizard.png</file>
<file>transform-move.png</file>
<file>configure.png</file>
<file>office-chart-area-stacked.png</file>
<file>code-class.png</file>
<file>resource-group.png</file>
<file>draw-eraser.png</file>
<file>image-x-generic.png</file>
<file>dialog-information.png</file>
<file>text-x-log.png</file>
<file>document-export.png</file>
<file>tied-zoom.png</file>
<file>change-data-file.png</file>
<file>data-manager.png</file>
Expand All @@ -100,6 +62,65 @@
<file>new-log-event.png</file>
<file>save-vectors.png</file>
<file>themes.png</file>
<file>magnifying_glass.png</file>
<file>svg_icons/page-previous.svgz</file>
<file>svg_icons/kst_changefile.svgz</file>
<file>svg_icons/kst_changenpts.svgz</file>
<file>svg_icons/kst_datamode.svgz</file>
<file>svg_icons/kst_gfx_label.svgz</file>
<file>svg_icons/kst_matrixedit.svgz</file>
<file>svg_icons/count-from-end.svgz</file>
<file>svg_icons/pause.svgz</file>
<file>svg_icons/page-next.svgz</file>
<file>svg_icons/data-manager.svgz</file>
<file>svg_icons/tools-wizard.svgz</file>
<file>svg_icons/themes.svgz</file>
<file>svg_icons/tied-zoom.svgz</file>
<file>svg_icons/save-vectors.svgz</file>
<file>svg_icons/kst_scalaredit.svgz</file>
<file>svg_icons/kst_scalarnew.svgz</file>
<file>svg_icons/kst_stringedit.svgz</file>
<file>svg_icons/kst_stringnew.svgz</file>
<file>svg_icons/kst_vectoredit.svgz</file>
<file>svg_icons/kst_vectornew.svgz</file>
<file>svg_icons/kst_matrixnew.svgz</file>
<file>svg_icons/change-data-file.svgz</file>
<file>svg_icons/kst_gfx_ellipse.svgz</file>
<file>svg_icons/kst_gfx_circle.svgz</file>
<file>svg_icons/read-to-end.svgz</file>
<file>svg_icons/x-zoom.svgz</file>
<file>svg_icons/xy-zoom.svgz</file>
<file>svg_icons/y-zoom.svgz</file>
<file>kst_newplot.png</file>
<file>svg_icons/kst_newplot.svgz</file>
<file>svg_icons/document-save.svgz</file>
<file>svg_icons/document-print.svgz</file>
<file>svg_icons/configure.svgz</file>
<file>svg_icons/application-exit.svgz</file>
<file>svg_icons/document-close.svgz</file>
<file>svg_icons/edit-undo.svgz</file>
<file>svg_icons/edit-redo.svgz</file>
<file>svg_icons/document-save-as.svgz</file>
<file>svg_icons/tab-close.svgz</file>
<file>svg_icons/tab-new.svgz</file>
<file>svg_icons/transform-move.svgz</file>
<file>svg_icons/kbugbuster.svgz</file>
<file>svg_icons/kst_reload.svgz</file>
<file>insert-image.png</file>
<file>svg_icons/insert-image.svgz</file>
<file>svg_icons/document-open.svgz</file>
<file>svg_icons/new-log-event.svgz</file>
<file>svg_icons/code-class.svgz</file>
<file>svg_icons/dialog-information.svgz</file>
<file>svg_icons/kst_gfx_rectangle.svgz</file>
<file>svg_icons/kst_gfx_line.svgz</file>
<file>svg_icons/kst_gfx_arrow.svgz</file>
<file>svg_icons/kst_gfx_sharedaxisbox.svgz</file>
<file>svg_icons/kst_differentiatecurves.svgz</file>
<file>svg_icons/kst_leftarrow.svgz</file>
<file>svg_icons/kst_uparrow.svgz</file>
<file>svg_icons/kst_rightarrow.svgz</file>
<file>svg_icons/kst_downarrow.svgz</file>
<file>svg_icons/kst_bold.svgz</file>
<file>svg_icons/kst_italic.svgz</file>
</qresource>
</RCC>
Binary file added src/images/insert-image.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/svg_icons/application-exit.svgz
View file
Binary file not shown.
Loading