1 #! /bin/sh /usr/share/dpatch/dpatch-run
2 ## RemoveSystray.dpatch by <drizzt@>
4 ## All lines beginning with `## DP:' are a description of the patch.
8 diff -urNad keepassx-0.4.1~/src/main.cpp keepassx-0.4.1/src/main.cpp
9 --- keepassx-0.4.1~/src/main.cpp 2009-09-03 18:53:44.000000000 +0200
10 +++ keepassx-0.4.1/src/main.cpp 2009-12-15 17:17:27.222405495 +0100
13 QApplication* app = new QApplication(argc,argv);
17 + QFont font = app->font();
18 + font.setPointSize( font.pointSize()-4 );
19 + app->setFont( font );
22 EventListener* eventListener = new EventListener();
23 app->installEventFilter(eventListener);
25 diff -urNad keepassx-0.4.1~/src/mainwindow.cpp keepassx-0.4.1/src/mainwindow.cpp
26 --- keepassx-0.4.1~/src/mainwindow.cpp 2009-09-14 10:59:05.000000000 +0200
27 +++ keepassx-0.4.1/src/mainwindow.cpp 2009-12-15 17:17:27.222405495 +0100
29 restoreGeometry(windowGeo);
30 VSplitter->restoreState(config->vSplitterPos());
31 HSplitter->restoreState(config->hSplitterPos());
33 SysTray=new QSystemTrayIcon(this);
37 setStateFileOpen(false);
39 connect(EntryView, SIGNAL(viewModeChanged(bool)), SLOT(loadColumnVisibility()));
40 connect(EntryView, SIGNAL(viewModeChanged(bool)), ViewColumnsGroupAction, SLOT(setVisible(bool)));
43 connect(SysTray,SIGNAL(activated(QSystemTrayIcon::ActivationReason)),this,SLOT(OnSysTrayActivated(QSystemTrayIcon::ActivationReason)));
45 connect(DetailView,SIGNAL(anchorClicked(const QUrl&)),this,SLOT(OnDetailViewUrlClicked(const QUrl&)));
46 connect(WorkspaceLockedWidget.Button_Unlock,SIGNAL(clicked()),this,SLOT(OnUnLockWorkspace()));
47 connect(WorkspaceLockedWidget.Button_CloseDatabase,SIGNAL(clicked()),this,SLOT(OnLockClose()));
49 AddThisAsBookmarkAction->setIcon(getIcon("bookmark_this"));
50 AddBookmarkAction->setIcon(getIcon("bookmark_add"));
51 ManageBookmarksAction->setIcon(getIcon("bookmark"));
53 SysTray->setIcon(getIcon("keepassx"));
54 if(config->showSysTrayIcon())
59 void KeepassMainWindow::setupMenus(){
61 SysTrayMenu->addAction(FileUnLockWorkspaceAction);
62 SysTrayMenu->addSeparator();
63 SysTrayMenu->addAction(FileExitAction);
65 SysTray->setContextMenu(SysTrayMenu);
70 #define _add_import(name){\
71 QAction* import=new QAction(this);\
72 import->setData(qVariantFromValue(dynamic_cast<QObject*>(&name)));\
74 config->setHSplitterPos(HSplitter->saveState());
75 config->setShowStatusbar(statusBar()->isVisible());
80 QMainWindow::closeEvent(e);
86 EntryView->setAlternatingRowColors(config->alternatingRowColors());
88 SysTray->setVisible(config->showSysTrayIcon());
90 menuBookmarks->menuAction()->setVisible(config->featureBookmarks());
92 if (config->alwaysOnTop() != oldAlwaysOnTop) {
94 toolBar->setIconSize(QSize(28,28));
98 void KeepassMainWindow::OnSysTrayActivated(QSystemTrayIcon::ActivationReason reason){
99 if(reason!=QSystemTrayIcon::Context){
101 @@ -1243,6 +1256,7 @@
107 void KeepassMainWindow::restoreWindow(){
109 @@ -1344,7 +1358,9 @@
110 NormalCentralWidget->setParent(NULL);
111 setCentralWidget(LockedCentralWidget);
112 LockedCentralWidget->setVisible(true);
114 SysTray->setIcon(getIcon("keepassx_locked"));
116 FileUnLockWorkspaceAction->setText(tr("Un&lock Workspace"));
119 @@ -1359,7 +1375,9 @@
120 LockedCentralWidget->setParent(NULL);
121 setCentralWidget(NormalCentralWidget);
122 NormalCentralWidget->setVisible(true);
124 SysTray->setIcon(getIcon("keepassx"));
126 FileUnLockWorkspaceAction->setText(tr("&Lock Workspace"));
129 @@ -1481,6 +1499,7 @@
132 void KeepassMainWindow::updateTrayTooltip() {
134 if (!IsLocked && !FileOpen)
135 SysTray->setToolTip(QString("%1 - %2").arg(APP_DISPLAY_NAME, APP_SHORT_FUNC));
137 @@ -1490,6 +1509,7 @@
138 tooltip.append( QString(" (%1)").arg(tr("locked")) );
139 SysTray->setToolTip(tooltip);
144 void KeepassMainWindow::updateCurrentFile(const QString& filePath) {
145 diff -urNad keepassx-0.4.1~/src/mainwindow.h keepassx-0.4.1/src/mainwindow.h
146 --- keepassx-0.4.1~/src/mainwindow.h 2009-12-15 16:55:18.000000000 +0100
147 +++ keepassx-0.4.1/src/mainwindow.h 2009-12-15 17:17:27.232398814 +0100
149 QLabel* StatusBarGeneral;
150 //QLabel* StatusBarSelection;
153 QSystemTrayIcon* SysTray;
155 QAction* ViewShowToolbarAction;
157 //QAssistantClient* HelpBrowser; //TODO HelpBrowser