diff --git a/QtAwesome/QtAwesome.cpp b/QtAwesome/QtAwesome.cpp index df2bd4c..aeb1d90 100644 --- a/QtAwesome/QtAwesome.cpp +++ b/QtAwesome/QtAwesome.cpp @@ -177,7 +177,7 @@ bool QtAwesome::initFontAwesome( ) Q_INIT_RESOURCE(QtAwesome); // load the font file - QFile res(":/fonts/fontawesome-4.4.0.ttf"); + QFile res(":/fonts/fontawesome-4.5.0.ttf"); if(!res.open(QIODevice::ReadOnly)) { qDebug() << "Font awesome font could not be loaded!"; return false; @@ -275,6 +275,8 @@ bool QtAwesome::initFontAwesome( ) m.insert("bitbucketsquare", fa::bitbucketsquare ); m.insert("bitcoin", fa::bitcoin ); m.insert("blacktie", fa::blacktie ); + m.insert("bluetooth", fa::bluetooth ); + m.insert("bluetoothb", fa::bluetoothb ); m.insert("bold", fa::bold ); m.insert("bolt", fa::bolt ); m.insert("bomb", fa::bomb ); @@ -353,6 +355,7 @@ bool QtAwesome::initFontAwesome( ) m.insert("code", fa::code ); m.insert("codefork", fa::codefork ); m.insert("codepen", fa::codepen ); + m.insert("codiepie", fa::codiepie ); m.insert("coffee", fa::coffee ); m.insert("cog", fa::cog ); m.insert("cogs", fa::cogs ); @@ -371,6 +374,7 @@ bool QtAwesome::initFontAwesome( ) m.insert("copyright", fa::copyright ); m.insert("creativecommons", fa::creativecommons ); m.insert("creditcard", fa::creditcard ); + m.insert("creditcardalt", fa::creditcardalt ); m.insert("crop", fa::crop ); m.insert("crosshairs", fa::crosshairs ); m.insert("css3", fa::css3 ); @@ -393,6 +397,7 @@ bool QtAwesome::initFontAwesome( ) m.insert("dribbble", fa::dribbble ); m.insert("dropbox", fa::dropbox ); m.insert("drupal", fa::drupal ); + m.insert("edge", fa::edge ); m.insert("edit", fa::edit ); m.insert("eject", fa::eject ); m.insert("ellipsish", fa::ellipsish ); @@ -462,6 +467,7 @@ bool QtAwesome::initFontAwesome( ) m.insert("folderopeno", fa::folderopeno ); m.insert("font", fa::font ); m.insert("fonticons", fa::fonticons ); + m.insert("fortawesome", fa::fortawesome ); m.insert("forumbee", fa::forumbee ); m.insert("forward", fa::forward ); m.insert("foursquare", fa::foursquare ); @@ -508,6 +514,7 @@ bool QtAwesome::initFontAwesome( ) m.insert("handscissorso", fa::handscissorso ); m.insert("handspocko", fa::handspocko ); m.insert("handstopo", fa::handstopo ); + m.insert("hashtag", fa::hashtag ); m.insert("hddo", fa::hddo ); m.insert("header", fa::header ); m.insert("headphones", fa::headphones ); @@ -568,7 +575,7 @@ bool QtAwesome::initFontAwesome( ) m.insert("link", fa::link ); m.insert("linkedin", fa::linkedin ); m.insert("linkedinsquare", fa::linkedinsquare ); - m.insert("linux", fa::_linux ); + m.insert("fa_linux", fa::fa_linux ); m.insert("list", fa::list ); m.insert("listalt", fa::listalt ); m.insert("listol", fa::listol ); @@ -607,8 +614,10 @@ bool QtAwesome::initFontAwesome( ) m.insert("minuscircle", fa::minuscircle ); m.insert("minussquare", fa::minussquare ); m.insert("minussquareo", fa::minussquareo ); + m.insert("mixcloud", fa::mixcloud ); m.insert("mobile", fa::mobile ); m.insert("mobilephone", fa::mobilephone ); + m.insert("modx", fa::modx ); m.insert("money", fa::money ); m.insert("moono", fa::moono ); m.insert("mortarboard", fa::mortarboard ); @@ -635,11 +644,14 @@ bool QtAwesome::initFontAwesome( ) m.insert("paragraph", fa::paragraph ); m.insert("paste", fa::paste ); m.insert("pause", fa::pause ); + m.insert("pausecircle", fa::pausecircle ); + m.insert("pausecircleo", fa::pausecircleo ); m.insert("paw", fa::paw ); m.insert("paypal", fa::paypal ); m.insert("pencil", fa::pencil ); m.insert("pencilsquare", fa::pencilsquare ); m.insert("pencilsquareo", fa::pencilsquareo ); + m.insert("percent", fa::percent ); m.insert("phone", fa::phone ); m.insert("phonesquare", fa::phonesquare ); m.insert("photo", fa::photo ); @@ -661,6 +673,7 @@ bool QtAwesome::initFontAwesome( ) m.insert("plussquareo", fa::plussquareo ); m.insert("poweroff", fa::poweroff ); m.insert("print", fa::print ); + m.insert("producthunt", fa::producthunt ); m.insert("puzzlepiece", fa::puzzlepiece ); m.insert("qq", fa::qq ); m.insert("qrcode", fa::qrcode ); @@ -673,6 +686,7 @@ bool QtAwesome::initFontAwesome( ) m.insert("rebel", fa::rebel ); m.insert("recycle", fa::recycle ); m.insert("reddit", fa::reddit ); + m.insert("redditalien", fa::redditalien ); m.insert("redditsquare", fa::redditsquare ); m.insert("refresh", fa::refresh ); m.insert("registered", fa::registered ); @@ -697,6 +711,7 @@ bool QtAwesome::initFontAwesome( ) m.insert("safari", fa::safari ); m.insert("save", fa::save ); m.insert("scissors", fa::scissors ); + m.insert("scribd", fa::scribd ); m.insert("search", fa::search ); m.insert("searchminus", fa::searchminus ); m.insert("searchplus", fa::searchplus ); @@ -714,6 +729,8 @@ bool QtAwesome::initFontAwesome( ) m.insert("shield", fa::shield ); m.insert("ship", fa::ship ); m.insert("shirtsinbulk", fa::shirtsinbulk ); + m.insert("shoppingbag", fa::shoppingbag ); + m.insert("shoppingbasket", fa::shoppingbasket ); m.insert("shoppingcart", fa::shoppingcart ); m.insert("signin", fa::signin ); m.insert("signout", fa::signout ); @@ -761,6 +778,8 @@ bool QtAwesome::initFontAwesome( ) m.insert("stickynote", fa::stickynote ); m.insert("stickynoteo", fa::stickynoteo ); m.insert("stop", fa::stop ); + m.insert("stopcircle", fa::stopcircle ); + m.insert("stopcircleo", fa::stopcircleo ); m.insert("streetview", fa::streetview ); m.insert("strikethrough", fa::strikethrough ); m.insert("stumbleupon", fa::stumbleupon ); @@ -831,6 +850,7 @@ bool QtAwesome::initFontAwesome( ) m.insert("unlockalt", fa::unlockalt ); m.insert("unsorted", fa::unsorted ); m.insert("upload", fa::upload ); + m.insert("usb", fa::usb ); m.insert("usd", fa::usd ); m.insert("user", fa::user ); m.insert("usermd", fa::usermd ); diff --git a/QtAwesome/QtAwesome.h b/QtAwesome/QtAwesome.h index 279870b..9330a01 100644 --- a/QtAwesome/QtAwesome.h +++ b/QtAwesome/QtAwesome.h @@ -98,6 +98,8 @@ namespace fa { bitbucketsquare = 0xf172, bitcoin = 0xf15a, blacktie = 0xf27e, + bluetooth = 0xf293, + bluetoothb = 0xf294, bold = 0xf032, bolt = 0xf0e7, bomb = 0xf1e2, @@ -176,6 +178,7 @@ namespace fa { code = 0xf121, codefork = 0xf126, codepen = 0xf1cb, + codiepie = 0xf284, coffee = 0xf0f4, cog = 0xf013, cogs = 0xf085, @@ -194,6 +197,7 @@ namespace fa { copyright = 0xf1f9, creativecommons = 0xf25e, creditcard = 0xf09d, + creditcardalt = 0xf283, crop = 0xf125, crosshairs = 0xf05b, css3 = 0xf13c, @@ -216,6 +220,7 @@ namespace fa { dribbble = 0xf17d, dropbox = 0xf16b, drupal = 0xf1a9, + edge = 0xf282, edit = 0xf044, eject = 0xf052, ellipsish = 0xf141, @@ -285,6 +290,7 @@ namespace fa { folderopeno = 0xf115, font = 0xf031, fonticons = 0xf280, + fortawesome = 0xf286, forumbee = 0xf211, forward = 0xf04e, foursquare = 0xf180, @@ -331,6 +337,7 @@ namespace fa { handscissorso = 0xf257, handspocko = 0xf259, handstopo = 0xf256, + hashtag = 0xf292, hddo = 0xf0a0, header = 0xf1dc, headphones = 0xf025, @@ -391,7 +398,7 @@ namespace fa { link = 0xf0c1, linkedin = 0xf0e1, linkedinsquare = 0xf08c, - _linux = 0xf17c, + fa_linux = 0xf17c, list = 0xf03a, listalt = 0xf022, listol = 0xf0cb, @@ -430,8 +437,10 @@ namespace fa { minuscircle = 0xf056, minussquare = 0xf146, minussquareo = 0xf147, + mixcloud = 0xf289, mobile = 0xf10b, mobilephone = 0xf10b, + modx = 0xf285, money = 0xf0d6, moono = 0xf186, mortarboard = 0xf19d, @@ -458,11 +467,14 @@ namespace fa { paragraph = 0xf1dd, paste = 0xf0ea, pause = 0xf04c, + pausecircle = 0xf28b, + pausecircleo = 0xf28c, paw = 0xf1b0, paypal = 0xf1ed, pencil = 0xf040, pencilsquare = 0xf14b, pencilsquareo = 0xf044, + percent = 0xf295, phone = 0xf095, phonesquare = 0xf098, photo = 0xf03e, @@ -484,6 +496,7 @@ namespace fa { plussquareo = 0xf196, poweroff = 0xf011, print = 0xf02f, + producthunt = 0xf288, puzzlepiece = 0xf12e, qq = 0xf1d6, qrcode = 0xf029, @@ -496,6 +509,7 @@ namespace fa { rebel = 0xf1d0, recycle = 0xf1b8, reddit = 0xf1a1, + redditalien = 0xf281, redditsquare = 0xf1a2, refresh = 0xf021, registered = 0xf25d, @@ -520,6 +534,7 @@ namespace fa { safari = 0xf267, save = 0xf0c7, scissors = 0xf0c4, + scribd = 0xf28a, search = 0xf002, searchminus = 0xf010, searchplus = 0xf00e, @@ -537,6 +552,8 @@ namespace fa { shield = 0xf132, ship = 0xf21a, shirtsinbulk = 0xf214, + shoppingbag = 0xf290, + shoppingbasket = 0xf291, shoppingcart = 0xf07a, signin = 0xf090, signout = 0xf08b, @@ -584,6 +601,8 @@ namespace fa { stickynote = 0xf249, stickynoteo = 0xf24a, stop = 0xf04d, + stopcircle = 0xf28d, + stopcircleo = 0xf28e, streetview = 0xf21d, strikethrough = 0xf0cc, stumbleupon = 0xf1a4, @@ -654,6 +673,7 @@ namespace fa { unlockalt = 0xf13e, unsorted = 0xf0dc, upload = 0xf093, + usb = 0xf287, usd = 0xf155, user = 0xf007, usermd = 0xf0f0, diff --git a/QtAwesome/QtAwesome.qrc b/QtAwesome/QtAwesome.qrc index 9c1536d..a00b165 100644 --- a/QtAwesome/QtAwesome.qrc +++ b/QtAwesome/QtAwesome.qrc @@ -1,5 +1,5 @@ - fonts/fontawesome-4.4.0.ttf + fonts/fontawesome-4.5.0.ttf diff --git a/QtAwesome/fonts/fontawesome-4.4.0.ttf b/QtAwesome/fonts/fontawesome-4.5.0.ttf similarity index 85% rename from QtAwesome/fonts/fontawesome-4.4.0.ttf rename to QtAwesome/fonts/fontawesome-4.5.0.ttf index d7994e1..26dea79 100644 Binary files a/QtAwesome/fonts/fontawesome-4.4.0.ttf and b/QtAwesome/fonts/fontawesome-4.5.0.ttf differ diff --git a/README.md b/README.md index 319a5b1..5744b47 100644 --- a/README.md +++ b/README.md @@ -11,12 +11,12 @@ 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 ------------------------- +Updated to FontAwesome 4.5.0 +---------------------------- -This library has been updated to Font Awesome version 4. +This library has been updated to Font Awesome version **4.5.0**. -The current Font Awesome version is **4.4.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). * You can find the previous FontAwesome 3 library in the [fontawesome-3 branch](https://github.com/gamecreature/QtAwesome/tree/fontawesome-3).