Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-02 03:26:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

Rename application to KeePassXC and change icon (#70)

Browse source
This commit is contained in:
Jonathan White 2016-11-03 00:05:30 -04:00 • committed by GitHub
parent 13983d0e51
commit ccec84aef2
78 changed files with 133 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/CMakeLists.txt
View file

@ -213,7 +213,7 @@ if(APPLE)
set(CPACK_DMG_VOLUME_NAME "${PROGNAME}")
set(CPACK_SYSTEM_NAME "OSX")
set(CPACK_STRIP_FILES ON)
set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSX_VERSION_NUM}")
set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION_NUM}")
include(CPack)
include(DeployQt4)
@ -223,7 +223,7 @@ endif()
if(MINGW )
set(CPACK_GENERATOR "ZIP")
set(CPACK_STRIP_FILES ON)
set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSX_VERSION_NUM}")
set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION_NUM}")
include(CPack)
include(DeployQt4)

2
src/autotype/AutoType.cpp
View file

@ -206,7 +206,7 @@ void AutoType::performGlobalAutoType(const QList<Database*>& dbList)
QString message = tr("Couldn't find an entry that matches the window title:");
message.append("\n\n");
message.append(windowTitle);
MessageBox::information(nullptr, tr("Auto-Type - KeePassX"), message);
MessageBox::information(nullptr, tr("Auto-Type - KeePassXC"), message);
}
else if ((entryList.size() == 1) && !config()->get("security/autotypeask").toBool()) {
m_inAutoType = false;

2
src/autotype/AutoTypeSelectDialog.cpp
View file

@ -38,7 +38,7 @@ AutoTypeSelectDialog::AutoTypeSelectDialog(QWidget* parent)
// Places the window on the active (virtual) desktop instead of where the main window is.
setAttribute(Qt::WA_X11BypassTransientForHint);
setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
setWindowTitle(tr("Auto-Type - KeePassX"));
setWindowTitle(tr("Auto-Type - KeePassXC"));
setWindowIcon(filePath()->applicationIcon());
QRect screenGeometry = QApplication::desktop()->availableGeometry(QCursor::pos());

2
src/config-keepassx.h.cmake
View file

@ -3,7 +3,7 @@
#ifndef KEEPASSX_CONFIG_KEEPASSX_H
#define KEEPASSX_CONFIG_KEEPASSX_H
#define KEEPASSX_VERSION "${KEEPASSX_VERSION}"
#define KEEPASSX_VERSION "${KEEPASSXC_VERSION}"
#define KEEPASSX_SOURCE_DIR "${CMAKE_SOURCE_DIR}"
#define KEEPASSX_BINARY_DIR "${CMAKE_BINARY_DIR}"

6
src/core/Config.cpp
View file

@ -68,14 +68,14 @@ Config::Config(QObject* parent)
userPath += QFile::decodeName(env);
}
userPath += "/keepassx/";
userPath += "/keepassxc/";
#else
userPath = QDir::fromNativeSeparators(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
// storageLocation() appends the application name ("/keepassx") to the end
// storageLocation() appends the application name ("/keepassxc") to the end
userPath += "/";
#endif
userPath += "keepassx2.ini";
userPath += "keepassxc.ini";
init(userPath);
}

4
src/core/FilePath.cpp
View file

@ -87,12 +87,12 @@ QString FilePath::pluginPath(const QString& name)
QIcon FilePath::applicationIcon()
{
return icon("apps", "keepassx");
return icon("apps", "keepassxc");
}
QIcon FilePath::trayIconLocked()
{
return icon("apps", "keepassx-locked");
return icon("apps", "keepassxc-locked");
}
QIcon FilePath::trayIconUnlocked()

2
src/core/Metadata.cpp
View file

@ -28,7 +28,7 @@ Metadata::Metadata(QObject* parent)
: QObject(parent)
, m_updateDatetime(true)
{
m_data.generator = "KeePassX";
m_data.generator = "KeePassXC";
m_data.maintenanceHistoryDays = 365;
m_data.masterKeyChangeRec = -1;
m_data.masterKeyChangeForce = -1;

8
src/gui/AboutDialog.ui
View file

@ -6,12 +6,12 @@
<rect>
<x>0</x>
<y>0</y>
<width>366</width>
<width>375</width>
<height>210</height>
</rect>
</property>
<property name="windowTitle">
<string>About KeePassX</string>
<string>About KeePassXC</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="sizeConstraint">
@ -38,7 +38,7 @@
</sizepolicy>
</property>
<property name="text">
<string notr="true"> KeePassX</string>
<string notr="true"> KeePassXC</string>
</property>
</widget>
</item>
@ -69,7 +69,7 @@
</sizepolicy>
</property>
<property name="text">
<string>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</string>
<string>KeePassXC is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</string>
</property>
<property name="wordWrap">
<bool>true</bool>

4
src/gui/DatabaseTabWidget.cpp
View file

@ -153,7 +153,7 @@ void DatabaseTabWidget::openDatabase(const QString& fileName, const QString& pw,
// due to lack of permissions
if (lockFile->error() != QLockFile::PermissionError) {
QMessageBox::StandardButton result = MessageBox::question(this, tr("Open database"),
tr("The database you are trying to open is locked by another instance of KeePassX.\n"
tr("The database you are trying to open is locked by another instance of KeePassXC.\n"
"Do you want to open it anyway? Alternatively the database is opened read-only."),
QMessageBox::Yes | QMessageBox::No);
@ -356,7 +356,7 @@ bool DatabaseTabWidget::saveDatabaseAs(Database* db)
// due to lack of permissions
if (lockFile->error() != QLockFile::PermissionError) {
QMessageBox::StandardButton result = MessageBox::question(this, tr("Save database as"),
tr("The database you are trying to save as is locked by another instance of KeePassX.\n"
tr("The database you are trying to save as is locked by another instance of KeePassXC.\n"
"Do you want to save it anyway?"),
QMessageBox::Yes | QMessageBox::No);

2
src/gui/MainWindow.cpp
View file

@ -72,7 +72,7 @@ class HttpPlugin: public ISettingsPage
Service *m_service;
};
const QString MainWindow::BaseWindowTitle = "KeePassX";
const QString MainWindow::BaseWindowTitle = "KeePassXC";
MainWindow::MainWindow()
: m_ui(new Ui::MainWindow())

10
src/gui/MainWindow.ui
View file

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string notr="true">KeePassX</string>
<string notr="true">KeePassXC</string>
</property>
<widget class="QWidget" name="centralwidget">
<layout class="QVBoxLayout" name="verticalLayout">
@ -331,6 +331,14 @@
<string>&amp;Clone entry</string>
</property>
</action>
<action name="actionSearch">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>&amp;Find</string>
</property>
</action>
<action name="actionEntryCopyUsername">
<property name="enabled">
<bool>false</bool>

4
src/http/Service.cpp
View file

@ -150,7 +150,7 @@ QString Service::storeKey(const QString &key)
tr("You have received an association "
"request for the above key.\n"
"If you would like to allow it access "
"to your KeePassX database\n"
"to your KeePassXC database\n"
"give it a unique name to identify and accept it."),
QLineEdit::Normal, QString(), &ok);
if (!ok || id.isEmpty())
@ -158,7 +158,7 @@ QString Service::storeKey(const QString &key)
//Warn if association key already exists
} while(config->attributes()->contains(QLatin1String(ASSOCIATE_KEY_PREFIX) + id) &&
QMessageBox::warning(0, tr("KeyPassX/Http: Overwrite existing key?"),
QMessageBox::warning(0, tr("KeyPassXC/Http: Overwrite existing key?"),
tr("A shared encryption-key with the name \"%1\" already exists.\nDo you want to overwrite it?").arg(id),
QMessageBox::Yes | QMessageBox::No) == QMessageBox::No);

6
src/main.cpp
View file

@ -36,7 +36,7 @@ int main(int argc, char** argv)
Tools::setupSearchPaths();
Application app(argc, argv);
Application::setApplicationName("keepassx");
Application::setApplicationName("keepassxc");
Application::setApplicationVersion(KEEPASSX_VERSION);
// don't set organizationName as that changes the return value of
// QStandardPaths::writableLocation(QDesktopServices::DataLocation)
@ -48,12 +48,12 @@ int main(int argc, char** argv)
"Fatal error while testing the cryptographic functions.");
error.append("\n");
error.append(Crypto::errorString());
MessageBox::critical(nullptr, QCoreApplication::translate("Main", "KeePassX - Error"), error);
MessageBox::critical(nullptr, QCoreApplication::translate("Main", "KeePassXC - Error"), error);
return 1;
}
QCommandLineParser parser;
parser.setApplicationDescription(QCoreApplication::translate("main", "KeePassX - cross-platform password manager"));
parser.setApplicationDescription(QCoreApplication::translate("main", "KeePassXC - cross-platform password manager"));
parser.addPositionalArgument("filename", QCoreApplication::translate("main", "filename(s) of the password database(s) to open (*.kdbx)"), "[filename(s)]");
QCommandLineOption configOption("config",