Merge branch 'master' of github.com:trueos/lumina

1 files changed, 83 insertions, 53 deletions

diff --git a/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_bs.ts b/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_bs.ts
index c4e9ff34..977d545a 100644
--- a/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_bs.ts
+++ b/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_bs.ts
@@ -41,221 +41,251 @@
     </message>
 </context>
 <context>
-    <name>MainUI</name>
+    <name>DnDTabBar</name>
     <message>
-        <location filename="../MainUI.ui" line="17"/>
-        <source>MainWindow</source>
+        <location filename="../DnDTabBar.h" line="43"/>
+        <source>Detach Tab</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>MainUI</name>
     <message>
-        <location filename="../MainUI.ui" line="49"/>
-        <source>Tab 1</source>
+        <location filename="../MainUI.ui" line="17"/>
+        <source>MainWindow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="84"/>
+        <location filename="../MainUI.ui" line="66"/>
         <source>Find the previous match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="87"/>
-        <location filename="../MainUI.ui" line="100"/>
-        <location filename="../MainUI.ui" line="151"/>
-        <location filename="../MainUI.ui" line="164"/>
-        <location filename="../MainUI.ui" line="176"/>
+        <location filename="../MainUI.ui" line="69"/>
+        <location filename="../MainUI.ui" line="82"/>
+        <location filename="../MainUI.ui" line="133"/>
+        <location filename="../MainUI.ui" line="146"/>
+        <location filename="../MainUI.ui" line="158"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="186"/>
+        <location filename="../MainUI.ui" line="168"/>
         <source>Find:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="97"/>
+        <location filename="../MainUI.ui" line="79"/>
         <source>Find the next match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="107"/>
+        <location filename="../MainUI.ui" line="89"/>
         <source>Replace:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="126"/>
+        <location filename="../MainUI.ui" line="108"/>
         <source>Match case</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="148"/>
+        <location filename="../MainUI.ui" line="130"/>
         <source>Replace next match</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="161"/>
+        <location filename="../MainUI.ui" line="143"/>
         <source>Replace all matches (to end of document)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="173"/>
+        <location filename="../MainUI.ui" line="155"/>
         <source>Hide the find/replace options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="214"/>
+        <location filename="../MainUI.ui" line="196"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="227"/>
+        <location filename="../MainUI.ui" line="209"/>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="231"/>
+        <location filename="../MainUI.ui" line="213"/>
         <source>Syntax Highlighting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="245"/>
+        <location filename="../MainUI.ui" line="220"/>
+        <source>Tabs Location</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainUI.ui" line="237"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="260"/>
+        <location filename="../MainUI.ui" line="252"/>
         <source>toolBar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="286"/>
+        <location filename="../MainUI.ui" line="278"/>
         <source>Show Line Numbers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="291"/>
+        <location filename="../MainUI.ui" line="283"/>
         <source>None</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="296"/>
-        <location filename="../MainUI.cpp" line="154"/>
+        <location filename="../MainUI.ui" line="288"/>
+        <location filename="../MainUI.cpp" line="187"/>
         <source>New File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="299"/>
+        <location filename="../MainUI.ui" line="291"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="307"/>
+        <location filename="../MainUI.ui" line="299"/>
         <source>Open File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="310"/>
+        <location filename="../MainUI.ui" line="302"/>
         <source>Ctrl+O</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="318"/>
+        <location filename="../MainUI.ui" line="310"/>
         <source>Save File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="321"/>
+        <location filename="../MainUI.ui" line="313"/>
         <source>Ctrl+S</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="329"/>
+        <location filename="../MainUI.ui" line="321"/>
         <source>Save File As</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="334"/>
+        <location filename="../MainUI.ui" line="326"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="337"/>
+        <location filename="../MainUI.ui" line="329"/>
         <source>Ctrl+Q</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="345"/>
+        <location filename="../MainUI.ui" line="337"/>
         <source>Close File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="348"/>
+        <location filename="../MainUI.ui" line="340"/>
         <source>Ctrl+W</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="356"/>
+        <location filename="../MainUI.ui" line="348"/>
         <source>Customize Colors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="367"/>
+        <location filename="../MainUI.ui" line="359"/>
         <source>Wrap Lines</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="372"/>
+        <location filename="../MainUI.ui" line="364"/>
         <source>Find</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="375"/>
+        <location filename="../MainUI.ui" line="367"/>
         <source>Ctrl+F</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="383"/>
+        <location filename="../MainUI.ui" line="375"/>
         <source>Replace</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="386"/>
+        <location filename="../MainUI.ui" line="378"/>
         <source>Ctrl+R</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="400"/>
+        <location filename="../MainUI.ui" line="392"/>
         <source>Show Popup Warnings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.ui" line="403"/>
-        <location filename="../MainUI.ui" line="406"/>
+        <location filename="../MainUI.ui" line="395"/>
+        <location filename="../MainUI.ui" line="398"/>
         <source>Show warnings about unsaved changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="40"/>
+        <location filename="../MainUI.ui" line="409"/>
+        <source>Top</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainUI.ui" line="417"/>
+        <source>Bottom</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainUI.ui" line="425"/>
+        <source>Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainUI.ui" line="433"/>
+        <source>Right</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../MainUI.cpp" line="61"/>
         <source>Text Editor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="161"/>
+        <location filename="../MainUI.cpp" line="194"/>
         <source>Open File(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="161"/>
+        <location filename="../MainUI.cpp" line="194"/>
         <source>Text Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="296"/>
-        <location filename="../MainUI.cpp" line="394"/>
+        <location filename="../MainUI.cpp" line="351"/>
+        <location filename="../MainUI.cpp" line="362"/>
+        <location filename="../MainUI.cpp" line="470"/>
         <source>Lose Unsaved Changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="296"/>
+        <location filename="../MainUI.cpp" line="351"/>
+        <location filename="../MainUI.cpp" line="362"/>
         <source>This file has unsaved changes.
 Do you want to close it anyway?
 
@@ -263,7 +293,7 @@ Do you want to close it anyway?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../MainUI.cpp" line="394"/>
+        <location filename="../MainUI.cpp" line="470"/>
         <source>There are unsaved changes.
 Do you want to close the editor anyway?