Attachment #199870 for bug #279978

View | Details | Raw Unified | Return to bug 279978
Collapse All | Expand All

Lines 255-260 Link Here

(-)konsole-4.2.4_orig/konsole/src/EditProfileDialog.cpp (+7 lines)
255		255
256	// window options	256	// window options
257	_ui->showMenuBarButton->setChecked( info->property<bool>(Profile::ShowMenuBar) );	257	_ui->showMenuBarButton->setChecked( info->property<bool>(Profile::ShowMenuBar) );
		258	_ui->saveGeometryOnExitButton->setChecked( info->property<bool>(Profile::SaveGeometryOnExit) );
258		259
259	// signals and slots	260	// signals and slots
260	connect( _ui->dirSelectButton , SIGNAL(clicked()) , this , SLOT(selectInitialDir()) );	261	connect( _ui->dirSelectButton , SIGNAL(clicked()) , this , SLOT(selectInitialDir()) );
Lines 270-275 Link Here
270		271
271	connect(_ui->showMenuBarButton , SIGNAL(toggled(bool)) , this ,	272	connect(_ui->showMenuBarButton , SIGNAL(toggled(bool)) , this ,
272	SLOT(showMenuBar(bool)) );	273	SLOT(showMenuBar(bool)) );
		274	connect(_ui->saveGeometryOnExitButton , SIGNAL(toggled(bool)) , this ,
		275	SLOT(saveGeometryOnExit(bool)) );
273		276
274	connect(_ui->environmentEditButton , SIGNAL(clicked()) , this ,	277	connect(_ui->environmentEditButton , SIGNAL(clicked()) , this ,
275	SLOT(showEnvironmentEditor()) );	278	SLOT(showEnvironmentEditor()) );
Lines 371-376 Link Here
371	{	374	{
372	_tempProfile->setProperty(Profile::ShowMenuBar,show);	375	_tempProfile->setProperty(Profile::ShowMenuBar,show);
373	}	376	}
		377	void EditProfileDialog::saveGeometryOnExit(bool save)
		378	{
		379	_tempProfile->setProperty(Profile::SaveGeometryOnExit,save);
		380	}
374	void EditProfileDialog::tabTitleFormatChanged(const QString& format)	381	void EditProfileDialog::tabTitleFormatChanged(const QString& format)
375	{	382	{
376	_tempProfile->setProperty(Profile::LocalTabTitleFormat,format);	383	_tempProfile->setProperty(Profile::LocalTabTitleFormat,format);

Lines 120-125 Link Here

(-)konsole-4.2.4_orig/konsole/src/EditProfileDialog.h (+1 lines)
120	void insertRemoteTabTitleText(const QString& text);	120	void insertRemoteTabTitleText(const QString& text);
121		121
122	void showMenuBar(bool);	122	void showMenuBar(bool);
		123	void saveGeometryOnExit(bool);
123	void showEnvironmentEditor();	124	void showEnvironmentEditor();
124	void tabBarVisibilityChanged(int);	125	void tabBarVisibilityChanged(int);
125	void tabBarPositionChanged(int);	126	void tabBarPositionChanged(int);




            </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>

Lines 79-84 Link Here

(-)konsole-4.2.4_orig/konsole/src/MainWindow.cpp (+7 lines)
79		79
80	connect( _viewManager , SIGNAL(setMenuBarVisibleRequest(bool)) , this ,	80	connect( _viewManager , SIGNAL(setMenuBarVisibleRequest(bool)) , this ,
81	SLOT(setMenuBarVisibleOnce(bool)) );	81	SLOT(setMenuBarVisibleOnce(bool)) );
		82	connect( _viewManager , SIGNAL(setSaveGeometryOnExitRequest(bool)) , this ,
		83	SLOT(setSaveGeometryOnExit(bool)) );
82	connect( _viewManager , SIGNAL(newViewRequest(Profile::Ptr)) ,	84	connect( _viewManager , SIGNAL(newViewRequest(Profile::Ptr)) ,
83	this , SLOT(newFromProfile(Profile::Ptr)) );	85	this , SLOT(newFromProfile(Profile::Ptr)) );
84	connect( _viewManager , SIGNAL(newViewRequest()) ,	86	connect( _viewManager , SIGNAL(newViewRequest()) ,
Lines 129-134 Link Here
129	_menuBarVisibilitySet = true;	131	_menuBarVisibilitySet = true;
130	}	132	}
131		133
		134	void MainWindow::setSaveGeometryOnExit(bool save)
		135	{
		136	setAutoSaveSettings("MainWindow",save);
		137	}
		138
132	void MainWindow::correctShortcuts()	139	void MainWindow::correctShortcuts()
133	{	140	{
134	// replace F1 shortcut for help contents	141	// replace F1 shortcut for help contents

Lines 155-160 Link Here

(-)konsole-4.2.4_orig/konsole/src/MainWindow.h (+2 lines)
155	// effect if the menu bar is a MacOS-style top-level menu	155	// effect if the menu bar is a MacOS-style top-level menu
156	void setMenuBarVisibleOnce(bool visible);	156	void setMenuBarVisibleOnce(bool visible);
157		157
		158	void setSaveGeometryOnExit(bool visible);
		159
158	void openUrls(const QList<KUrl>& urls);	160	void openUrls(const QList<KUrl>& urls);
159		161
160	private:	162	private:

Lines 113-118 Link Here

(-)konsole-4.2.4_orig/konsole/src/Profile.h (+1 lines)
113	RemoteTabTitleFormat,	113	RemoteTabTitleFormat,
114	/** (bool) Specifies whether the menu bar should be shown in the main application window. */	114	/** (bool) Specifies whether the menu bar should be shown in the main application window. */
115	ShowMenuBar,	115	ShowMenuBar,
		116	SaveGeometryOnExit,
116	/** (TabBarModeEnum) Specifies when the tab bar should be shown in	117	/** (TabBarModeEnum) Specifies when the tab bar should be shown in
117	* the main application window. */	118	* the main application window. */
118	TabBarMode,	119	TabBarMode,

Lines 738-743 Link Here

(-)konsole-4.2.4_orig/konsole/src/ViewManager.cpp (+2 lines)
738	// menu bar visibility	738	// menu bar visibility
739	emit setMenuBarVisibleRequest( info->property<bool>(Profile::ShowMenuBar) );	739	emit setMenuBarVisibleRequest( info->property<bool>(Profile::ShowMenuBar) );
740		740
		741	emit setSaveGeometryOnExitRequest( info->property<bool>(Profile::SaveGeometryOnExit) );
		742
741	// tab bar visibility	743	// tab bar visibility
742	if (applyContainerSettings)	744	if (applyContainerSettings)
743	{	745	{

Lines 195-200 Link Here

(-)konsole-4.2.4_orig/konsole/src/ViewManager.h (+1 lines)
195	* activated.	195	* activated.
196	*/	196	*/
197	void setMenuBarVisibleRequest(bool);	197	void setMenuBarVisibleRequest(bool);
		198	void setSaveGeometryOnExitRequest(bool);
198		199
199	/** Requests creation of a new view with the default profile. */	200	/** Requests creation of a new view with the default profile. */
200	void newViewRequest();	201	void newViewRequest();

Return to bug 279978

Lines 228-233 Link Here

(-)konsole-4.2.4_orig/konsole/src/EditProfileDialog.ui (+16 lines)
228	</property>	228	</property>
229	</widget>	229	</widget>
230	</item>	230	</item>
		231	<item>
		232	<widget class="QCheckBox" name="saveGeometryOnExitButton">
		233	<property name="sizePolicy">
		234	<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
		235	<horstretch>0</horstretch>
		236	<verstretch>0</verstretch>
		237	</sizepolicy>
		238	</property>
		239	<property name="toolTip">
		240	<string>Set the window size and position for this profile when exiting</string>
		241	</property>
		242	<property name="text">
		243	<string>Save window size and position on exit</string>
		244	</property>
		245	</widget>
		246	</item>
231	</layout>	247	</layout>
232	</widget>	248	</widget>
233	</item>	249	</item>

Lines 76-81 Link Here

(-)konsole-4.2.4_orig/konsole/src/Profile.cpp (+2 lines)
76	, { LocalTabTitleFormat , "tabtitle" , 0 , QVariant::String }	76	, { LocalTabTitleFormat , "tabtitle" , 0 , QVariant::String }
77	, { RemoteTabTitleFormat , "RemoteTabTitleFormat" , GENERAL_GROUP , QVariant::String }	77	, { RemoteTabTitleFormat , "RemoteTabTitleFormat" , GENERAL_GROUP , QVariant::String }
78	, { ShowMenuBar , "ShowMenuBar" , GENERAL_GROUP , QVariant::Bool }	78	, { ShowMenuBar , "ShowMenuBar" , GENERAL_GROUP , QVariant::Bool }
		79	, { SaveGeometryOnExit , "SaveGeometryOnExit" , GENERAL_GROUP , QVariant::Bool }
79	, { TabBarMode , "TabBarMode" , GENERAL_GROUP , QVariant::Int }	80	, { TabBarMode , "TabBarMode" , GENERAL_GROUP , QVariant::Int }
80	, { TabBarPosition , "TabBarPosition" , GENERAL_GROUP , QVariant::Int }	81	, { TabBarPosition , "TabBarPosition" , GENERAL_GROUP , QVariant::Int }
81	, { StartInCurrentSessionDir , "StartInCurrentSessionDir" , GENERAL_GROUP , QVariant::Bool }	82	, { StartInCurrentSessionDir , "StartInCurrentSessionDir" , GENERAL_GROUP , QVariant::Bool }
Lines 153-158 Link Here
153	setProperty(TabBarMode,AlwaysShowTabBar);	154	setProperty(TabBarMode,AlwaysShowTabBar);
154	setProperty(TabBarPosition,TabBarBottom);	155	setProperty(TabBarPosition,TabBarBottom);
155	setProperty(ShowMenuBar,true);	156	setProperty(ShowMenuBar,true);
		157	setProperty(SaveGeometryOnExit,true);
156	setProperty(StartInCurrentSessionDir,true);	158	setProperty(StartInCurrentSessionDir,true);
157	setProperty(ShowNewAndCloseTabButtons,false);	159	setProperty(ShowNewAndCloseTabButtons,false);
158		160