rev 6698 - in trunk/packages/kdenetwork/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2007-07-06 22:18:06 +0000 (Fri, 06 Jul 2007)
New Revision: 6698

Added:
   trunk/packages/kdenetwork/debian/patches/01_branch_673117-673118_kopete_toolbar_fix.diff
Modified:
   trunk/packages/kdenetwork/debian/changelog
Log:
fix format toolbar in kopete


Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog	2007-07-06 21:38:43 UTC (rev 6697)
+++ trunk/packages/kdenetwork/debian/changelog	2007-07-06 22:18:06 UTC (rev 6698)
@@ -4,6 +4,7 @@
 
   * Add lsb info to lisa init script.
   * Don't do anything if lisa is already running. (Closes: #407892)
+  * Pull patch from upstream to fix issue with format toolbar (Closes: #392019)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 06 Jul 2007 23:13:17 +0200
 

Added: trunk/packages/kdenetwork/debian/patches/01_branch_673117-673118_kopete_toolbar_fix.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/01_branch_673117-673118_kopete_toolbar_fix.diff	                        (rev 0)
+++ trunk/packages/kdenetwork/debian/patches/01_branch_673117-673118_kopete_toolbar_fix.diff	2007-07-06 22:18:06 UTC (rev 6698)
@@ -0,0 +1,88 @@
+Index: kdenetwork/kopete/kopete/chatwindow/kopetechatwindow.cpp
+===================================================================
+--- kdenetwork/kopete/kopete/chatwindow/kopetechatwindow.cpp	(revision 673117)
++++ kdenetwork/kopete/kopete/chatwindow/kopetechatwindow.cpp	(revision 673118)
+@@ -216,6 +216,8 @@
+ 
+ 	KGlobal::config()->setGroup( QString::fromLatin1("ChatWindowSettings") );
+ 	m_alwaysShowTabs = KGlobal::config()->readBoolEntry( QString::fromLatin1("AlwaysShowTabs"), false );
++	m_showFormatToolbar = KGlobal::config()->readBoolEntry( QString::fromLatin1("Show Format Toolbar"), true );
++	adjustingFormatToolbar = false;
+ //	kdDebug( 14010 ) << k_funcinfo << "Open Windows: " << windows.count() << endl;
+ 	kapp->ref();
+ }
+@@ -418,6 +420,9 @@
+ 
+ 	setXMLFile( QString::fromLatin1( "kopetechatwindow.rc" ) );
+ 	createGUI( 0L );
++
++	// Special handling for remembering whether the format toolbar is visible or not
++	connect ( toolBar("formatToolBar"), SIGNAL(visibilityChanged(bool)), this, SLOT(slotToggleFormatToolbar(bool)) );
+ }
+ 
+ const QString KopeteChatWindow::fileContents( const QString &path ) const
+@@ -1029,6 +1034,7 @@
+ 	KConfig *config = KGlobal::config();
+ 	applyMainWindowSettings( config, QString::fromLatin1( "KopeteChatWindow" ) );
+ 	config->setGroup( QString::fromLatin1("ChatWindowSettings") );
++	m_showFormatToolbar = config->readBoolEntry( QString::fromLatin1("Show Format Toolbar"), true );
+ }
+ 
+ void KopeteChatWindow::saveOptions()
+@@ -1043,6 +1049,7 @@
+ 	if( m_tabBar )
+ 		config->writeEntry ( QString::fromLatin1("Tab Placement"), m_tabBar->tabPosition() );
+ 
++	config->writeEntry( QString::fromLatin1("Show Format Toolbar"), m_showFormatToolbar );
+ 	config->sync();
+ }
+ 
+@@ -1072,6 +1079,13 @@
+ 		statusBar()->show();
+ }
+ 
++void KopeteChatWindow::slotToggleFormatToolbar(bool visible)
++{
++	if ( adjustingFormatToolbar )
++		return;
++	m_showFormatToolbar = visible;
++}
++
+ void KopeteChatWindow::slotViewMenuBar()
+ {
+ 	if( !menuBar()->isHidden() )
+@@ -1092,10 +1106,12 @@
+ 	if ( cv != m_activeView )
+ 		return;
+ 
+-	if ( enabled )
++	adjustingFormatToolbar = true;
++	if ( enabled && m_showFormatToolbar )
+ 		toolBar( "formatToolBar" )->show();
+ 	else
+ 		toolBar( "formatToolBar" )->hide();
++	adjustingFormatToolbar = false;
+ 	updateSpellCheckAction();
+ }
+ 
+Index: kdenetwork/kopete/kopete/chatwindow/kopetechatwindow.h
+===================================================================
+--- kdenetwork/kopete/kopete/chatwindow/kopetechatwindow.h	(revision 673117)
++++ kdenetwork/kopete/kopete/chatwindow/kopetechatwindow.h	(revision 673118)
+@@ -127,6 +127,8 @@
+ 	ChatView *m_activeView;
+ 	ChatView *m_popupView;
+ 	bool m_alwaysShowTabs;
++	bool m_showFormatToolbar;
++	bool adjustingFormatToolbar;
+ 	bool updateBg;
+ 	KTabWidget *m_tabBar;
+ 	KPushButton *m_button_send;
+@@ -200,6 +202,7 @@
+ 
+ 	void slotViewMenuBar();
+ 	void slotToggleStatusBar();
++	void slotToggleFormatToolbar( bool );
+ 
+ 	void slotConfKeys();
+ 	void slotConfToolbar();