Commit graph

80 commits

Author SHA1 Message Date
shun_iwasawa
21a6b6ba06 pencil test popup 2016-07-06 20:06:20 +09:00
Shinya Kitaoka
c08330d1ae Merge pull request #567 from opentoonz/cmake-cleanup-defines-pr
CMake: use multi-line defines
2016-07-06 13:56:49 +09:00
shun_iwasawa
fd6c3c05ac revert behavior on dblclking style, and more 2016-07-05 16:15:29 +09:00
Shinya Kitaoka
fd19c4eedf Support Visual Studio 2015 (#544)
* Small changes, for some reason VS 2015 can't link cprintf and they added a second function std::map::count and bind couldn't resolve the function. Substituted with a lambda-expression.

* Created all 64bit version of the 3rd party libs.

* Cleanup popup opens CleanupSettings instead of CleanupSettingsPane. Not finished, panel is wrong now (also uses CleanupSettings).

* Tried to get Twain working, failed.

* When there are more then 3 peg holes create additional holes.

* When a hole touches the boundary it should still be considered a hole.

* Do not compare dot size against fixed size. Will not work in some scan resolutions. Used the same value (PERCENT * max dot size) as later in the code in compare_dots.

* When there are more than three peg holes the code looked for the best fit and used that. The problem was, that the middle hole was used as center for auto center. For three peg holes that is correct, but does not work for more than three. Now the best fit is calculated and from there the offset of the middle of the three best fit holes is calculated and applied.

* One of the last changes broke VS2015 compatibility, it chocked on a missing include.

* fix for msvs2013

* revert autopos.cpp

* apply clang-format

* use GIT-LFS
2016-07-04 17:50:30 +09:00
Campbell Barton
f2d492861f CMake: use multi-line defines
Easier to read and avoids merge conflicts
2016-07-02 22:23:18 +10:00
Campbell Barton
f493896cc0 Cleanup: typo (sensibility) 2016-06-29 20:49:17 +10:00
Shinya Kitaoka
d1f6c4e95b REFACTORING: Add final specifiers (#537)
* add final specifiers

* apply clang-format

* fix for macOS
2016-06-29 15:17:12 +09:00
Shinya Kitaoka
91695244e8 Merge pull request #532 from shun-iwasawa/fix_infoviewer_text_color
Fix File Info text color
2016-06-29 12:56:16 +09:00
shun-iwasawa
c86c5d6189 Organizing the Tool option bar layout (#443)
* edit tool, selection tool, brush tool

* other tools

* include cmath
2016-06-27 15:22:54 +09:00
shun_iwasawa
b102ca20bb fix infoviewer text color (and some other ui color) 2016-06-27 14:21:30 +09:00
Shinya Kitaoka
0d7879fb9b Merge pull request #495 from shun-iwasawa/revert_planeviewer
(incompletely) Fix crash on using Shader Fx
2016-06-23 17:06:54 +09:00
tomosu
965183e43c Merge pull request #475 from skitaoka/refactoring/add-override
REFACTORING: add override specifiers
2016-06-23 17:03:53 +09:00
shun_iwasawa
24d63588e8 autopaint indicator on palette viewer 2016-06-22 22:27:06 +09:00
shun_iwasawa
2bdc044b89 revert planeviewer to inherit qglwidget 2016-06-22 20:46:24 +09:00
shun-iwasawa
76270a4b64 Merge pull request #395 from turtletooth/palettes
Toonz Palettes folder now working and has 3 starter palettes
2016-06-20 15:55:47 +09:00
Shinya Kitaoka
38fd868138 apply clang-format 2016-06-20 11:34:17 +09:00
Shinya Kitaoka
473e70432a add override specifier 2016-06-20 11:34:15 +09:00
shun-iwasawa
eec8419456 Fix text color in the Script console and the Rename popup (#458)
* set object names

* add style sheet

* close #442 and #449
2016-06-17 17:35:41 +09:00
Jeremy Bullock
946edbcf47 Fixed for 1.0.3 2016-06-15 23:15:05 -06:00
Shinya Kitaoka
120a6e041c apply clang-format 2016-06-15 15:43:10 +09:00
Shinya Kitaoka
ee259ffaf7 remove duplicated constants (#296) 2016-06-13 21:37:09 +09:00
Shinya Kitaoka
9eb50de5fe Use std functions (#297)
* use std functions

* replace toInt        to std::stoi
* replace toDouble     to std::stod
* replace toString     to std::to_string
* replace toWideString to std::to_wstring

* fix for MacOS

* cosmetic change
2016-06-07 16:06:00 +09:00
Jeremy Bullock
b37830bb62 Toonz Palettes folder now working and has 3 starter palettes 2016-06-02 20:51:51 -06:00
Shinya Kitaoka
822411ba0e Support German translation (#363)
German translations

* Added files via upload

First translation draft. Corrections need to be made with actual in hand program

* Added files via upload

* Japanese characters

正方ピクセルを保持 -> Force Squared Pixel translated as "Quadratische Pixel erzwingen"

* Small spelling error

Blur value ->Weichheitsgrad

* add loc/german/*.qm

* modify loc dir names to their local script

* fixup! update loc/*/*.qm

* fix "Sensitivity"
2016-05-27 14:27:54 +09:00
Shinya Kitaoka
210a8af034 Use QGLWidget instead of QOpenGLWidget (#337)
* use QGLWidget instead of QOpenGLWidget for PlaneView

* fix ImageViewer and HexagonalColorWhell
2016-05-25 18:19:38 +09:00
Shinya Kitaoka
3fa3e1e9b8 Use "range-based for" instead of iterators (#339)
* use "range-based for" instead of iterators

* fix assertions
2016-05-23 17:40:49 +09:00
Keisuke Ogaki
0c8292e173 Revert "Use QOpenGLWidget instead of QGLWidget" (#350) 2016-05-23 16:19:32 +09:00
shun-iwasawa
0a9e80ffa1 Fix crash on exploding sub-xsheet (#305)
* fix crash on exploding sub xsheet

* call onselectionchanged in mousepressevent
2016-05-20 18:20:30 +09:00
Campbell Barton
5ea53c8c6b Quiet GCC -Wparentheses warning with assignment (#310) 2016-05-20 17:37:59 +09:00
Shinya Kitaoka
dd27936d94 Use QOpenGLWidget instead of QGLWidget (#315)
* use QOpenGLWidget instead of QGLWidget for ImageViewer

* use update() instead of updateGL()

* fix doSwapBuffers

* fix HexagonalColorWheel

* fix Viewer

* support AA_ShareOpenGLContexts & AA_EnableHighDpiScaling

* check Qt version
2016-05-19 19:44:34 +09:00
Shinya Kitaoka
12c444ee0d use std::min and std::max (#318) 2016-05-18 13:03:37 +09:00
Campbell Barton
14c02ece7f Fix incorrect assignments in if statements (#311) 2016-05-17 14:28:51 +09:00
Shinya Kitaoka
8105532604 add #pragma once (#303) 2016-05-17 00:04:11 +09:00
Shinya Kitaoka
1660e0d627 Fix conflicts (Remove license and edition defines and code) (#291)
* Remove license support, and old editions

Previously, old code to support various editions of Toonz, as well as
license activiation code, was cluttering the repository.
Support for LINETEST is retained.

* fix conflicts
2016-05-16 20:45:31 +09:00
Shinya Kitaoka
7be7e612c4 Fix a version text (Rewrite update check) (#290)
* Rewrite update check

Before release, the update URL will need to be changed to an official
one.

* remove syntax macros: CASE, __OR, and DEFAULT

* define VC_EXTRALEAN

* modify the URL of opentoonz-version.txt

* fix a type of updateUrl

* remove meanless comments
2016-05-16 14:16:01 +09:00
Shinya Kitaoka
d4642c34e8 Remove macros: CASE, __OR, and DEFAULT (#286)
* remove syntax macros: CASE, __OR, and DEFAULT

* define VC_EXTRALEAN

* remove meaningless comments
2016-05-13 19:49:17 +09:00
Campbell Barton
f08982dd33 CMake: cleanup indentation, remove redundant endif args 2016-04-27 21:48:12 +10:00
tomosu
de525f2146 pen/touch device support (#206)
* change XsheetViewer::wheelEvent

* change horizontal mouse wheel move distance

* align 'Natural' direction with OSX policy

* change wheelEvent in SpreadSheetViewer (but function editor scroll still not working sufficiently)

* fix unintended zoom with pen-tablet
2016-04-27 15:11:23 +09:00
Shinya Kitaoka
1ab7cf5db2 Merge pull request #246 from shun-iwasawa/fix_function_editor_crash
Fix crash when typing an expression without selecting curve in function editor
2016-04-27 14:55:02 +09:00
Shinya Kitaoka
82ce0b9627 Merge pull request #236 from shun-iwasawa/fix_keyboard_shortcut_feature
Adding default keyboard shortcuts + Enable to delete default shortcuts
2016-04-27 13:51:47 +09:00
shun_iwasawa
9f8808c937 fix function editor crash 2016-04-26 17:13:12 +09:00
shun_iwasawa
84d31eab96 fix shortcut key feature and revert default keys 2016-04-25 22:46:24 +09:00
shun_iwasawa
01874c2b40 fix crash on new style 2016-04-22 22:20:32 +09:00
Shinya Kitaoka
cc48383f8a Merge pull request #146 from shun-iwasawa/fix_loading_reslist
Fix loading camera preset (reslist.txt)
2016-04-21 16:25:54 +09:00
Shinya Kitaoka
3bfa549e8b remove "using"
- using std::string;
- using std::wstring;
- using std::ostream;
- using std::istream;
- using std::iostream;
- using std::ostrstream;
- using std::istrstream;
- using std::fstream;
2016-04-21 16:23:15 +09:00
tomosu
b8c01c142e Merge pull request #190 from skitaoka/fix/delete-deletes
Remove `delete`s with some refactoring
2016-04-20 14:25:50 +09:00
Shinya Kitaoka
eabf183e6e fix namespace 2016-04-20 10:24:52 +09:00
Shinya Kitaoka
61dd762587 add #include <cmath> 2016-04-20 10:24:50 +09:00
Shinya Kitaoka
c12eacf2f3 remove #define NOMINMAX 2016-04-20 10:24:50 +09:00
Shinya Kitaoka
bb1d046db8 remove using namespace DVGui; from headers 2016-04-20 10:24:49 +09:00