Upgrade to 0.4.3 base on merge from mainstream branch

[keepassx] / debian / patches / 10_RemoveSystray.dpatch

diff --git a/debian/patches/10_RemoveSystray.dpatch b/debian/patches/10_RemoveSystray.dpatch
index 27de627..04ecd35 100755 (executable)
--- a/debian/patches/10_RemoveSystray.dpatch
+++ b/debian/patches/10_RemoveSystray.dpatch
@@ -1,13 +1,13 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## RemoveSystray.dpatch by  <drizzt@>
+## 10_RemoveSystray.dpatch by  <yma@>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: No description.
 
 @DPATCH@
-diff -urNad keepassx-0.4.1~/src/main.cpp keepassx-0.4.1/src/main.cpp
---- keepassx-0.4.1~/src/main.cpp       2009-09-03 18:53:44.000000000 +0200
-+++ keepassx-0.4.1/src/main.cpp        2009-12-15 17:17:27.222405495 +0100
+diff -urNad keepassx-0.4.3~/src/main.cpp keepassx-0.4.3/src/main.cpp
+--- keepassx-0.4.3~/src/main.cpp       2010-12-30 00:32:17.000000000 +0100
++++ keepassx-0.4.3/src/main.cpp        2010-12-30 00:50:22.000000000 +0100
 @@ -56,6 +56,13 @@
  #else
        QApplication* app = new QApplication(argc,argv);
@@ -22,10 +22,10 @@ diff -urNad keepassx-0.4.1~/src/main.cpp keepassx-0.4.1/src/main.cpp
        EventListener* eventListener = new EventListener();
        app->installEventFilter(eventListener);
        
-diff -urNad keepassx-0.4.1~/src/mainwindow.cpp keepassx-0.4.1/src/mainwindow.cpp
---- keepassx-0.4.1~/src/mainwindow.cpp 2009-09-14 10:59:05.000000000 +0200
-+++ keepassx-0.4.1/src/mainwindow.cpp  2009-12-15 17:17:27.222405495 +0100
-@@ -72,7 +72,9 @@
+diff -urNad keepassx-0.4.3~/src/mainwindow.cpp keepassx-0.4.3/src/mainwindow.cpp
+--- keepassx-0.4.3~/src/mainwindow.cpp 2010-12-30 00:32:17.000000000 +0100
++++ keepassx-0.4.3/src/mainwindow.cpp  2010-12-30 00:50:22.000000000 +0100
+@@ -73,7 +73,9 @@
                restoreGeometry(windowGeo);
        VSplitter->restoreState(config->vSplitterPos());
        HSplitter->restoreState(config->hSplitterPos());
@@ -35,7 +35,7 @@ diff -urNad keepassx-0.4.1~/src/mainwindow.cpp keepassx-0.4.1/src/mainwindow.cpp
        setupToolbar();
        setupIcons();
        setStateFileOpen(false);
-@@ -207,7 +209,9 @@
+@@ -211,7 +213,9 @@
        connect(EntryView, SIGNAL(viewModeChanged(bool)), SLOT(loadColumnVisibility()));
        connect(EntryView, SIGNAL(viewModeChanged(bool)), ViewColumnsGroupAction, SLOT(setVisible(bool)));
  
@@ -45,7 +45,7 @@ diff -urNad keepassx-0.4.1~/src/mainwindow.cpp keepassx-0.4.1/src/mainwindow.cpp
        connect(DetailView,SIGNAL(anchorClicked(const QUrl&)),this,SLOT(OnDetailViewUrlClicked(const QUrl&)));
        connect(WorkspaceLockedWidget.Button_Unlock,SIGNAL(clicked()),this,SLOT(OnUnLockWorkspace()));
        connect(WorkspaceLockedWidget.Button_CloseDatabase,SIGNAL(clicked()),this,SLOT(OnLockClose()));
-@@ -278,9 +282,11 @@
+@@ -282,9 +286,11 @@
        AddThisAsBookmarkAction->setIcon(getIcon("bookmark_this"));
        AddBookmarkAction->setIcon(getIcon("bookmark_add"));
        ManageBookmarksAction->setIcon(getIcon("bookmark"));
@@ -57,7 +57,7 @@ diff -urNad keepassx-0.4.1~/src/mainwindow.cpp keepassx-0.4.1/src/mainwindow.cpp
  }
  
  void KeepassMainWindow::setupMenus(){
-@@ -327,9 +333,11 @@
+@@ -336,9 +342,11 @@
        SysTrayMenu->addAction(FileUnLockWorkspaceAction);
        SysTrayMenu->addSeparator();
        SysTrayMenu->addAction(FileExitAction);
@@ -70,7 +70,7 @@ diff -urNad keepassx-0.4.1~/src/mainwindow.cpp keepassx-0.4.1/src/mainwindow.cpp
        #define _add_import(name){\
        QAction* import=new QAction(this);\
        import->setData(qVariantFromValue(dynamic_cast<QObject*>(&name)));\
-@@ -1082,7 +1090,9 @@
+@@ -1102,7 +1110,9 @@
                config->setHSplitterPos(HSplitter->saveState());
        config->setShowStatusbar(statusBar()->isVisible());
        
@@ -80,7 +80,7 @@ diff -urNad keepassx-0.4.1~/src/mainwindow.cpp keepassx-0.4.1/src/mainwindow.cpp
        QMainWindow::closeEvent(e);
        QApplication::quit();
  }
-@@ -1133,7 +1143,9 @@
+@@ -1153,7 +1163,9 @@
        }
        
        EntryView->setAlternatingRowColors(config->alternatingRowColors());
@@ -90,7 +90,7 @@ diff -urNad keepassx-0.4.1~/src/mainwindow.cpp keepassx-0.4.1/src/mainwindow.cpp
        menuBookmarks->menuAction()->setVisible(config->featureBookmarks());
  #ifndef Q_WS_MAC
        if (config->alwaysOnTop() != oldAlwaysOnTop) {
-@@ -1225,6 +1237,7 @@
+@@ -1245,6 +1257,7 @@
        toolBar->setIconSize(QSize(28,28));
  }
  
@@ -98,15 +98,15 @@ diff -urNad keepassx-0.4.1~/src/mainwindow.cpp keepassx-0.4.1/src/mainwindow.cpp
  void KeepassMainWindow::OnSysTrayActivated(QSystemTrayIcon::ActivationReason reason){
        if(reason!=QSystemTrayIcon::Context){
                if (isVisible()){
-@@ -1243,6 +1256,7 @@
+@@ -1263,6 +1276,7 @@
                }
        }
  }
 +#endif
  
  void KeepassMainWindow::restoreWindow(){
-       showNormal();
-@@ -1344,7 +1358,9 @@
+ #ifdef Q_WS_WIN
+@@ -1371,7 +1385,9 @@
        NormalCentralWidget->setParent(NULL);
        setCentralWidget(LockedCentralWidget);
        LockedCentralWidget->setVisible(true);
@@ -116,7 +116,7 @@ diff -urNad keepassx-0.4.1~/src/mainwindow.cpp keepassx-0.4.1/src/mainwindow.cpp
        FileUnLockWorkspaceAction->setText(tr("Un&lock Workspace"));
        IsLocked=true;
        updateTrayTooltip();
-@@ -1359,7 +1375,9 @@
+@@ -1386,7 +1402,9 @@
        LockedCentralWidget->setParent(NULL);
        setCentralWidget(NormalCentralWidget);
        NormalCentralWidget->setVisible(true);
@@ -126,7 +126,7 @@ diff -urNad keepassx-0.4.1~/src/mainwindow.cpp keepassx-0.4.1/src/mainwindow.cpp
        FileUnLockWorkspaceAction->setText(tr("&Lock Workspace"));
        IsLocked=false;
        updateTrayTooltip();
-@@ -1481,6 +1499,7 @@
+@@ -1510,6 +1528,7 @@
  }
  
  void KeepassMainWindow::updateTrayTooltip() {
@@ -134,7 +134,7 @@ diff -urNad keepassx-0.4.1~/src/mainwindow.cpp keepassx-0.4.1/src/mainwindow.cpp
        if (!IsLocked && !FileOpen)
                SysTray->setToolTip(QString("%1 - %2").arg(APP_DISPLAY_NAME, APP_SHORT_FUNC));
        else {
-@@ -1490,6 +1509,7 @@
+@@ -1519,6 +1538,7 @@
                        tooltip.append( QString(" (%1)").arg(tr("locked")) );
                SysTray->setToolTip(tooltip);
        }
@@ -142,10 +142,10 @@ diff -urNad keepassx-0.4.1~/src/mainwindow.cpp keepassx-0.4.1/src/mainwindow.cpp
  }
  
  void KeepassMainWindow::updateCurrentFile(const QString& filePath) {
-diff -urNad keepassx-0.4.1~/src/mainwindow.h keepassx-0.4.1/src/mainwindow.h
---- keepassx-0.4.1~/src/mainwindow.h   2009-12-15 16:55:18.000000000 +0100
-+++ keepassx-0.4.1/src/mainwindow.h    2009-12-15 17:17:27.232398814 +0100
-@@ -131,7 +131,9 @@
+diff -urNad keepassx-0.4.3~/src/mainwindow.h keepassx-0.4.3/src/mainwindow.h
+--- keepassx-0.4.3~/src/mainwindow.h   2010-12-30 00:32:17.000000000 +0100
++++ keepassx-0.4.3/src/mainwindow.h    2010-12-30 00:50:22.000000000 +0100
+@@ -129,7 +129,9 @@
                QLabel* StatusBarGeneral;
                //QLabel* StatusBarSelection;
                QToolBar* toolBar;