aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2017-01-23 16:59:50 +0100
committerAqua-sama <aqua@iserlohn-fortress.net>2017-01-23 16:59:50 +0100
commit8e140bc9b7c85851889964647d93b2187ae46449 (patch)
treeb1e9c0ddb893650204248ec35e974690b5713fec
parentURL blocking (diff)
downloadsmolbote-8e140bc9b7c85851889964647d93b2187ae46449.tar.xz
Made Profile menu a regular menu
-rw-r--r--src/data/icon.svg37
-rw-r--r--src/data/resources.qrc5
-rw-r--r--src/forms/profiledialog.cpp4
-rw-r--r--src/main.cpp1
-rw-r--r--src/mainwindow.cpp9
-rw-r--r--src/mainwindow.h1
-rw-r--r--src/smolbote.pro3
-rw-r--r--test/blocklist.txt2
8 files changed, 54 insertions, 8 deletions
diff --git a/src/data/icon.svg b/src/data/icon.svg
new file mode 100644
index 0000000..a2ae055
--- /dev/null
+++ b/src/data/icon.svg
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" width="512" height="512" id="svg2" version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="New document 1">
+ <title id="title3858">Vector Toks, the Lanix Penguin</title>
+ <defs id="defs4" />
+ <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.98994949" inkscape:cx="249.26947" inkscape:cy="297.59678" inkscape:document-units="px" inkscape:current-layer="g3837" showgrid="false" inkscape:window-width="1600" inkscape:window-height="878" inkscape:window-x="-8" inkscape:window-y="-8" 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>Vector Toks, the Lanix Penguin</dc:title>
+ <dc:date>2015-08-01</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>IBPX, originally by reddit.com/u/creed10</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g inkscape:label="Toks" inkscape:groupmode="layer" id="layer1" transform="translate(0,-540.36218)">
+ <g id="g3843">
+ <g transform="translate(-17.75134,-18.61414)" id="g2996">
+ <g transform="matrix(1.5609756,0,0,1.5609756,-153.56782,-457.18183)" id="g3826">
+ <path style="fill:#10100e" d="m 158.92347,857.42773 c -1.55533,-1.87231 -2.67648,-4.20232 -2.49145,-5.1778 0.44253,-2.33302 5.81932,-3.10917 5.81932,-0.84003 0,0.86153 -0.55227,1.56642 -1.22727,1.56642 -0.675,0 -0.0546,1.17266 1.37863,2.60591 1.88583,1.88582 3.1921,2.41986 4.72727,1.93261 1.77954,-0.5648 2.12137,-1.45861 2.12137,-5.54689 0,-5.37967 -1.05322,-6.79556 -3.34795,-4.50082 -1.64075,1.64074 -5.65205,2.06856 -5.65205,0.60281 0,-0.49851 -0.97043,-0.65261 -2.15651,-0.34244 -1.95043,0.51005 -2.09739,0.26832 -1.53782,-2.52954 0.44064,-2.2032 0.0946,-3.74065 -1.20225,-5.34225 l -1.82094,-2.24877 -0.70251,4.68469 c -0.46237,3.08331 -1.19432,4.68469 -2.14124,4.68469 -0.7913,0 -1.43873,-0.675 -1.43873,-1.5 0,-1.95797 -1.45016,-1.90698 -3.47948,0.12234 -1.21189,1.21188 -2.86606,1.50283 -6.53825,1.14998 -6.62384,-0.63647 -8.32475,-2.1823 -7.68113,-6.98083 0.50243,-3.74585 0.46756,-3.79149 -2.8963,-3.79149 -3.30565,0 -3.40484,0.11653 -3.40484,4 0,3.33333 -0.33333,4 -2,4 -1.81897,0 -2,-0.66667 -2,-7.36514 0,-5.93692 0.40191,-7.87609 2.07258,-10 3.5971,-4.57297 11.92742,-2.69152 11.92742,2.69388 0,1.28314 0.92894,1.67126 4,1.67126 2.2,0 4,0.45 4,1 0,0.55 0.675,1 1.5,1 1.03861,0 1.5,1.04367 1.5,3.39301 0,5.67955 2.64839,5.3152 3.41581,-0.46992 0.44585,-3.36092 1.11812,-4.92309 2.11863,-4.92309 0.80606,0 1.46556,0.45634 1.46556,1.0141 0,0.55775 1.43956,2.30034 3.19901,3.87241 2.7114,2.42263 3.40821,2.64912 4.57143,1.4859 0.75483,-0.75482 2.27242,-1.37241 3.37242,-1.37241 4.6721,0 7.81882,6.87881 7.84208,17.14301 0.0167,7.38324 -0.4447,7.91021 -6.81673,7.78479 -2.90551,-0.0572 -4.25619,-0.78 -6.49608,-3.47639 z m -15.42213,-14.84346 c 2.79541,-2.12202 2.10254,-2.60795 -3.71862,-2.60795 -4.35427,0 -5.35577,0.29406 -4.91485,1.44307 0.96317,2.51 5.97134,3.18573 8.63347,1.16488 z m 21.25,0.39205 c 0.33992,-0.55 0.31023,-1.49804 -0.066,-2.10676 -0.67211,-1.08751 -2.38241,0.57899 -2.4187,2.35676 -0.0224,1.09614 1.7638,0.91642 2.48468,-0.25 z m -23.5,-7.5 c -0.68469,-0.825 -1.81664,-1.5 -2.51546,-1.5 -0.69881,0 -1.52958,0.675 -1.84617,1.5 -0.43514,1.13396 0.17869,1.5 2.51546,1.5 2.63423,0 2.90707,-0.22169 1.84617,-1.5 z m -9.60986,-4.0743 c 0.33226,-0.86587 -0.0522,-2.23057 -0.85426,-3.03268 -1.20329,-1.20329 -1.81497,-1.23568 -3.49713,-0.18515 -1.12131,0.70027 -2.03875,2.06498 -2.03875,3.03268 0,2.30666 5.51472,2.46645 6.39014,0.18515 z m 49.60986,18.5743 c -0.62592,-1.16955 -2.09382,-2 -3.53518,-2 -2.34589,0 -2.46482,-0.28951 -2.46482,-6 0,-4.56557 0.34551,-6 1.44521,-6 1.01436,0 1.53672,1.41607 1.75216,4.75 l 0.30694,4.75 2.44711,-4.75 c 3.84977,-7.47266 6.55698,-5.49628 4.11839,3.0066 -0.73982,2.5796 -0.63749,3.2434 0.5,3.2434 0.85887,0 1.43019,0.99868 1.43019,2.5 0,1.99048 -0.50235,2.5 -2.46482,2.5 -1.44136,0 -2.90926,-0.83045 -3.53518,-2 z m 8,-5 c 0,-4.66667 0.33333,-6 1.5,-6 1.16667,0 1.5,1.33333 1.5,6 0,4.66667 -0.33333,6 -1.5,6 -1.16667,0 -1.5,-1.33333 -1.5,-6 z m 11,0.44098 c 0,-6.26713 -1.47234,-6.52366 -2.50089,-0.43574 -1.05082,6.21978 -3.49911,5.28482 -3.49911,-1.33626 0,-4.58408 0.33186,-5.50863 2.36856,-6.59864 4.83574,-2.58801 6.10221,-1.2693 6.42525,6.69026 0.24296,5.98654 0.0266,7.2394 -1.25,7.2394 -1.20661,0 -1.54381,-1.21422 -1.54381,-5.55902 z m -11,-9.94098 c 0,-0.825 0.675,-1.5 1.5,-1.5 0.825,0 1.5,0.675 1.5,1.5 0,0.825 -0.675,1.5 -1.5,1.5 -0.825,0 -1.5,-0.675 -1.5,-1.5 z m -40.07895,-19.75 c -0.0434,-1.2375 -0.30592,-1.6875 -0.58333,-1 -0.82562,2.0461 -4.05595,1.42367 -6.10041,-1.17544 l -1.90786,-2.42545 -6.91472,2.42109 c -9.60876,3.36436 -10.8337,3.26395 -10.00638,-0.8202 0.36209,-1.7875 0.93245,-5.8375 1.26745,-9 0.44265,-4.17858 1.01975,-5.75 2.11169,-5.75 1.24773,0 1.40431,1.17224 0.92316,6.91138 l -0.57943,6.91137 2.795,-0.80159 c 1.53726,-0.44088 3.72815,-1.301 4.86865,-1.91138 1.14051,-0.61038 3.00323,-1.10978 4.13939,-1.10978 1.6174,0 2.06574,-0.6356 2.06574,-2.92857 0,-4.02947 2.37828,-6.07143 7.07143,-6.07143 l 3.92857,0 0.0318,7.75 c 0.0273,6.65951 0.21873,7.50376 1.36024,6 2.78787,-3.67255 4.87395,-0.98405 2.57277,3.31574 -0.66611,1.24464 -2.09223,1.93426 -4,1.93426 -2.38456,0 -2.98026,-0.44035 -3.04376,-2.25 z m -1.7801,-9.33213 c 0.77365,-4.67633 0.59675,-5.01272 -1.5219,-2.89406 -0.89048,0.89048 -1.61905,2.9744 -1.61905,4.63095 0,4.36202 2.34662,3.06438 3.14095,-1.73689 z m 26.85905,5.58213 c 0,-3.77778 0.36667,-5 1.5,-5 1.13333,0 1.5,1.22222 1.5,5 0,3.77778 -0.36667,5 -1.5,5 -1.13333,0 -1.5,-1.22222 -1.5,-5 z m -6,0.58179 c 0,-7.09996 -2.37213,-8.90975 -3.38401,-2.58179 -0.41388,2.58824 -1.16487,4 -2.12781,4 -2.42338,0 -2.01953,-9.46865 0.51182,-12 2.61245,-2.61245 6,-2.64577 6,-0.059 0,1.06754 0.38928,2.18157 0.86506,2.47562 1.07613,0.66509 2.16585,8.33927 1.44931,10.20654 -1.08125,2.81767 -3.31437,1.44226 -3.31437,-2.04137 z m 12,0.46526 c 0,-0.52412 0.5214,-2.09729 1.15866,-3.49593 0.95099,-2.08719 0.86137,-2.87151 -0.5,-4.3758 -3.20746,-3.54421 -1.14338,-5.82895 2.38293,-2.63768 1.39659,1.2639 2.16798,1.32399 4.33297,0.33756 3.24207,-1.47718 4.47627,-0.46725 2.76929,2.26607 -1.06778,1.70978 -1.01997,2.33814 0.28785,3.78326 3.28698,3.63207 0.17131,5.83615 -3.52337,2.49251 -1.60687,-1.4542 -1.83984,-1.41353 -2.86393,0.5 -1.12014,2.093 -4.0444,2.91005 -4.0444,1.13001 z m -5,-11.54705 c 0,-0.825 0.675,-1.5 1.5,-1.5 0.825,0 1.5,0.675 1.5,1.5 0,0.825 -0.675,1.5 -1.5,1.5 -0.825,0 -1.5,-0.675 -1.5,-1.5 z m -4.5,-14.68968 c -4.09458,-1.46217 -6.5,-3.72707 -6.5,-6.1203 0,-1.87422 -0.115,-1.89592 -1.82874,-0.34501 -2.71709,2.45893 -4.17126,2.01494 -4.17126,-1.27358 0,-2.72232 -2.15266,-6.07143 -3.90245,-6.07143 -0.41777,0 -1.36167,1.125 -2.09755,2.5 -0.73588,1.375 -2.21438,2.5 -3.28556,2.5 -1.63768,0 -1.82964,-0.4376 -1.20636,-2.75 0.40768,-1.5125 0.9444,-6.2375 1.19272,-10.5 0.33944,-5.82662 0.80486,-7.75 1.87535,-7.75 1.08284,0 1.42385,1.52615 1.42385,6.37219 l 0,6.37219 3.8815,0.62068 c 2.80371,0.44833 4.03376,1.2029 4.42983,2.71747 0.43652,1.66924 1.02142,1.94903 2.8685,1.37214 1.27609,-0.39855 3.39403,-1.7889 4.70653,-3.08965 1.96405,-1.94648 3.42405,-2.36502 8.25,-2.36502 l 5.86364,0 0,3.5 0,3.5 -6.37756,0 c -4.59899,0 -6.74412,0.44169 -7.69201,1.58382 -3.35527,4.04285 4.944,7.91707 14.89984,6.95546 5.71616,-0.55211 6.29718,-0.43816 5.98916,1.17465 -0.28728,1.50415 -1.52323,1.81619 -7.83027,1.97688 -4.11904,0.10494 -8.83916,-0.29128 -10.48916,-0.88049 z m 6.23097,-14.50331 c -0.97297,-0.25354 -2.32297,-0.23687 -3,0.037 -0.67703,0.27393 0.11903,0.48137 1.76903,0.46099 1.65,-0.0204 2.20394,-0.2445 1.23097,-0.49804 z m -46.22603,6.71546 c -0.35969,-1.63764 -0.36512,-3.88764 -0.0121,-5 1.0443,-3.29029 -0.34403,-6.02247 -3.06026,-6.02247 -3.09784,0 -3.2554,-2.74404 -0.18261,-3.18045 1.80733,-0.25668 2.31106,-1.05733 2.56036,-4.06955 0.39333,-4.75233 2.93006,-5.128 3.37628,-0.5 0.3098,3.21312 0.37861,3.2534 6.06336,3.5499 4.21862,0.22004 5.75,0.68611 5.75,1.75 0,1.09103 -1.3619,1.4501 -5.5,1.4501 l -5.5,0 0,7.5 c 0,5.81356 -0.31942,7.5 -1.42055,7.5 -0.78129,0 -1.71483,-1.33989 -2.07451,-2.97753 z m 72.74506,-34.68475 c -0.6875,-0.27741 -1.25,-1.41937 -1.25,-2.53769 0,-1.64856 0.42574,-1.90134 2.25,-1.33593 5.01373,1.55396 6.33373,1.59083 8.17686,0.2284 1.76364,-1.30367 1.80838,-1.71036 0.52817,-4.80107 -0.76929,-1.85722 -2.9026,-5.04139 -4.7407,-7.07595 -2.7601,-3.0551 -3.28735,-4.35825 -3.02816,-7.48434 0.39444,-4.75736 3.08945,-6.29595 11.06383,-6.3164 4.22896,-0.0108 5.75,0.35026 5.75,1.36507 0,0.97192 -1.77806,1.50842 -6.01489,1.81489 -9.59304,0.69389 -9.94912,2.36709 -2.47565,11.63304 4.30733,5.34044 4.84469,11.11036 1.26803,13.61556 -2.10169,1.47208 -8.80661,1.99232 -11.52749,0.89442 z m -15.25,-2.64224 c -3.06562,-1.43368 -5.05941,-3.33137 -7.36752,-7.0124 -1.42899,-2.279 -2.03995,-2.5898 -3.19938,-1.62756 -0.78821,0.65416 -1.4331,1.99747 -1.4331,2.98514 0,2.86563 -1.10061,4.95934 -2.60699,4.95934 -1.81508,0 -1.75023,-2.15014 0.6334,-21 2.80111,-22.15138 2.9749,-23 4.71022,-23 1.59832,0 1.5255,1.82461 -0.59858,15 -0.48767,3.025 -0.76185,5.64389 -0.60927,5.81976 0.15257,0.17587 2.00852,-0.54778 4.12431,-1.6081 2.1158,-1.06032 5.08441,-2.22529 6.59691,-2.58881 1.5125,-0.36353 2.75,-1.10238 2.75,-1.6419 0,-0.53952 1.35,-0.98095 3,-0.98095 1.74645,0 2.98972,0.52231 2.9754,1.25 -0.0249,1.26445 -6.03893,4.73399 -8.2665,4.769 -2.26613,0.0356 -10.7089,5.97944 -10.7089,7.53921 0,0.85499 1.29836,2.76666 2.88525,4.24816 1.58689,1.4815 3.16131,3.60876 3.49872,4.72726 0.72174,2.39258 5.52033,5.41471 7.48168,4.71193 1.42719,-0.51138 3.09277,1.36002 3.11904,3.50444 0.0189,1.54207 -3.63164,1.51358 -6.98469,-0.0545 z m -43.3074,-9.44548 c -1.87993,-5.24505 -2.24962,-11.25 -0.6926,-11.25 0.55,0 1,-0.62041 1,-1.37868 0,-1.73687 4.29613,-3.47327 9.5,-3.83968 l 4,-0.28164 0.30908,5.44655 c 0.40177,7.08009 -0.12184,8.8842 -3.71595,12.80345 -2.03012,2.21377 -3.8919,3.25 -5.83922,3.25 -2.50491,0 -3.06958,-0.58803 -4.56131,-4.75 z m 9.0574,-2.57754 c 1.33079,-1.9496 2.25,-4.80295 2.25,-6.98434 0,-3.28576 -0.27795,-3.68812 -2.54775,-3.68812 -2.37533,0 -7.45225,4.17325 -7.45225,6.12579 0,2.33247 3.32001,8.68804 4.33324,8.29522 0.64172,-0.24878 2.17926,-1.93563 3.41676,-3.74855 z m -20.09663,1.123 c -1.00568,-8.37364 -0.80804,-11.79546 0.68126,-11.79546 1.03777,0 1.24438,-1.835 0.92889,-8.25 -0.5475,-11.13271 -0.37765,-10.83316 -5.72673,-10.09999 -3.7249,0.51056 -4.53679,0.34004 -4.53679,-0.95281 0,-1.10367 1.36976,-1.78006 4.57953,-2.2614 2.51874,-0.37771 4.81689,-1.30528 5.10699,-2.06127 0.6146,-1.60161 2.99065,-1.84303 3.4869,-0.35428 0.23122,0.69366 2.06215,0.69366 5.71982,0 7.70574,-1.46137 13.10676,-1.32058 13.10676,0.34165 0,0.93908 -1.98754,1.56554 -6.40181,2.01779 -3.52099,0.36074 -7.85322,1.16186 -9.62718,1.78026 l -3.22537,1.12437 0.59119,11.10784 c 0.7533,14.15354 -0.22946,23.96927 -2.44216,24.39204 -1.25063,0.23895 -1.74584,-0.8633 -2.2413,-4.98874 z" id="path2998" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssssssccssssssssssssssssssssssssssssscccccsssssscsssssssscssssssssssssssssssssssscsscssssscssssscsssscssssssssssssssssssssssssssssssssssssssssssscssssscccsssssscccccccssssssscssccssssssscssssscssssssscsssscssssssccsssscsssssssscssssssssssssscsss" />
+ </g>
+ </g>
+ <g id="g3837">
+ <path style="fill:#ffffff;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" d="m 312.64221,48.087443 32.32488,4.545687 25.00128,25.758889 5.3033,130.309681 39.39595,65.40738 -5.55584,53.79062 7.82868,21.2132 16.92006,-35.86041 8.5502,1.42608 7.76785,3.66072 5.04465,5.3125 3.30357,6.29464 2.41071,9.19643 3.16964,9.55357 2.76786,5.22321 5.625,2.99107 8.03572,4.50893 4.64285,5.66965 2.90179,8.70535 0.98214,8.92857 0.22322,5.35715 -0.53572,31.29464 -2.58928,8.66071 -6.16072,2.14286 -20.71428,13.48214 -17.94643,7.5 -23.30357,8.75 -13.75,5.89286 c 0,0 -31.07143,6.69643 -45,-6.25 -13.92858,-12.94643 -24.19643,-10.08928 -24.19643,-10.08928 l -93.30358,0.89285 c 0,0 -38.03571,10.89286 -46.78571,10.26786 -8.75,-0.625 -13.30357,2.23214 -13.30357,2.23214 l -15.80357,1.07143 -18.83929,-0.89286 c 0,0 -35.80357,-8.66071 -38.21428,-18.03571 -2.41072,-9.375 -5.8259,-9.15179 -5.8259,-9.15179 l -4.586651,-10.44849 -1.010153,-8.33375 -0.315672,-18.8141 3.282996,-8.71256 10.22779,-3.03046 14.89975,0 6.06092,-2.39911 2.39911,-9.97526 9.51066,-34.40234 6.96429,-7.76785 8.75,-3.21429 11.33928,-17.5 14.64286,-50.53571 14.64286,-25.17858 36.42857,-58.21428 27.67857,-53.03572 35.53572,-63.035711 z" id="path3832" inkscape:connector-curvature="0" transform="translate(3.807304e-6,540.36218)" />
+ <path style="fill:#e8da43" d="M 312.65625 48.09375 L 299.46875 63.25 L 263.9375 126.28125 L 236.25 179.3125 L 199.8125 237.53125 L 185.1875 262.71875 L 170.53125 313.25 L 159.1875 330.75 L 150.4375 333.96875 L 143.46875 341.71875 L 133.96875 376.125 L 131.5625 386.125 L 125.5 388.5 L 110.625 388.5 L 100.375 391.53125 L 97.09375 400.25 L 97.40625 419.0625 L 98.4375 427.40625 L 103 437.84375 C 103 437.84375 106.43303 437.625 108.84375 447 C 111.25446 456.375 147.0625 465.03125 147.0625 465.03125 L 165.90625 465.9375 L 181.6875 464.84375 C 181.6875 464.84375 186.25 462 195 462.625 C 203.75 463.25 241.78125 452.34375 241.78125 452.34375 L 335.09375 451.46875 C 335.09375 451.46875 345.35267 448.61607 359.28125 461.5625 C 373.20982 474.50893 404.28125 467.8125 404.28125 467.8125 L 418.03125 461.90625 L 441.34375 453.15625 L 459.28125 445.65625 L 480 432.1875 L 486.15625 430.03125 L 488.75 421.375 L 489.28125 390.09375 L 489.0625 384.71875 L 488.09375 375.78125 L 485.1875 367.09375 L 480.53125 361.40625 L 472.5 356.90625 L 466.875 353.90625 L 464.09375 348.6875 L 460.9375 339.15625 L 458.53125 329.9375 L 455.21875 323.65625 L 450.1875 318.34375 L 442.40625 314.6875 L 433.875 313.25 L 416.9375 349.125 L 409.125 327.90625 L 409.59375 323.34375 L 408.15625 318.875 L 411.03125 309.25 L 414.65625 274.09375 L 375.28125 208.6875 L 369.96875 78.40625 L 344.96875 52.625 L 312.65625 48.09375 z M 325.75 59.3125 C 338.19674 59.3125 338.37847 59.349402 346.34375 65.9375 C 364.70832 81.126838 364.23278 79.168174 364.84375 147.90625 C 365.25101 193.72638 364.96565 204.5 363.3125 204.5 C 362.18961 204.5 360.85664 203.44262 360.375 202.1875 C 359.89338 200.93237 358.00864 199.45632 356.15625 198.875 C 354.30386 198.29368 348.99116 195.38197 344.375 192.4375 C 324.19644 179.56638 321.74563 178.9405 286.96875 178 C 269.65269 177.53171 254.89546 176.61646 254.1875 175.90625 C 253.47952 175.19604 256.82141 167.10046 261.625 157.9375 C 266.42857 148.77453 271.99655 137.05747 274 131.90625 C 278.16645 121.19359 283.02401 112.83131 290.4375 103.65625 C 293.28077 100.13737 296.1201 95.322749 296.71875 92.9375 C 297.31742 90.552267 300.1468 84.065111 303.03125 78.53125 C 305.91568 72.997389 308.28125 66.835851 308.28125 64.84375 C 308.28125 60.101022 310.73004 59.3125 325.75 59.3125 z M 313.90625 121.90625 C 311.90687 121.95839 309.85555 122.72107 308.0625 124.34375 C 304.51248 127.55647 304.36081 132.3175 307.75 136.0625 C 312.91492 141.76968 322.34375 138.08001 322.34375 130.34375 C 322.34375 125.12004 318.30488 121.79146 313.90625 121.90625 z M 353.625 129.5625 C 345.25797 129.5625 341.30497 137.79253 346.78125 143.84375 C 349.99397 147.39377 354.755 147.54544 358.5 144.15625 C 364.12387 139.06672 360.95628 129.5625 353.625 129.5625 z M 242 194.34375 C 244.92361 194.12045 261.46875 212.35793 261.46875 216.25 C 261.46875 222.4981 265.36941 224.78125 276.1875 224.78125 C 281.62859 224.78125 288.67456 225.91794 291.9375 227.28125 C 296.72877 229.2832 302.91405 229.63704 324.625 229.21875 C 350.45153 228.72117 351.64065 228.54101 359.84375 224.28125 L 368.34375 219.84375 L 375.0625 227.125 C 382.38905 235.1036 386.31135 241.89056 392.9375 258.0625 C 397.13676 268.31134 397.28125 269.69873 397.28125 295.90625 C 397.28125 310.87285 396.73765 323.09294 396.09375 323.0625 C 395.44985 323.03206 393.17759 322.00821 391.03125 320.78125 C 385.93687 317.86905 376.96243 317.83385 372.84375 320.71875 C 366.87386 324.90023 364.5 332.68401 364.5 347.90625 C 364.5 358.44964 365.30852 364.25581 367.75 370.78125 C 371.50017 380.80446 371.22767 384.66555 365.5 404.625 C 361.31142 419.22106 355.19749 431.90793 349.84375 436.9375 C 346.74498 439.84866 343.99944 440.06005 309.0625 440.5 C 288.46533 440.75936 266.85762 440.34182 261.0625 439.5625 L 250.53125 438.15625 L 250.53125 424.375 C 250.53125 410.86994 247.15164 392.24932 242.0625 377.9375 C 238.84728 368.89555 238.82947 368.93016 244.78125 369.625 C 248.30806 370.03674 250.63942 369.39015 252.15625 367.5625 C 256.37082 362.48424 254.49248 354.30219 245.15625 337.15625 C 240.24765 328.14162 234.15479 314.85594 231.65625 307.625 C 226.62852 293.07441 218.09852 278.90118 205.71875 264.6875 C 198.76523 256.70391 197.83567 254.93304 199.46875 252.6875 C 200.52285 251.23809 205.62862 244.8571 210.84375 238.53125 C 216.05888 232.20541 222.83809 223.20171 225.9375 218.5 C 229.03691 213.79829 233.70598 206.91252 236.28125 203.21875 C 238.85652 199.52497 241.27113 195.65317 241.625 194.625 C 241.68994 194.43625 241.8051 194.35864 242 194.34375 z M 189.28125 276.15625 C 189.37564 276.12078 189.49261 276.13411 189.625 276.15625 C 193.59686 276.82057 209.58634 298.32965 212.25 307.125 C 215.09953 316.53411 204.57533 305.98826 198 292.84375 C 195.8065 288.45883 192.50146 283.31807 190.71875 281.375 C 188.66391 279.1353 188.08794 277.28706 189.03125 276.34375 C 189.10665 276.26835 189.18686 276.19172 189.28125 276.15625 z M 182.6875 304.0625 L 188.5 312.5 C 191.69438 317.13808 196.42202 322.54781 199.0625 324.5 C 204.03834 328.17881 209.92657 336.50246 209.9375 339.90625 C 209.94218 341.32816 206.01445 341.84375 195.40625 341.84375 C 182.3231 341.84375 180.51242 341.50031 177.5625 338.34375 C 174.64543 335.22236 174.5184 334.5054 176.5 331.8125 C 177.72633 330.14597 178.74254 325.21823 178.78125 320.875 C 178.81996 316.53177 179.73521 310.97983 180.78125 308.53125 L 182.6875 304.0625 z M 441.03125 335.625 C 441.69904 335.625 443.10793 339.30518 444.1875 343.8125 C 448.27871 360.89379 456.50504 373.0625 463.90625 373.0625 C 470.35434 373.0625 472.8735 379.58605 472.9375 396.34375 C 472.98339 408.37272 472.379 412.25729 470 416.1875 C 466.39986 422.13508 448.26583 432.2191 430.84375 437.90625 C 424.15909 440.08834 413.40081 444.30946 406.96875 447.28125 C 393.39899 453.55088 386.12795 454.03831 374.625 449.375 C 370.33491 447.63581 366.62811 445.97186 366.375 445.71875 C 366.12189 445.46564 368.41645 440.98003 371.5 435.71875 C 378.17572 424.32839 386.4228 397.86023 387.40625 384.71875 C 387.93698 377.6265 387.31902 373.32552 384.875 367.125 C 381.22514 357.86523 380.26165 337.15625 383.46875 337.15625 C 387.68501 337.15625 402.31658 350.57323 405.9375 357.71875 C 410.14311 366.01811 412.30206 367.52984 421.5625 369.0625 C 426.60885 369.8977 428.7029 369.50407 431.71875 367.0625 C 435.09964 364.32541 435.50889 362.70337 435.65625 352.1875 C 435.80891 341.29584 437.6781 335.625 441.03125 335.625 z M 161.90625 349.71875 C 162.47142 349.71719 163.06345 350.01917 163.71875 350.5 C 174.29325 358.25916 174.284 358.19843 192.6875 358.71875 C 210.42128 359.22015 210.79751 359.34025 215.75 364.09375 C 227.59849 375.46613 238.81383 430.07132 230.625 436.53125 C 223.4127 442.22082 217.77328 443.98567 202.9375 445.21875 C 194.35213 445.93232 178.19223 446.85414 167.03125 447.21875 C 146.05232 447.9041 139.90672 446.81607 128 440.25 C 121.03505 436.40909 114.82589 424.08783 114.78125 414.0625 L 114.71875 405.84375 L 125.625 405.84375 C 135.55215 405.84375 136.91715 405.43916 141.9375 401.03125 C 147.76052 395.91856 148.37825 394.34117 154.375 368.59375 C 157.6077 354.71393 159.45717 349.72649 161.90625 349.71875 z " transform="translate(0,540.36218)" id="path3000" />
+ <path transform="matrix(1.5609756,0,0,1.5609756,-171.31916,-475.79592)" sodipodi:nodetypes="sssssssssssssssssssssssssssssscsssssssssssssssssscsscsssssssssscssscsscsssssssssscssssssssssssssssssssssssssssccssssscssssccsssssssssss" style="fill:#10100e" d="m 346.14823,950.65585 c -3.08171,-1.19874 -6.29936,-2.75991 -7.15033,-3.46926 -1.18466,-0.9875 -9.47937,-1.339 -35.39689,-1.5 -31.38423,-0.19495 -34.0805,-0.34996 -37.01893,-2.12818 -2.874,-1.73924 -3.3864,-1.77765 -5.5,-0.41234 -5.07112,3.27577 -12.13505,4.83025 -21.94986,4.83025 -5.42988,0 -10.03714,0.44382 -10.38088,1 -0.3626,0.5867 -6.06992,0.99128 -13.80902,0.97891 -11.2476,-0.018 -14.16964,-0.36655 -19.83376,-2.36593 -12.53736,-4.42557 -14.90846,-6.25263 -19.47412,-15.00585 -3.52124,-6.75088 -4.19654,-9.05479 -4.66733,-15.92354 -0.6497,-9.47892 0.68118,-14.57075 4.28423,-16.39107 1.375,-0.69467 5.97893,-1.26967 10.23095,-1.27778 7.62944,-0.0145 7.73815,-0.0508 8.2798,-2.76474 0.85416,-4.27968 4.52726,-18.26587 6.09412,-23.20474 1.70718,-5.38121 5.92409,-10.04526 9.08222,-10.04526 2.1303,0 2.31291,-0.42431 2.31291,-5.37427 0,-2.95585 0.70173,-7.34335 1.5594,-9.75 0.85767,-2.40665 2.24253,-7.64762 3.07747,-11.64659 1.85301,-8.87509 6.61527,-22.21367 10.01543,-28.05216 1.38468,-2.37767 5.09606,-7.32767 8.24751,-11 13.66725,-15.92623 31.72682,-46.69031 40.48231,-68.96074 2.27649,-5.79046 5.33711,-11.35525 8.13387,-14.78892 2.46621,-3.02783 4.48401,-6.29031 4.48401,-7.24996 0,-0.95964 1.575,-4.18945 3.5,-7.17736 2.09967,-3.25902 3.5,-6.68633 3.5,-8.56624 0,-1.86791 1.16656,-4.74408 2.88806,-7.12054 2.39263,-3.30293 3.93635,-4.28099 8.99891,-5.70147 6.53764,-1.83437 14.61036,-1.97086 22.47893,-0.38006 6.68204,1.35092 18.89652,12.02175 23.34042,20.39069 l 3.12101,5.87762 0.52099,40.3258 c 0.42328,32.76267 0.79091,40.73357 1.96017,42.5 0.79155,1.19581 6.18136,6.94178 11.97734,12.76882 10.33563,10.39102 10.53684,10.68154 10.46979,15.11725 -0.0715,4.72968 4.09488,14.72948 8.27546,19.86206 1.55772,1.91245 2.24571,4.54665 2.67706,10.25 0.548,7.2459 0.71337,7.67607 2.95088,7.67607 1.30369,0 3.95946,1.4625 5.9017,3.25 2.89343,2.6629 4.01981,4.95524 6.23532,12.68971 2.50582,8.74798 2.9238,9.4986 5.70396,10.24324 1.65,0.44193 4.76924,2.31004 6.93165,4.15134 3.64844,3.10667 3.98689,3.84549 4.69864,10.25677 0.96926,8.73081 1.05858,20.30856 0.21866,28.34443 -0.57568,5.50783 -0.95168,6.34317 -3.24817,7.21629 -1.42841,0.54309 -3.27294,1.59139 -4.09895,2.32956 -1.93202,1.72658 -21.54054,11.51866 -23.06597,11.51866 -1.41149,0 -17.31571,6.3896 -22.56281,9.06472 -5.35747,2.7314 -16.93234,2.54924 -24.47616,-0.38519 z m 30.22385,-4.07819 c 5.17708,-2.41927 11.42588,-4.94071 13.88622,-5.60321 6.55504,-1.76509 22.01512,-9.68111 25.55879,-13.08687 1.68616,-1.62053 3.3372,-2.67497 3.66898,-2.3432 0.33178,0.33178 1.15854,-0.43437 1.83725,-1.70255 1.66477,-3.11065 1.73927,-29.10768 0.0973,-33.95056 -1.46302,-4.31507 -5.374,-8.19659 -10.29768,-10.2201 -3.82932,-1.57376 -4.34899,-2.55449 -8.54089,-16.11871 -1.90238,-6.15576 -4.50114,-8.93374 -9.456,-10.10812 -2.28764,-0.54221 -2.76996,-0.20727 -3.75,2.60409 -0.61859,1.77449 -1.12471,8.75204 -1.12471,15.50568 0,14.19593 -0.58434,15.42221 -7.34892,15.42221 -7.70799,0 -11.17785,-4.63899 -14.76399,-19.73858 -1.78398,-7.51148 -2.03131,-11.23596 -1.74728,-26.3111 l 0.33086,-17.56099 -3.97603,-9.83826 c -2.98207,-7.3788 -5.3101,-11.33337 -9.31254,-15.81899 -4.35273,-4.87818 -5.22169,-6.4382 -4.71368,-8.46229 0.38747,-1.54377 0.004,-3.42576 -1.01424,-4.98006 -1.41632,-2.16159 -1.71042,-7.57471 -2.18102,-40.14411 -0.62805,-43.46594 -0.1479,-41.18354 -10.60183,-50.39562 l -6.52513,-5.75 -8.24436,0 c -9.15143,0 -11.90184,1.3454 -11.90184,5.82194 0,1.38158 -1.575,5.37733 -3.5,8.87944 -1.925,3.5021 -3.5,7.25068 -3.5,8.33016 0,1.07949 -1.4783,3.65149 -3.28511,5.71558 -4.82524,5.5123 -8.00674,10.88008 -11.1149,18.75288 -4.89112,12.38893 -14.51723,29.5 -16.5957,29.5 -3.35626,0 -5.26843,2.94671 -4.60488,7.09629 0.55147,3.44875 -0.0234,4.67023 -7.09598,15.07824 -4.23284,6.22901 -10.53272,14.65664 -13.99975,18.72807 -3.46702,4.07143 -6.28544,7.67143 -6.26315,8 0.0223,0.32857 2.04958,3.0724 4.50509,6.0974 8.78643,10.82422 14.27452,19.95204 16.98836,28.25512 1.48214,4.53468 3.41508,9.36988 4.29542,10.74488 4.22604,6.60068 10.1706,19.658 10.1706,22.33988 0,3.23438 -2.43137,6.66012 -4.72692,6.66012 -5.23772,0 -18.73801,-11.96798 -22.74374,-20.16228 -1.71592,-3.51016 -4.72324,-7.35034 -7.91235,-10.10362 -2.82942,-2.44274 -6.02806,-6.08222 -7.10809,-8.08772 -1.08004,-2.00551 -2.32251,-3.64638 -2.76105,-3.64638 -1.3115,0 -2.72966,4.79242 -3.14512,10.62834 -0.5759,8.08964 -4.29216,11.34991 -9.13022,8.00994 -3.00718,-2.07601 -9.98531,1.1866 -11.91091,5.56892 -2.04656,4.6576 -6.5616,21.4042 -6.5616,24.33744 0,4.65878 -3.16971,6.45536 -11.38922,6.45536 -5.80199,0 -7.89631,0.41264 -9.75,1.92102 -2.22174,1.80787 -2.34632,2.4902 -2.11533,11.58526 0.22864,9.00207 0.50271,10.15413 4,16.81389 2.35153,4.47792 5.0037,7.98219 7.09732,9.37759 4.19106,2.79334 13.07431,6.14864 19.51009,7.36916 6.89854,1.30828 19.97642,1.16226 23.33204,-0.26052 1.54831,-0.65647 7.7651,-1.46725 13.8151,-1.80171 14.30568,-0.79088 22.44378,-3.78719 23.71535,-8.73161 1.16856,-4.54387 3.09564,-5.23414 11.80056,-4.22689 8.85445,1.02455 46.08777,1.08568 54.03437,0.0887 6.34899,-0.79654 11.8163,0.0469 13.06367,2.01523 1.57696,2.48844 0.90733,5.68796 -1.60383,7.66324 -2.25747,1.77572 -2.33915,2.08585 -0.87513,3.32258 3.21256,2.71379 10.91314,4.70952 18.46894,4.78654 6.97359,0.0711 8.38421,-0.28713 17.01681,-4.32116 z M 332.25134,742.97632 c -2.40692,-2.40692 -2.50067,-3.84018 -0.4433,-6.77749 1.94443,-2.77606 4.82391,-2.8419 7.49445,-0.17136 2.26563,2.26563 1.90736,5.53663 -0.84325,7.69885 -2.23899,1.76004 -3.89834,1.55956 -6.2079,-0.75 z m -24.2079,-4.25 c -2.75061,-2.16222 -3.10888,-5.43322 -0.84325,-7.69885 2.5809,-2.5809 4.50742,-2.59488 7.05115,-0.0512 1.1,1.1 2,2.675 2,3.5 0,1.84704 -3.52601,5.5 -5.30887,5.5 -0.71988,0 -2.02444,-0.5625 -2.89903,-1.25 z m 69.2079,115.69098 c 0,-6.7847 -0.35745,-10.3381 -1,-9.94098 -1.61996,1.00119 -1.02549,20.5 0.625,20.5 0.20625,0 0.375,-4.75156 0.375,-10.55902 z m -131.50388,-7.45196 c -1.63529,-4.63493 -6.43808,-12.05321 -10.83725,-16.73902 -3.52202,-3.75149 -4.65887,-4.05651 -4.65887,-1.25 0,1.1 0.44352,2 0.9856,2 0.54209,0 2.35529,2.71331 4.02933,6.02958 2.9657,5.87502 9.37291,13.97042 11.05707,13.97042 0.46161,0 0.20246,-1.80494 -0.57588,-4.01098 z" id="path3824" inkscape:connector-curvature="0" />
+ <path sodipodi:type="arc" style="opacity:0.75;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path3797" sodipodi:cx="266.01736" sodipodi:cy="217.60367" sodipodi:rx="2.241276" sodipodi:ry="1.5783633" d="m 268.25864,217.60367 a 2.241276,1.5783633 0 1 1 -4.48255,0 2.241276,1.5783633 0 1 1 4.48255,0 z" transform="translate(-1.7857143,517.14789)" />
+ </g>
+ </g>
+ </g>
+</svg> \ No newline at end of file
diff --git a/src/data/resources.qrc b/src/data/resources.qrc
new file mode 100644
index 0000000..c29d7fe
--- /dev/null
+++ b/src/data/resources.qrc
@@ -0,0 +1,5 @@
+<RCC>
+ <qresource prefix="/">
+ <file>icon.svg</file>
+ </qresource>
+</RCC>
diff --git a/src/forms/profiledialog.cpp b/src/forms/profiledialog.cpp
index 3d93dd0..a3e7c60 100644
--- a/src/forms/profiledialog.cpp
+++ b/src/forms/profiledialog.cpp
@@ -33,6 +33,10 @@ ProfileDialog::ProfileDialog(QWebEngineProfile *profile, QWidget *parent) :
_profile = profile;
ui->setupUi(this);
+ if(!_profile->storageName().isEmpty())
+ setWindowTitle(_profile->storageName());
+ else
+ setWindowTitle(tr("Off-the-record"));
// http
ui->userAgent->setPlainText(_profile->httpUserAgent());
diff --git a/src/main.cpp b/src/main.cpp
index 698a4a4..2a28439 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,6 +28,7 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
app.setApplicationName("smolbote");
app.setApplicationVersion("0.0.0");
+ app.setWindowIcon(QIcon(QLatin1String(":/icon.svg")));
QCommandLineParser parser;
parser.setApplicationDescription("Test browser using QtWebEngine");
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 3f23448..2b7a2b9 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -65,11 +65,9 @@ MainWindow::MainWindow(Browser *instance, QUrl defaultUrl, QWidget *parent) :
toolsMenu->addAction(tr("Downloads"), downloadManager, SLOT(show()));
// Profile menu
- QMenuBar *rightBar = new QMenuBar(ui->menuBar);
- profileMenu = new QMenu(tr("Profile: ") + profileName);
- rightBar->addMenu(profileMenu);
- ui->menuBar->setCornerWidget(rightBar);
- profileMenu->addAction(tr("Edit profile"), this, SLOT(execProfileEditor()));
+ QMenu *profileMenu = new QMenu(tr("Profile"), ui->menuBar);
+ ui->menuBar->addMenu(profileMenu);
+ profileMenu->addAction(tr("View profile"), this, SLOT(execProfileEditor()));
profileMenu->addAction(tr("Load profile"), this, SLOT(loadProfileGUI()));
//profileMenu->addAction(tr("Settings"));
//profileMenu->addAction(tr("Cookies"));
@@ -148,7 +146,6 @@ void MainWindow::loadProfileGUI()
QString name = QInputDialog::getText(this, tr("Load Profile"), tr("Enter Profile name"), QLineEdit::Normal, QString(""), &ok);
if(ok) {
loadProfile(name);
- profileMenu->setTitle(tr("Profile: ") + profileName);
tabBar->setProfile(profile);
}
}
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 0b01783..351a794 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -71,7 +71,6 @@ private:
// ui
Ui::MainWindow *ui;
- QMenu *profileMenu;
QToolBar *navigationToolBar, *tabToolBar;
WebViewTabBar *tabBar;
QLineEdit *urlLineEdit;
diff --git a/src/smolbote.pro b/src/smolbote.pro
index d7505c8..857a60a 100644
--- a/src/smolbote.pro
+++ b/src/smolbote.pro
@@ -38,3 +38,6 @@ FORMS += mainwindow.ui \
forms/profiledialog.ui \
forms/downloaddialog.ui \
webengine/downloaditemform.ui
+
+RESOURCES += \
+ data/resources.qrc
diff --git a/test/blocklist.txt b/test/blocklist.txt
index a66bee5..376b168 100644
--- a/test/blocklist.txt
+++ b/test/blocklist.txt
@@ -11,4 +11,4 @@
! or via e-mail (easylist.subscription@gmail.com).
!
! -----------------------General advert blocking filters-----------------------!
-css
+!css