From 4d036f77837785a9915166d3d2dc9f3e08206c12 Mon Sep 17 00:00:00 2001
From: Volker Lanz <vl@fidra.de>
Date: Sun, 21 Feb 2010 17:38:24 +0000
Subject: [PATCH] clean up xml gui file and copy changes to kpart's rc file,
 too

svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1093893
---
 src/gui/applyprogressdialog.cpp   |  4 ++--
 src/gui/partitionmanagerui.rc     | 14 +++++++-------
 src/kpart/partitionmanagerpart.rc | 15 ++++++++-------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/gui/applyprogressdialog.cpp b/src/gui/applyprogressdialog.cpp
index fa50f23..5fa92ad 100644
--- a/src/gui/applyprogressdialog.cpp
+++ b/src/gui/applyprogressdialog.cpp
@@ -83,13 +83,13 @@ ApplyProgressDialog::ApplyProgressDialog(QWidget* parent, OperationRunner& orunn
 
 	setupConnections();
 
-	restoreDialogSize(KConfigGroup(KGlobal::config(), "progressDialog"));
+	restoreDialogSize(KConfigGroup(KGlobal::config(), "applyProgressDialog"));
 }
 
 /** Destroys a ProgressDialog */
 ApplyProgressDialog::~ApplyProgressDialog()
 {
-	KConfigGroup kcg(KGlobal::config(), "progressDialog");
+	KConfigGroup kcg(KGlobal::config(), "applyProgressDialog");
 	saveDialogSize(kcg);
 	delete m_Report;
 }
diff --git a/src/gui/partitionmanagerui.rc b/src/gui/partitionmanagerui.rc
index ff97232..93106d3 100644
--- a/src/gui/partitionmanagerui.rc
+++ b/src/gui/partitionmanagerui.rc
@@ -1,6 +1,6 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
 
-<gui name="KDE Partition Manager" version="8">
+<gui name="KDE Partition Manager" version="9">
 	<ToolBar name="editToolBar">
 		<text context="@title:menu turn on and off edit toolbar">Edit Toolbar</text>
 		<Action name="applyAllOperations"/>
@@ -37,7 +37,7 @@
 			<Action name="toggleDockOperations"/>
 			<Action name="toggleDockInformation"/>
 			<Action name="toggleDockLog"/>
-			<separator name="separator_7"/>
+			<separator name="separator"/>
 			<Action name="fileSystemSupport"/>
 			<Action name="refreshDevices"/>
 		</Menu>
@@ -52,18 +52,18 @@
 			<Action name="resizePartition"/>
 			<Action name="deletePartition"/>
 			<Action name="shredPartition"/>
-			<separator name="separator_6"/>
+			<separator name="separator"/>
 			<Action name="copyPartition"/>
 			<Action name="pastePartition"/>
-			<separator name="separator_3"/>
+			<separator name="separator"/>
 			<Action name="editMountPoint"/>
 			<Action name="mountPartition"/>
-			<separator name="separator_4"/>
+			<separator name="separator"/>
 			<Action name="checkPartition"/>
-			<separator name="separator_5"/>
+			<separator name="separator"/>
 			<Action name="backupPartition"/>
 			<Action name="restorePartition"/>
-			<separator name="separator_8"/>
+			<separator name="separator"/>
 			<Action name="propertiesPartition"/>
 		</Menu>
 		<Menu name="settings"/>
diff --git a/src/kpart/partitionmanagerpart.rc b/src/kpart/partitionmanagerpart.rc
index 74da1ee..3944d01 100644
--- a/src/kpart/partitionmanagerpart.rc
+++ b/src/kpart/partitionmanagerpart.rc
@@ -1,6 +1,6 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
 
-<kpartgui name="partitionmanagerpart" version="7">
+<kpartgui name="partitionmanagerpart" version="8">
 	<ToolBar name="editToolBar">
 		<text context="@title:menu turn on and off edit toolbar">Edit Toolbar</text>
 		<Action name="applyAllOperations"/>
@@ -37,13 +37,14 @@
 			<Action name="toggleDockOperations"/>
 			<Action name="toggleDockInformation"/>
 			<Action name="toggleDockLog"/>
-			<separator name="separator_7"/>
+			<separator name="separator"/>
 			<Action name="fileSystemSupport"/>
 			<Action name="refreshDevices"/>
 		</Menu>
 		<Menu name="device">
 			<text context="@title:menu">Device</text>
 			<Action name="createNewPartitionTable"/>
+			<Action name="propertiesDevice"/>
 		</Menu>
 		<Menu name="partition">
 			<text context="@title:menu">Partition</text>
@@ -51,18 +52,18 @@
 			<Action name="resizePartition"/>
 			<Action name="deletePartition"/>
 			<Action name="shredPartition"/>
-			<separator name="separator_6"/>
+			<separator name="separator"/>
 			<Action name="copyPartition"/>
 			<Action name="pastePartition"/>
-			<separator name="separator_3"/>
+			<separator name="separator"/>
 			<Action name="editMountPoint"/>
 			<Action name="mountPartition"/>
-			<separator name="separator_4"/>
+			<separator name="separator"/>
 			<Action name="checkPartition"/>
-			<separator name="separator_5"/>
+			<separator name="separator"/>
 			<Action name="backupPartition"/>
 			<Action name="restorePartition"/>
-			<separator name="separator_8"/>
+			<separator name="separator"/>
 			<Action name="propertiesPartition"/>
 		</Menu>
 	</MenuBar>