diff --git a/QtAwesome/QtAwesome.cpp b/QtAwesome/QtAwesome.cpp index 49f1239..79811cc 100644 --- a/QtAwesome/QtAwesome.cpp +++ b/QtAwesome/QtAwesome.cpp @@ -164,6 +164,10 @@ struct FANameIcon { static const FANameIcon faNameIconArray[] = { { "fa_500px" , fa::fa_500px }, + { "addressbook" , fa::addressbook }, + { "addressbooko" , fa::addressbooko }, + { "addresscard" , fa::addresscard }, + { "addresscardo" , fa::addresscardo }, { "adjust" , fa::adjust }, { "adn" , fa::adn }, { "aligncenter" , fa::aligncenter }, @@ -212,11 +216,15 @@ static const FANameIcon faNameIconArray[] = { { "backward" , fa::backward }, { "balancescale" , fa::balancescale }, { "ban" , fa::ban }, + { "bandcamp" , fa::bandcamp }, { "bank" , fa::bank }, { "barchart" , fa::barchart }, { "barcharto" , fa::barcharto }, { "barcode" , fa::barcode }, { "bars" , fa::bars }, + { "bath" , fa::bath }, + { "bathtub" , fa::bathtub }, + { "battery" , fa::battery }, { "battery0" , fa::battery0 }, { "battery1" , fa::battery1 }, { "battery2" , fa::battery2 }, @@ -366,19 +374,25 @@ static const FANameIcon faNameIconArray[] = { { "dotcircleo" , fa::dotcircleo }, { "download" , fa::download }, { "dribbble" , fa::dribbble }, + { "driverslicense" , fa::driverslicense }, + { "driverslicenseo" , fa::driverslicenseo }, { "dropbox" , fa::dropbox }, { "drupal" , fa::drupal }, { "edge" , fa::edge }, { "edit" , fa::edit }, + { "eercast" , fa::eercast }, { "eject" , fa::eject }, { "ellipsish" , fa::ellipsish }, { "ellipsisv" , fa::ellipsisv }, { "empire" , fa::empire }, { "envelope" , fa::envelope }, { "envelopeo" , fa::envelopeo }, + { "envelopeopen" , fa::envelopeopen }, + { "envelopeopeno" , fa::envelopeopeno }, { "envelopesquare" , fa::envelopesquare }, { "envira" , fa::envira }, { "eraser" , fa::eraser }, + { "etsy" , fa::etsy }, { "eur" , fa::eur }, { "euro" , fa::euro }, { "exchange" , fa::exchange }, @@ -392,6 +406,7 @@ static const FANameIcon faNameIconArray[] = { { "eye" , fa::eye }, { "eyeslash" , fa::eyeslash }, { "eyedropper" , fa::eyedropper }, + { "fa" , fa::fa }, { "facebook" , fa::facebook }, { "facebookf" , fa::facebookf }, { "facebookofficial" , fa::facebookofficial }, @@ -426,6 +441,7 @@ static const FANameIcon faNameIconArray[] = { { "fire" , fa::fire }, { "fireextinguisher" , fa::fireextinguisher }, { "firefox" , fa::firefox }, + { "firstorder" , fa::firstorder }, { "flag" , fa::flag }, { "flagcheckered" , fa::flagcheckered }, { "flago" , fa::flago }, @@ -438,11 +454,13 @@ static const FANameIcon faNameIconArray[] = { { "folderopen" , fa::folderopen }, { "folderopeno" , fa::folderopeno }, { "font" , fa::font }, + { "fontawesome" , fa::fontawesome }, { "fonticons" , fa::fonticons }, { "fortawesome" , fa::fortawesome }, { "forumbee" , fa::forumbee }, { "forward" , fa::forward }, { "foursquare" , fa::foursquare }, + { "freecodecamp" , fa::freecodecamp }, { "frowno" , fa::frowno }, { "futbolo" , fa::futbolo }, { "gamepad" , fa::gamepad }, @@ -469,10 +487,13 @@ static const FANameIcon faNameIconArray[] = { { "globe" , fa::globe }, { "google" , fa::google }, { "googleplus" , fa::googleplus }, + { "googlepluscircle" , fa::googlepluscircle }, + { "googleplusofficial" , fa::googleplusofficial }, { "googleplussquare" , fa::googleplussquare }, { "googlewallet" , fa::googlewallet }, { "graduationcap" , fa::graduationcap }, { "gratipay" , fa::gratipay }, + { "grav" , fa::grav }, { "group" , fa::group }, { "hsquare" , fa::hsquare }, { "hackernews" , fa::hackernews }, @@ -489,6 +510,7 @@ static const FANameIcon faNameIconArray[] = { { "handscissorso" , fa::handscissorso }, { "handspocko" , fa::handspocko }, { "handstopo" , fa::handstopo }, + { "handshakeo" , fa::handshakeo }, { "hardofhearing" , fa::hardofhearing }, { "hashtag" , fa::hashtag }, { "hddo" , fa::hddo }, @@ -512,8 +534,12 @@ static const FANameIcon faNameIconArray[] = { { "houzz" , fa::houzz }, { "html5" , fa::html5 }, { "icursor" , fa::icursor }, + { "idbadge" , fa::idbadge }, + { "idcard" , fa::idcard }, + { "idcardo" , fa::idcardo }, { "ils" , fa::ils }, { "image" , fa::image }, + { "imdb" , fa::imdb }, { "inbox" , fa::inbox }, { "indent" , fa::indent }, { "industry" , fa::industry }, @@ -551,6 +577,7 @@ static const FANameIcon faNameIconArray[] = { { "link" , fa::link }, { "linkedin" , fa::linkedin }, { "linkedinsquare" , fa::linkedinsquare }, + { "linode" , fa::linode }, { "fa_linux" , fa::fa_linux }, { "list" , fa::list }, { "listalt" , fa::listalt }, @@ -583,8 +610,10 @@ static const FANameIcon faNameIconArray[] = { { "meanpath" , fa::meanpath }, { "medium" , fa::medium }, { "medkit" , fa::medkit }, + { "meetup" , fa::meetup }, { "meho" , fa::meho }, { "mercury" , fa::mercury }, + { "microchip" , fa::microchip }, { "microphone" , fa::microphone }, { "microphoneslash" , fa::microphoneslash }, { "minus" , fa::minus }, @@ -636,6 +665,7 @@ static const FANameIcon faNameIconArray[] = { { "piechart" , fa::piechart }, { "piedpiper" , fa::piedpiper }, { "piedpiperalt" , fa::piedpiperalt }, + { "piedpiperpp" , fa::piedpiperpp }, { "pinterest" , fa::pinterest }, { "pinterestp" , fa::pinterestp }, { "pinterestsquare" , fa::pinterestsquare }, @@ -648,6 +678,7 @@ static const FANameIcon faNameIconArray[] = { { "pluscircle" , fa::pluscircle }, { "plussquare" , fa::plussquare }, { "plussquareo" , fa::plussquareo }, + { "podcast" , fa::podcast }, { "poweroff" , fa::poweroff }, { "print" , fa::print }, { "producthunt" , fa::producthunt }, @@ -657,10 +688,12 @@ static const FANameIcon faNameIconArray[] = { { "question" , fa::question }, { "questioncircle" , fa::questioncircle }, { "questioncircleo" , fa::questioncircleo }, + { "quora" , fa::quora }, { "quoteleft" , fa::quoteleft }, { "quoteright" , fa::quoteright }, { "ra" , fa::ra }, { "random" , fa::random }, + { "ravelry" , fa::ravelry }, { "rebel" , fa::rebel }, { "recycle" , fa::recycle }, { "reddit" , fa::reddit }, @@ -674,6 +707,7 @@ static const FANameIcon faNameIconArray[] = { { "repeat" , fa::repeat }, { "reply" , fa::reply }, { "replyall" , fa::replyall }, + { "resistance" , fa::resistance }, { "retweet" , fa::retweet }, { "rmb" , fa::rmb }, { "road" , fa::road }, @@ -686,6 +720,7 @@ static const FANameIcon faNameIconArray[] = { { "rub" , fa::rub }, { "ruble" , fa::ruble }, { "rupee" , fa::rupee }, + { "s15" , fa::s15 }, { "safari" , fa::safari }, { "save" , fa::save }, { "scissors" , fa::scissors }, @@ -710,6 +745,7 @@ static const FANameIcon faNameIconArray[] = { { "shoppingbag" , fa::shoppingbag }, { "shoppingbasket" , fa::shoppingbasket }, { "shoppingcart" , fa::shoppingcart }, + { "shower" , fa::shower }, { "signin" , fa::signin }, { "signlanguage" , fa::signlanguage }, { "signout" , fa::signout }, @@ -726,6 +762,7 @@ static const FANameIcon faNameIconArray[] = { { "snapchat" , fa::snapchat }, { "snapchatghost" , fa::snapchatghost }, { "snapchatsquare" , fa::snapchatsquare }, + { "snowflakeo" , fa::snowflakeo }, { "soccerballo" , fa::soccerballo }, { "sort" , fa::sort }, { "sortalphaasc" , fa::sortalphaasc }, @@ -771,6 +808,7 @@ static const FANameIcon faNameIconArray[] = { { "subway" , fa::subway }, { "suitcase" , fa::suitcase }, { "suno" , fa::suno }, + { "superpowers" , fa::superpowers }, { "superscript" , fa::superscript }, { "support" , fa::support }, { "table" , fa::table }, @@ -780,6 +818,7 @@ static const FANameIcon faNameIconArray[] = { { "tags" , fa::tags }, { "tasks" , fa::tasks }, { "taxi" , fa::taxi }, + { "telegram" , fa::telegram }, { "television" , fa::television }, { "tencentweibo" , fa::tencentweibo }, { "terminal" , fa::terminal }, @@ -788,6 +827,18 @@ static const FANameIcon faNameIconArray[] = { { "th" , fa::th }, { "thlarge" , fa::thlarge }, { "thlist" , fa::thlist }, + { "themeisle" , fa::themeisle }, + { "thermometer" , fa::thermometer }, + { "thermometer0" , fa::thermometer0 }, + { "thermometer1" , fa::thermometer1 }, + { "thermometer2" , fa::thermometer2 }, + { "thermometer3" , fa::thermometer3 }, + { "thermometer4" , fa::thermometer4 }, + { "thermometerempty" , fa::thermometerempty }, + { "thermometerfull" , fa::thermometerfull }, + { "thermometerhalf" , fa::thermometerhalf }, + { "thermometerquarter" , fa::thermometerquarter }, + { "thermometerthreequarters" , fa::thermometerthreequarters }, { "thumbtack" , fa::thumbtack }, { "thumbsdown" , fa::thumbsdown }, { "thumbsodown" , fa::thumbsodown }, @@ -797,6 +848,8 @@ static const FANameIcon faNameIconArray[] = { { "times" , fa::times }, { "timescircle" , fa::timescircle }, { "timescircleo" , fa::timescircleo }, + { "timesrectangle" , fa::timesrectangle }, + { "timesrectangleo" , fa::timesrectangleo }, { "tint" , fa::tint }, { "toggledown" , fa::toggledown }, { "toggleleft" , fa::toggleleft }, @@ -837,11 +890,16 @@ static const FANameIcon faNameIconArray[] = { { "usb" , fa::usb }, { "usd" , fa::usd }, { "user" , fa::user }, + { "usercircle" , fa::usercircle }, + { "usercircleo" , fa::usercircleo }, { "usermd" , fa::usermd }, + { "usero" , fa::usero }, { "userplus" , fa::userplus }, { "usersecret" , fa::usersecret }, { "usertimes" , fa::usertimes }, { "users" , fa::users }, + { "vcard" , fa::vcard }, + { "vcardo" , fa::vcardo }, { "venus" , fa::venus }, { "venusdouble" , fa::venusdouble }, { "venusmars" , fa::venusmars }, @@ -866,10 +924,16 @@ static const FANameIcon faNameIconArray[] = { { "wheelchairalt" , fa::wheelchairalt }, { "wifi" , fa::wifi }, { "wikipediaw" , fa::wikipediaw }, + { "windowclose" , fa::windowclose }, + { "windowcloseo" , fa::windowcloseo }, + { "windowmaximize" , fa::windowmaximize }, + { "windowminimize" , fa::windowminimize }, + { "windowrestore" , fa::windowrestore }, { "windows" , fa::windows }, { "won" , fa::won }, { "wordpress" , fa::wordpress }, { "wpbeginner" , fa::wpbeginner }, + { "wpexplorer" , fa::wpexplorer }, { "wpforms" , fa::wpforms }, { "wrench" , fa::wrench }, { "xing" , fa::xing }, @@ -881,6 +945,7 @@ static const FANameIcon faNameIconArray[] = { { "ycsquare" , fa::ycsquare }, { "yelp" , fa::yelp }, { "yen" , fa::yen }, + { "yoast" , fa::yoast }, { "youtube" , fa::youtube }, { "youtubeplay" , fa::youtubeplay }, { "youtubesquare" , fa::youtubesquare } @@ -906,7 +971,7 @@ bool QtAwesome::initFontAwesome( ) Q_INIT_RESOURCE(QtAwesome); // load the font file - QFile res(":/fonts/fontawesome-4.6.1.ttf"); + QFile res(":/fonts/fontawesome-4.7.0.ttf"); if(!res.open(QIODevice::ReadOnly)) { qDebug() << "Font awesome font could not be loaded!"; return false; diff --git a/QtAwesome/QtAwesome.h b/QtAwesome/QtAwesome.h index 8e9cab7..3bcb0de 100644 --- a/QtAwesome/QtAwesome.h +++ b/QtAwesome/QtAwesome.h @@ -24,6 +24,10 @@ namespace fa { enum icon { fa_500px = 0xf26e, + addressbook = 0xf2b9, + addressbooko = 0xf2ba, + addresscard = 0xf2bb, + addresscardo = 0xf2bc, adjust = 0xf042, adn = 0xf170, aligncenter = 0xf037, @@ -72,11 +76,15 @@ namespace fa { backward = 0xf04a, balancescale = 0xf24e, ban = 0xf05e, + bandcamp = 0xf2d5, bank = 0xf19c, barchart = 0xf080, barcharto = 0xf080, barcode = 0xf02a, bars = 0xf0c9, + bath = 0xf2cd, + bathtub = 0xf2cd, + battery = 0xf240, battery0 = 0xf244, battery1 = 0xf243, battery2 = 0xf242, @@ -226,19 +234,25 @@ namespace fa { dotcircleo = 0xf192, download = 0xf019, dribbble = 0xf17d, + driverslicense = 0xf2c2, + driverslicenseo = 0xf2c3, dropbox = 0xf16b, drupal = 0xf1a9, edge = 0xf282, edit = 0xf044, + eercast = 0xf2da, eject = 0xf052, ellipsish = 0xf141, ellipsisv = 0xf142, empire = 0xf1d1, envelope = 0xf0e0, envelopeo = 0xf003, + envelopeopen = 0xf2b6, + envelopeopeno = 0xf2b7, envelopesquare = 0xf199, envira = 0xf299, eraser = 0xf12d, + etsy = 0xf2d7, eur = 0xf153, euro = 0xf153, exchange = 0xf0ec, @@ -252,6 +266,7 @@ namespace fa { eye = 0xf06e, eyeslash = 0xf070, eyedropper = 0xf1fb, + fa = 0xf2b4, facebook = 0xf09a, facebookf = 0xf09a, facebookofficial = 0xf230, @@ -286,6 +301,7 @@ namespace fa { fire = 0xf06d, fireextinguisher = 0xf134, firefox = 0xf269, + firstorder = 0xf2b0, flag = 0xf024, flagcheckered = 0xf11e, flago = 0xf11d, @@ -298,11 +314,13 @@ namespace fa { folderopen = 0xf07c, folderopeno = 0xf115, font = 0xf031, + fontawesome = 0xf2b4, fonticons = 0xf280, fortawesome = 0xf286, forumbee = 0xf211, forward = 0xf04e, foursquare = 0xf180, + freecodecamp = 0xf2c5, frowno = 0xf119, futbolo = 0xf1e3, gamepad = 0xf11b, @@ -329,10 +347,13 @@ namespace fa { globe = 0xf0ac, google = 0xf1a0, googleplus = 0xf0d5, + googlepluscircle = 0xf2b3, + googleplusofficial = 0xf2b3, googleplussquare = 0xf0d4, googlewallet = 0xf1ee, graduationcap = 0xf19d, gratipay = 0xf184, + grav = 0xf2d6, group = 0xf0c0, hsquare = 0xf0fd, hackernews = 0xf1d4, @@ -349,6 +370,7 @@ namespace fa { handscissorso = 0xf257, handspocko = 0xf259, handstopo = 0xf256, + handshakeo = 0xf2b5, hardofhearing = 0xf2a4, hashtag = 0xf292, hddo = 0xf0a0, @@ -372,8 +394,12 @@ namespace fa { houzz = 0xf27c, html5 = 0xf13b, icursor = 0xf246, + idbadge = 0xf2c1, + idcard = 0xf2c2, + idcardo = 0xf2c3, ils = 0xf20b, image = 0xf03e, + imdb = 0xf2d8, inbox = 0xf01c, indent = 0xf03c, industry = 0xf275, @@ -411,6 +437,7 @@ namespace fa { link = 0xf0c1, linkedin = 0xf0e1, linkedinsquare = 0xf08c, + linode = 0xf2b8, fa_linux = 0xf17c, list = 0xf03a, listalt = 0xf022, @@ -443,8 +470,10 @@ namespace fa { meanpath = 0xf20c, medium = 0xf23a, medkit = 0xf0fa, + meetup = 0xf2e0, meho = 0xf11a, mercury = 0xf223, + microchip = 0xf2db, microphone = 0xf130, microphoneslash = 0xf131, minus = 0xf068, @@ -494,8 +523,9 @@ namespace fa { photo = 0xf03e, pictureo = 0xf03e, piechart = 0xf200, - piedpiper = 0xf1a7, + piedpiper = 0xf2ae, piedpiperalt = 0xf1a8, + piedpiperpp = 0xf1a7, pinterest = 0xf0d2, pinterestp = 0xf231, pinterestsquare = 0xf0d3, @@ -508,6 +538,7 @@ namespace fa { pluscircle = 0xf055, plussquare = 0xf0fe, plussquareo = 0xf196, + podcast = 0xf2ce, poweroff = 0xf011, print = 0xf02f, producthunt = 0xf288, @@ -517,10 +548,12 @@ namespace fa { question = 0xf128, questioncircle = 0xf059, questioncircleo = 0xf29c, + quora = 0xf2c4, quoteleft = 0xf10d, quoteright = 0xf10e, ra = 0xf1d0, random = 0xf074, + ravelry = 0xf2d9, rebel = 0xf1d0, recycle = 0xf1b8, reddit = 0xf1a1, @@ -534,6 +567,7 @@ namespace fa { repeat = 0xf01e, reply = 0xf112, replyall = 0xf122, + resistance = 0xf1d0, retweet = 0xf079, rmb = 0xf157, road = 0xf018, @@ -546,6 +580,7 @@ namespace fa { rub = 0xf158, ruble = 0xf158, rupee = 0xf156, + s15 = 0xf2cd, safari = 0xf267, save = 0xf0c7, scissors = 0xf0c4, @@ -570,6 +605,7 @@ namespace fa { shoppingbag = 0xf290, shoppingbasket = 0xf291, shoppingcart = 0xf07a, + shower = 0xf2cc, signin = 0xf090, signlanguage = 0xf2a7, signout = 0xf08b, @@ -586,6 +622,7 @@ namespace fa { snapchat = 0xf2ab, snapchatghost = 0xf2ac, snapchatsquare = 0xf2ad, + snowflakeo = 0xf2dc, soccerballo = 0xf1e3, sort = 0xf0dc, sortalphaasc = 0xf15d, @@ -631,6 +668,7 @@ namespace fa { subway = 0xf239, suitcase = 0xf0f2, suno = 0xf185, + superpowers = 0xf2dd, superscript = 0xf12b, support = 0xf1cd, table = 0xf0ce, @@ -640,6 +678,7 @@ namespace fa { tags = 0xf02c, tasks = 0xf0ae, taxi = 0xf1ba, + telegram = 0xf2c6, television = 0xf26c, tencentweibo = 0xf1d5, terminal = 0xf120, @@ -648,6 +687,18 @@ namespace fa { th = 0xf00a, thlarge = 0xf009, thlist = 0xf00b, + themeisle = 0xf2b2, + thermometer = 0xf2c7, + thermometer0 = 0xf2cb, + thermometer1 = 0xf2ca, + thermometer2 = 0xf2c9, + thermometer3 = 0xf2c8, + thermometer4 = 0xf2c7, + thermometerempty = 0xf2cb, + thermometerfull = 0xf2c7, + thermometerhalf = 0xf2c9, + thermometerquarter = 0xf2ca, + thermometerthreequarters = 0xf2c8, thumbtack = 0xf08d, thumbsdown = 0xf165, thumbsodown = 0xf088, @@ -657,6 +708,8 @@ namespace fa { times = 0xf00d, timescircle = 0xf057, timescircleo = 0xf05c, + timesrectangle = 0xf2d3, + timesrectangleo = 0xf2d4, tint = 0xf043, toggledown = 0xf150, toggleleft = 0xf191, @@ -697,11 +750,16 @@ namespace fa { usb = 0xf287, usd = 0xf155, user = 0xf007, + usercircle = 0xf2bd, + usercircleo = 0xf2be, usermd = 0xf0f0, + usero = 0xf2c0, userplus = 0xf234, usersecret = 0xf21b, usertimes = 0xf235, users = 0xf0c0, + vcard = 0xf2bb, + vcardo = 0xf2bc, venus = 0xf221, venusdouble = 0xf226, venusmars = 0xf228, @@ -726,10 +784,16 @@ namespace fa { wheelchairalt = 0xf29b, wifi = 0xf1eb, wikipediaw = 0xf266, + windowclose = 0xf2d3, + windowcloseo = 0xf2d4, + windowmaximize = 0xf2d0, + windowminimize = 0xf2d1, + windowrestore = 0xf2d2, windows = 0xf17a, won = 0xf159, wordpress = 0xf19a, wpbeginner = 0xf297, + wpexplorer = 0xf2de, wpforms = 0xf298, wrench = 0xf0ad, xing = 0xf168, @@ -741,6 +805,7 @@ namespace fa { ycsquare = 0xf1d4, yelp = 0xf1e9, yen = 0xf157, + yoast = 0xf2b1, youtube = 0xf167, youtubeplay = 0xf16a, youtubesquare = 0xf166 diff --git a/QtAwesome/QtAwesome.qrc b/QtAwesome/QtAwesome.qrc index 09eb613..db80a8e 100644 --- a/QtAwesome/QtAwesome.qrc +++ b/QtAwesome/QtAwesome.qrc @@ -1,5 +1,5 @@ - fonts/fontawesome-4.6.1.ttf + fonts/fontawesome-4.7.0.ttf diff --git a/QtAwesome/fonts/fontawesome-4.6.1.ttf b/QtAwesome/fonts/fontawesome-4.7.0.ttf similarity index 73% rename from QtAwesome/fonts/fontawesome-4.6.1.ttf rename to QtAwesome/fonts/fontawesome-4.7.0.ttf index 86784df..35acda2 100644 Binary files a/QtAwesome/fonts/fontawesome-4.6.1.ttf and b/QtAwesome/fonts/fontawesome-4.7.0.ttf differ diff --git a/README.md b/README.md index 8ff5270..e1e6688 100644 --- a/README.md +++ b/README.md @@ -11,10 +11,10 @@ NOTE: Though the name is QtAwesome and currently it's very Font Awesome based, y The class can also be used to manage your own dynamic code-drawn icons, by adding named icon-painters. -Updated to FontAwesome 4.6.1 +Updated to FontAwesome 4.7.0 ---------------------------- -This library has been updated to Font Awesome version **4.6.1**. +This library has been updated to Font Awesome version **4.7.0**. * In the 4.5.0 version the _linux name has been changed to fa_linux. (Makes the naming of conflicting/invalid names more consistent, like fa_try and fa_500px) * You can find the previous FontAwesome 4 c++11 library in the [c++11 branch](https://github.com/gamecreature/QtAwesome/tree/c++11).