diff options
| author | 2015-01-30 17:00:24 -0500 | |
|---|---|---|
| committer | 2015-01-30 17:00:24 -0500 | |
| commit | e4767514ed04e6a0bddf3f4a47f5f0b09e65e0ee (patch) | |
| tree | 86cadc2137831d44fa29fd40a2964f7fb1326de4 /SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.ui | |
| parent | 26ddfe11c2b7fac52e5f57dcd9f5223a50b2a9a7 (diff) | |
| parent | 016003905ca0e8e459e3dc33e786beda8ec92f45 (diff) | |
Merge tag 'upstream/3.0.2'
Upstream version 3.0.2
# gpg: Signature made Fri 30 Jan 2015 05:00:11 PM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.org>"
# gpg: aka "Unit 193 <unit193@ubuntu.com>"
Diffstat (limited to 'SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.ui')
| -rw-r--r-- | SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.ui | 45 |
1 files changed, 36 insertions, 9 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.ui b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.ui index b0d598b..51d5503 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.ui +++ b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.ui @@ -11,10 +11,19 @@ </rect> </property> <property name="windowTitle"> - <string>SQL editor</string> + <string notr="true">SQL editor</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> - <property name="margin"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> <number>0</number> </property> <item> @@ -42,7 +51,16 @@ </widget> <widget class="QWidget" name="resultsContainer" native="true"> <layout class="QVBoxLayout" name="verticalLayout_5"> - <property name="margin"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> <number>0</number> </property> </layout> @@ -59,7 +77,16 @@ <item> <widget class="QWidget" name="resultsFrame" native="true"> <layout class="QVBoxLayout" name="verticalLayout_6"> - <property name="margin"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> <number>0</number> </property> <item> @@ -116,6 +143,11 @@ </widget> <customwidgets> <customwidget> + <class>SqlView</class> + <extends>QPlainTextEdit</extends> + <header>sqlview.h</header> + </customwidget> + <customwidget> <class>DataView</class> <extends>QTabWidget</extends> <header>dataview.h</header> @@ -126,11 +158,6 @@ <extends>QPlainTextEdit</extends> <header>sqleditor.h</header> </customwidget> - <customwidget> - <class>SqlView</class> - <extends>QPlainTextEdit</extends> - <header>sqlview.h</header> - </customwidget> </customwidgets> <resources/> <connections/> |
