Initial import of Trinity 3.5.11 to kdebase

Extends krandrtray, adds iccconfig kcontrol module, adds run dialog autocomplete and lots of bugfixes
Will need to check for commit warnings and repair as encountered
Also needs full compile test

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1061475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 29 insertions, 7 deletions

diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp
index 352f3ab74..45d5f5e4b 100644
--- a/klipper/urlgrabber.cpp
+++ b/klipper/urlgrabber.cpp
@@ -51,7 +51,6 @@ URLGrabber::URLGrabber( KConfig* config )
 {
     if( m_config == NULL )
         m_config = kapp->config();
-    myCurrentAction = 0L;
     myMenu = 0L;
     myPopupKillTimeout = 8;
     m_stripWhiteSpace = true;
@@ -160,6 +159,7 @@ void URLGrabber::actionMenu( bool wm_class_check )
 
         QString item;
         myCommandMapper.clear();
+        myGroupingMapper.clear();
 
         myPopupKillTimer->stop();
         delete myMenu;
@@ -184,6 +184,7 @@ void URLGrabber::actionMenu( bool wm_class_check )
                 else
                     id = myMenu->insertItem( SmallIcon(command->pixmap), item);
                 myCommandMapper.insert( id, command );
+                myGroupingMapper.insert( id, action->capturedTexts() );
             }
         }
 
@@ -224,19 +225,27 @@ void URLGrabber::slotItemSelected( int id )
 	break;
     default:
         ClipCommand *command = myCommandMapper.find( id );
-        if ( !command )
+        QStringList *backrefs = myGroupingMapper.find( id );
+        if ( !command || !backrefs )
             qWarning("Klipper: can't find associated action");
         else
-            execute( command );
+            execute( command, backrefs );
     }
 }
 
 
-void URLGrabber::execute( const struct ClipCommand *command ) const
+void URLGrabber::execute( const struct ClipCommand *command,
+                          QStringList *backrefs) const
 {
     if ( command->isEnabled ) {
         QMap<QChar,QString> map;
         map.insert( 's', myClipData );
+		int brCounter = -1;
+		QStringList::Iterator it = backrefs->begin();
+		while( it != backrefs->end() ) {
+			map.insert( char(++brCounter + '0') , *it );
+			++it;
+		}
         QString cmdLine = KMacroExpander::expandMacrosShellQuote( command->command, map );
 
         if ( cmdLine.isEmpty() )
diff --git a/klipper/urlgrabber.h b/klipper/urlgrabber.h
index ae39d648d..232455fa0 100644
--- a/klipper/urlgrabber.h
+++ b/klipper/urlgrabber.h
@@ -72,7 +72,8 @@ public:
     
 private:
   const ActionList& matchingActions( const QString& );
-  void execute( const struct ClipCommand *command ) const;
+  void execute( const struct ClipCommand *command, 
+                QStringList *backrefs ) const;
   void editData();
   bool isAvoidedWindow() const;
   void actionMenu( bool wm_class_check );
@@ -83,6 +84,7 @@ private:
   QString myClipData;
   ClipAction *myCurrentAction;
   QIntDict<ClipCommand> myCommandMapper;
+  QIntDict<QStringList> myGroupingMapper;
   KPopupMenu *myMenu;
   QTimer *myPopupKillTimer;
   int myPopupKillTimeout;
@@ -127,8 +129,13 @@ public:
 
   void  setRegExp( const QString& r) 	      { myRegExp = QRegExp( r ); }
   QString regExp() 			const { return myRegExp.pattern(); }
-  inline bool matches( const QString& string ) const {
-      return ( myRegExp.search( string ) != -1 );
+  inline bool matches( const QString& string ) {
+    int res = myRegExp.search( string ) ;
+    if ( res != -1 ) {
+      myCapturedTexts = myRegExp.capturedTexts();
+      return true;
+    } 
+    return false;
   }
 
   void 	setDescription( const QString& d)     { myDescription = d; }
@@ -147,9 +154,15 @@ public:
    */
   void save( KConfig * ) const;
 
+  /**
+   * Returns the most recent list of matched group backreferences.
+   * Note: you probably need to call matches() first.
+   */
+  inline const QStringList* capturedTexts() const { return &myCapturedTexts; }
 
 private:
   QRegExp 		myRegExp;
+  QStringList	myCapturedTexts;
   QString 		myDescription;
   QPtrList<ClipCommand> 	myCommands;