Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Added glabels zoom icons.

Browse Source
This commit is contained in:
Jim Evins
2017-02-05 22:19:11 -05:00
parent 7736f9c1e4
commit 55285405c2
17 changed files with 236 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
glabels/Icons.h
+8 -26
View File
@@ -348,28 +348,6 @@ namespace glabels
};
class BucketFill : public QIcon
{
public:
BucketFill()
{
addFile( ":icons/16x16/actions/glabels-bucket-fill.png" );
addFile( ":icons/24x24/actions/glabels-bucket-fill.png" );
}
};
class Pencil : public QIcon
{
public:
Pencil()
{
addFile( ":icons/16x16/actions/glabels-pencil.png" );
addFile( ":icons/24x24/actions/glabels-pencil.png" );
}
};
class Glabels : public QIcon
{
public:
@@ -470,7 +448,8 @@ namespace glabels
public:
ZoomBestFit()
{
addFile( ":icons/24x24/actions/zoom-best-fit.png" );
addPixmap( QPixmap( ":icons/16x16/actions/glabels-zoom-to-fit.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/glabels-zoom-to-fit.svg" ) );
}
};
@@ -480,7 +459,8 @@ namespace glabels
public:
ZoomIn()
{
addFile( ":icons/24x24/actions/zoom-in.png" );
addPixmap( QPixmap( ":icons/16x16/actions/glabels-zoom-in.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/glabels-zoom-in.svg" ) );
}
};
@@ -490,7 +470,8 @@ namespace glabels
public:
ZoomOriginal()
{
addFile( ":icons/24x24/actions/zoom-original.png" );
addPixmap( QPixmap( ":icons/16x16/actions/glabels-zoom-one-to-one.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/glabels-zoom-one-to-one.svg" ) );
}
};
@@ -500,7 +481,8 @@ namespace glabels
public:
ZoomOut()
{
addFile( ":icons/24x24/actions/zoom-out.png" );
addPixmap( QPixmap( ":icons/16x16/actions/glabels-zoom-out.svg" ) );
addPixmap( QPixmap( ":icons/22x22/actions/glabels-zoom-out.svg" ) );
}
};
glabels/MainWindow.cpp
+4 -4
View File
@@ -348,24 +348,24 @@ namespace glabels
connect( viewMarkupAction, SIGNAL(toggled(bool)), this, SLOT(viewMarkup(bool)) );
viewZoomInAction = new QAction( tr("Zoom &In"), this );
viewZoomInAction->setIcon( QIcon::fromTheme( "zoom-in", Icons::ZoomIn() ) );
viewZoomInAction->setIcon( Icons::ZoomIn() );
viewZoomInAction->setShortcut( QKeySequence::ZoomIn );
viewZoomInAction->setStatusTip( tr("Increase magnification") );
connect( viewZoomInAction, SIGNAL(triggered()), this, SLOT(viewZoomIn()) );
viewZoomOutAction = new QAction( tr("Zoom &Out"), this );
viewZoomOutAction->setIcon( QIcon::fromTheme( "zoom-out", Icons::ZoomOut() ) );
viewZoomOutAction->setIcon( Icons::ZoomOut() );
viewZoomOutAction->setShortcut( QKeySequence::ZoomOut );
viewZoomOutAction->setStatusTip( tr("Decrease magnification") );
connect( viewZoomOutAction, SIGNAL(triggered()), this, SLOT(viewZoomOut()) );
viewZoom1To1Action = new QAction( tr("Zoom &1 to 1"), this );
viewZoom1To1Action->setIcon( QIcon::fromTheme( "zoom-original", Icons::ZoomOriginal() ) );
viewZoom1To1Action->setIcon( Icons::ZoomOriginal() );
viewZoom1To1Action->setStatusTip( tr("Restore scale to 100%") );
connect( viewZoom1To1Action, SIGNAL(triggered()), this, SLOT(viewZoom1To1()) );
viewZoomToFitAction = new QAction( tr("Zoom to &Fit"), this );
viewZoomToFitAction->setIcon( QIcon::fromTheme( "zoom-fit-best", Icons::ZoomBestFit() ) );
viewZoomToFitAction->setIcon( Icons::ZoomBestFit() );
viewZoomToFitAction->setStatusTip( tr("Set scale to fit window") );
connect( viewZoomToFitAction, SIGNAL(triggered()), this, SLOT(viewZoomToFit()) );
glabels/icons.qrc
+8 -6
View File
@@ -4,7 +4,6 @@
<qresource>
<file>icons/16x16/actions/edit-clear.png</file>
<file>icons/16x16/actions/edit-find.png</file>
<file>icons/16x16/actions/glabels-align-bottom.png</file>
<file>icons/16x16/actions/glabels-align-hcenter.png</file>
<file>icons/16x16/actions/glabels-align-left.png</file>
@@ -14,7 +13,6 @@
<file>icons/16x16/actions/glabels-arrow.svg</file>
<file>icons/16x16/actions/glabels-barcode.svg</file>
<file>icons/16x16/actions/glabels-box.svg</file>
<file>icons/16x16/actions/glabels-bucket-fill.png</file>
<file>icons/16x16/actions/glabels-center-horiz.png</file>
<file>icons/16x16/actions/glabels-center-vert.png</file>
<file>icons/16x16/actions/glabels-ellipse.svg</file>
@@ -26,10 +24,13 @@
<file>icons/16x16/actions/glabels-object-properties.png</file>
<file>icons/16x16/actions/glabels-order-bottom.png</file>
<file>icons/16x16/actions/glabels-order-top.png</file>
<file>icons/16x16/actions/glabels-pencil.png</file>
<file>icons/16x16/actions/glabels-rotate-left.png</file>
<file>icons/16x16/actions/glabels-rotate-right.png</file>
<file>icons/16x16/actions/glabels-text.svg</file>
<file>icons/16x16/actions/glabels-zoom-in.svg</file>
<file>icons/16x16/actions/glabels-zoom-one-to-one.svg</file>
<file>icons/16x16/actions/glabels-zoom-out.svg</file>
<file>icons/16x16/actions/glabels-zoom-to-fit.svg</file>
<file>icons/16x16/apps/glabels.png</file>
<file>icons/22x22/actions/glabels-align-text-center.svg</file>
@@ -48,16 +49,18 @@
<file>icons/22x22/actions/glabels-valign-text-bottom.svg</file>
<file>icons/22x22/actions/glabels-valign-text-middle.svg</file>
<file>icons/22x22/actions/glabels-valign-text-top.svg</file>
<file>icons/22x22/actions/glabels-zoom-in.svg</file>
<file>icons/22x22/actions/glabels-zoom-one-to-one.svg</file>
<file>icons/22x22/actions/glabels-zoom-out.svg</file>
<file>icons/22x22/actions/glabels-zoom-to-fit.svg</file>
<file>icons/24x24/actions/edit-clear.png</file>
<file>icons/24x24/actions/edit-find.png</file>
<file>icons/24x24/actions/glabels-align-text-center.svg</file>
<file>icons/24x24/actions/glabels-align-text-left.svg</file>
<file>icons/24x24/actions/glabels-align-text-right.svg</file>
<file>icons/24x24/actions/glabels-arrow.svg</file>
<file>icons/24x24/actions/glabels-barcode.svg</file>
<file>icons/24x24/actions/glabels-box.svg</file>
<file>icons/24x24/actions/glabels-bucket-fill.png</file>
<file>icons/24x24/actions/glabels-ellipse.svg</file>
<file>icons/24x24/actions/glabels-format-text-bold.svg</file>
<file>icons/24x24/actions/glabels-format-text-italic.svg</file>
@@ -66,7 +69,6 @@
<file>icons/24x24/actions/glabels-line.svg</file>
<file>icons/24x24/actions/glabels-merge.png</file>
<file>icons/24x24/actions/glabels-object-properties.png</file>
<file>icons/24x24/actions/glabels-pencil.png</file>
<file>icons/24x24/actions/glabels-text.svg</file>
<file>icons/24x24/actions/glabels-valign-text-bottom.svg</file>
<file>icons/24x24/actions/glabels-valign-text-middle.svg</file>
glabels/icons/16x16/actions/edit-find.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 416 B

glabels/icons/16x16/actions/glabels-bucket-fill.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 521 B

glabels/icons/16x16/actions/glabels-pencil.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 489 B

glabels/icons/16x16/actions/glabels-zoom-in.svg
+23
View File
@@ -0,0 +1,23 @@
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 1,1 1,4 2,4 2,2 4,2 4,1 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 12,1 12,2 14,2 14,4 15,4 15,1 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 12,14 12,15 15,15 15,12 14,12 14,14 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 1,12 1,15 4,15 4,14 2,14 2,12 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 7,4 7,7 4,7 4,9 7,9 7,12 9,12 9,9 12,9 12,7 9,7 9,4 Z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 699 B

glabels/icons/16x16/actions/glabels-zoom-one-to-one.svg
+27
View File
@@ -0,0 +1,27 @@
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 1,1 1,4 2,4 2,2 4,2 4,1 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 12,1 12,2 14,2 14,4 15,4 15,1 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 12,14 12,15 15,15 15,12 14,12 14,14 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 1,12 1,15 4,15 4,14 2,14 2,12 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 4,5 4,7 12,7 12,5 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 4,9 4,11 12,11 12,9 Z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 773 B

glabels/icons/16x16/actions/glabels-zoom-out.svg
+23
View File
@@ -0,0 +1,23 @@
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 1,1 1,4 2,4 2,2 4,2 4,1 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 12,1 12,2 14,2 14,4 15,4 15,1 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 12,14 12,15 15,15 15,12 14,12 14,14 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 1,12 1,15 4,15 4,14 2,14 2,12 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 4,7 4,9 12,9 12,7 Z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 665 B

glabels/icons/16x16/actions/glabels-zoom-to-fit.svg
+35
View File
@@ -0,0 +1,35 @@
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 1,1 1,4 2,4 2,2 4,2 4,1 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 12,1 12,2 14,2 14,4 15,4 15,1 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 12,14 12,15 15,15 15,12 14,12 14,14 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 1,12 1,15 4,15 4,14 2,14 2,12 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 8,2 5,5 11,5 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 2,8 5,5 5,11 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 14,8 11,5 11,11 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 8,14 5,11 11,11 Z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 965 B

glabels/icons/22x22/actions/glabels-zoom-in.svg
+23
View File
@@ -0,0 +1,23 @@
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 1,1 1,6 2,6 2,2 6,2 6,1 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 16,1 16,2 20,2 20,6 21,6 21,1 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 16,20 16,21 21,21 21,16 20,16 20,20 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 1,16 1,21 6,21 6,20 2,20 2,16 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 10,6 10,10 6,10 6,12 10,12 10,16 12,16 12,12 16,12 16,10 12,10 12,6 Z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 715 B

glabels/icons/22x22/actions/glabels-zoom-one-to-one.svg
+27
View File
@@ -0,0 +1,27 @@
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 1,1 1,6 2,6 2,2 6,2 6,1 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 16,1 16,2 20,2 20,6 21,6 21,1 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 16,20 16,21 21,21 21,16 20,16 20,20 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 1,16 1,21 6,21 6,20 2,20 2,16 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 6,8 6,10 16,10 16,8 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 6,12 6,14 16,14 16,12 Z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 777 B

glabels/icons/22x22/actions/glabels-zoom-out.svg
+23
View File
@@ -0,0 +1,23 @@
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 1,1 1,6 2,6 2,2 6,2 6,1 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 16,1 16,2 20,2 20,6 21,6 21,1 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 16,20 16,21 21,21 21,16 20,16 20,20 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 1,16 1,21 6,21 6,20 2,20 2,16 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 6,10 6,12 16,12 16,10 Z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 669 B

glabels/icons/22x22/actions/glabels-zoom-to-fit.svg
+35
View File
@@ -0,0 +1,35 @@
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 1,1 1,6 2,6 2,2 6,2 6,1 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 16,1 16,2 20,2 20,6 21,6 21,1 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 16,20 16,21 21,21 21,16 20,16 20,20 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 1,16 1,21 6,21 6,20 2,20 2,16 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 11,2 7,6 15,6 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 2,11 6,15 6,7 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 11,20 15,16 7,16 Z" />
<path
style="fill:#333333;fill-opacity:1;stroke:none"
d="M 20,11 16,7 16,15 Z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 973 B

glabels/icons/24x24/actions/edit-find.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 569 B

glabels/icons/24x24/actions/glabels-bucket-fill.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 589 B

glabels/icons/24x24/actions/glabels-pencil.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 618 B