MOS
/
OpenBoard
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

new icons for the textAlignment

Browse Source
preferencesAboutTextFull
-f 11 years ago
parent 7630e50d01
commit bb4e0b43f2
7 changed files with 360 additions and 7 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      resources/OpenBoard.qrc
  2. 88
      resources/images/centerAligned.svg
  3. 88
      resources/images/leftAligned.svg
  4. 88
      resources/images/notAligned.svg
  5. 88
      resources/images/rightAligned.svg
  6. 8
      src/domain/UBGraphicsTextItemDelegate.cpp
  7. 3
      src/domain/UBSelectionFrame.cpp

4
resources/OpenBoard.qrc
Unescape View File

@ -346,5 +346,9 @@
<file>images/duplicateDisabled.svg</file> <file>images/duplicateDisabled.svg</file>
<file>images/roundeRrectangle.svg</file> <file>images/roundeRrectangle.svg</file>
<file>images/circle.svg</file> <file>images/circle.svg</file>
<file>images/rightAligned.svg</file>
<file>images/centerAligned.svg</file>
<file>images/leftAligned.svg</file>
<file>images/notAligned.svg</file>
</qresource> </qresource>
</RCC> </RCC>

88
resources/images/centerAligned.svg
Unescape View File

@ -0,0 +1,88 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.2"
id="Layer_1"
x="0px"
y="0px"
width="26px"
height="26px"
viewBox="0 0 26 26"
xml:space="preserve"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="rightAligned.svg"><metadata
id="metadata15"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs13" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="977"
inkscape:window-height="651"
id="namedview11"
showgrid="false"
inkscape:zoom="9.0769231"
inkscape:cx="-0.82627119"
inkscape:cy="13"
inkscape:window-x="378"
inkscape:window-y="85"
inkscape:window-maximized="0"
inkscape:current-layer="Layer_1" />
<circle
cx="13"
cy="13"
r="13"
id="circle3"
sodipodi:cx="13"
sodipodi:cy="13"
sodipodi:rx="13"
sodipodi:ry="13"
style="fill:#cccccc" />
<circle
cx="13"
cy="13"
r="11"
id="circle5"
sodipodi:cx="13"
sodipodi:cy="13"
sodipodi:rx="11"
sodipodi:ry="11"
style="fill:#999999" />
<rect
x="-9.4915257"
y="5.9864073"
width="4"
height="14.20339"
id="rect7"
transform="matrix(0,-1,1,0,0,0)"
style="fill:#ffffff" />
<rect
x="-15"
y="9.8423395"
width="4"
height="6.4915261"
id="rect9"
transform="matrix(0,-1,1,0,0,0)"
style="fill:#ffffff" />
<rect
style="fill:#ffffff"
x="-20.508474"
y="7.6940346"
width="4"
height="10.788136"
id="rect9-4"
transform="matrix(0,-1,1,0,0,0)" /></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

88
resources/images/leftAligned.svg
Unescape View File

@ -0,0 +1,88 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.2"
id="Layer_1"
x="0px"
y="0px"
width="26px"
height="26px"
viewBox="0 0 26 26"
xml:space="preserve"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="centerAligned.svg"><metadata
id="metadata15"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs13" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="977"
inkscape:window-height="651"
id="namedview11"
showgrid="false"
inkscape:zoom="9.0769231"
inkscape:cx="-0.82627119"
inkscape:cy="13"
inkscape:window-x="378"
inkscape:window-y="85"
inkscape:window-maximized="0"
inkscape:current-layer="Layer_1" />
<circle
cx="13"
cy="13"
r="13"
id="circle3"
sodipodi:cx="13"
sodipodi:cy="13"
sodipodi:rx="13"
sodipodi:ry="13"
style="fill:#cccccc" />
<circle
cx="13"
cy="13"
r="11"
id="circle5"
sodipodi:cx="13"
sodipodi:cy="13"
sodipodi:rx="11"
sodipodi:ry="11"
style="fill:#999999" />
<rect
x="-9.4915257"
y="5.9864073"
width="4"
height="14.20339"
id="rect7"
transform="matrix(0,-1,1,0,0,0)"
style="fill:#ffffff" />
<rect
x="-15"
y="5.9864073"
width="4"
height="6.4915261"
id="rect9"
transform="matrix(0,-1,1,0,0,0)"
style="fill:#ffffff" />
<rect
style="fill:#ffffff"
x="-20.508474"
y="5.9864073"
width="4"
height="10.788136"
id="rect9-4"
transform="matrix(0,-1,1,0,0,0)" /></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

88
resources/images/notAligned.svg
Unescape View File

@ -0,0 +1,88 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.2"
id="Layer_1"
x="0px"
y="0px"
width="26px"
height="26px"
viewBox="0 0 26 26"
xml:space="preserve"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="notAligned.svg"><metadata
id="metadata15"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
id="defs13" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1366"
inkscape:window-height="715"
id="namedview11"
showgrid="false"
inkscape:zoom="9.0769231"
inkscape:cx="-28.258474"
inkscape:cy="13"
inkscape:window-x="1680"
inkscape:window-y="309"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_1" />
<circle
cx="13"
cy="13"
r="13"
id="circle3"
sodipodi:cx="13"
sodipodi:cy="13"
sodipodi:rx="13"
sodipodi:ry="13"
style="fill:#cccccc" />
<circle
cx="13"
cy="13"
r="11"
id="circle5"
sodipodi:cx="13"
sodipodi:cy="13"
sodipodi:rx="11"
sodipodi:ry="11"
style="fill:#b3b3b3" />
<rect
x="-9.4915257"
y="5.9864073"
width="4"
height="14.20339"
id="rect7"
transform="matrix(0,-1,1,0,0,0)"
style="fill:#ffffff" />
<rect
x="-15"
y="9.8423395"
width="4"
height="6.4915261"
id="rect9"
transform="matrix(0,-1,1,0,0,0)"
style="fill:#ffffff" />
<rect
style="fill:#ffffff"
x="-20.508474"
y="9.4016619"
width="4"
height="10.788136"
id="rect9-4"
transform="matrix(0,-1,1,0,0,0)" /></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

88
resources/images/rightAligned.svg
Unescape View File

@ -0,0 +1,88 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.2"
id="Layer_1"
x="0px"
y="0px"
width="26px"
height="26px"
viewBox="0 0 26 26"
xml:space="preserve"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="rightAligned.svg"><metadata
id="metadata15"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs13" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="977"
inkscape:window-height="651"
id="namedview11"
showgrid="false"
inkscape:zoom="9.0769231"
inkscape:cx="-0.82627119"
inkscape:cy="13"
inkscape:window-x="378"
inkscape:window-y="85"
inkscape:window-maximized="0"
inkscape:current-layer="Layer_1" />
<circle
cx="13"
cy="13"
r="13"
id="circle3"
sodipodi:cx="13"
sodipodi:cy="13"
sodipodi:rx="13"
sodipodi:ry="13"
style="fill:#cccccc" />
<circle
cx="13"
cy="13"
r="11"
id="circle5"
sodipodi:cx="13"
sodipodi:cy="13"
sodipodi:rx="11"
sodipodi:ry="11"
style="fill:#999999" />
<rect
x="-9.4915257"
y="5.9864073"
width="4"
height="14.20339"
id="rect7"
transform="matrix(0,-1,1,0,0,0)"
style="fill:#ffffff" />
<rect
x="-15"
y="13.698271"
width="4"
height="6.4915261"
id="rect9"
transform="matrix(0,-1,1,0,0,0)"
style="fill:#ffffff" />
<rect
style="fill:#ffffff"
x="-20.508474"
y="9.4016619"
width="4"
height="10.788136"
id="rect9-4"
transform="matrix(0,-1,1,0,0,0)" /></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

8
src/domain/UBGraphicsTextItemDelegate.cpp
Unescape View File

@ -48,10 +48,10 @@ const int UBGraphicsTextItemDelegate::sMinPointSize = 8;
AlignTextButton::AlignTextButton(const QString &fileName, QGraphicsItem *pDelegated, QGraphicsItem *parent, Qt::WindowFrameSection section) AlignTextButton::AlignTextButton(const QString &fileName, QGraphicsItem *pDelegated, QGraphicsItem *parent, Qt::WindowFrameSection section)
: DelegateButton(fileName, pDelegated, parent, section) : DelegateButton(fileName, pDelegated, parent, section)
, lft(new QSvgRenderer(QString(":/images/plus.svg"))) , lft(new QSvgRenderer(QString(":/images/leftAligned.svg")))
, cntr(new QSvgRenderer(QString(":/images/pause.svg"))) , cntr(new QSvgRenderer(QString(":/images/centerAligned.svg")))
, rght(new QSvgRenderer(QString(":/images/minus.svg"))) , rght(new QSvgRenderer(QString(":/images/rightAligned.svg")))
, mxd(new QSvgRenderer(QString(":/images/reload.svg"))) , mxd(new QSvgRenderer(QString(":/images/notAligned.svg")))
{ {
setKind(k_left); setKind(k_left);
} }

3
src/domain/UBSelectionFrame.cpp
Unescape View File

@ -313,9 +313,6 @@ void UBSelectionFrame::increaseZlevelBottom()
ubscene()->changeZLevelTo(iter.previous(), UBZLayerController::bottom); ubscene()->changeZLevelTo(iter.previous(), UBZLayerController::bottom);
} }
addSelectionUndo(selItems, UBZLayerController::bottom); addSelectionUndo(selItems, UBZLayerController::bottom);
// foreach (QGraphicsItem *item, sortedByZ(scene()->selectedItems())) {
// ubscene()->changeZLevelTo(item, UBZLayerController::bottom);
// }
} }
void UBSelectionFrame::groupItems() void UBSelectionFrame::groupItems()

Write Preview
Loading…
Cancel
Save