Merge lp:~voldyman/pantheon-terminal/fixed-1016282 into lp:~elementary-apps/pantheon-terminal/trunk

[Akshay Shekher]

Fixed Foreground Process Dialog UI.

[Cody Garver (codygarver)]

review: Approve

=== modified file 'po/pantheon-terminal.pot'
--- po/pantheon-terminal.pot	2012-06-05 16:11:28 +0000
+++ po/pantheon-terminal.pot	2012-07-21 19:00:28 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-05 09:09-0700\n"
+"POT-Creation-Date: 2012-07-22 00:27+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,102 +17,116 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminal.vala:87
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/PantheonTerminal.vala:87
 msgid "Set shell at launch"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:78
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:212
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/ForegroundProcessDialog.vala:29
+msgid "Are you sure you want to close this tab?"
+msgstr ""
+
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/ForegroundProcessDialog.vala:30
+msgid "There is an active process on this tab."
+msgstr ""
+
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/ForegroundProcessDialog.vala:31
+msgid "If you close this tab, this process will end."
+msgstr ""
+
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/ForegroundProcessDialog.vala:33
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/ForegroundProcessDialog.vala:52
+msgid "Cancel"
+msgstr ""
+
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/ForegroundProcessDialog.vala:37
+msgid "Close Tab"
+msgstr ""
+
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/ForegroundProcessDialog.vala:48
+msgid "Are you sure you want to quit Terminal?"
+msgstr ""
+
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/ForegroundProcessDialog.vala:49
+msgid "There is an active process on this terminal."
+msgstr ""
+
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/ForegroundProcessDialog.vala:50
+msgid "If you quit Terminal, this process will end."
+msgstr ""
+
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/ForegroundProcessDialog.vala:56
+msgid "Quit Terminal"
+msgstr ""
+
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:78
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:232
 msgid "Terminal"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:127
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:127
 msgid "Open a new tab"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:350
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:381
 msgid "Quit"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:351
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:382
 msgid "Close"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:352
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:383
 msgid "New Window"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:352
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:383
 msgid "Open a new window"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:354
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:385
 msgid "New Tab"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:354
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:385
 msgid "Create a new tab"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:355
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:386
 msgid "Copy"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:355
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:386
 msgid "Copy the selected text"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:356
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:387
 msgid "Paste"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:356
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:387
 msgid "Paste some text"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:357
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:388
 msgid "Select All"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:358
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:389
 msgid "Select all the text in the terminal"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:359
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:390
 msgid "About"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:359
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:390
 msgid "Show about window"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:361
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:392
 msgid "Fullscreen"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/PantheonTerminalWindow.vala:361
+#: /home/akshay/Desktop/pantheon-terminal/po/../src/PantheonTerminalWindow.vala:392
 msgid "Toggle/Untoggle fullscreen"
 msgstr ""
-
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/ForegroundProcessDialog.vala:29
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/ForegroundProcessDialog.vala:43
-msgid "There is an active process on this terminal!"
-msgstr ""
-
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/ForegroundProcessDialog.vala:30
-msgid "Do you want to stay on the terminal?"
-msgstr ""
-
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/ForegroundProcessDialog.vala:32
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/ForegroundProcessDialog.vala:46
-msgid "Stay"
-msgstr ""
-
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/ForegroundProcessDialog.vala:36
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/ForegroundProcessDialog.vala:50
-msgid "Close terminal"
-msgstr ""
-
-#: /home/ttosttos/Projects/elementary/Bugs/pantheon-terminal-fix-989076/po/../src/ForegroundProcessDialog.vala:44
-msgid "Do you want to close this terminal?"
-msgstr ""

=== modified file 'src/ForegroundProcessDialog.vala'
--- src/ForegroundProcessDialog.vala	2012-05-14 20:46:00 +0000
+++ src/ForegroundProcessDialog.vala	2012-07-21 19:00:28 +0000
@@ -26,30 +26,40 @@
 
         public ForegroundProcessDialog () {
             use_markup = true;
-            set_markup ("<b>" + _("There is an active process on this terminal!") + "</b>\n\n" +
-                      _("Do you want to stay on the terminal?"));
+            set_markup ("<b>" + _("Are you sure you want to close this tab?") + "</b>\n\n" +
+                      _("There is an active process on this tab.")+"\n"+
+                      _("If you close this tab, this process will end."));
             
-            var button = new Gtk.Button.with_label (_("Stay"));
+            var button = new Gtk.Button.with_label (_("Cancel"));
             button.show ();
             add_action_widget (button, 0);
             
-            button = new Gtk.Button.with_label (_("Close terminal"));
+            button = new Gtk.Button.with_label (_("Close Tab"));
             button.show ();
             add_action_widget (button, 1);
+
+            var warning_image = new Gtk.Image.from_stock (Gtk.Stock.DIALOG_WARNING, Gtk.IconSize.DIALOG);
+            set_image (warning_image);
+            warning_image.show ();
         }
         
         public ForegroundProcessDialog.before_close () {
             use_markup = true;
-            set_markup ("<b>" + _("There is an active process on this terminal!") + "</b>\n\n" +
-                      _("Do you want to close this terminal?"));
-            
-            var button = new Gtk.Button.with_label (_("Stay"));
+            set_markup ("<b>" + _("Are you sure you want to quit Terminal?") + "</b>\n\n" +
+                      _("There is an active process on this terminal.")+"\n"+
+                      _("If you quit Terminal, this process will end."));
+
+            var button = new Gtk.Button.with_label (_("Cancel"));
             button.show ();
             add_action_widget (button, 0);
             
-            button = new Gtk.Button.with_label (_("Close terminal"));
+            button = new Gtk.Button.with_label (_("Quit Terminal"));
             button.show ();
             add_action_widget (button, 1);
+
+            var warning_image = new Gtk.Image.from_stock (Gtk.Stock.DIALOG_WARNING, Gtk.IconSize.DIALOG);
+            set_image (warning_image);
+            warning_image.show ();
         }
     }
 }