From 15380f1697903026075499a80a7eea0f5b7b9f30 Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Tue, 19 Jun 2012 13:52:07 +0300 Subject: [PATCH] Fixed dialog layout with RTL languages --- Language/Arabic.h | Bin 16332 -> 16298 bytes Language/Bulgarian.h | Bin 17486 -> 17452 bytes Language/ChineseSimplified.h | Bin 13528 -> 13494 bytes Language/ChineseTraditional.h | Bin 13562 -> 13528 bytes Language/Croatian.h | Bin 17464 -> 17430 bytes Language/Czech.h | Bin 16946 -> 16912 bytes Language/Danish.h | Bin 17160 -> 17126 bytes Language/Dutch.h | Bin 18112 -> 18078 bytes Language/English.h | Bin 16722 -> 16688 bytes Language/Finnish.h | Bin 17454 -> 17420 bytes Language/French.h | Bin 18056 -> 18022 bytes Language/German.h | Bin 18012 -> 17978 bytes Language/Greek.h | Bin 18388 -> 18354 bytes Language/Hebrew.h | Bin 15930 -> 15896 bytes Language/Hungarian.h | Bin 17598 -> 17564 bytes Language/Indonesian.h | Bin 17520 -> 17486 bytes Language/Italian.h | Bin 17520 -> 17486 bytes Language/Japanese.h | Bin 14488 -> 14454 bytes Language/Korean.h | Bin 14256 -> 14222 bytes Language/Latvian.h | Bin 17174 -> 17140 bytes Language/Lithuanian.h | Bin 17618 -> 17584 bytes Language/NorwegianBokmal.h | Bin 16882 -> 16848 bytes Language/Polish.h | Bin 17062 -> 17028 bytes Language/PortugueseBrazil.h | Bin 17686 -> 17652 bytes Language/PortuguesePortugal.h | Bin 17482 -> 17448 bytes Language/Resource.rc | 12 ++++++++++-- Language/Romanian.h | Bin 17110 -> 17076 bytes Language/Russian.h | Bin 17536 -> 17502 bytes Language/SerbianCyrillic.h | Bin 17634 -> 17600 bytes Language/SerbianLatin.h | Bin 17722 -> 17688 bytes Language/Slovak.h | Bin 17222 -> 17188 bytes Language/Slovenian.h | Bin 17386 -> 17352 bytes Language/SpanishModern.h | Bin 17736 -> 17702 bytes Language/Swedish.h | Bin 17208 -> 17174 bytes Language/Turkish.h | Bin 17234 -> 17200 bytes Language/Ukrainian.h | Bin 17492 -> 17458 bytes Language/Vietnamese.h | Bin 17292 -> 17258 bytes Library/Dialog.cpp | 5 ----- Library/Dialog.h | 3 --- Library/DialogAbout.cpp | 6 ------ Library/DialogManage.cpp | 6 ------ 41 files changed, 10 insertions(+), 22 deletions(-) diff --git a/Language/Arabic.h b/Language/Arabic.h index 632ce8d1848aa25f6fd2fe9cf26ba60378944fce..3cb47946f190c510b699a61b10637249950a5a5b 100644 GIT binary patch delta 39 tcmX?8zp8%1DsdkMM+QFzcZN_P?atuJ5YG_A5W?Uy*vHTIoLfJf*FDsLMDIIQ=I&Ola1MsL22W`mv#W>;tY@g diff --git a/Language/Bulgarian.h b/Language/Bulgarian.h index 58a9655ed2f847aa72fd5acc55e318077363ad77..07351c9b265fd059e16e21589cf35c6b6aa51490 100644 GIT binary patch delta 41 vcmX@t!MLV_al$Hb9|lJTKL&S(P$2Ej;K~rs;KLBY5HvYZY~$uBjJuow?<5Oi delta 36 scmZ3}!FaBNal)#}512UEJsE--f*3+3KV*}h{DF^$*?>W5-j<|&M6#sKbL3mO0b delta 30 mcmcbS`73k6s>u@!x!8jlf*3*=d?qWZsxlieC~Z6_ZUO+ZFbSCe diff --git a/Language/Croatian.h b/Language/Croatian.h index ee9d6cffd03e3ddc59f11cbeb66bdc95a6fe62d5..3588f09d35312f80f7ec86c17a8c7c60dcb20c81 100644 GIT binary patch delta 41 vcmdnd!8omhal$Hb9|lJTKL&S(P$2Ej;K~rs;KLBY5Hy)zY~$uBj7yvV<{k>( delta 36 scmbQ%!MLM?al)#}A6Pj!JsE--f*3*=d?qhsR%TUVFkn#Hcrer%0NEc3p8x;= diff --git a/Language/Czech.h b/Language/Czech.h index 0e36126a4e9d4fc49e46641ade9451eb4cd481cb..c33e556d17391c0d8ea95d8fda069b5430a5b88e 100644 GIT binary patch delta 41 ucmdng!Z-nlR*CyCI5PM#xHE(TX?F%!hIj@ah7g9J$*=7;Zl1z8&jA4H`U}PY delta 36 scmbQx!nmo0al)!eEF7Gk48aUR3?U3YlLc8+84V^2if!Ip#5m6Z0KyLnD*ylh diff --git a/Language/Danish.h b/Language/Danish.h index 5a9c4591c264a2a562a896c62965950c399b1fff..8fb13a5fa1c99d14a9f59bb8a310556857ff7333 100644 GIT binary patch delta 41 vcmeBZV|>=iIAN8z4}&9vAA>tXD3Eq%aAk;R@L>pH2%21Iv~lwk#u7&W?E(u% delta 34 qcmaFX%GlAyIAPV~2W%Xio(#bZK@1@bK9fI+t1=rfC~Z8b>I4AJJqo-4 diff --git a/Language/Dutch.h b/Language/Dutch.h index 32c7953103210f227f2c978ab596fc669d6bbe26..6121c5bf068a974bb75f07dc3c35d30b49f77c75 100644 GIT binary patch delta 41 vcmX@m%Q&x>al#sL9|lJTKL&S(P$2Ej;K~rs;KLBY5H$It*v8G%7`0ph@PZ3x delta 37 tcmbQ&%Xpxdal)F(0lHkQ!3;qRA(IbUiB8_YEW~Iq`K;LH%_WRlt^oRY47&gT diff --git a/Language/English.h b/Language/English.h index e63eef24d221bc05c0220c155ffd3ee8e197e3c0..5d807380e1e66f7304abbb54b346746b8dbc102f 100644 GIT binary patch delta 49 zcmccA#JHh}al$HT9|lJTKL&S(P$2Ej;K~rs;KLBY5X8XCz%}`y-SWu=hHRUsFz&Ml E07V21VgLXD delta 39 vcmdnc#CWNRal)#}2Fx7no(#bZK@1_27n+Gq-oPuwXfS!9!RF0HjQi{X18NN> diff --git a/Language/Finnish.h b/Language/Finnish.h index 0e628e0b3697c639d25ba3c1636b592a0060a9de..b5af7bde50fe5ab0810b73a063e5a9a016fd3dee 100644 GIT binary patch delta 41 vcmZ42!PwKmIAN8z4}&9vAA>tXD3Eq%aAk;R@L>pH2%7xfVdLg0jI*2o>lzEn delta 36 scmeC_U|iS1IAPV~11ucuo(#bZK@1_284VRDe_&x_HegWNc+lG!0N9TT_W%F@ diff --git a/Language/French.h b/Language/French.h index d82f7a6e846c6bc8b007b00c288b7743f12187a9..5bad99f2d9a621fe6ffbb11c7a10f415ae77aa02 100644 GIT binary patch delta 41 vcmeC^Wqj7dIAN8z4}&9vAA>tXD3Eq%aAk;R@L>pH2%7v~Y~$uBj9**;^UMrM delta 34 qcmaFX!`RWwIAPV~0$ncFV1^)ukjd-$lqX-{VPQ64P}+EKsVe}~nhTQv diff --git a/Language/German.h b/Language/German.h index 318593fff2d869e0543dea3cee5d30bb0bb30f70..683647f5b2ac907434484dc3e71483a1201a0651 100644 GIT binary patch delta 41 wcmcc9!?>%5al$Hb9|lJTKL&S(P$2Ej;K~rs;KLBY5H$I;*v8FM7*DtW0Qi^;5C8xG delta 34 qcmdnh!+58Mal)#}512VPJsE--f*3*=d?tTnR%JF|P}+E~(iH&H#|tq4 diff --git a/Language/Greek.h b/Language/Greek.h index ca596a02252511aff7205d17bda6f389f75c6498..bac418b3840f77632d3a2832246e241ba5056263 100644 GIT binary patch delta 41 vcmcc8&$y|dal#sL9|lJTKL&S(P$2Ej;K~rs;KLBY5Hy)reBPual)F(3Tzylo(#bZK@1@bK9e0~l$n(n3?>`8Y~EbLXy*n1>^ut! diff --git a/Language/Hebrew.h b/Language/Hebrew.h index 573d6012e93517427a6cbeb94d303926c8c8a9b5..68c80b94e518f392b0ada187048096389ac2b3a8 100644 GIT binary patch delta 43 xcmdm0Goxn0Drp}EM+QFzcZN_P?atuJ5YG_A5W?WYz{|ijnbBtX=03(XHURz;3he*@ delta 34 qcmbPHv#Vyps>uq>9PFM9!3;qRA(I!fNl#wD%)@NRptSK|xGez3nF@aZ diff --git a/Language/Hungarian.h b/Language/Hungarian.h index 2b7ee7cf3b898e84e638a9b1b3d7ab4c4dca2a0a..b78ffaa6176bfeece2bbdb83be62ac3167450f53 100644 GIT binary patch delta 45 zcmdnj$vCHzal$HT9|lJTKL&S(P$2Ej;K~rs;KLBY5X8XCz%^M=eEH@+MgwO61{ey5 delta 32 ocmbQ!$+)kRal)#}1v*^p!3;qRAq+l~7c#3d8!#wsJb2p~0I}H$ZvX%Q diff --git a/Language/Indonesian.h b/Language/Indonesian.h index f90968a77008bb42ec29f4240c36bea5e1d67de3..29fdd0e71df898fc151563d4e6e68b341342f588 100644 GIT binary patch delta 41 vcmey+!FaBNal$Hb9|lJTKL&S(P$2Ej;K~rs;KLBY5Hy)vY~$uBjCY&>_qGdy delta 39 vcmX@t!T6zral)#}4_GT)@J^XfRpOar5RP#yd^`8%+&) diff --git a/Language/Italian.h b/Language/Italian.h index 3988fa4b2ea3a2a3eb83f5743af64f82fd3d97d5..0986ef44948ebb71e330f07bba474314dbd1d397 100644 GIT binary patch delta 41 vcmey+!FaBNal$Hb9|lJTKL&S(P$2Ej;K~rs;KLBY5HwlQapUGGjCY&>`I8I7 delta 33 pcmX@t!T6zral)!eEF7Gk48aUR3?U3YlLc8+nGG0}HXiJC1^~1038Vl3 diff --git a/Language/Japanese.h b/Language/Japanese.h index b3dca67cdd149949aec2425f3f812f0d2c78d38c..d7aacd3fa5d9d96ff78a80404c394b92c0a9a4c2 100644 GIT binary patch delta 39 tcmbPH_^n{VDsdkMM+QFzcZN_P?atuJ5YOPl5W)~NIahn*<|&LU<^blQ3bgup09PFM9!3;qRA(IQ)q$e@+FdHx^Z9KTu900tS3M&8r diff --git a/Language/Korean.h b/Language/Korean.h index 808e8e71cf99a7a729b9f911ba50012658565d6b..60c8936d5c61f0bbdc3d9a8c520bf174fc84cad8 100644 GIT binary patch delta 39 tcmdmx-j5f{y@lFdJ delta 38 ucmdnc$#|)gal)F(A6Pj!JsE--f*3*=d?qt;sWKTbOpXxSw7G=Q#u)(f_6tb> diff --git a/Language/NorwegianBokmal.h b/Language/NorwegianBokmal.h index c26cfa4b33fe0865a0eea5eb8da689d7e8d4a104..f7dba559b3326090c5791d439941aeabc90cc0d0 100644 GIT binary patch delta 36 qcmey=%y^-hal$fj9|lJTKL&S(P$2Ej;K~rs;KLBY5VY~Wup8ceRYTe~@fF~b1>-`NY2 diff --git a/Language/Polish.h b/Language/Polish.h index 754ae139e16a25f3a45f9abbd29b82b50f4e563a..1d9c308e60e82ad40ec7428fd196bebdf62c21d4 100644 GIT binary patch delta 41 vcmZ41%GlD%IAN8z4}&9vAA>tXD3Eq%aAk;R@L>pH2%2nfv~lwkMj=N4;K&MX delta 34 qcmZo^Wn9+EIAPV~33gnp!3;qRA(IyxC{Dh>%EoNKptSMeVMhSZ4GWk6 diff --git a/Language/PortugueseBrazil.h b/Language/PortugueseBrazil.h index 524fce1de0923ee40c0dc645e627ece4403eae61..f57ac8e1f260444af9ef82c004a613678fc4004d 100644 GIT binary patch delta 41 vcmbQ%#rUO@al$Hb9|lJTKL&S(P$2Ej;K~rs;KLBY5H$Ir@y5+l7@M2{_ALwR delta 37 tcmey;$vCZxal)#}2Us{bJsE--f*3*=d?p)esxlf({wTV6a}i^cGXU}63`zh1 diff --git a/Language/PortuguesePortugal.h b/Language/PortuguesePortugal.h index 165e9d781ef2474bc5a78d87e20ce2752ff7f7cf..15bc6aff984b05500bc51735c509f2b36f05ab31 100644 GIT binary patch delta 41 wcmX@r!MLJ>al$Hb9|lJTKL&S(P$2Ej;K~rs;KLBY5H$Ix(Zj1GtXD3Eq%aAk;R@L>pH2%21Lym9js#y3s??8ytl delta 34 qcmccD!PwBrIAPV~1;Vf! delta 34 qcmZ3|#(1oaal)#}4$K^!o(#bZK@1@bK9d8PRhbPKlr|nrb^-vl2nnD7 diff --git a/Language/Slovenian.h b/Language/Slovenian.h index 2e27d4d0d9e2baf4c7893bae39517ab43f3e0ad5..168967af14eee278071b13444eeb5108f0dce353 100644 GIT binary patch delta 41 vcmaFW&Um7oal$Hb9|lJTKL&S(P$2Ej;K~rs;KLBY5Hwj)Y~$uBjA2dy^)m|u delta 34 qcmX@n&iJaGal)#}512SOJsE--f*3*=d?tUCR%JF|P}+Eq-5CJZ3<~A| diff --git a/Language/SpanishModern.h b/Language/SpanishModern.h index 3dfc4ababab5903886d236e083abd0e5585f67c8..27e4c8b9af1dc6a9eef382424b7526cb01fb160c 100644 GIT binary patch delta 41 wcmX@n#kj1Cal$Hb9|lJTKL&S(P$2Ej;K~rs;KLBY5H$It@y5+l7`HeB0P~~_5&!@I delta 36 scmZ41#dxBNal)#}3)ne0JsE--f*3*=d?qWZD6=Xt7%(VpJecYN0MO diff --git a/Language/Turkish.h b/Language/Turkish.h index 8f3d7e9454557e71ac91c2324a6cc6c56ad7ca0c..13e66d0b5d2af93f16ffc1f5d2809342e1f25492 100644 GIT binary patch delta 41 vcmccA#<-!4al$Hb9|lJTKL&S(P$2Ej;K~rs;KLBY5Hy+5VdLg0jQbn`?sE%6 delta 37 tcmdnc#(1fXal)#}2iQ0`JsE--f*3*=d?sI%RAn@nJW+J><|4*@jsWzq45t79 diff --git a/Language/Ukrainian.h b/Language/Ukrainian.h index 0e79c0460dc03378e1594b5676b5350f91f34d5b..912eebd4583bfb04bcfeb0e60371e2417d083e7a 100644 GIT binary patch delta 45 zcmcc8!MLe|al$HT9|lJTKL&S(P$2Ej;K~rs;KLBY5X8XCz%_X-tXD3Eq%aAk;R@L>pH2%2o~uyOMg#vhIV?qv(G delta 36 scmaFW#@N%&IAPV~08S2ePljNIAcm01A1y>DFOU{uHegWNcyOf?0OBMI-~a#s diff --git a/Library/Dialog.cpp b/Library/Dialog.cpp index 01c213ab..ad7a5a8e 100644 --- a/Library/Dialog.cpp +++ b/Library/Dialog.cpp @@ -65,11 +65,6 @@ INT_PTR CDialog::OnActivate(WPARAM wParam, LPARAM lParam) return FALSE; } -void CDialog::SetDialogRTL(HWND window) -{ - SetWindowLongPtr(window, GWL_EXSTYLE, GetWindowLongPtr(window, GWL_EXSTYLE) | WS_EX_LAYOUTRTL); -} - /* ** Sets dialog font to UI font. ** diff --git a/Library/Dialog.h b/Library/Dialog.h index 9981bcf8..3fda21ba 100644 --- a/Library/Dialog.h +++ b/Library/Dialog.h @@ -53,9 +53,6 @@ protected: INT_PTR OnActivate(WPARAM wParam, LPARAM lParam); - void SetDialogRTL(HWND window); - void SetDialogRTL() { SetDialogRTL(m_Window); } - void SetDialogFont(HWND window); void SetDialogFont() { SetDialogFont(m_Window); } diff --git a/Library/DialogAbout.cpp b/Library/DialogAbout.cpp index 5c1d77d9..945205e6 100644 --- a/Library/DialogAbout.cpp +++ b/Library/DialogAbout.cpp @@ -260,12 +260,6 @@ INT_PTR CDialogAbout::OnInitDialog(WPARAM wParam, LPARAM lParam) HICON hIcon = GetIcon(IDI_RAINMETER); SendMessage(m_Window, WM_SETICON, ICON_SMALL, (LPARAM)hIcon); - if (*GetString(ID_STR_ISRTL) == L'1') - { - // Use RTL layout if using a RTL language - SetDialogRTL(); - } - item = GetDlgItem(m_Window, IDC_ABOUT_TAB); TCITEM tci = {0}; tci.mask = TCIF_TEXT; diff --git a/Library/DialogManage.cpp b/Library/DialogManage.cpp index fee04fd3..b7175cb4 100644 --- a/Library/DialogManage.cpp +++ b/Library/DialogManage.cpp @@ -212,12 +212,6 @@ INT_PTR CDialogManage::OnInitDialog(WPARAM wParam, LPARAM lParam) HICON hIcon = GetIcon(IDI_RAINMETER); SendMessage(m_Window, WM_SETICON, ICON_SMALL, (LPARAM)hIcon); - if (*GetString(ID_STR_ISRTL) == L'1') - { - // Use RTL layout if using a RTL language - SetDialogRTL(); - } - item = GetDlgItem(m_Window, IDC_MANAGE_TAB); TCITEM tci = {0}; tci.mask = TCIF_TEXT;