From 22909150aca6d11bd29db7c131ed9b0e91311598 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 3 Feb 2014 08:32:43 +0100 Subject: [PATCH] Removed one icon + some tweaking. --- .../icons/mini-kfaenza/edit-delete.png | Bin 2540 -> 0 bytes src/gui/formstandardcategorydetails.cpp | 28 ++++++++++++++---- src/gui/formstandardcategorydetails.ui | 6 ++++ src/gui/formstandardfeeddetails.cpp | 28 ++++++++++++++---- src/gui/formstandardfeeddetails.ui | 9 ++++++ 5 files changed, 61 insertions(+), 10 deletions(-) delete mode 100644 resources/graphics/icons/mini-kfaenza/edit-delete.png diff --git a/resources/graphics/icons/mini-kfaenza/edit-delete.png b/resources/graphics/icons/mini-kfaenza/edit-delete.png deleted file mode 100644 index 8614a885d08be9cefe477ba40781ae7a7d20be04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2540 zcmV#CXOF*97z1wS;xCO zJ3IHBewZ0&yxxcRVI({GNmsKobMKvdetXWn=bX6%+{Ud9QRbfX@0Y8y7QlX?VmFHk z*94&1FItH@YY7ZM0m%8q4c{yj&H&H`phHS|TuRx;%#p8Un5zUKM4E^ui0CYUNdOA~ zoZ!9|s;dKN2hgu++Rp)WFth%(j&>E`%dkmG`7LI?3?K_258ou3{CWaF3xI@_@+dPm z6BRX?H47_>Lx2dMgt6A0 zo|RyUjJLu+UKY0r2>o6UfzL{?M9$k9;2#548cj$LS=ORi!f)GX$81TMznUgsJbh?j z_nD`jcqC%zZB_OyBZl7g_ES$h^7NsB-SDE+Mq!DZK{TiXxC20k5Mm26*ZUCT=PzHGgBRD= z3?T%Vc?`fc04V@&n1C1>Lx6Ge$icf`xO>Y!IX5HWDr{8wmJDF_-tGGyO0>6Y zqVkF-3*A6>j)D>V%-!MWnWN-04^?*aHPfN=ns z!d0M42+>=m2`~WHWp@Ah)ogNis~PV%4O1{Lv*RTt?_y)lZcSva1y|mjV53T3ICq4lDi^iqOaL71!HkJtEIR^cxx_YJ^k5uApAlt z!mpHoZXrZZ9ezNFgj8~u*_`M%bWamX&Fp20QiLO9cXnsRS?VdHBXiR0Z6+OIV9$z+#-iguJUymIbikW7#kz)(@RY*WX9uPCl z=&1(>hx#W*W0cK;m8z*wHjBRTOR-ZA4z30X0G6l3>V1HSn`ZRXk%L3MqnBbTlLfh| zuA(wo^p1_j{&M8tP`oiDERnU5bAX7MX7uI3`-e7kAX&6h65$hIr0w^9o4XR@jHGuf0{i8Lva6TXb&j;wNp~Kdf_V4}f*730f?tzyQ1a!%@5>&AsQ?A+B|noM*{ zVWN_2?7Fxkm1;e-b7$w@uUwr#!G50=;!AkGz#Kx3kO5#LfF1xHRd%QWh|EsUv>asG z*vu%I5CJiW80T!qdUig2!2xDnAoHf}SUZG__X=r>3hr?#=g=P}r^d&WO2XUeQLW#8 z%_m^Ckbpn~swIE{U`(m>gd#qu$%MfyO8xWa9M^g-o&7NH4ImA`As~Oo$tSl9ndlKH zsR=1X^kUZj{H&873EEaUR=^8|uM`r{3}91@1OT2Y(il;CTqz7nkA$#mOU!uBb*<;J zxv=mGH)99)?Yx`ZA(7|-mW9$ci0QYs{rOo}T?8->Z?jV^xCYM^o(13(Gl9Em?AQfB z72$vo34>TLF%&W0%`5BqT)t5F0E+?C+pbD(V~+&*fl-Q>ewWJ+zoV#L;Q`<} zZfd|X0yd*|0)Rjhm=~@n!T}(m6N~p1SueQi!@M`~l=AHtNjOJjZDWr2Fq=1s>Gydx z{0{RMs9$)%(}0o$)T03bJQ9F~8DdRiH2sG7g5wEaDXLqHBHv}UwlNZaCYpQ;7)E1+ z2MRPGSQ9q@*a=_|z@7#?1n{<^wZq$emPB%v@2Ec}w!fu4{0PsHm=i!mMuq+(* zGpCJsknJDS05Yg9q*b_?@pVIe)rDfR6%x?Mu#-{Wzor1(XwX=~C>svn3L7R$?h+FK zAjAsZYOGO&WV^jhF2FJZq+GvN;LCPZi(q{X zUkloV-HKvu0&wV!Y}j25E)&tR`^DOXU+e~B*E9_P$hK`AH{%jFOhC>jV3deDZQI^u z7)I7KO(}%Xq?8as2q`5rO%vgBA%xI04N^)Wga{v@X`1kXa2qM*V%tCvA_5UH5iOqk znIKk5EuIq*2S=q;xGobBLUn^9<#IW494A6V9|IWkWp#k1GolGEA-V%zM7SMZG#CD~ zZY@H=izbHwd<@_syu_#tEDeTic(F3WV`v248{@U^D-gU~#C3S7uxW&%%VLvVGk_?( zU0Cbo3$i@CkbEAVxi6yJY~O@}C1Z^u_;$ExKH~rQ#Z`mnZXT8Z0000 #include @@ -104,7 +102,17 @@ void FormStandardCategoryDetails::apply() { accept(); } else { - // TODO: hlasit chybu + if (SystemTrayIcon::isSystemTrayActivated()) { + SystemTrayIcon::instance()->showMessage(tr("Cannot add category"), + tr("Category was not added due to error."), + QSystemTrayIcon::Critical); + } + else { + MessageBox::show(this, + QMessageBox::Critical, + tr("Cannot add category"), + tr("Category was not added due to error.")); + } } } else { @@ -112,7 +120,17 @@ void FormStandardCategoryDetails::apply() { accept(); } else { - // TODO: hlasit chybu + if (SystemTrayIcon::isSystemTrayActivated()) { + SystemTrayIcon::instance()->showMessage(tr("Cannot edit category"), + tr("Category was not edited due to error."), + QSystemTrayIcon::Critical); + } + else { + MessageBox::show(this, + QMessageBox::Critical, + tr("Cannot edit category"), + tr("Category was not edited due to error.")); + } } } } diff --git a/src/gui/formstandardcategorydetails.ui b/src/gui/formstandardcategorydetails.ui index 04a2937c7..67bbed086 100644 --- a/src/gui/formstandardcategorydetails.ui +++ b/src/gui/formstandardcategorydetails.ui @@ -40,6 +40,12 @@ Select parent item for your category. + + + 13 + 12 + + diff --git a/src/gui/formstandardfeeddetails.cpp b/src/gui/formstandardfeeddetails.cpp index f7cb34487..b41c7a5a0 100644 --- a/src/gui/formstandardfeeddetails.cpp +++ b/src/gui/formstandardfeeddetails.cpp @@ -9,10 +9,8 @@ #include "core/feedsmodelstandardfeed.h" #include "gui/iconthemefactory.h" #include "gui/baselineedit.h" - -#if !defined(Q_OS_WIN) #include "gui/messagebox.h" -#endif +#include "gui/systemtrayicon.h" #include #include @@ -192,7 +190,17 @@ void FormStandardFeedDetails::apply() { accept(); } else { - // TODO: hlasit chybu + if (SystemTrayIcon::isSystemTrayActivated()) { + SystemTrayIcon::instance()->showMessage(tr("Cannot add feed"), + tr("Feed was not added due to error."), + QSystemTrayIcon::Critical); + } + else { + MessageBox::show(this, + QMessageBox::Critical, + tr("Cannot add feed"), + tr("Feed was not added due to error.")); + } } } else { @@ -201,7 +209,17 @@ void FormStandardFeedDetails::apply() { accept(); } else { - // TODO: hlasit chybu + if (SystemTrayIcon::isSystemTrayActivated()) { + SystemTrayIcon::instance()->showMessage(tr("Cannot edit feed"), + tr("Feed was not edited due to error."), + QSystemTrayIcon::Critical); + } + else { + MessageBox::show(this, + QMessageBox::Critical, + tr("Cannot edit feed"), + tr("Feed was not edited due to error.")); + } } } } diff --git a/src/gui/formstandardfeeddetails.ui b/src/gui/formstandardfeeddetails.ui index cf4f2254f..8805636f9 100644 --- a/src/gui/formstandardfeeddetails.ui +++ b/src/gui/formstandardfeeddetails.ui @@ -31,6 +31,15 @@ Select parent item for your feed. + + + 12 + 12 + + + + true +