summaryrefslogtreecommitdiff
path: root/capplets
diff options
context:
space:
mode:
authorzhuyaliang <[email protected]>2019-06-12 17:49:30 +0800
committerraveit65 <[email protected]>2019-06-14 12:05:04 +0200
commit9c0163fd3086b66e499e44468084836320b4b912 (patch)
tree36ce3e7c993f36cec105df16e1fc2067db3a1b78 /capplets
parent605e2ef44d8c06b14ef8dc44a1d6c7df255c8e92 (diff)
downloadmate-control-center-9c0163fd3086b66e499e44468084836320b4b912.tar.bz2
mate-control-center-9c0163fd3086b66e499e44468084836320b4b912.tar.xz
Use default color to set label and remove the maximum button
Diffstat (limited to 'capplets')
-rw-r--r--capplets/time-admin/src/main.c9
-rw-r--r--capplets/time-admin/src/time-share.c6
-rw-r--r--capplets/time-admin/src/time-share.h1
3 files changed, 8 insertions, 8 deletions
diff --git a/capplets/time-admin/src/main.c b/capplets/time-admin/src/main.c
index 295e0be1..b17ebc54 100644
--- a/capplets/time-admin/src/main.c
+++ b/capplets/time-admin/src/main.c
@@ -89,6 +89,7 @@ static void InitMainWindow(TimeAdmin *ta)
Window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
ta->MainWindow = WindowLogin = Window;
gtk_window_set_deletable(GTK_WINDOW(Window),FALSE);
+ gtk_window_set_resizable(GTK_WINDOW(Window),FALSE);
gtk_window_set_hide_titlebar_when_maximized(GTK_WINDOW(Window),TRUE);
gtk_window_set_position(GTK_WINDOW(Window), GTK_WIN_POS_CENTER);
gtk_window_set_title(GTK_WINDOW(Window),_("Time and Date Manager"));
@@ -216,7 +217,7 @@ static GtkWidget * TimeZoneAndNtp(TimeAdmin *ta)
TimeZoneLabel = gtk_label_new(NULL);
gtk_widget_set_halign(TimeZoneLabel,GTK_ALIGN_START);
- SetLableFontType(TimeZoneLabel,"gray",11,_("Time Zone:"));
+ SetLableFontType(TimeZoneLabel,11,_("Time Zone:"));
gtk_grid_attach(GTK_GRID(table) ,TimeZoneLabel, 0 , 0 , 1 , 1);
SetupTimezoneDialog(ta);
@@ -232,7 +233,7 @@ static GtkWidget * TimeZoneAndNtp(TimeAdmin *ta)
NtpSyncLabel = gtk_label_new(NULL);
gtk_widget_set_halign(NtpSyncLabel,GTK_ALIGN_START);
- SetLableFontType(NtpSyncLabel,"gray",11,_("Ntp Sync:"));
+ SetLableFontType(NtpSyncLabel,11,_("Ntp Sync:"));
gtk_grid_attach(GTK_GRID(table) ,NtpSyncLabel, 0 , 1 , 1 , 1);
NtpSyncSwitch = gtk_switch_new();
@@ -287,7 +288,7 @@ static GtkWidget *SetClock(TimeAdmin *ta)
gtk_grid_set_column_homogeneous(GTK_GRID(table),TRUE);
TimeLabel = gtk_label_new(NULL);
- SetLableFontType(TimeLabel,"green",13,_("Set Time"));
+ SetLableFontType(TimeLabel,13,_("Set Time"));
gtk_widget_set_halign(TimeLabel,GTK_ALIGN_CENTER);
gtk_widget_set_valign(TimeLabel,GTK_ALIGN_START);
gtk_widget_set_hexpand(TimeLabel,FALSE);
@@ -324,7 +325,7 @@ static GtkWidget *SetDate(TimeAdmin *ta)
gtk_grid_set_column_homogeneous(GTK_GRID(table),TRUE);
DateLabel = gtk_label_new(NULL);
- SetLableFontType(DateLabel,"green",12,_("Set Date"));
+ SetLableFontType(DateLabel,12,_("Set Date"));
gtk_grid_attach(GTK_GRID(table) ,DateLabel, 1 , 0 , 1 , 1);
LocalTime = GetCurrentTime();
diff --git a/capplets/time-admin/src/time-share.c b/capplets/time-admin/src/time-share.c
index e3ae18bb..b4c34e80 100644
--- a/capplets/time-admin/src/time-share.c
+++ b/capplets/time-admin/src/time-share.c
@@ -99,13 +99,13 @@ int MessageReport(const char *Title,const char *Msg,int nType)
return nRet;
}
-void SetLableFontType(GtkWidget *Lable ,const char *Color,int FontSzie,const char *Word)
+void SetLableFontType(GtkWidget *Lable,int FontSzie,const char *Word)
{
char LableTypeBuf[200] = { 0 };
sprintf(LableTypeBuf,
- "<span foreground=\'%s\'weight=\'light\'font_desc=\'%d\'>%s</span>",
- Color,FontSzie,Word);
+ "<span font_desc=\'%d\'>%s</span>",
+ FontSzie,Word);
gtk_label_set_markup(GTK_LABEL(Lable),LableTypeBuf);
}
diff --git a/capplets/time-admin/src/time-share.h b/capplets/time-admin/src/time-share.h
index bc7f8acf..453faeee 100644
--- a/capplets/time-admin/src/time-share.h
+++ b/capplets/time-admin/src/time-share.h
@@ -78,7 +78,6 @@ int MessageReport (const char *Title,
int nType);
void SetLableFontType (GtkWidget *Lable,
- const char *Color,
int FontSzie,
const char *Word);