[gparted] Change button create to apply for partition table creation (#576374)



commit 8e8bf7e5440f003d1a4f9658761d8673d1062860
Author: Curtis Gedak <gedakc gmail com>
Date:   Mon Jul 6 15:58:08 2009 -0600

    Change button create to apply for partition table creation (#576374)
    
    To further minimize the chance of accidentally creating a new partition
    table, the following steps have been taken:
    
    1)  Rename non-standard Create button to stock Apply button.
    2)  Remove extra warning about erasing entire disk device.
    3)  Update GParted Manual accordingly.
    
    Closes GParted bug #576374

 help/C/gparted.xml      |    8 ++++----
 src/Dialog_Disklabel.cc |   13 ++-----------
 src/Win_GParted.cc      |    4 ++--
 3 files changed, 8 insertions(+), 17 deletions(-)
---
diff --git a/help/C/gparted.xml b/help/C/gparted.xml
index 983f943..3520c46 100644
--- a/help/C/gparted.xml
+++ b/help/C/gparted.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
-  <!ENTITY appversion "0.4.2">
-  <!ENTITY manrevision "1.0">
-  <!ENTITY date "January 2009">
+  <!ENTITY appversion "0.4.6">
+  <!ENTITY manrevision "1.1">
+  <!ENTITY date "July 2009">
   <!ENTITY app "gparted">
   <!ENTITY appname "GParted">
   <!-- Information about the entities:
@@ -490,7 +490,7 @@
           </listitem>
           <listitem>
             <para>
-            Click <guibutton>Create</guibutton> to create the new partition table.
+            Click <guibutton>Apply</guibutton> to create the new partition table.
             The application writes the new partition table to the disk device.
             The application refreshes the device partition layout in the
             <application>&app;</application> window.
diff --git a/src/Dialog_Disklabel.cc b/src/Dialog_Disklabel.cc
index 5434f97..05b5177 100644
--- a/src/Dialog_Disklabel.cc
+++ b/src/Dialog_Disklabel.cc
@@ -76,18 +76,9 @@ Dialog_Disklabel::Dialog_Disklabel( const Glib::ustring & device_path, const std
 	combo_labeltypes .set_active( 0 ) ;
 	hbox ->pack_start( combo_labeltypes, Gtk::PACK_SHRINK ) ;
 
-	//standard warning	
-	str_temp = "\n<i>" ;
-	/*TO TRANSLATORS: looks like  Choosing the Create button will IMMEDIATELY ERASE ALL DATA on disk /dev/hda */
-	str_temp += String::ucompose( _("Choosing the Create button will IMMEDIATELY ERASE ALL DATA on disk %1"), device_path ) ;
-	str_temp += "\n</i>";
-	vbox ->pack_start( * Utils::mk_label( str_temp, true, Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, true ),
-			   Gtk::PACK_SHRINK );
-			
 	this ->add_button( Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL );
-	/*TO TRANSLATORS: This is the name of the button referred to in the previous text  Choosing the Create button will .... */
-	this ->add_button( _("Create"), Gtk::RESPONSE_OK );
-		
+	this ->add_button( Gtk::Stock::APPLY, Gtk::RESPONSE_APPLY );
+
 	this ->show_all_children() ;
 }
 
diff --git a/src/Win_GParted.cc b/src/Win_GParted.cc
index 665a243..f2e4cc4 100644
--- a/src/Win_GParted.cc
+++ b/src/Win_GParted.cc
@@ -1845,8 +1845,8 @@ void Win_GParted::activate_disklabel()
 {
 	Dialog_Disklabel dialog( devices[ current_device ] .get_path(), gparted_core .get_disklabeltypes() ) ;
 	dialog .set_transient_for( *this );
-		
-	if ( dialog .run() == Gtk::RESPONSE_OK )
+
+	if ( dialog .run() == Gtk::RESPONSE_APPLY )
 	{
 		if ( ! gparted_core .set_disklabel( devices[ current_device ] .get_path(), dialog .Get_Disklabel() ) )
 		{



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]