use theme's icon preferences-system-time

author: Wu Xiaotian <[email protected]> 2019-06-18 21:25:12 +0800
committer: raveit65 <[email protected]> 2019-06-23 16:51:20 +0200
commit: c436dbdbd09ce0db5dd3c86f015621ebf56626f0 (patch)
tree: 7c42ed683d01cbe944dac9ec48f5f582f1e843d8
parent: 50e94dbf3140a45cd54b5b6b58e063f9e131dac1 (diff)
download: mate-control-center-c436dbdbd09ce0db5dd3c86f015621ebf56626f0.tar.bz2
mate-control-center-c436dbdbd09ce0db5dd3c86f015621ebf56626f0.tar.xz
11 files changed, 8 insertions, 42 deletions
diff --git a/capplets/time-admin/data/Makefile.am b/capplets/time-admin/data/Makefile.am
index f7b82e08..c6d7f65b 100644
--- a/capplets/time-admin/data/Makefile.am
+++ b/capplets/time-admin/data/Makefile.am
@@ -23,27 +23,14 @@ map/timezone_12.75_dim.png map/timezone_-3.png map/timezone_-6_dim.png
 map/timezone_12.75.png map/timezone_3.png map/timezone_6_dim.png map/timezone_9.png \
 map/timezone_12_dim.png map/timezone_-4.5_dim.png map/timezone_-6.png
 
-icons16dir = $(datadir)/icons/hicolor/16x16/apps
-dist_icons16_DATA = hicolor/16x16/apps/mate-times-admin.png
-icons22dir = $(datadir)/icons/hicolor/22x22/apps
-dist_icons22_DATA = hicolor/22x22/apps/mate-times-admin.png
-icons24dir = $(datadir)/icons/hicolor/24x24/apps
-dist_icons24_DATA = hicolor/24x24/apps/mate-times-admin.png
-icons32dir = $(datadir)/icons/hicolor/32x32/apps
-dist_icons32_DATA = hicolor/32x32/apps/mate-times-admin.png
-icons48dir = $(datadir)/icons/hicolor/48x48/apps
-dist_icons48_DATA = hicolor/48x48/apps/mate-times-admin.png
-
-icondir = $(datadir)/mate-time-admin/icon
-dist_icon_DATA = icon/mate-times-admin.png
-
 @INTLTOOL_DESKTOP_RULE@
 
 desktopdir = $(datadir)/applications
-desktop_in_files = mate-time-admin.desktop.in 
+desktop_in_files = mate-time-admin.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 CLEANFILES = $(desktop_DATA)
 EXTRA_DIST = \
 $(desktop_in_files)
+
 -include $(top_srcdir)/git.mk
diff --git a/capplets/time-admin/data/hicolor/16x16/apps/mate-times-admin.png b/capplets/time-admin/data/hicolor/16x16/apps/mate-times-admin.png
deleted file mode 100644
index 66760fb4..00000000
--- a/capplets/time-admin/data/hicolor/16x16/apps/mate-times-admin.png
+++ /dev/null
diff --git a/capplets/time-admin/data/hicolor/22x22/apps/mate-times-admin.png b/capplets/time-admin/data/hicolor/22x22/apps/mate-times-admin.png
deleted file mode 100644
index a661b627..00000000
--- a/capplets/time-admin/data/hicolor/22x22/apps/mate-times-admin.png
+++ /dev/null
diff --git a/capplets/time-admin/data/hicolor/24x24/apps/mate-times-admin.png b/capplets/time-admin/data/hicolor/24x24/apps/mate-times-admin.png
deleted file mode 100644
index 474eb03f..00000000
--- a/capplets/time-admin/data/hicolor/24x24/apps/mate-times-admin.png
+++ /dev/null
diff --git a/capplets/time-admin/data/hicolor/32x32/apps/mate-times-admin.png b/capplets/time-admin/data/hicolor/32x32/apps/mate-times-admin.png
deleted file mode 100644
index dd8b8a43..00000000
--- a/capplets/time-admin/data/hicolor/32x32/apps/mate-times-admin.png
+++ /dev/null
diff --git a/capplets/time-admin/data/hicolor/48x48/apps/mate-times-admin.png b/capplets/time-admin/data/hicolor/48x48/apps/mate-times-admin.png
deleted file mode 100644
index 1f304624..00000000
--- a/capplets/time-admin/data/hicolor/48x48/apps/mate-times-admin.png
+++ /dev/null
diff --git a/capplets/time-admin/data/icon/mate-times-admin.png b/capplets/time-admin/data/icon/mate-times-admin.png
deleted file mode 100644
index cf6d4e2f..00000000
--- a/capplets/time-admin/data/icon/mate-times-admin.png
+++ /dev/null
diff --git a/capplets/time-admin/data/mate-time-admin.desktop.in b/capplets/time-admin/data/mate-time-admin.desktop.in
index 0bc57bb3..5f8de5a6 100644
--- a/capplets/time-admin/data/mate-time-admin.desktop.in
+++ b/capplets/time-admin/data/mate-time-admin.desktop.in
@@ -4,7 +4,7 @@ _Comment=Setting the time and date of the local system
 Terminal=false
 Type=Application
 Exec=mate-time-admin
-Icon=mate-times-admin
+Icon=preferences-system-time
 StartupNotify=true
 Categories=GTK;Settings;HardwareSettings;
 Keywords=mate-control-center;MATE;clock;date;time;preferences;
diff --git a/capplets/time-admin/src/Makefile.am b/capplets/time-admin/src/Makefile.am
index 4bf47c9e..59332519 100644
--- a/capplets/time-admin/src/Makefile.am
+++ b/capplets/time-admin/src/Makefile.am
@@ -11,11 +11,11 @@ mate_time_admin_LDFLAGS = -export-dynamic
 
 AM_CPPFLAGS = \
 $(MATECC_CAPPLETS_CFLAGS) \
- -DDATADIR="\"$(datadir)/mate-time-admin/icon/\"" \
+ -DMATELOCALEDIR="\"$(datadir)/locale\""\
 -DTIMPZONEDIR="\"$(datadir)/mate-time-admin/map/\""
 
 
-CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) 
+CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES)
 
 EXTRA_DIST = time-zones.h
 
diff --git a/capplets/time-admin/src/main.c b/capplets/time-admin/src/main.c
index dfe934e9..ebd58aa2 100644
--- a/capplets/time-admin/src/main.c
+++ b/capplets/time-admin/src/main.c
@@ -24,8 +24,6 @@
 
 #define LOCKFILE "/tmp/time-admin.pid"
 #define TIME_ADMIN_PERMISSION "org.freedesktop.timedate1.set-time"
-#define APPICON "mate-times-admin.png"
-#define ICONFILE DATADIR APPICON
 
 static gboolean CheckClockHealth(gpointer data)
 {
@@ -54,20 +52,7 @@ static void ChangeTimeValue(GtkSpinButton *spin_button,
 update_apply_timeout(ta);
 }
 }
-static GdkPixbuf * GetAppIcon(void)
-{
- GdkPixbuf *Pixbuf;
- GError *Error = NULL;
-
- Pixbuf = gdk_pixbuf_new_from_file(ICONFILE,&Error);
- if(!Pixbuf)
- {
- MessageReport(("Get Icon Fail"),Error->message,ERROR);
- g_error_free(Error);
- }
 
- return Pixbuf;
-}
 static gboolean on_window_quit (GtkWidget *widget,
 GdkEvent *event,
 gpointer user_data)
@@ -109,7 +94,6 @@ static void on_permission_changed (GPermission *permission,
 static void InitMainWindow(TimeAdmin *ta)
 {
 GtkWidget *Window;
- GdkPixbuf *AppIcon;
 GError *error = NULL;
 
 Window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -125,14 +109,8 @@ static void InitMainWindow(TimeAdmin *ta)
 "delete-event",
 G_CALLBACK(on_window_quit),
 ta);
-
- AppIcon = GetAppIcon();
- if(AppIcon)
- {
- gtk_window_set_icon(GTK_WINDOW(Window),AppIcon);
- g_object_unref(AppIcon);
- }
- ta->Permission = polkit_permission_new_sync (TIME_ADMIN_PERMISSION,
+ gtk_window_set_icon_name (GTK_WINDOW(Window), "preferences-system-time");
+ ta->Permission = polkit_permission_new_sync (TIME_ADMIN_PERMISSION,
 NULL,
 NULL,
 &error);
diff --git a/capplets/time-admin/src/time-zone.c b/capplets/time-admin/src/time-zone.c
index e4782d97..0523b799 100644
--- a/capplets/time-admin/src/time-zone.c
+++ b/capplets/time-admin/src/time-zone.c
@@ -445,6 +445,7 @@ void SetupTimezoneDialog(TimeAdmin *ta)
 NULL,
 NULL);
 gtk_window_set_default_size (GTK_WINDOW (ta->dialog), 730, 520);
+ gtk_window_set_icon_name (GTK_WINDOW(ta->dialog), "preferences-system-time");
 
 ta->TZclose = DialogAddButtonWithIconName(GTK_DIALOG(ta->dialog),
 _("Close"),
author	Wu Xiaotian <[email protected]>	2019-06-18 21:25:12 +0800
committer	raveit65 <[email protected]>	2019-06-23 16:51:20 +0200
commit	c436dbdbd09ce0db5dd3c86f015621ebf56626f0 (patch)
tree	7c42ed683d01cbe944dac9ec48f5f582f1e843d8
parent	50e94dbf3140a45cd54b5b6b58e063f9e131dac1 (diff)
download	mate-control-center-c436dbdbd09ce0db5dd3c86f015621ebf56626f0.tar.bz2 mate-control-center-c436dbdbd09ce0db5dd3c86f015621ebf56626f0.tar.xz