ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-24 05:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Cutter Icon (#94)

Browse Source
This commit is contained in:
Florian Märkl 2017-11-05 15:19:47 +01:00 committed by xarkes
parent 6b42ffca0c
commit e8b2cf3fea
22 changed files with 226 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/MainWindow.ui
View File

@ -19,10 +19,6 @@
<property name="windowTitle"> <property name="windowTitle">
<string notr="true">Cutter</string> <string notr="true">Cutter</string>
</property> </property>
<property name="windowIcon">
<iconset>
<normaloff>:/img/logo-small.png</normaloff>:/img/logo-small.png</iconset>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">QHeaderView::section { <string notr="true">QHeaderView::section {
padding: 3px; padding: 3px;
@ -174,7 +170,7 @@ border-top: 0px;
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1013</width> <width>1013</width>
<height>20</height> <height>22</height>
</rect> </rect>
</property> </property>
<property name="defaultUp"> <property name="defaultUp">
@ -188,8 +184,8 @@ border-top: 0px;
<rect> <rect>
<x>419</x> <x>419</x>
<y>265</y> <y>265</y>
<width>148</width> <width>173</width>
<height>190</height> <height>206</height>
</rect> </rect>
</property> </property>
<property name="title"> <property name="title">

2
src/cutter.desktop
View File

@ -2,5 +2,5 @@
Type=Application Type=Application
Name=Cutter Name=Cutter
Exec=cutter Exec=cutter
Icon=cutter-small Icon=cutter
Categories=Development; Categories=Development;

6
src/cutter.pro
View File

@ -5,7 +5,7 @@ TARGET = cutter
# The application version # The application version
VERSION = 1.0 VERSION = 1.0
ICON = img/Enso.icns ICON = img/cutter.icns
QT += core gui widgets QT += core gui widgets
QT_CONFIG -= no-pkg-config QT_CONFIG -= no-pkg-config
@ -196,10 +196,10 @@ unix {
!isEmpty(APPIMAGE){ !isEmpty(APPIMAGE){
# UGLY work around for the logo name in cutter.desktop # UGLY work around for the logo name in cutter.desktop
# Would be better to have a file called cutter.png in the first place # Would be better to have a file called cutter.png in the first place
system(cp img/cutter-small.png $$OUT_PWD/cutter-small.png) system(cp img/cutter.svg $$OUT_PWD/cutter.svg)
appimage_root.path = / appimage_root.path = /
appimage_root.files = $$OUT_PWD/cutter.png $$desktop_file appimage_root.files = $$OUT_PWD/cutter.svg $$desktop_file
INSTALLS += appimage_root INSTALLS += appimage_root
} }

24
src/dialogs/AboutDialog.ui
View File

@ -37,25 +37,37 @@
<item> <item>
<widget class="QLabel" name="aboutLogo"> <widget class="QLabel" name="aboutLogo">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="styleSheet"> <property name="minimumSize">
<string notr="true">background-color: rgb(255, 255, 255);</string> <size>
<width>96</width>
<height>96</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>96</width>
<height>96</height>
</size>
</property> </property>
<property name="text"> <property name="text">
<string notr="true"/> <string notr="true"/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../resources.qrc">:/img/logo-small.png</pixmap> <pixmap resource="../resources.qrc">:/img/cutter.svg</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="margin"> <property name="margin">
<number>5</number> <number>8</number>
</property> </property>
</widget> </widget>
</item> </item>
@ -68,7 +80,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: rgb(255, 255, 255);</string> <string notr="true">s</string>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>

32
src/dialogs/CreateNewDialog.ui
View File

@ -36,17 +36,41 @@
<property name="spacing"> <property name="spacing">
<number>5</number> <number>5</number>
</property> </property>
<item> <item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_7">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>96</width>
<height>96</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>96</width>
<height>96</height>
</size>
</property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap>:/img/logo-small.png</pixmap> <pixmap resource="../resources.qrc">:/img/cutter.svg</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="margin">
<number>8</number>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -451,6 +475,8 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources/> <resources>
<include location="../resources.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

36
src/dialogs/NewfileDialog.ui
View File

@ -6,17 +6,13 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>452</width> <width>451</width>
<height>532</height> <height>599</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Open File</string> <string>Open File</string>
</property> </property>
<property name="windowIcon">
<iconset>
<normaloff>:/img/logo-small.png</normaloff>:/img/logo-small.png</iconset>
</property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing"> <property name="spacing">
<number>5</number> <number>5</number>
@ -33,23 +29,41 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>5</number> <number>5</number>
</property> </property>
<item> <item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="Logo"> <widget class="QLabel" name="Logo">
<property name="styleSheet"> <property name="sizePolicy">
<string notr="true"/> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>96</width>
<height>96</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>96</width>
<height>96</height>
</size>
</property> </property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap>:/img/logo-small.png</pixmap> <pixmap resource="../resources.qrc">:/img/cutter.svg</pixmap>
</property> </property>
<property name="scaledContents"> <property name="scaledContents">
<bool>false</bool> <bool>true</bool>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="margin">
<number>8</number>
</property>
</widget> </widget>
</item> </item>
<item> <item>

28
src/dialogs/OptionsDialog.ui
View File

@ -25,10 +25,6 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Load Options</string> <string>Load Options</string>
</property> </property>
<property name="windowIcon">
<iconset>
<normaloff>:/img/logo-small.png</normaloff>:/img/logo-small.png</iconset>
</property>
<property name="autoFillBackground"> <property name="autoFillBackground">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -70,35 +66,41 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item alignment="Qt::AlignHCenter">
<widget class="QLabel" name="logo"> <widget class="QLabel" name="logo">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>400</width> <width>96</width>
<height>0</height> <height>96</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>400</width> <width>96</width>
<height>16777215</height> <height>96</height>
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap>:/img/logo-small.png</pixmap> <pixmap resource="../resources.qrc">:/img/cutter.svg</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
<property name="margin">
<number>8</number>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -927,6 +929,8 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources/> <resources>
<include location="../resources.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

BIN
src/img/Enso copy.icns
View File

Binary file not shown.

BIN
src/img/Enso.icns
View File

Binary file not shown.

16
src/img/Enso.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
src/img/Logo simple white.xcf
View File

Binary file not shown.

BIN
src/img/Logo simple.xcf
View File

Binary file not shown.

BIN
src/img/Logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

BIN
src/img/Logo.xcf
View File

Binary file not shown.

BIN
src/img/cutter-small.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.4 KiB

BIN
src/img/cutter.icns Normal file
View File

Binary file not shown.

64
src/img/cutter.svg Normal file
View File

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<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"
width="512"
height="512"
viewBox="0 0 512.00001 512.00001"
id="svg4254"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="cutter.svg">
<defs
id="defs4256" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="0.98994949"
inkscape:cx="170.8751"
inkscape:cy="252.9044"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:snap-bbox="true"
inkscape:window-width="1920"
inkscape:window-height="1026"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1" />
<metadata
id="metadata4259">
<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>
<g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-540.36216)">
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="M 256.00271,572.36218 C 132.45491,572.36218 32.000055,672.8129 32,796.36215 c 2.7e-5,33.63902 7.491933,65.53883 20.82432,94.19185 L 69.68595,858.80902 C 63.130866,839.19082 59.529221,818.2119 59.529194,796.36215 59.529221,687.69096 147.33276,599.89171 256.00271,599.89171 c 57.4471,0 109.04798,24.54673 144.94228,63.73192 l -95.88977,0 -73.12445,137.19058 73.32338,138.70687 85.35663,0 c -35.14099,33.04896 -82.45299,53.31159 -134.60807,53.31159 -48.23544,0 -92.33512,-17.3306 -126.4945,-46.07433 l -39.38502,0 c 41.00589,45.18743 100.17358,73.60386 165.87952,73.60386 C 379.55049,1020.3622 480,919.91141 480,796.36218 480,672.8129 379.55049,572.36221 256.00271,572.36221 Z m -66.64542,119.83947 -120.59613,227.02716 194.62926,0 -62.62353,-118.46834 57.85968,-108.5588 -69.26926,0 z m 162.72874,50.55859 0,56.84417 38.07845,-28.42205 38.07309,-28.42209 0,56.84417 0,56.84418 -38.07309,-28.4221 -38.07845,-28.42208 0,56.84418 -38.07305,-28.4221 -38.0785,-28.42208 38.0785,-28.42208 38.07305,-28.42209 z"
id="circle4218"
inkscape:connector-curvature="0" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

64
src/img/cutter_white.svg Normal file
View File

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<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"
width="512"
height="512"
viewBox="0 0 512.00001 512.00001"
id="svg4254"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="cutter_white.svg">
<defs
id="defs4256" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="0.98994949"
inkscape:cx="170.8751"
inkscape:cy="252.9044"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
inkscape:snap-bbox="true"
inkscape:window-width="1920"
inkscape:window-height="1026"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1" />
<metadata
id="metadata4259">
<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>
<g
inkscape:label="Ebene 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-540.36216)">
<path
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
d="M 256.00271,572.36218 C 132.45491,572.36218 32.000055,672.8129 32,796.36215 c 2.7e-5,33.63902 7.491933,65.53883 20.82432,94.19185 L 69.68595,858.80902 C 63.130866,839.19082 59.529221,818.2119 59.529194,796.36215 59.529221,687.69096 147.33276,599.89171 256.00271,599.89171 c 57.4471,0 109.04798,24.54673 144.94228,63.73192 l -95.88977,0 -73.12445,137.19058 73.32338,138.70687 85.35663,0 c -35.14099,33.04896 -82.45299,53.31159 -134.60807,53.31159 -48.23544,0 -92.33512,-17.3306 -126.4945,-46.07433 l -39.38502,0 c 41.00589,45.18743 100.17358,73.60386 165.87952,73.60386 C 379.55049,1020.3622 480,919.91141 480,796.36218 480,672.8129 379.55049,572.36221 256.00271,572.36221 Z m -66.64542,119.83947 -120.59613,227.02716 194.62926,0 -62.62353,-118.46834 57.85968,-108.5588 -69.26926,0 z m 162.72874,50.55859 0,56.84417 38.07845,-28.42205 38.07309,-28.42209 0,56.84417 0,56.84418 -38.07309,-28.4221 -38.07845,-28.42208 0,56.84418 -38.07305,-28.4221 -38.0785,-28.42208 38.0785,-28.42208 38.07305,-28.42209 z"
id="circle4218"
inkscape:connector-curvature="0" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
src/img/logo-small-white.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.6 KiB

BIN
src/img/logo2.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.0 KiB

2
src/main.cpp
View File

@ -37,6 +37,7 @@ int main(int argc, char *argv[])
a.setOrganizationName("cutter"); a.setOrganizationName("cutter");
a.setApplicationName("cutter"); a.setApplicationName("cutter");
a.setApplicationVersion(APP_VERSION); a.setApplicationVersion(APP_VERSION);
a.setWindowIcon(QIcon(":/img/cutter_white.svg"));
// Set QString codec to UTF-8 // Set QString codec to UTF-8
QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8")); QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
@ -67,7 +68,6 @@ int main(int argc, char *argv[])
{ {
QMessageBox msg; QMessageBox msg;
msg.setIcon(QMessageBox::Critical); msg.setIcon(QMessageBox::Critical);
msg.setWindowIcon(QIcon(":/img/logo-small.png"));
msg.setStandardButtons(QMessageBox::Yes | QMessageBox::No); msg.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
msg.setWindowTitle(QObject::tr("Version mismatch!")); msg.setWindowTitle(QObject::tr("Version mismatch!"));
msg.setText(QString(QObject::tr("The version used to compile cutter (%1) does not match the binary version of radare2 (%2). This could result in unexpected behaviour. Are you sure you want to continue?")).arg(localVersion, r2version)); msg.setText(QString(QObject::tr("The version used to compile cutter (%1) does not match the binary version of radare2 (%2). This could result in unexpected behaviour. Are you sure you want to continue?")).arg(localVersion, r2version));

5
src/resources.qrc
View File

@ -54,11 +54,10 @@
<file>img/icons/transfer.svg</file> <file>img/icons/transfer.svg</file>
<file>img/icons/transfer_white.svg</file> <file>img/icons/transfer_white.svg</file>
<file>img/icons/spin_light.svg</file> <file>img/icons/spin_light.svg</file>
<file>img/logo2.png</file>
<file>img/cutter-small.png</file>
<file>img/logo-small-white.png</file>
<file>img/icons/import_light.svg</file> <file>img/icons/import_light.svg</file>
<file>fonts/Anonymous Pro.ttf</file> <file>fonts/Anonymous Pro.ttf</file>
<file>fonts/Inconsolata-Regular.ttf</file> <file>fonts/Inconsolata-Regular.ttf</file>
<file>img/cutter.svg</file>
<file>img/cutter_white.svg</file>
</qresource> </qresource>
</RCC> </RCC>