aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main/CMakeLists.txt12
-rw-r--r--main/data/icons/dino-double-tick-symbolic.svg7
-rw-r--r--main/data/icons/dino-status-away.svg7
-rw-r--r--main/data/icons/dino-status-chat.svg9
-rw-r--r--main/data/icons/dino-status-dnd.svg7
-rw-r--r--main/data/icons/dino-status-online.svg6
-rw-r--r--main/data/icons/dino-tick-symbolic.svg6
-rw-r--r--main/data/img/double_tick.svg190
-rw-r--r--main/data/img/send.svg1
-rw-r--r--main/data/img/status_away.svg73
-rw-r--r--main/data/img/status_chat.svg85
-rw-r--r--main/data/img/status_dnd.svg73
-rw-r--r--main/data/img/status_online.svg67
-rw-r--r--main/data/img/tick.svg184
-rw-r--r--main/src/ui/application.vala1
-rw-r--r--main/src/ui/conversation_selector/chat_row.vala11
-rw-r--r--main/src/ui/conversation_summary/merged_message_item.vala4
-rw-r--r--main/src/ui/util.vala1
18 files changed, 56 insertions, 688 deletions
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index ef78f446..619f23c9 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -15,12 +15,12 @@ set(MAIN_PACKAGES
pkg_check_modules(MAIN REQUIRED ${MAIN_PACKAGES})
set(RESOURCE_LIST
- img/double_tick.svg
- img/status_away.svg
- img/status_chat.svg
- img/status_dnd.svg
- img/status_online.svg
- img/tick.svg
+ icons/dino-double-tick-symbolic.svg
+ icons/dino-status-away.svg
+ icons/dino-status-chat.svg
+ icons/dino-status-dnd.svg
+ icons/dino-status-online.svg
+ icons/dino-tick-symbolic.svg
add_conversation/add_contact_dialog.ui
add_conversation/add_groupchat_dialog.ui
diff --git a/main/data/icons/dino-double-tick-symbolic.svg b/main/data/icons/dino-double-tick-symbolic.svg
new file mode 100644
index 00000000..abbf5142
--- /dev/null
+++ b/main/data/icons/dino-double-tick-symbolic.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" style="enable-background:new" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+ <g transform="translate(-345 -121)">
+ <path d="m356.03 124.03c-0.21888 0.0473-0.42059 0.17053-0.5625 0.34375l-6.2812 7.1875-2.25-2.25c-0.37633-0.37638-1.0612-0.3764-1.4376-5e-5 -0.37635 0.37636-0.37633 1.0612 5e-5 1.4376l3 3 0.78125 0.75 0.6875-0.8125 7-8c0.56742-0.61773-0.11583-1.8248-0.9375-1.6562z" style="color:#000000;enable-background:accumulate;fill:#555;text-decoration-line:none;text-indent:0;text-transform:none"/>
+ <path d="m359.75 124.03c-0.23347 0.0504-0.44863 0.1819-0.6 0.36667l-6.7 7.6667-0.34583-0.34583-1.4259 1.6187 1.0384 1.0605 0.83333 0.8 0.73334-0.86667 7.4667-8.5333c0.60525-0.65892-0.12355-1.9465-1-1.7667z" style="color:#000000;enable-background:accumulate;fill:#555;text-decoration-line:none;text-indent:0;text-transform:none"/>
+ </g>
+</svg>
diff --git a/main/data/icons/dino-status-away.svg b/main/data/icons/dino-status-away.svg
new file mode 100644
index 00000000..1bfc2351
--- /dev/null
+++ b/main/data/icons/dino-status-away.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28.222mm" height="28.222mm" version="1.1" viewBox="0 0 99.999997 99.999997" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-62.857 -678.08)">
+ <circle cx="112.86" cy="728.08" r="50" style="fill-rule:evenodd;fill:#ffa726"/>
+ <path d="m106.86 698.39v35.688h35.688" style="fill:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:12;stroke:#fff"/>
+ </g>
+</svg>
diff --git a/main/data/icons/dino-status-chat.svg b/main/data/icons/dino-status-chat.svg
new file mode 100644
index 00000000..ac766a8a
--- /dev/null
+++ b/main/data/icons/dino-status-chat.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26.458mm" height="26.458mm" version="1.1" viewBox="0 0 93.750737 93.750737" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-62.86 -684.33)">
+ <circle cx="109.74" cy="731.2" r="46.875" style="fill-rule:evenodd;fill:#81c784;stroke-width:.93751"/>
+ <path d="m83.485 740.58c13.874 23.704 39.908 24.288 52.5 0" style="fill-rule:evenodd;fill:#81c784;stroke-linecap:round;stroke-width:11.25;stroke:#fff"/>
+ <ellipse cx="88.641" cy="713.86" rx="5.3125" ry="5.3125" style="fill-rule:evenodd;fill:#fff;stroke-linecap:round;stroke-linejoin:round;stroke-width:5.3125;stroke:#fff"/>
+ <ellipse cx="130.83" cy="713.86" rx="5.3125" ry="5.3125" style="fill-rule:evenodd;fill:#fff;stroke-linecap:round;stroke-linejoin:round;stroke-width:5.3125;stroke:#fff"/>
+ </g>
+</svg>
diff --git a/main/data/icons/dino-status-dnd.svg b/main/data/icons/dino-status-dnd.svg
new file mode 100644
index 00000000..a81c6c3b
--- /dev/null
+++ b/main/data/icons/dino-status-dnd.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28.222mm" height="28.222mm" version="1.1" viewBox="0 0 99.999997 99.999997" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-62.857 -678.08)">
+ <circle cx="112.86" cy="728.08" r="50" style="fill-rule:evenodd;fill:#e57373"/>
+ <path d="m82.857 728.08h60" style="fill:none;stroke-linecap:round;stroke-width:15;stroke:#fff"/>
+ </g>
+</svg>
diff --git a/main/data/icons/dino-status-online.svg b/main/data/icons/dino-status-online.svg
new file mode 100644
index 00000000..f5f828c7
--- /dev/null
+++ b/main/data/icons/dino-status-online.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28.222mm" height="28.222mm" version="1.1" viewBox="0 0 99.999997 99.999997" xmlns="http://www.w3.org/2000/svg">
+ <g transform="translate(-62.857 -678.08)">
+ <circle cx="112.86" cy="728.08" r="50" style="fill-rule:evenodd;fill:#81c784"/>
+ </g>
+</svg>
diff --git a/main/data/icons/dino-tick-symbolic.svg b/main/data/icons/dino-tick-symbolic.svg
new file mode 100644
index 00000000..bc067e02
--- /dev/null
+++ b/main/data/icons/dino-tick-symbolic.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" style="enable-background:new" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb">
+ <g transform="translate(-345 -121)">
+ <path d="m356.03 124.03c-0.21888 0.0473-0.42059 0.17053-0.5625 0.34375l-6.2812 7.1875-2.25-2.25c-0.37633-0.37638-1.0612-0.3764-1.4376-5e-5 -0.37635 0.37636-0.37633 1.0612 5e-5 1.4376l3 3 0.78125 0.75 0.6875-0.8125 7-8c0.56742-0.61773-0.11583-1.8248-0.9375-1.6562z" style="color:#000000;enable-background:accumulate;fill:#555;text-decoration-line:none;text-indent:0;text-transform:none"/>
+ </g>
+</svg>
diff --git a/main/data/img/double_tick.svg b/main/data/img/double_tick.svg
deleted file mode 100644
index d65840f6..00000000
--- a/main/data/img/double_tick.svg
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
- 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"
- sodipodi:docname="double_tick.svg"
- inkscape:export-filename="/home/sam/source-symbolic.png"
- inkscape:export-xdpi="270"
- inkscape:export-ydpi="270"
- height="16"
- id="svg7384"
- style="enable-background:new"
- version="1.1"
- inkscape:version="0.92.0 r"
- width="16">
- <sodipodi:namedview
- inkscape:bbox-nodes="true"
- inkscape:bbox-paths="true"
- bordercolor="#666666"
- borderlayer="false"
- borderopacity="1"
- inkscape:current-layer="g8784"
- inkscape:cx="11.598048"
- inkscape:cy="11.93762"
- gridtolerance="10"
- inkscape:guide-bbox="true"
- guidetolerance="10"
- id="namedview88"
- inkscape:object-nodes="true"
- inkscape:object-paths="true"
- objecttolerance="10"
- pagecolor="#f7f7f7"
- inkscape:pageopacity="1"
- inkscape:pageshadow="2"
- showborder="true"
- showgrid="false"
- showguides="true"
- inkscape:showpageshadow="false"
- inkscape:snap-bbox="true"
- inkscape:snap-bbox-edge-midpoints="false"
- inkscape:snap-bbox-midpoints="false"
- inkscape:snap-center="false"
- inkscape:snap-global="true"
- inkscape:snap-grids="true"
- inkscape:snap-intersection-paths="true"
- inkscape:snap-midpoints="true"
- inkscape:snap-nodes="true"
- inkscape:snap-object-midpoints="true"
- inkscape:snap-others="true"
- inkscape:snap-page="false"
- inkscape:snap-smooth-nodes="true"
- inkscape:snap-to-guides="true"
- inkscape:window-height="845"
- inkscape:window-maximized="1"
- inkscape:window-width="1600"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:zoom="22.627416"
- units="mm">
- <inkscape:grid
- color="#000000"
- dotted="false"
- empcolor="#0800ff"
- empopacity="0.4627451"
- empspacing="4"
- enabled="true"
- id="grid4866"
- opacity="0.16470588"
- originx="-104.00001px"
- originy="-96px"
- snapvisiblegridlinesonly="true"
- spacingx="0.25px"
- spacingy="0.25px"
- type="xygrid"
- visible="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata90">
- <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>Paper Symbolic Icon Theme</dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <title
- id="title8473">Paper Symbolic Icon Theme</title>
- <defs
- id="defs7386">
- <linearGradient
- id="linearGradient5606"
- osb:paint="solid">
- <stop
- id="stop5608"
- offset="0"
- style="stop-color:#000000;stop-opacity:1;" />
- </linearGradient>
- <filter
- inkscape:collect="always"
- id="filter7554"
- color-interpolation-filters="sRGB">
- <feBlend
- inkscape:collect="always"
- id="feBlend7556"
- in2="BackgroundImage"
- mode="darken" />
- </filter>
- </defs>
- <g
- inkscape:groupmode="layer"
- id="layer9"
- inkscape:label="status"
- style="display:inline"
- transform="translate(-345.00021,-121)" />
- <g
- inkscape:groupmode="layer"
- id="layer10"
- inkscape:label="devices"
- style="display:inline;filter:url(#filter7554)"
- transform="translate(-345.00021,-121)" />
- <g
- inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="places"
- style="display:inline"
- transform="translate(-104.00001,-738)" />
- <g
- inkscape:groupmode="layer"
- id="layer14"
- inkscape:label="mimetypes"
- style="display:inline"
- transform="translate(-345.00021,-121)" />
- <g
- inkscape:groupmode="layer"
- id="layer15"
- inkscape:label="emblems"
- style="display:inline"
- transform="translate(-345.00021,-121)" />
- <g
- inkscape:groupmode="layer"
- id="g71291"
- inkscape:label="emotes"
- style="display:inline"
- transform="translate(-345.00021,-121)" />
- <g
- inkscape:groupmode="layer"
- id="layer2"
- inkscape:label="categories"
- style="display:inline"
- transform="translate(-104.00001,-588)" />
- <g
- inkscape:groupmode="layer"
- id="g6058"
- inkscape:label="apps"
- style="display:inline"
- transform="translate(-104.00001,-588)" />
- <g
- inkscape:groupmode="layer"
- id="layer12"
- inkscape:label="actions"
- style="display:inline"
- transform="translate(-345.00021,-121)">
- <g
- id="g8784"
- inkscape:label="object-select">
- <path
- inkscape:connector-curvature="0"
- d="m 356.03145,124.03125 c -0.21888,0.0473 -0.42059,0.17053 -0.5625,0.34375 l -6.28125,7.1875 -2.25,-2.25 c -0.37633,-0.37638 -1.06119,-0.3764 -1.43755,-5e-5 -0.37635,0.37636 -0.37633,1.06122 5e-5,1.43755 l 3,3 0.78125,0.75 0.6875,-0.8125 7,-8 c 0.56742,-0.61773 -0.11583,-1.8248 -0.9375,-1.65625 z"
- id="path8741"
- sodipodi:nodetypes="ccccscccccc"
- style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#555555;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
- <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;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#555555;fill-opacity:1;stroke:none;stroke-width:2.13333344;marker:none;enable-background:accumulate"
- sodipodi:nodetypes="cccccccccc"
- id="path4500"
- d="m 359.74533,124.03232 c -0.23347,0.0504 -0.44863,0.1819 -0.6,0.36667 l -6.7,7.66666 -0.34583,-0.34583 -1.42592,1.61866 1.03842,1.06051 0.83333,0.8 0.73334,-0.86667 7.46666,-8.53333 c 0.60525,-0.65892 -0.12355,-1.94646 -1,-1.76667 z"
- inkscape:connector-curvature="0" />
- </g>
- </g>
-</svg>
diff --git a/main/data/img/send.svg b/main/data/img/send.svg
deleted file mode 100644
index 8627d4a7..00000000
--- a/main/data/img/send.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path fill="#6f778c" d="M2,21L23,12L2,3V10L17,12L2,14V21Z" /></svg>
diff --git a/main/data/img/status_away.svg b/main/data/img/status_away.svg
deleted file mode 100644
index d976d095..00000000
--- a/main/data/img/status_away.svg
+++ /dev/null
@@ -1,73 +0,0 @@
-<?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="28.222221mm"
- height="28.222221mm"
- viewBox="0 0 99.999997 99.999997"
- id="svg2"
- version="1.1"
- inkscape:version="0.92.0 r"
- sodipodi:docname="status_away.svg">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="2.8"
- inkscape:cx="-2.3899949"
- inkscape:cy="49.421164"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="1600"
- inkscape:window-height="873"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata7">
- <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="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-62.857162,-678.07648)">
- <circle
- style="opacity:1;fill:#ffa726;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="path4136"
- cx="112.85716"
- cy="728.07648"
- r="50" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 106.85716,698.38898 v 35.6875 h 35.6875"
- id="path4157"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccc" />
- </g>
-</svg>
diff --git a/main/data/img/status_chat.svg b/main/data/img/status_chat.svg
deleted file mode 100644
index 5b427cb6..00000000
--- a/main/data/img/status_chat.svg
+++ /dev/null
@@ -1,85 +0,0 @@
-<?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="28.222221mm"
- height="28.222221mm"
- viewBox="0 0 99.999997 99.999997"
- id="svg2"
- version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="status_chat.svg">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="2.8"
- inkscape:cx="-2.3899949"
- inkscape:cy="49.421164"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="1600"
- inkscape:window-height="845"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata7">
- <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="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-62.857162,-678.07648)">
- <circle
- style="opacity:1;fill:#81c784;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="path4136"
- cx="112.85716"
- cy="728.07648"
- r="50" />
- <path
- style="fill:#81c784;fill-rule:evenodd;stroke:#ffffff;stroke-width:7;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
- d="m 77.857162,738.07648 c 13.92857,35.35715 55.714288,35 69.999998,0"
- id="path4199"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc" />
- <circle
- style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="path4203"
- cx="90.357162"
- cy="710.57648"
- r="5" />
- <circle
- style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="path4203-3"
- cx="135.35716"
- cy="710.57648"
- r="5" />
- </g>
-</svg>
diff --git a/main/data/img/status_dnd.svg b/main/data/img/status_dnd.svg
deleted file mode 100644
index e7e17e78..00000000
--- a/main/data/img/status_dnd.svg
+++ /dev/null
@@ -1,73 +0,0 @@
-<?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="28.222221mm"
- height="28.222221mm"
- viewBox="0 0 99.999997 99.999997"
- id="svg2"
- version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="status_dnd.svg">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="2.8"
- inkscape:cx="-2.3899949"
- inkscape:cy="49.421164"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="1600"
- inkscape:window-height="845"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata7">
- <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="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-62.857162,-678.07648)">
- <circle
- style="opacity:1;fill:#e57373;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="path4136"
- cx="112.85716"
- cy="728.07648"
- r="50" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:15;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 82.857162,728.07648 59.999998,0"
- id="path4178"
- inkscape:connector-curvature="0"
- sodipodi:nodetypes="cc" />
- </g>
-</svg>
diff --git a/main/data/img/status_online.svg b/main/data/img/status_online.svg
deleted file mode 100644
index 13cc6592..00000000
--- a/main/data/img/status_online.svg
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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="28.222221mm"
- height="28.222221mm"
- viewBox="0 0 99.999997 99.999997"
- id="svg2"
- version="1.1"
- inkscape:version="0.91 r13725"
- sodipodi:docname="status_online.svg">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="2.8"
- inkscape:cx="-2.3899949"
- inkscape:cy="49.421164"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- fit-margin-top="0"
- fit-margin-left="0"
- fit-margin-right="0"
- fit-margin-bottom="0"
- inkscape:window-width="1600"
- inkscape:window-height="845"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata7">
- <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="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(-62.857162,-678.07648)">
- <circle
- style="opacity:1;fill:#81c784;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="path4136"
- cx="112.85716"
- cy="728.07648"
- r="50" />
- </g>
-</svg>
diff --git a/main/data/img/tick.svg b/main/data/img/tick.svg
deleted file mode 100644
index 4a08848c..00000000
--- a/main/data/img/tick.svg
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
- 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"
- sodipodi:docname="tick.svg"
- inkscape:export-filename="/home/sam/source-symbolic.png"
- inkscape:export-xdpi="270"
- inkscape:export-ydpi="270"
- height="16"
- id="svg7384"
- style="enable-background:new"
- version="1.1"
- inkscape:version="0.92.0 r"
- width="16">
- <sodipodi:namedview
- inkscape:bbox-nodes="true"
- inkscape:bbox-paths="true"
- bordercolor="#666666"
- borderlayer="false"
- borderopacity="1"
- inkscape:current-layer="g8784"
- inkscape:cx="11.077638"
- inkscape:cy="13.807036"
- gridtolerance="10"
- inkscape:guide-bbox="true"
- guidetolerance="10"
- id="namedview88"
- inkscape:object-nodes="true"
- inkscape:object-paths="true"
- objecttolerance="10"
- pagecolor="#f7f7f7"
- inkscape:pageopacity="1"
- inkscape:pageshadow="2"
- showborder="true"
- showgrid="false"
- showguides="true"
- inkscape:showpageshadow="false"
- inkscape:snap-bbox="true"
- inkscape:snap-bbox-edge-midpoints="false"
- inkscape:snap-bbox-midpoints="false"
- inkscape:snap-center="false"
- inkscape:snap-global="true"
- inkscape:snap-grids="true"
- inkscape:snap-intersection-paths="true"
- inkscape:snap-midpoints="true"
- inkscape:snap-nodes="true"
- inkscape:snap-object-midpoints="true"
- inkscape:snap-others="true"
- inkscape:snap-page="false"
- inkscape:snap-smooth-nodes="true"
- inkscape:snap-to-guides="true"
- inkscape:window-height="838"
- inkscape:window-maximized="0"
- inkscape:window-width="1290"
- inkscape:window-x="0"
- inkscape:window-y="27"
- inkscape:zoom="11.313708"
- units="mm">
- <inkscape:grid
- color="#000000"
- dotted="false"
- empcolor="#0800ff"
- empopacity="0.4627451"
- empspacing="4"
- enabled="true"
- id="grid4866"
- opacity="0.16470588"
- originx="-104.00001px"
- originy="-96px"
- snapvisiblegridlinesonly="true"
- spacingx="0.25px"
- spacingy="0.25px"
- type="xygrid"
- visible="true" />
- </sodipodi:namedview>
- <metadata
- id="metadata90">
- <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>Paper Symbolic Icon Theme</dc:title>
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <title
- id="title8473">Paper Symbolic Icon Theme</title>
- <defs
- id="defs7386">
- <linearGradient
- id="linearGradient5606"
- osb:paint="solid">
- <stop
- id="stop5608"
- offset="0"
- style="stop-color:#000000;stop-opacity:1;" />
- </linearGradient>
- <filter
- inkscape:collect="always"
- id="filter7554"
- color-interpolation-filters="sRGB">
- <feBlend
- inkscape:collect="always"
- id="feBlend7556"
- in2="BackgroundImage"
- mode="darken" />
- </filter>
- </defs>
- <g
- inkscape:groupmode="layer"
- id="layer9"
- inkscape:label="status"
- style="display:inline"
- transform="translate(-345.00021,-121)" />
- <g
- inkscape:groupmode="layer"
- id="layer10"
- inkscape:label="devices"
- style="display:inline;filter:url(#filter7554)"
- transform="translate(-345.00021,-121)" />
- <g
- inkscape:groupmode="layer"
- id="layer1"
- inkscape:label="places"
- style="display:inline"
- transform="translate(-104.00001,-738)" />
- <g
- inkscape:groupmode="layer"
- id="layer14"
- inkscape:label="mimetypes"
- style="display:inline"
- transform="translate(-345.00021,-121)" />
- <g
- inkscape:groupmode="layer"
- id="layer15"
- inkscape:label="emblems"
- style="display:inline"
- transform="translate(-345.00021,-121)" />
- <g
- inkscape:groupmode="layer"
- id="g71291"
- inkscape:label="emotes"
- style="display:inline"
- transform="translate(-345.00021,-121)" />
- <g
- inkscape:groupmode="layer"
- id="layer2"
- inkscape:label="categories"
- style="display:inline"
- transform="translate(-104.00001,-588)" />
- <g
- inkscape:groupmode="layer"
- id="g6058"
- inkscape:label="apps"
- style="display:inline"
- transform="translate(-104.00001,-588)" />
- <g
- inkscape:groupmode="layer"
- id="layer12"
- inkscape:label="actions"
- style="display:inline"
- transform="translate(-345.00021,-121)">
- <g
- id="g8784"
- inkscape:label="object-select">
- <path
- inkscape:connector-curvature="0"
- d="m 356.03145,124.03125 c -0.21888,0.0473 -0.42059,0.17053 -0.5625,0.34375 l -6.28125,7.1875 -2.25,-2.25 c -0.37633,-0.37638 -1.06119,-0.3764 -1.43755,-5e-5 -0.37635,0.37636 -0.37633,1.06122 5e-5,1.43755 l 3,3 0.78125,0.75 0.6875,-0.8125 7,-8 c 0.56742,-0.61773 -0.11583,-1.8248 -0.9375,-1.65625 z"
- id="path8741"
- sodipodi:nodetypes="ccccscccccc"
- style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#555555;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
- </g>
- </g>
-</svg>
diff --git a/main/src/ui/application.vala b/main/src/ui/application.vala
index 8dbe176b..66fc0fd0 100644
--- a/main/src/ui/application.vala
+++ b/main/src/ui/application.vala
@@ -16,6 +16,7 @@ public class Dino.Ui.Application : Dino.Application {
notifications = new Notifications(stream_interaction);
notifications.start();
Environment.set_application_name("Dino");
+ IconTheme.get_default().add_resource_path("/org/dino-im/icons");
}
public override void activate() {
diff --git a/main/src/ui/conversation_selector/chat_row.vala b/main/src/ui/conversation_selector/chat_row.vala
index 8b36b333..96f6921d 100644
--- a/main/src/ui/conversation_selector/chat_row.vala
+++ b/main/src/ui/conversation_selector/chat_row.vala
@@ -61,18 +61,15 @@ public class ChatRow : ConversationRow {
Show show = PresenceManager.get_instance(stream_interactor).get_last_show(full_jids[i], conversation.account);
Image image = new Image();
- Pixbuf pixbuf;
- int icon_size = 13 * image.scale_factor;
if (show.as == Show.AWAY) {
- pixbuf = new Pixbuf.from_resource_at_scale("/org/dino-im/img/status_away.svg", icon_size, icon_size, true);
+ image.set_from_icon_name("dino-status-away", IconSize.SMALL_TOOLBAR);
} else if (show.as == Show.XA || show.as == Show.DND) {
- pixbuf = new Pixbuf.from_resource_at_scale("/org/dino-im/img/status_dnd.svg", icon_size, icon_size, true);
+ image.set_from_icon_name("dino-status-dnd", IconSize.SMALL_TOOLBAR);
} else if (show.as == Show.CHAT) {
- pixbuf = new Pixbuf.from_resource_at_scale("/org/dino-im/img/status_chat.svg", icon_size, icon_size, true);
+ image.set_from_icon_name("dino-status-chat", IconSize.SMALL_TOOLBAR);
} else {
- pixbuf = new Pixbuf.from_resource_at_scale("/org/dino-im/img/status_online.svg", icon_size, icon_size, true);
+ image.set_from_icon_name("dino-status-online", IconSize.SMALL_TOOLBAR);
}
- Util.image_set_from_scaled_pixbuf(image, pixbuf);
box.add(image);
Label resource = new Label(full_jids[i].resourcepart);
diff --git a/main/src/ui/conversation_summary/merged_message_item.vala b/main/src/ui/conversation_summary/merged_message_item.vala
index 695bf589..190be50a 100644
--- a/main/src/ui/conversation_summary/merged_message_item.vala
+++ b/main/src/ui/conversation_summary/merged_message_item.vala
@@ -94,10 +94,10 @@ public class MergedMessageItem : Grid {
}
if (all_read) {
received_image.visible = true;
- received_image.set_from_resource("/org/dino-im/img/double_tick.svg");
+ received_image.set_from_icon_name("dino-double-tick-symbolic", IconSize.SMALL_TOOLBAR);
} else if (all_received) {
received_image.visible = true;
- received_image.set_from_resource("/org/dino-im/img/tick.svg");
+ received_image.set_from_icon_name("dino-tick-symbolic", IconSize.SMALL_TOOLBAR);
} else if (received_image.visible) {
received_image.set_from_icon_name("image-loading-symbolic", IconSize.SMALL_TOOLBAR);
}
diff --git a/main/src/ui/util.vala b/main/src/ui/util.vala
index ec09609a..34df82d8 100644
--- a/main/src/ui/util.vala
+++ b/main/src/ui/util.vala
@@ -9,6 +9,7 @@ public class Util : Object {
private const string[] tango_colors_light = {"FCE94F", "FCAF3E", "E9B96E", "8AE234", "729FCF", "AD7FA8", "EF2929"};
private const string[] tango_colors_medium = {"EDD400", "F57900", "C17D11", "73D216", "3465A4", "75507B", "CC0000"};
+ private const string[] material_colors_800 = {"D32F2F", "C2185B", "7B1FA2", "512DA8", "303F9F", "1976D2", "0288D1", "0097A7", "00796B", "388E3C", "689F38", "AFB42B", "FFA000", "F57C00", "E64A19", "5D4037"};
private const string[] material_colors_500 = {"F44336", "E91E63", "9C27B0", "673AB7", "3f51B5", "2196F3", "03A9f4", "00BCD4", "009688", "4CAF50", "8BC34a", "CDDC39", "FFC107", "FF9800", "FF5722", "795548"};
private const string[] material_colors_300 = {"E57373", "F06292", "BA68C8", "9575CD", "7986CB", "64B5F6", "4FC3F7", "4DD0E1", "4DB6AC", "81C784", "AED581", "DCE775", "FFD54F", "FFB74D", "FF8A65", "A1887F"};
private const string[] material_colors_200 = {"EF9A9A", "F48FB1", "CE93D8", "B39DDB", "9FA8DA", "90CAF9", "81D4FA", "80DEEA", "80CBC4", "A5D6A7", "C5E1A5", "E6EE9C", "FFE082", "FFCC80", "FFAB91", "BCAAA4"};
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-11-03 13:10:32 +0000