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

List:       kde-commits
Subject:    [KTorrent] 7fcffaa: Fix restoring hidden state of bottom tab bar in th
From:       Joris <joris.guisson () gmail ! com>
Date:       2010-11-23 19:40:31
Message-ID: 20101123194031.5A1C8A60A6 () git ! kde ! org
[Download RAW message or body]

commit 7fcffaac839a7bac7b2ac87d95639753ad2b820c
branch master
Author: Joris <joris.guisson@gmail.com>
Date:   Tue Nov 23 20:39:18 2010 +0100

    Fix restoring hidden state of bottom tab bar in the torrent activity

diff --git a/ChangeLog b/ChangeLog
index 9a9c2a4..17797f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,7 @@ Changes in 4.0.5:
 - Fix crash due to uncaught exception when creating torrent (255020)
 - Modify tracker grouping script to avoid a memory leak in krosspython
 - Fix bug causing extenders to be shown when the torrent is hidden (248205)
+- Fix restoring hidden state of bottom tab bar in the torrent activity
 
 Changes in 4.0.4:
 - Make sure that syndication filter save location overrides group save location (250116)
diff --git a/libktcore/gui/tabbarwidget.cpp b/libktcore/gui/tabbarwidget.cpp
index 6d85c32..0c9364c 100644
--- a/libktcore/gui/tabbarwidget.cpp
+++ b/libktcore/gui/tabbarwidget.cpp
@@ -212,27 +212,23 @@ namespace kt
 	{
 		KConfigGroup g = cfg->group(group);
 		
-		bool tmp = g.readEntry("shrunken",true);
-		if (tmp != shrunken)
-		{
-			if (tmp)
-				shrink();
-			else
-				unshrink();
-		}
-		
 		QString ctab = g.readPathEntry("current_tab", QString());
 		for (QMap<QWidget*,QAction*>::iterator i = widget_to_action.begin();i != widget_to_action.end();i++)
 		{
 			if (i.value()->text() == ctab)
 			{
-				i.value()->setChecked(true);
-				bool shrunken_tmp = shrunken;
-				onActionTriggered(i.value());
-				if (shrunken_tmp)
-					shrink();
+				widget_stack->setCurrentWidget(i.key());
 				break;
 			}
 		}
+		
+		bool tmp = g.readEntry("shrunken",true);
+		if (tmp != shrunken)
+		{
+			if (tmp)
+				shrink();
+			else
+				unshrink();
+		}
 	}
 }
\ No newline at end of file
[prev in list] [next in list] [prev in thread] [next in thread]