diff options
Diffstat (limited to 'SQLiteStudio3/guiSQLiteStudio/windows')
8 files changed, 125 insertions, 62 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.ui b/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.ui index 98e7ddb..97c4e0a 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.ui +++ b/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.ui @@ -101,27 +101,7 @@ <property name="bottomMargin"> <number>0</number> </property> - <item row="1" column="0"> - <widget class="QLineEdit" name="nameEdit"/> - </item> - <item row="0" column="0"> - <widget class="QLabel" name="nameLabel"> - <property name="text"> - <string>Collation name:</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QComboBox" name="langCombo"/> - </item> - <item row="0" column="1"> - <widget class="QLabel" name="langLabel"> - <property name="text"> - <string>Implementation language:</string> - </property> - </widget> - </item> - <item row="2" column="0" colspan="2"> + <item row="3" column="0" colspan="2"> <widget class="QWidget" name="rightBottomWidget" native="true"> <layout class="QVBoxLayout" name="verticalLayout_5"> <property name="leftMargin"> @@ -196,6 +176,41 @@ </layout> </widget> </item> + <item row="0" column="0" colspan="2"> + <widget class="QWidget" name="widget" native="true"> + <layout class="QGridLayout" name="gridLayout_2"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item row="0" column="0"> + <widget class="QLabel" name="nameLabel"> + <property name="text"> + <string>Collation name:</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLineEdit" name="nameEdit"/> + </item> + <item row="0" column="1"> + <widget class="QLabel" name="langLabel"> + <property name="text"> + <string>Implementation language:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QComboBox" name="langCombo"/> + </item> + </layout> + </widget> + </item> </layout> </widget> </widget> diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp index c494702..30fe07b 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp @@ -24,6 +24,7 @@ #include <QStringListModel> #include <QActionGroup> #include <QMessageBox> +#include <themetuner.h> CFG_KEYS_DEFINE(EditorWindow) EditorWindow::ResultsDisplayMode EditorWindow::resultsDisplayMode; @@ -87,6 +88,12 @@ void EditorWindow::init() setFocusProxy(ui->sqlEdit); updateResultsDisplayMode(); + THEME_TUNER->manageCompactLayout({ + ui->query, + ui->results, + ui->history + }); + resultsModel = new SqlQueryModel(this); ui->dataView->init(resultsModel); @@ -365,6 +372,7 @@ void EditorWindow::createActions() createAction(CREATE_VIEW_FROM_QUERY, ICONS.VIEW_ADD, tr("Create view from query", "sql editor"), this, SLOT(createViewFromQuery()), ui->toolBar); ui->toolBar->addSeparator(); ui->toolBar->addAction(ui->sqlEdit->getAction(SqlEditor::SAVE_SQL_FILE)); + attachActionInMenu(ui->sqlEdit->getAction(SqlEditor::SAVE_SQL_FILE), ui->sqlEdit->getAction(SqlEditor::SAVE_AS_SQL_FILE), ui->toolBar); ui->toolBar->addAction(ui->sqlEdit->getAction(SqlEditor::OPEN_SQL_FILE)); ui->toolBar->addSeparator(); actionMap[CURRENT_DB] = ui->toolBar->addWidget(dbCombo); diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.ui b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.ui index 51d5503..924f895 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.ui +++ b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.ui @@ -14,6 +14,9 @@ <string notr="true">SQL editor</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> + <property name="spacing"> + <number>0</number> + </property> <property name="leftMargin"> <number>0</number> </property> diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.ui b/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.ui index 45d291d..b99efe1 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.ui +++ b/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.ui @@ -145,37 +145,7 @@ <property name="bottomMargin"> <number>0</number> </property> - <item row="0" column="0"> - <widget class="QLabel" name="nameLabel"> - <property name="text"> - <string>Function name:</string> - </property> - </widget> - </item> - <item row="2" column="2"> - <widget class="QComboBox" name="typeCombo"/> - </item> - <item row="0" column="3"> - <widget class="QLabel" name="langLabel"> - <property name="text"> - <string>Implementation language:</string> - </property> - </widget> - </item> - <item row="2" column="0" colspan="2"> - <widget class="QLineEdit" name="nameEdit"/> - </item> - <item row="0" column="2"> - <widget class="QLabel" name="typeLabel"> - <property name="text"> - <string>Type:</string> - </property> - </widget> - </item> - <item row="2" column="3"> - <widget class="QComboBox" name="langCombo"/> - </item> - <item row="4" column="0"> + <item row="5" column="0"> <widget class="QGroupBox" name="argsGroup"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> @@ -223,7 +193,7 @@ </layout> </widget> </item> - <item row="4" column="1" colspan="3"> + <item row="5" column="1" colspan="3"> <widget class="QGroupBox" name="databasesGroup"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> @@ -265,6 +235,51 @@ </layout> </widget> </item> + <item row="0" column="0" colspan="4"> + <widget class="QWidget" name="widget" native="true"> + <layout class="QGridLayout" name="gridLayout_3"> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item row="0" column="1"> + <widget class="QLabel" name="typeLabel"> + <property name="text"> + <string>Type:</string> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="nameLabel"> + <property name="text"> + <string>Function name:</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QLineEdit" name="nameEdit"/> + </item> + <item row="1" column="1"> + <widget class="QComboBox" name="typeCombo"/> + </item> + <item row="0" column="2"> + <widget class="QLabel" name="langLabel"> + <property name="text"> + <string>Implementation language:</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QComboBox" name="langCombo"/> + </item> + </layout> + </widget> + </item> </layout> </widget> <widget class="QGroupBox" name="initCodeGroup"> @@ -329,9 +344,6 @@ <tabstops> <tabstop>functionFilterEdit</tabstop> <tabstop>list</tabstop> - <tabstop>nameEdit</tabstop> - <tabstop>typeCombo</tabstop> - <tabstop>langCombo</tabstop> <tabstop>undefArgsCheck</tabstop> <tabstop>argsList</tabstop> <tabstop>allDatabasesRadio</tabstop> diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp index 3a315db..02a1052 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp @@ -33,6 +33,9 @@ #include "services/importmanager.h" #include "dbobjectdialogs.h" #include "dialogs/exportdialog.h" +#include "themetuner.h" +#include "dialogs/importdialog.h" +#include "dialogs/populatedialog.h" #include <QMenu> #include <QToolButton> #include <QLabel> @@ -43,8 +46,6 @@ #include <QPushButton> #include <QDebug> #include <QStyleFactory> -#include <dialogs/importdialog.h> -#include <dialogs/populatedialog.h> // TODO extend QTableView for columns and constraints, so they show full-row-width drop indicator, // instead of single column drop indicator. @@ -171,6 +172,16 @@ void TableWindow::init() connect(structureExecutor, SIGNAL(success()), this, SLOT(changesSuccessfullyCommited())); connect(structureExecutor, SIGNAL(failure(int,QString)), this, SLOT(changesFailedToCommit(int,QString))); + THEME_TUNER->manageCompactLayout({ + ui->structureTab, + ui->constraintsWidget, + ui->dataTab, + ui->constraintsTab, + ui->indexesTab, + ui->triggersTab, + ui->ddlTab + }); + setupCoverWidget(); updateAfterInit(); } diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.ui b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.ui index f1fe409..0dd7fe6 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.ui +++ b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.ui @@ -43,7 +43,7 @@ <widget class="QWidget" name="structureTopBar" native="true"> <layout class="QHBoxLayout" name="horizontalLayout_2"> <property name="leftMargin"> - <number>0</number> + <number>4</number> </property> <property name="topMargin"> <number>0</number> @@ -52,7 +52,7 @@ <number>0</number> </property> <property name="bottomMargin"> - <number>0</number> + <number>2</number> </property> <item> <widget class="QLabel" name="tableNameLabel"> @@ -99,6 +99,9 @@ <property name="orientation"> <enum>Qt::Vertical</enum> </property> + <property name="handleWidth"> + <number>2</number> + </property> <property name="childrenCollapsible"> <bool>false</bool> </property> @@ -130,6 +133,9 @@ </widget> <widget class="QWidget" name="constraintsWidget" native="true"> <layout class="QVBoxLayout" name="verticalLayout"> + <property name="spacing"> + <number>0</number> + </property> <property name="leftMargin"> <number>0</number> </property> diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp index 9a30e1c..cb3a11e 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp @@ -20,6 +20,7 @@ #include "uiconfig.h" #include "services/config.h" #include "services/codeformatter.h" +#include "themetuner.h" #include <QPushButton> #include <QProgressBar> #include <QDebug> @@ -204,6 +205,13 @@ void ViewWindow::init() { ui->setupUi(this); + THEME_TUNER->manageCompactLayout({ + ui->queryTab, + ui->dataTab, + ui->triggersTab, + ui->ddl + }); + dataModel = new SqlQueryModel(this); ui->dataView->init(dataModel); diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.ui b/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.ui index 94f5ea7..0fdccc3 100644 --- a/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.ui +++ b/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.ui @@ -43,7 +43,7 @@ <widget class="QWidget" name="nameWidget" native="true"> <layout class="QHBoxLayout" name="horizontalLayout"> <property name="leftMargin"> - <number>0</number> + <number>4</number> </property> <property name="topMargin"> <number>0</number> @@ -52,7 +52,7 @@ <number>0</number> </property> <property name="bottomMargin"> - <number>0</number> + <number>2</number> </property> <item> <widget class="QLabel" name="nameLabel"> |