Skip to content

Commit f42b614

Browse files
committed
A bit of polishing of the main window user-interface
Reorder the context menu of the table header and use separators for coherent grouping: column actions, misc and encoding. Set buttons invisible in the DB Structure toolbar when the object is different to the supported ones. Disabling wasn't enough because the logic for changing icon and text wasn't working well for fields and other items. Separate Print from object actions in that same toolbar. New icon for Project Save so it uses the same metaphor (floppy disk) as other save actions. Improved the look in the clear filters icon by editing it in gimp. It had a glitch in the funnel base.
1 parent 071f963 commit f42b614

File tree

5 files changed

+16
-5
lines changed

5 files changed

+16
-5
lines changed

src/MainWindow.cpp

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,13 +233,14 @@ void MainWindow::init()
233233

234234
popupBrowseDataHeaderMenu = new QMenu(this);
235235
popupBrowseDataHeaderMenu->addAction(ui->actionShowRowidColumn);
236+
popupBrowseDataHeaderMenu->addAction(ui->actionHideColumns);
237+
popupBrowseDataHeaderMenu->addAction(ui->actionShowAllColumns);
238+
popupBrowseDataHeaderMenu->addSeparator();
236239
popupBrowseDataHeaderMenu->addAction(ui->actionUnlockViewEditing);
237240
popupBrowseDataHeaderMenu->addAction(ui->actionBrowseTableEditDisplayFormat);
238-
popupBrowseDataHeaderMenu->addAction(ui->actionSetTableEncoding);
239241
popupBrowseDataHeaderMenu->addSeparator();
242+
popupBrowseDataHeaderMenu->addAction(ui->actionSetTableEncoding);
240243
popupBrowseDataHeaderMenu->addAction(ui->actionSetAllTablesEncoding);
241-
popupBrowseDataHeaderMenu->addAction(ui->actionHideColumns);
242-
popupBrowseDataHeaderMenu->addAction(ui->actionShowAllColumns);
243244

244245
QShortcut* dittoRecordShortcut = new QShortcut(QKeySequence("Ctrl+\""), this);
245246
connect(dittoRecordShortcut, &QShortcut::activated, [this]() {
@@ -1744,11 +1745,19 @@ void MainWindow::changeTreeSelection()
17441745
} else if(type == "index") {
17451746
ui->editDeleteObjectAction->setText(tr("Delete Index"));
17461747
ui->editModifyObjectAction->setText(tr("Modify Index"));
1747-
} else {
1748+
} else if(type == "table") {
17481749
ui->editDeleteObjectAction->setText(tr("Delete Table"));
17491750
ui->editModifyObjectAction->setText(tr("Modify Table"));
1751+
} else {
1752+
// Nothing to do for other types. Set the buttons not visible and return.
1753+
ui->editDeleteObjectAction->setVisible(false);
1754+
ui->editModifyObjectAction->setVisible(false);
1755+
return;
17501756
}
17511757

1758+
ui->editDeleteObjectAction->setVisible(true);
1759+
ui->editModifyObjectAction->setVisible(true);
1760+
17521761
// Activate actions
17531762
if(type == "table" || type == "index")
17541763
{

src/MainWindow.ui

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
<addaction name="editCreateIndexAction"/>
5757
<addaction name="editModifyObjectAction"/>
5858
<addaction name="editDeleteObjectAction"/>
59+
<addaction name="separator"/>
5960
<addaction name="actionDbPrint"/>
6061
</widget>
6162
</item>

src/icons/clear_filters.png

-29 Bytes
Loading

src/icons/icons.qrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<file alias="up">bullet_arrow_up.png</file>
3838
<file alias="appicon">sqlitebrowser.png</file>
3939
<file alias="browser_open">internet-web-browser.png</file>
40-
<file alias="project_save">package.png</file>
40+
<file>package.png</file>
4141
<file alias="project_open">package_go.png</file>
4242
<file alias="field_key">page_key.png</file>
4343
<file alias="encryption">key.png</file>
@@ -67,5 +67,6 @@
6767
<file alias="db_attach">database_link.png</file>
6868
<file alias="text_indent">text_indent.png</file>
6969
<file alias="print">printer.png</file>
70+
<file alias="project_save">package_save.png</file>
7071
</qresource>
7172
</RCC>

src/icons/package_save.png

888 Bytes
Loading

0 commit comments

Comments
 (0)