rev |
line source |
al@19883
|
1 Set Freedesktop standard icon
|
al@19883
|
2
|
al@19883
|
3 --- a/src/lxterminal.c
|
al@19883
|
4 +++ b/src/lxterminal.c
|
al@19883
|
5 @@ -577,14 +577,7 @@
|
al@19883
|
6 NULL, GTK_RESPONSE_OK,
|
al@19883
|
7 NULL);
|
al@19883
|
8 gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
|
al@19883
|
9 - if (gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), "lxterminal"))
|
al@19883
|
10 - {
|
al@19883
|
11 - gtk_window_set_icon_name(GTK_WINDOW(dialog), "lxterminal");
|
al@19883
|
12 - }
|
al@19883
|
13 - else
|
al@19883
|
14 - {
|
al@19883
|
15 - gtk_window_set_icon_from_file(GTK_WINDOW(dialog), PACKAGE_DATA_DIR "/icons/hicolor/128x128/apps/lxterminal.png", NULL);
|
al@19883
|
16 - }
|
al@19883
|
17 + gtk_window_set_icon_name(GTK_WINDOW(dialog), "utilities-terminal");
|
al@19883
|
18 g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(terminal_name_tab_response_event), term);
|
al@19883
|
19 GtkWidget * dialog_item = gtk_entry_new();
|
al@19883
|
20 g_object_set_data(G_OBJECT(dialog), "entry", (gpointer) dialog_item);
|
al@19883
|
21 @@ -746,7 +739,7 @@
|
al@19883
|
22 gtk_container_set_border_width(GTK_CONTAINER(about_dlg), 2);
|
al@19883
|
23 gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(about_dlg), VERSION);
|
al@19883
|
24 gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG(about_dlg), _("LXTerminal"));
|
al@19883
|
25 - gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(about_dlg), gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR "/icons/hicolor/128x128/apps/lxterminal.png", NULL));
|
al@19883
|
26 + gtk_about_dialog_set_logo_icon_name(GTK_ABOUT_DIALOG(about_dlg), "utilities-terminal");
|
al@19883
|
27 gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(about_dlg), _("Copyright (C) 2008-2017"));
|
al@19883
|
28 gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(about_dlg), _("Terminal emulator for LXDE project"));
|
al@19883
|
29 gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(about_dlg), "This program is free software; you can redistribute it and/or\nmodify it under the terms of the GNU General Public License\nas published by the Free Software Foundation; either version 2\nof the License, or (at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.");
|
al@19883
|
30 @@ -1490,15 +1483,7 @@
|
al@19883
|
31 #endif
|
al@19883
|
32
|
al@19883
|
33 /* Set window icon. */
|
al@19883
|
34 - if (gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), "lxterminal"))
|
al@19883
|
35 - {
|
al@19883
|
36 - gtk_window_set_icon_name(GTK_WINDOW(terminal->window), "lxterminal");
|
al@19883
|
37 - }
|
al@19883
|
38 - else
|
al@19883
|
39 - {
|
al@19883
|
40 - gtk_window_set_icon_from_file(GTK_WINDOW(terminal->window),
|
al@19883
|
41 - PACKAGE_DATA_DIR "/icons/hicolor/128x128/apps/lxterminal.png", NULL);
|
al@19883
|
42 - }
|
al@19883
|
43 + gtk_window_set_icon_name(GTK_WINDOW(terminal->window), "utilities-terminal");
|
al@19883
|
44 g_object_weak_ref(G_OBJECT(terminal->window), (GWeakNotify) terminal_window_exit, terminal);
|
al@19883
|
45
|
al@19883
|
46 /* Create a vertical box as the child of the toplevel window. */
|
al@19883
|
47 --- a/src/preferences.c
|
al@19883
|
48 +++ b/src/preferences.c
|
al@19883
|
49 @@ -272,7 +272,7 @@
|
al@19883
|
50
|
al@19883
|
51 GtkDialog * dialog = GTK_DIALOG(gtk_builder_get_object(builder, "lxterminal_preferences"));
|
al@19883
|
52 gtk_window_set_title(GTK_WINDOW(dialog), _("LXTerminal"));
|
al@19883
|
53 - gtk_window_set_icon_from_file(GTK_WINDOW(dialog), PACKAGE_DATA_DIR "/icons/hicolor/128x128/apps/lxterminal.png", NULL);
|
al@19883
|
54 + gtk_window_set_icon_name(GTK_WINDOW(dialog), "utilities-terminal");
|
al@19883
|
55
|
al@19883
|
56 GtkWidget * w = GTK_WIDGET(gtk_builder_get_object(builder, "terminal_font"));
|
al@19883
|
57 gtk_font_button_set_font_name(GTK_FONT_BUTTON(w), setting->font_name);
|
al@19883
|
58 --- a/data/lxterminal.desktop.in
|
al@19883
|
59 +++ b/data/lxterminal.desktop.in
|
al@19883
|
60 @@ -4,7 +4,7 @@
|
al@19883
|
61 _Comment=Use the command line
|
al@19883
|
62 TryExec=lxterminal
|
al@19883
|
63 Exec=lxterminal
|
al@19883
|
64 -Icon=lxterminal
|
al@19883
|
65 +Icon=utilities-terminal
|
al@19883
|
66 Type=Application
|
al@19883
|
67 Categories=GTK;System;TerminalEmulator;
|
al@19883
|
68 _Keywords=console;command line;execute;
|