mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-02-11 06:08:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

dbhub: Some UI improvements

Browse Source 
Move the Clone database button to a newly created tool bar in the
DBHub.io tab of the Remote dock.

Transform labels in the Current Database tab into line edit widgets.

Adjust spacings a bit.
This commit is contained in:
Martin Kleusberg
2020-07-21 22:22:16 +02:00
parent 73819f5f5e
commit fa1930135d
2 changed files with 59 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/RemoteDock.cpp
View File

@@ -206,8 +206,8 @@ void RemoteDock::enableButtons()
bool db_opened = mainWindow->getDb().isOpen() && mainWindow->getDb().currentFile() != ":memory:";
bool logged_in = !remoteModel->currentClientCertificate().isEmpty();
ui->buttonCloneDatabase->setEnabled(logged_in);
ui->buttonPushDatabase->setEnabled(db_opened && logged_in);
ui->actionCloneDatabase->setEnabled(logged_in);
ui->actionDatabaseOpenBrowser->setEnabled(db_opened && logged_in);
}
@@ -321,9 +321,9 @@ void RemoteDock::fileOpened(const QString& filename)
currently_opened_file_info.clear();
remoteCommitsModel->clear();
ui->comboDatabaseBranch->clear();
ui->labelDatabaseUser->setText(QString());
ui->labelDatabaseFile->setText(QString());
ui->labelDatabaseBranch->setText(QString());
ui->editDatabaseUser->clear();
ui->editDatabaseFile->clear();
ui->editDatabaseBranch->clear();
// Do nothing if the file name is empty (indicating a closed database) or this is an in-memory database
if(filename.isEmpty() || filename == ":memory:")
@@ -337,9 +337,9 @@ void RemoteDock::fileOpened(const QString& filename)
if(!currently_opened_file_info.file.empty())
{
// Copy information to view
ui->labelDatabaseUser->setText(currently_opened_file_info.user_name());
ui->labelDatabaseFile->setText(QString::fromStdString(currently_opened_file_info.name));
ui->labelDatabaseBranch->setText(QString::fromStdString(currently_opened_file_info.branch));
ui->editDatabaseUser->setText(currently_opened_file_info.user_name());
ui->editDatabaseFile->setText(QString::fromStdString(currently_opened_file_info.name));
ui->editDatabaseBranch->setText(QString::fromStdString(currently_opened_file_info.branch));
// Make sure the current identity matches the identity used to clone this file in the first place.
// A mismatch is possible when the local database file has been opened using a recent files menu item or some similar technique.
@@ -383,7 +383,7 @@ void RemoteDock::showMetadata(const std::vector<RemoteMetadataBranchInfo>& branc
ui->comboDatabaseBranch->addItem(QString::fromStdString(release.name) + " (" + tr("release") + ")", QString::fromStdString(release.commit_id));
for(const auto& tag : tags)
ui->comboDatabaseBranch->addItem(QString::fromStdString(tag.name) + " (" + tr("tag") + ")", QString::fromStdString(tag.commit_id));
ui->comboDatabaseBranch->setCurrentIndex(ui->comboDatabaseBranch->findText(ui->labelDatabaseBranch->text()));
ui->comboDatabaseBranch->setCurrentIndex(ui->comboDatabaseBranch->findText(ui->editDatabaseBranch->text()));
}
void RemoteDock::deleteLocalDatabase(const QModelIndex& index)

94
src/RemoteDock.ui
View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>534</width>
<height>379</height>
<height>387</height>
</rect>
</property>
<property name="windowTitle">
@@ -77,23 +77,6 @@
</property>
</spacer>
</item>
<item>
<widget class="QToolButton" name="buttonCloneDatabase">
<property name="toolTip">
<string>Use this to download a remote database for local editing using a URL as provided on the web page of the database.</string>
</property>
<property name="text">
<string>Clone</string>
</property>
<property name="icon">
<iconset resource="icons/icons.qrc">
<normaloff>:/icons/clone_database</normaloff>:/icons/clone_database</iconset>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="buttonPushDatabase">
<property name="toolTip">
@@ -135,6 +118,17 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QToolBar" name="toolBar_2">
<property name="movable">
<bool>false</bool>
</property>
<property name="floatable">
<bool>false</bool>
</property>
<addaction name="actionCloneDatabase"/>
</widget>
</item>
<item>
<widget class="QTreeView" name="treeRemote">
<property name="whatsThis">
@@ -204,20 +198,23 @@
<string>Clone</string>
</property>
<layout class="QFormLayout" name="formLayout">
<property name="verticalSpacing">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>User</string>
</property>
<property name="buddy">
<cstring>editDatabaseUser</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="labelDatabaseUser">
<property name="text">
<string/>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
<widget class="QLineEdit" name="editDatabaseUser">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
@@ -226,15 +223,15 @@
<property name="text">
<string>Database</string>
</property>
<property name="buddy">
<cstring>editDatabaseFile</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="labelDatabaseFile">
<property name="text">
<string/>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
<widget class="QLineEdit" name="editDatabaseFile">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
@@ -243,15 +240,15 @@
<property name="text">
<string>Branch</string>
</property>
<property name="buddy">
<cstring>editDatabaseBranch</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="labelDatabaseBranch">
<property name="text">
<string/>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
<widget class="QLineEdit" name="editDatabaseBranch">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
@@ -425,10 +422,21 @@
<string>Open the web page for the current database in your browser</string>
</property>
</action>
<action name="actionCloneDatabase">
<property name="icon">
<iconset resource="icons/icons.qrc">
<normaloff>:/icons/clone_database</normaloff>:/icons/clone_database</iconset>
</property>
<property name="text">
<string>Clone from link</string>
</property>
<property name="toolTip">
<string>Use this to download a remote database for local editing using a URL as provided on the web page of the database.</string>
</property>
</action>
</widget>
<tabstops>
<tabstop>comboUser</tabstop>
<tabstop>buttonCloneDatabase</tabstop>
<tabstop>buttonPushDatabase</tabstop>
<tabstop>tabs</tabstop>
<tabstop>treeRemote</tabstop>
@@ -464,8 +472,8 @@
<slot>fetchDatabase(QModelIndex)</slot>
<hints>
<hint type="sourcelabel">
<x>211</x>
<y>75</y>
<x>215</x>
<y>148</y>
</hint>
<hint type="destinationlabel">
<x>204</x>
@@ -522,14 +530,14 @@
</hints>
</connection>
<connection>
<sender>buttonCloneDatabase</sender>
<signal>clicked()</signal>
<sender>actionCloneDatabase</sender>
<signal>triggered()</signal>
<receiver>RemoteDock</receiver>
<slot>fetchDatabase()</slot>
<hints>
<hint type="sourcelabel">
<x>412</x>
<y>15</y>
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>266</x>