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

List:       kde-commits
Subject:    extragear/office/kile/kile
From:       Michel Ludwig <michel.ludwig () kdemail ! net>
Date:       2007-04-13 17:46:27
Message-ID: 1176486387.156349.12120.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 653585 by mludwig:

Temporarily replace KMultiTabBar by our own version, which takes hidden widgets into \
account during layout computations.


 M  +1 -0      CMakeLists.txt  
 M  +3 -3      Makefile.am  
 A             kilemultitabbar.cpp   [License: LGPL (v2+)]
 A             kilemultitabbar.h   [License: LGPL (v2+)]
 A             kilemultitabbar_p.h   [License: LGPL (v2+)]
 M  +11 -11    kilesidebar.cpp  
 M  +2 -4      kilesidebar.h  


--- trunk/extragear/office/kile/kile/CMakeLists.txt #653584:653585
@@ -109,6 +109,7 @@
 	kileversion.cpp
 	kileabbrevview.cpp
 	kileextensions.cpp
+	kilemultitabbar.cpp
 )
 
 KDE3_AUTOMOC(${kile_SRCS})
--- trunk/extragear/office/kile/kile/Makefile.am #653584:653585
@@ -26,7 +26,7 @@
 	kilestatsdlg.cpp kilestatswidget.cpp envconfigwidget.ui structureconfigwidget.ui \
 	previewwidget.cpp kilejscript.h kilejscript.cpp scriptsmanagementwidget.h \
scriptsmanagementwidget.cpp \  editorkeysequencemanager.h \
                editorkeysequencemanager.cpp scriptingconfigwidget.ui \
-	kileabbrevview.cpp kileextensions.cpp kileversion.cpp graphicsconfigwidget.ui
+	kileabbrevview.cpp kileextensions.cpp kileversion.cpp graphicsconfigwidget.ui \
kilemultitabbar.cpp  
 kile_LDADD   = -lkjs -lkdeprint -lktexteditor -lkatepartinterfaces $(LIB_KSPELL) \
$(LIB_KHTML)   
@@ -44,7 +44,7 @@
 	latexoutputfilter.cpp outputinfo.cpp latexoutputinfo.cpp \
 	outputfilter.cpp latexoutputfilter.h outputinfo.h latexoutputinfo.h \
 	includegraphicsdialog.h includegraphicsdialog.cpp kiletoolconfigwidget.cpp \
kiletoolconfigwidget.h outputfilter.h kilegrepdialog.cpp kilegrepdialog.h \
codecompletion.h codecompletion.cpp configcodecompletion.cpp configcodecompletion.h \
kileedit.cpp cleandialog.cpp kileedit.h cleandialog.h  kilehelp.cpp kilehelp.h \
                configstructure.cpp configstructure.h configenvironment.h convert.h \
                convert.cpp \
-	kileconstants.h kilejscript.h kilejscript.cpp scriptsmanagementwidget.h \
scriptsmanagementwidget.cpp editorkeysequencemanager.h editorkeysequencemanager.cpp \
+	kileconstants.h kilejscript.h kilejscript.cpp scriptsmanagementwidget.h \
scriptsmanagementwidget.cpp editorkeysequencemanager.h editorkeysequencemanager.cpp \
kilemultitabbar.cpp kilemultitabbar.h  kilemultitabbar_p.h  
 xdg_apps_DATA = kile.desktop
 
@@ -99,7 +99,7 @@
 		kilestructurewidget.h convert.h kiledocmanager.h kileviewmanager.h \
kileeventfilter.h \  latexconfigwidget.h kilespell.h kileerrorhandler.h \
configcheckerdlg.h configtester.h \  kilesidebar.h plaintolatexconverter.h \
                kileuntitled.h 	kilestatsdlg.h \
-	kilestatswidget.h envconfigwidget.h structureconfigwidget.h kileversion.h \
kileconstants.h +	kilestatswidget.h envconfigwidget.h structureconfigwidget.h \
kileversion.h kileconstants.h kilemultitabbar.h  kilemultitabbar_p.h  
 CREATE_HASH_TABLE = $(top_srcdir)/kile/kile/create_hash_table
 
--- trunk/extragear/office/kile/kile/kilesidebar.cpp #653584:653585
@@ -20,7 +20,7 @@
 
 #include <kdeversion.h>
 #include <kdebug.h>
-#include <kmultitabbar.h>
+#include <kilemultitabbar.h>
 
 #include "symbolview.h"
 #include "kilesidebar.h"
@@ -43,28 +43,28 @@
 	m_tabStack = new QWidgetStack(this);
 	m_tabStack->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
 
-	KMultiTabBar::KMultiTabBarMode tabbarori = KMultiTabBar::Horizontal;
-	KMultiTabBar::KMultiTabBarPosition tabbarpos = KMultiTabBar::Top;
+	KileMultiTabBar::KileMultiTabBarMode tabbarori = KileMultiTabBar::Horizontal;
+	KileMultiTabBar::KileMultiTabBarPosition tabbarpos = KileMultiTabBar::Top;
 	if ( orientation == Qt::Horizontal ) 
 	{
 		layout = new QVBoxLayout(this);
-		tabbarori = KMultiTabBar::Horizontal;
-		tabbarpos = KMultiTabBar::Top;
+		tabbarori = KileMultiTabBar::Horizontal;
+		tabbarpos = KileMultiTabBar::Top;
 	}
 	else if ( orientation == Qt::Vertical ) 
 	{
 		layout = new QHBoxLayout(this);
-		tabbarori = KMultiTabBar::Vertical;
-		tabbarpos = KMultiTabBar::Right;
+		tabbarori = KileMultiTabBar::Vertical;
+		tabbarpos = KileMultiTabBar::Right;
 	}
 
-	m_tabBar = new KMultiTabBar(tabbarori, this);
+	m_tabBar = new KileMultiTabBar(tabbarori, this);
 	m_tabBar->setPosition(tabbarpos);
 
 	#if KDE_VERSION >= KDE_MAKE_VERSION(3,3,0)
-		m_tabBar->setStyle(KMultiTabBar::KDEV3ICON);
+		m_tabBar->setStyle(KileMultiTabBar::KDEV3ICON);
  	#else
- 		m_tabBar->setStyle(KMultiTabBar::KDEV3);
+ 		m_tabBar->setStyle(KileMultiTabBar::KDEV3);
  	#endif
 
 	if ( orientation == Qt::Horizontal )
@@ -170,7 +170,7 @@
 		return;
 	}
 	int index = *it;
-	KMultiTabBarTab *tab = m_tabBar->tab(index);
+	KileMultiTabBarTab *tab = m_tabBar->tab(index);
 	if(tab->isShown() == b) {
 		return;
 	}
--- trunk/extragear/office/kile/kile/kilesidebar.h #653584:653585
@@ -22,7 +22,7 @@
 #include <qmap.h>
 
 class QWidgetStack;
-class KMultiTabBar;
+class KileMultiTabBar;
 class SymbolView;
 
 /**
@@ -52,8 +52,6 @@
 	 * Shows or hides the tab connected to the widget "w". If the tab to be hidden is
 	 * currently selected, the next tab will be shown (cyclically).
 	 *
-	 * Due to limitations in KMultiTabBar, the result only looks nice if the tab to
-	 * be hidden is the last tab in the KMultiTabBar.
 	 * @param b set to "true" to show the tab connected to the widget "w", "false" to
 	 *          hide it
 	 **/
@@ -75,7 +73,7 @@
 
 protected:
 	QWidgetStack		*m_tabStack;
-	KMultiTabBar		*m_tabBar;
+	KileMultiTabBar		*m_tabBar;
 	int			m_nTabs;
 	int			m_nCurrent;
 	QMap<int,int>		m_indexToPage;


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