Skip to content
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

Enhancements to About dialog and add settings button to toolbar #2214

Merged
merged 1 commit into from
Aug 21, 2018
+211 −73
Merged

Enhancements to About dialog and add settings button to toolbar #2214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 54 additions & 0 deletions share/about-contributors.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<h3>VIP Patreon Supporters:</h3>
<ul>
<li>John Cook</li>
<li>Max Anderson</li>
</ul>
<h3>Notable Code Contributions:</h3>
<ul>
<li>droidmonkey</li>
<li>phoerious</li>
<li>TheZ3ro</li>
<li>louib</li>
<li>weslly</li>
<li>varjolintu (KeePassXC-Browser)</li>
<li>hifi (SSH Agent)</li>
<li>frostasm</li>
<li>fonic (Entry Table View)</li>
<li>kylemanna (YubiKey)</li>
<li>keithbennett (KeePassHTTP)</li>
<li>Typz (KeePassHTTP)</li>
<li>denk-mal (KeePassHTTP)</li>
<li>angelsl (KDBX 4)</li>
<li>seatedscribe (CSV Import)</li>
<li>debfx (KeePassX)</li>
<li>BlueIce (KeePassX)</li>
</ul>
<h3>Patreon Supporters:</h3>
<ul>
<li>Ashura</li>
<li>Alexanderjb</li>
<li>Andreas Kollmann</li>
<li>Richard Ames</li>
</ul>
<h3>Translations:</h3>
<ul>
<li><strong>Basque</strong>: azken_tximinoa, Hey_neken</li>
<li><strong>Catalan</strong>: capitantrueno, dsoms, mcus, raulua, ZJaume</li>
<li><strong>Chinese (China)</strong>: Biggulu, Brandon_c, hoilc, ligyxy, vc5, Small_Ku</li>
<li><strong>Chinese (Taiwan)</strong>: BestSteve, MiauLightouch, Small_Ku, yan12125, ymhuang0808</li>
<li><strong>Czech</strong>: DanielMilde, JosefVitu, pavelb, tpavelek</li>
<li><strong>Danish</strong>: nlkl</li>
<li><strong>Dutch</strong>: apie, bartlibert, evanoosten, fvw, KnooL, srgvg, Vistaus, wanderingidea</li>
<li><strong>Finnish</strong>: artnay, Jarppi, MawKKe</li>
<li><strong>French</strong>: A1RO, aghilas.messara, bisaloo, frgnca, ggtr1138, gilbsgilbs, gtalbot, Gui13, iannick, jlutran, kyodev, logut, MartialBis, narzb, pBouillon, plunkets, Raphi111, Scrat15, tl_pierre, wilfriedroset</li>
<li><strong>German</strong>: antsas, BasicBaer, Calyrx, codejunky, DavidHamburg, eth0, for1real, jensrutschmann, joe776, kflesch, MarcEdinger, marcbone, mcliquid, mfernau77, montilo, nursoda, omnisome4, origin_de, pcrcoding, phoerious, rgloor, transi_222, vlenzer, waster</li>
<li><strong>Greek</strong>: magkopian, nplatis, tassos.b, xinomilo</li>
<li><strong>Hungarian</strong>: bubu, meskobalazs, urbalazs</li>
<li><strong>Indonesian</strong>: zk</li>
<li><strong>Italian</strong>: amaxis, bovirus, duncanmid, FranzMari, lucaim, Mte90, Peo, TheZ3ro, tosky, VosaxAlo</li>
<li><strong>Japanese</strong>: masoo, metalic_cat, p2635, Shinichirou_Yamada, vargas.peniel, vmemjp, yukinakato</li>
<li><strong>Korean</strong>: cancantun, peremen</li>
<li><strong>Lithuanian</strong>: Moo</li>
<li><strong>Polish</strong>: keypress, konradmb, mrerexx, psobczak</li>
<li><strong>Portuguese (Brazil)</strong>: danielbibit, fabiom, flaviobn, vitor895, weslly</li>
</ul>
14 changes: 14 additions & 0 deletions share/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<p>Website: <a href="https://keepassxc.org/" style="text-decoration: underline">https://keepassxc.org</a></p>
<p>Report bugs at: <a href="https://github.com/keepassxreboot/keepassxc/issues">https://github.com</a></p>
<p>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</p>
<h3>Project Maintainers:</h3>
<ul>
<li>Jonathan White (<a href="https://github.com/droidmonkey">droidmonkey</a>)</li>
<li>Janek Bevendorff (<a href="https://github.com/phoerious">phoerious</a>)</li>
<li><a href="https://github.com/TheZ3ro">TheZ3ro</a></li>
<li>Louis-Bertrand (<a href="https://github.com/louib">louib</a>)</li>
<li>Weslly Honorato (<a href="https://github.com/weslly">weslly</a>)</li>
<li>Toni Spets (<a href="https://github.com/hifi">hifi</a>)</li>
<li>Sami V&auml;nttinen (<a href="https://github.com/varjolintu">varjolintu</a>)</li>
</ul>
<p>Special thanks from the KeePassXC team go to <a href="https://github.com/debfx">debfx</a> for creating the original KeePassX.</p>
144 changes: 87 additions & 57 deletions src/gui/AboutDialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
<ui version="4.0">
<class>AboutDialog</class>
<widget class="QDialog" name="AboutDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>510</width>
<height>443</height>
</rect>
</property>
<property name="windowTitle">
<string>About KeePassXC</string>
</property>
Expand Down Expand Up @@ -68,7 +76,7 @@
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="tab">
<widget class="QWidget" name="aboutTab">
<attribute name="title">
<string>About</string>
</attribute>
Expand Down Expand Up @@ -164,13 +172,21 @@
</property>
<property name="text">
<string notr="true">&lt;ul&gt;
&lt;li&gt;droidmonkey&lt;/li&gt;
&lt;li&gt;phoerious&lt;/li&gt;
&lt;li&gt;TheZ3ro&lt;/li&gt;
&lt;li&gt;louib&lt;/li&gt;
&lt;li&gt;weslly&lt;/li&gt;
&lt;li&gt;Jonathan White (&lt;a href=&quot;https://github.com/droidmonkey&quot;&gt;droidmonkey&lt;/a&gt;)&lt;/li&gt;
&lt;li&gt;Janek Bevendorff (&lt;a href=&quot;https://github.com/phoerious&quot;&gt;phoerious&lt;/a&gt;)&lt;/li&gt;
&lt;li&gt;&lt;a href=&quot;https://github.com/TheZ3ro&quot;&gt;TheZ3ro&lt;/a&gt;&lt;/li&gt;
&lt;li&gt;Louis-Bertrand (&lt;a href=&quot;https://github.com/louib&quot;&gt;louib&lt;/a&gt;)&lt;/li&gt;
&lt;li&gt;Weslly Honorato (&lt;a href=&quot;https://github.com/weslly&quot;&gt;weslly&lt;/a&gt;)&lt;/li&gt;
&lt;li&gt;Toni Spets (&lt;a href=&quot;https://github.com/hifi&quot;&gt;hifi&lt;/a&gt;)&lt;/li&gt;
&lt;li&gt;Sami V&amp;auml;nttinen (&lt;a href=&quot;https://github.com/varjolintu&quot;&gt;varjolintu&lt;/a&gt;)&lt;/li&gt;
&lt;/ul&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
</property>
</widget>
</item>
<item>
Expand All @@ -187,6 +203,9 @@
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
</property>
</widget>
</item>
<item>
Expand All @@ -204,7 +223,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_3">
<widget class="QWidget" name="contribTab">
<attribute name="title">
<string>Contributors</string>
</attribute>
Expand All @@ -220,7 +239,7 @@
<x>0</x>
<y>0</y>
<width>449</width>
<height>803</height>
<height>845</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
Expand All @@ -236,63 +255,74 @@
<cursorShape>IBeamCursor</cursorShape>
</property>
<property name="text">
<string notr="true">&lt;h3&gt;Notable Code Contributions:&lt;/h3&gt;
<string notr="true">&lt;h3&gt;VIP Patreon Supporters:&lt;/h3&gt;
&lt;ul&gt;
&lt;li&gt;droidmonkey&lt;/li&gt;
&lt;li&gt;phoerious&lt;/li&gt;
&lt;li&gt;TheZ3ro&lt;/li&gt;
&lt;li&gt;louib&lt;/li&gt;
&lt;li &gt;weslly&lt;/li&gt;
&lt;li&gt;varjolintu (KeePassXC-Browser)&lt;/li&gt;
&lt;li&gt;hifi (SSH Agent)&lt;/li&gt;
&lt;li&gt;frostasm&lt;/li&gt;
&lt;li&gt;fonic (Entry Table View)&lt;/li&gt;
&lt;li&gt;kylemanna (YubiKey)&lt;/li&gt;
&lt;li&gt;keithbennett (KeePassHTTP)&lt;/li&gt;
&lt;li&gt;Typz (KeePassHTTP)&lt;/li&gt;
&lt;li&gt;denk-mal (KeePassHTTP)&lt;/li&gt;
&lt;li&gt;angelsl (KDBX 4)&lt;/li&gt;
&lt;li&gt;seatedscribe (CSV Import)&lt;/li&gt;
&lt;li&gt;debfx (KeePassX)&lt;/li&gt;
&lt;li&gt;BlueIce (KeePassX)&lt;/li&gt;
&lt;li&gt;John Cook&lt;/li&gt;
&lt;li&gt;Max Anderson&lt;/li&gt;
&lt;/ul&gt;
&lt;h3&gt;Notable Code Contributions:&lt;/h3&gt;
&lt;ul&gt;
&lt;li&gt;droidmonkey&lt;/li&gt;
&lt;li&gt;phoerious&lt;/li&gt;
&lt;li&gt;TheZ3ro&lt;/li&gt;
&lt;li&gt;louib&lt;/li&gt;
&lt;li&gt;weslly&lt;/li&gt;
&lt;li&gt;varjolintu (KeePassXC-Browser)&lt;/li&gt;
&lt;li&gt;hifi (SSH Agent)&lt;/li&gt;
&lt;li&gt;frostasm&lt;/li&gt;
&lt;li&gt;fonic (Entry Table View)&lt;/li&gt;
&lt;li&gt;kylemanna (YubiKey)&lt;/li&gt;
&lt;li&gt;keithbennett (KeePassHTTP)&lt;/li&gt;
&lt;li&gt;Typz (KeePassHTTP)&lt;/li&gt;
&lt;li&gt;denk-mal (KeePassHTTP)&lt;/li&gt;
&lt;li&gt;angelsl (KDBX 4)&lt;/li&gt;
&lt;li&gt;seatedscribe (CSV Import)&lt;/li&gt;
&lt;li&gt;debfx (KeePassX)&lt;/li&gt;
&lt;li&gt;BlueIce (KeePassX)&lt;/li&gt;
&lt;/ul&gt;
&lt;h3&gt;Patreon Supporters:&lt;/h3&gt;
&lt;ul&gt;
&lt;li&gt;Ashura&lt;/li&gt;
&lt;li&gt;Alexanderjb&lt;/li&gt;
&lt;li&gt;Andreas Kollmann&lt;/li&gt;
&lt;li&gt;Richard Ames&lt;/li&gt;
&lt;/ul&gt;

&lt;h3&gt;Translations:&lt;/h3&gt;
&lt;ul&gt;
&lt;li&gt;&lt;b&gt;Basque:&lt;/b&gt; azken_tximinoa, Hey_neken&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Catalan:&lt;/b&gt; capitantrueno, dsoms, mcus, raulua, ZJaume&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Chinese (China):&lt;/b&gt; Biggulu, Brandon_c, hoilc, ligyxy, vc5, Small_Ku&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Chinese (Taiwan):&lt;/b&gt; BestSteve, MiauLightouch, Small_Ku, yan12125, ymhuang0808&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Czech:&lt;/b&gt; DanielMilde, JosefVitu, pavelb, tpavelek&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Danish:&lt;/b&gt; nlkl&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Dutch:&lt;/b&gt; apie, bartlibert, evanoosten, fvw, KnooL, srgvg, Vistaus, wanderingidea&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Finnish:&lt;/b&gt; artnay, Jarppi, MawKKe &lt;/li&gt;
&lt;li&gt;&lt;b&gt;French:&lt;/b&gt; A1RO, aghilas.messara, bisaloo, frgnca, ggtr1138, gilbsgilbs, gtalbot, Gui13, iannick, jlutran, kyodev, logut, MartialBis, narzb, pBouillon, plunkets, Raphi111, Scrat15, tl_pierre, wilfriedroset&lt;/li&gt;
&lt;li&gt;&lt;b&gt;German:&lt;/b&gt; antsas, BasicBaer, Calyrx, codejunky, DavidHamburg, eth0, for1real, jensrutschmann, joe776, kflesch, MarcEdinger, marcbone, mcliquid, mfernau77, montilo, nursoda, omnisome4, origin_de, pcrcoding, phoerious, rgloor, transi_222, vlenzer, waster&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Greek:&lt;/b&gt; magkopian, nplatis, tassos.b, xinomilo&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Hungarian:&lt;/b&gt; bubu, meskobalazs, urbalazs&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Indonesian:&lt;/b&gt; zk&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Italian:&lt;/b&gt; amaxis, bovirus, duncanmid, FranzMari, lucaim, Mte90, Peo, TheZ3ro, tosky, VosaxAlo&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Japanese:&lt;/b&gt; masoo, metalic_cat, p2635, Shinichirou_Yamada, vargas.peniel, vmemjp, yukinakato&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Korean:&lt;/b&gt; cancantun, peremen&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Lithuanian:&lt;/b&gt; Moo&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Polish:&lt;/b&gt; keypress, konradmb, mrerexx, psobczak&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Portuguese (Brazil): &lt;/b&gt; danielbibit, fabiom, flaviobn, vitor895, weslly&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Portuguese (Portugal): &lt;/b&gt; American_Jesus, hds, mihai.ile, VictorR2007, smarquespt&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Russian:&lt;/b&gt; _nomoretears_, agag11507, anm, denoos, KekcuHa, Mogost, NcNZllQnHVU, netforhack, NetWormKido, RKuchma, VictorR2007, vsvyatski, wkill95&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Spanish:&lt;/b&gt; antifaz, EdwardNavarro, eliluminado, gonrial, jojobrambs, LeoBeltran, piegope, pquin, puchrojo, vargas.peniel, vsvyatski, Zranz&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Swedish:&lt;/b&gt; Anders_Bergqvist, LIINdd, henziger, jpyllman, peron&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Thai:&lt;/b&gt; arthit&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Turkish:&lt;/b&gt; etc, N3pp&lt;/li&gt;
&lt;li&gt;&lt;b&gt;Ukrainian:&lt;/b&gt; brisk022, netforhack, zoresvit&lt;/li&gt;
&lt;/ul&gt;</string>
&lt;li&gt;&lt;strong&gt;Basque&lt;/strong&gt;: azken_tximinoa, Hey_neken&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Catalan&lt;/strong&gt;: capitantrueno, dsoms, mcus, raulua, ZJaume&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Chinese (China)&lt;/strong&gt;: Biggulu, Brandon_c, hoilc, ligyxy, vc5, Small_Ku&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Chinese (Taiwan)&lt;/strong&gt;: BestSteve, MiauLightouch, Small_Ku, yan12125, ymhuang0808&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Czech&lt;/strong&gt;: DanielMilde, JosefVitu, pavelb, tpavelek&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Danish&lt;/strong&gt;: nlkl&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Dutch&lt;/strong&gt;: apie, bartlibert, evanoosten, fvw, KnooL, srgvg, Vistaus, wanderingidea&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Finnish&lt;/strong&gt;: artnay, Jarppi, MawKKe&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;French&lt;/strong&gt;: A1RO, aghilas.messara, bisaloo, frgnca, ggtr1138, gilbsgilbs, gtalbot, Gui13, iannick, jlutran, kyodev, logut, MartialBis, narzb, pBouillon, plunkets, Raphi111, Scrat15, tl_pierre, wilfriedroset&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;German&lt;/strong&gt;: antsas, BasicBaer, Calyrx, codejunky, DavidHamburg, eth0, for1real, jensrutschmann, joe776, kflesch, MarcEdinger, marcbone, mcliquid, mfernau77, montilo, nursoda, omnisome4, origin_de, pcrcoding, phoerious, rgloor, transi_222, vlenzer, waster&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Greek&lt;/strong&gt;: magkopian, nplatis, tassos.b, xinomilo&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Hungarian&lt;/strong&gt;: bubu, meskobalazs, urbalazs&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Indonesian&lt;/strong&gt;: zk&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Italian&lt;/strong&gt;: amaxis, bovirus, duncanmid, FranzMari, lucaim, Mte90, Peo, TheZ3ro, tosky, VosaxAlo&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Japanese&lt;/strong&gt;: masoo, metalic_cat, p2635, Shinichirou_Yamada, vargas.peniel, vmemjp, yukinakato&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Korean&lt;/strong&gt;: cancantun, peremen&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Lithuanian&lt;/strong&gt;: Moo&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Polish&lt;/strong&gt;: keypress, konradmb, mrerexx, psobczak&lt;/li&gt;
&lt;li&gt;&lt;strong&gt;Portuguese (Brazil)&lt;/strong&gt;: danielbibit, fabiom, flaviobn, vitor895, weslly&lt;/li&gt;
&lt;/ul&gt;
</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
<enum>Qt::AutoText</enum>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<property name="margin">
<number>5</number>
</property>
<property name="textInteractionFlags">
<set>Qt::TextBrowserInteraction</set>
</property>
Expand All @@ -303,7 +333,7 @@
</widget>
</item>
<item>
<widget class="QLabel" name="label_6">
<widget class="QLabel" name="seeContributions">
<property name="text">
<string>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</string>
</property>
Expand All @@ -317,7 +347,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
<widget class="QWidget" name="debugTab">
<attribute name="title">
<string>Debug Info</string>
</attribute>
Expand Down
31 changes: 26 additions & 5 deletions src/gui/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <QMimeData>
#include <QShortcut>
#include <QTimer>
#include <QDesktopServices>

#include "config-keepassx.h"

Expand Down Expand Up @@ -389,7 +390,7 @@ MainWindow::MainWindow()
m_actionMultiplexer.connect(m_ui->actionGroupEmptyRecycleBin, SIGNAL(triggered()),
SLOT(emptyRecycleBin()));

connect(m_ui->actionSettings, SIGNAL(triggered()), SLOT(switchToSettings()));
connect(m_ui->actionSettings, SIGNAL(toggled(bool)), SLOT(switchToSettings(bool)));
connect(m_ui->actionPasswordGenerator, SIGNAL(toggled(bool)), SLOT(switchToPasswordGen(bool)));
connect(m_ui->passwordGeneratorWidget, SIGNAL(dialogTerminated()), SLOT(closePasswordGen()));

Expand All @@ -400,6 +401,8 @@ MainWindow::MainWindow()
connect(m_ui->welcomeWidget, SIGNAL(importCsv()), SLOT(switchToImportCsv()));

connect(m_ui->actionAbout, SIGNAL(triggered()), SLOT(showAboutDialog()));
connect(m_ui->actionDonate, SIGNAL(triggered()), SLOT(openDonateUrl()));
connect(m_ui->actionBugReport, SIGNAL(triggered()), SLOT(openBugReportUrl()));

#ifdef Q_OS_MAC
setUnifiedTitleAndToolBarOnMac(true);
Expand Down Expand Up @@ -662,6 +665,10 @@ void MainWindow::setMenuActionState(DatabaseWidget::Mode mode)
bool blocked = m_ui->actionPasswordGenerator->blockSignals(true);
m_ui->actionPasswordGenerator->toggle();
m_ui->actionPasswordGenerator->blockSignals(blocked);
} else if ((currentIndex == SettingsScreen) != m_ui->actionSettings->isChecked()) {
bool blocked = m_ui->actionSettings->blockSignals(true);
m_ui->actionSettings->toggle();
m_ui->actionSettings->blockSignals(blocked);
}
}

Expand Down Expand Up @@ -710,6 +717,16 @@ void MainWindow::showAboutDialog()
aboutDialog->open();
}

void MainWindow::openDonateUrl()
{
QDesktopServices::openUrl(QUrl("https://keepassxc.org/donate"));
}

void MainWindow::openBugReportUrl()
{
QDesktopServices::openUrl(QUrl("https://github.com/keepassxreboot/keepassxc/issues"));
}

void MainWindow::switchToDatabases()
{
if (m_ui->tabWidget->currentIndex() == -1) {
Expand All @@ -720,15 +737,19 @@ void MainWindow::switchToDatabases()
}
}

void MainWindow::switchToSettings()
void MainWindow::switchToSettings(bool enabled)
{
m_ui->settingsWidget->loadSettings();
m_ui->stackedWidget->setCurrentIndex(SettingsScreen);
if (enabled) {
m_ui->settingsWidget->loadSettings();
m_ui->stackedWidget->setCurrentIndex(SettingsScreen);
} else {
switchToDatabases();
}
}

void MainWindow::switchToPasswordGen(bool enabled)
{
if (enabled == true) {
if (enabled) {
m_ui->passwordGeneratorWidget->loadSettings();
m_ui->passwordGeneratorWidget->regeneratePassword();
m_ui->passwordGeneratorWidget->setStandaloneMode(true);
Expand Down
4 changes: 3 additions & 1 deletion src/gui/MainWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,10 @@ private slots:
void setMenuActionState(DatabaseWidget::Mode mode = DatabaseWidget::None);
void updateWindowTitle();
void showAboutDialog();
void openDonateUrl();
void openBugReportUrl();
void switchToDatabases();
void switchToSettings();
void switchToSettings(bool enabled);
void switchToPasswordGen(bool enabled);
void switchToNewDatabase();
void switchToOpenDatabase();
Expand Down
Loading