Add missing file used by cmake

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@276 b624d157-de02-0410-bad0-e51aec6abb33
master
sniperbeamer 16 years ago
parent e531a8a7ff
commit 13df3a6c72
  1. 70
      share/macx_bundle/Info_cmake.plist
  2. 36
      src/mainwindow.cpp

@ -0,0 +1,70 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<!-- For a full list of properties, see
http://developer.apple.com/documentation/MacOSX/Conceptual/BPRuntimeConfig/Articles/PListKeys.html
-->
<key>CFBundleIconFile</key>
<string>${MACOSX_BUNDLE_ICON_FILE}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleGetInfoString</key>
<string>${MACOSX_BUNDLE_INFO_STRING}</string>
<key>CFBundleSignature</key>
<string>kpsx</string>
<key>CFBundleExecutable</key>
<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
<key>CFBundleVersion</key>
<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
<key>CFBundleShortVersionString</key>
<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
<key>CFBundleLongVersionString</key>
<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
<key>CFBundleName</key>
<string>KeePassX</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleIdentifier</key>
<string>org.keepassx.KeePassX</string>
<key>NSHumanReadableCopyright</key>
<string>© 2005-2009, KeePassX Development Team</string>
<key>CFBundleDocumentTypes</key>
<array>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>kdb</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>icon</string>
<key>CFBundleTypeName</key>
<string>KeePassX Password Database</string>
<key>CFBundleTypeOSTypes</key>
<array>
<string>kpsx</string>
</array>
<key>CFBundleTypeRole</key>
<string>Editor</string>
</dict>
</array>
</dict>
</plist>

@ -56,7 +56,7 @@ KeepassMainWindow::KeepassMainWindow(const QString& ArgFile,bool ArgMin,bool Arg
InUnLock=false; InUnLock=false;
unlockDlg=NULL; unlockDlg=NULL;
db=NULL; db=NULL;
setupUi(this); setupUi(this);
#ifdef Q_WS_MAC #ifdef Q_WS_MAC
setUnifiedTitleAndToolBarOnMac(true); setUnifiedTitleAndToolBarOnMac(true);
#endif #endif
@ -222,11 +222,11 @@ void KeepassMainWindow::setupToolbar(){
toolBar->addAction(EditDeleteEntryAction); toolBar->addAction(EditDeleteEntryAction);
toolBar->addSeparator(); toolBar->addSeparator();
toolBar->addAction(EditUsernameToClipboardAction); toolBar->addAction(EditUsernameToClipboardAction);
toolBar->addAction(EditPasswordToClipboardAction); toolBar->addAction(EditPasswordToClipboardAction);
toolBar->addSeparator(); toolBar->addSeparator();
toolBar->addAction(FileUnLockWorkspaceAction); toolBar->addAction(FileUnLockWorkspaceAction);
toolBar->addSeparator(); toolBar->addSeparator();
QuickSearchEdit=new QLineEdit(toolBar); QuickSearchEdit=new QLineEdit(toolBar);
QuickSearchEdit->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed); QuickSearchEdit->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
toolBar->addWidget(QuickSearchEdit); toolBar->addWidget(QuickSearchEdit);
toolBar->setVisible(config->showToolbar()); toolBar->setVisible(config->showToolbar());
@ -240,15 +240,15 @@ void KeepassMainWindow::setupIcons(){
FileSaveAsAction->setIcon(getIcon("filesaveas")); FileSaveAsAction->setIcon(getIcon("filesaveas"));
FileCloseAction->setIcon(getIcon("fileclose")); FileCloseAction->setIcon(getIcon("fileclose"));
FileSettingsAction->setIcon(getIcon("dbsettings")); FileSettingsAction->setIcon(getIcon("dbsettings"));
FileUnLockWorkspaceAction->setIcon(getIcon("lock")); FileUnLockWorkspaceAction->setIcon(getIcon("lock"));
FileExitAction->setIcon(getIcon("exit")); FileExitAction->setIcon(getIcon("exit"));
EditNewEntryAction->setIcon(getIcon("newentry")); EditNewEntryAction->setIcon(getIcon("newentry"));
EditEditEntryAction->setIcon(getIcon("editentry")); EditEditEntryAction->setIcon(getIcon("editentry"));
EditDeleteEntryAction->setIcon(getIcon("deleteentry")); EditDeleteEntryAction->setIcon(getIcon("deleteentry"));
EditGroupSortAction->setIcon(getIcon("swap")); EditGroupSortAction->setIcon(getIcon("swap"));
EditUsernameToClipboardAction->setIcon(getIcon("copyusername")); EditUsernameToClipboardAction->setIcon(getIcon("copyusername"));
EditPasswordToClipboardAction->setIcon(getIcon("copypwd")); EditPasswordToClipboardAction->setIcon(getIcon("copypwd"));
EditCloneEntryAction->setIcon(getIcon("cloneentry")); EditCloneEntryAction->setIcon(getIcon("cloneentry"));
EditOpenUrlAction->setIcon(getIcon("openurl")); EditOpenUrlAction->setIcon(getIcon("openurl"));
EditSaveAttachmentAction->setIcon(getIcon("filesave")); EditSaveAttachmentAction->setIcon(getIcon("filesave"));
EditNewGroupAction->setIcon(getIcon("newgroup")); EditNewGroupAction->setIcon(getIcon("newgroup"));
@ -260,9 +260,9 @@ void KeepassMainWindow::setupIcons(){
ExtrasShowExpiredEntriesAction->setIcon(getIcon("expired")); ExtrasShowExpiredEntriesAction->setIcon(getIcon("expired"));
ExtrasPasswordGenAction->setIcon(getIcon("generator")); ExtrasPasswordGenAction->setIcon(getIcon("generator"));
//ExtrasTrashCanAction->setIcon(getIcon("trashcan")); //TODO ExtrasTrashCan //ExtrasTrashCanAction->setIcon(getIcon("trashcan")); //TODO ExtrasTrashCan
ExtrasSettingsAction->setIcon(getIcon("appsettings")); ExtrasSettingsAction->setIcon(getIcon("appsettings"));
#ifdef AUTOTYPE #ifdef AUTOTYPE
EditAutoTypeAction->setIcon(getIcon("autotype")); EditAutoTypeAction->setIcon(getIcon("autotype"));
#else #else
EditAutoTypeAction->setVisible(false); EditAutoTypeAction->setVisible(false);
#endif #endif
@ -289,8 +289,8 @@ void KeepassMainWindow::setupMenus(){
GroupView->ContextMenuSearchGroup->addAction(HideSearchResultsAction); GroupView->ContextMenuSearchGroup->addAction(HideSearchResultsAction);
EntryView->ContextMenu->addAction(EditUsernameToClipboardAction); EntryView->ContextMenu->addAction(EditUsernameToClipboardAction);
EntryView->ContextMenu->addAction(EditPasswordToClipboardAction); EntryView->ContextMenu->addAction(EditPasswordToClipboardAction);
EntryView->ContextMenu->addAction(EditOpenUrlAction); EntryView->ContextMenu->addAction(EditOpenUrlAction);
EntryView->ContextMenu->addAction(EditCopyUrlAction); EntryView->ContextMenu->addAction(EditCopyUrlAction);
EntryView->ContextMenu->addAction(EditSaveAttachmentAction); EntryView->ContextMenu->addAction(EditSaveAttachmentAction);
#ifdef AUTOTYPE #ifdef AUTOTYPE
@ -328,11 +328,11 @@ void KeepassMainWindow::setupMenus(){
} }
SysTrayMenu = new QMenu(APP_DISPLAY_NAME,this); SysTrayMenu = new QMenu(APP_DISPLAY_NAME,this);
SysTrayMenu->addAction(FileUnLockWorkspaceAction); SysTrayMenu->addAction(FileUnLockWorkspaceAction);
SysTrayMenu->addSeparator(); SysTrayMenu->addSeparator();
SysTrayMenu->addAction(FileExitAction); SysTrayMenu->addAction(FileExitAction);
SysTray->setContextMenu(SysTrayMenu); SysTray->setContextMenu(SysTrayMenu);
SysTray->setToolTip(QString("%1 %2 - %3").arg(APP_DISPLAY_NAME, APP_SHORT_FUNC, (IsLocked) ? tr("Locked") : tr("Unlocked"))); SysTray->setToolTip(QString("%1 %2 - %3").arg(APP_DISPLAY_NAME, APP_SHORT_FUNC, (IsLocked) ? tr("Locked") : tr("Unlocked")));
#define _add_import(name){\ #define _add_import(name){\
QAction* import=new QAction(this);\ QAction* import=new QAction(this);\
@ -635,8 +635,8 @@ void KeepassMainWindow::setStateFileOpen(bool IsOpen){
#endif #endif
} }
/*else{ /*else{
OnGroupSelectionChanged(); OnGroupSelectionChanged();
OnEntrySelectionChanged(); OnEntrySelectionChanged();
}*/ }*/
} }