From b591ff45acbeabe502bac551853f7dbd5b34e4f3 Mon Sep 17 00:00:00 2001
From: Rafael <Syping@users.noreply.github.com>
Date: Tue, 26 Jul 2016 08:22:10 +0200
Subject: [PATCH] OptionsDialog give informations at changing default Custom
Folder
---
OptionsDialog.cpp | 19 +++++++++++++------
OptionsDialog.h | 2 ++
lang/gta5sync_ru.ts | 24 +++++++++++++-----------
res/gta5sync_de.qm | Bin 23392 -> 23520 bytes
res/gta5sync_de.ts | 26 ++++++++++++++++++--------
5 files changed, 46 insertions(+), 25 deletions(-)
diff --git a/OptionsDialog.cpp b/OptionsDialog.cpp
index b252916..f627921 100755
--- a/OptionsDialog.cpp
+++ b/OptionsDialog.cpp
@@ -240,9 +240,10 @@ void OptionsDialog::applySettings()
settings->setValue("AspectRatio", aspectRatio);
settings->endGroup();
+ bool forceCustomFolder = ui->cbForceCustomFolder->isChecked();
settings->beginGroup("dir");
settings->setValue("dir", ui->txtFolder->text());
- settings->setValue("force", ui->cbForceCustomFolder->isChecked());
+ settings->setValue("force", forceCustomFolder);
settings->endGroup();
#if QT_VERSION >= 0x050000
@@ -256,6 +257,11 @@ void OptionsDialog::applySettings()
#else
bool languageChanged = ui->cbLanguage->itemData(ui->cbLanguage->currentIndex()).toString() != currentLanguage;
#endif
+
+ if (forceCustomFolder && ui->txtFolder->text() != currentCFolder || forceCustomFolder != currentFFolder && forceCustomFolder)
+ {
+ QMessageBox::information(this, tr("%1", "%1").arg(GTA5SYNC_APPSTR), tr("The new Custom Folder will initialize after you restart %1.").arg(GTA5SYNC_APPSTR));
+ }
if (languageChanged)
{
QMessageBox::information(this, tr("%1", "%1").arg(GTA5SYNC_APPSTR), tr("The language change will take effect after you restart %1.").arg(GTA5SYNC_APPSTR));
@@ -384,13 +390,14 @@ void OptionsDialog::setupCustomGTAFolder()
bool ok;
QString defaultGameFolder = AppEnv::getGameFolder(&ok);
settings->beginGroup("dir");
- QString customGameFolder = settings->value("dir", "").toString();
- if (customGameFolder == "" && ok)
+ currentCFolder = settings->value("dir", "").toString();
+ currentFFolder = settings->value("force", false).toBool();
+ if (currentCFolder == "" && ok)
{
- customGameFolder = defaultGameFolder;
+ currentCFolder = defaultGameFolder;
}
- ui->txtFolder->setText(customGameFolder);
- ui->cbForceCustomFolder->setChecked(settings->value("force", false).toBool());
+ ui->txtFolder->setText(currentCFolder);
+ ui->cbForceCustomFolder->setChecked(currentFFolder);
settings->endGroup();
}
diff --git a/OptionsDialog.h b/OptionsDialog.h
index 4fcdeaa..824fbac 100755
--- a/OptionsDialog.h
+++ b/OptionsDialog.h
@@ -56,9 +56,11 @@ private:
QList<QTreeWidgetItem*> playerItems;
Qt::AspectRatioMode aspectRatio;
QString currentLanguage;
+ QString currentCFolder;
QString defaultProfile;
QString percentString;
QSettings *settings;
+ bool currentFFolder;
int contentMode;
int customQuality;
int defaultQuality;
diff --git a/lang/gta5sync_ru.ts b/lang/gta5sync_ru.ts
index 1f45176..432c12d 100755
--- a/lang/gta5sync_ru.ts
+++ b/lang/gta5sync_ru.ts
@@ -264,26 +264,32 @@ Copyright &copy; <a href="https://github.com/Syping/">Syping
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../OptionsDialog.cpp" line="261"/>
+ <location filename="../OptionsDialog.cpp" line="263"/>
+ <location filename="../OptionsDialog.cpp" line="267"/>
<source>%1</source>
<comment>%1</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../OptionsDialog.cpp" line="261"/>
+ <location filename="../OptionsDialog.cpp" line="263"/>
+ <source>The new Custom Folder will initialize after you restart %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../OptionsDialog.cpp" line="267"/>
<source>The language change will take effect after you restart %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../OptionsDialog.cpp" line="271"/>
+ <location filename="../OptionsDialog.cpp" line="277"/>
<source>No Profile</source>
<comment>No Profile, as default</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../OptionsDialog.cpp" line="279"/>
- <location filename="../OptionsDialog.cpp" line="283"/>
<location filename="../OptionsDialog.cpp" line="285"/>
+ <location filename="../OptionsDialog.cpp" line="289"/>
+ <location filename="../OptionsDialog.cpp" line="291"/>
<source>Profile: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1090,6 +1096,7 @@ Copyright &copy; <a href="https://github.com/Syping/">Syping
</message>
<message>
<location filename="../UserInterface.ui" line="285"/>
+ <location filename="../UserInterface.cpp" line="123"/>
<source>Select &GTA V Folder...</source>
<translation type="unfinished"></translation>
</message>
@@ -1187,17 +1194,12 @@ Copyright &copy; <a href="https://github.com/Syping/">Syping
</message>
<message>
<location filename="../UserInterface.ui" line="288"/>
- <location filename="../OptionsDialog.cpp" line="398"/>
+ <location filename="../OptionsDialog.cpp" line="406"/>
<location filename="../UserInterface.cpp" line="72"/>
<location filename="../UserInterface.cpp" line="446"/>
<source>Select GTA V Folder...</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../UserInterface.cpp" line="123"/>
- <source>Select GTA V &Folder...</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../UserInterface.cpp" line="303"/>
<source>Open File...</source>
diff --git a/res/gta5sync_de.qm b/res/gta5sync_de.qm
index f7349b5f33df0404ef40572af84e98662bea84d5..28eac5b9f93a0713849c6fd0ad2a27f2b368948d 100755
GIT binary patch
delta 1694
zcmXApc~DbV6vn?KFTA{$geZcFg2vh)yPyOjhyo$(;6jkrDdPgMjX>yN5XYI4w#tl-
z6zm|ywvH<<WvSK(E=(PfL54DdqiEe1grSb@SZz_XR(jI=$9uo~?!D){bI<widDtd-
zcv`Y^w$!uXYh9=#=?8HA9I*T}xEp35>JsEBdcb`J<R^^4L<i*k-GH%|F<lMCf#rZ&
zfxvdM%UFXzmwm=w1YXernFa*@9!4xgkjpOS0Hf&;Vhtu>ZVgP90U+xFk}C(`fW880
zk#)e-aX5090h&=9E|^GxyvFbVZB$g?xh)HLZ@xsl8w^C(F(%eBW_U{0tr(?1TO`-g
z-vQyTC4Z`aBF>S1)J^kAkEF$wbg(6P((QH|FlnW9|LSnSC&EPsu;7@q(G>u|D8Iw#
zwUAM#Wi;e6rr(q{uNejwj!0Wu^*~&twC&<-V9_tqo^LdOHd6YaC!GSCDjhuH38bBs
zY5T4L@>-d8h?u@ZrZ1zw(v7nCBMuATJ0{C%-UfJ`mDS`5fC{paNcuro8|S9%qV)()
z|4%e!;43aFo(vPgEj8=|;&*U6c0U1xK(49!Ik2>l_&0GMk@hXq5ML1;#MeY8ahy29
zHPz5@mrv)K95oUeETIV*aSPWRd>Dw0WlRp@j&I2Y_+GAm<1U)N#F*T|-F;9AOrOa8
zme)=t3*cTnJ`2pa#f@F<CGA||-kzh(EcKRiF1xTY`Q&5uz|3%YNO1+=-O89!BzF|=
z&j<YH$q&3S13@?CCmMeSJmTDZyWB}s*WEJiP|7?PyX8wufXEh}ANHW{9$p-^lS3zC
z#6iY*p7(#-NdcYbR~5DbZj*UyJZUHVIA8dPs9VJscTxZzcE04-L10$CgD<^(l^ogl
zo%_lt@~wPbUmdA4lW*uCv1GpETdzg{^N0A07Xzp?W&FcTQor(~!nZ3F2+%0B<CMXW
zaYg)_2Flb6MaHpyz;suUb#j#a%}|tdSb)V}DxS5IUolOXQ1>n1ClRLHivv;}{|bI%
zB%ai8Az%}2R75kXI)&u=Y6@VlkjFcL36a9udI}_Awov+N9^C?oP-#3t*D_3~3e{67
zh8R;G2n`){((F*7CyvCuFj$m4CBLzDQJYD26B<R`=cy#p`(n(xJ%A%&kPXt-GiGlV
zGoR3ggmN+WnLA((7Oi`K1g6!Cg>Pn%YNEy6sbnae7SH&20eXM&asp+*a6|0hc#2Yf
zl+kMwqhS|g^kc@vLGi}S93VMgyxI7I?!S0J96H$p%)2K(>CGmt6<-==0Xd;cNgLH_
z{!yj(sV+*nMY+X2jZR=wR_V=DqDo~|(l9j`9ivI7tbXT1qPwQ7!4Rq3sN55@mDcka
zO$EyH#pK6)pGbD*YGuE@f>M;-t$f*jn`&oZRQjs8?@V+Xo~neWqd;(<D#-sY3S_P-
zn=hc+RjRfd>*%C;s``*JvU8~RNH|JNE@Pru)u35GnYp4m_iO_-p2_N{?Id2cQyr)7
z0OmBR6TTQA(YLD2o(@X&tZo_*BNwSVKlGvvAE>XJ4pWD!Qr|vOOR4u$57`cp*h<x7
zS$$ONjqaSQF9e=(KegIQowJ2e*UT7mOEYaf1rX+=Nl9{DHv?nxADU0ADRXWknuFsx
z)Uf25rs<c-v1Xg5^NfXhGp8B-K9m;n$!kt|ZLBK9S>qNyDSR9C91BXJrMDFy)7wUm
z7E5TZ;Qz5}t(?|e-&$B}KZ}}D`@VOYUyS(^i`Hf-*BZ+<*h`AFNhL)EmQroGwWvsI
XwOQ@fHAU9V7H6&Zv^b~7$}Gu$WA@gY
delta 1633
zcmXAp3s6*L6vzL&dw1{NyL)$4P!Lhq6yhO^7z>D!yDYG>yaZNACe6}y@&Pmmj?)yk
zMlqcX)NMn{6bsM+QUdWsT0o@a2!>>h+NcB>WBEpqR65MvnVsLacfWJ)IsfzjzMCgx
zH;>D9&Xjw6zst`k#{USWiviNR!CY|w5x1aRWCC<qP}W<4@gkI6=YZJ1B-#U@K9~Ur
zY6LY?T+(|88jDXlg`i7*KyoI6{+UDEir}%h=<g)PokdJkJYcLryt4;LxdvNF4@89T
zg+0Ozc>6%iP6zaZs9H51i1b8%4{cNz<3V03Fe6pQU!M)ktCwg!A~7jcwmNH&3jIcQ
zIq3xu<|(@`d<)EpmA`(Dp2t6v=ax`oshi{#E5d*&X%eH_<TVj)5%d{b0Lp6;J+mdw
znlCZ3K%)JTyzb3@V1ZoT)MNq{rpu4F&IDrm<sF~tf$8b;8y!hhh_}4A+7n3ZQ5ZTe
zQ(l+C&_}daD@;XHkbSwrQtbq$dMK9EiQ53r9z|I;2WX+V9YHS${e@9!+5z7*#`Iq_
zb$*zMv{0aR3bQ!s0AQ|WKHf6`a6wFM=>s5bEAcV$G?Df#9(z7S{G9ld*hw6v5zCp{
zGHN$Hf+!=dWopGT1ugb7b+fCev)3dhBrr!eX9Mg7rfcJ;^!%2@g!9bx8zq3xZ07G}
z%`~b&=HZ{GsFTOcaQ6lB%umd-)1*vVxRM!*3*D)lbhsRtmaGiPEv6A)l4$!#nOm_E
zcsWHW9vpE1L64O6HD`bcX4TYo9hvFAD)|~o=8>aXDbEK?=UKLY0{!k|`N2X;*eUUq
zGZM`&u>sH8sGzg#8|#_?)g*R}g*-FoXLj8!;;eVs+%_s;LLr;~TQ6WJW(%%%Q=aW2
zyYoO1RlbFFce=@yZ?lyxdBn+VQ+GHpca&{y4W!W&u{Tr5^_m9t)OI5f5TrJYl7t~X
zYRgC^DfLjDe7FmU8&an>3{t*n>iiZb@amW9d(D)Ww{zp%djUUR&g%~|dBdCYA13cC
z5|g>WO|(%REm7OX*~&}l_?+UFv5mmE2=1+ND#Y?CS1>e}-0#bkSnKIHCUHBACK|=4
zMB4~g*+QLWByt^QGWC2LFS|o|7nJda6p9;H!~1=ZNG5&C&tJWd@;#R*CYDHx3^$)L
zKpQN(`Rsc-AhV8Nv;PP%xq)9dGL2jl&F@L1K<)&8(sv>dZsjk=k^+$r_^yq|Nb*Ax
zJzWwbk4l{PLZbCKe`Wd-AfcH5z2+e)@&n)3&_U-vY?vRokV)tEef~+*48U<jBRfvB
zn%k<Ge5{=$cWO54?9@S?W{1f^qp8sBNa&|}%o5|wn$j1(WV*YWGW3z#muvO~Z=wH-
zCB})Gv$>SVv7AV84xOf}kn(5rYMwM-b)_pkM3t7iGYA9^XoCYD(VOksOm-Cwt3tco
z>ZaC~Y0E>3Xvm^=pNydy6iBq@Yb*8hNQyh!)Au&e4HG7K4BsW`Y(nIAa;?xPn1vR=
zzg>v^u!rn^NpN_Q#D-pprlmsL(usiRzd`slzKX7<L&DW+7in%0`trUemwh4(r*_hi
zcj=h13nB2b?%0YofY*76v(8D3eysOdONE3+>K7$YYu=d>ZEF2Hr6if^w*ITpC3I66
z^tBf$uYQ}p?WB|L;_3RqFN{zlrkJuihFme)kj64qm`7uk&%X;@Avrq11_vxKAd9~K
quG*X_-d>r`_0E-r2AjiT$TIjR<gZ`lEHE04uKEnG#@#uovi||3uFY!z
diff --git a/res/gta5sync_de.ts b/res/gta5sync_de.ts
index 8904ee0..73b3c7d 100755
--- a/res/gta5sync_de.ts
+++ b/res/gta5sync_de.ts
@@ -341,26 +341,36 @@ Copyright &copy; <a href="https://github.com/Syping/">Syping
<translation>%1 (%2 wenn verfügbar)</translation>
</message>
<message>
- <location filename="../OptionsDialog.cpp" line="261"/>
+ <location filename="../OptionsDialog.cpp" line="263"/>
+ <location filename="../OptionsDialog.cpp" line="267"/>
<source>%1</source>
<comment>%1</comment>
<translation>%1</translation>
</message>
<message>
- <location filename="../OptionsDialog.cpp" line="261"/>
+ <location filename="../OptionsDialog.cpp" line="263"/>
+ <source>The new Custom Folder will initialize after you restart %1.</source>
+ <translation>Der eigene Ordner wird initialisiert sobald du %1 neugestartet hast.</translation>
+ </message>
+ <message>
+ <source>The new Custom Folder initialize after you restart %1.</source>
+ <translation type="vanished">Der eigene Ordner initialisiert sobald du %1 neugestartet hast.</translation>
+ </message>
+ <message>
+ <location filename="../OptionsDialog.cpp" line="267"/>
<source>The language change will take effect after you restart %1.</source>
<translation>Die Änderung der Sprache nimmt Effekt sobald du %1 neugestartet hast.</translation>
</message>
<message>
- <location filename="../OptionsDialog.cpp" line="271"/>
+ <location filename="../OptionsDialog.cpp" line="277"/>
<source>No Profile</source>
<comment>No Profile, as default</comment>
<translation>Kein Profil</translation>
</message>
<message>
- <location filename="../OptionsDialog.cpp" line="279"/>
- <location filename="../OptionsDialog.cpp" line="283"/>
<location filename="../OptionsDialog.cpp" line="285"/>
+ <location filename="../OptionsDialog.cpp" line="289"/>
+ <location filename="../OptionsDialog.cpp" line="291"/>
<source>Profile: %1</source>
<translation>Profil: %1</translation>
</message>
@@ -1449,6 +1459,7 @@ Exportieren als:</translation>
</message>
<message>
<location filename="../UserInterface.ui" line="285"/>
+ <location filename="../UserInterface.cpp" line="123"/>
<source>Select &GTA V Folder...</source>
<translation>Wähle &GTA V Ordner...</translation>
</message>
@@ -1526,16 +1537,15 @@ Exportieren als:</translation>
</message>
<message>
<location filename="../UserInterface.ui" line="288"/>
- <location filename="../OptionsDialog.cpp" line="398"/>
+ <location filename="../OptionsDialog.cpp" line="406"/>
<location filename="../UserInterface.cpp" line="72"/>
<location filename="../UserInterface.cpp" line="446"/>
<source>Select GTA V Folder...</source>
<translation>Wähle GTA V Ordner...</translation>
</message>
<message>
- <location filename="../UserInterface.cpp" line="123"/>
<source>Select GTA V &Folder...</source>
- <translation>Wähle GTA V &Ordner...</translation>
+ <translation type="vanished">Wähle GTA V &Ordner...</translation>
</message>
<message>
<location filename="../UserInterface.cpp" line="303"/>