[Added server tools activity indicator Dan Pascu **20101206062708 Ignore-this: 10e792dd44637c5ba3a698af4b3e2df0 ] hunk ./blink/accounts.py 17 -from PyQt4.QtGui import QAction, QButtonGroup, QComboBox, QIcon, QMenu, QPalette, QPixmap, QSortFilterProxyModel, QStyledItemDelegate +from PyQt4.QtGui import QAction, QButtonGroup, QComboBox, QIcon, QMenu, QMovie, QPalette, QPixmap, QSortFilterProxyModel, QStyledItemDelegate hunk ./blink/accounts.py 531 + self.last_error = None hunk ./blink/accounts.py 554 + self.access_manager.finished.disconnect(self._SH_Finished) hunk ./blink/accounts.py 557 + self.access_manager.finished.connect(self._SH_Finished) hunk ./blink/accounts.py 584 + def _SH_Finished(self, reply): + if reply.error() != reply.NoError: + self.last_error = reply.errorString() + else: + self.last_error = None + hunk ./blink/accounts.py 614 + self.spinner_movie = QMovie(Resources.get('icons/servertools-spinner.mng')) + self.spinner_label.setMovie(self.spinner_movie) + self.spinner_label.hide() + self.progress_bar.hide() hunk ./blink/accounts.py 633 + web_view = self.tab_widget.currentWidget() + web_view.loadStarted.connect(self._SH_WebViewLoadStarted) + web_view.loadFinished.connect(self._SH_WebViewLoadFinished) + web_view.loadProgress.connect(self._SH_WebViewLoadProgress) hunk ./blink/accounts.py 645 + def _SH_WebViewLoadStarted(self): + self.spinner_label.setMovie(self.spinner_movie) + self.spinner_label.show() + self.spinner_movie.start() + self.progress_bar.setValue(0) + #self.progress_bar.show() + + def _SH_WebViewLoadFinished(self, load_ok): + self.spinner_movie.stop() + self.spinner_label.hide() + self.progress_bar.hide() + if not load_ok: + web_view = self.tab_widget.currentWidget() + icon_path = Resources.get('icons/invalid.png') + error_message = web_view.last_error or 'Unknown error' + html = """ + + + + + +

Failed to load web page: %s

+ + + """ % (icon_path, error_message) + web_view.loadStarted.disconnect(self._SH_WebViewLoadStarted) + web_view.loadFinished.disconnect(self._SH_WebViewLoadFinished) + web_view.setHtml(html) + web_view.loadStarted.connect(self._SH_WebViewLoadStarted) + web_view.loadFinished.connect(self._SH_WebViewLoadFinished) + + def _SH_WebViewLoadProgress(self, percent): + self.progress_bar.setValue(percent) + addfile ./resources/icons/servertools-spinner.mng binary ./resources/icons/servertools-spinner.mng oldhex * newhex *8a4d4e470d0a1a0a0000001c4d48445200000010000000100000000a0000000000000000000000 *000000000310ee7b050000000a5445524d0300000000017fffffff67978be90000000970485973 *00000048000000480046c96b3e00000180504c54452060c0ffffff447aca7ca1d9aac2e6c6d6ee *c2d3ed9db9e37099d63d75c86e97d5dee7f5dbe5f4d4e0f2cedcf0c7d7eea1bce45b8ad0e5ecf7 *9ab7e22f6bc42d69c35485ce85a8dcb8cceaabc3e75787cf487ccbcbd9efeaf0f883a6db6994d4 *adc4e791b0df3871c688aaddf1f5faa3bde4759cd7a4bee55e8cd1c0d2ecf5f7fb6490d37aa0d9 *e9eff8f8fafc336dc52866c295b3e08aabdd2664c18cadde6b95d42362c02161c05686cf4d80cc *2563c14278c96591d32c68c3467bca3670c63b73c7497dcb5082cd5989d03a72c74177c92a67c2 *3f76c893b2e0608ed2628fd2bbceebb6cae9afc6e8a8c1e6c4d4edc9d8ef5284ce96b4e1d2def1 *316cc4d9e3f381a5dbb1c7e8d7e2f3e3ebf6729ad6b9cdeaeef2f987a9dca6bfe5d0ddf14f81cd *4b7fcc346ec55d8bd18fafdf7ea3da739bd7b2c8e980a4dabdcfebbfd1ece0e8f56c96d5f0f4fa *f3f6fb6793d4fafbfd779ed8dce6f4ecf1f9cddbf098b5e1d5e1f2f7f9fc9cb8e2e2eaf6b4c9e9 *9fbae38eaede000000000000000000a53e133e0000000d49484452000000100000001008020000 *009091683600000009767041670000001000000010005cc6adc3000001b04944415428cf9592cb *4e53511486d7be1cf6b9d4b69182a51ebc9406ca04359280c6015327c48133273c81898fe3c097 *30d181231990408c71506334800a2a149ab4b4b63de7eccbda0eda46448fc67fb656fe2ff9d785 *5c597b09ff237ebaa886c1cac2f9e56a6e7e3ab3f468f31fc0bd5b930f56a666c38053c2181934 *19054a88466bedafc0ead2c4c3d5cb198f3ddd3c5eafb5deec76067db4e070221c1a4963700454 *4afefd3b45e1d0c7cfbf3c79f1ed74006b4169141ecf78bcd3d7d6020580e5b95c58709fbd6a9c *710f64108cb1c2a1816000400160e1ea398376bdd64cdb8cd4e830e2bb6c18292cb889c2b77bdd *74c00a878ef1d10cda58a911d1a601848070a8413b8cb47dd04f14ce85411a90f5b970a83623a0 *f6f9bbd2f6c64c360db8901ff3048b250e81d73b9d4f47d1cd4af6ee62e17777b9e85d9af094c6 *939e020096bfbed6e96ba5b15cf467a6fc9ccf11a11b1b4aa034ee56c3a052f295b11f0fa36657 *ffbcf4c6bb136decedf9fcb572b63a9d89a589244689892436daf2fdd7de413339fb4b5b1fda7b *c7d1ecc5202cb8f980270aebad64bf11ef37e2764ffff95beb2d596f49f8ab7e004f51bb8a5087 *21f10000002274455874636f6d6d656e740043726561746564207769746820616a61786c6f6164 *2e696e666f7a98b5eb0000002574455874646174653a63726561746500323031302d31322d3036 *5430373a35363a33332b30323a30302c6f04340000002574455874646174653a6d6f6469667900 *323031302d31322d30335431313a35363a30382b30323a303096090c2c0000000049454e44ae42 *60820000000d494844520000001000000010080200000090916836000000097670416700000010 *00000010005cc6adc3000001b24944415428cf9592cb4a234114864f557575a7ed988b1d936802 *310e13110654441467e705dcb910dcea6bf822be80b872edc6459c81590c2e142f8ca2c3780b12 *9d9868d2495faabbca859ac45bc07f57c5f7d77fcea9837a167fc06724351f7ae3ea787f682413 *cc243489a07ff9daf6dff2cffdd251ae5a67503d617a489ffb1e4bc7542a612a2159c2942042d0 *69de5cddbc5afb75fd226162a06361b23bd0266decdcfe3eba3b38373082a12f81a9417d762cba *34dffbc2908afa66862354c22bd9c64b0090dd2d66778bb982b5bc7e59bfc40030906e8f8795cd *bd62335dd7238d5093e16b42b319df3abe6f351c8c087e36c4423273f971d328de8a4a48a1f8a9 *07c715b62bb8102d0d9873f194707e63da8ca7a2ea87344194a0460f2757359bf1bea4f691c1af *1285e2c70a3000fcb93072052b93d046fb826f69bd9dea015908301d0f00486870b16a79cce55d *612519f1b5f988c785697b04a3b09fc6c34a675016020a65c762a2f1d3fb6786eb896f297f3aa6 *76772896e3990eb719371d5eaeb9d77776c5f45e2fdfe165355fb293119f1e9035053357142bec *b6c2fedf3b96c3dfdfd692e1960c035aea01eac8b7cd7b83f78a0000002574455874646174653a *63726561746500323031302d31322d30365430373a35363a33332b30323a30302c6f0434000000 *2574455874646174653a6d6f6469667900323031302d31322d30335431313a35363a30382b3032 *3a303096090c2c0000000049454e44ae4260820000000d49484452000000100000001008020000 *009091683600000009767041670000001000000010005cc6adc3000001c44944415428cf95924d *6b13511486cffd9a8f26d3ce241da9d1c660b1565b2142290a8a1b1722887f212bb7fe25ff80d2 *858b822e2c18854a29d8d245554825ad9a4c1bd38ec9dcb933e7ba488dd530a087b33817de87c3 *7bdf432ab557f03fc54f3fa67debfa4567a1e2cc4cd982d366106ded866b3bdd8ffbbda1860c37 *dcbce2dead16cbbe650a2a383105353835056d06d1d3fab7e76bed3f362ccd4e3c58f2f336af6f *77de37c20f7b3f0060a1e2dc9ef7ee2f4e3e7e788133b2fcb60500ccadd6a63ce3dea23f3ec657 *d683676f5a5f0e659ce838d1cd20aa6f7f07805bf3def4a4b5d50883234501e052295770c4bb9d *ee8b8d8351974f5eeeafac0797cfe7ee5cf300800ebc4a859b8de3ac9f59dd3c6494dc98734f00 *37c7a5c2cfed280bd8f8742438b95ace9f98960a2925883a0be884c9dca3d7839902c0d78e940a *cf16cc7f098e024033905261a96865891805c1c86fa0d1eab7bb71a960ce9e1b1b550b466c8311 *f20b76ab35a950255870849717829114b55448085806cd59cc36186a1d27a8f5a9a4775b5192ea *f219db9f30dcbce8cb542a1c74146314638a23c7b777203ba12a8e1b3993094e52d4518cc7fda4 *27d3a1faef6bed49ec65a731a89f5becc0f38edf26820000002574455874646174653a63726561 *746500323031302d31322d30365430373a35363a33332b30323a30302c6f043400000025744558 *74646174653a6d6f6469667900323031302d31322d30335431313a35363a30382b30323a303096 *090c2c0000000049454e44ae4260820000000d4948445200000010000000100802000000909168 *3600000009767041670000001000000010005cc6adc3000001b14944415428cf95925d4b146114 *c7cff33633ce3335b39b9ae81682a9ab6068208add78531fa04f207d253f47375d16941182042a *b58ae20beb2ac84eea8eb3ee8b33cf9b174da6d60a1dcecd81f3e3cfff7f0e1a5c5882ff297a73 *e80dac62810ff7bb4f7bbb6c86c328d93d6e950e2e2a3f2faf77d0b5c2c4a0375b0cfa72b6cdf0 *ef4616c5e179fa61edf4d3f7da2d85b127fce5788e3b647dbfbe77dc3a3c6963849ef5bb33a3fe *fcf3fcdb570304a38feb67004082c9859c47678b81e79095edf8f38fda695d08655269aa51baba *570780e911bff0c8de3a6a460d8901a0d0ed785d74a3d2f8b613ffedf2dd72f875331a1ee07363 *01006000e8f1ad44e872d8ee94cccaf63923687ac4cf00d72689d0d55ad209d8a83418c5c502cf *4c0b6500f43dd963048c224250a670564f13a17d4e3b0153430f2d8acbd576069cc4692274fe01 *eb04bc7ed1cd08fa955806c44d1970d697b3fe09bc997b5c0edb5f4ab5ec0e4219a90c77886b13 *8c406a2395010084b25e7c7fa8b4592a45b75ec3e734ef31425022b4903a115a48934aadb45137 *12f963346ecad6a5721dc20802006d406a7367fbeeb70a65e2a6847beb0ad5c3be1f59b8c01300 *00002574455874646174653a63726561746500323031302d31322d30365430373a35363a33332b *30323a30302c6f04340000002574455874646174653a6d6f6469667900323031302d31322d3033 *5431313a35363a30382b30323a303096090c2c0000000049454e44ae4260820000000d49484452 *000000100000001008020000009091683600000009767041670000001000000010005cc6adc300 *0001ad4944415428cf9592dd4e135110c76767f7ec3965cb673f0cb6480911d0348231c8a5241a *63427c0713ef7c1edec07b2e7800c20d468837100202452296add8d2b44b7bd8b37bce592fd8d4 *4a280993b999c9ff97c9fc678cc28775b84f58ddc5a063e5d32c9f660f866c621a1e976e5d1cb9 *fc4f23b80518cbb0e99c931a2094e0750e25c9e39c333bd1bf75d8fc76e4fd073c1ca133792761 *e3718557eaa2da0c00e05136f174cc999f1a7cbf9035d1d83c68c6401fc57c9a01c0eecfd68fdf *579d992597975cdef2d5d27ce6f55caa5cf3cf2e0402c070925082bfaa7eb7ba136bdbf5ed93cb *f12c7b3e39000008000e3345a8cf1ba297333b2797b685c5f1640c100b03a91b6dd90b38ae7066 *e3e4685fbc4328b5d6c6ddf65382a18ce2096d5f852aa2047ba98b857e4ab05cf363c0e352843a *61f7045e158729c1bdd3560c70a1ae842216b2db988f6f734b2f33e59affb57307a5c1e3d26126 *25a87514c8e85afa662eb5f86ce4dd8bb4c7e5cac679c9e5ff2e1dc848714909221ac484504500 *b0fce94928a3c3b3f6e7357775b37af39794062eb4d1e5d6d641f3cb7e637da7febddcee348dfb *bef75f49a6b39fb8133ac60000002574455874646174653a63726561746500323031302d31322d *30365430373a35363a33332b30323a30302c6f04340000002574455874646174653a6d6f646966 *7900323031302d31322d30335431313a35363a30382b30323a303096090c2c0000000049454e44 *ae4260820000000d49484452000000100000001008020000009091683600000009767041670000 *001000000010005cc6adc3000001a84944415428cf95924b4f135114c7cf7dcc5c6ee95006441a *4420261403c610a3d1444cdcfa01dc13bf895bbe082b97868405d1053b8b1a161a280f6329ad4c *5b3a6387f63e5d74288f3824fc7727f9fdce3937f7a099e54f709bd0cbc5808b473d67c473fcac *e3527c267423929546b7d556ff11fc2ccdfbcce394399812e45094e5eee49d81d989cccf727be7 *28be22789c8c0f3397e2da69378c55182b8cd0e890337d97cf4f655fcebb04a31fbfdb8940300c *65a8b1b61c74ea91ecb5d060ab4d516d8aae344b0bfeb342eea42582506200e02ec118d543d9a7 *2fe7db7eb45b89f33e9b9b1c04000c000e455adbe84c414a0eaa3173f0ec44261100402823944d *13ca4187bbf8fe184fdea0b435a97012ce488fc10020b595ca20944a17ee0d328a4e5a22992095 *2118ddd0fef95c8e33b2771c2713b401a953777abb34fefaf148ed546c1f46171f67cff9957785 *f5ad7ab1d4028047d3de8b87b9570b7e18abf5ade0d79fcef55bfaf8fec9837ce6cdd331a98cd4 *5628d395a654893f6cd636be377a0c195e5cee0b5ff7c26a5380b59c918e30db877fd7be04ab9f *8f8ba5b0cfa0db9ef73f19a4b7962fb5292d0000002574455874646174653a6372656174650032 *3031302d31322d30365430373a35363a33332b30323a30302c6f04340000002574455874646174 *653a6d6f6469667900323031302d31322d30335431313a35363a30382b30323a303096090c2c00 *00000049454e44ae4260820000000d494844520000001000000010080200000090916836000000 *09767041670000001000000010005cc6adc3000001b24944415428cf9592cf6a135114c6cfbd67 *e6ce4c3bd63419e31f62a86e228221a5a0886eba2876e9c207c8c627f06d5cfa102e4444dcd485 *602b8a095468a189ad266932e9dc99b973ffb898a1ad98287e9cc5b987efc7395c3eb2d27e0bff *23ebfc8310587470c145df450b895486a76a1cc944e819808dc4f7d0638848282548c98283c112 *bb5631fd6172782c7e039082cb2825641acb34d3421a42c077f1d245560bdc5bd77da4516f989e *01b6458d8190cb4c997c620c4c63358d63a5cdedbadfa82d865c4e6345f3d3b53669a64fdde7b5 *ff23391a8b65dfae052e00d07caab499e9ce75384a1d9be680956f9f6f06001884c263f46ad939 *dbf04f790eda480ae0c5b33b9de70f37562bf3dcf5aae7311a725900ef3b63a5cc7ab33c0f68ae *f82ec3fe282d80373ba36e2fda5c0b9e6ed6fe746fac56ee364a9328fbf69d0300965aed419865 *52b76e2edd6b94ae2c336360c225b348f3c685476bc17ab39c08fd7a7bd4ed710020a7e17b7cbf *fae4c1e57ad51352a7595189d07b47f1ab8fc3adafe32213a5563bef3a07d1a7bd939f13a10d38 *364d84ee1ef0779f8f5f7e187cd93f999dd6dd3edfedf3bfffef2f41ddc3f941808a5600000025 *74455874646174653a63726561746500323031302d31322d30365430373a35363a33332b30323a *30302c6f04340000002574455874646174653a6d6f6469667900323031302d31322d3033543131 *3a35363a30382b30323a303096090c2c0000000049454e44ae4260820000000d49484452000000 *100000001008020000009091683600000009767041670000001000000010005cc6adc3000001a1 *4944415428cf95d2414b1b411400e037b3b39326ea66b1a9b18a12898a1102952a88885ebcf803 *4a8ffabbfc155e050f9eb4076dbd19510fc1a065319a4d32bb3bbbf3663cb84588aed077991978 *1ff3dee391caee11fc4fb0813721c028b119b1280100d446261a7536a004080100a094d816e18c *02403750fd08d38497e3c77af9e5821a626502a97da17ca184c49c4dc75c5e1c62afa03635b4b3 *35d9d85b1ff82d41e30bd51149cea66597734652b0591f9d29e7f74fbc77bb7ceaab7e844e8195 *1c9e82efb38ed2e6f04f3b6b32dd40d98c7e76ecb4e9ead702a239bbf6b3403f54794e19fd0750 *9b04cd07b3a784e46c4a89494bbab815b1d2f5ca4816f852e4794ec31853707ae527caacd5dc2c *30339effc4adc75e9282e38bcecd7db0591ffdb931fe367b79ce599c1e0e24fe7d920060b9df76 *1f7b49accce2f470bd3252726c34d00b14b3c8ec446175c15daa3ab132bfafbbad07f9ba1a0767 *0f88667bb9b4567357e68ba144a94c28318cf55d3bfa75e9375a6270970ecfdb577762a9eacc4d *14c6dc9c4c74d30b2f5ba2d1125e277e7ff99a5ed4f422f8309e014b75b799e7a440aa00000025 *74455874646174653a63726561746500323031302d31322d30365430373a35363a33332b30323a *30302c6f04340000002574455874646174653a6d6f6469667900323031302d31322d3033543131 *3a35363a30382b30323a303096090c2c0000000049454e44ae426082000000004d454e442120f7 *d5 hunk ./resources/server_tools.ui 72 - + hunk ./resources/server_tools.ui 80 - QLabel { + QFrame#location_frame { hunk ./resources/server_tools.ui 92 + +QWidget { + color: white; +} hunk ./resources/server_tools.ui 98 + + QFrame::NoFrame + + + QFrame::Plain + + + 0 + + + + 7 + + + 0 + + + 0 + + + 4 + + + 0 + + + + + + 0 + 0 + + + + + + + + + 0 + 0 + + + + + 16777215 + 12 + + + + QProgressBar { + border: 1px solid white; + border-radius: 2px; +} + +QProgressBar::chunk { + background-color: #2060c0; + width: 3px; + margin-right: 1px; +} + + + 30 + + + false + + + + + + + icons/servertools-spinner.mng + + + Qt::AlignCenter + + + +