Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

shutdown: simplify

  • Loading branch information...
commit 03418903b16a376b6d0452e5addb13b7b2021969 1 parent adc8774
Sébastien Bourdeauducq authored November 27, 2011
11  src/gui/shutdown.c
... ...
@@ -1,6 +1,6 @@
1 1
 /*
2 2
  * Flickernoise
3  
- * Copyright (C) 2010 Sebastien Bourdeauducq
  3
+ * Copyright (C) 2010, 2011 Sebastien Bourdeauducq
4 4
  *
5 5
  * This program is free software: you can redistribute it and/or modify
6 6
  * it under the terms of the GNU General Public License as published by
@@ -50,21 +50,18 @@ void init_shutdown()
50 50
 	mtk_cmd_seq(appid,
51 51
 		"g = new Grid()",
52 52
 		"g2 = new Grid()",
53  
-		"l = new Label(-text \"Do you want to power off or reboot the system?\")",
54  
-		"b_shutdown = new Button(-text \"Power off\")",
55  
-		"b_reboot = new Button(-text \"Reboot\")",
  53
+		"l = new Label(-text \"Are you sure?\")",
  54
+		"b_shutdown = new Button(-text \"Shutdown\")",
56 55
 		"b_cancel = new Button(-text \"Cancel\")",
57 56
 		"g.place(l, -column 1 -row 1)",
58 57
 		"g.rowconfig(1, -size 50)",
59 58
 		"g2.place(b_shutdown, -column 1 -row 1)",
60  
-		"g2.place(b_reboot, -column 2 -row 1)",
61  
-		"g2.place(b_cancel, -column 3 -row 1)",
  59
+		"g2.place(b_cancel, -column 2 -row 1)",
62 60
 		"g.place(g2, -column 1 -row 2)",
63 61
 		"w = new Window(-content g -title \"Shutdown\")",
64 62
 		0);
65 63
 
66 64
 	mtk_bind(appid, "b_shutdown", "clack", shutdown_callback, (void *)1);
67  
-	mtk_bind(appid, "b_reboot", "clack", shutdown_callback, (void *)0);
68 65
 
69 66
 	mtk_bind(appid, "b_cancel", "clack", cancel_callback, NULL);
70 67
 	mtk_bind(appid, "w", "close", cancel_callback, NULL);
2  src/shortcuts.c
@@ -76,7 +76,7 @@ static void shortcuts_callback(mtk_event *e, int count)
76 76
 			else if(e[i].press.code == MTK_KEY_LEFTALT)
77 77
 				alt = 1;
78 78
 			else if(ctrl && alt && (e[i].press.code == MTK_KEY_DELETE))
79  
-				clean_shutdown(0);
  79
+				clean_shutdown(1);
80 80
 			else if(ctrl && (e[i].press.code == MTK_KEY_F1))
81 81
 				switch_resolution();
82 82
 			else if(ctrl && (e[i].press.code == MTK_KEY_PAUSE))
4  src/translations/french.c
@@ -246,9 +246,7 @@ struct mtk_i18n_entry translation_french[] = {
246 246
 	"Web: www.milkymist.org" },
247 247
 	
248 248
 	// Shutdown
249  
-	{ "Do you want to power off or reboot the system?",	"Souhaitez-vous arr\xea""ter ou red\xe9""marrer le syst\xe8""me ?" },
250  
-	{ "Power off",						"Arr\xea""ter" },
251  
-	{ "Reboot",						"Red\xe9""marrer" },
  249
+	{ "Are you sure?",					"Confirmation:" },
252 250
 	
253 251
 	{ "Messagebox",						"Bo\xee""te de message" },
254 252
 	

0 notes on commit 0341890

Please sign in to comment.
Something went wrong with that request. Please try again.