From b37830bb62bce94a910fd88dbeea6ace836bc270 Mon Sep 17 00:00:00 2001 From: Jeremy Bullock Date: Thu, 2 Jun 2016 20:51:51 -0600 Subject: [PATCH] Toonz Palettes folder now working and has 3 starter palettes --- .../studiopalette/Global Palettes/basics.tpl | 59 ++ stuff/studiopalette/Global Palettes/skin.tpl | 95 +++ .../studiopalette/Global Palettes/variety.tpl | 785 ++++++++++++++++++ toonz/sources/toonzlib/studiopalette.cpp | 2 +- toonz/sources/toonzqt/studiopaletteviewer.cpp | 2 +- 5 files changed, 941 insertions(+), 2 deletions(-) create mode 100644 stuff/studiopalette/Global Palettes/basics.tpl create mode 100644 stuff/studiopalette/Global Palettes/skin.tpl create mode 100644 stuff/studiopalette/Global Palettes/variety.tpl diff --git a/stuff/studiopalette/Global Palettes/basics.tpl b/stuff/studiopalette/Global Palettes/basics.tpl new file mode 100644 index 00000000..e2679aa4 --- /dev/null +++ b/stuff/studiopalette/Global Palettes/basics.tpl @@ -0,0 +1,59 @@ + + + 71 0 + + + + + + + + + + + + + + + + + + + + colors + + + 0 1 2 3 4 5 6 7 8 9 10 11 12 + + + + + 0 1 -1 -1 -1 -1 -1 -1 -1 -1 + + diff --git a/stuff/studiopalette/Global Palettes/skin.tpl b/stuff/studiopalette/Global Palettes/skin.tpl new file mode 100644 index 00000000..27d9e71d --- /dev/null +++ b/stuff/studiopalette/Global Palettes/skin.tpl @@ -0,0 +1,95 @@ + + + 71 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + colors + + + 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 + + + + + 0 1 -1 -1 -1 -1 -1 -1 -1 -1 + + diff --git a/stuff/studiopalette/Global Palettes/variety.tpl b/stuff/studiopalette/Global Palettes/variety.tpl new file mode 100644 index 00000000..6dafab7b --- /dev/null +++ b/stuff/studiopalette/Global Palettes/variety.tpl @@ -0,0 +1,785 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + colors + + + 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 + + + + + 0 1 -1 -1 -1 -1 -1 -1 -1 -1 + + diff --git a/toonz/sources/toonzlib/studiopalette.cpp b/toonz/sources/toonzlib/studiopalette.cpp index 7fb824ab..43d3164e 100644 --- a/toonz/sources/toonzlib/studiopalette.cpp +++ b/toonz/sources/toonzlib/studiopalette.cpp @@ -225,7 +225,7 @@ StudioPalette *StudioPalette::instance() TFilePath StudioPalette::getLevelPalettesRoot() { - return m_root + "Toonz Palettes"; + return m_root + "Global Palettes"; } //------------------------------------------------------------------- diff --git a/toonz/sources/toonzqt/studiopaletteviewer.cpp b/toonz/sources/toonzqt/studiopaletteviewer.cpp index fe134c0f..65047249 100644 --- a/toonz/sources/toonzqt/studiopaletteviewer.cpp +++ b/toonz/sources/toonzqt/studiopaletteviewer.cpp @@ -189,7 +189,7 @@ void StudioPaletteTreeViewer::setStdPaletteHandle(TPaletteHandle *studioPaletteH QTreeWidgetItem *StudioPaletteTreeViewer::createRootItem(TFilePath path) { QString rootName = QString::fromStdWString(path.getWideName()); - if (rootName != "Toonz Palettes") + if (rootName != "Global Palettes") rootName = "Project Palettes"; QTreeWidgetItem *rootItem = new QTreeWidgetItem((QTreeWidget *)0, QStringList(rootName)); rootItem->setIcon(0, m_folderIcon);