From f0dff83db6023b5140c6da376b81717d41f1a8e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Mon, 28 Sep 2015 17:38:26 +0200 Subject: [PATCH] Use stock icons for the "ok" and "not ok" status in the account assistant --- gtk/setupwizard.c | 35 ++++++++++------------------------- pixmaps/CMakeLists.txt | 4 +--- pixmaps/Makefile.am | 4 +--- pixmaps/notok.png | Bin 2023 -> 0 bytes pixmaps/ok.png | Bin 1373 -> 0 bytes 5 files changed, 12 insertions(+), 31 deletions(-) delete mode 100644 pixmaps/notok.png delete mode 100644 pixmaps/ok.png diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c index c7cd6a195..53790970e 100644 --- a/gtk/setupwizard.c +++ b/gtk/setupwizard.c @@ -309,15 +309,13 @@ static gboolean update_interface_with_username_availability(void *w) { int account_existing = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), "is_username_used")); if (account_existing == 0) { - GdkPixbuf *ok_pixbuf = GDK_PIXBUF(g_object_get_data(G_OBJECT(the_assistant), "ok_pixbuf")); g_object_set_data(G_OBJECT(w), "is_username_available", GINT_TO_POINTER(1)); - gtk_image_set_from_pixbuf(isUsernameOk, ok_pixbuf); + gtk_image_set_from_stock(isUsernameOk, GTK_STOCK_OK, GTK_ICON_SIZE_LARGE_TOOLBAR); gtk_label_set_text(usernameError, ""); } else { - GdkPixbuf *nok_pixbuf = GDK_PIXBUF(g_object_get_data(G_OBJECT(the_assistant), "nok_pixbuf")); gtk_label_set_text(usernameError, "Username is already in use!"); g_object_set_data(G_OBJECT(w), "is_username_available", GINT_TO_POINTER(0)); - gtk_image_set_from_pixbuf(isUsernameOk, nok_pixbuf); + gtk_image_set_from_stock(isUsernameOk, GTK_STOCK_NO, GTK_ICON_SIZE_LARGE_TOOLBAR); } gtk_assistant_set_page_complete(GTK_ASSISTANT(assistant), GTK_WIDGET(w), linphone_account_creation_configuration_correct(GTK_WIDGET(w)) > 0); return FALSE; @@ -358,14 +356,13 @@ static void linphone_account_creation_username_changed(GtkEntry *entry, GtkWidge timerID = g_timeout_add(500, (GSourceFunc)check_username_availability, assistant); g_object_set_data(G_OBJECT(w), "usernameAvailabilityTimerID", GUINT_TO_POINTER(timerID)); } else { - GdkPixbuf *nok_pixbuf = GDK_PIXBUF(g_object_get_data(G_OBJECT(the_assistant), "nok_pixbuf")); if (gtk_entry_get_text_length(username) < LOGIN_MIN_SIZE) { gtk_label_set_text(usernameError, "Username is too short"); } else if (!g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{3,}$", gtk_entry_get_text(username), 0, 0)) { gtk_label_set_text(usernameError, "Unauthorized username"); } g_object_set_data(G_OBJECT(w), "is_username_available", GINT_TO_POINTER(0)); - gtk_image_set_from_pixbuf(isUsernameOk, nok_pixbuf); + gtk_image_set_from_stock(isUsernameOk, GTK_STOCK_NO, GTK_ICON_SIZE_LARGE_TOOLBAR); gtk_assistant_set_page_complete(GTK_ASSISTANT(assistant), w, linphone_account_creation_configuration_correct(w) > 0); } } @@ -376,13 +373,11 @@ static void linphone_account_creation_email_changed(GtkEntry *entry, GtkWidget * GtkWidget *assistant = gtk_widget_get_toplevel(w); if (g_regex_match_simple("^[a-z0-9]([a-z0-9_\\+\\.-]+)@[a-z0-9]([a-z0-9\\.-]+)\\.[a-z]{2,}$", gtk_entry_get_text(email), 0, 0)) { - GdkPixbuf *ok_pixbuf = GDK_PIXBUF(g_object_get_data(G_OBJECT(the_assistant), "ok_pixbuf")); g_object_set_data(G_OBJECT(w), "is_email_correct", GINT_TO_POINTER(1)); - gtk_image_set_from_pixbuf(isEmailOk, ok_pixbuf); + gtk_image_set_from_stock(isEmailOk, GTK_STOCK_OK, GTK_ICON_SIZE_LARGE_TOOLBAR); } else { - GdkPixbuf *nok_pixbuf = GDK_PIXBUF(g_object_get_data(G_OBJECT(the_assistant), "nok_pixbuf")); g_object_set_data(G_OBJECT(w), "is_email_correct", GINT_TO_POINTER(0)); - gtk_image_set_from_pixbuf(isEmailOk, nok_pixbuf); + gtk_image_set_from_stock(isEmailOk, GTK_STOCK_NO, GTK_ICON_SIZE_LARGE_TOOLBAR); } gtk_assistant_set_page_complete(GTK_ASSISTANT(assistant), w, linphone_account_creation_configuration_correct(w) > 0); } @@ -396,33 +391,30 @@ static void linphone_account_creation_password_changed(GtkEntry *entry, GtkWidge if ((gtk_entry_get_text_length(password) >= PASSWORD_MIN_SIZE) && (g_ascii_strcasecmp(gtk_entry_get_text(password), gtk_entry_get_text(password_confirm)) == 0)) { - GdkPixbuf *ok_pixbuf = GDK_PIXBUF(g_object_get_data(G_OBJECT(the_assistant), "ok_pixbuf")); g_object_set_data(G_OBJECT(w), "is_password_correct", GINT_TO_POINTER(1)); - gtk_image_set_from_pixbuf(isPasswordOk, ok_pixbuf); + gtk_image_set_from_stock(isPasswordOk, GTK_STOCK_OK, GTK_ICON_SIZE_LARGE_TOOLBAR); gtk_label_set_text(passwordError, ""); } else { - GdkPixbuf *nok_pixbuf = GDK_PIXBUF(g_object_get_data(G_OBJECT(the_assistant), "nok_pixbuf")); if (gtk_entry_get_text_length(password) < PASSWORD_MIN_SIZE) { gtk_label_set_text(passwordError, "Password is too short !"); } else if (!g_ascii_strcasecmp(gtk_entry_get_text(password), gtk_entry_get_text(password_confirm)) == 0) { gtk_label_set_text(passwordError, "Passwords don't match !"); } g_object_set_data(G_OBJECT(w), "is_password_correct", GINT_TO_POINTER(0)); - gtk_image_set_from_pixbuf(isPasswordOk, nok_pixbuf); + gtk_image_set_from_stock(isPasswordOk, GTK_STOCK_NO, GTK_ICON_SIZE_LARGE_TOOLBAR); } gtk_assistant_set_page_complete(GTK_ASSISTANT(assistant), w, linphone_account_creation_configuration_correct(w) > 0); } static GtkWidget * create_linphone_account_creation_configuration_page(void) { GtkWidget *vbox = gtk_table_new(7, 3, FALSE); - GdkPixbuf *nok_pixbuf = GDK_PIXBUF(g_object_get_data(G_OBJECT(the_assistant), "nok_pixbuf")); GtkWidget *label = gtk_label_new(_("(*) Required fields")); GtkWidget *labelUsername = gtk_label_new(_("Username: (*)")); - GtkWidget *isUsernameOk = gtk_image_new_from_pixbuf(nok_pixbuf); + GtkWidget *isUsernameOk = gtk_image_new_from_stock(GTK_STOCK_NO, GTK_ICON_SIZE_LARGE_TOOLBAR); GtkWidget *labelPassword = gtk_label_new(_("Password: (*)")); - GtkWidget *isPasswordOk = gtk_image_new_from_pixbuf(nok_pixbuf); + GtkWidget *isPasswordOk = gtk_image_new_from_stock(GTK_STOCK_NO, GTK_ICON_SIZE_LARGE_TOOLBAR); GtkWidget *labelEmail = gtk_label_new(_("Email: (*)")); - GtkWidget *isEmailOk = gtk_image_new_from_pixbuf(nok_pixbuf); + GtkWidget *isEmailOk = gtk_image_new_from_stock(GTK_STOCK_NO, GTK_ICON_SIZE_LARGE_TOOLBAR); GtkWidget *labelPassword2 = gtk_label_new(_("Confirm your password: (*)")); GtkWidget *entryUsername = gtk_entry_new(); GtkWidget *entryPassword = gtk_entry_new(); @@ -547,8 +539,6 @@ void linphone_gtk_show_assistant(GtkWidget *parent) { GtkWidget *page_7_linphone_account_validation_check_in_progress; GtkWidget *page_8_error; GtkWidget *page_9_finish; - GdkPixbuf *ok_pixbuf; - GdkPixbuf *nok_pixbuf; if (the_assistant != NULL) return; @@ -556,11 +546,6 @@ void linphone_gtk_show_assistant(GtkWidget *parent) { gtk_window_set_resizable (GTK_WINDOW(w), FALSE); gtk_window_set_title(GTK_WINDOW(w), _("SIP account configuration assistant")); - ok_pixbuf = create_pixbuf(linphone_gtk_get_ui_config("ok", "ok.png")); - g_object_set_data_full(G_OBJECT(the_assistant), "ok_pixbuf", ok_pixbuf, g_object_unref); - nok_pixbuf = create_pixbuf(linphone_gtk_get_ui_config("notok", "notok.png")); - g_object_set_data_full(G_OBJECT(the_assistant), "nok_pixbuf", nok_pixbuf, g_object_unref); - page_0_intro = create_intro_page(); page_1_choice = create_choice_page(); page_2_external_account_configuration = create_external_account_configuration_page(); diff --git a/pixmaps/CMakeLists.txt b/pixmaps/CMakeLists.txt index 6df0b512b..aef7fd115 100644 --- a/pixmaps/CMakeLists.txt +++ b/pixmaps/CMakeLists.txt @@ -22,9 +22,7 @@ set(ICONS_INSTALL_DIR ${PACKAGE_DATA_DIR}/icons/hicolor) -file(GLOB PIXMAPS "*.png" "linphone.icns") - -install(FILES ${PIXMAPS} +install(FILES "linphone.png" "linphone.icns" "linphone-banner.png" DESTINATION ${PACKAGE_DATA_DIR}/pixmaps/linphone PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index 06161d857..d21afc0ec 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -1,9 +1,7 @@ pixmapdir=$(datadir)/pixmaps/linphone dist_pixmap_DATA= \ linphone.png linphone-banner.png \ - linphone.icns \ - ok.png \ - notok.png + linphone.icns iconsdir=$(datadir)/icons/hicolor if BUILD_WIN32 diff --git a/pixmaps/notok.png b/pixmaps/notok.png deleted file mode 100644 index 84813bc2d7452bdc7d4875a9489b8c71cb4c5913..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2023 zcmVi-m!k{Ltv5$!% z){c)Ut@ucap|D62t?!^%Oh=>g5CkH`2g@RKVcq4mFW_GG?wyjGc#$ra)nJN zPg0+h#9hF_J%I1G0nffLZyxPmf6b9*EGlBYR@?a(V8s)d$LA=O&A0aNCrJ*H^pJFR zbg(!rjqd|_y8+cx!S%pzFT};sWi-mDmrqc7b2UBf^0TqHn0Z>Q^)Qe&>~jE!&rv8^ z>W07_-Bubm{fMR``zexiSuE72rt){d;az}wRPaxLjpt)y>AZWFBykNWF_9z(RI(Oe27?PfFcQd0OH z@Xn|K90RVm7JnjxmmQ~+6ijgz*gqe1Oa<+07Emy?kRC8p_JJQ=@4ZiTPM#C{(IQT}%uBz769#xZ zfHwe;Dr?~0ycV8=CotpHS0M>PxL~&z_t? zh8wM?lZLfvtQ!y3O#y4d!K!fZnii~>8%@)VtCUDqfAkS|`1t%|tnN=N^z(aYEGm*a z+0st?kCWLIE`yt6K~pUFAQWs{nLtN-8y!vu4eM7tN_$N>STz~E<_}iPiJ_^gf)dH5 z(o%j99NhnFAbrd!$OqE$wOXsOxR@jDZd}g# zfXA6%*MSwYBWb!>PKl)9@@4LtIMKBo*!WC)AP-oPr`2{EhBDD_dO-841h$0A;7!xO zd(*&%iQrcuVEqvDn?uaYpO2!c{JIP-GZ)?kUVkR=VLJ>gJ*-w+?iUuy9o}kS+e`C# zKLorR1vW;4Uqy^adpLMa2UffgNmErh-6WeXU1D}fi1V45f71>Diw^Voi;k#3T=3JSPgt+u>9hJY!b^fDKS_b8Pomh9UX9lv!e zT=rgAfBp(w7s`MDnY9OiGyu3ofWCm&3s4R887#0>UWexUixItSIYOpQ)7`mvF+Ew5 z>dS%Vrv`8Ui1#QICx5Va@3i?@S#b4q!kV!GeHY7sKpEIWV9*YzVq>9or< zswt4Xw0k!<10|zQfse0mTJ+kra0BRkCj+kIrLwRLb^D+VP)0@};^QJrTKFO!oIQ&> zdObpC&BpY?W6&nVL3GKb@OS}*8nD*Zqb_4JdV6{>bMHI11!B{<@-US>w zmYPbZ#X^y!A$KpUQj#A@>XU@!Z6NKJety=QMMbhtbq$XvC-d)by+x}a(B^RR$hvjh z1e|&k2pDq#?FUrv19^pMX>^#)6iC|oTq7m*iNdlCSh3CDzq7KSfC5Q#XD7P_fi}CH zN7k?BCg99wVBAypKq=r&2TCk0Et5<)ZX^arMM3HD;NF=tIGd5-boKQ7?Dv5Fn|?Qd z=7o}UtMUB#l`4%!7Zer-yU~b~nVGnG=FBO7;Ppemf7E}}ACujHS^%~ve0?{l0s|-Y zb#*l=fPLA(g|RZ22_%ca4sCGo0%X8O-xS>N=;0u1OP9b1=Ow#sZ9U?002ovPDHLk FV1nEOu(JRF diff --git a/pixmaps/ok.png b/pixmaps/ok.png deleted file mode 100644 index 769986fb79c67b15f7f58082ad0f170fc97c0275..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1373 zcmV-j1)}L_t(o!|j!8Y*bYc$NzKA*}IQ! z%WjLbgi=rftr`*y#TdaL_zEH^!9+9>Lolf&8Za^F7foye8cYm+0VRZIK?^Dn(?EnG zP#{7|RUkwIDUY_iO6ha=?%uukobf|jBc(4NEnl4E1Yx)R4?k5w@yTcB!u%SOH4TMJ6R% zby<6ZA>-luVFf5Tb6=KY>x!!)szyfEB0bh(^0^Q+u5$N;CuE906&GRT~~_ zzCPptD^JZ8zuh{rHh$B*mS|xp3kZ&+%R$Qc^sjzHGKiKPnyhX*7dNIlc%jqA0DwS* z;7^zHzk0r7_mBcC+MDOM_3d)k=6PPCQ(P#(KSJ!=IXC`7PyahwuwYl_xPK%5>YnJx zSn~Eh*XDV~1%x69MNmO%6~p0fN^od82)_T_Ov$#EBxcdjWlmtTCq0zs1O(@RHvv=01;p`cJF#QUe;H9 zPk@usM+D+8=WY(IpT8xV)t`9L=8XK+Rd4-3ir4vqE~mCOoEqSIPKhGT-q*3>2++_yr zCZpLCvnt+*R}C5f0A_y?+?z2*&6WXx*}zLO+&G{ehS9J|BB=aCRv3^0>XD2fNFdha z!D+>Z`x)q(9oNjSWAjHvjdYOo#bBkI?%hydi7XL7P^P1`tqt}qxANia zsUPn{zs2`{0s!#b>d^FXIJ`gqk?}zYMncDs@Y;~nF&LO02?!A@2Vs?ocDohlf4)+$ zC@^L3($-r8s-vGl^z^Dw(Wp^5-%g%Vprq<_V`jJ}12PRuKO zV9Z1c2P5#y5d1QPtJmvMxxey6Mlfr^g@YaXKL-GS+C#Q`r7E@8n%GqJ%bA)-!IXXf z=zM6`VB0qvZ|D@BIau1%@^{7iY{8l}YpA-qnrdrnMO#}NB@zj897njWODgL4vS->0 z)1#qf>EZP84YfDtUfGp)oQPNm0V$>`&Qc71TCBh;-1+b4`n=HaunGf00000NkvXXu0mjfgvWbY