[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/office/skrooge
From:       Stephane Mankowski <stephane () mankowski ! fr>
Date:       2009-05-31 20:29:40
Message-ID: 1243801780.001501.4818.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 976078 by smankowski:

Middle click is able to open new page from context or bookmarks

 M  +1 -0      CHANGELOG  
 M  +7 -1      skgbasegui/skgmainpanel.cpp  
 M  +2 -0      skgbasegui/skgmainpanel.h  
 M  +8 -2      skrooge_bookmark/skgbookmarkplugindockwidget.cpp  
 M  +2 -0      skrooge_bookmark/skgbookmarkplugindockwidget.h  


--- trunk/playground/office/skrooge/CHANGELOG #976077:976078
@@ -23,6 +23,7 @@
   *New operation editor
   *Better management of messages in status bar
   *New editor in unit plugin
+  *Middle click is able to open new page from context or bookmarks
 
  -- maintainer Stephane MANKOWSKI <miraks@users.sourceforge.net>  xxx
  
--- trunk/playground/office/skrooge/skgbasegui/skgmainpanel.cpp #976077:976078
@@ -319,6 +319,7 @@
                 connect ( ( const QObject* ) currentBankDocument, SIGNAL ( \
transactionSuccessfullyEnded ( int ) ), this, SLOT ( refresh() ), \
Qt::QueuedConnection );  connect ( ( const QObject* ) currentBankDocument, SIGNAL ( \
transactionSuccessfullyEnded ( int ) ), this, SLOT ( notify ( int ) ), \
Qt::QueuedConnection );  }
+        connect ( ui.kContextList, SIGNAL ( itemPressed ( QListWidgetItem* ) ), \
                this, SLOT ( onBeforeOpenContext () ) );
         connect ( ui.kContextList, SIGNAL ( itemClicked ( QListWidgetItem* ) ), \
                this, SLOT ( onOpenContext () ) );
         connect ( tabView, SIGNAL ( closeRequest ( QWidget* ) ), this, SLOT ( \
                closeTab ( QWidget* ) ) );
         connect ( tabView, SIGNAL ( mouseMiddleClick ( QWidget* ) ), this, SLOT ( \
closeTab ( QWidget* ) ) ); @@ -742,6 +743,11 @@
         tabView->setCurrentIndex ( iIndex );
 }
 
+void SKGMainPanel::onBeforeOpenContext ()
+{
+        middleClick=QApplication::keyboardModifiers() &Qt::ControlModifier || \
QApplication::mouseButtons () &Qt::MidButton; +}
+
 void SKGMainPanel::onOpenContext ()
 {
         SKGTRACEIN ( 1, "SKGMainPanel::onOpenContext" );
@@ -756,7 +762,7 @@
                         index=selection.at(0)->data(12).toInt();
                 }
         }
-        if (index!=-1) setNewTabContent ( getPluginByIndex ( index ), \
QApplication::keyboardModifiers() &Qt::ControlModifier ? -1 : tabView->currentIndex() \
); +        if (index!=-1) setNewTabContent ( getPluginByIndex ( index ), middleClick \
? -1 : tabView->currentIndex() );  QApplication::restoreOverrideCursor();
 }
 
--- trunk/playground/office/skrooge/skgbasegui/skgmainpanel.h #976077:976078
@@ -245,6 +245,7 @@
         void onQuitAction();
 
         void addTab();
+        void onBeforeOpenContext();
         void onOpenContext();
         void onTipOfDay();
         void onTrayActivated ( QSystemTrayIcon::ActivationReason reason );
@@ -288,6 +289,7 @@
 
         doublePointer progressObjects;
         QString defaultStyle;
+        bool middleClick;
 };
 
 #endif // SKGMAINPANEL_H
--- trunk/playground/office/skrooge/skrooge_bookmark/skgbookmarkplugindockwidget.cpp \
#976077:976078 @@ -77,6 +77,7 @@
         ui.kBookmarksList->setModel(modelproxy);
 
         connect(ui.kBookmarksList->selectionModel(), \
SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(refresh())); +    \
connect(ui.kBookmarksList, SIGNAL(pressed(QModelIndex)), this, \
                SLOT(onBeforeOpenBookmark()));
         connect(ui.kBookmarksList, SIGNAL(clicked(QModelIndex)), this, \
                SLOT(onOpenBookmark(QModelIndex)));
         connect(ui.kBookmarksList, SIGNAL(doubleClicked(QModelIndex)), this, \
SLOT(onOpenBookmarkFolder(QModelIndex)));  }
@@ -168,14 +169,14 @@
         int nbTab=getMainPanel()->countTab();
         if (nbTab) {
                 setForcusOn=nbTab-1;
-                if (QApplication::keyboardModifiers()&Qt::ControlModifier) {
+                if (middleClick) {
                         setForcusOn=nbTab;
                 } else {
                         setForcusOn=getMainPanel()->currentTabIndex();
                 }
         }
 
-        int tabNumberForNextOpen=(QApplication::keyboardModifiers()&Qt::ControlModifier \
|| iFirstInNewPage ? -1 : getMainPanel()->currentTabIndex()); +        int \
tabNumberForNextOpen=(middleClick || iFirstInNewPage ? -1 : \
                getMainPanel()->currentTabIndex());
         for (int i=0; i<nodes.count(); ++i) { //WARNING: This list is modified \
dynamically  SKGNodeObject selectedNode=nodes.at(i);
                 QStringList data=SKGServices::splitCSVLine(selectedNode.getData());
@@ -203,6 +204,11 @@
         QApplication::restoreOverrideCursor();
 }
 
+void SKGBookmarkPluginDockWidget::onBeforeOpenBookmark()
+{
+        middleClick=QApplication::keyboardModifiers() &Qt::ControlModifier || \
QApplication::mouseButtons () &Qt::MidButton; +}
+
 void SKGBookmarkPluginDockWidget::onOpenBookmark(const QModelIndex & index )
 {
         SKGTRACEIN(1, "SKGBookmarkPluginDockWidget::onOpenBookmark");
--- trunk/playground/office/skrooge/skrooge_bookmark/skgbookmarkplugindockwidget.h \
#976077:976078 @@ -84,6 +84,7 @@
         void onAddBookmark();
         void onRemoveBookmark();
         void onRenameBookmark();
+        void onBeforeOpenBookmark();
         void onOpenBookmark(const QModelIndex & index );
         void onOpenBookmarkFolder(const QModelIndex & index );
         void onBookmarkEditorChanged();
@@ -105,6 +106,7 @@
         QAction* actAddBookmarkGroup;
         QAction* actSetAutostart;
         QAction* actUnsetAutostart;
+        bool middleClick;
 };
 
 #endif // SKGBOOKMARKPLUGINDOCKWIDGET_H


[prev in list] [next in list] [prev in thread] [next in thread]