Added finished page to alert user to proper completion of installation process

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdpkg@1111441 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

3 files changed, 66 insertions, 5 deletions

diff --git a/kdpkg-install/install.cpp b/kdpkg-install/install.cpp
index e0156d3..ca08a3c 100644
--- a/kdpkg-install/install.cpp
+++ b/kdpkg-install/install.cpp
@@ -128,6 +128,7 @@ void install::next2()
 // page 2: warnings
 // page 3: apt-get update
 // page 4: install package
+// page 5: process complete
 
 
 void install::page1()
@@ -166,8 +167,8 @@ void install::page3()
 		run.append( "update" );
 
 	QWidget *consoleWidget = new console(this, run );
- 	widgetStack->addWidget(consoleWidget, 3);
-	widgetStack->raiseWidget(3);
+ 	widgetStack->addWidget(consoleWidget, 4);
+	widgetStack->raiseWidget(4);
 
 	connect( consoleWidget, SIGNAL( finished(bool) ), this, SLOT( page1() ));
 }
@@ -192,11 +193,21 @@ void install::page4()
 		run.append( removePkg );
 
 	QWidget *consoleWidget = new console(this, run );
-	widgetStack->addWidget(consoleWidget, 4);
-	widgetStack->raiseWidget(4);
+	widgetStack->addWidget(consoleWidget, 5);
+	widgetStack->raiseWidget(5);
+
+	//connect( consoleWidget, SIGNAL( finished(bool) ), this, SLOT( close() ));
+	connect( consoleWidget, SIGNAL( finished(bool) ), this, SLOT( page5() ));
+
 
-	connect( consoleWidget, SIGNAL( finished(bool) ), this, SLOT( close() ));
+}
 
+void install::page5()
+{
+	successTextLabel->setText("<b>"+i18n("Installation process is complete!")+"</b><br>"+i18n("You may now close this window."));
+	nextPushButton2->hide();
+	closePushButton->show();
+	widgetStack->raiseWidget(3);
 
 }
 
diff --git a/kdpkg-install/install.h b/kdpkg-install/install.h
index 3b896b1..7fb280c 100644
--- a/kdpkg-install/install.h
+++ b/kdpkg-install/install.h
@@ -56,6 +56,7 @@ class install : public InstallDialog
 		virtual void page2x2();
 		virtual void page3();
 		virtual void page4();
+		virtual void page5();
 		virtual void showDependencies();
 		virtual void next1();
 		virtual void next2();
diff --git a/kdpkg-install/installdialog.ui b/kdpkg-install/installdialog.ui
index 576e023..9e7ae95 100644
--- a/kdpkg-install/installdialog.ui
+++ b/kdpkg-install/installdialog.ui
@@ -347,6 +347,52 @@
                     </property>
                 </widget>
             </widget>
+	    <widget class="QWidget">
+		    <property name="name">
+			    <cstring>WStackPage</cstring>
+		    </property>
+		    <attribute name="id">
+			    <number>3</number>
+		    </attribute>
+		    <widget class="QLabel">
+			    <property name="name">
+				    <cstring>successPixmapLabel</cstring>
+			    </property>
+			    <property name="geometry">
+				    <rect>
+					    <x>60</x>
+					    <y>120</y>
+					    <width>32</width>
+					    <height>32</height>
+				    </rect>
+			    </property>
+			    <property name="pixmap">
+				    <pixmap>image5</pixmap>
+			    </property>
+			    <property name="scaledContents">
+				    <bool>true</bool>
+			    </property>
+		    </widget>
+		    <widget class="QLabel">
+			    <property name="name">
+				    <cstring>successTextLabel</cstring>
+			    </property>
+			    <property name="geometry">
+				    <rect>
+					    <x>110</x>
+					    <y>110</y>
+					    <width>440</width>
+					    <height>50</height>
+				    </rect>
+			    </property>
+			    <property name="text">
+				    <string></string>
+			    </property>
+			    <property name="alignment">
+				    <set>WordBreak|AlignVCenter</set>
+			    </property>
+		    </widget>
+            </widget>
         </widget>
         <widget class="Line" row="3" column="0" rowspan="1" colspan="6">
             <property name="name">
@@ -402,6 +448,9 @@
     <image name="image4">
         <data format="PNG" length="1421">89504e470d0a1a0a0000000d4948445200000020000000200806000000737a7af400000554494441545885d5975d6c145514c77f776667f6b3ed6eb76cbb9b5d4a294a2d05317c2bd2184404da0a41242a51e189a0848444a306a244e39b823ef84222890f44239a182a1a1334f1a3044b7421e189ef60c1d0164adbfd9aeecef56166b74369a12d51e34dfe99b37b67cef9df73ffe7cc5c21a5e47f393a5ba8eb58c5744001c464fd28937928d9ca1eb7c2f980c6b98e55bc077826eb4b9de8039d2dd4690a5f856683b71acc1e9696697cf3eb357a80c244fd4d98b5ae7040f540f4710baa07d626f8082863120b9a1081642beb0434170317890434e67ff2084f035e26a88709111082bd9e6a082d99030b3b616127a12573f054c3ec10bb807240fb4708245bd923a036b6428169bb41895898b69bd80a05b742b47d396f02be89f81dd79e75b650e752385039074fd59a8d50fd22202de83174df1586ae9c46bb4e83cfc5f7c7bae9669c821c17819767b24ff3b228f14c19eaac0f39f6db55dadb3b3971e22cf9bc49e2fe87f1685f723369b8633ae14fcff11d90b359de1b813f5a794c15ec8d2c53285ffe2ad7f30b387a348910024551e8eaea21188e13991a42def805f9270d8d414e7ddbc559207f37ff77dd2b45b0570f4164f50ca85c47363b08809412d33401e8ebeb83ca754456d7a387606115bbb104e9ba2702c956360b7830da22a0e6155075745d22a52c11304d937058075587e856a22d02afcacc83cb7809ab2cef1863ccc9536d0415c107fe7a285fb20c02f3802c55551aaa2ac9e7f325c4e33e200d8179942f5a80bf1e1a2b78a32d4182bb94e598044cc9db4030febc0fa6bc00420259204b6d6d198661601806c1a086db3d0464401420b289f8733a8aa06c5b03af037eeea0b5510974b650a708765435833e6d25e80920650521432ca691cd66c9e572c4629a3d970206c01d45af7d94aa668879d9b4bd8126c0cd181d725402bac201d50b91b630543ce10890020649241432990ce9749a1933742b30fd360620d44ca43580ea8567eb781f088c9585db0894fafd06506b9683ab6cd83103c020a1508e5048924aa5a8af978ef97ee006b8bca8358b886eb8fb7be2b6321182bd9e04849a6bc03f1fb83e0a579378bc40a160027d584daf000c010690077f23a1659df4fcd8cf6c935dc0d758cdc970c6bb252dc956f62882a7a66e05bdee49705562ed7bd64606480359eaea04b366b9f0fbb3a5adb1ae69cb163950153ce1cb0c7450b6268ee7e0057eb609c8db089c6a2388e0b3caa578aad64c05df5cdb598ea2f8acdf192085ae674609eeb407c0e5460ff630d49d45bb4ac3e53487cef4731347872ce5d594ec73f9a888ac17e0bbcf4e7daf0da7ddcb91239758b9f2248b17ffcefefde7c7b8b7cf82af86c87ad0fc94ed6ce41d4694a50a8e7edf06e54ba2a08547a43eed408a2d5bfea2b7378b61187474dc64ed5a93f2f2e1f9e16ca5413151bd06d230906768680a72f24817e78a5970012882b7f429106ed1400f003d36b7d1aa54924e0f924a99140a054cd344ca82bdad05c0b4e1b0dd3ae116851b3f99cc1d6227f083ad852135d9ca6645b023be1dbcd303a00ac7ca8bc2730a3043286470f8b0413e9f67fdfa21366ecc95c4793b72200c144da2474c32c7883557d37be8124960489c6ce362a089dae9ef025480706195ab13d2be9aa52c0cc31c6163af5ede0a6965e4fc2eb87e8aab0bda59085c7309a855fd903a0d4229a64d8028f60c67efb0ab47ca922d4b2977fe3f32f8f0fdaa1fdc0a51acafe83e57b6c0c71c675bff71106a1614b5145c3889388e70d249a408216e0984fdcabee5a3c8362f0cf20596c01401785e6be2a12a370f18262e534efe98359e71ba8f2b9f5fe4127003e81636133756afd6b88773de3887c4ead91920e7dce822997f6394942bfeebe3f9dfdeac06dfae15d7560000000049454e44ae426082</data>
     </image>
+    <image name="image5">
+	    <data format="PNG" length="1427">89504e470d0a1a0a0000000d4948445200000020000000200806000000737a7af40000055a494441545885ed976b6c145514c7fff7de99d96e5bfba085b6b640e551b0ad4079531091800f4835180b3125418982a1624a88d1a8113f58436263f00bc418500b86884422a6d1d6b64a440481f0dab6dbf4614b5b762905babbed3e66eec30f856dcbcb12403ec84d4ee666ce3df3ffcd993be7de4b9452b89f8dde57f5070000b4ab9d988fd2a0940421144c68a0dcb872d5c084010802c904a412500687240292092826208980d20514159094f78d231cd0250478df18267428f526185b472077c835b218f82f32400029551a2cf5654a7272c993d373c6d8ed518557ddf71c4070b11494fd9c9339b160c3827988613a42bda2e5aa5fbb45ec9d358578cb941f460c8f7d237f7a162d98381edb6b9cd8ffbba38d5a2a9c817b0220b99c69527c3a2a23656ee19cc9589294822dce3a7cff5bad8706d5abc4464fdc2b009d5b722d8db56d9a37253571fdb42c4c8d8cc3b6bf1bf14d555d0feb51af20825648c870c040805829d5744ad531009edb5556424d0809f9f1b0f4f81796e78e45fe98911846756c696c406979ad898bbc9045907d822828d25f7dc3008c689f458eb0bfe4bf685642aa0200dd4315975cbe2822d927999386a7af9e9581b90989a09463674b1b7697374aeee6ef6936bd544a02ca0988ea9ffb6100026dfeac1969467b9b6f49fdb1ae5d065105ff9a0989382ee5fbda08dbfa45b31f360ab2c761b42d0ea6f0e380fb3c4a2b9a113ac78b0dc3288104986903b966e909a3701fd9ef739b589e3b12a3b3872de51c3b9544cccdb495504f70422a53b36237aecbcb368aa6cc40aa9684a03051e972e3f3b256f4345a2586c6368184a3a0aef90461009bd44a6b6abc1e1ad2b161d154244d88cab3b8fa0240f46065d8848977f190f6c3b4c713a6bdf5740ef252a7003c1a2111c4914b2eecac6c47b733f4adc1d83b20b8e5721b0660d04f99e7f14bd5994ecc8ccf41e1a2594818672cb72cb20d4ad9fade1a8f7282ddd1e94671de3369b145b3e720db9e097f88c2523d38ed6d47695507ba1cd68f06d3d6124ac4adc4810173804a4d181629759cf12cabce76b015a39621f054003b50bbd2eb80a00a7faa68b669ecd48894fcd9e9c84d7c0c9076784c1f407b51eb6dc7d7d5e7e03a6a551994beac881cd29fd40f60eaa040b9e522472a9d75b9f393e66159eaf3082c0ca0d4d7b2caeca1ab66ccb5237f721632222722640904a40f2041b4f8dbb0e7a00baebf448d0d6cb560f2d250b739fd005c0700530f6257bdc3cc3d9cf90716262ec59294c5f02efe0921c1f1ec239390c0d2e0330308a95e10124447a815df1d72a1e5a06cd22db652d9e4d9216a5f03a0faba84606fb0094507ea1b3226c438112147e0b9d10ba0c0a1a48ecba16e582a0410132eeb2cf61eee40433569d3836c85b45b27073f5e01e48adda4f54f42ae81710d9ad22fb05e7db7b386a3ced38080f420c025fca680d7ea869ff7c25241b8ad36949d70a1a94af7e87efa1ad1e8712802a2fa0a0d9114443210a181dec0aecfc0809b44d1525f037bfdd8d9d6a4e4f10990c200572108c5a1c0e1159da8ae75c35961f4685eb286d84439e50c1a376e27fb833340851e36466833edb255384f7334f536c32f7ce8317df0f31e74f10e54d6b8e128b373add328a23af6dcb6ea8d0098a90f30033ad7b77aeaa2ccda8e2e784517fca217dde23c0e355c80b32c0aa4c3f601d1b1fd4ec4070150ae0d32a6d851b8237e6dae63e80c75c1ab2ee064fb45d497c781b54596301d9bef547c308034061b34a187f4af7ca76364ebe54ba8e9f0a0ae2c11a88fda4a35bc0d72774e34032a21bbde4b4819ce459d6a3e199f63b645423962f651c3dc28c9801dc55d03e03700007c44d0cdfecae46212a0c7291185922078b7c401803c381bfeef01fe01eb138c41beb6fb4c0000000049454e44ae426082</data>
+    </image>
 </images>
 <connections>
     <connection>