mirror of
https://github.com/creyD/intelliphoto.git
synced 2026-04-12 19:40:28 +02:00
Merge branch 'dev' into dev-warnings
This commit is contained in:
@@ -26,7 +26,7 @@
|
||||
<tr style="height: 56px;">
|
||||
<td id="projectalign" style="padding-left: 0.5em;">
|
||||
<div id="projectname">IntelliPhoto
|
||||
 <span id="projectnumber">0.5</span>
|
||||
 <span id="projectnumber">0.6</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -854,9 +854,9 @@ $(document).ready(function(){initNavTree('_intelli_photo_gui_8cpp_source.html','
|
||||
<div class="line"><a name="l00766"></a><span class="lineno"> 766</span>  <span class="comment">// Set style sheet</span></div>
|
||||
<div class="line"><a name="l00767"></a><span class="lineno"> 767</span>  this->setStyleSheet(<span class="stringliteral">"color: white;"</span> <span class="stringliteral">"background-color: rgb(64, 64, 64);"</span> <span class="stringliteral">"selection-color: rgb(200, 10, 10);"</span> <span class="stringliteral">"selection-background-color: rgb(64, 64, 64);"</span>);</div>
|
||||
<div class="line"><a name="l00768"></a><span class="lineno"> 768</span>  </div>
|
||||
<div class="line"><a name="l00769"></a><span class="lineno"> 769</span>  QString <span class="keywordtype">string</span> = QString(<span class="stringliteral">"background-color: %1"</span>).arg(paintingArea-><a class="code" href="class_painting_area.html#a132535c4e16052c1472cf1b9f3e096ed">colorPicker</a>.<a class="code" href="class_intelli_color_picker.html#aeb08029a0c946ed0402c9c11a91965b1">getFirstColor</a>().name());</div>
|
||||
<div class="line"><a name="l00769"></a><span class="lineno"> 769</span>  QString <span class="keywordtype">string</span> = QString(<span class="stringliteral">"background-color: %1"</span>).arg(paintingArea-><a class="code" href="class_painting_area.html#a132535c4e16052c1472cf1b9f3e096ed">colorPicker</a>.<a class="code" href="class_intelli_color_picker.html#aae2eb27b928fe9388b9398b0556303b7">getFirstColor</a>().name());</div>
|
||||
<div class="line"><a name="l00770"></a><span class="lineno"> 770</span>  FirstColorButton->setStyleSheet(<span class="keywordtype">string</span>);</div>
|
||||
<div class="line"><a name="l00771"></a><span class="lineno"> 771</span>  <span class="keywordtype">string</span> = QString(<span class="stringliteral">"background-color: %1"</span>).arg(paintingArea-><a class="code" href="class_painting_area.html#a132535c4e16052c1472cf1b9f3e096ed">colorPicker</a>.<a class="code" href="class_intelli_color_picker.html#ab41abe8fb7e184db2c33e792f09792e0">getSecondColor</a>().name());</div>
|
||||
<div class="line"><a name="l00771"></a><span class="lineno"> 771</span>  <span class="keywordtype">string</span> = QString(<span class="stringliteral">"background-color: %1"</span>).arg(paintingArea-><a class="code" href="class_painting_area.html#a132535c4e16052c1472cf1b9f3e096ed">colorPicker</a>.<a class="code" href="class_intelli_color_picker.html#a55568fbf5dc783f06284b7031ffe9415">getSecondColor</a>().name());</div>
|
||||
<div class="line"><a name="l00772"></a><span class="lineno"> 772</span>  SecondColorButton->setStyleSheet(<span class="keywordtype">string</span>);</div>
|
||||
<div class="line"><a name="l00773"></a><span class="lineno"> 773</span> }</div>
|
||||
<div class="line"><a name="l00774"></a><span class="lineno"> 774</span>  </div>
|
||||
@@ -935,9 +935,9 @@ $(document).ready(function(){initNavTree('_intelli_photo_gui_8cpp_source.html','
|
||||
<div class="line"><a name="l00847"></a><span class="lineno"> 847</span>  }</div>
|
||||
<div class="line"><a name="l00848"></a><span class="lineno"> 848</span>  ActiveLayerImageLabel->setPixmap(preview.scaled(Buttonsize * 2));</div>
|
||||
<div class="line"><a name="l00849"></a><span class="lineno"> 849</span>  </div>
|
||||
<div class="line"><a name="l00850"></a><span class="lineno"> 850</span>  <span class="keywordtype">string</span> = QString(<span class="stringliteral">"background-color: %1"</span>).arg(paintingArea-><a class="code" href="class_painting_area.html#a132535c4e16052c1472cf1b9f3e096ed">colorPicker</a>.<a class="code" href="class_intelli_color_picker.html#aeb08029a0c946ed0402c9c11a91965b1">getFirstColor</a>().name());</div>
|
||||
<div class="line"><a name="l00850"></a><span class="lineno"> 850</span>  <span class="keywordtype">string</span> = QString(<span class="stringliteral">"background-color: %1"</span>).arg(paintingArea-><a class="code" href="class_painting_area.html#a132535c4e16052c1472cf1b9f3e096ed">colorPicker</a>.<a class="code" href="class_intelli_color_picker.html#aae2eb27b928fe9388b9398b0556303b7">getFirstColor</a>().name());</div>
|
||||
<div class="line"><a name="l00851"></a><span class="lineno"> 851</span>  FirstColorButton->setStyleSheet(<span class="keywordtype">string</span>);</div>
|
||||
<div class="line"><a name="l00852"></a><span class="lineno"> 852</span>  <span class="keywordtype">string</span> = QString(<span class="stringliteral">"background-color: %1"</span>).arg(paintingArea-><a class="code" href="class_painting_area.html#a132535c4e16052c1472cf1b9f3e096ed">colorPicker</a>.<a class="code" href="class_intelli_color_picker.html#ab41abe8fb7e184db2c33e792f09792e0">getSecondColor</a>().name());</div>
|
||||
<div class="line"><a name="l00852"></a><span class="lineno"> 852</span>  <span class="keywordtype">string</span> = QString(<span class="stringliteral">"background-color: %1"</span>).arg(paintingArea-><a class="code" href="class_painting_area.html#a132535c4e16052c1472cf1b9f3e096ed">colorPicker</a>.<a class="code" href="class_intelli_color_picker.html#a55568fbf5dc783f06284b7031ffe9415">getSecondColor</a>().name());</div>
|
||||
<div class="line"><a name="l00853"></a><span class="lineno"> 853</span>  SecondColorButton->setStyleSheet(<span class="keywordtype">string</span>);</div>
|
||||
<div class="line"><a name="l00854"></a><span class="lineno"> 854</span>  </div>
|
||||
<div class="line"><a name="l00855"></a><span class="lineno"> 855</span>  <span class="keywordtype">string</span> = QString(<span class="stringliteral">"%1x%2"</span>).arg(paintingArea->Canvas->width()).arg(paintingArea->Canvas->height());</div>
|
||||
@@ -964,6 +964,7 @@ $(document).ready(function(){initNavTree('_intelli_photo_gui_8cpp_source.html','
|
||||
<div class="ttc" id="aclass_painting_area_html_a79eb059829f27e8cdb3a54c5cd3d12c9"><div class="ttname"><a href="class_painting_area.html#a79eb059829f27e8cdb3a54c5cd3d12c9">PaintingArea::setLayerActive</a></div><div class="ttdeci">void setLayerActive(int idx)</div><div class="ttdoc">The setLayerToActive method marks a specific layer as active.</div><div class="ttdef"><b>Definition:</b> <a href="_painting_area_8cpp_source.html#l00103">PaintingArea.cpp:103</a></div></div>
|
||||
<div class="ttc" id="aclass_painting_area_html_aa811d142df9239ae248679bd70ad6da7"><div class="ttname"><a href="class_painting_area.html#aa811d142df9239ae248679bd70ad6da7">PaintingArea::getMaxHeight</a></div><div class="ttdeci">int getMaxHeight()</div><div class="ttdef"><b>Definition:</b> <a href="_painting_area_8cpp_source.html#l00247">PaintingArea.cpp:247</a></div></div>
|
||||
<div class="ttc" id="aclass_painting_area_html_a9b7dc8b8dc0b301ce58206aa76fb1630"><div class="ttname"><a href="class_painting_area.html#a9b7dc8b8dc0b301ce58206aa76fb1630">PaintingArea::deleteLayer</a></div><div class="ttdeci">void deleteLayer(int idx, bool isTool=false)</div><div class="ttdoc">The deleteLayer method removes a layer at a given idx.</div><div class="ttdef"><b>Definition:</b> <a href="_painting_area_8cpp_source.html#l00081">PaintingArea.cpp:81</a></div></div>
|
||||
<div class="ttc" id="aclass_intelli_color_picker_html_a55568fbf5dc783f06284b7031ffe9415"><div class="ttname"><a href="class_intelli_color_picker.html#a55568fbf5dc783f06284b7031ffe9415">IntelliColorPicker::getSecondColor</a></div><div class="ttdeci">QColor getSecondColor()</div><div class="ttdoc">A function to read the secondary selected color.</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_color_picker_8cpp_source.html#l00019">IntelliColorPicker.cpp:19</a></div></div>
|
||||
<div class="ttc" id="aclass_painting_area_html_a3de83443d2d5cf460ff48d0602070938"><div class="ttname"><a href="class_painting_area.html#a3de83443d2d5cf460ff48d0602070938">PaintingArea::createPlainTool</a></div><div class="ttdeci">void createPlainTool()</div><div class="ttdef"><b>Definition:</b> <a href="_painting_area_8cpp_source.html#l00206">PaintingArea.cpp:206</a></div></div>
|
||||
<div class="ttc" id="aclass_intelli_photo_gui_html_ad2aaec3c1517a9aaa461b54e341b97e0"><div class="ttname"><a href="class_intelli_photo_gui.html#ad2aaec3c1517a9aaa461b54e341b97e0">IntelliPhotoGui::IntelliPhotoGui</a></div><div class="ttdeci">IntelliPhotoGui()</div><div class="ttdoc">The IntelliPhotoGui method is the constructor and is used to create a new instance of the main progra...</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_photo_gui_8cpp_source.html#l00007">IntelliPhotoGui.cpp:7</a></div></div>
|
||||
<div class="ttc" id="aclass_painting_area_html"><div class="ttname"><a href="class_painting_area.html">PaintingArea</a></div><div class="ttdoc">The PaintingArea class manages the methods and stores information about the current painting area,...</div><div class="ttdef"><b>Definition:</b> <a href="_painting_area_8h_source.html#l00053">PaintingArea.h:53</a></div></div>
|
||||
@@ -984,6 +985,7 @@ $(document).ready(function(){initNavTree('_intelli_photo_gui_8cpp_source.html','
|
||||
<div class="ttc" id="aclass_painting_area_html_ae05f6893fb44bfcb34018573a609cd1a"><div class="ttname"><a href="class_painting_area.html#ae05f6893fb44bfcb34018573a609cd1a">PaintingArea::moveActiveLayer</a></div><div class="ttdeci">void moveActiveLayer(int idx)</div><div class="ttdoc">The moveActiveLayer moves the active layer to a specific position in the layer stack.</div><div class="ttdef"><b>Definition:</b> <a href="_painting_area_8cpp_source.html#l00170">PaintingArea.cpp:170</a></div></div>
|
||||
<div class="ttc" id="aclass_painting_area_html_a132535c4e16052c1472cf1b9f3e096ed"><div class="ttname"><a href="class_painting_area.html#a132535c4e16052c1472cf1b9f3e096ed">PaintingArea::colorPicker</a></div><div class="ttdeci">IntelliColorPicker colorPicker</div><div class="ttdef"><b>Definition:</b> <a href="_painting_area_8h_source.html#l00202">PaintingArea.h:202</a></div></div>
|
||||
<div class="ttc" id="a_painting_area_8h_html"><div class="ttname"><a href="_painting_area_8h.html">PaintingArea.h</a></div></div>
|
||||
<div class="ttc" id="aclass_intelli_color_picker_html_aae2eb27b928fe9388b9398b0556303b7"><div class="ttname"><a href="class_intelli_color_picker.html#aae2eb27b928fe9388b9398b0556303b7">IntelliColorPicker::getFirstColor</a></div><div class="ttdeci">QColor getFirstColor()</div><div class="ttdoc">A function to read the primary selected color.</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_color_picker_8cpp_source.html#l00015">IntelliColorPicker.cpp:15</a></div></div>
|
||||
<div class="ttc" id="aclass_painting_area_html_a0b22e18069b524f3e75857d203baf256"><div class="ttname"><a href="class_painting_area.html#a0b22e18069b524f3e75857d203baf256">PaintingArea::createFloodFillTool</a></div><div class="ttdeci">void createFloodFillTool()</div><div class="ttdef"><b>Definition:</b> <a href="_painting_area_8cpp_source.html#l00230">PaintingArea.cpp:230</a></div></div>
|
||||
<div class="ttc" id="aclass_intelli_toolsettings_html_a9a61f3de61efeba2287f8b32941f4271"><div class="ttname"><a href="class_intelli_toolsettings.html#a9a61f3de61efeba2287f8b32941f4271">IntelliToolsettings::setInnerAlpha</a></div><div class="ttdeci">void setInnerAlpha(int innerAlpha)</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_toolsettings_8cpp_source.html#l00032">IntelliToolsettings.cpp:32</a></div></div>
|
||||
<div class="ttc" id="aclass_intelli_photo_gui_html_a1dbef8d4688227aa9455aea52db00bf4"><div class="ttname"><a href="class_intelli_photo_gui.html#a1dbef8d4688227aa9455aea52db00bf4">IntelliPhotoGui::UpdateGui</a></div><div class="ttdeci">void UpdateGui()</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_photo_gui_8cpp_source.html#l00836">IntelliPhotoGui.cpp:836</a></div></div>
|
||||
|
||||
Reference in New Issue
Block a user