Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
riuson committed Dec 14, 2014
2 parents 6998b5e + c0f8229 commit ff449e0c73a0ed4c77e835441f7593daca6e3da1
Showing with 3,103 additions and 809 deletions.
  1. +7 −1 README
  2. +4 −3 classes/action-handlers/actionedithandlers.cpp
  3. +204 −75 classes/action-handlers/actionfilehandlers.cpp
  4. +9 −0 classes/action-handlers/actionfilehandlers.h
  5. +3 −7 classes/action-handlers/actionfonthandlers.cpp
  6. +2 −2 classes/action-handlers/actionhelphandlers.cpp
  7. +1 −1 classes/action-handlers/actionhelphandlers.h
  8. +92 −22 classes/action-handlers/actionimagehandlers.cpp
  9. +1 −0 classes/action-handlers/actionimagehandlers.h
  10. +137 −0 classes/cmdline/cmdline.cpp
  11. +57 −0 classes/cmdline/cmdline.h
  12. +42 −0 classes/cmdline/cmdoptions.h
  13. +283 −0 classes/cmdline/modeconvertfont.cpp
  14. +70 −0 classes/cmdline/modeconvertfont.h
  15. +165 −0 classes/cmdline/modeconvertimage.cpp
  16. +56 −0 classes/cmdline/modeconvertimage.h
  17. +205 −0 classes/cmdline/modehex2bin.cpp
  18. +57 −0 classes/cmdline/modehex2bin.h
  19. +32 −0 classes/cmdline/modeparserbase.cpp
  20. +45 −0 classes/cmdline/modeparserbase.h
  21. +127 −85 classes/compression/rlecompressor.cpp
  22. +23 −3 classes/compression/rlecompressor.h
  23. +83 −0 classes/compression/rlesequence.cpp
  24. +47 −0 classes/compression/rlesequence.h
  25. +31 −7 classes/data/datacontainer.cpp
  26. +2 −2 classes/data/datacontainer.h
  27. +90 −55 classes/data/fontdocument.cpp
  28. +8 −8 classes/data/fontdocument.h
  29. +11 −2 classes/data/historykeeper.cpp
  30. +79 −37 classes/data/imagedocument.cpp
  31. +8 −8 classes/data/imagedocument.h
  32. +1 −1 classes/data/imagesmodel.cpp
  33. +10 −0 classes/data/revisioninfo.cpp
  34. +1 −0 classes/data/revisioninfo.h
  35. +4 −12 classes/parser/convert/converterhelper.cpp
  36. +2 −1 classes/parser/convert/converterhelper.h
  37. +5 −11 classes/parser/parser.cpp
  38. +1 −2 classes/parser/parser.h
  39. +20 −1 classes/settings/presets/imageoptions.cpp
  40. +3 −0 classes/settings/presets/imageoptions.h
  41. +28 −6 classes/settings/presets/preset.cpp
  42. +7 −4 classes/settings/presets/preset.h
  43. +19 −0 classes/settings/setupdialogoptions.cpp
  44. +19 −0 classes/settings/setupdialogoptions.h
  45. +1 −1 controls/about/dialogabout.cpp
  46. +3 −3 controls/about/dialogabout.ui
  47. +2 −4 controls/fonts/font-editor/editortabfont.cpp
  48. +26 −3 controls/fonts/font-range/dialogfontrange.cpp
  49. +19 −0 controls/fonts/font-range/dialogfontrange.h
  50. +0 −6 controls/images/editortabimage.cpp
  51. +51 −22 controls/main/mainwindow.cpp
  52. +10 −4 controls/main/mainwindow.ui
  53. +1 −1 controls/main/revisionlabel.cpp
  54. +42 −24 controls/save-changes/dialogsavechanges.cpp
  55. +9 −12 controls/save-changes/dialogsavechanges.h
  56. +0 −64 controls/save-changes/dialogsavechanges.ui
  57. +5 −2 controls/setup/dialogoptions.cpp
  58. +0 −1 controls/setup/dialogoptions.h
  59. +58 −1 controls/setup/dialogpreview.cpp
  60. +7 −1 controls/setup/dialogpreview.h
  61. +77 −32 controls/setup/dialogpreview.ui
  62. +7 −0 controls/setup/parts/image/setuptabimage.cpp
  63. +1 −0 controls/setup/parts/image/setuptabimage.h
  64. +34 −1 controls/setup/parts/image/setuptabimage.ui
  65. +1 −1 controls/setup/parts/matrix/matrixitemdelegate.cpp
  66. +4 −3 controls/setup/parts/matrix/matrixitemdelegate.h
  67. +3 −2 controls/setup/parts/matrix/setuptabmatrix.cpp
  68. +3 −2 controls/setup/parts/reordering/reorderingitemdelegate.h
  69. +1 −1 controls/start/starttab.ui
  70. +41 −4 controls/updates/dialogupdates.cpp
  71. +1 −0 controls/updates/dialogupdates.h
  72. +5 −2 interfaces/idocument.h
  73. +78 −52 lcd-image-converter.pro
  74. +32 −6 main.cpp
  75. +26 −0 qt-version-check.h
  76. +29 −0 readme.md
  77. +33 −6 resources/history.xml
  78. +1 −1 resources/history.xsl
  79. +327 −176 resources/lcd-image-converter-ru.ts
  80. BIN resources/template.png
  81. +56 −10 tests/parts/testrle.cpp
  82. +2 −3 tests/parts/testrle.h
  83. +2 −0 tests/test.pro
  84. +2 −1 translation-compile.sh
  85. +2 −1 version-gen.sh
8 README
@@ -3,7 +3,7 @@ Tool to create bitmaps and fonts for embedded applications, v.2
This program allows you to create bitmaps and fonts, and transform them to "C"
source format for embedded applications.

Home page: http://code.google.com/p/lcd-image-converter/
Home page: http://www.riuson.com/lcd-image-converter
Mailto: riuson@gmail.com

================================================================================
@@ -29,3 +29,9 @@ chmod +x build.sh
./_linux/release/lcd-image-converter

================================================================================

Additional packages on Ubuntu 14.04, Qt5:
libqt5xmlpatterns5 libqt5xmlpatterns5-dev libqt5xmlpatterns5-private-dev
qtscript5-dev qttools5-dev-tools

================================================================================
@@ -18,12 +18,13 @@
*/

#include "actionedithandlers.h"
#include "qt-version-check.h"

#ifdef USED_QT5
#if QT_VERSION_COMBINED >= VERSION_COMBINE(5, 0, 0)
#include <QtWidgets/QApplication>
#else
#include <QtGui/QApplication>
#endif
#endif // QT_VERSION

#include <QFileDialog>
#include <QTextStream>
@@ -134,7 +135,7 @@ void ActionEditHandlers::paste_triggered()
this->editor()->document()->dataContainer()->setImage(key, &image);
}

this->editor()->document()->endChanges();
this->editor()->document()->endChanges(false);
}
}
}
Oops, something went wrong.

0 comments on commit ff449e0

Please sign in to comment.