From 88d1c7518a13a2737541d48ebbd4de00fc27e5ca Mon Sep 17 00:00:00 2001 From: David Sansome Date: Wed, 23 Jun 2010 16:27:23 +0000 Subject: [PATCH] Move the "Configure Clementine" menu item into the Tools menu and rename it "Preferences". Also move the global shortcuts dialog into a page in the preferences dialog. Fixes issue #422 --- data/data.qrc | 6 +- data/icons/22x22/configure-shortcuts.png | Bin 1141 -> 0 bytes data/icons/22x22/input-keyboard.png | Bin 0 -> 626 bytes data/icons/32x32/configure-shortcuts.png | Bin 1826 -> 0 bytes data/icons/32x32/input-keyboard.png | Bin 0 -> 1084 bytes data/icons/48x48/configure-shortcuts.png | Bin 3079 -> 0 bytes data/icons/48x48/input-keyboard.png | Bin 0 -> 1619 bytes src/CMakeLists.txt | 6 +- src/translations/ar.po | 11 +-- src/translations/cs.po | 19 +++-- src/translations/da.po | 19 +++-- src/translations/de.po | 22 ++++-- src/translations/el.po | 22 ++++-- src/translations/en_CA.po | 22 ++++-- src/translations/en_GB.po | 19 +++-- src/translations/es.po | 22 ++++-- src/translations/fi.po | 11 +-- src/translations/fr.po | 19 +++-- src/translations/gl.po | 11 +-- src/translations/it.po | 22 ++++-- src/translations/kk.po | 11 +-- src/translations/nb.po | 19 +++-- src/translations/oc.po | 19 +++-- src/translations/pl.po | 19 +++-- src/translations/pt.po | 22 ++++-- src/translations/pt_BR.po | 22 ++++-- src/translations/ro.po | 19 +++-- src/translations/ru.po | 22 ++++-- src/translations/sk.po | 22 ++++-- src/translations/sv.po | 22 ++++-- src/translations/tr.po | 14 ++-- src/translations/uk.po | 22 ++++-- src/translations/zh_CN.po | 11 +-- src/translations/zh_TW.po | 11 +-- ...tsdialog.cpp => globalshortcutsconfig.cpp} | 73 ++++++++---------- ...rtcutsdialog.h => globalshortcutsconfig.h} | 31 ++++---- ...cutsdialog.ui => globalshortcutsconfig.ui} | 50 +----------- src/ui/mainwindow.cpp | 12 +-- src/ui/mainwindow.h | 2 - src/ui/mainwindow.ui | 20 +---- src/ui/settingsdialog.cpp | 26 +++++-- src/ui/settingsdialog.h | 3 + src/ui/settingsdialog.ui | 28 ++++++- 43 files changed, 381 insertions(+), 350 deletions(-) delete mode 100644 data/icons/22x22/configure-shortcuts.png create mode 100644 data/icons/22x22/input-keyboard.png delete mode 100644 data/icons/32x32/configure-shortcuts.png create mode 100644 data/icons/32x32/input-keyboard.png delete mode 100644 data/icons/48x48/configure-shortcuts.png create mode 100644 data/icons/48x48/input-keyboard.png rename src/ui/{globalshortcutsdialog.cpp => globalshortcutsconfig.cpp} (78%) rename src/ui/{globalshortcutsdialog.h => globalshortcutsconfig.h} (76%) rename src/ui/{globalshortcutsdialog.ui => globalshortcutsconfig.ui} (82%) diff --git a/data/data.qrc b/data/data.qrc index 0a8a8c1f9..080d345bc 100644 --- a/data/data.qrc +++ b/data/data.qrc @@ -50,7 +50,6 @@ icons/22x22/application-exit.png icons/22x22/applications-internet.png icons/22x22/configure.png - icons/22x22/configure-shortcuts.png icons/22x22/document-open.png icons/22x22/document-open-folder.png icons/22x22/document-open-remote.png @@ -92,7 +91,6 @@ icons/32x32/application-exit.png icons/32x32/applications-internet.png icons/32x32/configure.png - icons/32x32/configure-shortcuts.png icons/32x32/document-open.png icons/32x32/document-open-folder.png icons/32x32/document-open-remote.png @@ -134,7 +132,6 @@ icons/48x48/application-exit.png icons/48x48/applications-internet.png icons/48x48/configure.png - icons/48x48/configure-shortcuts.png icons/48x48/document-open.png icons/48x48/document-open-folder.png icons/48x48/document-open-remote.png @@ -186,5 +183,8 @@ icons/48x48/view-fullscreen.png schema-12.sql schema-13.sql + icons/22x22/input-keyboard.png + icons/32x32/input-keyboard.png + icons/48x48/input-keyboard.png diff --git a/data/icons/22x22/configure-shortcuts.png b/data/icons/22x22/configure-shortcuts.png deleted file mode 100644 index 391ba80cc3e11363b6102a0be292bc009b30af01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1141 zcmV-*1d98KP)4pWgKoXbUaUmT5~y-GZ#+j|B{gz(n2t zSi~(D7NrBGCK@+}sPj9`+#f1Ia=0b3LC~6+&4?e}2-&EKOJSQcjJdU2;yRa^Qf9lA z9<9)F*Xy0{TU#=MQ&;0Jd2-Kv{qA|6_kB+!2m)lwOE0$)7zoaBM!_e%Io@zP@~u zv1IGniE}XYwFAza{SoMJ7>aayQd?M9E0su-1N{TGyAo5qRJBH1aGhn?yp0d!T<%$}kMLTrRliz7RWe`t*#! zP)vHg-b-HZm3M}RMq;BuVbP^0W7c>gwuY zold6##KOWtG8hcntyXKh82$$9wq|WfiD|@h>GFe<=O#g+P{7Xi9ozyFZ|>}P*Gs4jsIH?N!-6%fuqo!M5!!@8zrW-{2Cws6e9unL-Ywr7L|`f4N%!nf=f;^bFD1*tnKJpxzc? zDVAffm`5xTudlDW=lK_&`y52%hTPmdkjv#j)3Z>dFYk{o?q@iA@=4 z1~gd$A~Wn%Z)ay`ah?(<5h*dMuq_w}zDiO18cNM8JrW6ts*&vfu$!{F-JUos1y9Zr zDc&euU0s0wbXbbzfA*MV6ElY56}3-nZn(V0@_4d zizU?-e4RzYRK;tf8bvM&d@kG;Jc{IP!7Yj9*ZDsHMUNiK%t9GQ00000NkvXX Hu0mjf;TIcB diff --git a/data/icons/22x22/input-keyboard.png b/data/icons/22x22/input-keyboard.png new file mode 100644 index 0000000000000000000000000000000000000000..d28c96276ee61d61fb7a7fa173a44d4b65970f2d GIT binary patch literal 626 zcmV-&0*(ENP)L)r!M^ebfUt^mDBOVT4Gcnf`7?Z_ffhdZ2Y|{#* zEO=fEa#HGO%9P}@g%V1kNo>rCv$Io7r&DY;8xY)Q5ptShJi&ZEH+}bgzqwp7w9IT0 z^Mj^A5U?Fg#{?8Jkuh$-!~{=41EyzE>YCHA|LnPLM7*TgY=*<(fZc9Kf$1^9e$uF! zIaqMN--F<5isKl^$0wp`gV0%)*HIJ;xkSGonDG?!dOlwb`_GV-PSZ4dc!*5W^?HMU zK^P9qJ&0$ne7}Ese*XSK`s0P+Fu>Cx!G8Ug*OQFLXR?o{)H7*h z@JNcw-Fnb8!9R)?idWl0t$ga=oJAiTJ4(g<07~~QGj8!SYgYS%@@v| zIrlXHR53Pr?{NXYUA+P{O;2uZZN>QotJMm6gB}F-f?p7?3c7)Y9!617QJ9;n*t@>I z9xzbh0fjz+0fF{_(CY$tJZ_x3M?Yw4Y6J#w1T0`dHf-3ixU_w{`Cx;@qy&c^ZNrSr z;}TQ5>7lEOE5E$F9Nrx=6nq8_gg$-xKy`Js^>+5H+^4$MMMDM;{+!3>&&bWmIo6XA zKwdxjN#Y^p-_Fhf_2WO`;E`i+?)-VS4#Z+H%~+XHE-o%5-U9}#A2Sm%G!Dui-VNoHIkdSb=qP%he;x)gO zfYP!O>e{vI$Gp5eUS2!GAz~237(9+xj7-Pf3U{ze4AuB6u!s)Ct#W6842Yq~e zWOjCT6aq`6*XuhP8ym~f-moY+Il1MHSHk$!apT1O#EM5XHSVXgPJ`KE!G1tw{#}3k#d+?d?rADBKOihL)9;6#~GPHxjU7<+A1O9+FMU8%kk* z0e&9X>W+$<3R9*|tvz~FF?#3DUA2I~;c)C79Ubu%FfcLIxi<)fLU3?!5We!8z%NsR~?a&26L?a^t zY{^MISYIk&*6fdC{Ra7N*Xi_5csFx$cET$f`$E}>AmDN6^!T_ni%CCs1NN9h!i~5H zDV`@qX?dZ5Kv@7C7#Of)pzpx140#R9zay>_ESPM|xw*Lz92|^=;1oR{fw3QidxVa9@36>OG+x*86nX6o zjzUMEXbRffP2lb!w*1}P9RFj=u5C$)KLEkRi4&t_GTB_IREl$py(U*Sorsz?B|IodrUZr>Utg~Qrn7ZA%pIW9>cBy0Z)((N7GiSf273hLJ;^hsQI?#vh^zxW)NX1ABge?*-PKj3t5K`xr0+j?4xR`0mO-9& zUvO~PNzQGJ2x3z}e>xvU&QrQytJSV3FRL7cPBR(9gM!#|T$|AdF0P`+2M?;F{*9cp z8p`(z1)!rD&OIKJdt{w3vk?%B-Q>vIt2>f+?gNB*^XIG`(BDVS<#NEwTUz}`<$by0 z$gv`L1+b@t7>@~IY-}uqhlfK!K>-8=1lV@Mvm#`W7>cI*qe&W13LS*prY9P!?;zi@ zl6$4m87EFw!7G5nkBxXufWIpg3Va*`)D`$1He8%tMcB}wIm_kR`J+D*$CoW%x)`P4 z04kh2ck}K}CgiUnz)aGBUv8Us+zprLNZU0@k@-wKY(NQ=Z~`4 QqyPW_07*qoM6N<$g1_}%h5!Hn diff --git a/data/icons/32x32/input-keyboard.png b/data/icons/32x32/input-keyboard.png new file mode 100644 index 0000000000000000000000000000000000000000..eff45df7c9dc24ecc3a14cab14bb834ecd69eb9a GIT binary patch literal 1084 zcmZ|OdrZ?u00;0NqVY#9#AG@UQHh$&0FrLqGQhe>1Az*uSV$a?%HwC1hT2LEEGjeZ_e33H>fl>XDJhYPIGu1acIdHVTd5o&e*}Q{Wji0sI4LahO)C(`xk?q{A@1PN&oB zpW|M>fIv>ZgeGx@$;l}LG=-bS8K^Z7P6KjF3jzu!;3{ zbc>s4XU|5-WS3kyb4nMZLHVU|U8FCu`V*NOO=34OqU<{%nc9<*kD*I0Ve{c%NXK}L zlBw1D+6i(_^nxQUEUxiX%a-&qYrk2#7Q>2=Hl046{_T8Q_x?kbMA=Ub@dx4z*DIVS ziS5IYSDDmNO>?|K9y-oFS=W9+tSY6SFHFctw2m#+?9_#&wWE^M-2$E=?}+0>+V8xr znyiuA8cIjCw>s|!87#W0LgpO)oyqs#UB35EoyNFv9p(H(`i<29pqc|kF%A=QV z66T!G@1Fjni1}oYwkI?;7uk6xs;7$S(flUg{L~7jLot3xA7RZ);0x=};MKMAM{;jp zu%~ua(fqS9q%8kb2#J+*C?l~Tg&iL9!hBvop%yb*ShoW6o1CSjUQZAz;Pd$cfk1uZ p1QGSD{Pi{I&t7{#O!~3o7ZBvkqt1lhHcuz~x3pw>(nD%q_5U!#db|Jt literal 0 HcmV?d00001 diff --git a/data/icons/48x48/configure-shortcuts.png b/data/icons/48x48/configure-shortcuts.png deleted file mode 100644 index 59ec430ae9a20808933905ba3f9fbaf6d1b6e7b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3079 zcmV+i4EXbjP))6CV@%*$pMi_N^Si6XjMvQnBC+Dc6{D_0N`uZfDv#Q_`?R0a|lZq5vIpV{x6 z$MZBzBP6-Vs~`VA|3Ccy_nz}z-gDqwE*Eqcyt#0`P^+zd$7;1a+_R@V(pM@GSS*&4 zJPtCCA3u4lxTwSd9_Tg%X1z9JMu2}{+Vd|w9~9TGKX4p?!Ds-3-T*DFEl^uq(^geg zwP4|!Z*T5)1Qx#i_Zj!y*YmTfQ>OC${QN-T>kAf(nL4jG7{F-Ig8`3q^>vPm7fY5e zTl&xC%x?kQW32mlO{kC1XTyZ&Ch&PY9vM^M^Z59a2M&h=T3VW*ysX?&R9tkeL8r@a zZEjHm01wUCEeN!=ncqrG7$Ok}gy7?&t9Y z;pikCdKdn4I*B>JWHN!(YCX@K@0J8~4UKO^DivIH^>sksiP4d_+Z`DHc4%s9QUjt} z639P&iu3oAJ|YX2VWPGG#yAZhBtVnb$Hxc8j2ZKIw-C1DNM!_{lyiy17p`5s3XzeK;6wsI{<|EY2oDcb zmzET)S)2OETMOUSvfoYL_(`}(BwkQ`{o3h!Lg137+&?HN=pnI4LPuLFmEtuGNU@2@ zf`g%NObktCSx5+HHCv-ZK0c@CyfJ&q@L|Iq!SB2jrR)={*Xu2xW^CGbPY9gO&tIm9 zQ21lG!_}+RP+4^inp>LT@bRBuXyRa)KW{Dw_OzPBl3AIphqC&=bwgk8`80yR>B*vzYYQZeo$Ig1~+fsB%y@n z0=c{wRwX-x^$Y{CNDRIxGfarjw`~0ilV0ED1PThy?u=4KNqxm)h>eW_kyrwiSFeN3 zYJ<4gSkN`KK>4L|8bU5iWQ9Tj6`Bep5(a!ekCa$f`iAsuU4w2{msX)0bvH!Ywr@M3 z8WcY|EKCk!u`di5&>v!=`_Pg8_Pg&PC@>I&SU%4cT%ctYXMu)`pVXh`huz_HrKYYr zwP(-X_i*%$T~>v@$@-?hQLjHdV#GsX1?LI?D+mzzAQ153!9Nd$!s22mQLAD4)R&>; zVhJX1Fl}TA+7}`sBH-kSpG?IiMZ2>P?a`XsQ zobxbIUzs)yE)*8RnX~6WBKCoX`g*WfEiiZPJUa5GHY3#3)WG@k=Upi)S8YUjJsB&SLz$;k5*M({T7|Sg3dd;WJPv3??-8VeturRe*NyRs;uHRZQcw< zqY)TL2(4K05e!L8aGfnUd$6&o@ksuu(>V?GI(=+xtP;s z<6S~@5R#xqfIiYv+R)GdI-Rbpxw-jq{J!?ChtLO$lV)L8T^kt{;kP<%4OCvK1b0ZW zhA;l`LkJHK*KgjuY23%_HymU4u)fb6Hf)$ABqW45%!~;U z64;#pt46d7YwM9^JJ;(vUQ6o{SkhnSeYBQ6vcVT(UTVinxc1H0~`MQ?-CVZV@) zvhp#E_eS_FI6j}x9R3Xfc1XoZf! zv1c%_@WJbzx#75D0#7~lWPF&s=T43$40I(WmJqE@x|{vDw+^lh2gM zLk|xp%fnCBq^*0?Q@3;+LTt3XhYp^z#Qyyu^xTAJ(^RTK^Kp?aG#X5pm;r#}L8Y#Z zZ=(+-&-1|=otPN!!YZ>G8`S&WbW3t_@-(dDPhrAJaK!m|wpagTtKveIYdb!C`?4MeiL6iHT3(?iuiTLYk-|u?Pfw0fr8B{#FQaFnHh~r$%#m zdB(p#UCyT14XAxqj6z4Yqg=qg&;#7TzV0oAa&mGY2G__)+IKr#;75k}~u9J;ZMbaEJ+i8NW7hNWxsR*&-+@R#WYPrGX?E zah!&X!%4UOfWuxA8Y(lXFP6^!BJ;~k=m0nfE<(Z$-b9<{b$Co& zR7O4nR2kZx0|)l!)!k@-HdEU#vX*STnw$_A)B|JES6@X~P-Ywo~s7*}xi++e%Io;^r403s9-RGgX3W-uX{(EDT< z!;zEDtGgE;TeTuz$JZ7+(kbPgEU9|f1S=0ZWy^n7u&xqL{WALMcSzMliqun-FRurq@h7UffGsT z!`#TtK5+19cjxcY40yFsqeju4YR~KV4DV{xXfW(YXBUPmdS!pObn&*qZb zCE}pymigQ=p~pGDy_b4^c0YD>uQShMMhJKf5%-brz&H2185Fi|)2+Gmj*FT`2+5PV9&hzg6u^;7yyc(?Jl7-{FH4!ut9;sQ+J2p2UM1SJxA6 zZYNHm&YwSj|9(t#^qsUc29+8HT54)4ot~DMn3$51LZ{P{lT&CkT6%hVLIPMzLM10B zgSBS>S`4bv00x7>y<#5XK_TuyN3xGnXsIZX5VimJk z>|%%wl$4Zkpf^BiX=zzmSvdr@0zg)BA&_9(>Pn~zoXF#WtgeD;s;g^jYHDh0Yx#VB zJ=9QN-`D^N8lffu)Z7Gt6gER5A=Dy*K(>lR;ufg2rA6Edfov1!7mA@au~^aufozvR z9qmwO2h@q`LUjW@P+xCvZyz+!-`_s~4FW^ZFluz9zJ3H6MZE>yL1UbOHi7 zDSbO89iNawlTzu_Bm{DL3YtdArl)6Q(9F!tENTulk9v<<06st;QH!Wgs3p`g>NDyK zu(GnUy1Kfywif0bLbmdIq-pekJBdwD1ByxBlAQje0^SW--II3s){ z^C!yyNfsq53wzycGM%k2Fc1%zN0b=W&?vDfHpW#~90&^k;_n%zo92@;^#s9Zx0Vik zY?4?yzf#T&cG9i)e$n0TIM}`F(Z=k&{kKNsb<#G)Kn3&GK`qLe%_PG)r{Y_ub|j4~ z>9}4);?0#A5`7XO?RiVVd*gO;#l3tFxSk+Di5vrs7zC%M)?9wV)Td+KKiDuDf3Z(?m=Dc zH=TLND>q((4^D2r+tsJ%-d|1jZ3Vr^{c_vtKg>-ujCp9d}w?#+ruB=@|9ov3C4m;=LYArI*JrQOwdN z%)*3)6_aCUnsmv0d&fk9!i8!qJE2i4QY%7ym%PwM4S3k=wWUX6Z8LkZYMs%%fA*Ay z%uaT#n@HI9(ckpu$b;IRZzeaU7>6yj8dcaU;u!alBx&peS$;@{@v%R9!c|YlT&x%I zy{tR-A5gZ5O)#nC{K59g-Wo2aK(~+jAxFU(`C$0B+;puu7Lf?4{p82-?nBtazs?O( zI^46PcwJ^2lWj3|h#J;SO}X0^(|l9~uV(c$SV5>^$iwF&*_Q2_iu^0T!w0Kxz!MT` txMoU@9_oZ6N|Pp6$hf(1$II9Et|;-}*|+Z)#@vCwa}t4!&vkH*{0~JWpTGbB literal 0 HcmV?d00001 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 13eaf68ab..f55e3ed44 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -116,7 +116,7 @@ set(SOURCES ui/edittagdialog.cpp ui/equalizer.cpp ui/globalshortcutgrabber.cpp - ui/globalshortcutsdialog.cpp + ui/globalshortcutsconfig.cpp ui/iconloader.cpp ui/mainwindow.cpp ui/qtsystemtrayicon.cpp @@ -220,7 +220,7 @@ set(HEADERS ui/edittagdialog.h ui/equalizer.h ui/globalshortcutgrabber.h - ui/globalshortcutsdialog.h + ui/globalshortcutsconfig.h ui/mainwindow.h ui/qtsystemtrayicon.h ui/settingsdialog.h @@ -268,7 +268,7 @@ set(UI ui/edittagdialog.ui ui/equalizer.ui ui/globalshortcutgrabber.ui - ui/globalshortcutsdialog.ui + ui/globalshortcutsconfig.ui ui/mainwindow.ui ui/settingsdialog.ui diff --git a/src/translations/ar.po b/src/translations/ar.po index 8246c39c1..bf609fcb0 100644 --- a/src/translations/ar.po +++ b/src/translations/ar.po @@ -1262,7 +1262,7 @@ msgstr "" msgid "F2" msgstr "" -msgid "Configure Clementine..." +msgid "Preferences..." msgstr "" msgid "Ctrl+P" @@ -1310,9 +1310,6 @@ msgstr "" msgid "Add folder..." msgstr "" -msgid "Configure global shortcuts..." -msgstr "" - msgid "Jump to the currently playing track" msgstr "" @@ -1349,9 +1346,6 @@ msgstr "" msgid "Music" msgstr "" -msgid "Settings" -msgstr "" - msgid "Help" msgstr "" @@ -1367,6 +1361,9 @@ msgstr "" msgid "Behavior" msgstr "" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "" diff --git a/src/translations/cs.po b/src/translations/cs.po index bc05c7b4b..ddf790255 100644 --- a/src/translations/cs.po +++ b/src/translations/cs.po @@ -1266,8 +1266,8 @@ msgstr "Uprav tag..." msgid "F2" msgstr "F2" -msgid "Configure Clementine..." -msgstr "Nastavit Clementine..." +msgid "Preferences..." +msgstr "" msgid "Ctrl+P" msgstr "" @@ -1314,9 +1314,6 @@ msgstr "Odstranit z playlistu" msgid "Add folder..." msgstr "" -msgid "Configure global shortcuts..." -msgstr "" - msgid "Jump to the currently playing track" msgstr "" @@ -1353,9 +1350,6 @@ msgstr "Internet" msgid "Music" msgstr "Hudba" -msgid "Settings" -msgstr "Nastavení" - msgid "Help" msgstr "Nápověda" @@ -1371,6 +1365,9 @@ msgstr "Přehrávání" msgid "Behavior" msgstr "Chování" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "Upozornění" @@ -1530,6 +1527,12 @@ msgstr "" msgid "Delay between visualizations" msgstr "" +#~ msgid "Settings" +#~ msgstr "Nastavení" + +#~ msgid "Configure Clementine..." +#~ msgstr "Nastavit Clementine..." + #~ msgid "Loading audio engine" #~ msgstr "Načítá se podpora audia" diff --git a/src/translations/da.po b/src/translations/da.po index a985b5938..747f27bd4 100644 --- a/src/translations/da.po +++ b/src/translations/da.po @@ -1269,8 +1269,8 @@ msgstr "Redigér mærke..." msgid "F2" msgstr "F2" -msgid "Configure Clementine..." -msgstr "Indstil Clementine..." +msgid "Preferences..." +msgstr "" msgid "Ctrl+P" msgstr "" @@ -1317,9 +1317,6 @@ msgstr "Fjern fra spilleliste" msgid "Add folder..." msgstr "" -msgid "Configure global shortcuts..." -msgstr "" - msgid "Jump to the currently playing track" msgstr "" @@ -1356,9 +1353,6 @@ msgstr "" msgid "Music" msgstr "Musik" -msgid "Settings" -msgstr "Indstillinger" - msgid "Help" msgstr "Hjælp" @@ -1374,6 +1368,9 @@ msgstr "Afspilning" msgid "Behavior" msgstr "Opførsel" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "Bekendtgørelser" @@ -1533,6 +1530,12 @@ msgstr "" msgid "Delay between visualizations" msgstr "" +#~ msgid "Settings" +#~ msgstr "Indstillinger" + +#~ msgid "Configure Clementine..." +#~ msgstr "Indstil Clementine..." + #~ msgid "Loading audio engine" #~ msgstr "Indlæser lydmotor" diff --git a/src/translations/de.po b/src/translations/de.po index 9a9bdece5..18c7f8626 100644 --- a/src/translations/de.po +++ b/src/translations/de.po @@ -1268,8 +1268,8 @@ msgstr "Tag bearbeiten..." msgid "F2" msgstr "F2" -msgid "Configure Clementine..." -msgstr "Clementine einrichten..." +msgid "Preferences..." +msgstr "" msgid "Ctrl+P" msgstr "" @@ -1316,9 +1316,6 @@ msgstr "Aus der Wiedergabeliste entfernen" msgid "Add folder..." msgstr "Ordner hinzufügen..." -msgid "Configure global shortcuts..." -msgstr "Tastenkürzel einrichten..." - msgid "Jump to the currently playing track" msgstr "Zum aktuellen Stück springen" @@ -1355,9 +1352,6 @@ msgstr "Internet" msgid "Music" msgstr "Musik" -msgid "Settings" -msgstr "Einstellungen" - msgid "Help" msgstr "Hilfe" @@ -1373,6 +1367,9 @@ msgstr "Wiedergabe" msgid "Behavior" msgstr "Verhalten" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "Benachrichtigungen" @@ -1534,6 +1531,15 @@ msgstr "Von der Liste wählen" msgid "Delay between visualizations" msgstr "" +#~ msgid "Configure global shortcuts..." +#~ msgstr "Tastenkürzel einrichten..." + +#~ msgid "Settings" +#~ msgstr "Einstellungen" + +#~ msgid "Configure Clementine..." +#~ msgstr "Clementine einrichten..." + #~ msgid "Loading audio engine" #~ msgstr "Audio Engine wird geladen" diff --git a/src/translations/el.po b/src/translations/el.po index 17bc884aa..7893470d6 100644 --- a/src/translations/el.po +++ b/src/translations/el.po @@ -1272,8 +1272,8 @@ msgstr "Τροποποίηση ετικέτας..." msgid "F2" msgstr "F2" -msgid "Configure Clementine..." -msgstr "Παραμετροποίηση του Clementine..." +msgid "Preferences..." +msgstr "" msgid "Ctrl+P" msgstr "" @@ -1320,9 +1320,6 @@ msgstr "Αφαίρεση από την λίστα" msgid "Add folder..." msgstr "Προσθήκη φακέλου" -msgid "Configure global shortcuts..." -msgstr "Ρύθμιση καθολικών συντομεύσεων..." - msgid "Jump to the currently playing track" msgstr "Μετάβαση στο τρέχον κομμάτι που παίζει" @@ -1359,9 +1356,6 @@ msgstr "Διαδίκτυο" msgid "Music" msgstr "Μουσική" -msgid "Settings" -msgstr "Ρυθμίσεις" - msgid "Help" msgstr "Βοήθεια" @@ -1377,6 +1371,9 @@ msgstr "Αναπαραγωγή" msgid "Behavior" msgstr "Συμπεριφορά" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "Ειδοποιήσεις" @@ -1536,6 +1533,15 @@ msgstr "Επιλογή από τη λίστα" msgid "Delay between visualizations" msgstr "" +#~ msgid "Configure global shortcuts..." +#~ msgstr "Ρύθμιση καθολικών συντομεύσεων..." + +#~ msgid "Settings" +#~ msgstr "Ρυθμίσεις" + +#~ msgid "Configure Clementine..." +#~ msgstr "Παραμετροποίηση του Clementine..." + #~ msgid "Loading audio engine" #~ msgstr "Φόρτωμα της μηχανής ήχου" diff --git a/src/translations/en_CA.po b/src/translations/en_CA.po index 05dca8233..b2f424007 100644 --- a/src/translations/en_CA.po +++ b/src/translations/en_CA.po @@ -1267,8 +1267,8 @@ msgstr "Edit tag..." msgid "F2" msgstr "F2" -msgid "Configure Clementine..." -msgstr "Configure Clementine..." +msgid "Preferences..." +msgstr "" msgid "Ctrl+P" msgstr "" @@ -1315,9 +1315,6 @@ msgstr "Remove from playlist" msgid "Add folder..." msgstr "Add folder..." -msgid "Configure global shortcuts..." -msgstr "Configure global shortcuts..." - msgid "Jump to the currently playing track" msgstr "Jump to the currently playing track" @@ -1354,9 +1351,6 @@ msgstr "Internet" msgid "Music" msgstr "Music" -msgid "Settings" -msgstr "Settings" - msgid "Help" msgstr "Help" @@ -1372,6 +1366,9 @@ msgstr "Playback" msgid "Behavior" msgstr "Behaviour" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "Notifications" @@ -1531,6 +1528,15 @@ msgstr "" msgid "Delay between visualizations" msgstr "Delay between visualisations" +#~ msgid "Configure global shortcuts..." +#~ msgstr "Configure global shortcuts..." + +#~ msgid "Settings" +#~ msgstr "Settings" + +#~ msgid "Configure Clementine..." +#~ msgstr "Configure Clementine..." + #~ msgid "Loading audio engine" #~ msgstr "Loading audio engine" diff --git a/src/translations/en_GB.po b/src/translations/en_GB.po index b88504e8f..4dbbe588a 100644 --- a/src/translations/en_GB.po +++ b/src/translations/en_GB.po @@ -1264,8 +1264,8 @@ msgstr "Edit tag..." msgid "F2" msgstr "F2" -msgid "Configure Clementine..." -msgstr "Configure Clementine..." +msgid "Preferences..." +msgstr "" msgid "Ctrl+P" msgstr "" @@ -1312,9 +1312,6 @@ msgstr "Remove from playlist" msgid "Add folder..." msgstr "" -msgid "Configure global shortcuts..." -msgstr "" - msgid "Jump to the currently playing track" msgstr "" @@ -1351,9 +1348,6 @@ msgstr "" msgid "Music" msgstr "Music" -msgid "Settings" -msgstr "Settings" - msgid "Help" msgstr "Help" @@ -1369,6 +1363,9 @@ msgstr "Playback" msgid "Behavior" msgstr "Behaviour" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "Notifications" @@ -1528,6 +1525,12 @@ msgstr "" msgid "Delay between visualizations" msgstr "Delay between visualisations" +#~ msgid "Settings" +#~ msgstr "Settings" + +#~ msgid "Configure Clementine..." +#~ msgstr "Configure Clementine..." + #~ msgid "Loading audio engine" #~ msgstr "Loading audio engine" diff --git a/src/translations/es.po b/src/translations/es.po index d7b3d1a72..2ba644efa 100644 --- a/src/translations/es.po +++ b/src/translations/es.po @@ -1276,8 +1276,8 @@ msgstr "Editar etiqueta..." msgid "F2" msgstr "F2" -msgid "Configure Clementine..." -msgstr "Configurar Clementine..." +msgid "Preferences..." +msgstr "" msgid "Ctrl+P" msgstr "" @@ -1324,9 +1324,6 @@ msgstr "Eliminar de la lista de reproducción" msgid "Add folder..." msgstr "Añadir carpeta..." -msgid "Configure global shortcuts..." -msgstr "Configurar combinaciones de teclas globales" - msgid "Jump to the currently playing track" msgstr "Ir a la pista actualmente reproduciéndose" @@ -1363,9 +1360,6 @@ msgstr "Internet" msgid "Music" msgstr "Música" -msgid "Settings" -msgstr "Preferencias" - msgid "Help" msgstr "Ayuda" @@ -1381,6 +1375,9 @@ msgstr "Reproducción" msgid "Behavior" msgstr "Comportamiento" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "Notificaciones" @@ -1542,6 +1539,15 @@ msgstr "Elegir de la lista" msgid "Delay between visualizations" msgstr "" +#~ msgid "Configure global shortcuts..." +#~ msgstr "Configurar combinaciones de teclas globales" + +#~ msgid "Settings" +#~ msgstr "Preferencias" + +#~ msgid "Configure Clementine..." +#~ msgstr "Configurar Clementine..." + #~ msgid "Loading audio engine" #~ msgstr "Cargando motor de sonido" diff --git a/src/translations/fi.po b/src/translations/fi.po index cda83a1f8..4aa210b31 100644 --- a/src/translations/fi.po +++ b/src/translations/fi.po @@ -1262,7 +1262,7 @@ msgstr "" msgid "F2" msgstr "" -msgid "Configure Clementine..." +msgid "Preferences..." msgstr "" msgid "Ctrl+P" @@ -1310,9 +1310,6 @@ msgstr "" msgid "Add folder..." msgstr "" -msgid "Configure global shortcuts..." -msgstr "" - msgid "Jump to the currently playing track" msgstr "" @@ -1349,9 +1346,6 @@ msgstr "" msgid "Music" msgstr "" -msgid "Settings" -msgstr "" - msgid "Help" msgstr "" @@ -1367,6 +1361,9 @@ msgstr "" msgid "Behavior" msgstr "" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "" diff --git a/src/translations/fr.po b/src/translations/fr.po index 214bf72b5..b76ee267e 100644 --- a/src/translations/fr.po +++ b/src/translations/fr.po @@ -1272,8 +1272,8 @@ msgstr "Modifier la tag..." msgid "F2" msgstr "F2" -msgid "Configure Clementine..." -msgstr "Configurer Clementine..." +msgid "Preferences..." +msgstr "" msgid "Ctrl+P" msgstr "" @@ -1320,9 +1320,6 @@ msgstr "Supprimer de la liste de lecture" msgid "Add folder..." msgstr "" -msgid "Configure global shortcuts..." -msgstr "" - msgid "Jump to the currently playing track" msgstr "" @@ -1359,9 +1356,6 @@ msgstr "" msgid "Music" msgstr "Musique" -msgid "Settings" -msgstr "Configuration" - msgid "Help" msgstr "Aide" @@ -1377,6 +1371,9 @@ msgstr "Lecture sonore" msgid "Behavior" msgstr "" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "Notifications" @@ -1538,6 +1535,12 @@ msgstr "" msgid "Delay between visualizations" msgstr "" +#~ msgid "Settings" +#~ msgstr "Configuration" + +#~ msgid "Configure Clementine..." +#~ msgstr "Configurer Clementine..." + #~ msgid "Loading audio engine" #~ msgstr "Chargement du moteur audio" diff --git a/src/translations/gl.po b/src/translations/gl.po index 2ba87a6d5..5336fb2ec 100644 --- a/src/translations/gl.po +++ b/src/translations/gl.po @@ -1264,7 +1264,7 @@ msgstr "" msgid "F2" msgstr "" -msgid "Configure Clementine..." +msgid "Preferences..." msgstr "" msgid "Ctrl+P" @@ -1312,9 +1312,6 @@ msgstr "" msgid "Add folder..." msgstr "" -msgid "Configure global shortcuts..." -msgstr "" - msgid "Jump to the currently playing track" msgstr "" @@ -1351,9 +1348,6 @@ msgstr "" msgid "Music" msgstr "" -msgid "Settings" -msgstr "" - msgid "Help" msgstr "" @@ -1369,6 +1363,9 @@ msgstr "" msgid "Behavior" msgstr "" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "" diff --git a/src/translations/it.po b/src/translations/it.po index 4c856f143..7638b9392 100644 --- a/src/translations/it.po +++ b/src/translations/it.po @@ -1273,8 +1273,8 @@ msgstr "Modifica tag..." msgid "F2" msgstr "F2" -msgid "Configure Clementine..." -msgstr "Configura Clementine..." +msgid "Preferences..." +msgstr "" msgid "Ctrl+P" msgstr "" @@ -1321,9 +1321,6 @@ msgstr "Rimuovi dalla scaletta" msgid "Add folder..." msgstr "Aggiungi cartella..." -msgid "Configure global shortcuts..." -msgstr "Configura le scorciatoie globali..." - msgid "Jump to the currently playing track" msgstr "Salta alla traccia in riproduzione" @@ -1360,9 +1357,6 @@ msgstr "Internet" msgid "Music" msgstr "Musica" -msgid "Settings" -msgstr "Impostazioni" - msgid "Help" msgstr "Aiuto" @@ -1378,6 +1372,9 @@ msgstr "Riproduzione" msgid "Behavior" msgstr "Comportamento" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "Notifiche" @@ -1539,6 +1536,15 @@ msgstr "Scegli dall'elenco" msgid "Delay between visualizations" msgstr "" +#~ msgid "Configure global shortcuts..." +#~ msgstr "Configura le scorciatoie globali..." + +#~ msgid "Settings" +#~ msgstr "Impostazioni" + +#~ msgid "Configure Clementine..." +#~ msgstr "Configura Clementine..." + #~ msgid "Loading audio engine" #~ msgstr "Caricamento motore audio" diff --git a/src/translations/kk.po b/src/translations/kk.po index 3870f02e0..a0a013c67 100644 --- a/src/translations/kk.po +++ b/src/translations/kk.po @@ -1264,7 +1264,7 @@ msgstr "" msgid "F2" msgstr "" -msgid "Configure Clementine..." +msgid "Preferences..." msgstr "" msgid "Ctrl+P" @@ -1312,9 +1312,6 @@ msgstr "" msgid "Add folder..." msgstr "" -msgid "Configure global shortcuts..." -msgstr "" - msgid "Jump to the currently playing track" msgstr "" @@ -1351,9 +1348,6 @@ msgstr "" msgid "Music" msgstr "" -msgid "Settings" -msgstr "" - msgid "Help" msgstr "" @@ -1369,6 +1363,9 @@ msgstr "" msgid "Behavior" msgstr "" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "" diff --git a/src/translations/nb.po b/src/translations/nb.po index b8cd28e4c..5e69d6c55 100644 --- a/src/translations/nb.po +++ b/src/translations/nb.po @@ -1266,8 +1266,8 @@ msgstr "Endre merkelapp..." msgid "F2" msgstr "" -msgid "Configure Clementine..." -msgstr "Konfigurér Clementine..." +msgid "Preferences..." +msgstr "" msgid "Ctrl+P" msgstr "" @@ -1314,9 +1314,6 @@ msgstr "Fjern fra spillelisten" msgid "Add folder..." msgstr "" -msgid "Configure global shortcuts..." -msgstr "" - msgid "Jump to the currently playing track" msgstr "" @@ -1353,9 +1350,6 @@ msgstr "" msgid "Music" msgstr "Musikk" -msgid "Settings" -msgstr "Innstillinger" - msgid "Help" msgstr "Hjelp" @@ -1371,6 +1365,9 @@ msgstr "Avspilling" msgid "Behavior" msgstr "" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "Meldinger" @@ -1530,6 +1527,12 @@ msgstr "" msgid "Delay between visualizations" msgstr "" +#~ msgid "Settings" +#~ msgstr "Innstillinger" + +#~ msgid "Configure Clementine..." +#~ msgstr "Konfigurér Clementine..." + #~ msgid "Loading audio engine" #~ msgstr "Laster lydmotor" diff --git a/src/translations/oc.po b/src/translations/oc.po index 8508f016d..fc8f0f936 100644 --- a/src/translations/oc.po +++ b/src/translations/oc.po @@ -1262,8 +1262,8 @@ msgstr "" msgid "F2" msgstr "F2" -msgid "Configure Clementine..." -msgstr "Configurar Clementine..." +msgid "Preferences..." +msgstr "" msgid "Ctrl+P" msgstr "" @@ -1310,9 +1310,6 @@ msgstr "" msgid "Add folder..." msgstr "" -msgid "Configure global shortcuts..." -msgstr "" - msgid "Jump to the currently playing track" msgstr "" @@ -1349,9 +1346,6 @@ msgstr "Sus Internet" msgid "Music" msgstr "Musica" -msgid "Settings" -msgstr "Paramètres" - msgid "Help" msgstr "Ajuda" @@ -1367,6 +1361,9 @@ msgstr "Sortida" msgid "Behavior" msgstr "Compòrtament" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "Notificacions" @@ -1526,5 +1523,11 @@ msgstr "" msgid "Delay between visualizations" msgstr "" +#~ msgid "Settings" +#~ msgstr "Paramètres" + +#~ msgid "Configure Clementine..." +#~ msgstr "Configurar Clementine..." + #~ msgid "Options" #~ msgstr "Opcions" diff --git a/src/translations/pl.po b/src/translations/pl.po index 7966cf920..e34890ab5 100644 --- a/src/translations/pl.po +++ b/src/translations/pl.po @@ -1264,8 +1264,8 @@ msgstr "Edytuj znacznik..." msgid "F2" msgstr "" -msgid "Configure Clementine..." -msgstr "Konfiguruj Clementine..." +msgid "Preferences..." +msgstr "" msgid "Ctrl+P" msgstr "" @@ -1312,9 +1312,6 @@ msgstr "Usuń z playlisty" msgid "Add folder..." msgstr "" -msgid "Configure global shortcuts..." -msgstr "" - msgid "Jump to the currently playing track" msgstr "" @@ -1351,9 +1348,6 @@ msgstr "" msgid "Music" msgstr "Muzyka" -msgid "Settings" -msgstr "Ustawienia" - msgid "Help" msgstr "Pomoc" @@ -1369,6 +1363,9 @@ msgstr "Odtwarzanie" msgid "Behavior" msgstr "" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "Powiadomienia" @@ -1528,6 +1525,12 @@ msgstr "" msgid "Delay between visualizations" msgstr "" +#~ msgid "Settings" +#~ msgstr "Ustawienia" + +#~ msgid "Configure Clementine..." +#~ msgstr "Konfiguruj Clementine..." + #~ msgid "Loading audio engine" #~ msgstr "Ładowanie silnika dźwięku" diff --git a/src/translations/pt.po b/src/translations/pt.po index 42b0b6205..a8d1c9c2c 100644 --- a/src/translations/pt.po +++ b/src/translations/pt.po @@ -1268,8 +1268,8 @@ msgstr "Editar a marca..." msgid "F2" msgstr "F2" -msgid "Configure Clementine..." -msgstr "Configurar Clementine..." +msgid "Preferences..." +msgstr "" msgid "Ctrl+P" msgstr "" @@ -1316,9 +1316,6 @@ msgstr "Remover da lista de reprodução" msgid "Add folder..." msgstr "Adicionar pasta..." -msgid "Configure global shortcuts..." -msgstr "Configurar atalhos globais..." - msgid "Jump to the currently playing track" msgstr "Ir para a faixa de reprodução actual" @@ -1355,9 +1352,6 @@ msgstr "Internet" msgid "Music" msgstr "Música" -msgid "Settings" -msgstr "Definições" - msgid "Help" msgstr "Ajuda" @@ -1373,6 +1367,9 @@ msgstr "Reprodução" msgid "Behavior" msgstr "Comportamento" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "Notificações" @@ -1533,6 +1530,15 @@ msgstr "Escolher da lista" msgid "Delay between visualizations" msgstr "" +#~ msgid "Configure global shortcuts..." +#~ msgstr "Configurar atalhos globais..." + +#~ msgid "Settings" +#~ msgstr "Definições" + +#~ msgid "Configure Clementine..." +#~ msgstr "Configurar Clementine..." + #~ msgid "Loading audio engine" #~ msgstr "Carregando o sistema de áudio" diff --git a/src/translations/pt_BR.po b/src/translations/pt_BR.po index 828a499af..6f9e7a0c5 100644 --- a/src/translations/pt_BR.po +++ b/src/translations/pt_BR.po @@ -1272,8 +1272,8 @@ msgstr "Editar Marcador" msgid "F2" msgstr "F2" -msgid "Configure Clementine..." -msgstr "Cnfigurar Clementine..." +msgid "Preferences..." +msgstr "" msgid "Ctrl+P" msgstr "" @@ -1320,9 +1320,6 @@ msgstr "Remover da lista de reprodução" msgid "Add folder..." msgstr "Adicionar pasta..." -msgid "Configure global shortcuts..." -msgstr "Configurar atalhos globais..." - msgid "Jump to the currently playing track" msgstr "Pular para a faixa em execução" @@ -1359,9 +1356,6 @@ msgstr "Internet" msgid "Music" msgstr "Música" -msgid "Settings" -msgstr "Configurações" - msgid "Help" msgstr "Ajuda" @@ -1377,6 +1371,9 @@ msgstr "Reproduzir" msgid "Behavior" msgstr "Comportamento" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "Notificações" @@ -1536,6 +1533,15 @@ msgstr "Escolher da lista" msgid "Delay between visualizations" msgstr "" +#~ msgid "Configure global shortcuts..." +#~ msgstr "Configurar atalhos globais..." + +#~ msgid "Settings" +#~ msgstr "Configurações" + +#~ msgid "Configure Clementine..." +#~ msgstr "Cnfigurar Clementine..." + #~ msgid "Loading audio engine" #~ msgstr "Carregando mecanismo de áudio" diff --git a/src/translations/ro.po b/src/translations/ro.po index 669fb60ac..d182dfd29 100644 --- a/src/translations/ro.po +++ b/src/translations/ro.po @@ -1263,8 +1263,8 @@ msgstr "" msgid "F2" msgstr "" -msgid "Configure Clementine..." -msgstr "Configurează Clementine..." +msgid "Preferences..." +msgstr "" msgid "Ctrl+P" msgstr "" @@ -1311,9 +1311,6 @@ msgstr "Elimină din lista de redare" msgid "Add folder..." msgstr "" -msgid "Configure global shortcuts..." -msgstr "" - msgid "Jump to the currently playing track" msgstr "" @@ -1350,9 +1347,6 @@ msgstr "" msgid "Music" msgstr "Muzică" -msgid "Settings" -msgstr "Setări" - msgid "Help" msgstr "Ajutor" @@ -1368,6 +1362,9 @@ msgstr "Redare" msgid "Behavior" msgstr "Comportament" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "Notificări" @@ -1527,6 +1524,12 @@ msgstr "" msgid "Delay between visualizations" msgstr "" +#~ msgid "Settings" +#~ msgstr "Setări" + +#~ msgid "Configure Clementine..." +#~ msgstr "Configurează Clementine..." + #~ msgid "Loading audio engine" #~ msgstr "Se încarcă motorul audio" diff --git a/src/translations/ru.po b/src/translations/ru.po index d72327f96..dfa74bf17 100644 --- a/src/translations/ru.po +++ b/src/translations/ru.po @@ -1268,8 +1268,8 @@ msgstr "Редактировать тег..." msgid "F2" msgstr "F2" -msgid "Configure Clementine..." -msgstr "Настроить Clementine..." +msgid "Preferences..." +msgstr "" msgid "Ctrl+P" msgstr "" @@ -1316,9 +1316,6 @@ msgstr "Удалить из списка воспроизведения" msgid "Add folder..." msgstr "Добавить каталог..." -msgid "Configure global shortcuts..." -msgstr "Настройка глобальных горячих клавиш..." - msgid "Jump to the currently playing track" msgstr "Перейти к текущей композиции" @@ -1355,9 +1352,6 @@ msgstr "Интернет" msgid "Music" msgstr "Музыка" -msgid "Settings" -msgstr "Настройки" - msgid "Help" msgstr "Помощь" @@ -1373,6 +1367,9 @@ msgstr "Воспроизведение" msgid "Behavior" msgstr "Поведение" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "Уведомления" @@ -1533,6 +1530,15 @@ msgstr "Выбор из списка" msgid "Delay between visualizations" msgstr "" +#~ msgid "Configure global shortcuts..." +#~ msgstr "Настройка глобальных горячих клавиш..." + +#~ msgid "Settings" +#~ msgstr "Настройки" + +#~ msgid "Configure Clementine..." +#~ msgstr "Настроить Clementine..." + #~ msgid "Loading audio engine" #~ msgstr "Загрузка движка аудио" diff --git a/src/translations/sk.po b/src/translations/sk.po index a52480046..8dcee775f 100644 --- a/src/translations/sk.po +++ b/src/translations/sk.po @@ -1269,8 +1269,8 @@ msgstr "Upraviť tag..." msgid "F2" msgstr "F2" -msgid "Configure Clementine..." -msgstr "Nastaviť Clementine..." +msgid "Preferences..." +msgstr "" msgid "Ctrl+P" msgstr "" @@ -1317,9 +1317,6 @@ msgstr "Odstrániť z playlistu" msgid "Add folder..." msgstr "Pridať priečinok..." -msgid "Configure global shortcuts..." -msgstr "Nastaviť globálne skratky..." - msgid "Jump to the currently playing track" msgstr "Skočiť na práve prehrávanú skladbu" @@ -1356,9 +1353,6 @@ msgstr "Internet" msgid "Music" msgstr "Hudba" -msgid "Settings" -msgstr "Nastavenia" - msgid "Help" msgstr "Nápoveda" @@ -1374,6 +1368,9 @@ msgstr "Prehrávanie" msgid "Behavior" msgstr "Správanie" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "Notifikácie" @@ -1533,6 +1530,15 @@ msgstr "Vybrať zo zoznamu" msgid "Delay between visualizations" msgstr "" +#~ msgid "Configure global shortcuts..." +#~ msgstr "Nastaviť globálne skratky..." + +#~ msgid "Settings" +#~ msgstr "Nastavenia" + +#~ msgid "Configure Clementine..." +#~ msgstr "Nastaviť Clementine..." + #~ msgid "Loading audio engine" #~ msgstr "Načítava sa zvukový engine" diff --git a/src/translations/sv.po b/src/translations/sv.po index d09586a06..bd3d049fd 100644 --- a/src/translations/sv.po +++ b/src/translations/sv.po @@ -1269,8 +1269,8 @@ msgstr "Redigera tagg..." msgid "F2" msgstr "F2" -msgid "Configure Clementine..." -msgstr "Ställ in Clementine..." +msgid "Preferences..." +msgstr "" msgid "Ctrl+P" msgstr "" @@ -1317,9 +1317,6 @@ msgstr "Ta bort från spellista" msgid "Add folder..." msgstr "Lägg till mapp..." -msgid "Configure global shortcuts..." -msgstr "Ställ in globala genvägar..." - msgid "Jump to the currently playing track" msgstr "Hoppa till det spår som spelas för tillfället" @@ -1356,9 +1353,6 @@ msgstr "Internet" msgid "Music" msgstr "Musik" -msgid "Settings" -msgstr "Inställningar" - msgid "Help" msgstr "Hjälp" @@ -1374,6 +1368,9 @@ msgstr "Uppspelning" msgid "Behavior" msgstr "Beteende" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "Underrättelser" @@ -1534,6 +1531,15 @@ msgstr "Välj från listan" msgid "Delay between visualizations" msgstr "" +#~ msgid "Configure global shortcuts..." +#~ msgstr "Ställ in globala genvägar..." + +#~ msgid "Settings" +#~ msgstr "Inställningar" + +#~ msgid "Configure Clementine..." +#~ msgstr "Ställ in Clementine..." + #~ msgid "Loading audio engine" #~ msgstr "Laddar audiomotor" diff --git a/src/translations/tr.po b/src/translations/tr.po index 510123555..b2a8de083 100644 --- a/src/translations/tr.po +++ b/src/translations/tr.po @@ -1264,7 +1264,7 @@ msgstr "" msgid "F2" msgstr "F2" -msgid "Configure Clementine..." +msgid "Preferences..." msgstr "" msgid "Ctrl+P" @@ -1312,9 +1312,6 @@ msgstr "" msgid "Add folder..." msgstr "" -msgid "Configure global shortcuts..." -msgstr "" - msgid "Jump to the currently playing track" msgstr "" @@ -1351,9 +1348,6 @@ msgstr "İnternet" msgid "Music" msgstr "Müzik" -msgid "Settings" -msgstr "Ayarlar" - msgid "Help" msgstr "Yardım" @@ -1369,6 +1363,9 @@ msgstr "" msgid "Behavior" msgstr "" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "" @@ -1528,6 +1525,9 @@ msgstr "" msgid "Delay between visualizations" msgstr "" +#~ msgid "Settings" +#~ msgstr "Ayarlar" + #~ msgid "Music (*.mp3 *.ogg *.flac *.mpc *.m4a *.aac *.wma)" #~ msgstr "Müzik (*.mp3 *.ogg *.flac *.mpc *.m4a *.aac *.wma)" diff --git a/src/translations/uk.po b/src/translations/uk.po index f9b920cfc..59486b91c 100644 --- a/src/translations/uk.po +++ b/src/translations/uk.po @@ -1269,8 +1269,8 @@ msgstr "Змінити позначку..." msgid "F2" msgstr "F2" -msgid "Configure Clementine..." -msgstr "Налаштувати Clementine..." +msgid "Preferences..." +msgstr "" msgid "Ctrl+P" msgstr "" @@ -1317,9 +1317,6 @@ msgstr "Вилучити зі списку відтворення" msgid "Add folder..." msgstr "Додати теку..." -msgid "Configure global shortcuts..." -msgstr "Налаштувати глобальні комбінації клавіш..." - msgid "Jump to the currently playing track" msgstr "Перейти до відтворюваної доріжки" @@ -1356,9 +1353,6 @@ msgstr "Інтернет" msgid "Music" msgstr "Музика" -msgid "Settings" -msgstr "Налаштування" - msgid "Help" msgstr "Довідка" @@ -1374,6 +1368,9 @@ msgstr "Відтворення" msgid "Behavior" msgstr "Поведінка" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "Сповіщення" @@ -1533,6 +1530,15 @@ msgstr "Вибрати зі списку" msgid "Delay between visualizations" msgstr "" +#~ msgid "Configure global shortcuts..." +#~ msgstr "Налаштувати глобальні комбінації клавіш..." + +#~ msgid "Settings" +#~ msgstr "Налаштування" + +#~ msgid "Configure Clementine..." +#~ msgstr "Налаштувати Clementine..." + #~ msgid "Loading audio engine" #~ msgstr "Завантаження аудіо-рушія" diff --git a/src/translations/zh_CN.po b/src/translations/zh_CN.po index 46e6e7245..636516bdc 100644 --- a/src/translations/zh_CN.po +++ b/src/translations/zh_CN.po @@ -1262,7 +1262,7 @@ msgstr "" msgid "F2" msgstr "" -msgid "Configure Clementine..." +msgid "Preferences..." msgstr "" msgid "Ctrl+P" @@ -1310,9 +1310,6 @@ msgstr "" msgid "Add folder..." msgstr "" -msgid "Configure global shortcuts..." -msgstr "" - msgid "Jump to the currently playing track" msgstr "" @@ -1349,9 +1346,6 @@ msgstr "" msgid "Music" msgstr "" -msgid "Settings" -msgstr "" - msgid "Help" msgstr "" @@ -1367,6 +1361,9 @@ msgstr "" msgid "Behavior" msgstr "" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "" diff --git a/src/translations/zh_TW.po b/src/translations/zh_TW.po index d2ddbadda..418970f11 100644 --- a/src/translations/zh_TW.po +++ b/src/translations/zh_TW.po @@ -1262,7 +1262,7 @@ msgstr "" msgid "F2" msgstr "" -msgid "Configure Clementine..." +msgid "Preferences..." msgstr "" msgid "Ctrl+P" @@ -1310,9 +1310,6 @@ msgstr "從撥放清單移除" msgid "Add folder..." msgstr "" -msgid "Configure global shortcuts..." -msgstr "" - msgid "Jump to the currently playing track" msgstr "" @@ -1349,9 +1346,6 @@ msgstr "" msgid "Music" msgstr "" -msgid "Settings" -msgstr "" - msgid "Help" msgstr "" @@ -1367,6 +1361,9 @@ msgstr "" msgid "Behavior" msgstr "" +msgid "Global Shortcuts" +msgstr "" + msgid "Notifications" msgstr "" diff --git a/src/ui/globalshortcutsdialog.cpp b/src/ui/globalshortcutsconfig.cpp similarity index 78% rename from src/ui/globalshortcutsdialog.cpp rename to src/ui/globalshortcutsconfig.cpp index da1d1602f..4e5c68ee1 100644 --- a/src/ui/globalshortcutsdialog.cpp +++ b/src/ui/globalshortcutsconfig.cpp @@ -15,8 +15,8 @@ */ #include "globalshortcutgrabber.h" -#include "globalshortcutsdialog.h" -#include "ui_globalshortcutsdialog.h" +#include "globalshortcutsconfig.h" +#include "ui_globalshortcutsconfig.h" #include "core/globalshortcuts.h" #include @@ -26,23 +26,35 @@ #include #include -GlobalShortcutsDialog::GlobalShortcutsDialog(GlobalShortcuts* manager, - QWidget* parent) - : QDialog(parent), - ui_(new Ui_GlobalShortcutsDialog), - manager_(manager), +GlobalShortcutsConfig::GlobalShortcutsConfig(QWidget* parent) + : QWidget(parent), + ui_(new Ui_GlobalShortcutsConfig), + manager_(NULL), grabber_(new GlobalShortcutGrabber) { ui_->setupUi(this); ui_->shortcut_options->setEnabled(false); ui_->list->header()->setResizeMode(QHeaderView::ResizeToContents); + settings_.beginGroup(GlobalShortcuts::kSettingsGroup); + + connect(ui_->list, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)), SLOT(ItemClicked(QTreeWidgetItem*))); + connect(ui_->radio_none, SIGNAL(clicked()), SLOT(NoneClicked())); + connect(ui_->radio_default, SIGNAL(clicked()), SLOT(DefaultClicked())); + connect(ui_->radio_custom, SIGNAL(clicked()), SLOT(ChangeClicked())); + connect(ui_->change, SIGNAL(clicked()), SLOT(ChangeClicked())); + connect(ui_->gnome_open, SIGNAL(clicked()), SLOT(OpenGnomeKeybindingProperties())); +} + +void GlobalShortcutsConfig::SetManager(GlobalShortcuts *manager) { + manager_ = manager; + + connect(ui_->mac_open, SIGNAL(clicked()), manager_, SLOT(ShowMacAccessibilityDialog())); + if (!manager->IsGsdAvailable()) { ui_->gnome_container->hide(); } - settings_.beginGroup(GlobalShortcuts::kSettingsGroup); - foreach (const GlobalShortcuts::Shortcut& s, manager_->shortcuts().values()) { Shortcut shortcut; shortcut.s = s; @@ -55,64 +67,45 @@ GlobalShortcutsDialog::GlobalShortcutsDialog(GlobalShortcuts* manager, } ui_->list->sortItems(0, Qt::AscendingOrder); - - connect(ui_->button_box->button(QDialogButtonBox::Reset), SIGNAL(clicked()), SLOT(ResetAll())); - connect(ui_->list, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)), SLOT(ItemClicked(QTreeWidgetItem*))); - connect(ui_->radio_none, SIGNAL(clicked()), SLOT(NoneClicked())); - connect(ui_->radio_default, SIGNAL(clicked()), SLOT(DefaultClicked())); - connect(ui_->radio_custom, SIGNAL(clicked()), SLOT(ChangeClicked())); - connect(ui_->change, SIGNAL(clicked()), SLOT(ChangeClicked())); - connect(ui_->gnome_open, SIGNAL(clicked()), SLOT(OpenGnomeKeybindingProperties())); - connect(ui_->mac_open, SIGNAL(clicked()), manager_, SLOT(ShowMacAccessibilityDialog())); - ItemClicked(ui_->list->topLevelItem(0)); } -GlobalShortcutsDialog::~GlobalShortcutsDialog() { +GlobalShortcutsConfig::~GlobalShortcutsConfig() { delete ui_; } -void GlobalShortcutsDialog::showEvent(QShowEvent*) { +void GlobalShortcutsConfig::Load() { foreach (const Shortcut& s, shortcuts_.values()) { SetShortcut(s.s.id, s.s.action->shortcut()); } bool use_gnome = settings_.value("use_gnome", true).toBool(); - if (ui_->gnome_container->isVisible()) { + if (ui_->gnome_container->isVisibleTo(this)) { ui_->gnome_checkbox->setChecked(use_gnome); } ui_->mac_container->setVisible(!manager_->IsMacAccessibilityEnabled()); } -void GlobalShortcutsDialog::ResetAll() { - foreach (const QString& id, shortcuts_.keys()) { - SetShortcut(id, shortcuts_[id].s.default_key); - } -} - -void GlobalShortcutsDialog::SetShortcut(const QString& id, const QKeySequence& key) { +void GlobalShortcutsConfig::SetShortcut(const QString& id, const QKeySequence& key) { Shortcut& shortcut = shortcuts_[id]; shortcut.key = key; shortcut.item->setText(1, key.toString(QKeySequence::NativeText)); } -void GlobalShortcutsDialog::accept() { - Save(); - QDialog::accept(); -} - -void GlobalShortcutsDialog::Save() { +void GlobalShortcutsConfig::Save() { foreach (const Shortcut& s, shortcuts_.values()) { s.s.action->setShortcut(s.key); settings_.setValue(s.s.id, s.key.toString()); } settings_.setValue("use_gnome", ui_->gnome_checkbox->isChecked()); + + manager_->ReloadSettings(); } -void GlobalShortcutsDialog::ItemClicked(QTreeWidgetItem* item) { +void GlobalShortcutsConfig::ItemClicked(QTreeWidgetItem* item) { current_id_ = item->data(0, Qt::UserRole).toString(); Shortcut& shortcut = shortcuts_[current_id_]; @@ -128,15 +121,15 @@ void GlobalShortcutsDialog::ItemClicked(QTreeWidgetItem* item) { ui_->radio_custom->setChecked(true); } -void GlobalShortcutsDialog::NoneClicked() { +void GlobalShortcutsConfig::NoneClicked() { SetShortcut(current_id_, QKeySequence()); } -void GlobalShortcutsDialog::DefaultClicked() { +void GlobalShortcutsConfig::DefaultClicked() { SetShortcut(current_id_, shortcuts_[current_id_].s.default_key); } -void GlobalShortcutsDialog::ChangeClicked() { +void GlobalShortcutsConfig::ChangeClicked() { QKeySequence key = grabber_->GetKey(shortcuts_[current_id_].s.action->text()); if (key.isEmpty()) return; @@ -145,7 +138,7 @@ void GlobalShortcutsDialog::ChangeClicked() { SetShortcut(current_id_, key); } -void GlobalShortcutsDialog::OpenGnomeKeybindingProperties() { +void GlobalShortcutsConfig::OpenGnomeKeybindingProperties() { if (!QProcess::startDetached("gnome-keybinding-properties")) { QMessageBox::warning(this, "Error", tr("The \"%1\" command could not be started.") diff --git a/src/ui/globalshortcutsdialog.h b/src/ui/globalshortcutsconfig.h similarity index 76% rename from src/ui/globalshortcutsdialog.h rename to src/ui/globalshortcutsconfig.h index fcc903cb3..8c212d3e9 100644 --- a/src/ui/globalshortcutsdialog.h +++ b/src/ui/globalshortcutsconfig.h @@ -14,10 +14,10 @@ along with Clementine. If not, see . */ -#ifndef GLOBALSHORTCUTSDIALOG_H -#define GLOBALSHORTCUTSDIALOG_H +#ifndef GLOBALSHORTCUTSCONFIG_H +#define GLOBALSHORTCUTSCONFIG_H -#include +#include #include #include @@ -27,25 +27,22 @@ class QTreeWidgetItem; -class Ui_GlobalShortcutsDialog; +class Ui_GlobalShortcutsConfig; class GlobalShortcutGrabber; -class GlobalShortcutsDialog : public QDialog { +class GlobalShortcutsConfig : public QWidget { Q_OBJECT public: - GlobalShortcutsDialog(GlobalShortcuts* manager, QWidget* parent = 0); - ~GlobalShortcutsDialog(); + GlobalShortcutsConfig(QWidget* parent = 0); + ~GlobalShortcutsConfig(); - protected: - // QWidget - void showEvent(QShowEvent *); + void SetManager(GlobalShortcuts* manager); + + void Load(); + void Save(); private slots: - void accept(); - - void ResetAll(); - void ItemClicked(QTreeWidgetItem*); void NoneClicked(); void DefaultClicked(); @@ -53,8 +50,6 @@ class GlobalShortcutsDialog : public QDialog { void OpenGnomeKeybindingProperties(); - void Save(); - private: struct Shortcut { GlobalShortcuts::Shortcut s; @@ -65,7 +60,7 @@ class GlobalShortcutsDialog : public QDialog { void SetShortcut(const QString& id, const QKeySequence& key); private: - Ui_GlobalShortcutsDialog* ui_; + Ui_GlobalShortcutsConfig* ui_; GlobalShortcuts* manager_; boost::scoped_ptr grabber_; @@ -76,4 +71,4 @@ class GlobalShortcutsDialog : public QDialog { QString current_id_; }; -#endif // GLOBALSHORTCUTSDIALOG_H +#endif // GLOBALSHORTCUTSCONFIG_H diff --git a/src/ui/globalshortcutsdialog.ui b/src/ui/globalshortcutsconfig.ui similarity index 82% rename from src/ui/globalshortcutsdialog.ui rename to src/ui/globalshortcutsconfig.ui index c6901b70a..017740712 100644 --- a/src/ui/globalshortcutsdialog.ui +++ b/src/ui/globalshortcutsconfig.ui @@ -1,7 +1,7 @@ - GlobalShortcutsDialog - + GlobalShortcutsConfig + 0 @@ -167,19 +167,6 @@ - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset - - - false - - - @@ -188,44 +175,11 @@ radio_default radio_custom change - button_box - - button_box - accepted() - GlobalShortcutsDialog - accept() - - - 358 - 368 - - - 333 - 346 - - - - - button_box - rejected() - GlobalShortcutsDialog - reject() - - - 436 - 374 - - - 440 - 391 - - - gnome_checkbox toggled(bool) diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index f7fe1eee9..80f5ab186 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -49,7 +49,6 @@ #include "ui/albumcovermanager.h" #include "ui/edittagdialog.h" #include "ui/equalizer.h" -#include "ui/globalshortcutsdialog.h" #include "ui/iconloader.h" #include "ui/qtsystemtrayicon.h" #ifdef Q_OS_DARWIN @@ -121,7 +120,6 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg cover_manager_(NULL), equalizer_(new Equalizer), transcode_dialog_(new TranscodeDialog), - global_shortcuts_dialog_(new GlobalShortcutsDialog(global_shortcuts_)), error_dialog_(new ErrorDialog), #ifdef ENABLE_VISUALISATIONS visualisation_(new VisualisationContainer), @@ -194,7 +192,6 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg ui_->action_add_stream->setIcon(IconLoader::Load("document-open-remote")); ui_->action_clear_playlist->setIcon(IconLoader::Load("edit-clear-list")); ui_->action_configure->setIcon(IconLoader::Load("configure")); - ui_->action_configure_global_shortcuts->setIcon(IconLoader::Load("configure-shortcuts")); ui_->action_cover_manager->setIcon(IconLoader::Load("download")); ui_->action_edit_track->setIcon(IconLoader::Load("edit-rename")); ui_->action_equalizer->setIcon(IconLoader::Load("view-media-equalizer")); @@ -252,7 +249,6 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg connect(ui_->action_cover_manager, SIGNAL(triggered()), cover_manager_.get(), SLOT(show())); connect(ui_->action_equalizer, SIGNAL(triggered()), equalizer_.get(), SLOT(show())); connect(ui_->action_transcode, SIGNAL(triggered()), transcode_dialog_.get(), SLOT(show())); - connect(ui_->action_configure_global_shortcuts, SIGNAL(triggered()), global_shortcuts_dialog_.get(), SLOT(show())); connect(ui_->action_jump, SIGNAL(triggered()), ui_->playlist->view(), SLOT(JumpToCurrentlyPlayingTrack())); connect(ui_->action_update_library, SIGNAL(triggered()), library_, SLOT(IncrementalScan())); connect(ui_->action_rain, SIGNAL(toggled(bool)), player_, SLOT(MakeItRain(bool))); @@ -408,14 +404,8 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg // Force this menu to be the app "Preferences". ui_->action_configure->setMenuRole(QAction::PreferencesRole); - // Force this menu into the "Clementine" menu. - ui_->action_configure_global_shortcuts->setMenuRole(QAction::ApplicationSpecificRole); // Force this menu to be the app "About". ui_->action_about->setMenuRole(QAction::AboutRole); - - if (QSysInfo::MacintoshVersion != QSysInfo::MV_SNOWLEOPARD) { - ui_->action_configure_global_shortcuts->setEnabled(false); - } #endif // Global shortcuts @@ -431,7 +421,7 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg connect(global_shortcuts_, SIGNAL(Mute()), player_, SLOT(Mute())); connect(global_shortcuts_, SIGNAL(SeekForward()), player_, SLOT(SeekForward())); connect(global_shortcuts_, SIGNAL(SeekBackward()), player_, SLOT(SeekBackward())); - connect(global_shortcuts_dialog_.get(), SIGNAL(accepted()), global_shortcuts_, SLOT(ReloadSettings())); + settings_dialog_->SetGlobalShortcutManager(global_shortcuts_); // Settings connect(settings_dialog_.get(), SIGNAL(accepted()), SLOT(ReloadSettings())); diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h index 9c4be1b52..841903408 100644 --- a/src/ui/mainwindow.h +++ b/src/ui/mainwindow.h @@ -38,7 +38,6 @@ class EditTagDialog; class Equalizer; class ErrorDialog; class GlobalShortcuts; -class GlobalShortcutsDialog; class GroupByDialog; class Library; class MultiLoadingIndicator; @@ -181,7 +180,6 @@ class MainWindow : public QMainWindow, public PlatformInterface { boost::scoped_ptr cover_manager_; boost::scoped_ptr equalizer_; boost::scoped_ptr transcode_dialog_; - boost::scoped_ptr global_shortcuts_dialog_; boost::scoped_ptr error_dialog_; #ifdef ENABLE_VISUALISATIONS diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui index f4a19df3b..99c8e34b3 100644 --- a/src/ui/mainwindow.ui +++ b/src/ui/mainwindow.ui @@ -89,9 +89,6 @@ false - - false - @@ -518,13 +515,6 @@ - - - Settings - - - - Help @@ -547,11 +537,12 @@ + + - @@ -675,7 +666,7 @@ - Configure Clementine... + Preferences... Ctrl+P @@ -761,11 +752,6 @@ Add folder... - - - Configure global shortcuts... - - Jump to the currently playing track diff --git a/src/ui/settingsdialog.cpp b/src/ui/settingsdialog.cpp index 347ca39a4..8e985cc13 100644 --- a/src/ui/settingsdialog.cpp +++ b/src/ui/settingsdialog.cpp @@ -43,9 +43,10 @@ SettingsDialog::SettingsDialog(QWidget* parent) QImage(":nocover.png")); // Icons - ui_->list->item(0)->setIcon(IconLoader::Load("media-playback-start")); // Playback - ui_->list->item(2)->setIcon(IconLoader::Load("help-hint")); // Notifications - ui_->list->item(3)->setIcon(IconLoader::Load("folder-sound")); // Library + ui_->list->item(Page_Playback)->setIcon(IconLoader::Load("media-playback-start")); + ui_->list->item(Page_GlobalShortcuts)->setIcon(IconLoader::Load("input-keyboard")); + ui_->list->item(Page_Notifications)->setIcon(IconLoader::Load("help-hint")); + ui_->list->item(Page_Library)->setIcon(IconLoader::Load("folder-sound")); // Playback connect(ui_->fading_cross, SIGNAL(toggled(bool)), SLOT(FadingOptionsChanged())); @@ -63,12 +64,19 @@ SettingsDialog::SettingsDialog(QWidget* parent) // Behaviour connect(ui_->b_show_tray_icon_, SIGNAL(toggled(bool)), SLOT(ShowTrayIconToggled(bool))); + // Global shortcuts +#ifdef Q_OS_MAC + if (QSysInfo::MacintoshVersion != QSysInfo::MV_SNOWLEOPARD) { + ui_->list->item(Page_GlobalShortcuts)->setFlags(Qt::NoItemFlags); + } +#endif + // Last.fm connect(ui_->lastfm, SIGNAL(ValidationComplete(bool)), SLOT(LastFMValidationComplete(bool))); // List box connect(ui_->list, SIGNAL(currentTextChanged(QString)), SLOT(CurrentTextChanged(QString))); - ui_->list->setCurrentRow(0); + ui_->list->setCurrentRow(Page_Playback); // Notifications ui_->notifications_bg_preset->setItemData(0, QColor(OSDPretty::kPresetBlue), Qt::DecorationRole); @@ -94,7 +102,7 @@ SettingsDialog::SettingsDialog(QWidget* parent) ui_->list->setMinimumWidth(ui_->list->sizeHintForColumn(0)); #ifdef Q_OS_DARWIN - ui_->list->item(1)->setHidden(true); // Hide "Behaviour" on mac. + ui_->list->item(Page_Behaviour)->setHidden(true); // Hide "Behaviour" on mac. #endif } @@ -111,6 +119,10 @@ void SettingsDialog::SetLibraryDirectoryModel(LibraryDirectoryModel* model) { ui_->library_config->SetModel(model); } +void SettingsDialog::SetGlobalShortcutManager(GlobalShortcuts *manager) { + ui_->global_shortcuts->SetManager(manager); +} + void SettingsDialog::LastFMValidationComplete(bool success) { ui_->buttonBox->setEnabled(true); @@ -183,6 +195,7 @@ void SettingsDialog::accept() { ui_->library_config->Save(); ui_->magnatune->Save(); + ui_->global_shortcuts->Save(); QDialog::accept(); } @@ -209,6 +222,9 @@ void SettingsDialog::showEvent(QShowEvent*) { // Magnatune ui_->magnatune->Load(); + // Global Shortcuts + ui_->global_shortcuts->Load(); + // Playback s.beginGroup(Engine::Base::kSettingsGroup); ui_->fading_out->setChecked(s.value("FadeoutEnabled", true).toBool()); diff --git a/src/ui/settingsdialog.h b/src/ui/settingsdialog.h index a2dbc804f..d8e62d8a8 100644 --- a/src/ui/settingsdialog.h +++ b/src/ui/settingsdialog.h @@ -21,6 +21,7 @@ #include "config.h" +class GlobalShortcuts; class LibraryDirectoryModel; class OSDPretty; class Ui_SettingsDialog; @@ -39,6 +40,7 @@ class SettingsDialog : public QDialog { enum Page { Page_Playback = 0, Page_Behaviour, + Page_GlobalShortcuts, Page_Notifications, Page_Library, Page_Lastfm, @@ -46,6 +48,7 @@ class SettingsDialog : public QDialog { }; void SetLibraryDirectoryModel(LibraryDirectoryModel* model); + void SetGlobalShortcutManager(GlobalShortcuts* manager); #ifdef HAVE_GSTREAMER void SetGstEngine(const GstEngine* engine); #endif diff --git a/src/ui/settingsdialog.ui b/src/ui/settingsdialog.ui index 9a48aed47..61a618e78 100644 --- a/src/ui/settingsdialog.ui +++ b/src/ui/settingsdialog.ui @@ -11,7 +11,7 @@ - Settings + Preferences @@ -64,6 +64,11 @@ :/icon.png:/icon.png + + + Global Shortcuts + + Notifications @@ -109,7 +114,7 @@ - 5 + 2 @@ -409,6 +414,19 @@ + + + + 0 + + + 0 + + + + + + @@ -670,6 +688,12 @@
radio/magnatuneconfig.h
1 + + GlobalShortcutsConfig + QWidget +
ui/globalshortcutsconfig.h
+ 1 + list