[gthumb: 8/24] Revert "copy_move_to_folder: changes to the copy/move complete popup"

[Paolo Bacchilega <paobac src gnome org>]

commit 5dfd93a75cbd16281e325ad8f687fea759cb195f
Author: Michael J. Chudobiak <mjc avtechpulse com>
Date:   Thu Nov 11 14:08:41 2010 -0500

    Revert "copy_move_to_folder: changes to the copy/move complete popup"
    
    This reverts commit 3c6ccb49ebae881c67a61930557431554393e370.

 extensions/copy_move_to_folder/data/ui/Makefile.am |    1 +
 .../data/ui/copy-move-to-folder-copy-complete.ui   |   22 ++++--
 .../data/ui/copy-move-to-folder-move-complete.ui   |   80 ++++++++++++++++++++
 extensions/copy_move_to_folder/dlg-copy-complete.c |    7 +-
 4 files changed, 99 insertions(+), 11 deletions(-)
---
diff --git a/extensions/copy_move_to_folder/data/ui/Makefile.am b/extensions/copy_move_to_folder/data/ui/Makefile.am
index 892481b..2e6f0ce 100644
--- a/extensions/copy_move_to_folder/data/ui/Makefile.am
+++ b/extensions/copy_move_to_folder/data/ui/Makefile.am
@@ -1,6 +1,7 @@
 uidir = $(pkgdatadir)/ui
 ui_DATA = 					\
 	copy-move-to-folder-copy-complete.ui	\
+	copy-move-to-folder-move-complete.ui	\
 	copy-move-to-folder-preferences.ui
 
 EXTRA_DIST = $(ui_DATA)
diff --git a/extensions/copy_move_to_folder/data/ui/copy-move-to-folder-copy-complete.ui b/extensions/copy_move_to_folder/data/ui/copy-move-to-folder-copy-complete.ui
index b49d4c0..04b91ff 100644
--- a/extensions/copy_move_to_folder/data/ui/copy-move-to-folder-copy-complete.ui
+++ b/extensions/copy_move_to_folder/data/ui/copy-move-to-folder-copy-complete.ui
@@ -8,7 +8,7 @@
     <property name="modal">True</property>
     <property name="type_hint">normal</property>
     <property name="skip_taskbar_hint">True</property>
-    <property name="text" translatable="yes">Go to destination folder?</property>
+    <property name="text" translatable="yes">File(s) successfully copied.</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
@@ -30,12 +30,13 @@
             <property name="visible">True</property>
             <property name="layout_style">center</property>
             <child>
-              <object class="GtkButton" id="close_button">
-                <property name="label">gtk-no</property>
+              <object class="GtkButton" id="open_button">
+                <property name="label" translatable="yes">_Open in the Browser</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
+                <property name="image">icon_image</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -44,8 +45,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="open_button">
-                <property name="label">gtk-yes</property>
+              <object class="GtkButton" id="close_button">
+                <property name="label">gtk-close</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
@@ -67,8 +68,13 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="0">close_button</action-widget>
-      <action-widget response="0">open_button</action-widget>
+      <action-widget response="1">open_button</action-widget>
+      <action-widget response="-7">close_button</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkImage" id="icon_image">
+    <property name="visible">True</property>
+    <property name="yalign">0</property>
+    <property name="stock">gtk-jump-to</property>
+  </object>
 </interface>
diff --git a/extensions/copy_move_to_folder/data/ui/copy-move-to-folder-move-complete.ui b/extensions/copy_move_to_folder/data/ui/copy-move-to-folder-move-complete.ui
new file mode 100644
index 0000000..371bd5f
--- /dev/null
+++ b/extensions/copy_move_to_folder/data/ui/copy-move-to-folder-move-complete.ui
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkMessageDialog" id="completed_messagedialog">
+    <property name="border_width">5</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="type_hint">normal</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="text" translatable="yes">File(s) successfully moved.</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkCheckButton" id="always_button">
+            <property name="label" translatable="yes">Always preform this action</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">center</property>
+            <child>
+              <object class="GtkButton" id="open_button">
+                <property name="label" translatable="yes">_Open in the Browser</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="image">icon_image</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="close_button">
+                <property name="label">gtk-close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="1">open_button</action-widget>
+      <action-widget response="-7">close_button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkImage" id="icon_image">
+    <property name="visible">True</property>
+    <property name="yalign">0</property>
+    <property name="stock">gtk-jump-to</property>
+  </object>
+</interface>
diff --git a/extensions/copy_move_to_folder/dlg-copy-complete.c b/extensions/copy_move_to_folder/dlg-copy-complete.c
index 9312a53..9593558 100644
--- a/extensions/copy_move_to_folder/dlg-copy-complete.c
+++ b/extensions/copy_move_to_folder/dlg-copy-complete.c
@@ -87,9 +87,10 @@ dlg_copy_complete (GthBrowser *browser,
 		data->location = g_file_dup(location);
 		data->browser = browser;
 		g_object_ref(browser);
-
-		data->builder = _gtk_builder_new_from_file ("copy-move-to-folder-copy-complete.ui", "copy_move_to_folder_copy_complete");
-
+		if(move)
+			data->builder = _gtk_builder_new_from_file ("copy-move-to-folder-move-complete.ui", "copy_move_to_folder_move_complete");
+		else
+			data->builder = _gtk_builder_new_from_file ("copy-move-to-folder-copy-complete.ui", "copy_move_to_folder_copy_complete");
 		data->dialog = GET_WIDGET ("completed_messagedialog");
 
 		g_signal_connect (G_OBJECT (data->dialog),