Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-07-24 15:25:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Coding style fixes.

Browse source
This commit is contained in:
Felix Geyer 2012-04-25 20:22:55 +02:00
parent 2ac659f408
commit e4bc302d3d
7 changed files with 97 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/gui/DatabaseOpenDialog.cpp
View file

@ -115,7 +115,8 @@ void DatabaseOpenDialog::openDatabase()
accept(); accept();
} }
else { else {
QMessageBox::warning(this, tr("Error"), tr("Unable to open the database.\n%1").arg(reader.errorString())); QMessageBox::warning(this, tr("Error"), tr("Unable to open the database.\n%1")
.arg(reader.errorString()));
m_ui->editPassword->clear(); m_ui->editPassword->clear();
} }
} }
@ -137,7 +138,8 @@ void DatabaseOpenDialog::activateKeyFile()
void DatabaseOpenDialog::setOkButtonEnabled() void DatabaseOpenDialog::setOkButtonEnabled()
{ {
bool enable = m_ui->checkPassword->isChecked() || (m_ui->checkKeyFile->isChecked() && !m_ui->comboKeyFile->currentText().isEmpty()); bool enable = m_ui->checkPassword->isChecked()
|| (m_ui->checkKeyFile->isChecked() && !m_ui->comboKeyFile->currentText().isEmpty());
m_ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(enable); m_ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(enable);
} }

9
src/gui/DatabaseTabWidget.cpp
View file

@ -403,11 +403,14 @@ void DatabaseTabWidget::insertDatabase(Database* db, const DatabaseManagerStruct
int index = databaseIndex(db); int index = databaseIndex(db);
setCurrentIndex(index); setCurrentIndex(index);
connect(db->metadata(), SIGNAL(nameTextChanged(Database*)), SLOT(updateTabName(Database*))); connect(db->metadata(), SIGNAL(nameTextChanged(Database*)),
connect(dbStruct.dbWidget->entryView(), SIGNAL(entrySelectionChanged()), SLOT(emitEntrySelectionChanged())); SLOT(updateTabName(Database*)));
connect(dbStruct.dbWidget->entryView(), SIGNAL(entrySelectionChanged()),
SLOT(emitEntrySelectionChanged()));
connect(dbStruct.dbWidget, SIGNAL(closeRequest()), SLOT(closeDatabase())); connect(dbStruct.dbWidget, SIGNAL(closeRequest()), SLOT(closeDatabase()));
connect(db, SIGNAL(modified()), SLOT(modified())); connect(db, SIGNAL(modified()), SLOT(modified()));
connect(dbStruct.dbWidget, SIGNAL(currentModeChanged(DatabaseWidget::Mode)), this, SIGNAL(currentWidgetModeChanged(DatabaseWidget::Mode))); connect(dbStruct.dbWidget, SIGNAL(currentModeChanged(DatabaseWidget::Mode)),
SIGNAL(currentWidgetModeChanged(DatabaseWidget::Mode)));
} }
DatabaseWidget* DatabaseTabWidget::currentDatabaseWidget() DatabaseWidget* DatabaseTabWidget::currentDatabaseWidget()

8
src/gui/DatabaseWidget.cpp
View file

@ -96,20 +96,18 @@ DatabaseWidget::Mode DatabaseWidget::currentMode()
switch (currentIndex()) { switch (currentIndex()) {
case -1: case -1:
return DatabaseWidget::None; return DatabaseWidget::None;
break;
case 0: case 0:
return DatabaseWidget::ViewMode; return DatabaseWidget::ViewMode;
break;
case 1: // entry edit case 1: // entry edit
case 2: // group edit case 2: // group edit
case 3: // change master key case 3: // change master key
case 4: // database settings case 4: // database settings
return DatabaseWidget::EditMode; return DatabaseWidget::EditMode;
break; default:
} Q_ASSERT(false);
return DatabaseWidget::None; return DatabaseWidget::None;
} }
}
void DatabaseWidget::emitCurrentModeChanged() void DatabaseWidget::emitCurrentModeChanged()
{ {

8
src/gui/DatabaseWidget.h
View file

@ -37,9 +37,9 @@ class DatabaseWidget : public QStackedWidget
public: public:
enum Mode enum Mode
{ {
None = 0, None,
ViewMode = 1, ViewMode,
EditMode = 2 EditMode
}; };
explicit DatabaseWidget(Database* db, QWidget* parent = 0); explicit DatabaseWidget(Database* db, QWidget* parent = 0);
@ -55,7 +55,7 @@ public:
Q_SIGNALS: Q_SIGNALS:
void closeRequest(); void closeRequest();
void currentModeChanged(DatabaseWidget::Mode); void currentModeChanged(DatabaseWidget::Mode mode);
public Q_SLOTS: public Q_SLOTS:
void createEntry(); void createEntry();

1
src/gui/DialogyWidget.cpp
View file

@ -20,7 +20,6 @@
#include <QtGui/QDialogButtonBox> #include <QtGui/QDialogButtonBox>
#include <QtGui/QPushButton> #include <QtGui/QPushButton>
#include <QtGui/QKeyEvent> #include <QtGui/QKeyEvent>
#include <QtCore/QDebug>
DialogyWidget::DialogyWidget(QWidget* parent) DialogyWidget::DialogyWidget(QWidget* parent)
: QWidget(parent) : QWidget(parent)

1
src/gui/DialogyWidget.h
View file

@ -33,7 +33,6 @@ protected:
private: private:
bool clickButton(QDialogButtonBox::StandardButton standardButton); bool clickButton(QDialogButtonBox::StandardButton standardButton);
}; };
#endif // KEEPASSX_DIALOGYWIDGET_H #endif // KEEPASSX_DIALOGYWIDGET_H

51
src/gui/MainWindow.cpp
View file

@ -33,24 +33,41 @@ MainWindow::MainWindow()
setWindowIcon(dataPath()->applicationIcon()); setWindowIcon(dataPath()->applicationIcon());
connect(m_ui->tabWidget, SIGNAL(entrySelectionChanged(bool)), SLOT(setMenuActionState())); connect(m_ui->tabWidget, SIGNAL(entrySelectionChanged(bool)),
connect(m_ui->tabWidget, SIGNAL(currentWidgetModeChanged(DatabaseWidget::Mode)), SLOT(setMenuActionState(DatabaseWidget::Mode))); SLOT(setMenuActionState()));
connect(m_ui->tabWidget, SIGNAL(tabNameChanged()), SLOT(updateWindowTitle())); connect(m_ui->tabWidget, SIGNAL(currentWidgetModeChanged(DatabaseWidget::Mode)),
connect(m_ui->tabWidget, SIGNAL(currentChanged(int)), SLOT(updateWindowTitle())); SLOT(setMenuActionState(DatabaseWidget::Mode)));
connect(m_ui->tabWidget, SIGNAL(tabNameChanged()),
SLOT(updateWindowTitle()));
connect(m_ui->tabWidget, SIGNAL(currentChanged(int)),
SLOT(updateWindowTitle()));
connect(m_ui->actionDatabaseNew, SIGNAL(triggered()), m_ui->tabWidget, SLOT(newDatabase())); connect(m_ui->actionDatabaseNew, SIGNAL(triggered()), m_ui->tabWidget,
connect(m_ui->actionDatabaseOpen, SIGNAL(triggered()), m_ui->tabWidget, SLOT(openDatabase())); SLOT(newDatabase()));
connect(m_ui->actionDatabaseSave, SIGNAL(triggered()), m_ui->tabWidget, SLOT(saveDatabase())); connect(m_ui->actionDatabaseOpen, SIGNAL(triggered()), m_ui->tabWidget,
connect(m_ui->actionDatabaseSaveAs, SIGNAL(triggered()), m_ui->tabWidget, SLOT(saveDatabaseAs())); SLOT(openDatabase()));
connect(m_ui->actionDatabaseClose, SIGNAL(triggered()), m_ui->tabWidget, SLOT(closeDatabase())); connect(m_ui->actionDatabaseSave, SIGNAL(triggered()), m_ui->tabWidget,
connect(m_ui->actionChangeMasterKey, SIGNAL(triggered()), m_ui->tabWidget, SLOT(changeMasterKey())); SLOT(saveDatabase()));
connect(m_ui->actionChangeDatabaseSettings, SIGNAL(triggered()), m_ui->tabWidget, SLOT(changeDatabaseSettings())); connect(m_ui->actionDatabaseSaveAs, SIGNAL(triggered()), m_ui->tabWidget,
connect(m_ui->actionEntryNew, SIGNAL(triggered()), m_ui->tabWidget, SLOT(createEntry())); SLOT(saveDatabaseAs()));
connect(m_ui->actionEntryEdit, SIGNAL(triggered()), m_ui->tabWidget, SLOT(editEntry())); connect(m_ui->actionDatabaseClose, SIGNAL(triggered()), m_ui->tabWidget,
connect(m_ui->actionEntryDelete, SIGNAL(triggered()), m_ui->tabWidget, SLOT(deleteEntry())); SLOT(closeDatabase()));
connect(m_ui->actionGroupNew, SIGNAL(triggered()), m_ui->tabWidget, SLOT(createGroup())); connect(m_ui->actionChangeMasterKey, SIGNAL(triggered()), m_ui->tabWidget,
connect(m_ui->actionGroupEdit, SIGNAL(triggered()), m_ui->tabWidget, SLOT(editGroup())); SLOT(changeMasterKey()));
connect(m_ui->actionGroupDelete, SIGNAL(triggered()), m_ui->tabWidget, SLOT(deleteGroup())); connect(m_ui->actionChangeDatabaseSettings, SIGNAL(triggered()), m_ui->tabWidget,
SLOT(changeDatabaseSettings()));
connect(m_ui->actionEntryNew, SIGNAL(triggered()), m_ui->tabWidget,
SLOT(createEntry()));
connect(m_ui->actionEntryEdit, SIGNAL(triggered()), m_ui->tabWidget,
SLOT(editEntry()));
connect(m_ui->actionEntryDelete, SIGNAL(triggered()), m_ui->tabWidget,
SLOT(deleteEntry()));
connect(m_ui->actionGroupNew, SIGNAL(triggered()), m_ui->tabWidget,
SLOT(createGroup()));
connect(m_ui->actionGroupEdit, SIGNAL(triggered()), m_ui->tabWidget,
SLOT(editGroup()));
connect(m_ui->actionGroupDelete, SIGNAL(triggered()), m_ui->tabWidget,
SLOT(deleteGroup()));
connect(m_ui->actionQuit, SIGNAL(triggered()), SLOT(close())); connect(m_ui->actionQuit, SIGNAL(triggered()), SLOT(close()));
} }