apply patch for konsole to remember size, bug 279978, kde bug 152385

4 files changed, 168 insertions, 4 deletions

diff --git a/kde-base/konsole/ChangeLog b/kde-base/konsole/ChangeLog
index 4279e189cd90..5d8c4998ddbb 100644
--- a/kde-base/konsole/ChangeLog
+++ b/kde-base/konsole/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/konsole
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.162 2010/03/31 22:56:08 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.163 2010/04/08 23:59:01 tampakrap Exp $
+
+  08 Apr 2010; Theo Chatzimichos <tampakrap@gentoo.org>
+  konsole-4.4.2.ebuild, +files/konsole-4.4.2-remember-size.patch:
+  apply patch for konsole to remember size, bug 279978, kde bug 152385
 
   31 Mar 2010; Dror Levin <spatz@gentoo.org> -konsole-4.3.4.ebuild,
   -konsole-4.4.0.ebuild:
diff --git a/kde-base/konsole/Manifest b/kde-base/konsole/Manifest
index 535b0bc349d5..6f1c3921b56b 100644
--- a/kde-base/konsole/Manifest
+++ b/kde-base/konsole/Manifest
@@ -1,3 +1,4 @@
+AUX konsole-4.4.2-remember-size.patch 7135 RMD160 d3d69760e5da3e5c09631bb76f1ae746d73b1da5 SHA1 4f91991e2aa0de67f49e177477e27d472e226945 SHA256 0773bd696167c7ebd67657a17cc182a546bcfd1036d557199d024c8c0d952670
 DIST kdebase-4.3.3.tar.bz2 4275500 RMD160 7fdc0f5cb3574b6707ae8f005eb887126ca2339e SHA1 7459ea75312961b4802626edd22dc291370be329 SHA256 9b642f2a720067b15873e92a07d81e092c7e0f70a13490357118266917306f4c
 DIST kdebase-4.3.5.tar.bz2 4151612 RMD160 eaad26faf859aea288ec767a97417663323897b6 SHA1 cb003415dbe7f511d869170c7f497f05d9814081 SHA256 2f2d4881face2e55a8b86c841a6d9ad438cfa5f7dfa58010e53c86f2dd1b1513
 DIST kdebase-4.4.1.tar.bz2 4048109 RMD160 5f27327876baf154a5baa081d4009d2992f12343 SHA1 b89a0019859e64d2c45965bacf3d2b09d67a908c SHA256 fd496ccf58f8779cf67ad5ba8da74090828e00d38cddfb2750d43aee711a2964
@@ -5,6 +6,6 @@ DIST kdebase-4.4.2.tar.bz2 4048565 RMD160 813fd4e6525f3dd281b81f02685899a9cfbebc
 EBUILD konsole-4.3.3.ebuild 623 RMD160 5989375af7025dbb109cd548f4870e2af306ae7e SHA1 3354b4fb6b1332b3e55c03a4663259cf66116ed5 SHA256 e9811b550e99f0546e16d2d8c9586e1c6ae0ef8efd997fe39b0ffb33c1027f8c
 EBUILD konsole-4.3.5.ebuild 691 RMD160 c88baac4402867718590057eb82fdb532f75d064 SHA1 df1231685a14538a798c6015e412ced5fdf04cc6 SHA256 2dbb5a14aa85ba0d3d9a8f8f5dcf9981131d778c33c72abbbbd5446c6e9c8cba
 EBUILD konsole-4.4.1.ebuild 697 RMD160 4a5b965c3a49c2118b4a3b45a825054dd8a78835 SHA1 b13105b16c312c8b6eb91be2dac68043786b2b7d SHA256 6a09055441589048d418a57484bf7b0ebdbf4f3299ca3c8d26dcff9816ba92c5
-EBUILD konsole-4.4.2.ebuild 693 RMD160 2d4cdfd8c0dabd4e9f8099af60f9c7b7e85302be SHA1 89fd26cb3cda7d6ce2c944bb7a69992397e272a2 SHA256 d3404f6748f523037641280e5aacabe245cc4be88d0efa4d89b5deec43ebeb57
-MISC ChangeLog 20157 RMD160 9353ac0bdebb4086f357e0ce6c36eff0f0d9af3e SHA1 1ba5a9dda3395f92f3b57acb4ccb2f32ea2fa6bc SHA256 c44ae71a7f7baf9dad1d3b92b66af68070bfdc7e89c7570ba55efa0b4ebfffe7
+EBUILD konsole-4.4.2.ebuild 745 RMD160 021a319534cba708b8253afc8745d69dfc43bdf2 SHA1 7ad03a8cb357375e3d704cea2c8bca1e5611c37f SHA256 0f5c485c508d80fa62a20d89e4d417d9898410145ee59e320b4e8b5a826f96cf
+MISC ChangeLog 20351 RMD160 142cf9976957e42678aaddb823f5bb805b6fb6da SHA1 c0d996f59e0347ca6196971bc807f1ecd1454a84 SHA256 eff7bdcde282e819e83700e712fe11c29f19dd57b76756c14f48d406038cef0e
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/konsole/files/konsole-4.4.2-remember-size.patch b/kde-base/konsole/files/konsole-4.4.2-remember-size.patch
new file mode 100644
index 000000000000..516af28f08f5
--- /dev/null
+++ b/kde-base/konsole/files/konsole-4.4.2-remember-size.patch
@@ -0,0 +1,157 @@
+diff -ur konsole-4.2.4_orig/konsole/src/EditProfileDialog.cpp konsole-4.2.4/konsole/src/EditProfileDialog.cpp
+--- konsole-4.2.4_orig/konsole/src/EditProfileDialog.cpp	2008-12-10 17:13:08.000000000 +0100
++++ konsole-4.2.4/konsole/src/EditProfileDialog.cpp	2009-08-02 01:50:04.000000000 +0200
+@@ -255,6 +255,7 @@
+ 
+     // window options
+     _ui->showMenuBarButton->setChecked( info->property<bool>(Profile::ShowMenuBar) );
++    _ui->saveGeometryOnExitButton->setChecked( info->property<bool>(Profile::SaveGeometryOnExit) );
+ 
+     // signals and slots
+     connect( _ui->dirSelectButton , SIGNAL(clicked()) , this , SLOT(selectInitialDir()) );
+@@ -270,6 +271,8 @@
+     
+     connect(_ui->showMenuBarButton , SIGNAL(toggled(bool)) , this , 
+             SLOT(showMenuBar(bool)) );
++    connect(_ui->saveGeometryOnExitButton , SIGNAL(toggled(bool)) , this ,
++	    SLOT(saveGeometryOnExit(bool)) );
+ 
+     connect(_ui->environmentEditButton , SIGNAL(clicked()) , this , 
+             SLOT(showEnvironmentEditor()) );
+@@ -371,6 +374,10 @@
+ {
+     _tempProfile->setProperty(Profile::ShowMenuBar,show);
+ }
++void EditProfileDialog::saveGeometryOnExit(bool save)
++{
++    _tempProfile->setProperty(Profile::SaveGeometryOnExit,save);
++}
+ void EditProfileDialog::tabTitleFormatChanged(const QString& format)
+ {
+     _tempProfile->setProperty(Profile::LocalTabTitleFormat,format);
+diff -ur konsole-4.2.4_orig/konsole/src/EditProfileDialog.h konsole-4.2.4/konsole/src/EditProfileDialog.h
+--- konsole-4.2.4_orig/konsole/src/EditProfileDialog.h	2008-09-26 16:55:51.000000000 +0200
++++ konsole-4.2.4/konsole/src/EditProfileDialog.h	2009-08-02 01:53:03.000000000 +0200
+@@ -120,6 +120,7 @@
+     void insertRemoteTabTitleText(const QString& text);
+ 
+     void showMenuBar(bool);
++    void saveGeometryOnExit(bool);
+     void showEnvironmentEditor();
+     void tabBarVisibilityChanged(int);
+     void tabBarPositionChanged(int);
+diff -ur konsole-4.2.4_orig/konsole/src/EditProfileDialog.ui konsole-4.2.4/konsole/src/EditProfileDialog.ui
+--- konsole-4.2.4_orig/konsole/src/EditProfileDialog.ui	2008-10-09 11:46:34.000000000 +0200
++++ konsole-4.2.4/konsole/src/EditProfileDialog.ui	2009-08-02 02:02:59.000000000 +0200
+@@ -228,6 +228,22 @@
+             </property>
+            </widget>
+           </item>
++	  <item>
++	   <widget class="QCheckBox" name="saveGeometryOnExitButton">
++	    <property name="sizePolicy">
++	     <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
++	      <horstretch>0</horstretch>
++	      <verstretch>0</verstretch>
++	     </sizepolicy>
++	    </property>
++	    <property name="toolTip">
++	     <string>Set the window size and position for this profile when exiting</string>
++	    </property>
++	    <property name="text">
++	     <string>Save window size and position on exit</string>
++	    </property>
++	   </widget>
++	  </item>
+          </layout>
+         </widget>
+        </item>
+diff -ur konsole-4.2.4_orig/konsole/src/MainWindow.cpp konsole-4.2.4/konsole/src/MainWindow.cpp
+--- konsole-4.2.4_orig/konsole/src/MainWindow.cpp	2008-12-10 17:13:08.000000000 +0100
++++ konsole-4.2.4/konsole/src/MainWindow.cpp	2009-08-02 01:57:31.000000000 +0200
+@@ -79,6 +79,8 @@
+ 
+     connect( _viewManager , SIGNAL(setMenuBarVisibleRequest(bool)) , this ,
+             SLOT(setMenuBarVisibleOnce(bool)) );
++    connect( _viewManager , SIGNAL(setSaveGeometryOnExitRequest(bool)) , this ,
++	    SLOT(setSaveGeometryOnExit(bool)) );
+     connect( _viewManager , SIGNAL(newViewRequest(Profile::Ptr)) , 
+         this , SLOT(newFromProfile(Profile::Ptr)) );
+     connect( _viewManager , SIGNAL(newViewRequest()) , 
+@@ -129,6 +131,11 @@
+     _menuBarVisibilitySet = true;
+ }
+ 
++void MainWindow::setSaveGeometryOnExit(bool save)
++{
++    setAutoSaveSettings("MainWindow",save);
++}
++
+ void MainWindow::correctShortcuts()
+ {
+     // replace F1 shortcut for help contents
+diff -ur konsole-4.2.4_orig/konsole/src/MainWindow.h konsole-4.2.4/konsole/src/MainWindow.h
+--- konsole-4.2.4_orig/konsole/src/MainWindow.h	2008-10-09 11:46:34.000000000 +0200
++++ konsole-4.2.4/konsole/src/MainWindow.h	2009-08-02 01:46:59.000000000 +0200
+@@ -155,6 +155,8 @@
+         // effect if the menu bar is a MacOS-style top-level menu
+         void setMenuBarVisibleOnce(bool visible);
+ 
++	void setSaveGeometryOnExit(bool visible);
++
+         void openUrls(const QList<KUrl>& urls);
+ 
+     private:
+diff -ur konsole-4.2.4_orig/konsole/src/Profile.cpp konsole-4.2.4/konsole/src/Profile.cpp
+--- konsole-4.2.4_orig/konsole/src/Profile.cpp	2008-09-26 16:55:51.000000000 +0200
++++ konsole-4.2.4/konsole/src/Profile.cpp	2009-08-02 01:45:01.000000000 +0200
+@@ -76,6 +76,7 @@
+     , { LocalTabTitleFormat , "tabtitle" , 0 , QVariant::String }
+     , { RemoteTabTitleFormat , "RemoteTabTitleFormat" , GENERAL_GROUP , QVariant::String }
+     , { ShowMenuBar , "ShowMenuBar" , GENERAL_GROUP , QVariant::Bool }
++    , { SaveGeometryOnExit , "SaveGeometryOnExit" , GENERAL_GROUP , QVariant::Bool }
+     , { TabBarMode , "TabBarMode" , GENERAL_GROUP , QVariant::Int }
+     , { TabBarPosition , "TabBarPosition" , GENERAL_GROUP , QVariant::Int }
+     , { StartInCurrentSessionDir , "StartInCurrentSessionDir" , GENERAL_GROUP , QVariant::Bool }
+@@ -153,6 +154,7 @@
+     setProperty(TabBarMode,AlwaysShowTabBar);
+     setProperty(TabBarPosition,TabBarBottom);
+     setProperty(ShowMenuBar,true);
++    setProperty(SaveGeometryOnExit,true);
+     setProperty(StartInCurrentSessionDir,true);
+     setProperty(ShowNewAndCloseTabButtons,false);
+ 
+diff -ur konsole-4.2.4_orig/konsole/src/Profile.h konsole-4.2.4/konsole/src/Profile.h
+--- konsole-4.2.4_orig/konsole/src/Profile.h	2008-09-26 16:55:51.000000000 +0200
++++ konsole-4.2.4/konsole/src/Profile.h	2009-08-02 01:52:38.000000000 +0200
+@@ -113,6 +113,7 @@
+         RemoteTabTitleFormat,   
+         /** (bool) Specifies whether the menu bar should be shown in the main application window. */
+         ShowMenuBar,    
++	SaveGeometryOnExit,
+         /** (TabBarModeEnum) Specifies when the tab bar should be shown in
+          * the main application window. */ 
+         TabBarMode,    
+diff -ur konsole-4.2.4_orig/konsole/src/ViewManager.cpp konsole-4.2.4/konsole/src/ViewManager.cpp
+--- konsole-4.2.4_orig/konsole/src/ViewManager.cpp	2009-03-26 15:42:41.000000000 +0100
++++ konsole-4.2.4/konsole/src/ViewManager.cpp	2009-08-02 01:51:24.000000000 +0200
+@@ -738,6 +738,8 @@
+     // menu bar visibility
+     emit setMenuBarVisibleRequest( info->property<bool>(Profile::ShowMenuBar) );
+ 
++    emit setSaveGeometryOnExitRequest( info->property<bool>(Profile::SaveGeometryOnExit) );
++
+     // tab bar visibility
+     if (applyContainerSettings)
+     {
+diff -ur konsole-4.2.4_orig/konsole/src/ViewManager.h konsole-4.2.4/konsole/src/ViewManager.h
+--- konsole-4.2.4_orig/konsole/src/ViewManager.h	2008-10-09 11:46:34.000000000 +0200
++++ konsole-4.2.4/konsole/src/ViewManager.h	2009-08-02 01:46:23.000000000 +0200
+@@ -195,6 +195,7 @@
+      * activated.
+      */
+     void setMenuBarVisibleRequest(bool);
++    void setSaveGeometryOnExitRequest(bool);
+ 
+     /** Requests creation of a new view with the default profile. */
+     void newViewRequest();
diff --git a/kde-base/konsole/konsole-4.4.2.ebuild b/kde-base/konsole/konsole-4.4.2.ebuild
index 89ed5b80fd57..824c8839c61f 100644
--- a/kde-base/konsole/konsole-4.4.2.ebuild
+++ b/kde-base/konsole/konsole-4.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-4.4.2.ebuild,v 1.1 2010/03/30 21:23:12 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-4.4.2.ebuild,v 1.2 2010/04/08 23:59:01 tampakrap Exp $
 
 EAPI="3"
 
@@ -28,3 +28,5 @@ DEPEND="${COMMONDEPEND}
 	)
 "
 RDEPEND="${COMMONDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-remember-size.patch" )