mirrors/QtAwesome
1
0
Fork 0
mirror of https://github.com/gamecreature/QtAwesome.git synced 2024-11-15 13:35:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade to font-awesome 4.2.0

Browse Source
This commit is contained in:
A Random Coder 2014-12-01 22:20:29 -05:00
parent 771ff741b7
commit eedb9d7a99
6 changed files with 98 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
QtAwesome/QtAwesome.cpp
View File

@ -154,7 +154,7 @@ void QtAwesome::init(const QString& fontname)
bool QtAwesome::initFontAwesome( )
{
static int fontAwesomeFontId = -1;
// only load font-awesome once
if( fontAwesomeFontId < 0 ) {
@ -167,7 +167,7 @@ bool QtAwesome::initFontAwesome( )
Q_INIT_RESOURCE(QtAwesome);
// load the font file
QFile res(":/fonts/fontawesome-4.1.0.ttf");
QFile res(":/fonts/fontawesome-4.2.0.ttf");
if(!res.open(QIODevice::ReadOnly)) {
qDebug() << "Font awesome font could not be loaded!";
return false;
@ -199,6 +199,7 @@ bool QtAwesome::initFontAwesome( )
m.insert("ambulance", fa::ambulance);
m.insert("anchor", fa::anchor);
m.insert("androidicon", fa::androidicon);
m.insert("angellist", fa::angellist);
m.insert("angledoubledown", fa::angledoubledown);
m.insert("angledoubleleft", fa::angledoubleleft);
m.insert("angledoubleright", fa::angledoubleright);
@ -209,6 +210,7 @@ bool QtAwesome::initFontAwesome( )
m.insert("angleup", fa::angleup);
m.insert("apple", fa::apple);
m.insert("archive", fa::archive);
m.insert("areachart", fa::areachart);
m.insert("arrowcircledown", fa::arrowcircledown);
m.insert("arrowcircleleft", fa::arrowcircleleft);
m.insert("arrowcircleodown", fa::arrowcircleodown);
@ -226,10 +228,12 @@ bool QtAwesome::initFontAwesome( )
m.insert("arrowsh", fa::arrowsh);
m.insert("arrowsv", fa::arrowsv);
m.insert("asterisk", fa::asterisk);
m.insert("at", fa::at);
m.insert("automobile", fa::automobile);
m.insert("backward", fa::backward);
m.insert("ban", fa::ban);
m.insert("bank", fa::bank);
m.insert("barchart", fa::barchart);
m.insert("barcharto", fa::barcharto);
m.insert("barcode", fa::barcode);
m.insert("bars", fa::bars);
@ -238,6 +242,11 @@ bool QtAwesome::initFontAwesome( )
m.insert("behancesquare", fa::behancesquare);
m.insert("bell", fa::bell);
m.insert("bello", fa::bello);
m.insert("bellslash", fa::bellslash);
m.insert("bellslasho", fa::bellslasho);
m.insert("bicycle", fa::bicycle);
m.insert("binoculars", fa::binoculars);
m.insert("birthdaycake", fa::birthdaycake);
m.insert("bitbucket", fa::bitbucket);
m.insert("bitbucketsquare", fa::bitbucketsquare);
m.insert("bitcoin", fa::bitcoin);
@ -254,7 +263,9 @@ bool QtAwesome::initFontAwesome( )
m.insert("buildingo", fa::buildingo);
m.insert("bullhorn", fa::bullhorn);
m.insert("bullseye", fa::bullseye);
m.insert("bus", fa::bus);
m.insert("cab", fa::cab);
m.insert("calculator", fa::calculator);
m.insert("calendar", fa::calendar);
m.insert("calendaro", fa::calendaro);
m.insert("camera", fa::camera);
@ -268,6 +279,13 @@ bool QtAwesome::initFontAwesome( )
m.insert("caretsquareoright", fa::caretsquareoright);
m.insert("caretsquareoup", fa::caretsquareoup);
m.insert("caretup", fa::caretup);
m.insert("cc", fa::cc);
m.insert("ccamex", fa::ccamex);
m.insert("ccdiscover", fa::ccdiscover);
m.insert("ccmastercard", fa::ccmastercard);
m.insert("ccpaypal", fa::ccpaypal);
m.insert("ccstripe", fa::ccstripe);
m.insert("ccvisa", fa::ccvisa);
m.insert("certificate", fa::certificate);
m.insert("chain", fa::chain);
m.insert("chainbroken", fa::chainbroken);
@ -291,6 +309,7 @@ bool QtAwesome::initFontAwesome( )
m.insert("circlethin", fa::circlethin);
m.insert("clipboard", fa::clipboard);
m.insert("clocko", fa::clocko);
m.insert("close", fa::close);
m.insert("cloud", fa::cloud);
m.insert("clouddownload", fa::clouddownload);
m.insert("cloudupload", fa::cloudupload);
@ -309,6 +328,7 @@ bool QtAwesome::initFontAwesome( )
m.insert("compass", fa::compass);
m.insert("compress", fa::compress);
m.insert("copy", fa::copy);
m.insert("copyright", fa::copyright);
m.insert("creditcard", fa::creditcard);
m.insert("crop", fa::crop);
m.insert("crosshairs", fa::crosshairs);
@ -350,6 +370,7 @@ bool QtAwesome::initFontAwesome( )
m.insert("externallinksquare", fa::externallinksquare);
m.insert("eye", fa::eye);
m.insert("eyeslash", fa::eyeslash);
m.insert("eyedropper", fa::eyedropper);
m.insert("facebook", fa::facebook);
m.insert("facebooksquare", fa::facebooksquare);
m.insert("fastbackward", fa::fastbackward);
@ -395,6 +416,7 @@ bool QtAwesome::initFontAwesome( )
m.insert("forward", fa::forward);
m.insert("foursquare", fa::foursquare);
m.insert("frowno", fa::frowno);
m.insert("futbolo", fa::futbolo);
m.insert("gamepad", fa::gamepad);
m.insert("gavel", fa::gavel);
m.insert("gbp", fa::gbp);
@ -413,6 +435,7 @@ bool QtAwesome::initFontAwesome( )
m.insert("google", fa::google);
m.insert("googleplus", fa::googleplus);
m.insert("googleplussquare", fa::googleplussquare);
m.insert("googlewallet", fa::googlewallet);
m.insert("graduationcap", fa::graduationcap);
m.insert("group", fa::group);
m.insert("hsquare", fa::hsquare);
@ -430,6 +453,7 @@ bool QtAwesome::initFontAwesome( )
m.insert("home", fa::home);
m.insert("hospitalo", fa::hospitalo);
m.insert("html5", fa::html5);
m.insert("ils", fa::ils);
m.insert("image", fa::image);
m.insert("inbox", fa::inbox);
m.insert("indent", fa::indent);
@ -438,6 +462,7 @@ bool QtAwesome::initFontAwesome( )
m.insert("inr", fa::inr);
m.insert("instagram", fa::instagram);
m.insert("institution", fa::institution);
m.insert("ioxhost", fa::ioxhost);
m.insert("italic", fa::italic);
m.insert("joomla", fa::joomla);
m.insert("jpy", fa::jpy);
@ -447,15 +472,19 @@ bool QtAwesome::initFontAwesome( )
m.insert("krw", fa::krw);
m.insert("language", fa::language);
m.insert("laptop", fa::laptop);
m.insert("lastfm", fa::lastfm);
m.insert("lastfmsquare", fa::lastfmsquare);
m.insert("leaf", fa::leaf);
m.insert("legal", fa::legal);
m.insert("lemono", fa::lemono);
m.insert("leveldown", fa::leveldown);
m.insert("levelup", fa::levelup);
m.insert("lifebouy", fa::lifebouy);
m.insert("lifebuoy", fa::lifebuoy);
m.insert("lifering", fa::lifering);
m.insert("lifesaver", fa::lifesaver);
m.insert("lightbulbo", fa::lightbulbo);
m.insert("linechart", fa::linechart);
m.insert("link", fa::link);
m.insert("linkedin", fa::linkedin);
m.insert("linkedinsquare", fa::linkedinsquare);
@ -478,6 +507,7 @@ bool QtAwesome::initFontAwesome( )
m.insert("male", fa::male);
m.insert("mapmarker", fa::mapmarker);
m.insert("maxcdn", fa::maxcdn);
m.insert("meanpath", fa::meanpath);
m.insert("medkit", fa::medkit);
m.insert("meho", fa::meho);
m.insert("microphone", fa::microphone);
@ -493,9 +523,11 @@ bool QtAwesome::initFontAwesome( )
m.insert("mortarboard", fa::mortarboard);
m.insert("music", fa::music);
m.insert("navicon", fa::navicon);
m.insert("newspapero", fa::newspapero);
m.insert("openid", fa::openid);
m.insert("outdent", fa::outdent);
m.insert("pagelines", fa::pagelines);
m.insert("paintbrush", fa::paintbrush);
m.insert("paperplane", fa::paperplane);
m.insert("paperplaneo", fa::paperplaneo);
m.insert("paperclip", fa::paperclip);
@ -503,6 +535,7 @@ bool QtAwesome::initFontAwesome( )
m.insert("paste", fa::paste);
m.insert("pause", fa::pause);
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);
@ -510,6 +543,7 @@ bool QtAwesome::initFontAwesome( )
m.insert("phonesquare", fa::phonesquare);
m.insert("photo", fa::photo);
m.insert("pictureo", fa::pictureo);
m.insert("piechart", fa::piechart);
m.insert("piedpiper", fa::piedpiper);
m.insert("piedpiperalt", fa::piedpiperalt);
m.insert("piedpipersquare", fa::piedpipersquare);
@ -519,6 +553,7 @@ bool QtAwesome::initFontAwesome( )
m.insert("play", fa::play);
m.insert("playcircle", fa::playcircle);
m.insert("playcircleo", fa::playcircleo);
m.insert("plug", fa::plug);
m.insert("plus", fa::plus);
m.insert("pluscircle", fa::pluscircle);
m.insert("plussquare", fa::plussquare);
@ -539,6 +574,7 @@ bool QtAwesome::initFontAwesome( )
m.insert("reddit", fa::reddit);
m.insert("redditsquare", fa::redditsquare);
m.insert("refresh", fa::refresh);
m.insert("remove", fa::remove);
m.insert("renren", fa::renren);
m.insert("reorder", fa::reorder);
m.insert("repeat", fa::repeat);
@ -568,6 +604,8 @@ bool QtAwesome::initFontAwesome( )
m.insert("sharealtsquare", fa::sharealtsquare);
m.insert("sharesquare", fa::sharesquare);
m.insert("sharesquareo", fa::sharesquareo);
m.insert("shekel", fa::shekel);
m.insert("sheqel", fa::sheqel);
m.insert("shield", fa::shield);
m.insert("shoppingcart", fa::shoppingcart);
m.insert("signin", fa::signin);
@ -577,7 +615,9 @@ bool QtAwesome::initFontAwesome( )
m.insert("skype", fa::skype);
m.insert("slack", fa::slack);
m.insert("sliders", fa::sliders);
m.insert("slideshare", fa::slideshare);
m.insert("smileo", fa::smileo);
m.insert("soccerballo", fa::soccerballo);
m.insert("sort", fa::sort);
m.insert("sortalphaasc", fa::sortalphaasc);
m.insert("sortalphadesc", fa::sortalphadesc);
@ -644,16 +684,21 @@ bool QtAwesome::initFontAwesome( )
m.insert("tint", fa::tint);
m.insert("toggledown", fa::toggledown);
m.insert("toggleleft", fa::toggleleft);
m.insert("toggleoff", fa::toggleoff);
m.insert("toggleon", fa::toggleon);
m.insert("toggleright", fa::toggleright);
m.insert("toggleup", fa::toggleup);
m.insert("trash", fa::trash);
m.insert("trasho", fa::trasho);
m.insert("tree", fa::tree);
m.insert("trello", fa::trello);
m.insert("trophy", fa::trophy);
m.insert("truck", fa::truck);
m.insert("tty", fa::tty);
m.insert("tumblr", fa::tumblr);
m.insert("tumblrsquare", fa::tumblrsquare);
m.insert("turkishlira", fa::turkishlira);
m.insert("twitch", fa::twitch);
m.insert("twitter", fa::twitter);
m.insert("twittersquare", fa::twittersquare);
m.insert("umbrella", fa::umbrella);
@ -681,6 +726,7 @@ bool QtAwesome::initFontAwesome( )
m.insert("weibo", fa::weibo);
m.insert("weixin", fa::weixin);
m.insert("wheelchair", fa::wheelchair);
m.insert("wifi", fa::wifi);
m.insert("windowsicon", fa::windowsicon);
m.insert("won", fa::won);
m.insert("wordpress", fa::wordpress);
@ -688,6 +734,7 @@ bool QtAwesome::initFontAwesome( )
m.insert("xing", fa::xing);
m.insert("xingsquare", fa::xingsquare);
m.insert("yahoo", fa::yahoo);
m.insert("yelp", fa::yelp);
m.insert("yen", fa::yen);
m.insert("youtube", fa::youtube);
m.insert("youtubeplay", fa::youtubeplay);

47
QtAwesome/QtAwesome.h
View File

@ -27,6 +27,7 @@ enum class fa {
ambulance = 0xf0f9,
anchor = 0xf13d,
androidicon = 0xf17b,
angellist = 0xf209,
angledoubledown = 0xf103,
angledoubleleft = 0xf100,
angledoubleright = 0xf101,
@ -37,6 +38,7 @@ enum class fa {
angleup = 0xf106,
apple = 0xf179,
archive = 0xf187,
areachart = 0xf1fe,
arrowcircledown = 0xf0ab,
arrowcircleleft = 0xf0a8,
arrowcircleodown = 0xf01a,
@ -54,10 +56,12 @@ enum class fa {
arrowsh = 0xf07e,
arrowsv = 0xf07d,
asterisk = 0xf069,
at = 0xf1fa,
automobile = 0xf1b9,
backward = 0xf04a,
ban = 0xf05e,
bank = 0xf19c,
barchart = 0xf080,
barcharto = 0xf080,
barcode = 0xf02a,
bars = 0xf0c9,
@ -66,6 +70,11 @@ enum class fa {
behancesquare = 0xf1b5,
bell = 0xf0f3,
bello = 0xf0a2,
bellslash = 0xf1f6,
bellslasho = 0xf1f7,
bicycle = 0xf206,
binoculars = 0xf1e5,
birthdaycake = 0xf1fd,
bitbucket = 0xf171,
bitbucketsquare = 0xf172,
bitcoin = 0xf15a,
@ -82,7 +91,9 @@ enum class fa {
buildingo = 0xf0f7,
bullhorn = 0xf0a1,
bullseye = 0xf140,
bus = 0xf207,
cab = 0xf1ba,
calculator = 0xf1ec,
calendar = 0xf073,
calendaro = 0xf133,
camera = 0xf030,
@ -96,6 +107,13 @@ enum class fa {
caretsquareoright = 0xf152,
caretsquareoup = 0xf151,
caretup = 0xf0d8,
cc = 0xf20a,
ccamex = 0xf1f3,
ccdiscover = 0xf1f2,
ccmastercard = 0xf1f1,
ccpaypal = 0xf1f4,
ccstripe = 0xf1f5,
ccvisa = 0xf1f0,
certificate = 0xf0a3,
chain = 0xf0c1,
chainbroken = 0xf127,
@ -119,6 +137,7 @@ enum class fa {
circlethin = 0xf1db,
clipboard = 0xf0ea,
clocko = 0xf017,
close = 0xf00d,
cloud = 0xf0c2,
clouddownload = 0xf0ed,
cloudupload = 0xf0ee,
@ -137,6 +156,7 @@ enum class fa {
compass = 0xf14e,
compress = 0xf066,
copy = 0xf0c5,
copyright = 0xf1f9,
creditcard = 0xf09d,
crop = 0xf125,
crosshairs = 0xf05b,
@ -178,6 +198,7 @@ enum class fa {
externallinksquare = 0xf14c,
eye = 0xf06e,
eyeslash = 0xf070,
eyedropper = 0xf1fb,
facebook = 0xf09a,
facebooksquare = 0xf082,
fastbackward = 0xf049,
@ -223,6 +244,7 @@ enum class fa {
forward = 0xf04e,
foursquare = 0xf180,
frowno = 0xf119,
futbolo = 0xf1e3,
gamepad = 0xf11b,
gavel = 0xf0e3,
gbp = 0xf154,
@ -241,6 +263,7 @@ enum class fa {
google = 0xf1a0,
googleplus = 0xf0d5,
googleplussquare = 0xf0d4,
googlewallet = 0xf1ee,
graduationcap = 0xf19d,
group = 0xf0c0,
hsquare = 0xf0fd,
@ -258,6 +281,7 @@ enum class fa {
home = 0xf015,
hospitalo = 0xf0f8,
html5 = 0xf13b,
ils = 0xf20b,
image = 0xf03e,
inbox = 0xf01c,
indent = 0xf03c,
@ -266,6 +290,7 @@ enum class fa {
inr = 0xf156,
instagram = 0xf16d,
institution = 0xf19c,
ioxhost = 0xf208,
italic = 0xf033,
joomla = 0xf1aa,
jpy = 0xf157,
@ -275,15 +300,19 @@ enum class fa {
krw = 0xf159,
language = 0xf1ab,
laptop = 0xf109,
lastfm = 0xf202,
lastfmsquare = 0xf203,
leaf = 0xf06c,
legal = 0xf0e3,
lemono = 0xf094,
leveldown = 0xf149,
levelup = 0xf148,
lifebouy = 0xf1cd,
lifebuoy = 0xf1cd,
lifering = 0xf1cd,
lifesaver = 0xf1cd,
lightbulbo = 0xf0eb,
linechart = 0xf201,
link = 0xf0c1,
linkedin = 0xf0e1,
linkedinsquare = 0xf08c,
@ -306,6 +335,7 @@ enum class fa {
male = 0xf183,
mapmarker = 0xf041,
maxcdn = 0xf136,
meanpath = 0xf20c,
medkit = 0xf0fa,
meho = 0xf11a,
microphone = 0xf130,
@ -321,9 +351,11 @@ enum class fa {
mortarboard = 0xf19d,
music = 0xf001,
navicon = 0xf0c9,
newspapero = 0xf1ea,
openid = 0xf19b,
outdent = 0xf03b,
pagelines = 0xf18c,
paintbrush = 0xf1fc,
paperplane = 0xf1d8,
paperplaneo = 0xf1d9,
paperclip = 0xf0c6,
@ -331,6 +363,7 @@ enum class fa {
paste = 0xf0ea,
pause = 0xf04c,
paw = 0xf1b0,
paypal = 0xf1ed,
pencil = 0xf040,
pencilsquare = 0xf14b,
pencilsquareo = 0xf044,
@ -338,6 +371,7 @@ enum class fa {
phonesquare = 0xf098,
photo = 0xf03e,
pictureo = 0xf03e,
piechart = 0xf200,
piedpiper = 0xf1a7,
piedpiperalt = 0xf1a8,
piedpipersquare = 0xf1a7,
@ -347,6 +381,7 @@ enum class fa {
play = 0xf04b,
playcircle = 0xf144,
playcircleo = 0xf01d,
plug = 0xf1e6,
plus = 0xf067,
pluscircle = 0xf055,
plussquare = 0xf0fe,
@ -367,6 +402,7 @@ enum class fa {
reddit = 0xf1a1,
redditsquare = 0xf1a2,
refresh = 0xf021,
remove = 0xf00d,
renren = 0xf18b,
reorder = 0xf0c9,
repeat = 0xf01e,
@ -396,6 +432,8 @@ enum class fa {
sharealtsquare = 0xf1e1,
sharesquare = 0xf14d,
sharesquareo = 0xf045,
shekel = 0xf20b,
sheqel = 0xf20b,
shield = 0xf132,
shoppingcart = 0xf07a,
signin = 0xf090,
@ -405,7 +443,9 @@ enum class fa {
skype = 0xf17e,
slack = 0xf198,
sliders = 0xf1de,
slideshare = 0xf1e7,
smileo = 0xf118,
soccerballo = 0xf1e3,
sort = 0xf0dc,
sortalphaasc = 0xf15d,
sortalphadesc = 0xf15e,
@ -472,16 +512,21 @@ enum class fa {
tint = 0xf043,
toggledown = 0xf150,
toggleleft = 0xf191,
toggleoff = 0xf204,
toggleon = 0xf205,
toggleright = 0xf152,
toggleup = 0xf151,
trash = 0xf1f8,
trasho = 0xf014,
tree = 0xf1bb,
trello = 0xf181,
trophy = 0xf091,
truck = 0xf0d1,
tty = 0xf1e4,
tumblr = 0xf173,
tumblrsquare = 0xf174,
turkishlira = 0xf195,
twitch = 0xf1e8,
twitter = 0xf099,
twittersquare = 0xf081,
umbrella = 0xf0e9,
@ -509,6 +554,7 @@ enum class fa {
weibo = 0xf18a,
weixin = 0xf1d7,
wheelchair = 0xf193,
wifi = 0xf1eb,
windowsicon = 0xf17a,
won = 0xf159,
wordpress = 0xf19a,
@ -516,6 +562,7 @@ enum class fa {
xing = 0xf168,
xingsquare = 0xf169,
yahoo = 0xf19e,
yelp = 0xf1e9,
yen = 0xf157,
youtube = 0xf167,
youtubeplay = 0xf16a,

2
QtAwesome/QtAwesome.qrc
View File

@ -1,5 +1,5 @@
<RCC>
<qresource prefix="/">
<file>fonts/fontawesome-4.1.0.ttf</file>
<file>fonts/fontawesome-4.2.0.ttf</file>
</qresource>
</RCC>

BIN
QtAwesome/fonts/fontawesome-4.1.0.ttf
View File

Binary file not shown.

BIN
QtAwesome/fonts/fontawesome-4.2.0.ttf Normal file
View File

Binary file not shown.

2
README.md
View File

@ -17,7 +17,7 @@ Updated to FontAwesome 4 and c++11
This library has been updated to Font Awesome version 4 and now
requires c++11 specific features.
The current Font Awesome version is **4.1.0**.
The current Font Awesome version is **4.2.0**.
You can find the previous FontAwesome 3 library in the [fontawesome-3 branch](https://github.com/gamecreature/QtAwesome/tree/fontawesome-3).
This branch is c++11 free!