make log tabs closable

qgis · Nov 26, 2011 · 414729c · 414729c
1 parent 0a49c8c
commit 414729c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 14 deletions.
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -392,10 +392,10 @@ FnDef QgsExpression::BuiltinFunctions[] =
   FnDef( "toreal", 1, fcnToReal, "Conversions" ),
   FnDef( "tostring", 1, fcnToString, "Conversions" ),
   // string manipulation
-  FnDef( "lower", 1, fcnLower, "String"),
-  FnDef( "upper", 1, fcnUpper, "String"),
-  FnDef( "length", 1, fcnLength, "String"),
-  FnDef( "replace", 3, fcnReplace, "String"),
+  FnDef( "lower", 1, fcnLower, "String" ),
+  FnDef( "upper", 1, fcnUpper, "String" ),
+  FnDef( "length", 1, fcnLength, "String" ),
+  FnDef( "replace", 3, fcnReplace, "String" ),
   FnDef( "regexp_replace", 3, fcnRegexpReplace, "String" ),
   FnDef( "substr", 3, fcnSubstr, "String" ),
   // geometry accessors

diff --git a/src/gui/qgsmessagelogviewer.cpp b/src/gui/qgsmessagelogviewer.cpp
@@ -31,6 +31,8 @@ QgsMessageLogViewer::QgsMessageLogViewer( QWidget *parent, Qt::WFlags fl )
   setupUi( this );
   gmInstance = this;
   QgsMessageLog::setLogger( logger );
+
+  connect( tabWidget, SIGNAL( tabCloseRequested( int ) ), this, SLOT( closeTab( int ) ) );
 }
 
 QgsMessageLogViewer::~QgsMessageLogViewer()
@@ -40,47 +42,52 @@ QgsMessageLogViewer::~QgsMessageLogViewer()
 
 void QgsMessageLogViewer::logger( QString message, QString tag, int level )
 {
-  if( !gmInstance )
+  if ( !gmInstance )
     return;
 
   gmInstance->logMessage( message, tag, level );
 }
 
 void QgsMessageLogViewer::logMessage( QString message, QString tag, int level )
 {
-  if( tag.isNull() )
+  if ( tag.isNull() )
     tag = tr( "General" );
 
   int i;
-  for( i=0; i<tabWidget->count() && tabWidget->tabText(i) != tag; i++ )
-	;
+  for ( i = 0; i < tabWidget->count() && tabWidget->tabText( i ) != tag; i++ )
+    ;
 
   QTableWidget *w;
-  if( i<tabWidget->count() )
+  if ( i < tabWidget->count() )
   {
-    w = qobject_cast<QTableWidget *>( tabWidget->widget(i) );
+    w = qobject_cast<QTableWidget *>( tabWidget->widget( i ) );
   }
   else
   {
     w = new QTableWidget( 0, 3, this );
     w->verticalHeader()->setDefaultSectionSize( 16 );
     w->verticalHeader()->setVisible( false );
     w->setGridStyle( Qt::DotLine );
-    w->setEditTriggers(QAbstractItemView::NoEditTriggers);
-    w->setHorizontalHeaderLabels( QStringList() << tr( "Timestamp" ) << tr( "Message" ) << "Level" );
+    w->setEditTriggers( QAbstractItemView::NoEditTriggers );
+    w->setHorizontalHeaderLabels( QStringList() << tr( "Timestamp" ) << tr( "Message" ) << tr( "Level" ) );
     tabWidget->addTab( w, tag );
   }
 
   int n = w->rowCount();
 
   QgsDebugMsg( QString( "%1: %2[%3] %4" ).arg( n ).arg( QDateTime::currentDateTime().toString( Qt::ISODate ) ).arg( level ).arg( level ) );
 
-  w->setRowCount( n+1 );
+  w->setRowCount( n + 1 );
   QTableWidgetItem *item = new QTableWidgetItem( QDateTime::currentDateTime().toString( Qt::ISODate ) );
   w->setItem( n, 0, item );
   w->setItem( n, 1, new QTableWidgetItem( message ) );
-  w->setItem( n, 2, new QTableWidgetItem( level ) );
+  w->setItem( n, 2, new QTableWidgetItem( QString::number( level ) ) );
   w->scrollToItem( item );
 
   w->resizeColumnsToContents();
 }
+
+void QgsMessageLogViewer::closeTab( int index )
+{
+  tabWidget->removeTab( index );
+}
diff --git a/src/gui/qgsmessagelogviewer.h b/src/gui/qgsmessagelogviewer.h
@@ -37,6 +37,9 @@ class GUI_EXPORT QgsMessageLogViewer: public QDialog, public QgsMessageLog, priv
     void logMessage( QString message, QString tag = QString::null, int level = 0 );
 
     static void logger( QString message, QString tag, int level );
+
+  private slots:
+    void closeTab( int index );
 };
 
 #endif
diff --git a/src/ui/qgsmessagelogviewer.ui b/src/ui/qgsmessagelogviewer.ui
@@ -28,6 +28,9 @@
      <property name="currentIndex">
       <number>-1</number>
      </property>
+     <property name="tabsClosable">
+      <bool>true</bool>
+     </property>
     </widget>
    </item>
   </layout>