Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Allow the user can change MaxRecentFiles #2373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MKleusberg merged 4 commits into from
Aug 17, 2020
Merged

Allow the user can change MaxRecentFiles #2373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77ee448
Add spin box for max recent files
Aug 15, 2020
e93f8f1
Set default value for max recent files
Aug 15, 2020
37fe028
Implement handling of max recent files value
Aug 15, 2020
ceb33ae
Add separator to separate the recent file list and the clear list action
Aug 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions 43 src/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

#include <limits>

const int MainWindow::MaxRecentFiles;
int MainWindow::MaxRecentFiles;

MainWindow::MainWindow(QWidget* parent)
: QMainWindow(parent),
Expand Down Expand Up @@ -213,6 +213,10 @@ void MainWindow::init()
QShortcut* shortcutFocusEditor = new QShortcut(QKeySequence(tr("Ctrl+PgUp")), ui->tabSqlAreas, nullptr, nullptr, Qt::WidgetWithChildrenShortcut);
connect(shortcutFocusEditor, &QShortcut::activated, this, &MainWindow::focusSqlEditor);

// Get MaxRecentFiles value from QSettings.
MaxRecentFiles = Settings::getValue("General", "maxRecentFiles").toInt();
recentFileActs.resize(MaxRecentFiles);

// Create the actions for the recently opened dbs list
for(int i = 0; i < MaxRecentFiles; ++i) {
recentFileActs[i] = new QAction(this);
Expand All @@ -222,7 +226,8 @@ void MainWindow::init()
for(int i = 0; i < MaxRecentFiles; ++i)
ui->fileRecentFiles->insertAction(ui->fileExitAction, recentFileActs[i]);

QAction *clearRecentFilesAction = ui->fileRecentFiles->addAction(tr("Clear List"));
recentSeparatorAct = ui->fileRecentFiles->insertSeparator(ui->fileExitAction);
clearRecentFilesAction = ui->fileRecentFiles->addAction(tr("Clear List"));
ui->fileRecentFiles->insertAction(ui->fileExitAction, clearRecentFilesAction);
connect(clearRecentFilesAction, &QAction::triggered, this, &MainWindow::clearRecentFiles);

Expand Down Expand Up @@ -2154,6 +2159,40 @@ void MainWindow::reloadSettings()
w->reloadSettings();
}

// Set max recent files
const int newMaxRecentFiles = Settings::getValue("General", "maxRecentFiles").toInt();

if(MaxRecentFiles < newMaxRecentFiles) {
// If user increase max recent files value.
ui->fileRecentFiles->removeAction(clearRecentFilesAction);

recentFileActs.resize(newMaxRecentFiles);
for(int i = MaxRecentFiles; i < newMaxRecentFiles; ++i) {
recentFileActs[i] = new QAction(this);
recentFileActs[i]->setVisible(false);
connect(recentFileActs[i], &QAction::triggered, this, &MainWindow::openRecentFile);
}

for(int i = 0; i < newMaxRecentFiles; ++i)
ui->fileRecentFiles->insertAction(ui->fileExitAction, recentFileActs[i]);

ui->fileRecentFiles->insertSeparator(ui->fileExitAction);
ui->fileRecentFiles->insertAction(ui->fileExitAction, clearRecentFilesAction);

MaxRecentFiles = newMaxRecentFiles;
updateRecentFileActions();
} else if (MaxRecentFiles > newMaxRecentFiles) {
// If user decrease max recent files value.
for(int i = (MaxRecentFiles - 1); i >= newMaxRecentFiles; --i) {
ui->fileRecentFiles->removeAction(recentFileActs[i]);
delete recentFileActs[i];
}

recentFileActs.resize(newMaxRecentFiles);
MaxRecentFiles = newMaxRecentFiles;
updateRecentFileActions();
}

switch (static_cast<Settings::AppStyle>(Settings::getValue("General", "appStyle").toInt())) {
case Settings::FollowDesktopStyle :
qApp->setStyleSheet("");
Expand Down
6 changes: 4 additions & 2 deletions 6 src/MainWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,10 @@ class MainWindow : public QMainWindow

DbStructureModel* dbStructureModel;

static const int MaxRecentFiles = 5;
QAction *recentFileActs[MaxRecentFiles];
static int MaxRecentFiles;
QVector<QAction*> recentFileActs;
QAction* clearRecentFilesAction;
QAction* recentSeparatorAct;

EditDialog* editDock;
PlotDock* plotDock;
Expand Down
2 changes: 2 additions & 0 deletions 2 src/PreferencesDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ void PreferencesDialog::loadSettings()
ui->toolbarStyleComboSql->setCurrentIndex(Settings::getValue("General", "toolbarStyleSql").toInt());
ui->toolbarStyleComboEditCell->setCurrentIndex(Settings::getValue("General", "toolbarStyleEditCell").toInt());
ui->spinGeneralFontSize->setValue(Settings::getValue("General", "fontsize").toInt());
ui->spinMaxRecentFiles->setValue(Settings::getValue("General", "maxRecentFiles").toInt());
}

void PreferencesDialog::saveSettings()
Expand Down Expand Up @@ -337,6 +338,7 @@ void PreferencesDialog::saveSettings()
Settings::setValue("General", "toolbarStyleEditCell", ui->toolbarStyleComboEditCell->currentIndex());
Settings::setValue("General", "DBFileExtensions", m_dbFileExtensions.join(";;") );
Settings::setValue("General", "fontsize", ui->spinGeneralFontSize->value());
Settings::setValue("General", "maxRecentFiles", ui->spinMaxRecentFiles->value());

m_proxyDialog->saveSettings();

Expand Down
53 changes: 35 additions & 18 deletions 53 src/PreferencesDialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>755</width>
<height>618</height>
<height>625</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -122,7 +122,7 @@
</property>
</widget>
</item>
<item row="4" column="0">
<item row="5" column="0">
<widget class="QLabel" name="labelToolbarStyle">
<property name="text">
<string>Toolbar style</string>
Expand All @@ -132,7 +132,7 @@
</property>
</widget>
</item>
<item row="6" column="1">
<item row="7" column="1">
<widget class="QComboBox" name="toolbarStyleComboMain">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
Expand Down Expand Up @@ -182,7 +182,7 @@
</item>
</widget>
</item>
<item row="7" column="1">
<item row="8" column="1">
<widget class="QComboBox" name="toolbarStyleComboStructure">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
Expand Down Expand Up @@ -232,7 +232,7 @@
</item>
</widget>
</item>
<item row="8" column="1">
<item row="9" column="1">
<widget class="QComboBox" name="toolbarStyleComboBrowse">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
Expand Down Expand Up @@ -282,7 +282,7 @@
</item>
</widget>
</item>
<item row="9" column="1">
<item row="10" column="1">
<widget class="QComboBox" name="toolbarStyleComboSql">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
Expand Down Expand Up @@ -332,7 +332,7 @@
</item>
</widget>
</item>
<item row="11" column="0">
<item row="12" column="0">
<widget class="QLabel" name="labelUseRemotes">
<property name="text">
<string>Show remote options</string>
Expand All @@ -342,7 +342,7 @@
</property>
</widget>
</item>
<item row="11" column="1">
<item row="12" column="1">
<widget class="QCheckBox" name="checkUseRemotes">
<property name="text">
<string>enabled</string>
Expand All @@ -352,7 +352,7 @@
</property>
</widget>
</item>
<item row="12" column="0">
<item row="13" column="0">
<widget class="QLabel" name="labelUpdates">
<property name="text">
<string>Automatic &amp;updates</string>
Expand All @@ -362,14 +362,14 @@
</property>
</widget>
</item>
<item row="12" column="1">
<item row="13" column="1">
<widget class="QCheckBox" name="checkUpdates">
<property name="text">
<string>enabled</string>
</property>
</widget>
</item>
<item row="13" column="0">
<item row="14" column="0">
<widget class="QLabel" name="label_16">
<property name="text">
<string>DB file extensions</string>
Expand All @@ -379,14 +379,14 @@
</property>
</widget>
</item>
<item row="13" column="1">
<item row="14" column="1">
<widget class="QPushButton" name="buttonManageFileExtension">
<property name="text">
<string>Manage</string>
</property>
</widget>
</item>
<item row="6" column="0">
<item row="7" column="0">
<widget class="QLabel" name="labelMainToolBar">
<property name="text">
<string>Main Window</string>
Expand All @@ -399,7 +399,7 @@
</property>
</widget>
</item>
<item row="7" column="0">
<item row="8" column="0">
<widget class="QLabel" name="labelStructureToolBar">
<property name="text">
<string>Database Structure</string>
Expand All @@ -412,7 +412,7 @@
</property>
</widget>
</item>
<item row="8" column="0">
<item row="9" column="0">
<widget class="QLabel" name="labelBrowseToolBar">
<property name="text">
<string>Browse Data</string>
Expand All @@ -425,7 +425,7 @@
</property>
</widget>
</item>
<item row="9" column="0">
<item row="10" column="0">
<widget class="QLabel" name="labelSqlToolBar">
<property name="text">
<string>Execute SQL</string>
Expand All @@ -438,7 +438,7 @@
</property>
</widget>
</item>
<item row="10" column="1">
<item row="11" column="1">
<widget class="QComboBox" name="toolbarStyleComboEditCell">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
Expand Down Expand Up @@ -488,7 +488,7 @@
</item>
</widget>
</item>
<item row="10" column="0">
<item row="11" column="0">
<widget class="QLabel" name="labelEditCellToolBar">
<property name="text">
<string>Edit Database Cell</string>
Expand Down Expand Up @@ -565,6 +565,23 @@
<item row="3" column="1">
<widget class="QSpinBox" name="spinGeneralFontSize"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="labelMaxRecentFiles">
<property name="text">
<string>Max Recent Files</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QSpinBox" name="spinMaxRecentFiles">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>40</number>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab">
Expand Down
4 changes: 4 additions & 0 deletions 4 src/Settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,10 @@ QVariant Settings::getDefaultValue(const std::string& group, const std::string&
if(group == "General" && name == "recentFileList")
return QStringList();

// General/maxRecentFiles?
if(group == "General" && name == "maxRecentFiles")
return 5;

// General/language?
if(group == "General" && name == "language")
return QLocale::system().name();
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.