From ecc9c4863cc89366950518bb51a6264a0369c49d Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 8 Jun 2016 19:14:37 +0200 Subject: Update all use of progress_*.png to new TexturedBox. --- plugingui/progressbar.cc | 68 +++----- plugingui/progressbar.h | 30 +++- plugingui/resource_data.cc | 231 ++++--------------------- plugingui/resources/progress.png | Bin 0 -> 605 bytes plugingui/resources/progress_back_c.png | Bin 188 -> 0 bytes plugingui/resources/progress_back_l.png | Bin 321 -> 0 bytes plugingui/resources/progress_back_r.png | Bin 311 -> 0 bytes plugingui/resources/progress_front_blue_c.png | Bin 219 -> 0 bytes plugingui/resources/progress_front_blue_l.png | Bin 240 -> 0 bytes plugingui/resources/progress_front_blue_r.png | Bin 245 -> 0 bytes plugingui/resources/progress_front_green_c.png | Bin 215 -> 0 bytes plugingui/resources/progress_front_green_l.png | Bin 241 -> 0 bytes plugingui/resources/progress_front_green_r.png | Bin 241 -> 0 bytes plugingui/resources/progress_front_red_c.png | Bin 209 -> 0 bytes plugingui/resources/progress_front_red_l.png | Bin 229 -> 0 bytes plugingui/resources/progress_front_red_r.png | Bin 229 -> 0 bytes 16 files changed, 81 insertions(+), 248 deletions(-) create mode 100644 plugingui/resources/progress.png delete mode 100644 plugingui/resources/progress_back_c.png delete mode 100644 plugingui/resources/progress_back_l.png delete mode 100644 plugingui/resources/progress_back_r.png delete mode 100644 plugingui/resources/progress_front_blue_c.png delete mode 100644 plugingui/resources/progress_front_blue_l.png delete mode 100644 plugingui/resources/progress_front_blue_r.png delete mode 100644 plugingui/resources/progress_front_green_c.png delete mode 100644 plugingui/resources/progress_front_green_l.png delete mode 100644 plugingui/resources/progress_front_green_r.png delete mode 100644 plugingui/resources/progress_front_red_c.png delete mode 100644 plugingui/resources/progress_front_red_l.png delete mode 100644 plugingui/resources/progress_front_red_r.png (limited to 'plugingui') diff --git a/plugingui/progressbar.cc b/plugingui/progressbar.cc index 8a382f5..a897d76 100644 --- a/plugingui/progressbar.cc +++ b/plugingui/progressbar.cc @@ -28,45 +28,16 @@ #include -namespace GUI { +namespace GUI +{ ProgressBar::ProgressBar(Widget *parent) : Widget(parent) { - bar_bg.left = new Image(":progress_back_l.png"); - bar_bg.right = new Image(":progress_back_r.png"); - bar_bg.center = new Image(":progress_back_c.png"); - - bar_blue.left = new Image(":progress_front_blue_l.png"); - bar_blue.right = new Image(":progress_front_blue_r.png"); - bar_blue.center = new Image(":progress_front_blue_c.png"); - - bar_red.left = new Image(":progress_front_red_l.png"); - bar_red.right = new Image(":progress_front_red_r.png"); - bar_red.center = new Image(":progress_front_red_c.png"); - - bar_green.left = new Image(":progress_front_green_l.png"); - bar_green.right = new Image(":progress_front_green_r.png"); - bar_green.center = new Image(":progress_front_green_c.png"); } ProgressBar::~ProgressBar() { - delete bar_bg.left; - delete bar_bg.right; - delete bar_bg.center; - - delete bar_blue.left; - delete bar_blue.right; - delete bar_blue.center; - - delete bar_red.left; - delete bar_red.right; - delete bar_red.center; - - delete bar_green.left; - delete bar_green.right; - delete bar_green.center; } void ProgressBar::setState(ProgressBarState state) @@ -80,6 +51,7 @@ void ProgressBar::setState(ProgressBarState state) void ProgressBar::setTotal(std::size_t total) { + std::cout << "total: " << total << std::endl; if(this->total != total) { this->total = total; @@ -89,6 +61,7 @@ void ProgressBar::setTotal(std::size_t total) void ProgressBar::setValue(std::size_t value) { + std::cout << "value: " << value << std::endl; if(this->value != value) { this->value = value; @@ -100,35 +73,38 @@ void ProgressBar::repaintEvent(RepaintEvent* repaintEvent) { Painter p(*this); - float progress = (float)value / (float)total; + float progress = 0.0f; + if(total != 0) + { + progress = (float)value / (float)total; + } - int max = width() * progress; + int brd = 4; + int val = (width() - (2 * brd)) * progress; p.clear(); - int brd = 4; - p.drawBar(0, 0, bar_bg, width(), height()); + bar_bg.setSize(width(), height()); + p.drawImage(0, 0, bar_bg); - Painter::Bar* bar = nullptr; - switch(state) { + switch(state) + { case ProgressBarState::Red: - bar = &bar_red; + bar_red.setSize(val, height()); + p.drawImage(brd, 0, bar_red); break; case ProgressBarState::Green: - bar = &bar_green; + bar_green.setSize(val, height()); + p.drawImage(brd, 0, bar_green); break; case ProgressBarState::Blue: - bar = &bar_blue; + bar_blue.setSize(val, height()); + p.drawImage(brd, 0, bar_blue); break; case ProgressBarState::Off: - bar = nullptr; - break; + return; } - if(bar) - { - p.drawBar(brd, 0, *bar, max - 2 * brd, height()); - } } } // GUI:: diff --git a/plugingui/progressbar.h b/plugingui/progressbar.h index 7485e40..9c651ef 100644 --- a/plugingui/progressbar.h +++ b/plugingui/progressbar.h @@ -30,8 +30,10 @@ #include "guievent.h" #include "painter.h" +#include "texturedbox.h" -namespace GUI { +namespace GUI +{ enum class ProgressBarState { @@ -41,7 +43,9 @@ enum class ProgressBarState Off }; -class ProgressBar : public Widget { +class ProgressBar + : public Widget +{ public: ProgressBar(Widget* parent); ~ProgressBar(); @@ -58,11 +62,25 @@ protected: private: ProgressBarState state{ProgressBarState::Blue}; - Painter::Bar bar_bg; + TexturedBox bar_bg{getImageCache(), ":progress.png", + 0, 0, // atlas offset (x, y) + 6, 1, 6, // dx1, dx2, dx3 + 11, 0, 0}; // dy1, dy2, dy3 + + TexturedBox bar_red{getImageCache(), ":progress.png", + 13, 0, // atlas offset (x, y) + 2, 1, 2, // dx1, dx2, dx3 + 11, 0, 0}; // dy1, dy2, dy3 + + TexturedBox bar_green{getImageCache(), ":progress.png", + 18, 0, // atlas offset (x, y) + 2, 1, 2, // dx1, dx2, dx3 + 11, 0, 0}; // dy1, dy2, dy3 - Painter::Bar bar_green; - Painter::Bar bar_blue; - Painter::Bar bar_red; + TexturedBox bar_blue{getImageCache(), ":progress.png", + 23, 0, // atlas offset (x, y) + 2, 1, 2, // dx1, dx2, dx3 + 11, 0, 0}; // dy1, dy2, dy3 std::size_t total{0}; std::size_t value{0}; diff --git a/plugingui/resource_data.cc b/plugingui/resource_data.cc index a58235d..faaaa7b 100644 --- a/plugingui/resource_data.cc +++ b/plugingui/resource_data.cc @@ -2171,206 +2171,45 @@ const rc_data_t rc_data[] = "\145\61\320\326\102\274\60\245\112\277\46\301\156\1\110\232" "\177\54\265\74\151\202\237\160\375\177\245\167\327\120\325\233" "\303\223\0\0\0\0\111\105\116\104\256\102\140\202" }, - { ":progress_back_c.png", 188, + { ":progress.png", 605, "\211\120\116\107\15\12\32\12\0\0\0\15\111\110\104\122" - "\0\0\0\1\0\0\0\13\10\6\0\0\0\276\216\347" - "\357\0\0\0\6\142\113\107\104\0\377\0\377\0\377\240" - "\275\247\223\0\0\0\11\160\110\131\163\0\0\15\327\0" - "\0\15\327\1\102\50\233\170\0\0\0\7\164\111\115\105" - "\7\335\3\33\13\24\47\45\75\202\300\0\0\0\31\164" - "\105\130\164\103\157\155\155\145\156\164\0\103\162\145\141\164" - "\145\144\40\167\151\164\150\40\107\111\115\120\127\201\16\27" - "\0\0\0\44\111\104\101\124\10\327\143\150\151\151\371\317" - "\304\305\305\305\300\304\315\315\315\200\237\305\360\356\335\273" - "\377\14\377\377\377\257\7\0\312\260\12\335\354\117\27\207" - "\0\0\0\0\111\105\116\104\256\102\140\202" }, - { ":progress_back_l.png", 321, - "\211\120\116\107\15\12\32\12\0\0\0\15\111\110\104\122" - "\0\0\0\6\0\0\0\13\10\6\0\0\0\134\122\374" - "\226\0\0\0\6\142\113\107\104\0\377\0\377\0\377\240" - "\275\247\223\0\0\0\11\160\110\131\163\0\0\15\327\0" - "\0\15\327\1\102\50\233\170\0\0\0\7\164\111\115\105" - "\7\335\3\33\13\24\17\20\210\52\72\0\0\0\31\164" - "\105\130\164\103\157\155\155\145\156\164\0\103\162\145\141\164" - "\145\144\40\167\151\164\150\40\107\111\115\120\127\201\16\27" - "\0\0\0\251\111\104\101\124\30\323\155\217\75\12\302\100" - "\30\104\337\352\362\25\33\110\51\121\114\27\273\24\66\376" - "\40\170\54\301\13\170\23\233\324\151\155\274\206\333\132\206" - "\204\130\44\133\54\254\215\101\105\37\114\365\6\206\121\326" - "\132\0\212\242\330\1\7\140\15\314\64\100\131\226\107\143" - "\314\11\30\361\142\234\347\371\116\104\316\42\62\22\21\206" - "\150\143\314\341\263\71\240\243\50\332\360\7\35\307\61\336" - "\373\137\221\44\311\255\151\232\351\217\110\323\364\252\224\332" - "\73\347\276\166\124\10\141\336\165\135\121\125\325\266\357\373" - "\267\264\326\22\102\130\170\357\57\316\271\173\333\266\217\272" - "\256\203\32\236\147\131\246\201\45\260\2\46\117\310\37\73" - "\263\2\156\13\143\0\0\0\0\111\105\116\104\256\102\140" - "\202" }, - { ":progress_back_r.png", 311, - "\211\120\116\107\15\12\32\12\0\0\0\15\111\110\104\122" - "\0\0\0\6\0\0\0\13\10\6\0\0\0\134\122\374" - "\226\0\0\0\6\142\113\107\104\0\377\0\377\0\377\240" - "\275\247\223\0\0\0\11\160\110\131\163\0\0\15\327\0" - "\0\15\327\1\102\50\233\170\0\0\0\7\164\111\115\105" - "\7\335\3\33\13\25\21\363\234\46\30\0\0\0\31\164" - "\105\130\164\103\157\155\155\145\156\164\0\103\162\145\141\164" - "\145\144\40\167\151\164\150\40\107\111\115\120\127\201\16\27" - "\0\0\0\237\111\104\101\124\30\323\155\313\41\16\202\160" - "\34\107\361\7\373\7\370\222\330\110\216\352\25\154\336\301" - "\306\111\334\154\26\232\47\140\36\203\152\161\156\316\151\61" - "\13\321\31\14\154\230\10\214\237\31\345\305\267\175\274\74" - "\317\15\170\1\127\140\227\145\331\31\300\227\204\244\231\244" - "\225\244\123\131\226\33\0\257\50\12\143\334\0\54\235\244" - "\237\217\17\254\135\24\105\114\264\230\22\70\347\274\111\21" - "\307\361\343\117\4\101\60\244\151\172\34\211\60\14\207\44" - "\111\56\222\366\64\115\143\155\333\176\272\256\173\366\175\177" - "\60\263\171\125\125\170\146\266\5\336\300\15\270\327\165\335" - "\3\174\1\121\321\64\275\311\161\155\236\0\0\0\0\111" - "\105\116\104\256\102\140\202" }, - { ":progress_front_blue_c.png", 219, - "\211\120\116\107\15\12\32\12\0\0\0\15\111\110\104\122" - "\0\0\0\1\0\0\0\13\10\6\0\0\0\276\216\347" - "\357\0\0\0\6\142\113\107\104\0\377\0\377\0\377\240" - "\275\247\223\0\0\0\11\160\110\131\163\0\0\15\327\0" - "\0\15\327\1\102\50\233\170\0\0\0\7\164\111\115\105" - "\7\335\3\34\17\41\10\266\3\355\112\0\0\0\35\151" - "\124\130\164\103\157\155\155\145\156\164\0\0\0\0\0\103" - "\162\145\141\164\145\144\40\167\151\164\150\40\107\111\115\120" - "\144\56\145\7\0\0\0\77\111\104\101\124\10\327\5\301" - "\241\21\200\100\14\105\301\67\137\236\311\14\226\6\250\350" - "\52\112\163\61\224\200\104\6\21\235\11\273\270\73\132\153" - "\241\252\102\367\261\107\166\136\250\273\321\367\76\20\21\310" - "\314\40\63\141\146\370\1\16\65\25\22\46\314\211\254\0" - "\0\0\0\111\105\116\104\256\102\140\202" }, - { ":progress_front_blue_l.png", 240, - "\211\120\116\107\15\12\32\12\0\0\0\15\111\110\104\122" - "\0\0\0\2\0\0\0\13\10\6\0\0\0\125\271\134" - "\354\0\0\0\6\142\113\107\104\0\377\0\377\0\377\240" - "\275\247\223\0\0\0\11\160\110\131\163\0\0\15\327\0" - "\0\15\327\1\102\50\233\170\0\0\0\7\164\111\115\105" - "\7\335\3\34\17\41\26\114\14\320\51\0\0\0\35\151" - "\124\130\164\103\157\155\155\145\156\164\0\0\0\0\0\103" - "\162\145\141\164\145\144\40\167\151\164\150\40\107\111\115\120" - "\144\56\145\7\0\0\0\124\111\104\101\124\10\327\45\306" - "\261\11\300\40\20\100\321\257\21\271\23\353\200\333\144\70" - "\147\113\345\54\66\202\105\344\142\212\274\352\271\132\53\0" - "\41\245\4\200\217\61\62\306\300\317\71\271\217\153\7\125" - "\105\364\304\213\10\257\275\370\122\12\153\75\270\326\32\146" - "\106\310\71\3\340\172\357\177\366\336\0\174\340\375\33\154" - "\260\321\121\130\0\0\0\0\111\105\116\104\256\102\140\202" }, - { ":progress_front_blue_r.png", 245, - "\211\120\116\107\15\12\32\12\0\0\0\15\111\110\104\122" - "\0\0\0\2\0\0\0\13\10\6\0\0\0\125\271\134" - "\354\0\0\0\6\142\113\107\104\0\377\0\377\0\377\240" - "\275\247\223\0\0\0\11\160\110\131\163\0\0\15\327\0" - "\0\15\327\1\102\50\233\170\0\0\0\7\164\111\115\105" - "\7\335\3\34\17\40\2\117\315\65\25\0\0\0\35\151" - "\124\130\164\103\157\155\155\145\156\164\0\0\0\0\0\103" - "\162\145\141\164\145\144\40\167\151\164\150\40\107\111\115\120" - "\144\56\145\7\0\0\0\131\111\104\101\124\10\327\5\301" - "\113\12\200\40\24\100\321\353\207\207\112\341\54\160\67\55" - "\316\265\5\56\46\47\202\202\121\166\216\312\71\173\140\330" - "\20\302\0\104\267\326\20\221\135\137\346\134\275\367\333\272" - "\170\340\361\350\357\375\160\316\241\237\147\222\122\102\225\122" - "\304\30\63\155\214\161\2\250\132\253\0\123\255\265\0\266" - "\37\321\361\36\170\171\253\246\12\0\0\0\0\111\105\116" - "\104\256\102\140\202" }, - { ":progress_front_green_c.png", 215, - "\211\120\116\107\15\12\32\12\0\0\0\15\111\110\104\122" - "\0\0\0\1\0\0\0\13\10\6\0\0\0\276\216\347" - "\357\0\0\0\6\142\113\107\104\0\377\0\377\0\377\240" - "\275\247\223\0\0\0\11\160\110\131\163\0\0\15\327\0" - "\0\15\327\1\102\50\233\170\0\0\0\7\164\111\115\105" - "\7\335\3\34\17\41\44\204\333\201\251\0\0\0\35\151" - "\124\130\164\103\157\155\155\145\156\164\0\0\0\0\0\103" - "\162\145\141\164\145\144\40\167\151\164\150\40\107\111\115\120" - "\144\56\145\7\0\0\0\73\111\104\101\124\10\327\5\301" - "\261\15\200\0\10\105\301\27\354\150\176\334\302\101\331\301" - "\231\130\302\21\320\204\232\340\35\21\201\271\73\326\335\34" - "\347\255\65\135\302\146\6\373\236\27\62\23\223\4\125\5" - "\273\313\17\372\141\24\222\115\220\223\17\0\0\0\0\111" - "\105\116\104\256\102\140\202" }, - { ":progress_front_green_l.png", 241, - "\211\120\116\107\15\12\32\12\0\0\0\15\111\110\104\122" - "\0\0\0\2\0\0\0\13\10\6\0\0\0\125\271\134" - "\354\0\0\0\6\142\113\107\104\0\377\0\377\0\377\240" - "\275\247\223\0\0\0\11\160\110\131\163\0\0\15\327\0" - "\0\15\327\1\102\50\233\170\0\0\0\7\164\111\115\105" - "\7\335\3\34\17\40\53\15\177\255\171\0\0\0\35\151" - "\124\130\164\103\157\155\155\145\156\164\0\0\0\0\0\103" - "\162\145\141\164\145\144\40\167\151\164\150\40\107\111\115\120" - "\144\56\145\7\0\0\0\125\111\104\101\124\10\327\45\306" - "\261\15\200\40\20\100\321\317\305\220\203\120\233\260\215\303" - "\61\233\261\140\26\32\22\12\25\316\302\127\75\127\112\1" - "\140\213\61\2\40\336\173\172\357\310\30\203\353\70\115\102" - "\10\350\256\210\252\262\326\102\162\316\274\367\203\253\265\62" - "\347\144\113\51\1\340\132\153\177\314\14\200\17\23\0\34" - "\60\72\336\172\342\0\0\0\0\111\105\116\104\256\102\140" - "\202" }, - { ":progress_front_green_r.png", 241, - "\211\120\116\107\15\12\32\12\0\0\0\15\111\110\104\122" - "\0\0\0\2\0\0\0\13\10\6\0\0\0\125\271\134" - "\354\0\0\0\6\142\113\107\104\0\377\0\377\0\377\240" - "\275\247\223\0\0\0\11\160\110\131\163\0\0\15\327\0" - "\0\15\327\1\102\50\233\170\0\0\0\7\164\111\115\105" - "\7\335\3\34\17\41\62\160\17\64\370\0\0\0\35\151" - "\124\130\164\103\157\155\155\145\156\164\0\0\0\0\0\103" - "\162\145\141\164\145\144\40\167\151\164\150\40\107\111\115\120" - "\144\56\145\7\0\0\0\125\111\104\101\124\10\327\45\306" - "\261\15\200\40\20\100\321\317\141\310\101\103\147\302\66\16" - "\307\154\106\226\241\41\241\120\303\131\370\252\347\152\255\0" - "\154\51\45\0\144\214\101\10\1\271\216\323\346\234\210\356" - "\112\214\21\131\153\241\252\310\173\77\224\122\160\255\65\274" - "\367\154\71\147\0\134\357\375\217\231\1\360\1\333\320\31" - "\102\112\336\12\263\0\0\0\0\111\105\116\104\256\102\140" - "\202" }, - { ":progress_front_red_c.png", 209, - "\211\120\116\107\15\12\32\12\0\0\0\15\111\110\104\122" - "\0\0\0\1\0\0\0\13\10\6\0\0\0\276\216\347" - "\357\0\0\0\6\142\113\107\104\0\377\0\377\0\377\240" - "\275\247\223\0\0\0\11\160\110\131\163\0\0\15\327\0" - "\0\15\327\1\102\50\233\170\0\0\0\7\164\111\115\105" - "\7\335\3\34\17\54\22\376\317\152\175\0\0\0\35\151" - "\124\130\164\103\157\155\155\145\156\164\0\0\0\0\0\103" - "\162\145\141\164\145\144\40\167\151\164\150\40\107\111\115\120" - "\144\56\145\7\0\0\0\65\111\104\101\124\10\327\5\301" - "\241\21\0\60\10\4\301\33\202\302\320\152\212\240\71\232" - "\301\140\342\76\273\124\25\26\21\330\356\202\316\221\161\57" - "\306\173\40\167\321\335\130\146\302\314\200\44\76\352\176\23" - "\267\226\121\122\244\0\0\0\0\111\105\116\104\256\102\140" - "\202" }, - { ":progress_front_red_l.png", 229, - "\211\120\116\107\15\12\32\12\0\0\0\15\111\110\104\122" - "\0\0\0\2\0\0\0\13\10\6\0\0\0\125\271\134" - "\354\0\0\0\6\142\113\107\104\0\377\0\377\0\377\240" - "\275\247\223\0\0\0\11\160\110\131\163\0\0\15\327\0" - "\0\15\327\1\102\50\233\170\0\0\0\7\164\111\115\105" - "\7\335\3\34\17\54\66\302\314\216\254\0\0\0\35\151" - "\124\130\164\103\157\155\155\145\156\164\0\0\0\0\0\103" - "\162\145\141\164\145\144\40\167\151\164\150\40\107\111\115\120" - "\144\56\145\7\0\0\0\111\111\104\101\124\10\327\45\310" - "\261\15\200\40\0\0\260\212\206\10\341\1\376\145\342\66" - "\156\141\141\46\70\270\65\275\132\153\340\311\71\203\20\143" - "\264\326\242\367\356\160\102\112\211\373\26\336\367\145\157\241" - "\326\12\256\61\206\275\267\247\224\362\317\234\363\307\71\7" - "\174\332\201\26\12\347\356\355\352\0\0\0\0\111\105\116" - "\104\256\102\140\202" }, - { ":progress_front_red_r.png", 229, - "\211\120\116\107\15\12\32\12\0\0\0\15\111\110\104\122" - "\0\0\0\2\0\0\0\13\10\6\0\0\0\125\271\134" - "\354\0\0\0\6\142\113\107\104\0\377\0\377\0\377\240" - "\275\247\223\0\0\0\11\160\110\131\163\0\0\15\327\0" + "\0\0\0\34\0\0\0\13\10\6\0\0\0\154\336\355" + "\267\0\0\0\6\142\113\107\104\0\0\0\0\0\0\371" + "\103\273\177\0\0\0\11\160\110\131\163\0\0\15\327\0" "\0\15\327\1\102\50\233\170\0\0\0\7\164\111\115\105" - "\7\335\3\34\17\54\47\250\174\256\136\0\0\0\35\151" + "\7\340\6\10\21\7\11\273\35\213\111\0\0\0\35\151" "\124\130\164\103\157\155\155\145\156\164\0\0\0\0\0\103" "\162\145\141\164\145\144\40\167\151\164\150\40\107\111\115\120" - "\144\56\145\7\0\0\0\111\111\104\101\124\10\327\45\306" - "\61\22\304\20\0\0\300\105\306\204\106\355\277\52\77\363" - "\31\215\72\343\212\333\152\303\30\3\74\265\126\20\317\71" - "\162\316\134\356\234\123\224\222\122\212\350\373\274\357\53\102" - "\357\135\130\153\111\51\171\132\153\40\354\275\377\271\367\202" - "\37\224\360\23\34\221\167\121\131\0\0\0\0\111\105\116" - "\104\256\102\140\202" }, + "\144\56\145\7\0\0\1\301\111\104\101\124\70\313\245\223" + "\117\213\122\121\30\306\177\157\367\340\134\257\245\150\42\126" + "\272\14\134\66\213\246\30\30\146\71\264\154\325\107\220\140" + "\26\203\40\4\335\345\15\202\340\62\13\41\374\10\175\200" + "\310\131\112\20\131\233\226\61\301\254\142\26\42\332\37\320" + "\253\336\163\116\13\115\147\6\152\314\236\335\373\234\347\345" + "\167\316\373\162\204\271\202\40\330\6\352\300\26\160\223\245" + "\116\201\17\300\13\337\367\337\261\246\202\40\110\372\276\77" + "\22\200\60\14\237\0\317\200\53\177\351\61\300\323\132\255" + "\366\174\135\150\30\206\11\151\66\233\333\300\333\113\140\147" + "\241\73\325\152\165\255\227\66\32\215\353\312\363\274\372\212" + "\60\346\271\72\360\320\202\305\161\100\153\4\4\340\101\173" + "\317\272\5\227\250\33\361\146\367\110\0\366\202\266\165\63" + "\5\242\357\135\366\367\167\105\245\122\251\173\377\170\321\55" + "\0\34\7\16\16\340\360\20\264\6\300\55\270\144\52\231" + "\163\141\67\123\40\163\253\262\250\125\72\235\46\216\343\225" + "\151\112\51\1\146\220\50\132\300\0\214\61\150\255\61\306" + "\54\75\75\367\364\314\123\305\142\361\170\60\30\334\130\25" + "\230\315\146\217\27\105\263\171\356\54\236\114\371\166\62\300" + "\114\226\300\351\164\302\340\364\4\63\235\314\200\345\162\271" + "\55\42\73\121\24\135\272\107\327\165\115\251\124\152\3\263" + "\275\135\230\314\353\315\226\134\354\151\325\67\5\240\323\351" + "\44\132\200\130\153\113\303\341\360\125\257\327\273\77\32\215" + "\376\10\115\46\223\46\237\317\277\367\74\357\221\210\174\135" + "\367\153\10\200\265\366\266\326\372\145\34\307\225\361\170\234" + "\326\132\137\373\35\160\34\347\347\306\306\306\17\245\324\147" + "\307\161\36\213\310\227\165\100\375\176\77\221\313\345\46\213" + "\21\130\153\25\160\7\270\13\24\316\144\273\300\107\340\223" + "\210\304\374\207\254\265\127\177\1\277\357\245\376\331\316\240" + "\232\0\0\0\0\111\105\116\104\256\102\140\202" }, { ":pushbutton.png", 1396, "\211\120\116\107\15\12\32\12\0\0\0\15\111\110\104\122" "\0\0\0\56\0\0\0\136\10\6\0\0\0\134\233\46" diff --git a/plugingui/resources/progress.png b/plugingui/resources/progress.png new file mode 100644 index 0000000..f6c01dc Binary files /dev/null and b/plugingui/resources/progress.png differ diff --git a/plugingui/resources/progress_back_c.png b/plugingui/resources/progress_back_c.png deleted file mode 100644 index a1882a1..0000000 Binary files a/plugingui/resources/progress_back_c.png and /dev/null differ diff --git a/plugingui/resources/progress_back_l.png b/plugingui/resources/progress_back_l.png deleted file mode 100644 index f250f5e..0000000 Binary files a/plugingui/resources/progress_back_l.png and /dev/null differ diff --git a/plugingui/resources/progress_back_r.png b/plugingui/resources/progress_back_r.png deleted file mode 100644 index 701d98a..0000000 Binary files a/plugingui/resources/progress_back_r.png and /dev/null differ diff --git a/plugingui/resources/progress_front_blue_c.png b/plugingui/resources/progress_front_blue_c.png deleted file mode 100644 index 5a18e05..0000000 Binary files a/plugingui/resources/progress_front_blue_c.png and /dev/null differ diff --git a/plugingui/resources/progress_front_blue_l.png b/plugingui/resources/progress_front_blue_l.png deleted file mode 100644 index 513e6bc..0000000 Binary files a/plugingui/resources/progress_front_blue_l.png and /dev/null differ diff --git a/plugingui/resources/progress_front_blue_r.png b/plugingui/resources/progress_front_blue_r.png deleted file mode 100644 index e339f3b..0000000 Binary files a/plugingui/resources/progress_front_blue_r.png and /dev/null differ diff --git a/plugingui/resources/progress_front_green_c.png b/plugingui/resources/progress_front_green_c.png deleted file mode 100644 index 5055b76..0000000 Binary files a/plugingui/resources/progress_front_green_c.png and /dev/null differ diff --git a/plugingui/resources/progress_front_green_l.png b/plugingui/resources/progress_front_green_l.png deleted file mode 100644 index 58c2c08..0000000 Binary files a/plugingui/resources/progress_front_green_l.png and /dev/null differ diff --git a/plugingui/resources/progress_front_green_r.png b/plugingui/resources/progress_front_green_r.png deleted file mode 100644 index e583c53..0000000 Binary files a/plugingui/resources/progress_front_green_r.png and /dev/null differ diff --git a/plugingui/resources/progress_front_red_c.png b/plugingui/resources/progress_front_red_c.png deleted file mode 100644 index b483faf..0000000 Binary files a/plugingui/resources/progress_front_red_c.png and /dev/null differ diff --git a/plugingui/resources/progress_front_red_l.png b/plugingui/resources/progress_front_red_l.png deleted file mode 100644 index a9e1f0f..0000000 Binary files a/plugingui/resources/progress_front_red_l.png and /dev/null differ diff --git a/plugingui/resources/progress_front_red_r.png b/plugingui/resources/progress_front_red_r.png deleted file mode 100644 index d90d48b..0000000 Binary files a/plugingui/resources/progress_front_red_r.png and /dev/null differ -- cgit v1.2.3