diff --git a/QtAwesome/QtAwesome.cpp b/QtAwesome/QtAwesome.cpp index 7b2193d..1b6ba37 100644 --- a/QtAwesome/QtAwesome.cpp +++ b/QtAwesome/QtAwesome.cpp @@ -12,7 +12,7 @@ #include -Q_INIT_RESOURCE_EXTERN(QtAwesome); +Q_INIT_RESOURCE_EXTERN(QtAwesome) /// The font-awesome icon painter class QtAwesomeCharIconPainter: public QtAwesomeIconPainter @@ -438,9 +438,71 @@ bool QtAwesome::initFontAwesome( ) m.insert( "spinner", icon_spinner ); m.insert( "circle", icon_circle ); m.insert( "reply", icon_reply ); + m.insert( "mail_reply", icon_mail_reply ); + m.insert( "github-alt", icon_github_alt ); m.insert( "folder-close-alt", icon_folder_close_alt ); m.insert( "folder-open-alt", icon_folder_open_alt ); + + m.insert( "icon_expand_alt", icon_expand_alt ); + m.insert( "icon_collapse_alt", icon_collapse_alt ); + m.insert( "icon_smile", icon_smile ); + m.insert( "icon_frown", icon_frown ); + m.insert( "icon_meh", icon_meh ); + m.insert( "icon_gamepad", icon_gamepad ); + m.insert( "icon_keyboard", icon_keyboard ); + m.insert( "icon_flag_alt", icon_flag_alt ); + m.insert( "icon_flag_checkered", icon_flag_checkered ); + + m.insert( "icon_terminal", icon_terminal ); + m.insert( "icon_code", icon_code ); + m.insert( "icon_reply_all", icon_reply_all ); + m.insert( "icon_mail_reply_all", icon_mail_reply_all ); + m.insert( "icon_star_half_full", icon_star_half_full ); + m.insert( "icon_star_half_empty", icon_star_half_empty ); + m.insert( "icon_location_arrow", icon_location_arrow ); + m.insert( "icon_crop", icon_crop ); + m.insert( "icon_code_fork", icon_code_fork ); + m.insert( "icon_unlink", icon_unlink ); + m.insert( "icon_question", icon_question ); + m.insert( "icon_info", icon_info ); + m.insert( "icon_exclamation", icon_exclamation ); + m.insert( "icon_superscript", icon_superscript ); + m.insert( "icon_subscript", icon_subscript ); + m.insert( "icon_eraser", icon_eraser ); + m.insert( "icon_puzzle_piece", icon_puzzle_piece ); + + m.insert( "icon_microphone", icon_microphone ); + m.insert( "icon_microphone_off", icon_microphone_off ); + m.insert( "icon_shield", icon_shield ); + m.insert( "icon_calendar_empty", icon_calendar_empty ); + m.insert( "icon_fire_extinguisher", icon_fire_extinguisher ); + m.insert( "icon_rocket", icon_rocket ); + m.insert( "icon_maxcdn", icon_maxcdn ); + m.insert( "icon_chevron_sign_left", icon_chevron_sign_left ); + m.insert( "icon_chevron_sign_right", icon_chevron_sign_right ); + m.insert( "icon_chevron_sign_up", icon_chevron_sign_up ); + m.insert( "icon_chevron_sign_down", icon_chevron_sign_down ); + m.insert( "icon_html5", icon_html5 ); + m.insert( "icon_css3", icon_css3 ); + m.insert( "icon_anchor", icon_anchor ); + m.insert( "icon_unlock_alt", icon_unlock_alt ); + + m.insert( "icon_bullseye", icon_bullseye ); + m.insert( "icon_ellipsis_horizontal", icon_ellipsis_horizontal ); + m.insert( "icon_ellipsis_vertical", icon_ellipsis_vertical ); + m.insert( "icon_rss_sign", icon_rss_sign ); + m.insert( "icon_play_sign", icon_play_sign ); + m.insert( "icon_ticket", icon_ticket ); + m.insert( "icon_minus_sign_alt", icon_minus_sign_alt ); + m.insert( "icon_check_minus", icon_check_minus ); + m.insert( "icon_level_up", icon_level_up ); + m.insert( "icon_level_down", icon_level_down ); + m.insert( "icon_check_sign", icon_check_sign ); + m.insert( "icon_edit_sign", icon_edit_sign ); + m.insert( "icon_external_link_sign", icon_external_link_sign ); + m.insert( "icon_share_sign", icon_share_sign ); + return true; } diff --git a/QtAwesome/QtAwesome.h b/QtAwesome/QtAwesome.h index 3f56ba8..a780ce7 100644 --- a/QtAwesome/QtAwesome.h +++ b/QtAwesome/QtAwesome.h @@ -281,10 +281,71 @@ enum QtFontAwesomeName { icon_spinner = 0xf110, icon_circle = 0xf111, - icon_reply = 0xf112, + icon_mail_reply = 0xf112, + icon_reply = icon_mail_reply, + icon_github_alt = 0xf113, icon_folder_close_alt = 0xf114, - icon_folder_open_alt = 0xf115 + icon_folder_open_alt = 0xf115, + + icon_expand_alt = 0xf116, + icon_collapse_alt = 0xf117, + icon_smile = 0xf118, + icon_frown = 0xf119, + icon_meh = 0xf11a, + icon_gamepad = 0xf11b, + icon_keyboard = 0xf11c, + icon_flag_alt = 0xf11d, + icon_flag_checkered = 0xf11e, + + icon_terminal = 0xf120, + icon_code = 0xf121, + icon_reply_all = 0xf122, + icon_mail_reply_all = icon_reply_all, + icon_star_half_full = 0xf123, + icon_star_half_empty = icon_star_half_full, + icon_location_arrow = 0xf124, + icon_crop = 0xf125, + icon_code_fork = 0xf126, + icon_unlink = 0xf127, + icon_question = 0xf128, + icon_info = 0xf129, + icon_exclamation = 0xf12a, + icon_superscript = 0xf12b, + icon_subscript = 0xf12c, + icon_eraser = 0xf12d, + icon_puzzle_piece = 0xf12e, + + icon_microphone = 0xf130, + icon_microphone_off = 0xf131, + icon_shield = 0xf132, + icon_calendar_empty = 0xf133, + icon_fire_extinguisher = 0xf134, + icon_rocket = 0xf135, + icon_maxcdn = 0xf136, + icon_chevron_sign_left = 0xf137, + icon_chevron_sign_right = 0xf138, + icon_chevron_sign_up = 0xf139, + icon_chevron_sign_down = 0xf13a, + icon_html5 = 0xf13b, + icon_css3 = 0xf13c, + icon_anchor = 0xf13d, + icon_unlock_alt = 0xf13e, + + icon_bullseye = 0xf140, + icon_ellipsis_horizontal = 0xf141, + icon_ellipsis_vertical = 0xf142, + icon_rss_sign = 0xf143, + icon_play_sign = 0xf144, + icon_ticket = 0xf145, + icon_minus_sign_alt = 0xf146, + icon_check_minus = 0xf147, + icon_level_up = 0xf148, + icon_level_down = 0xf149, + icon_check_sign = 0xf14a, + icon_edit_sign = 0xf14b, + icon_external_link_sign = 0xf14c, + icon_share_sign = 0xf14d }; diff --git a/QtAwesome/fonts/fontawesome.ttf b/QtAwesome/fonts/fontawesome.ttf index d461724..908f69e 100755 Binary files a/QtAwesome/fonts/fontawesome.ttf and b/QtAwesome/fonts/fontawesome.ttf differ diff --git a/QtAwesomeSample/main.cpp b/QtAwesomeSample/main.cpp index 146439f..eefa0e5 100644 --- a/QtAwesomeSample/main.cpp +++ b/QtAwesomeSample/main.cpp @@ -18,7 +18,7 @@ int main(int argc, char *argv[]) awesome->initFontAwesome(); // a simple beer button - QPushButton* beerButton = new QPushButton( awesome->icon( icon_beer), "Cheers!" ); + QPushButton* beerButton = new QPushButton( awesome->icon( icon_beer ), "Cheers!" ); w.setCentralWidget( beerButton ); w.show(); diff --git a/README.md b/README.md index e7068df..9a9b902 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,8 @@ iconfont you want. The class can also be used to manage your own dynamic code-drawn icons, by adding named icon-painters. +The current Font Awesome version is Version 3.1.1 + Installation ------------ @@ -32,7 +34,7 @@ You probably want to create a single QtAwesome object for your whole application Add an accessor to this object. (a global function, member of your application object whatever you like). -Use an icon name from the icon copy-past list [http://fortawesome.github.io/Font-Awesome/design.html](http://fortawesome.github.io/Font-Awesome/design.html) +Use an icon name from the icon copy-past list [http://fortawesome.github.io/Font-Awesome/cheatsheet/](http://fortawesome.github.io/Font-Awesome/cheatsheet/) Example