Cherry-picking upstream version 0.9.0+20150927.

Solves:
 - apply-button for desktop preferences
 - close the desktop painting process by incident
ubuntu/cosmic
Alf Gaida 9 years ago
parent b69cb453e3
commit 01aeefbffd

9
debian/changelog vendored

@ -1,3 +1,12 @@
pcmanfm-qt (0.9.0+20150927-1) experimental; urgency=medium
* Cherry-picked upstream version 0.9.0+20150927.
* This snapshot contain:
- apply button for desktop preferences
- fix for incidental closing the desktop paint process
-- Alf Gaida <agaida@siduction.org> Mon, 28 Sep 2015 00:25:42 +0200
pcmanfm-qt (0.9.0+20150925-1) experimental; urgency=medium pcmanfm-qt (0.9.0+20150925-1) experimental; urgency=medium
* Cherry-picked upstream version 0.9.0+20150925. * Cherry-picked upstream version 0.9.0+20150925.

@ -6,27 +6,27 @@
<message> <message>
<location filename="../app-chooser-dialog.ui" line="14"/> <location filename="../app-chooser-dialog.ui" line="14"/>
<source>Choose an Application</source> <source>Choose an Application</source>
<translation type="unfinished"></translation> <translation>Výběr aplikace</translation>
</message> </message>
<message> <message>
<location filename="../app-chooser-dialog.ui" line="36"/> <location filename="../app-chooser-dialog.ui" line="36"/>
<source>Installed Applications</source> <source>Installed Applications</source>
<translation type="unfinished"></translation> <translation>Nainstalované aplikace</translation>
</message> </message>
<message> <message>
<location filename="../app-chooser-dialog.ui" line="46"/> <location filename="../app-chooser-dialog.ui" line="46"/>
<source>Custom Command</source> <source>Custom Command</source>
<translation type="unfinished"></translation> <translation>Vlastní příkaz</translation>
</message> </message>
<message> <message>
<location filename="../app-chooser-dialog.ui" line="52"/> <location filename="../app-chooser-dialog.ui" line="52"/>
<source>Command line to execute:</source> <source>Command line to execute:</source>
<translation type="unfinished"></translation> <translation>Příkaz k vykonání:</translation>
</message> </message>
<message> <message>
<location filename="../app-chooser-dialog.ui" line="62"/> <location filename="../app-chooser-dialog.ui" line="62"/>
<source>Application name:</source> <source>Application name:</source>
<translation type="unfinished"></translation> <translation>Jméno aplikace:</translation>
</message> </message>
<message> <message>
<location filename="../app-chooser-dialog.ui" line="72"/> <location filename="../app-chooser-dialog.ui" line="72"/>
@ -37,22 +37,28 @@
&lt;li&gt;&lt;b&gt;%u&lt;/b&gt;: Represents a single URI of the file&lt;/li&gt; &lt;li&gt;&lt;b&gt;%u&lt;/b&gt;: Represents a single URI of the file&lt;/li&gt;
&lt;li&gt;&lt;b&gt;%U&lt;/b&gt;: Represents multiple URIs&lt;/li&gt; &lt;li&gt;&lt;b&gt;%U&lt;/b&gt;: Represents multiple URIs&lt;/li&gt;
&lt;/ul&gt;</source> &lt;/ul&gt;</source>
<translation type="unfinished"></translation> <translation>&lt;b&gt;Tyto zástupné symboly mohou být použity v příkazovém řádku:&lt;/b&gt;
&lt;ul&gt;
&lt;li&gt;&lt;b&gt;%f&lt;/b&gt;: Reprezentuje jméno jednoho souboru&lt;/li&gt;
&lt;li&gt;&lt;b&gt;%F&lt;/b&gt;: Reprezentuje jména více souborů&lt;/li&gt;
&lt;li&gt;&lt;b&gt;%u&lt;/b&gt;: Reprezentuje URI jednoho souboru&lt;/li&gt;
&lt;li&gt;&lt;b&gt;%U&lt;/b&gt;: Reprezentuje URI více souborů&lt;/li&gt;
&lt;/ul&gt;</translation>
</message> </message>
<message> <message>
<location filename="../app-chooser-dialog.ui" line="91"/> <location filename="../app-chooser-dialog.ui" line="91"/>
<source>Keep terminal window open after command execution</source> <source>Keep terminal window open after command execution</source>
<translation type="unfinished"></translation> <translation>Nechat okno terminálu otevřené</translation>
</message> </message>
<message> <message>
<location filename="../app-chooser-dialog.ui" line="98"/> <location filename="../app-chooser-dialog.ui" line="98"/>
<source>Execute in terminal emulator</source> <source>Execute in terminal emulator</source>
<translation type="unfinished"></translation> <translation>Spustit v emulátoru terminálu</translation>
</message> </message>
<message> <message>
<location filename="../app-chooser-dialog.ui" line="109"/> <location filename="../app-chooser-dialog.ui" line="109"/>
<source>Set selected application as default action of this file type</source> <source>Set selected application as default action of this file type</source>
<translation type="unfinished"></translation> <translation>Použít aplikaci jako výchozí pro tento typ souboru</translation>
</message> </message>
</context> </context>
<context> <context>
@ -60,32 +66,32 @@
<message> <message>
<location filename="../edit-bookmarks.ui" line="14"/> <location filename="../edit-bookmarks.ui" line="14"/>
<source>Edit Bookmarks</source> <source>Edit Bookmarks</source>
<translation type="unfinished"></translation> <translation>Upravit záložky</translation>
</message> </message>
<message> <message>
<location filename="../edit-bookmarks.ui" line="42"/> <location filename="../edit-bookmarks.ui" line="42"/>
<source>Name</source> <source>Name</source>
<translation type="unfinished">Jméno</translation> <translation>Jméno</translation>
</message> </message>
<message> <message>
<location filename="../edit-bookmarks.ui" line="47"/> <location filename="../edit-bookmarks.ui" line="47"/>
<source>Location</source> <source>Location</source>
<translation type="unfinished"></translation> <translation>Umístění</translation>
</message> </message>
<message> <message>
<location filename="../edit-bookmarks.ui" line="67"/> <location filename="../edit-bookmarks.ui" line="67"/>
<source>&amp;Add Item</source> <source>&amp;Add Item</source>
<translation type="unfinished"></translation> <translation>&amp;Přidat položku</translation>
</message> </message>
<message> <message>
<location filename="../edit-bookmarks.ui" line="77"/> <location filename="../edit-bookmarks.ui" line="77"/>
<source>&amp;Remove Item</source> <source>&amp;Remove Item</source>
<translation type="unfinished"></translation> <translation>&amp;Odebrat položku</translation>
</message> </message>
<message> <message>
<location filename="../edit-bookmarks.ui" line="102"/> <location filename="../edit-bookmarks.ui" line="102"/>
<source>Use drag and drop to reorder the items</source> <source>Use drag and drop to reorder the items</source>
<translation type="unfinished"></translation> <translation>Přetažením uprav pořadí</translation>
</message> </message>
</context> </context>
<context> <context>
@ -93,27 +99,27 @@
<message> <message>
<location filename="../exec-file.ui" line="14"/> <location filename="../exec-file.ui" line="14"/>
<source>Execute file</source> <source>Execute file</source>
<translation type="unfinished">Spustit soubor</translation> <translation>Spustit soubor</translation>
</message> </message>
<message> <message>
<location filename="../exec-file.ui" line="39"/> <location filename="../exec-file.ui" line="39"/>
<source>&amp;Open</source> <source>&amp;Open</source>
<translation type="unfinished">&amp;Otevřít</translation> <translation>&amp;Otevřít</translation>
</message> </message>
<message> <message>
<location filename="../exec-file.ui" line="52"/> <location filename="../exec-file.ui" line="52"/>
<source>E&amp;xecute</source> <source>E&amp;xecute</source>
<translation type="unfinished">&amp;Spustit</translation> <translation>&amp;Spustit</translation>
</message> </message>
<message> <message>
<location filename="../exec-file.ui" line="62"/> <location filename="../exec-file.ui" line="62"/>
<source>Execute in &amp;Terminal</source> <source>Execute in &amp;Terminal</source>
<translation type="unfinished">Spustit v &amp;Terminálu</translation> <translation>Spustit v &amp;Terminálu</translation>
</message> </message>
<message> <message>
<location filename="../exec-file.ui" line="85"/> <location filename="../exec-file.ui" line="85"/>
<source>Cancel</source> <source>Cancel</source>
<translation type="unfinished">Zrušit</translation> <translation>Zrušit</translation>
</message> </message>
</context> </context>
<context> <context>
@ -121,27 +127,27 @@
<message> <message>
<location filename="../file-operation-dialog.ui" line="32"/> <location filename="../file-operation-dialog.ui" line="32"/>
<source>Destination:</source> <source>Destination:</source>
<translation type="unfinished"></translation> <translation>Umístění:</translation>
</message> </message>
<message> <message>
<location filename="../file-operation-dialog.ui" line="55"/> <location filename="../file-operation-dialog.ui" line="55"/>
<source>Processing:</source> <source>Processing:</source>
<translation type="unfinished"></translation> <translation>Zpracování:</translation>
</message> </message>
<message> <message>
<location filename="../file-operation-dialog.ui" line="68"/> <location filename="../file-operation-dialog.ui" line="68"/>
<source>Preparing...</source> <source>Preparing...</source>
<translation type="unfinished"></translation> <translation>Příprava...</translation>
</message> </message>
<message> <message>
<location filename="../file-operation-dialog.ui" line="75"/> <location filename="../file-operation-dialog.ui" line="75"/>
<source>Progress</source> <source>Progress</source>
<translation type="unfinished"></translation> <translation>Průběh</translation>
</message> </message>
<message> <message>
<location filename="../file-operation-dialog.ui" line="95"/> <location filename="../file-operation-dialog.ui" line="95"/>
<source>Time remaining:</source> <source>Time remaining:</source>
<translation type="unfinished"></translation> <translation>Zbývající čas:</translation>
</message> </message>
</context> </context>
<context> <context>
@ -149,118 +155,118 @@
<message> <message>
<location filename="../file-props.ui" line="14"/> <location filename="../file-props.ui" line="14"/>
<source>File Properties</source> <source>File Properties</source>
<translation type="unfinished"></translation> <translation>Vlastnosti souboru</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="41"/> <location filename="../file-props.ui" line="41"/>
<source>General</source> <source>General</source>
<translation type="unfinished"></translation> <translation>Obecné</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="80"/> <location filename="../file-props.ui" line="80"/>
<source>Location:</source> <source>Location:</source>
<translation type="unfinished"></translation> <translation>Umístění:</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="106"/> <location filename="../file-props.ui" line="106"/>
<source>File type:</source> <source>File type:</source>
<translation type="unfinished"></translation> <translation>Typ souboru:</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="129"/> <location filename="../file-props.ui" line="129"/>
<source>Mime type:</source> <source>Mime type:</source>
<translation type="unfinished"></translation> <translation>Mime typ:</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="152"/> <location filename="../file-props.ui" line="152"/>
<source>File size:</source> <source>File size:</source>
<translation type="unfinished"></translation> <translation>Velikost souboru:</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="175"/> <location filename="../file-props.ui" line="175"/>
<source>On-disk size:</source> <source>On-disk size:</source>
<translation type="unfinished"></translation> <translation>Zabrané místo:</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="198"/> <location filename="../file-props.ui" line="198"/>
<source>Last modified:</source> <source>Last modified:</source>
<translation type="unfinished"></translation> <translation>Upraveno:</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="221"/> <location filename="../file-props.ui" line="221"/>
<source>Link target:</source> <source>Link target:</source>
<translation type="unfinished"></translation> <translation>Cíl odkazu:</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="247"/> <location filename="../file-props.ui" line="247"/>
<source>Open With:</source> <source>Open With:</source>
<translation type="unfinished"></translation> <translation>Otevřít pomocí:</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="267"/> <location filename="../file-props.ui" line="267"/>
<source>Last accessed:</source> <source>Last accessed:</source>
<translation type="unfinished"></translation> <translation>Poslední přístup:</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="285"/> <location filename="../file-props.ui" line="285"/>
<source>Permissions</source> <source>Permissions</source>
<translation type="unfinished"></translation> <translation>Práva</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="300"/> <location filename="../file-props.ui" line="300"/>
<source>Ownership</source> <source>Ownership</source>
<translation type="unfinished"></translation> <translation>Vlastnictví</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="324"/> <location filename="../file-props.ui" line="324"/>
<location filename="../file-props.ui" line="389"/> <location filename="../file-props.ui" line="389"/>
<location filename="../file-props.ui" line="503"/> <location filename="../file-props.ui" line="503"/>
<source>Group:</source> <source>Group:</source>
<translation type="unfinished"></translation> <translation>Skupina:</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="337"/> <location filename="../file-props.ui" line="337"/>
<location filename="../file-props.ui" line="372"/> <location filename="../file-props.ui" line="372"/>
<location filename="../file-props.ui" line="451"/> <location filename="../file-props.ui" line="451"/>
<source>Owner:</source> <source>Owner:</source>
<translation type="unfinished"></translation> <translation>Vlastník:</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="353"/> <location filename="../file-props.ui" line="353"/>
<source>Access Control</source> <source>Access Control</source>
<translation type="unfinished"></translation> <translation>Zpřístupnění</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="406"/> <location filename="../file-props.ui" line="406"/>
<location filename="../file-props.ui" line="555"/> <location filename="../file-props.ui" line="555"/>
<source>Other:</source> <source>Other:</source>
<translation type="unfinished"></translation> <translation>Ostatní:</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="423"/> <location filename="../file-props.ui" line="423"/>
<source>Make the file executable</source> <source>Make the file executable</source>
<translation type="unfinished"></translation> <translation>Označit soubor jako spustitelný</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="464"/> <location filename="../file-props.ui" line="464"/>
<location filename="../file-props.ui" line="516"/> <location filename="../file-props.ui" line="516"/>
<location filename="../file-props.ui" line="568"/> <location filename="../file-props.ui" line="568"/>
<source>Read</source> <source>Read</source>
<translation type="unfinished"></translation> <translation>Čtení</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="477"/> <location filename="../file-props.ui" line="477"/>
<location filename="../file-props.ui" line="529"/> <location filename="../file-props.ui" line="529"/>
<location filename="../file-props.ui" line="581"/> <location filename="../file-props.ui" line="581"/>
<source>Write</source> <source>Write</source>
<translation type="unfinished"></translation> <translation>Čtení a zápis</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="490"/> <location filename="../file-props.ui" line="490"/>
<location filename="../file-props.ui" line="542"/> <location filename="../file-props.ui" line="542"/>
<location filename="../file-props.ui" line="594"/> <location filename="../file-props.ui" line="594"/>
<source>Execute</source> <source>Execute</source>
<translation type="unfinished"></translation> <translation>Spuštění</translation>
</message> </message>
<message> <message>
<location filename="../file-props.ui" line="603"/> <location filename="../file-props.ui" line="603"/>
@ -280,7 +286,7 @@
<message> <message>
<location filename="../file-props.ui" line="653"/> <location filename="../file-props.ui" line="653"/>
<source>Advanced Mode</source> <source>Advanced Mode</source>
<translation type="unfinished"></translation> <translation>Pokročilý režim</translation>
</message> </message>
</context> </context>
<context> <context>
@ -348,22 +354,22 @@
<message> <message>
<location filename="../dndactionmenu.cpp" line="26"/> <location filename="../dndactionmenu.cpp" line="26"/>
<source>Copy here</source> <source>Copy here</source>
<translation type="unfinished"></translation> <translation>Kopírovat sem</translation>
</message> </message>
<message> <message>
<location filename="../dndactionmenu.cpp" line="27"/> <location filename="../dndactionmenu.cpp" line="27"/>
<source>Move here</source> <source>Move here</source>
<translation type="unfinished"></translation> <translation>Přesunout sem</translation>
</message> </message>
<message> <message>
<location filename="../dndactionmenu.cpp" line="28"/> <location filename="../dndactionmenu.cpp" line="28"/>
<source>Create symlink here</source> <source>Create symlink here</source>
<translation type="unfinished"></translation> <translation>Vytvořit zde odkaz</translation>
</message> </message>
<message> <message>
<location filename="../dndactionmenu.cpp" line="30"/> <location filename="../dndactionmenu.cpp" line="30"/>
<source>Cancel</source> <source>Cancel</source>
<translation type="unfinished">Zrušit</translation> <translation>Zrušit</translation>
</message> </message>
</context> </context>
<context> <context>
@ -391,7 +397,7 @@ What do you want to do with it?</source>
<context> <context>
<name>Fm::FileMenu</name> <name>Fm::FileMenu</name>
<message> <message>
<location filename="../filemenu.cpp" line="81"/> <location filename="../filemenu.cpp" line="78"/>
<source>Open</source> <source>Open</source>
<translation>Otevřít</translation> <translation>Otevřít</translation>
</message> </message>
@ -401,73 +407,73 @@ What do you want to do with it?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../filemenu.cpp" line="138"/> <location filename="../filemenu.cpp" line="128"/>
<source>&amp;Restore</source> <source>&amp;Restore</source>
<translation type="unfinished"></translation> <translation type="unfinished">O&amp;bnovit</translation>
</message> </message>
<message> <message>
<location filename="../filemenu.cpp" line="144"/> <location filename="../filemenu.cpp" line="134"/>
<source>Cut</source> <source>Cut</source>
<translation>Vyjmout</translation> <translation>Vyjmout</translation>
</message> </message>
<message> <message>
<location filename="../filemenu.cpp" line="148"/> <location filename="../filemenu.cpp" line="138"/>
<source>Copy</source> <source>Copy</source>
<translation>Kopírovat</translation> <translation>Kopírovat</translation>
</message> </message>
<message> <message>
<location filename="../filemenu.cpp" line="152"/> <location filename="../filemenu.cpp" line="142"/>
<source>Paste</source> <source>Paste</source>
<translation>Vložit</translation> <translation>Vložit</translation>
</message> </message>
<message> <message>
<location filename="../filemenu.cpp" line="156"/> <location filename="../filemenu.cpp" line="146"/>
<location filename="../filemenu.cpp" line="349"/> <location filename="../filemenu.cpp" line="339"/>
<source>&amp;Move to Trash</source> <source>&amp;Move to Trash</source>
<translation>Přesunout do &amp;koše</translation> <translation>Přesunout do &amp;koše</translation>
</message> </message>
<message> <message>
<location filename="../filemenu.cpp" line="299"/> <location filename="../filemenu.cpp" line="289"/>
<source>Output</source> <source>Output</source>
<translation>Výstup</translation> <translation>Výstup</translation>
</message> </message>
<message> <message>
<location filename="../filemenu.cpp" line="349"/> <location filename="../filemenu.cpp" line="339"/>
<source>&amp;Delete</source> <source>&amp;Delete</source>
<translation>&amp;Smazat</translation> <translation>&amp;Smazat</translation>
</message> </message>
<message> <message>
<location filename="../filemenu.cpp" line="160"/> <location filename="../filemenu.cpp" line="150"/>
<source>Rename</source> <source>Rename</source>
<translation>Přejmenovat</translation> <translation>Přejmenovat</translation>
</message> </message>
<message> <message>
<location filename="../filemenu.cpp" line="85"/> <location filename="../filemenu.cpp" line="82"/>
<source>Open With...</source> <source>Open With...</source>
<translation>Otevřít v ...</translation> <translation>Otevřít v ...</translation>
</message> </message>
<message> <message>
<location filename="../filemenu.cpp" line="113"/> <location filename="../filemenu.cpp" line="110"/>
<source>Other Applications</source> <source>Other Applications</source>
<translation>Ostatní programy</translation> <translation>Ostatní programy</translation>
</message> </message>
<message> <message>
<location filename="../filemenu.cpp" line="187"/> <location filename="../filemenu.cpp" line="177"/>
<source>Extract to...</source> <source>Extract to...</source>
<translation>Rozbalit do ...</translation> <translation>Rozbalit do ...</translation>
</message> </message>
<message> <message>
<location filename="../filemenu.cpp" line="192"/> <location filename="../filemenu.cpp" line="182"/>
<source>Extract Here</source> <source>Extract Here</source>
<translation>Rozbalit sem</translation> <translation>Rozbalit sem</translation>
</message> </message>
<message> <message>
<location filename="../filemenu.cpp" line="198"/> <location filename="../filemenu.cpp" line="188"/>
<source>Compress</source> <source>Compress</source>
<translation>Komprimovat</translation> <translation>Komprimovat</translation>
</message> </message>
<message> <message>
<location filename="../filemenu.cpp" line="208"/> <location filename="../filemenu.cpp" line="198"/>
<source>Properties</source> <source>Properties</source>
<translation>Vlastnosti</translation> <translation>Vlastnosti</translation>
</message> </message>
@ -477,29 +483,30 @@ What do you want to do with it?</source>
<message> <message>
<location filename="../fileoperation.cpp" line="220"/> <location filename="../fileoperation.cpp" line="220"/>
<source>Error</source> <source>Error</source>
<translation type="unfinished">Chyba</translation> <translation>Chyba</translation>
</message> </message>
<message> <message>
<location filename="../fileoperation.cpp" line="221"/> <location filename="../fileoperation.cpp" line="221"/>
<source>Some files cannot be moved to trash can because the underlying file systems don&apos;t support this operation. <source>Some files cannot be moved to trash can because the underlying file systems don&apos;t support this operation.
Do you want to delete them instead?</source> Do you want to delete them instead?</source>
<translation type="unfinished"></translation> <translation>Některé soubory nemohou být přesunuty do koše, protože příslušné souborové systémy nepodporují tuto operaci.
Chceš je odstranit trvale?</translation>
</message> </message>
<message> <message>
<location filename="../fileoperation.cpp" line="262"/> <location filename="../fileoperation.cpp" line="262"/>
<location filename="../fileoperation.cpp" line="278"/> <location filename="../fileoperation.cpp" line="278"/>
<source>Confirm</source> <source>Confirm</source>
<translation type="unfinished"></translation> <translation>Potvrdit</translation>
</message> </message>
<message> <message>
<location filename="../fileoperation.cpp" line="263"/> <location filename="../fileoperation.cpp" line="263"/>
<source>Do you want to delete the selected files?</source> <source>Do you want to delete the selected files?</source>
<translation type="unfinished"></translation> <translation>Chceš smazat vybrané soubory?</translation>
</message> </message>
<message> <message>
<location filename="../fileoperation.cpp" line="279"/> <location filename="../fileoperation.cpp" line="279"/>
<source>Do you want to move the selected files to trash can?</source> <source>Do you want to move the selected files to trash can?</source>
<translation type="unfinished"></translation> <translation>Chceš přesunout vybrané soubory do koše?</translation>
</message> </message>
</context> </context>
<context> <context>
@ -631,84 +638,94 @@ Do you want to delete them instead?</source>
<context> <context>
<name>Fm::FolderMenu</name> <name>Fm::FolderMenu</name>
<message> <message>
<location filename="../foldermenu.cpp" line="37"/> <location filename="../foldermenu.cpp" line="36"/>
<source>Create &amp;New</source> <source>Create &amp;New</source>
<translation type="unfinished"></translation> <translation>Vytvořit &amp;nový</translation>
</message> </message>
<message> <message>
<location filename="../foldermenu.cpp" line="44"/> <location filename="../foldermenu.cpp" line="44"/>
<source>&amp;Paste</source> <source>&amp;Paste</source>
<translation type="unfinished"></translation> <translation>&amp;Vložit</translation>
</message> </message>
<message> <message>
<location filename="../foldermenu.cpp" line="50"/> <location filename="../foldermenu.cpp" line="50"/>
<source>Select &amp;All</source> <source>Select &amp;All</source>
<translation type="unfinished"></translation> <translation>Vybr&amp;at všechno</translation>
</message> </message>
<message> <message>
<location filename="../foldermenu.cpp" line="54"/> <location filename="../foldermenu.cpp" line="54"/>
<source>Invert Selection</source> <source>Invert Selection</source>
<translation type="unfinished"></translation> <translation>Invertovat výběr</translation>
</message> </message>
<message> <message>
<location filename="../foldermenu.cpp" line="60"/> <location filename="../foldermenu.cpp" line="60"/>
<source>Sorting</source> <source>Sorting</source>
<translation type="unfinished"></translation> <translation>Řadit</translation>
</message> </message>
<message> <message>
<location filename="../foldermenu.cpp" line="65"/> <location filename="../foldermenu.cpp" line="65"/>
<source>Show Hidden</source> <source>Show Hidden</source>
<translation type="unfinished"></translation> <translation>Zobrazit skryté</translation>
</message> </message>
<message> <message>
<location filename="../foldermenu.cpp" line="73"/> <location filename="../foldermenu.cpp" line="73"/>
<source>Folder Pr&amp;operties</source> <source>Folder Pr&amp;operties</source>
<translation type="unfinished"></translation> <translation>Vlastnosti sl&amp;ožky</translation>
</message> </message>
<message> <message>
<location filename="../foldermenu.cpp" line="99"/> <location filename="../foldermenu.cpp" line="85"/>
<source>Folder</source>
<translation>Adresář</translation>
</message>
<message>
<location filename="../foldermenu.cpp" line="89"/>
<source>Blank File</source>
<translation>Prázdný soubor</translation>
</message>
<message>
<location filename="../foldermenu.cpp" line="133"/>
<source>By File Name</source> <source>By File Name</source>
<translation type="unfinished"></translation> <translation>Podle jména</translation>
</message> </message>
<message> <message>
<location filename="../foldermenu.cpp" line="100"/> <location filename="../foldermenu.cpp" line="134"/>
<source>By Modification Time</source> <source>By Modification Time</source>
<translation type="unfinished"></translation> <translation>Podle času</translation>
</message> </message>
<message> <message>
<location filename="../foldermenu.cpp" line="101"/> <location filename="../foldermenu.cpp" line="135"/>
<source>By File Size</source> <source>By File Size</source>
<translation type="unfinished"></translation> <translation>Podle velikosti</translation>
</message> </message>
<message> <message>
<location filename="../foldermenu.cpp" line="102"/> <location filename="../foldermenu.cpp" line="136"/>
<source>By File Type</source> <source>By File Type</source>
<translation type="unfinished"></translation> <translation>Podle typu</translation>
</message> </message>
<message> <message>
<location filename="../foldermenu.cpp" line="103"/> <location filename="../foldermenu.cpp" line="137"/>
<source>By File Owner</source> <source>By File Owner</source>
<translation type="unfinished"></translation> <translation>Podle vlastníka</translation>
</message> </message>
<message> <message>
<location filename="../foldermenu.cpp" line="115"/> <location filename="../foldermenu.cpp" line="149"/>
<source>Ascending</source> <source>Ascending</source>
<translation type="unfinished"></translation> <translation>Vzestupně</translation>
</message> </message>
<message> <message>
<location filename="../foldermenu.cpp" line="120"/> <location filename="../foldermenu.cpp" line="154"/>
<source>Descending</source> <source>Descending</source>
<translation type="unfinished"></translation> <translation>sestupně</translation>
</message> </message>
<message> <message>
<location filename="../foldermenu.cpp" line="135"/> <location filename="../foldermenu.cpp" line="169"/>
<source>Folder First</source> <source>Folder First</source>
<translation type="unfinished"></translation> <translation>Adresáře jako první</translation>
</message> </message>
<message> <message>
<location filename="../foldermenu.cpp" line="144"/> <location filename="../foldermenu.cpp" line="178"/>
<source>Case Sensitive</source> <source>Case Sensitive</source>
<translation type="unfinished"></translation> <translation>Zohlednit velikost písmen</translation>
</message> </message>
</context> </context>
<context> <context>
@ -757,7 +774,7 @@ Do you want to delete them instead?</source>
<message> <message>
<location filename="../mountoperationpassworddialog.cpp" line="40"/> <location filename="../mountoperationpassworddialog.cpp" line="40"/>
<source>&amp;Connect</source> <source>&amp;Connect</source>
<translation type="unfinished"></translation> <translation type="unfinished">&amp;Připojit</translation>
</message> </message>
</context> </context>
<context> <context>
@ -765,42 +782,42 @@ Do you want to delete them instead?</source>
<message> <message>
<location filename="../placesmodel.cpp" line="40"/> <location filename="../placesmodel.cpp" line="40"/>
<source>Places</source> <source>Places</source>
<translation type="unfinished">Místa</translation> <translation>Místa</translation>
</message> </message>
<message> <message>
<location filename="../placesmodel.cpp" line="48"/> <location filename="../placesmodel.cpp" line="48"/>
<source>Desktop</source> <source>Desktop</source>
<translation type="unfinished"></translation> <translation>Plocha</translation>
</message> </message>
<message> <message>
<location filename="../placesmodel.cpp" line="207"/> <location filename="../placesmodel.cpp" line="207"/>
<source>Trash</source> <source>Trash</source>
<translation type="unfinished"></translation> <translation>Koš</translation>
</message> </message>
<message> <message>
<location filename="../placesmodel.cpp" line="57"/> <location filename="../placesmodel.cpp" line="57"/>
<source>Computer</source> <source>Computer</source>
<translation type="unfinished"></translation> <translation>Počítač</translation>
</message> </message>
<message> <message>
<location filename="../placesmodel.cpp" line="70"/> <location filename="../placesmodel.cpp" line="70"/>
<source>Applications</source> <source>Applications</source>
<translation type="unfinished"></translation> <translation>Aplikace</translation>
</message> </message>
<message> <message>
<location filename="../placesmodel.cpp" line="82"/> <location filename="../placesmodel.cpp" line="82"/>
<source>Network</source> <source>Network</source>
<translation type="unfinished"></translation> <translation>Síť</translation>
</message> </message>
<message> <message>
<location filename="../placesmodel.cpp" line="90"/> <location filename="../placesmodel.cpp" line="90"/>
<source>Devices</source> <source>Devices</source>
<translation type="unfinished"></translation> <translation>Zařízení</translation>
</message> </message>
<message> <message>
<location filename="../placesmodel.cpp" line="132"/> <location filename="../placesmodel.cpp" line="132"/>
<source>Bookmarks</source> <source>Bookmarks</source>
<translation type="unfinished"></translation> <translation>Záložky</translation>
</message> </message>
</context> </context>
<context> <context>
@ -808,7 +825,7 @@ Do you want to delete them instead?</source>
<message> <message>
<location filename="../placesview.cpp" line="343"/> <location filename="../placesview.cpp" line="343"/>
<source>Empty Trash</source> <source>Empty Trash</source>
<translation type="unfinished">Vysypat koš</translation> <translation>Vysypat koš</translation>
</message> </message>
<message> <message>
<source>Rename</source> <source>Rename</source>
@ -821,48 +838,48 @@ Do you want to delete them instead?</source>
<message> <message>
<location filename="../placesview.cpp" line="331"/> <location filename="../placesview.cpp" line="331"/>
<source>Open in New Tab</source> <source>Open in New Tab</source>
<translation type="unfinished"></translation> <translation>Otevřít v novém panelu</translation>
</message> </message>
<message> <message>
<location filename="../placesview.cpp" line="334"/> <location filename="../placesview.cpp" line="334"/>
<source>Open in New Window</source> <source>Open in New Window</source>
<translation type="unfinished"></translation> <translation type="unfinished">Otevřít v novém okně</translation>
</message> </message>
<message> <message>
<location filename="../placesview.cpp" line="352"/> <location filename="../placesview.cpp" line="352"/>
<source>Move Bookmark Up</source> <source>Move Bookmark Up</source>
<translation type="unfinished"></translation> <translation type="unfinished">Přesunout záložku nahoru</translation>
</message> </message>
<message> <message>
<location filename="../placesview.cpp" line="357"/> <location filename="../placesview.cpp" line="357"/>
<source>Move Bookmark Down</source> <source>Move Bookmark Down</source>
<translation type="unfinished"></translation> <translation type="unfinished">Přesunout záložku dolů</translation>
</message> </message>
<message> <message>
<location filename="../placesview.cpp" line="361"/> <location filename="../placesview.cpp" line="361"/>
<source>Rename Bookmark</source> <source>Rename Bookmark</source>
<translation type="unfinished"></translation> <translation type="unfinished">Přejmenovat záložku</translation>
</message> </message>
<message> <message>
<location filename="../placesview.cpp" line="364"/> <location filename="../placesview.cpp" line="364"/>
<source>Remove Bookmark</source> <source>Remove Bookmark</source>
<translation type="unfinished"></translation> <translation type="unfinished">Odstranit záložku</translation>
</message> </message>
<message> <message>
<location filename="../placesview.cpp" line="373"/> <location filename="../placesview.cpp" line="373"/>
<location filename="../placesview.cpp" line="390"/> <location filename="../placesview.cpp" line="390"/>
<source>Unmount</source> <source>Unmount</source>
<translation type="unfinished">Odpojit</translation> <translation>Odpojit</translation>
</message> </message>
<message> <message>
<location filename="../placesview.cpp" line="377"/> <location filename="../placesview.cpp" line="377"/>
<source>Mount</source> <source>Mount</source>
<translation type="unfinished">Připojit</translation> <translation>Připojit</translation>
</message> </message>
<message> <message>
<location filename="../placesview.cpp" line="383"/> <location filename="../placesview.cpp" line="383"/>
<source>Eject</source> <source>Eject</source>
<translation type="unfinished">Vysunout</translation> <translation>Vysunout</translation>
</message> </message>
</context> </context>
<context> <context>
@ -890,37 +907,37 @@ Modified: %3</source>
<message> <message>
<location filename="../renamedialog.cpp" line="89"/> <location filename="../renamedialog.cpp" line="89"/>
<source>&amp;Overwrite</source> <source>&amp;Overwrite</source>
<translation type="unfinished"></translation> <translation type="unfinished">&amp;Přepsat</translation>
</message> </message>
<message> <message>
<location filename="../renamedialog.cpp" line="91"/> <location filename="../renamedialog.cpp" line="91"/>
<source>&amp;Rename</source> <source>&amp;Rename</source>
<translation type="unfinished"></translation> <translation type="unfinished">Pře&amp;jmenovat</translation>
</message> </message>
</context> </context>
<context> <context>
<name>Fm::SidePane</name> <name>Fm::SidePane</name>
<message> <message>
<location filename="../sidepane.cpp" line="47"/> <location filename="../sidepane.cpp" line="46"/>
<location filename="../sidepane.cpp" line="126"/> <location filename="../sidepane.cpp" line="125"/>
<source>Places</source> <source>Places</source>
<translation type="unfinished">Místa</translation> <translation>Místa</translation>
</message> </message>
<message> <message>
<location filename="../sidepane.cpp" line="48"/> <location filename="../sidepane.cpp" line="47"/>
<location filename="../sidepane.cpp" line="128"/> <location filename="../sidepane.cpp" line="127"/>
<source>Directory Tree</source> <source>Directory Tree</source>
<translation type="unfinished">Strom adresářů</translation> <translation>Strom adresářů</translation>
</message> </message>
<message> <message>
<location filename="../sidepane.cpp" line="136"/> <location filename="../sidepane.cpp" line="135"/>
<source>Shows list of common places, devices, and bookmarks in sidebar</source> <source>Shows list of common places, devices, and bookmarks in sidebar</source>
<translation type="unfinished"></translation> <translation type="unfinished">Zobrazit seznam obvyklých míst, zařízení a záložek v postranní liště</translation>
</message> </message>
<message> <message>
<location filename="../sidepane.cpp" line="138"/> <location filename="../sidepane.cpp" line="137"/>
<source>Shows tree of directories in sidebar</source> <source>Shows tree of directories in sidebar</source>
<translation type="unfinished"></translation> <translation type="unfinished">Zobrazit strom adresářů v postranní liště</translation>
</message> </message>
</context> </context>
<context> <context>
@ -928,103 +945,103 @@ Modified: %3</source>
<message> <message>
<location filename="../mount-operation-password.ui" line="20"/> <location filename="../mount-operation-password.ui" line="20"/>
<source>Mount</source> <source>Mount</source>
<translation type="unfinished">Připojit</translation> <translation>Připojit</translation>
</message> </message>
<message> <message>
<location filename="../mount-operation-password.ui" line="48"/> <location filename="../mount-operation-password.ui" line="48"/>
<source>Connect &amp;anonymously</source> <source>Connect &amp;anonymously</source>
<translation type="unfinished"></translation> <translation type="unfinished">Připojit &amp;anonymně</translation>
</message> </message>
<message> <message>
<location filename="../mount-operation-password.ui" line="58"/> <location filename="../mount-operation-password.ui" line="58"/>
<source>Connect as u&amp;ser:</source> <source>Connect as u&amp;ser:</source>
<translation type="unfinished"></translation> <translation type="unfinished">Připojit jako &amp;uživatel:</translation>
</message> </message>
<message> <message>
<location filename="../mount-operation-password.ui" line="79"/> <location filename="../mount-operation-password.ui" line="79"/>
<source>&amp;Username:</source> <source>&amp;Username:</source>
<translation type="unfinished"></translation> <translation type="unfinished">Uživatelské &amp;jméno:</translation>
</message> </message>
<message> <message>
<location filename="../mount-operation-password.ui" line="102"/> <location filename="../mount-operation-password.ui" line="102"/>
<source>&amp;Password:</source> <source>&amp;Password:</source>
<translation type="unfinished"></translation> <translation type="unfinished">&amp;Heslo:</translation>
</message> </message>
<message> <message>
<location filename="../mount-operation-password.ui" line="112"/> <location filename="../mount-operation-password.ui" line="112"/>
<source>&amp;Domain:</source> <source>&amp;Domain:</source>
<translation type="unfinished"></translation> <translation type="unfinished">&amp;Doména:</translation>
</message> </message>
<message> <message>
<location filename="../mount-operation-password.ui" line="127"/> <location filename="../mount-operation-password.ui" line="127"/>
<source>Forget password &amp;immediately</source> <source>Forget password &amp;immediately</source>
<translation type="unfinished"></translation> <translation type="unfinished">&amp;Zapomenout heslo</translation>
</message> </message>
<message> <message>
<location filename="../mount-operation-password.ui" line="137"/> <location filename="../mount-operation-password.ui" line="137"/>
<source>Remember password until you &amp;logout</source> <source>Remember password until you &amp;logout</source>
<translation type="unfinished"></translation> <translation type="unfinished">Pamatovat si heslo do &amp;odhlášení</translation>
</message> </message>
<message> <message>
<location filename="../mount-operation-password.ui" line="147"/> <location filename="../mount-operation-password.ui" line="147"/>
<source>Remember &amp;forever</source> <source>Remember &amp;forever</source>
<translation type="unfinished"></translation> <translation type="unfinished">Pamatovat si heslo &amp;trvale</translation>
</message> </message>
</context> </context>
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>
<location filename="../filelauncher.cpp" line="117"/>
<location filename="../mountoperation.cpp" line="185"/>
<location filename="../utilities.cpp" line="152"/> <location filename="../utilities.cpp" line="152"/>
<location filename="../utilities.cpp" line="228"/> <location filename="../utilities.cpp" line="228"/>
<location filename="../mountoperation.cpp" line="185"/>
<location filename="../filelauncher.cpp" line="109"/>
<source>Error</source> <source>Error</source>
<translation type="unfinished">Chyba</translation> <translation>Chyba</translation>
</message> </message>
<message> <message>
<location filename="../utilities.cpp" line="123"/> <location filename="../utilities.cpp" line="123"/>
<source>Rename File</source> <source>Rename File</source>
<translation type="unfinished">Přejmenovat Soubor</translation> <translation>Přejmenovat soubor</translation>
</message> </message>
<message> <message>
<location filename="../utilities.cpp" line="124"/> <location filename="../utilities.cpp" line="124"/>
<source>Please enter a new name:</source> <source>Please enter a new name:</source>
<translation type="unfinished">Prosím zadej nové jméno:</translation> <translation>Prosím zadej nové jméno:</translation>
</message> </message>
<message> <message>
<location filename="../utilities.cpp" line="164"/> <location filename="../utilities.cpp" line="164"/>
<source>Create Folder</source> <source>Create Folder</source>
<translation type="unfinished"></translation> <translation>Vytvořit adresář</translation>
</message> </message>
<message> <message>
<location filename="../utilities.cpp" line="169"/> <location filename="../utilities.cpp" line="169"/>
<source>Please enter a new file name:</source> <source>Please enter a new file name:</source>
<translation type="unfinished">Prosím zadej nové jméno souboru:</translation> <translation>Prosím zadej nové jméno souboru:</translation>
</message> </message>
<message> <message>
<location filename="../utilities.cpp" line="170"/> <location filename="../utilities.cpp" line="170"/>
<source>New text file</source> <source>New text file</source>
<translation type="unfinished">Nový textový soubor</translation> <translation>Nový textový soubor</translation>
</message> </message>
<message> <message>
<location filename="../utilities.cpp" line="174"/> <location filename="../utilities.cpp" line="174"/>
<source>Please enter a new folder name:</source> <source>Please enter a new folder name:</source>
<translation type="unfinished">Prosím zadej nové jméno složky:</translation> <translation>Prosím zadej nové jméno adresáře:</translation>
</message> </message>
<message> <message>
<location filename="../utilities.cpp" line="175"/> <location filename="../utilities.cpp" line="175"/>
<source>New folder</source> <source>New folder</source>
<translation type="unfinished">Nová složka</translation> <translation>Nový adresář</translation>
</message> </message>
<message> <message>
<location filename="../utilities.cpp" line="180"/> <location filename="../utilities.cpp" line="180"/>
<source>Enter a name for the new %1:</source> <source>Enter a name for the new %1:</source>
<translation type="unfinished">Zadej jméno pro nový %1:</translation> <translation>Zadej jméno pro nový %1:</translation>
</message> </message>
<message> <message>
<location filename="../utilities.cpp" line="165"/> <location filename="../utilities.cpp" line="165"/>
<source>Create File</source> <source>Create File</source>
<translation type="unfinished">Vytvořit soubor</translation> <translation>Vytvořit soubor</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1032,12 +1049,12 @@ Modified: %3</source>
<message> <message>
<location filename="../rename-dialog.ui" line="14"/> <location filename="../rename-dialog.ui" line="14"/>
<source>Confirm to replace files</source> <source>Confirm to replace files</source>
<translation type="unfinished"></translation> <translation>Potvrdit náhradu souborů</translation>
</message> </message>
<message> <message>
<location filename="../rename-dialog.ui" line="35"/> <location filename="../rename-dialog.ui" line="35"/>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;There is already a file with the same name in this location.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Do you want to replace the existing file?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;There is already a file with the same name in this location.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Do you want to replace the existing file?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation> <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Na tomto místě už je soubor se stejným jménem.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;Chceš nahradit existující soubor&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location filename="../rename-dialog.ui" line="56"/> <location filename="../rename-dialog.ui" line="56"/>
@ -1047,7 +1064,7 @@ Modified: %3</source>
<message> <message>
<location filename="../rename-dialog.ui" line="63"/> <location filename="../rename-dialog.ui" line="63"/>
<source>with the following file?</source> <source>with the following file?</source>
<translation type="unfinished"></translation> <translation>následujícím souborem?</translation>
</message> </message>
<message> <message>
<location filename="../rename-dialog.ui" line="76"/> <location filename="../rename-dialog.ui" line="76"/>
@ -1067,12 +1084,12 @@ Modified: %3</source>
<message> <message>
<location filename="../rename-dialog.ui" line="122"/> <location filename="../rename-dialog.ui" line="122"/>
<source>&amp;File name:</source> <source>&amp;File name:</source>
<translation type="unfinished"></translation> <translation>&amp;Jméno souboru:</translation>
</message> </message>
<message> <message>
<location filename="../rename-dialog.ui" line="137"/> <location filename="../rename-dialog.ui" line="137"/>
<source>Apply this option to all existing files</source> <source>Apply this option to all existing files</source>
<translation type="unfinished"></translation> <translation>Použij tuto volbu pro všechny soubory</translation>
</message> </message>
</context> </context>
</TS> </TS>

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>501</width> <width>501</width>
<height>376</height> <height>434</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -295,7 +295,7 @@
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="standardButtons"> <property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property> </property>
</widget> </widget>
</item> </item>

@ -85,12 +85,16 @@ DesktopPreferencesDialog::DesktopPreferencesDialog(QWidget* parent, Qt::WindowFl
ui.textColor->setColor(settings.desktopFgColor()); ui.textColor->setColor(settings.desktopFgColor());
ui.shadowColor->setColor(settings.desktopShadowColor()); ui.shadowColor->setColor(settings.desktopShadowColor());
ui.showWmMenu->setChecked(settings.showWmMenu()); ui.showWmMenu->setChecked(settings.showWmMenu());
connect(ui.buttonBox->button(QDialogButtonBox::Apply), &QPushButton::clicked,
this, &DesktopPreferencesDialog::onApplyClicked);
} }
DesktopPreferencesDialog::~DesktopPreferencesDialog() { DesktopPreferencesDialog::~DesktopPreferencesDialog() {
} }
void DesktopPreferencesDialog::accept() { void DesktopPreferencesDialog::applySettings()
{
Settings& settings = static_cast<Application*>(qApp)->settings(); Settings& settings = static_cast<Application*>(qApp)->settings();
XdgDir::setDesktopDir(ui.desktopFolder->text()); XdgDir::setDesktopDir(ui.desktopFolder->text());
@ -104,10 +108,19 @@ void DesktopPreferencesDialog::accept() {
settings.setDesktopShadowColor(ui.shadowColor->color()); settings.setDesktopShadowColor(ui.shadowColor->color());
settings.setShowWmMenu(ui.showWmMenu->isChecked()); settings.setShowWmMenu(ui.showWmMenu->isChecked());
QDialog::accept(); settings.save();
}
void DesktopPreferencesDialog::onApplyClicked()
{
applySettings();
static_cast<Application*>(qApp)->updateDesktopsFromSettings(); static_cast<Application*>(qApp)->updateDesktopsFromSettings();
settings.save(); }
void DesktopPreferencesDialog::accept() {
applySettings();
static_cast<Application*>(qApp)->updateDesktopsFromSettings();
QDialog::accept();
} }
void DesktopPreferencesDialog::onWallpaperModeChanged(int index) { void DesktopPreferencesDialog::onWallpaperModeChanged(int index) {

@ -38,10 +38,13 @@ public:
void selectPage(QString name); void selectPage(QString name);
protected Q_SLOTS: protected Q_SLOTS:
void onApplyClicked();
void onWallpaperModeChanged(int index); void onWallpaperModeChanged(int index);
void onBrowseClicked(); void onBrowseClicked();
void onBrowseDesktopFolderClicked(); void onBrowseDesktopFolderClicked();
void applySettings();
private: private:
Ui::DesktopPreferencesDialog ui; Ui::DesktopPreferencesDialog ui;
}; };

@ -788,6 +788,10 @@ void DesktopWindow::childDropEvent(QDropEvent* e) {
Fm::FolderView::childDropEvent(e); Fm::FolderView::childDropEvent(e);
} }
void DesktopWindow::closeEvent(QCloseEvent *event) {
// prevent the desktop window from being closed.
event->ignore();
}
void DesktopWindow::setScreenNum(int num) { void DesktopWindow::setScreenNum(int num) {
if(screenNum_ != num) { if(screenNum_ != num) {

@ -89,6 +89,7 @@ protected:
virtual bool eventFilter(QObject * watched, QEvent * event); virtual bool eventFilter(QObject * watched, QEvent * event);
virtual void childDropEvent(QDropEvent* e); virtual void childDropEvent(QDropEvent* e);
virtual void closeEvent(QCloseEvent *event);
protected Q_SLOTS: protected Q_SLOTS:
void onOpenDirRequested(FmPath* path, int target); void onOpenDirRequested(FmPath* path, int target);

@ -217,6 +217,8 @@ void MainWindow::addTab(FmPath* path) {
connect(newPage, &TabPage::statusChanged, this, &MainWindow::onTabPageStatusChanged); connect(newPage, &TabPage::statusChanged, this, &MainWindow::onTabPageStatusChanged);
connect(newPage, &TabPage::openDirRequested, this, &MainWindow::onTabPageOpenDirRequested); connect(newPage, &TabPage::openDirRequested, this, &MainWindow::onTabPageOpenDirRequested);
connect(newPage, &TabPage::sortFilterChanged, this, &MainWindow::onTabPageSortFilterChanged); connect(newPage, &TabPage::sortFilterChanged, this, &MainWindow::onTabPageSortFilterChanged);
connect(newPage, &TabPage::backwardRequested, this, &MainWindow::on_actionGoBack_triggered);
connect(newPage, &TabPage::forwardRequested, this, &MainWindow::on_actionGoForward_triggered);
ui.tabBar->insertTab(index, newPage->title()); ui.tabBar->insertTab(index, newPage->title());

@ -57,8 +57,8 @@ TabPage::TabPage(FmPath* path, QWidget* parent):
// newView->setColumnWidth(Fm::FolderModel::ColumnName, 200); // newView->setColumnWidth(Fm::FolderModel::ColumnName, 200);
connect(folderView_, &View::openDirRequested, this, &TabPage::onOpenDirRequested); connect(folderView_, &View::openDirRequested, this, &TabPage::onOpenDirRequested);
connect(folderView_, &View::selChanged, this, &TabPage::onSelChanged); connect(folderView_, &View::selChanged, this, &TabPage::onSelChanged);
connect(folderView_, &View::clickedBack, this, &TabPage::backward); connect(folderView_, &View::clickedBack, this, &TabPage::backwardRequested);
connect(folderView_, &View::clickedForward, this, &TabPage::forward); connect(folderView_, &View::clickedForward, this, &TabPage::forwardRequested);
// FIXME: this is very dirty // FIXME: this is very dirty
folderView_->setModel(proxyModel_); folderView_->setModel(proxyModel_);

@ -182,6 +182,8 @@ Q_SIGNALS:
void titleChanged(QString title); void titleChanged(QString title);
void openDirRequested(FmPath* path, int target); void openDirRequested(FmPath* path, int target);
void sortFilterChanged(); void sortFilterChanged();
void forwardRequested();
void backwardRequested();
protected Q_SLOTS: protected Q_SLOTS:
void onOpenDirRequested(FmPath* path, int target); void onOpenDirRequested(FmPath* path, int target);

Loading…
Cancel
Save