[PC-BSD Commits] r179 - in pcbsd/trunk: PBCsource PBIsource PBItext

svn at pcbsd.org svn at pcbsd.org
Wed Apr 18 15:29:12 PDT 2007


Author: kris
Date: 2007-04-18 23:29:12 +0100 (Wed, 18 Apr 2007)
New Revision: 179

Added:
   pcbsd/trunk/PBCsource/pbistart.c
Modified:
   pcbsd/trunk/PBCsource/pbcwizard.ui
   pcbsd/trunk/PBCsource/pbcwizard.ui.h
   pcbsd/trunk/PBIsource/pbi.ui
   pcbsd/trunk/PBIsource/pbi.ui.h
   pcbsd/trunk/PBItext/main.cpp
Log:
Updates for PBI Creator version 3.2

Modified: pcbsd/trunk/PBCsource/pbcwizard.ui
===================================================================
--- pcbsd/trunk/PBCsource/pbcwizard.ui	2007-04-18 18:38:42 UTC (rev 178)
+++ pcbsd/trunk/PBCsource/pbcwizard.ui	2007-04-18 22:29:12 UTC (rev 179)
@@ -259,7 +259,7 @@
                     <cstring>textLabel1_5</cstring>
                 </property>
                 <property name="text">
-                    <string>PBI Creator 3.1</string>
+                    <string>PBI Creator 3.2</string>
                 </property>
             </widget>
         </grid>
@@ -1093,10 +1093,10 @@
 </widget>
 <images>
     <image name="image0">
-        <data format="PNG" length="4409">89504e470d0a1a0a0000000d4948445200000040000000400806000000aa6971de0000110049444154789ce59b5d8c1c5756c77f6d57af6f6dda49551843178cd194e4486e9320b793a0cc2811b151a4d5900764041209086d8440280869c9030f080904124f79230f7c6cf60112219235f0b0ce3ecd44eb3013943063c966dabb7652c36692eac543ea92e96cdd78ca6e1eeebd55b77bba677a1c7bf3b0258dce54777ddc7bcefffccfc7bd5debf7fbfc381f1ec0b3ffc27faa9c69a018759100942b7d50b996e4c0285998a78f90c2037587ce0520b7a89d7b2b3dc0dffd740bf814b831a9613d000a66da11f72bf370a9aa97080f3205be918107b280e661739d0f320751d732a883dc32f76d19ad6d55f75b2d86e2ce9c0b01528210010a8e01ef011f4f34fb52011e9fc50104a29a7cb7a765aa2012a014440d7d6e95a4b621cdb555544f2b2c29202f8c85d0ca82ea7c34c63ec75100450e4a021c0136f673fb01fb10d7f256660a424f4f5e789015fabc8421e61cac2a098496628ce42e4921826a3efb380ed8c14b358800eb6399f3790963cfc01ead14702c6ebe57cabc4119d43ae7774c7aeef3e57ee7ee28a0a8261988caf729b4afd9cf7373ae0a087cfd008b80c04821f47daec51577090185fbfce07328c0c!
 25e0cc2df371c60bf874104a8429f2b9cef7b5a4af3b9ea5172040560bebfa3b2b87d04d828a07dd7c2bda7894f1a02cc7afaf3aec3befe6148b7a069a20081be2e0ab4d2424f4f5a0495d29485ad712f1769bb9def2a1b5a0992a0f48e7d2b4078108b8c5620904a229a0152490261a417200b89f00294954aead06364a624be179017462a892f2a992949e80564c3cf315216e63dce7bdde72b35e67a2dfbbff90d59ebdcae0214d09a09f1ebe0a39d3b1c2371e53650d732aa0f9e0fcb784852f7c973f07d2df17d9d44793eaa80d848e1f91a39c22fb330a5aaef637c5299117c1e0e28597fbf475d8f79406e0fca6c84cceb90998c313552e6a04c928523bb26f9910a94a8a28c7b9d8f46eeed1c250794f17c9fc7002eb6c1af0fcad0286340e6553a4d0f3ad740ca9c645369636c299d596eeb68a380e694c00f0471d3d729b0307989804c8228c3cced28c02639f5c96f2c537f33d9619999c996d24c3acb3519ae5cce901b905ed7dc805034c30050f85140a6142d2148a544e482cea514d9033c49dc8c68c68213c72232337ea56e87022d07dc06024acbd71d3964f90104f890a4905c839524233a2c08029fb907438480a06147e49b28e0d3ddd4be9e2b982324931a299d2461f542ceea724abb1d114e41f0791020f681807d5b7e1b2860e1ed9c6e02e2b062fed!
 19030d021332fc0b7858d4dbb8dafe7e8901c789016104c41d0f0999f3941d!
 2cd4913c
9e2850421a82105c097d8673a5c7280981001fbb5bcdcd493179e4fbb0da78e691fa6aeb5e90bc84dde90db0cb270266df3139bae7b7ad4ede33ecd699f562b62f99d84b9464af86b7ff1dcdaf2f9f7d737967fc0846557c901aaa82635ead8cbf2a31090acc3c272c6a938a47d1cc223e63a3411dada2234081c4040cf7cee20c296e2a1a94a4301aa09f34fc52c5d14e0cdff7210c4617cb5f5fbb55aed4abfdfbf319102d40408d8cbf2c3ac9f5c81e54b30ff68c88963688bdbeb721df6c9f5246c7d9f5b692cdf9586e51d24440daaa865c7dd80b35f89889b114bcb624e085ef1bde8f76ab5da0af0597f97ee4895078c21d17c586e3b724cbc5fbd02cb9772e66719987c79bdaf1180813da2aa3db2424b69e2bf8b0c841987f9bcac56039d9acf3d0673a763e2e9f683c103adbf9f7df2b9878143b55aad364e0115078c21d11df9df1e964fd7b502ce3ee1131d35376d338880ed0a01a39080db7f30e7be800c884d356a6b9228d00a03fd8eb9477d024e707e9116057f8d94bfbd7cf1dc7781cf46cd6fa01adced1867791701dd4d58bc98337f926af2308080b148b016375299e85022a430059a63f95018c3d5abf1019c3809a76663a2667c327ee8cc5f023f51abd5463af90130f5fd1e61749ce5ad14c0d2bb307bcc279e19f18021250c20a1d010b6fd87d2b78b!
 8a134233be40549f07c2dcef3ccfbeebcc233eb3ed36d1746b7efee93ff92a706fad56db11224b0e188780492c4f1d962fea64a6657c3eb7a4e1586624124c7819e004b7216b9140150d6cfbcd3f3ce279f67d3e9c79dc279e6e1e6c1e6dff61ebe47c9bca930715c02e089884f5d3eb906ec2a9637a50b9e902939bc1b947dd91db8e052d128cb49c641161d93f101a6dd1919d931f464278044e3f7182702afac976fbec1fa05d616044633960c0f28cb77cb6ad8b9920d07e9f66943e8a370609ae32c670826d9ed8bcc0f628958230183df95148886660b6dd4608f154fb91b373c03d6e5418cb0193589e6dddf5493661eeb8b67ce9bb86d8c622614809c39c602d1d348cb4480806ef1b27cb711e86d6319f78ba754f1cb77f1d08ddd1ece080fdc47beadafa71b3b29232bd40db4bbc5d2494f5becd048d5be41e7b4ebee416f3bc7806a2e9902068fde2ccf1d9160e17ece08049e27d19f773dd078ca7f43d76fdc0e6ee3b90600739ea187a8f1d4fd3f17ddf73d2f5bd1060f38cba26d1762b4604e2fe1333679e000ed76ab58395025c044cc8fa59ae578f9482e6944e5bcbe7d895238690c0de48c8cd4a9374bacbbe754fdfb96f94cfbb9677a34b1dc226445331e270f018701fba72dcc90193e6faa10fe986863f9876bd5bd2ba4850937142bea5279ff540147a!
 b54b9873df42b33e420e73c8b044a3346e460441f4403035731438542a404c!
 8000d7f7
7d8380ac67c295b7d3e7079030e2fb6124645b94f13f0cb446830064a12fccaedb1b06efcb77430226445f87b52e444743f0980a82e818e0d76ab5033b39602fcb3b0890661da02c5d8732b9893801c833fdb9ef4118426e17513c888ffa084f7787f3cc51c070dcaf1b04294853bd62bcb2ae8d946e9a7b3c889bf1a1a8d98a812f0307cb7e805413d6f94e6faf2ca0cc0a51d8d02fb4858abbace6ae3c05cef7a9e9f8e446f9dfba90b37e55916e260441c8fc1301275aa14180af97da0f57fd8434d3ee97f64c35e918a35c3c11da184103f0047233f9198d31bcd11cb087efb3ad9540a11f9a9ac9e5b66adb0b09b6eeef19ee3019e0b72e40a723c97ae789a652a44c39f75a87f46a4e18e8f500a534622820dba45c76b3fd81a8a19569df6fd73285c92bc2204434c27bd11c70703407ece1fbd4cd0e111b9fa97cbeaceb0d8b8fe384ace7ac290a483ed0d5a42a16888fc60471c499d331d2cb58b890e86ad183b4970fdc6797c776d40ec3bd465355e62a236ab6eed54fa3e200310601a37c1fdbd72faa0c2db069aa37020923a283cd180351e51e59b6467424423423dac74f114c47ccb64f916c4a7ccfd400c22f334470f20473ee5ade5691be83843088c80b0e00072b058c40c038cbdb151d993bc8b1199b657b4ce832be595677769086e5439bd6daa57611a3806!
 8aa89f234a774b38ca8217486ea99a8202a8bcb2184b99b3986fb094240d6cbf03d015003370fb025e6049627372b3645d5adb5160e3c0deda8a1addb6a6aebc491b642683271bf5e598a1ce2a320421fb1dd22930a01ac5dce49ae485aeda8aa111a7af5b2ec0f38487091110a9d430cf41314f89e4f2693320dab38c0349127b1bcbb43c486421d62b4554f4deb181e1ed19ffb8787b8c51ebeb64c8e56fafc63a0ea82ceaae2dc6b6bac2e76987d34606e3622cb308c99eb0ccf58d85a7c1412184682a7112037932de016d0d77657150246ade8e4db8396b7d25a3e0a201e958b8f8826c3ad771b0d10faffe7be1292ac832a02a2c0278a812d275a1cf10772fdb0a139c7ee6c6936ccbe8486e12451c9a40b02415e281347e86b0e101507ec58cd75587f070204a4929d39f828e9666c3812f01b9a2bd29e1ec78987a0f5a04f340dd9756d3da972fc23e606b77f6091e0728218744b617b8d0a92cde496eaa51f9a11dcd41ca0aa3cc0f57d1ccb8ff27d7733d4709777474eee22849dd24607d093a6a7e3bc8d16d1d460376bb87f101adf1f880ef6dc7040ba99434f7e2a7bf2237497582bc0c6738b00df4180b5bc1a66ff42fb7ca7ab0732d0d1f177e6138c43c0b6e6008513cf6d7ed1d039837fc45198cb212e124cfe318a1384d04be8f2baa493ac7ea494fc409b8!
 9a242c0080e201fc1fe367e7b7a80c26464032b3e237c7f64dd6e0e65d2615!
 540d3f4f
9a3231adaa16d7cb2f3be01241c36e31f8584426b38e926a86efa3d0a32e087c04d0f40781c58b89cdd08519f644a110a41a6144208942b3d812ab494854220e8f6c4e1a41b1e0aa3caf2bbd514c34a48a5b6505751ee27f41b26d7f71d39ca8d8690505eef5519a034dcd0b996916e66db9df58515600b50fd7e5f470105f7bdfc4e585f783bb98110358aac8f089d8e64c6b8f3f634b9101c3a755c2b60aff50377f259e66486168953da62b66f3092437643c250748804ac6d403755245717df93bdee7f01ff875929d2c0cf399f74935865f941bcb44f3de893a550177a9475c1b8f3d52ba9973483434bd77c7feea1bd1150569799e92162323753d0488300bb2d771c124a44ec8604a19fdb5d87b5f5955bc99585ef50f03fc027c631b4025e7db6f655e0678100e89bbf890e0507d2e63ffe4a1a3ffb423e0d7eb83b022c5728286b01654bd942affd956b84bb20619c3b0c77869484954b09ddab9df7d737562f009b40afdfefdfaa10a009e1bf818f269db87b2cbcf1d287f183679e88a6a25f983b4965893152a9aa6fe0ee300d1b1507d87e81956391e0286738b4e60a16de4d4936929b4b6fbff406051bc0ffe22c945a05146862b8ad63fddab244a67fb67a357a2d9ae29e38de8503944e78dc7e416a5b6bb6f56d273d09128ccfef5cf482ce4548ae66acaebef2!
 1f72b3fb26f003e0937ebf7fd35e7300a0dfef7fdebf5b7ffac70f2fe69be9df2e5ccc75de0e3bf30020910cec3a4f7ba373f96c8c1c9961dafcc339d63ab0bc9ab07a65b1bbfaeeb9d755a152e03a65bae528e00e1d9fbdfc8ddff9ab2c536f9c7fcbf4e718f4d574d358d259df2fd9dfa3dc19b263757852241825a7092c2fa7ac5c59c95716bffe0faa272f011fa2ad7febae28a0dfeff73b17cf7fbcf8ed17ff284db395736fe6a512a843725db37eee58d467d0f2be37a29adb0f12ea905c8585c594a5cb2bdbcb175efca7f58dd5ef001fa0c96f7b68d82507dc2925dcacd56aefe189df3dfde4f37f73ee4dffe1b38feb704451152eb9097116feee2ef14054e9c67e91907460e99d8ca5cb2bdb9dc5975fed5c5efe5734b9a798c46778ccb5bbf1b3b95aad76e8f4d32ffcdcfc532fbce847e2c9f99321762f73ea746d2906bbc6f1949eb8dd0de62ac3dd226f374ed9521d05ab977356df91ac5c5beaad5e78e99f572f2efe1bb00e7c9f11d0bfab0ab04a68365bcde7bff6fa9f8ba9f837e65afe97e2695d3fc89e4641573abf5011fa2f9e7226ed20c1fecec0a2095ff38cdc84a58b399dab099d6bcbdfef2c7efdd5d56bcb6fa12dbfb1dbe4efaa028c12be0404cf7dedf5df8a664e3ddf3ada8ce36968cdf8a44a4f5c3a6ed06aea89ba0818fe198f95dd0d48bb!
 b074698d64437ed6b9f4caf2eadbe7be2937bb1db4cf7771129e2f44014609!
 07817b67
1f7ba6d53efdcc73f1cca9a7fd46f053edd8270a3422ecd6b84098c6a9696a0c484faff6643de85ccb91a9a4b391165977796df99d6f7ebb7371f1dfcda45374b2a3f69a3cfc0814006036270920683ffecccfb71f3dfb743815ff523c15cf888612cd2301be5034831055e408e1a394de5e2b7b39143e4937456d0992cd846c537edced2ead259d85a5d58b8bef52d04527399bc056bfdfdfc1f663c7f6a3fcedb0d9aae603f735a7669aadc77ef591563cdba6211e8882785aa1ee0f447848151cd4c951868042f6d21fa2b89e745737d4f5f47b6b5716bfbbbede791f90e85f8966e84cf6c624561f18d317f1e369a38843c03d40c3fc7d198d12bbe3bb66fe6c71560037d089efa7e809f7ccf9be275e8ee58bfcf5b8718d83e864b98ee6fa835493b7471fddc6be49a58802b8b9db3ee089c6f0e3fef3f9ff07fc2ee043adf678150000000049454e44ae426082</data>
+        <data format="PNG" length="4467">89504e470d0a1a0a0000000d4948445200000040000000400806000000aa6971de0000113a49444154789ce59b5f8c1c475ec73f63f7c6d5a437e90e63e88635da966cc9b397a0dbbd186557671107f280f10338e8246210ba2081d0212488eee9780089132fdc1b798023e2016c107f7c202e1b1e4ebba773d80d8a6fc7d2f9767c67e77a4936e9811dd24db6e3ae78c76e1eaa6aba67766677d6f9874449a3dfd64cffa9fafdbef5fdfda9da5a5114fc7f6e16c0857fe1db729b29a03bec2201c8aa9c04b9ad24dbc0302987dda8a410203fa4bee842ba4dedf22bf121befa630de03de0ceb886b500904ccf1fe39154822ba09d2969fa71069e9681805842e8a9be3b09ed6d706d257d1bda89eac75b5a195bfafe0470800402e7c3e90b07d214841320e138f03af0ce58b3ef2940f07ee0c09caf26d5a8c3460aa10b5106411d6456f6855686dc81560e7475bf0b5107f2aefa1b206d2b69fac331f6015a577fb218e028b07990db0f0150b1741501c6e2d2f4a5ea9beb2510d8fa494209dfd1dd11928f480a2728e7738076c80cbe9d295855e18f5182feded67d8482bb00e25c3d484a25db196029a50190e9a55be97f68d2aa3e3f3ee8dc2b0a90ca7271a6a459fb48bdd6f4f7b9ee4b09fea47a804140a011201ca0d!
 b6f71c94784806ef5f9c107508081bdd30f7f4fa8356f7ec7ea4780ec42bcad06106bcb24a99269a6be97a91aa891e8df3f54d9bd7f04182f80ef2898fa0eb45308b5324207e254593eca4a44781e44094c6b2f208e2a560eebea3a4fa849bbf55269524be312a57669fbf5f794ae52426a05c8fb55801010580973d31e7116e3fa01ed2cc69fae4819e38a80d4c82cc6754a1967319e0848a496598ce79432ce62021110cb81ebb48ca5fe3d8b09f4f5d5e7a759fffbdb32c62f65f14b5f8d6badfb814051143c7bb978bbb89f76e703cadbc3e5ed41f9aefac9c877de2d8adb77b4bc5d14df7de3f6bd335f2e0ae01c1098798df339641090e4f7a1bd09c807e54ebf4c46c91cb0b517d1321fe86343a423cbf636482d11d096a5f42c9bf607e500cfdee7ca11cdaeca1db027faa5374ce6ea7d790e42c2fa2d459aad76ae5c70225564992b6f937621f40538368d29401376acbd928a04dd0fa0008d808328411b885c4f7650267ab23da99f9fe8c871e5b504d91644719bc0f29122253c1a9077131ac73ce22c61b6ee117562dcdc65ad199166364b564cc30f7143983b1910a72a3e9159bacf88f75080bc0f04f42c3f51917b59de8638866803566ee6849e8770e0c2d321c202cfb5959b149ef6021e711bc2e30149060bd60c4907d22ca479739d78d5a6b9bacec2a900e!
 182efb8dc0f09f6bcc0b80838b0e57794e75bba929346364c263c33af261fd!
 45570654
f42b20d9e0349a6649c81b4b40b161049087ce54acf4fcfd0dacc4922c9e2720b21444d760078800386c3b5a228f8f5aff1f68bbfc8fd8552009ad886c93885c5575470154ec1dc497dcf44459b9ad8fa52670bd636553c818e1f4c2e2200d785280552585e8d893b31cdeb8b2fadaf2efdfec6e6f2f5a228c64abbc6e680fd2c3f0c01f1262c5e495838e1d1380eded1caf539d8b6b6bc80446a6910a02d1f57106152f146bd0cca520bceff5cc0d255909cff79d70dbdf066f85bb55aed46511477c652c0381cb0df9a1f5cfbf12d586ec233f31ee1343d44d8daf2b6ada4a78b283de950e6203a02356c8f4ec919c84ae9c28573010d3f60f5357b614d70d1b3c2dfacd56a6bc0fb4531ba3a52c601dbc32fc807e54e458ef0f76bb760b99973fe347d93ef5daf5d604f6a0e4023c164a1e8c91b64e040d22dbf37d77975f5acb9d3307bda279c5a78549c08ff62fec9e73e031ca9d56ab5510a28e380c9e117d883721fcba79bb07a1d9e3d63e31956a97042ef3e8d80514870852aae18cb070ec45d68b80ab1262709ebfde35d38651310b27885065dfe54a4f2d796af5dfa1ef0feb0f9f5b2c17804024c1b65f92a02e21416afe69c7f9c72f2309420772141477c8996a9d45e41d2b378e89411a0a95360559ea75b780a1aa77c02bff1e9e0b1853f027eb856ab59231520!
 2504231060da28cb5711b0f42a9c3969134c0d79c08012762161921209797f3d22311cd0d51527ddf72c7d7fe579a63df584cdfcec1ce1f4ecd9b3e7bef479e0a15aadb6cb45f638601402c6b13c13b0f41a046eb9e673431a95410d4542950b2a32d5296f6c90a08b2c6d935a775105d761c8d2ef3afb2404be7bd83f36ff3b8d4f9f9da55cc9fd0a600f048cc3fac9962a84cc4e6b4b6e97966562e0811315b953b1e00027b8dae281b6b8617fdf51a5f0e0e8eec90f22c1f6e0ec9919bc7af023f3a79efd6dd452e81bd1480ee8b33c7bb37e6b4359c73ba64bd7c6abd823905055c6084e48b5a5d34c97be65d9b7474c7e1812dc2938736a0e2c9e9e7dfcfc02f060d52b8ce48071fd3d125a6d78ea517aec8d765d7b22614009839c10684bfbaeb6b859fbf5fd27df37ce49b52c1bd3b30f86e1ece700af3a9a5d1c70107fcf04346fa052544bdd9b6690576a87f78b04e3e7db19d8da0bd84e5977d8170179f9bc99e3e0f936ae3bfbd3d327e71b54b86017078cebef4d5e9febf5695be5fe015919a9f521c10c72581b788f61fd5ee4e754c63586127a9c32a18c33ff58887079646efaec6960b256ab1d2e155045c098ac9fe4ca2a69a6b2b4a8535accf8e95d4818e51d2a4a30bfc7296515da51bb4dd895fb86adf9aae5ab5e6502ec3a04f51998144f000fa332c7dd!
 1c30eedaf76c883734fcbbe0ea4d0a570c41423626276ceb842b0517901d25!
 f354df47
e5be416f32ccabec94f7853e84be8f5f0f4fb8f5e963c0919e02c418081856d34b75da4a65ffa0b76f504582d89f13aab9807d54d502bc3ab4650e16245b0345cb81718e4242bc054902eb9b108636125977dde03860d76ab543bb39609cb56f1090aa583c49cb54d5b0f550248ce284447f8fda6f20e96d35121eb3b1014fd890541430e8f727f473bb90c4eadd6b3715bae3b6e628a031d53812f88d10f821e070af1e106f2b25ec9be7576a7baea32232a1d76ae05652d8ca9ea2d976731dcd198eae034caab821106a8ddb36bc7425a77d13a24e0bd70d387b5a30d3f048b6728465ab494e96f5843851cb2f6aeb2df86a1dc1d41974a5c9779512d24ef4e36ad658c339609fb56fa4946ad2912e5a4853bcd80f09998ef9f5e09166f2b0715312679709fd94348d59fc5a447213bca3b6da59eaaafb6c208f7501292d1116ba2a6c0e2a39835182dd85a01e201cef2114071c1ece01fbac7d23cd64bd0adbf70e5354597c08272489f2126dcdf2d19baabc9dc8451a610371cce5ecd3216d6296ae442a5b1410a579e95d748428dc21b98354116415093890643181df78488d8e9203dc110818b6f64d5d3fa9583ad0450b739ea00f0943bc83a72de69bdd640be2ad75c220847ac0c2a37308dfe3cca9055a9d045ba88830746c654997be38c1d7fd41cb078eda7be8f5eb2!
 1799743c0e152017ab7b78a80bd2c6f766eccb199aae523b38b9c2a6444a9fadd584a7615cbe796667beddf6517023143da95847e40829ae4c6564ce808150708ed15f464face2b5473870124f42a4b0ec4698c6db90035a8c401bee847c05e962757e7021259128e2b20d70848b4655c0be6a69462c24031b1e755dea397113984c7000f5c66893b399e056bd720be25096703e53524f87affc09bd416af20c1e40e06096200090a791e49daea85613d0e68ebbde5712cdf438055ba42892a7b0b07e64225eda33a769f1ce016d3b412b19492cf7f566df7b79a928b7fb34e6b799dd959c1c2bc47a20f48c96ede5f4b1c3cb95241028348100a016927da06ee01857283598980a196dfe9b7bc914b19cc0b95a498fc7c574436ccab549af106380a215f38e711dd821c4f557d4254add0788ba3765facef79eaf7c029f3923cd52e4fbb5c235b6df02c8fbc2b1385130ac501a6d2724004b88ece010663f061b21ab131203d85a444ea42e763109e54934fb6d4657196ab3360549e5745429513f47c44a59e10676a89acb7d7efc92c7e4bbff9aee280ac3cdd35cedacfb594d03bf63658d1d9159357233606e44ee91d8405f916d852f979e32d82de7134fdbe81accff3d8c509184ed01c10b5c196f2bd344bdf465589950284b30f07d8fd08b0b56c4c41539fcadb55e51d8!
 827d80b01136a0bdcf8f35efeefeae8d758be7adf20124c2e3184138403710!
 7e456c2d
acdd5b7a54cdf546aa35b22601807e4c311d09342676b71c9eaa3d6fed0bcdd4c4287c3529675fee02860698e184c818721417b85a148902a0a6cb55bd04ebe4f9704b80ddc35bbc38716af2577028b77e32c25705ce22cc5735c92aa142e8954329629aee5b291321975bc23334169f9bdf60e0795106f692ec994db4cf4012c13ebf7e4b065348084def5668f517b0157c0da8d84b823779a1b8b6ba8ed58591485f202b2cbc3979adec4e22bf11d1cb7868c0b9c0032098eab8ea18ee8cf4e8b5c088ecc9c5403d96fffa02f754dcab5efea8a52e0339c4b462168100943bcc3fa06a45b10dd5c7c3dcddadf05fe07bd53a4dc60ce626b330a65c261b6a38289a0208960c253b9e584c7a87ef37a6445f585232b37b0171edb1f01bdec52a7b6bd03d9952c2ef0caac7314127a88d80b0993ea3de926acdd5ab917dd58fa165dfe0b78174ddf16c0a50bb5cf033f815ad285fe8cd5241c8afdbffe85e4c485e79902dbdb1b01862bcc3157df51d99c81eb8c4fb947b80712462d87c138840c569a31e9cd8d1f6c6c36af001d202b8ae25e89004508ff01bc3deec4ab6de9e517de0a1f7dea74500f7e6acea1b4c40849b7ac1bb4b5eb8b53455c86034cbdc0c89148a82867978bedc2e2ab31d1667477e9d53f79992e9bc07f53d928b5ca4bd9677b7474dbb8b59a8a2cf983d5!
 56f0f7419d0783637b20a00beb697fbd20ea94e702bc2a02c64182a9310e39dfb07e15e248d26cbef8ef69a7fd4de03f81778ba2b86bae3904e31f2adce373ef8bcf7f6a994ef2e78b5773e59361681cb0dee9cf22a3945d5965af7658a921f6d5120723cc6a8dd14cbe05abcd98d5eb8bede6d5cbff20bb3206b6a0ff44ed81cfd7efd1de7fe12f7fe58fe5362f5ffe26981d96ea5a4daa919d295658952cb2525f30d71d08093a5e482268be96b07263255f5bbef857324bbf03bc85b2febd8f4401455114ad6b8bef2c7efdcbbf97c6f9dac56fe43d253001d196527d52ad1f0cab241904dc0f122620ba094bcb094bd7567656af7ce56f373657bf05bc8922bf9d8161f738e0c352c2dd5aadf63a96f88db33ffbfc9f5dfc069fb9f0a47a8b409f4532f9b9767dd5ff4d42aa3820cf2a9c700024c42d586be62c5d5fd989962f5d6a5d5ffd2714b9c7e8c06770ccb53dce0fdd77abd56a47ce9c7bfe53cf3cfda5af10f0e4f9c73d7014db479512baa0ac1ab73368f84a59d512bb3935d63b45a695d18b1334b1ae5ccb69bd2659b9b59435afbcf077cd6bcbff0c6c006f3004fa1fa9028c127cbfe13fffc597fe1037fce5a71ee381d0d7094faa9643d4d171802e6062a93820d71ba246f69d1fd40830e70b931496ae421445346f2cbd112d5fbcb47a6bf91594e537f79a!
 fc47aa00ad840700f7b9dffdfaaf06d3335f980dc330f073668fdbaa7688fa!
 e70cb30c
66a7d41cab0830fb0b7d0810eac86dd281a5e63ad1a67cbff59d17579baf5efec7b4d36ea1d67c9b4ac0f38928402be130f0d099279e6b34ce9c7f6ee6f8c23984f7a3f32774ddce2d8fc2b9964a81d1458d3e29d48453096b37546adbdc88bb7967757d79f5e2bfb6ae2dff9b9e748c0a76e47e93878f410100fa709200dcd9cf3efb93b3a79e3de7d5839f69d41bd338a9088300ac84b0ee91c81ccfb149b21c4fd8c4698ec0a6b519c3b64babd322e9c877daeda5f5a8b5b4d2bcb67c952e6d5490d301b68ba2d8c5f623c7f67128a0f7327554cd061ef6ebd37ee389671e9f3b716636179c08eb33536937792470822389e4b0728931ae25baed34ba2dbaf6566b736593adf4fb6b3716bfb7b1d1fa01aa86fa0eaa6eb28dfa97d97dadde37a68f5301bd972a451c011e4481dc416d560aca13df35fd31c95917b883a2c0f75013ce74ffc013ef8de5935040efe56a691c4605cb13a8b8e430e5e44d2b5065ecbb948ae80277f73a073cd6183e4905fc5f68ff0b020da434c68686cc0000000049454e44ae426082</data>
     </image>
     <image name="image1">
-        <data format="PNG" length="1027">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003ca49444154388db5954f681c7514c73fdb4cec6f25cacc21b063b2ed2e66db6e70919dc2423618697ba9050f063cb4e0a15972d05cb26cf11482097bd2c006647b4b40a43d545811313908bbd84003463660252b4960161a983984ce2843e6172dac877197cd1f152bbecb8fdfeff7e67dbfeffbdeef4da8d56af17f98d2bd29ce175b0066d3cc03c463f1527bbfb4bcb4f86f029f397e30757b8a782c5e322e19a5c27b05c6df1a271e8b97ca1f975bb989dc74dbefce0777a68f7fdb6da16e29caf3e5d6d4ec14005b8d2d6a5fd47070284c1658ff799dc65a030707b369e6e3b1784943a3deac9f9acd91c0c5f9626b6676067e077a8333c774287f5e46131ab7debd85b56f5159ad5078bfc0e64f9b6c6e6ce24807d776f30b77173a00a189db13d346cc283938008cbf33ce706a18dff70987c31d90adc75b54beac0050982c604b9b8888604b1b7fdfa7b21adcb5ebd193bb995b4fa693a42ea6d869ee60376d941715ce45cf810f9c057ce81fe8672c3346e27c82f26765f6b6f750cfaa4407a384953063a363e8619dc3df0eaf674633733d236f8c7c947a3585785990bd9cc5eff559abadf1f0bb872406123c539e11166!
 1fc5f7d7a452f8a50b876e51aca4b0a6bdfae51fda14a7420caa172483412a5fa7d95b137c7e67a8ca4f1cb93a74fae675fcf621d585c885cc04818e8bace836f1eb0fbe32efde17efa5fe98703e87da1170e408fe8642e67489c4f70ffabfbec6def91bc9864777b97cc6866eeccc2dd85450d8dfa6e1d4d68589e1574771fe46ee688a562acacae50fca488d934b1dce0bebd0a5550982ce0480721048e0c6aa500d49bf53c82d27064b8135cefd3919ec41832880fc691aee4ded7f7d084467a244df6b52cbeeba3f5696ced6da1090d24c1da7e204bcb4b8b8e74b0f62d2ccf3ac2dc722d34453b9241b556a5f86911d336315d134dd102a6820ee3cecb736d375fdda8a20b1ddff30367cf41131ad293e842c7f22c8c2183dcdb396e5cb94165b5424444909e0cfca43cca18a0dddcf5dd7ac0d4b310427498b79959ae0522a80104e7289cd0f8c8ac309b66de36eda0d93dc003555103cddb99b46b207400e4beecc87742e3b62d2d2f2d4e7d3815329b66beba51a556abd1683650857a4273d335b93a729595da0aaa50ff5ae3e30033b333a17ab3dec940ba12dbb351858aeff901e3be8061a3d938a1b1725ae06e0060f1cf71590248269324079398ae49a42f422411c17e6ce3704a1fff93750368422b351a0db2e92c124972301938ed7044e3d0f3fc9a7213b9e9f!
 63c568754d2f134b6b441c2a38d47ccccce849e2b70378071c9283932e8f7e!
 eb9fc9f0
2ff9dfd013eede379e7d1c8f20000000049454e44ae426082</data>
+        <data format="PNG" length="1004">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b349444154388db5954f681b4714873ff90f59850d588780975a8e366e69944669ab22976ca903362d2190437d0d39d4a287605aa4e698c55491a02757c267af0f019d4a1d8a413904641a13097af025450aa468446b18284bbd35c25a5ad3e94168233bc6d0943e5896d99df9bddffbdece6c4829c5ff11238383c2bd8202106d9105306366b13f76d69cd2bf111e3afae0ce6777306366d1ba6415ed5b36376fdcc48c9945e71b47a517d299fe3cfb0b3b7374ed6084065138f71c955e4a03d06836a87f5b4722b16fdb547faa22b6041289688bac19338b0606b576edf86a9452c195cfe595524aa93f5510fbbfecab7c2eaf569757d57e6b5fb5b65b2a9fcb2bf5bb524faa4fd4eaf2aacae7f2eaeee77733835aa1854f173256cc2a4a2400f39fcc733171916eb74b381c86bf8051683c6db0fe60bd87e1b68de8084cdd4474047850de2833d88fe1c55b8b75f36d93d45b299aad26de8e071a4c4627a10b9c02ba70f6b5b3cc4ccf90984ab0ec2ce3b65c22c311cc988986c6dcd539a2a7a21cfc7d702d7925991b4e7d90fa2af5660a4ec3ecfbb3ec8676d9dadce2f10f8f499c4be00ff984cf84e9ee76193d330a2330f7f!
 11c68507f54a7f26385f3e7cee3e1614e98546a1566aecee486ad84f5c7f3df9e5f9b7d6f16b127b83c7199e9a969a2d128f7bfbfcf4e630763c4203219813d183d3d0a7b604c1824df4d92984ae07ce7e0b65ce25371daad36c92bc9dc5061a5503230a83dab61e806c213a081aff92cde5a643c3e4ee56185c2d705e48e44ba1234823b7a8fb9ec48c27a18d9e9f56a04a0d6ae652ddd2a324e206e8e99f89e8f75c1424e48e880f3c0c1d00de2a938d63b16b810198bd068373074033abdf5c10671d69c92ec48a427119e38e45cb80243330e5550ddac52281610ae08decb8e049dc071b0f37cd7cf56ea154cbde7d4d00ca427317403dff37b9f9627b02e582cde5864fea379ca1be517f375836ea77bd8314061a55002a83dabf59c7a82881e099c37dd268666205c017aaf07000db7d1637e84f1a1b342b445d6fbd5a3bc5146f335f0e88979e290b3fe18008f00df4b8c83b362cd29a5bf4c87445b642bf50ad5cd2adb3f6f1fcbbce936b9fee175d61fad63e827303e9ac05eb243b5762da880ce0b677de6bed6aba09f7c90f1c871c2830980527a219da9522d02ecc67749c69234dd26e698893425de530fc9098c4f4a602fd9a1a0070f7b3de87a5d92b1246389b19718875ee5d7945e4867fae7b1f6ba86f58685e808b4038d6abd8abd64875e4978308175c92ac!
 a8e0c1ae8bb7eb6b05228fd27e193e21f8fff12200e5c4ee10000000049454!
 e44ae426
082</data>
     </image>
 </images>
 <tabstops>

Modified: pcbsd/trunk/PBCsource/pbcwizard.ui.h
===================================================================
--- pcbsd/trunk/PBCsource/pbcwizard.ui.h	2007-04-18 18:38:42 UTC (rev 178)
+++ pcbsd/trunk/PBCsource/pbcwizard.ui.h	2007-04-18 22:29:12 UTC (rev 179)
@@ -11,10 +11,10 @@
 *****************************************************************************/
 /****************************************************************************
 *     Name: PBC-Wizard
-*  Version: 2.1
+*  Version: 3.2
 *   Author: Kris Moore
 *  License: BSD (See LICENSE file for more detail)
-*     Date: 6-5-06
+*     Date: 04-4-07
 *****************************************************************************/
 
 
@@ -1005,7 +1005,7 @@
     if ( ! FirstRun.exists() ) {
         if ( FirstRun.open( IO_WriteOnly ) ) {
 	    QTextStream stream( &FirstRun );
-	    stream << "#!/bin/sh\n# Filename: PBI.FirstRun.sh\n# Place any custom installation code here.\n# This script will be run before your program is extracted into\n# /Programs/<ProgNameVer>/\n# ${1} is the directory name.\n# ${2} is the username of person performing install.\n# Return a '2' to halt the PBI installation\n# TIP: 'kdialog' should be used for user interaction. \n# To interact with the progress dialog echo these flags:\n# echo 'TOTALSTEPS: <num>' # Set the total steps of the progress bar\n# echo 'SETSTEPS: <num>' # Set the current progress of the progress bar\n# echo 'MSG: <text>' # Display this text above progress bar\n#########################################"<< "\n";
+	    stream << "#!/bin/sh\n# Filename: PBI.FirstRun.sh\n# Place any custom installation code here.\n# This script will be run before your program is extracted into\n# /Programs/<ProgNameVer>/\n# Available variables:\n# $PROGDIR - Directory where the files will be extracted to.\n# $USERNAME - Username of who started the installation.\n# $INSTALLMODE - Set to 'TEXT' or 'GUI', depending on which installer is running.\n#\n# Return a '2' to halt the PBI installation\n# TIP: 'kdialog' should be used for user interaction. \n# To interact with the progress dialog echo these flags:\n# echo 'TOTALSTEPS: <num>' # Set the total steps of the progress bar\n# echo 'SETSTEPS: <num>' # Set the current progress of the progress bar\n# echo 'MSG: <text>' # Display this text above progress bar\n#########################################"<< "\n";
                     FirstRun.close();
          }	
 	
@@ -1030,7 +1030,7 @@
     if ( ! FirstRun.exists() ) {
         if ( FirstRun.open( IO_WriteOnly ) ) {
 	    QTextStream stream( &FirstRun );
-	    stream << "#!/bin/sh\n# Filename: PBI.SetupScript.sh\n# Place any custom installation code here.\n# This script will be run after your program is extracted into\n# /Programs/<ProgNameVer>/\n# ${1} is the directory name.\n# ${2} is the username of person performing install.\n# TIP: 'kdialog' should be used for user interaction.\n# To interact with the progress dialog echo these flags:\n# echo 'TOTALSTEPS: <num>' # Set the total steps of the progress bar\n# echo 'SETSTEPS: <num>' # Set the current progress of the progress bar\n# echo 'MSG: <text>' # Display this text above progress bar\n#########################################"<< "\n";
+	    stream << "#!/bin/sh\n# Filename: PBI.SetupScript.sh\n# Place any custom installation code here.\n# This script will be run after your program is extracted into\n# /Programs/<ProgNameVer>/\n# Available variables:\n# $PROGDIR - Directory where the files will be extracted to.\n# $USERNAME - Username of who started the installation.\n# $INSTALLMODE - Set to 'TEXT' or 'GUI', depending on which installer is running.\n#\n# TIP: 'kdialog' should be used for user interaction.\n# To interact with the progress dialog echo these flags:\n# echo 'TOTALSTEPS: <num>' # Set the total steps of the progress bar\n# echo 'SETSTEPS: <num>' # Set the current progress of the progress bar\n# echo 'MSG: <text>' # Display this text above progress bar\n#########################################"<< "\n";
                     FirstRun.close();
          }
 	

Added: pcbsd/trunk/PBCsource/pbistart.c

Modified: pcbsd/trunk/PBIsource/pbi.ui
===================================================================
--- pcbsd/trunk/PBIsource/pbi.ui	2007-04-18 18:38:42 UTC (rev 178)
+++ pcbsd/trunk/PBIsource/pbi.ui	2007-04-18 22:29:12 UTC (rev 179)
@@ -1141,7 +1141,7 @@
                     <enum>ParentOrigin</enum>
                 </property>
                 <property name="text">
-                    <string>The program is now being installed. This may take a few moments. The wizard will inform you when it is finished.</string>
+                    <string>The program is now being installed. This may take a few moments.</string>
                 </property>
                 <property name="alignment">
                     <set>WordBreak|AlignVCenter</set>
@@ -1224,10 +1224,10 @@
                     <enum>Plain</enum>
                 </property>
                 <property name="text">
-                    <string>&lt;b&gt;&lt;font size="+1"&gt;Installation finished! &lt;/font&gt;&lt;/b&gt;&lt;br&gt;&lt;br&gt;You may now close the PBI install wizard and start your program.</string>
+                    <string>&lt;b&gt;&lt;font size="+1"&gt;Installation complete! &lt;/font&gt;&lt;/b&gt;&lt;br&gt;&lt;br&gt;Click "Finish" to exit.</string>
                 </property>
                 <property name="alignment">
-                    <set>WordBreak|AlignCenter</set>
+                    <set>WordBreak|AlignTop|AlignHCenter</set>
                 </property>
             </widget>
             <spacer row="1" column="2">

Modified: pcbsd/trunk/PBIsource/pbi.ui.h
===================================================================
--- pcbsd/trunk/PBIsource/pbi.ui.h	2007-04-18 18:38:42 UTC (rev 178)
+++ pcbsd/trunk/PBIsource/pbi.ui.h	2007-04-18 22:29:12 UTC (rev 179)
@@ -1130,7 +1130,7 @@
                 QTextStream stream2( &file2 );
 	     stream2 << "[Desktop Entry]\n";
 	     stream2 << "Exec=/Programs/" + ProgDirName + "/.sbin/" +Binary + "\n";
-	     stream2 << "Icon=\n";
+	     stream2 << "Icon=" + Icon + "\n";
 	     stream2 << "InitialPreference=1\n";
 	     stream2 << "MimeType=application/" << ProgramName << MimeNum << "\n";
 	     stream2 << "Name=" + Binary + "\n";
@@ -1490,9 +1490,12 @@
 		   }
 		   
                     }
-	  }
+	  } // End of Start Dialog check
+	  
+	  
+	  
  
-     }
+     } // End of while reading setup script output
 }
 
 

Modified: pcbsd/trunk/PBItext/main.cpp
===================================================================
--- pcbsd/trunk/PBItext/main.cpp	2007-04-18 18:38:42 UTC (rev 178)
+++ pcbsd/trunk/PBItext/main.cpp	2007-04-18 22:29:12 UTC (rev 179)
@@ -116,8 +116,28 @@
         // If we have a PBI.FirstRun.sh file, execute it here first
         QFile FirstRun( "PBI.FirstRun.sh" );
         if ( FirstRun.exists() ) {
+
+	    
             cout << "Running pre-install script...\n";
-	    runCommand("./PBI.FirstRun.sh " + ProgDirName + " root >/dev/null 2>/dev/null");
+
+	    // Write out the wrapper script
+    	    QFile file( ".PBIwrapper.sh" );
+   	    if ( file.open( IO_WriteOnly ) ) {
+        	 QTextStream stream( &file );
+			stream << "#!/bin/sh\n";
+			stream << "PROGDIR=\"" + ProgDirName + "\"; export PROGDIR\n";
+			stream << "USERNAME=\"" + RealUserName + "\"; export USERNAME\n";
+			stream << "INSTALLMODE=\"GUI\"; export INSTALLMODE\n";
+			stream << "sh ./PBI.FirstRun.sh\nexit ${?}";
+
+        	file.close();
+    	    }
+	    int result = system("sh ./.PBIwrapper.sh");
+	    if ( result == 512) {
+		// If this process returns a number 2, then the FirstRun.sh failed
+		exit(2);
+	    }
+	    //runCommand("./PBI.FirstRun.sh " + ProgDirName + " root >/dev/null 2>/dev/null");
         }
 
 	if (NewDir.exists())
@@ -917,8 +937,20 @@
     {
 	cout << "Running install script...\n";
 	// Run the programs SetupScript
-        QString command = "/Programs/" + ProgDirName + "/PBI.SetupScript.sh " + ProgDirName + " " + RealUserName + " >/dev/null 2>/dev/null";
-        runCommand(command);
+        // Write out the wrapper script
+    	QFile file( ".PBIwrapper.sh" );
+   	 if ( file.open( IO_WriteOnly ) ) {
+        	QTextStream stream( &file );
+			stream << "#!/bin/sh\n";
+			stream << "PROGDIR=\"" + ProgDirName + "\"; export PROGDIR\n";
+			stream << "USERNAME=\"" + RealUserName + "\"; export USERNAME\n";
+			stream << "INSTALLMODE=\"GUI\"; export INSTALLMODE\n";
+			stream << "sh /Programs/" + ProgDirName + "/PBI.SetupScript.sh\nexit ${?}";
+
+        	file.close();
+    	}
+        system("sh ./.PBIwrapper.sh");
+        //runCommand(command);
     } 
     
 }



More information about the Commits mailing list