From efd4b1603ce84d8fd9c458ba19fbb5e340a412f2 Mon Sep 17 00:00:00 2001 From: doitux Date: Wed, 19 Dec 2012 11:21:24 +0100 Subject: [PATCH] add uploadanimation for logfiledialog (#146) --- .../qt/gui_800x480/logfiledialog_800x480.ui | 219 ++++++++++-------- src/gui/qt/logfiledialog.ui | 196 +++++++++------- src/gui/qt/logfiledialog/logfiledialog.cpp | 32 ++- src/gui/qt/logfiledialog/logfiledialog.h | 4 +- src/gui/qt/resources/loader.gif | Bin 0 -> 3208 bytes src/gui/qt/resources/pokerth.qrc | 3 +- 6 files changed, 264 insertions(+), 190 deletions(-) create mode 100644 src/gui/qt/resources/loader.gif diff --git a/src/gui/qt/gui_800x480/logfiledialog_800x480.ui b/src/gui/qt/gui_800x480/logfiledialog_800x480.ui index 763bb27c..8faaaf24 100644 --- a/src/gui/qt/gui_800x480/logfiledialog_800x480.ui +++ b/src/gui/qt/gui_800x480/logfiledialog_800x480.ui @@ -20,7 +20,99 @@ Dialog - + + + + + + + + + + + 0 + 0 + + + + Game: + + + + + + + + 0 + 0 + + + + + + + + + + + 0 + 0 + + + + + 250 + 16777215 + + + + true + + + QAbstractItemView::ExtendedSelection + + + 5 + + + false + + + true + + + + Log File + + + + + + + + + + + + Preview: + + + + + + + + 0 + 0 + + + + + + + + + @@ -92,28 +184,48 @@ - - + + - + - Preview: + - + - + 0 0 + + Analyse Logfile ... + + + + :/gfx/view-statistics.png:/gfx/view-statistics.png + + + + 32 + 32 + + - + + + + Qt::Horizontal + + + + @@ -129,97 +241,6 @@ - - - - - - - - - 0 - 0 - - - - Game: - - - - - - - - 0 - 0 - - - - - - - - - - - 0 - 0 - - - - - 250 - 16777215 - - - - true - - - QAbstractItemView::ExtendedSelection - - - 5 - - - false - - - true - - - - Log File - - - - - - - - - - Qt::Horizontal - - - - - - - Analyse Logfile ... - - - - :/gfx/view-statistics.png:/gfx/view-statistics.png - - - - 32 - 32 - - - - diff --git a/src/gui/qt/logfiledialog.ui b/src/gui/qt/logfiledialog.ui index 31452b7a..cab073cd 100644 --- a/src/gui/qt/logfiledialog.ui +++ b/src/gui/qt/logfiledialog.ui @@ -14,7 +14,92 @@ Dialog - + + + + + + + + + + + 0 + 0 + + + + Game: + + + + + + + + + + + + + 0 + 0 + + + + + 200 + 16777215 + + + + true + + + QAbstractItemView::ExtendedSelection + + + 5 + + + false + + + true + + + + Log File + + + + + + + + + + + + Preview: + + + + + + + + 0 + 0 + + + + + + + + + @@ -62,119 +147,54 @@ - - + + - + - Preview: + - + - + 0 0 - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - - - - 0 - 0 - - - - Game: - - - - - - - - 0 - 0 - - - - - - - - - - - 0 - 0 - + + Analyse Logfile ... - + + + :/gfx/view-statistics.png:/gfx/view-statistics.png + + - 200 - 16777215 + 32 + 32 - - true - - - QAbstractItemView::ExtendedSelection - - - 5 - - - false - - - true - - - - Log File - - - + Qt::Horizontal - - - - Analyse Logfile ... + + + + Qt::Horizontal - - - :/gfx/view-statistics.png:/gfx/view-statistics.png + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok diff --git a/src/gui/qt/logfiledialog/logfiledialog.cpp b/src/gui/qt/logfiledialog/logfiledialog.cpp index eb5658b0..9e0da6bb 100644 --- a/src/gui/qt/logfiledialog/logfiledialog.cpp +++ b/src/gui/qt/logfiledialog/logfiledialog.cpp @@ -36,6 +36,9 @@ ui(new Ui::LogFileDialog) { ui->setupUi(this); + ui->label_animation->setMaximumWidth(0); + ui->horizontalLayout_animation->setSpacing(0); + connect( ui->pushButton_deleteLog, SIGNAL(clicked()), this, SLOT (deleteLogFile())); connect( ui->pushButton_exportLogHtml, SIGNAL(clicked()), this, SLOT (exportLogToHtml())); connect( ui->pushButton_exportLogTxt, SIGNAL(clicked()), this, SLOT (exportLogToTxt())); @@ -191,9 +194,15 @@ void LogFileDialog::keyPressEvent ( QKeyEvent * event ) { if (event->key() == Qt::Key_Delete ) { /*Delete*/ if(ui->treeWidget_logFiles->hasFocus()) { - ui->pushButton_deleteLog->click(); + ui->pushButton_deleteLog->click(); } } + else if (event->key() == Qt::Key_N ){ + uploadInProgressAnimationStart(); + } + else if (event->key() == Qt::Key_M ){ + uploadInProgressAnimationStop(); + } } @@ -257,3 +266,24 @@ void LogFileDialog::uploadFile() } } + +void LogFileDialog::uploadInProgressAnimationStart() +{ + ui->pushButton_analyseLogfile->setDisabled(TRUE); + + QMovie *movie = new QMovie(":/gfx/loader.gif"); + ui->label_animation->setMovie(movie); + ui->label_animation->setMaximumWidth(32); + ui->horizontalLayout_animation->setSpacing(-1); + ui->label_animation->setGeometry(0,0,32,32); + movie->start(); +} + +void LogFileDialog::uploadInProgressAnimationStop() +{ + ui->pushButton_analyseLogfile->setDisabled(FALSE); + + ui->label_animation->setMaximumWidth(0); + ui->horizontalLayout_animation->setSpacing(0); + ui->label_animation->setGeometry(0,0,0,0); +} diff --git a/src/gui/qt/logfiledialog/logfiledialog.h b/src/gui/qt/logfiledialog/logfiledialog.h index 244f9d90..5ea7a030 100644 --- a/src/gui/qt/logfiledialog/logfiledialog.h +++ b/src/gui/qt/logfiledialog/logfiledialog.h @@ -54,7 +54,9 @@ public slots: void showLogFilePreview(ShowLogMode); void keyPressEvent ( QKeyEvent * event ); void uploadFile(); - + void uploadInProgressAnimationStart(); + void uploadInProgressAnimationStop(); + private: ConfigFile *myConfig; guiLog *myGuiLog; diff --git a/src/gui/qt/resources/loader.gif b/src/gui/qt/resources/loader.gif new file mode 100644 index 0000000000000000000000000000000000000000..3288d1035d70bb86517e2c233f1a904e41f06b29 GIT binary patch literal 3208 zcmc(iX;4#H9>pJdFE7h`I{IF)0|5<6L}(j=N}5%L009EB2nYfyF)E0PvIqo$u!IC; z4PgyY5|S9AEh38G)(9eq4TbH7_UHg@yWrlIJ$6smIADL7s^P;_O;ykRc9soXl`UC*LwQJXkii*0rx|*7rI2=x7WaRkx_~XZqFJ8R3c=2Kg zf@aSAv8+BJ8+^hyay>(QR@t*blbKzsf0}bscEqRc5Hd3o(-N5RyW=zWB*zQw6Zh>* z2CROCDAbu#D`)S|J_o(lL9Yn3l*+8RdiRD_>iNz$#_IAzCna&Wl5 zSF_(rRCDD!wi#i8oAm&jYtn2_@VB%2-H*G%bN#|(6R6N?wM)3u`PiGzwuX7qmTgyF zpE)h0kuoxQ9?=kW7Y!=R@DmhU9)vwT*EZWzJ zrt+=2tqFts72yIp?|gvdLhs8Hfku^Z(){gmN%Y=K#P|%fkvgUj~HfIp3CuXqCtYGtJ#me+n+-LmP( z*XNuk%!aH8bIE@_Bj46>M*dSro|7<6vZ7WUHh5YQzN$>IJFqCb|CT!wj~R2C2%=q{ zpt8rzY$aw?W?=Ustv{jo?Ow@ZRkLe<)NItY>Cyhle*wR59dTdF6(@{5^ zAQBOB*hNtc3bkY-8{Cm$nFS@elbTtSqrt7MB{h_4y+~`!mVa}?c&N>&?P}GqdMuhQ z&@TD5Czd((DcG_Su~dKKV)Pj$-qi1WHM8_vc^O4?^!oY|tmK~i!{fjd&@_1E(T~r7 z_REZy&hMT^ySJB3W7l$4YhR`M(J7S5S~+4Q&3HPa)z%zPpisOp$^ zTEe99ig2$5_qFr!$;7A6CJ}PJmRhli>w?LC}Y`#HLGy6 zMU4EhL~dKCN5Ut;U2jd*83ShBNiu zcJB0l9>1Modc?-oM<R4?}3g}UJ%@K);kriq>)e*rh%hdqM)5Q)*+O8 zXm;SEbs@koiYS!9YXIclSg+5m_s~yrW#kKMdiRszg(gCP5HPmP7L)vCf8@fxUh6qY z@Z#TmkjzAZX{rwE+q|K~F2v5{_@vt%>yT_a#fF03SFt{0RXvDAiaY~K9CgS1O>frXgAjBCS}mEd4mIWZ$=ovd5| zR?GRdU}d6+Q`+JRW)|=v7$)XNkn3yE`!nAiSCvOB1jKT zG<1aK3s<0b0m==egTD#8i(Of=1pGDTOCho0XpIOMQ&P87cVKY1W=C6kIg z9cH=@a&zbm2+`|{(_?YC9fdm?1TY~-pwlBn?>=(~1pDKbco6jloP;0-cqRiwV1A_S zEyV0Dj8Pwy!nekzaN>{)7rgZ&_QLxK{~1yRe865^yx>}+a!ECd>#MMwddow z@CU{l+Rt$xuXuf}?ga{3IAr?Raql^c@a%sI0U5m}HvJ5O1#I%_MMPt#BH>OqUZ{-k zt>4Xzz=%jT*FVW(uYkWyx}9Gw$HdN*qU?Bit#ji(Wi7p-u|_8?h^%szIS^s^fNM}b zgGy>|=cbEufpguY5_6w~&ZLv=Bo06UF9EYIY;Er-1VK)SyF&!|J{axiE1z^(hXwVq zsFS=K-#zC}CcOs^8W{KAt+kK)jYDgDYbCXv{{rwsgqtIU3<910$CJi)s?? z_t8k{>7*0~4l~LLF7$WXT5OSq5QCTbP_l!SN|{R}3D&eWA8~0ltWh1IL+ZBX4rRSt zWF6Om3WDMu4xK^1(BF`2cL}rUCzhHAB`@j5&R-yk_l*t;mPGY|u2^o|myvcOdrg0W z%=lX;f^Vkqfp?u7*4qQq%A3Mpf!xspWBSKS@O%r*TSM}?dl(@*%{0Jm_8;(h{R__M Bt + view-fullscreen.png swbuttoninternetgame.png @@ -58,6 +58,7 @@ preferences-desktop_50x50.png tab-close.png tab-new-background.png + loader.gif cflags/ad.png