Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 38375)
@@ -348,5 +348,5 @@
 	src/widgets/VBoxFilePathSelectorWidget.h \
 	src/widgets/VBoxImportApplianceWgt.h \
-	src/widgets/VBoxLineTextEdit.h \
+	src/widgets/UILineTextEdit.h \
 	src/widgets/VBoxMediaComboBox.h \
 	src/widgets/VBoxMiniToolBar.h \
@@ -520,5 +520,5 @@
 	src/widgets/VBoxGuestRAMSlider.cpp \
 	src/widgets/VBoxImportApplianceWgt.cpp \
-	src/widgets/VBoxLineTextEdit.cpp \
+	src/widgets/UILineTextEdit.cpp \
 	src/widgets/VBoxMediaComboBox.cpp \
 	src/widgets/VBoxMiniToolBar.cpp \
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ar.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ar.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ar.ts	(revision 38375)
@@ -5845,5 +5845,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -7799,5 +7799,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts	(revision 38375)
@@ -7685,5 +7685,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -9908,5 +9908,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts	(revision 38375)
@@ -9412,5 +9412,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -12215,5 +12215,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts	(revision 38375)
@@ -9412,5 +9412,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -12215,5 +12215,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts	(revision 38375)
@@ -8898,5 +8898,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -11576,5 +11576,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts	(revision 38375)
@@ -7527,5 +7527,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -9719,5 +9719,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts	(revision 38375)
@@ -6375,5 +6375,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -7041,5 +7041,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_el.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_el.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_el.ts	(revision 38375)
@@ -5276,5 +5276,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -6931,5 +6931,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts	(revision 38375)
@@ -9373,5 +9373,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -12212,5 +12212,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts	(revision 38375)
@@ -7648,5 +7648,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -10005,5 +10005,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts	(revision 38375)
@@ -8359,5 +8359,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -10859,5 +10859,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts	(revision 38375)
@@ -6075,5 +6075,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -7990,5 +7990,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts	(revision 38375)
@@ -7121,5 +7121,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -9223,5 +9223,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts	(revision 38375)
@@ -9069,5 +9069,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -11732,5 +11732,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts	(revision 38375)
@@ -8014,5 +8014,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -10537,5 +10537,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts	(revision 38375)
@@ -9465,5 +9465,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -12338,5 +12338,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts	(revision 38375)
@@ -10460,7 +10460,7 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
-    <message>
-        <location filename="../src/widgets/VBoxLineTextEdit.cpp" line="109"/>
+    <name>UILineTextEdit</name>
+    <message>
+        <location filename="../src/widgets/UILineTextEdit.cpp" line="109"/>
         <source>&amp;Edit</source>
         <translation>編集(&amp;E)</translation>
@@ -13655,27 +13655,27 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
-    <message>
-        <location filename="../src/widgets/VBoxLineTextEdit.cpp" line="74"/>
+    <name>UITextEditor</name>
+    <message>
+        <location filename="../src/widgets/UILineTextEdit.cpp" line="74"/>
         <source>Edit text</source>
         <translation>テキストを編集</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxLineTextEdit.cpp" line="75"/>
+        <location filename="../src/widgets/UILineTextEdit.cpp" line="75"/>
         <source>&amp;Replace...</source>
         <translation>置換(&amp;R)...</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxLineTextEdit.cpp" line="76"/>
+        <location filename="../src/widgets/UILineTextEdit.cpp" line="76"/>
         <source>Replaces the current text with the content of a file.</source>
         <translation>現在のテキストを指定のファイルの内容で置き換えます。</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxLineTextEdit.cpp" line="81"/>
+        <location filename="../src/widgets/UILineTextEdit.cpp" line="81"/>
         <source>Text (*.txt);;All (*.*)</source>
         <translation>テキストファイル(*.txt);;すべてのファイル(*.*)</translation>
     </message>
     <message>
-        <location filename="../src/widgets/VBoxLineTextEdit.cpp" line="81"/>
+        <location filename="../src/widgets/UILineTextEdit.cpp" line="81"/>
         <source>Select a file to open...</source>
         <translation>開くファイルを選択...</translation>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts	(revision 38375)
@@ -7565,5 +7565,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -9689,5 +9689,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts	(revision 38375)
@@ -7748,5 +7748,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -9945,5 +9945,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts	(revision 38375)
@@ -7539,5 +7539,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -9783,5 +9783,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts	(revision 38375)
@@ -7508,5 +7508,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -9704,5 +9704,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts	(revision 38375)
@@ -9313,5 +9313,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -12017,5 +12017,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts	(revision 38375)
@@ -8561,5 +8561,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -11216,5 +11216,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts	(revision 38375)
@@ -9595,5 +9595,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -12451,5 +12451,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts	(revision 38375)
@@ -9211,5 +9211,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -11989,5 +11989,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts	(revision 38375)
@@ -7964,5 +7964,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -10228,5 +10228,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts	(revision 38375)
@@ -8474,5 +8474,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -10983,5 +10983,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts	(revision 38375)
@@ -7586,5 +7586,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -9819,5 +9819,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts	(revision 38375)
@@ -8338,5 +8338,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -10741,5 +10741,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts	(revision 38375)
@@ -8276,5 +8276,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -10812,5 +10812,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts	(revision 38375)
@@ -7795,5 +7795,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -10079,5 +10079,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts	(revision 38375)
@@ -5270,5 +5270,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -6923,5 +6923,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts	(revision 38375)
@@ -9304,5 +9304,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -12127,5 +12127,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts	(revision 38375)
@@ -5270,5 +5270,5 @@
 </context>
 <context>
-    <name>VBoxLineTextEdit</name>
+    <name>UILineTextEdit</name>
     <message>
         <source>&amp;Edit</source>
@@ -6923,5 +6923,5 @@
 </context>
 <context>
-    <name>VBoxTextEditor</name>
+    <name>UITextEditor</name>
     <message>
         <source>Edit text</source>
Index: /trunk/src/VBox/Frontends/VirtualBox/src/precomp.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/precomp.h	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/precomp.h	(revision 38375)
@@ -222,5 +222,5 @@
 #include "VBoxImportApplianceWzd.h"
 #include "VBoxLicenseViewer.h"
-#include "VBoxLineTextEdit.h"
+#include "UILineTextEdit.h"
 //#include "VBoxMediaComboBox.h"
 #include "VBoxMediaManagerDlg.h"
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp	(revision 38375)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp	(revision 38375)
@@ -0,0 +1,123 @@
+/* $Id$ */
+/** @file
+ *
+ * VBox frontends: Qt4 GUI ("VirtualBox"):
+ * UILineTextEdit class definitions
+ */
+
+/*
+ * Copyright (C) 2009-2011 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
+/* VBox includes */
+#include "VBoxGlobal.h"
+#include "UILineTextEdit.h"
+#include "QIFileDialog.h"
+
+/* Qt includes */
+#include <QDialogButtonBox>
+#include <QFile>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QTextEdit>
+#include <QTextStream>
+
+////////////////////////////////////////////////////////////////////////////////
+// UITextEditor
+
+UITextEditor::UITextEditor(QWidget *pParent /* = NULL */)
+  : QIWithRetranslateUI<QIDialog>(pParent)
+{
+    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
+    pMainLayout->setMargin(12);
+
+    /* We need a text editor */
+    m_pTextEdit = new QTextEdit(this);
+    pMainLayout->addWidget(m_pTextEdit);
+    /* and some buttons to interact with */
+    m_pButtonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this);
+    m_pOpenButton = new QPushButton(this);
+    m_pButtonBox->addButton(m_pOpenButton, QDialogButtonBox::ActionRole);
+    pMainLayout->addWidget(m_pButtonBox);
+    /* Connect the buttons so that they are useful */
+    connect(m_pButtonBox, SIGNAL(accepted()),
+            this, SLOT(accept()));
+    connect(m_pButtonBox, SIGNAL(rejected()),
+            this, SLOT(reject()));
+    connect(m_pOpenButton, SIGNAL(clicked()),
+            this, SLOT(open()));
+
+    /* Applying language settings */
+    retranslateUi();
+}
+
+void UITextEditor::setText(const QString& strText)
+{
+    m_pTextEdit->setText(strText);
+}
+
+QString UITextEditor::text() const
+{
+    return m_pTextEdit->toPlainText();
+}
+
+void UITextEditor::retranslateUi()
+{
+    setWindowTitle(tr("Edit text"));
+    m_pOpenButton->setText(tr("&Replace..."));
+    m_pOpenButton->setToolTip(tr("Replaces the current text with the content of a file."));
+}
+
+void UITextEditor::open()
+{
+    QString fileName = QIFileDialog::getOpenFileName(vboxGlobal().documentsPath(), tr("Text (*.txt);;All (*.*)"), this, tr("Select a file to open..."));
+    if (!fileName.isEmpty())
+    {
+        QFile file(fileName);
+        if (file.open(QFile::ReadOnly))
+        {
+            QTextStream in(&file);
+            m_pTextEdit->setPlainText(in.readAll());
+        }
+    }
+
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// UILineTextEdit
+
+UILineTextEdit::UILineTextEdit(QWidget *pParent /* = NULL */)
+  : QIWithRetranslateUI<QPushButton>(pParent)
+{
+    connect(this, SIGNAL(clicked()),
+            this, SLOT(edit()));
+
+    /* Don't interpret the Enter Key. */
+    setAutoDefault(false);
+    setDefault(false);
+
+    setFocusPolicy(Qt::StrongFocus);
+    retranslateUi();
+}
+
+void UILineTextEdit::retranslateUi()
+{
+    QPushButton::setText(tr("&Edit"));
+}
+
+void UILineTextEdit::edit()
+{
+    UITextEditor te(this);
+    te.setText(m_strText);
+    if (te.exec() == QDialog::Accepted)
+        m_strText = te.text();
+}
+
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.h	(revision 38375)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.h	(revision 38375)
@@ -0,0 +1,84 @@
+/** @file
+ *
+ * VBox frontends: Qt4 GUI ("VirtualBox"):
+ * UILineTextEdit class declaration
+ */
+
+/*
+ * Copyright (C) 2009-2011 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
+#ifndef __UILineTextEdit_h__
+#define __UILineTextEdit_h__
+
+/* VBox includes */
+#include "QIDialog.h"
+#include "QIWithRetranslateUI.h"
+
+/* Qt includes */
+#include <QPushButton>
+
+/* Qt forward declarations */
+class QTextEdit;
+class QDialogButtonBox;
+
+////////////////////////////////////////////////////////////////////////////////
+// UITextEditor
+
+class UITextEditor: public QIWithRetranslateUI<QIDialog>
+{
+    Q_OBJECT;
+
+public:
+    UITextEditor(QWidget *pParent = NULL);
+
+    void setText(const QString& strText);
+    QString text() const;
+
+protected:
+    void retranslateUi();
+
+private slots:
+    void open();
+
+private:
+    /* Private member vars */
+    QTextEdit        *m_pTextEdit;
+    QDialogButtonBox *m_pButtonBox;
+    QPushButton      *m_pOpenButton;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// UILineTextEdit
+
+class UILineTextEdit: public QIWithRetranslateUI<QPushButton>
+{
+    Q_OBJECT;
+
+public:
+    UILineTextEdit(QWidget *pParent = NULL);
+
+    void setText(const QString& strText) { m_strText = strText; }
+    QString text() const { return m_strText; }
+
+protected:
+    void retranslateUi();
+
+private slots:
+    void edit();
+
+private:
+    /* Private member vars */
+    QString m_strText;
+};
+
+#endif /* __UILineTextEdit_h__ */
+
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxApplianceEditorWgt.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxApplianceEditorWgt.cpp	(revision 38374)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxApplianceEditorWgt.cpp	(revision 38375)
@@ -23,5 +23,5 @@
 #include "UIMessageCenter.h"
 #include "VBoxOSTypeSelectorButton.h"
-#include "VBoxLineTextEdit.h"
+#include "UILineTextEdit.h"
 
 /* Qt includes */
@@ -410,5 +410,5 @@
             case KVirtualSystemDescriptionType_License:
                 {
-                    VBoxLineTextEdit *e = new VBoxLineTextEdit (aParent);
+                    UILineTextEdit *e = new UILineTextEdit (aParent);
                     editor = e;
                     break;
@@ -532,5 +532,5 @@
         case KVirtualSystemDescriptionType_License:
             {
-                if (VBoxLineTextEdit *e = qobject_cast<VBoxLineTextEdit*> (aEditor))
+                if (UILineTextEdit *e = qobject_cast<UILineTextEdit*> (aEditor))
                 {
                     e->setText (mConfigValue);
@@ -649,5 +649,5 @@
         case KVirtualSystemDescriptionType_License:
             {
-                if (VBoxLineTextEdit *e = qobject_cast<VBoxLineTextEdit*> (aEditor))
+                if (UILineTextEdit *e = qobject_cast<UILineTextEdit*> (aEditor))
                 {
                     mConfigValue = e->text();
@@ -977,5 +977,5 @@
         /* The same counts for the text edit buttons of the license or
          * description fields. */
-        else if (qobject_cast<VBoxLineTextEdit*> (aObject))
+        else if (qobject_cast<UILineTextEdit*> (aObject))
             return false;
     }
Index: unk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxLineTextEdit.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxLineTextEdit.cpp	(revision 38374)
+++ 	(revision )
@@ -1,123 +1,0 @@
-/* $Id$ */
-/** @file
- *
- * VBox frontends: Qt4 GUI ("VirtualBox"):
- * VBoxLineTextEdit class definitions
- */
-
-/*
- * Copyright (C) 2009 Oracle Corporation
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- */
-
-/* VBox includes */
-#include "VBoxGlobal.h"
-#include "VBoxLineTextEdit.h"
-#include "QIFileDialog.h"
-
-/* Qt includes */
-#include <QDialogButtonBox>
-#include <QFile>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QTextEdit>
-#include <QTextStream>
-
-////////////////////////////////////////////////////////////////////////////////
-// VBoxTextEditor
-
-VBoxTextEditor::VBoxTextEditor (QWidget *aParent /* = NULL */)
-  : QIWithRetranslateUI<QIDialog> (aParent)
-{
-    QVBoxLayout *mainLayout = new QVBoxLayout (this);
-    mainLayout->setMargin (12);
-
-    /* We need a text editor */
-    mTextEdit = new QTextEdit (this);
-    mainLayout->addWidget (mTextEdit);
-    /* and some buttons to interact with */
-    mButtonBox = new QDialogButtonBox (QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this);
-    mOpenBtn = new QPushButton (this);
-    mButtonBox->addButton (mOpenBtn, QDialogButtonBox::ActionRole);
-    mainLayout->addWidget (mButtonBox);
-    /* Connect the buttons so that they are useful */
-    connect (mButtonBox, SIGNAL (accepted()),
-             this, SLOT (accept()));
-    connect (mButtonBox, SIGNAL (rejected()),
-             this, SLOT (reject()));
-    connect (mOpenBtn, SIGNAL (clicked()),
-             this, SLOT (open()));
-
-    /* Applying language settings */
-    retranslateUi();
-}
-
-void VBoxTextEditor::setText (const QString& aText)
-{
-    mTextEdit->setText (aText);
-}
-
-QString VBoxTextEditor::text() const
-{
-    return mTextEdit->toPlainText();
-}
-
-void VBoxTextEditor::retranslateUi()
-{
-    setWindowTitle (tr ("Edit text"));
-    mOpenBtn->setText (tr ("&Replace..."));
-    mOpenBtn->setToolTip (tr ("Replaces the current text with the content of a file."));
-}
-
-void VBoxTextEditor::open()
-{
-    QString fileName = QIFileDialog::getOpenFileName (vboxGlobal().documentsPath(), tr("Text (*.txt);;All (*.*)"), this, tr("Select a file to open..."));
-    if (!fileName.isEmpty())
-    {
-        QFile file (fileName);
-        if (file.open(QFile::ReadOnly))
-        {
-            QTextStream in (&file);
-            mTextEdit->setPlainText (in.readAll());
-        }
-    }
-
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// VBoxLineTextEdit
-
-VBoxLineTextEdit::VBoxLineTextEdit (QWidget *aParent /* = NULL */)
-  : QIWithRetranslateUI<QPushButton> (aParent)
-{
-    connect (this, SIGNAL (clicked()),
-             this, SLOT (edit()));
-
-    /* Don't interpret the Enter Key. */
-    setAutoDefault(false);
-    setDefault(false);
-
-    setFocusPolicy (Qt::StrongFocus);
-    retranslateUi();
-}
-
-void VBoxLineTextEdit::retranslateUi()
-{
-    QPushButton::setText (tr ("&Edit"));
-}
-
-void VBoxLineTextEdit::edit()
-{
-    VBoxTextEditor te (this);
-    te.setText (mText);
-    if (te.exec() == QDialog::Accepted)
-        mText = te.text();
-}
-
Index: unk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxLineTextEdit.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxLineTextEdit.h	(revision 38374)
+++ 	(revision )
@@ -1,84 +1,0 @@
-/** @file
- *
- * VBox frontends: Qt4 GUI ("VirtualBox"):
- * VBoxLineTextEdit class declaration
- */
-
-/*
- * Copyright (C) 2009 Oracle Corporation
- *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
- */
-
-#ifndef __VBoxLineTextEdit_h__
-#define __VBoxLineTextEdit_h__
-
-/* VBox includes */
-#include "QIDialog.h"
-#include "QIWithRetranslateUI.h"
-
-/* Qt includes */
-#include <QPushButton>
-
-/* Qt forward declarations */
-class QTextEdit;
-class QDialogButtonBox;
-
-////////////////////////////////////////////////////////////////////////////////
-// VBoxTextEditor
-
-class VBoxTextEditor: public QIWithRetranslateUI<QIDialog>
-{
-    Q_OBJECT;
-
-public:
-    VBoxTextEditor (QWidget *aParent = NULL);
-
-    void setText (const QString& aText);
-    QString text() const;
-
-protected:
-    void retranslateUi();
-
-private slots:
-    void open();
-
-private:
-    /* Private member vars */
-    QTextEdit *mTextEdit;
-    QDialogButtonBox *mButtonBox;
-    QPushButton *mOpenBtn;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// VBoxLineTextEdit
-
-class VBoxLineTextEdit: public QIWithRetranslateUI<QPushButton>
-{
-    Q_OBJECT;
-
-public:
-    VBoxLineTextEdit (QWidget *aParent = NULL);
-
-    void setText (const QString& aText) { mText = aText; }
-    QString text() const { return mText; }
-
-protected:
-    void retranslateUi();
-
-private slots:
-    void edit();
-
-private:
-    /* Private member vars */
-    QString mText;
-};
-
-#endif /* __VBoxLineTextEdit_h__ */
-
