[qet] qet/qet: [4840] Minor : Save file has always enabled

[subversion@xxxxxxxxxxxxx]

Revision: 4840
Author:   scorpio810
Date:     2017-01-10 15:56:34 +0100 (Tue, 10 Jan 2017)
Log Message:
-----------
Minor : Save file has always enabled
Project path argument is now always displayed on diagram view

Modified Paths:
--------------
    trunk/sources/qetdiagrameditor.cpp
    trunk/sources/qetproject.cpp

Modified: trunk/sources/qetdiagrameditor.cpp
===================================================================
--- trunk/sources/qetdiagrameditor.cpp	2017-01-10 09:09:30 UTC (rev 4839)
+++ trunk/sources/qetdiagrameditor.cpp	2017-01-10 14:56:34 UTC (rev 4840)
@@ -717,7 +717,7 @@
 		QETResult saved = project_view -> save();
 
 		if (saved.isOk()) {
-			save_file -> setDisabled(true);
+			//save_file -> setDisabled(true);
 			QETApp::projectsRecentFiles() -> fileWasOpened(project_view -> project() -> filePath());
 
 			QString title = (project_view -> project() -> title ());
@@ -1361,12 +1361,12 @@
 	if (pv)
 	{
 		undo_group.setActiveStack(pv->project()->undoStack());
-		save_file -> setEnabled (undo_group.activeStack() -> count() && !pv -> project() -> isReadOnly());
+//		save_file -> setEnabled (undo_group.activeStack() -> count() && !pv -> project() -> isReadOnly());
+//	}
+//	else
+//	{
+//		//save_file -> setDisabled(true);
 	}
-	else
-	{
-		save_file -> setDisabled(true);
-	}
 }
 
 /**
@@ -2141,9 +2141,9 @@
  * @param clean
  */
 void QETDiagramEditor::activeUndoStackCleanChanged(bool clean) {
-	if (!clean) {
-		save_file -> setEnabled(true);
-	}
+//	if (!clean) {
+//		save_file -> setEnabled(true);
+//	}
 }
 
 

Modified: trunk/sources/qetproject.cpp
===================================================================
--- trunk/sources/qetproject.cpp	2017-01-10 09:09:30 UTC (rev 4839)
+++ trunk/sources/qetproject.cpp	2017-01-10 14:56:34 UTC (rev 4840)
@@ -237,10 +237,10 @@
 	if (!project_title_.isEmpty()) {
 		final_title = QString(
 			tr(
-				"Projet « %1 »",
+				"Projet « %1 : %2»",
 				"displayed title for a ProjectView - %1 is the project title"
 			)
-		).arg(project_title_);
+		).arg(project_title_).arg (file_path_);
 	} else if (!file_path_.isEmpty()) {
 		final_title = QString(
 			tr(
@@ -268,10 +268,10 @@
 	if (modified_) {
 		final_title = QString(
 			tr(
-				"%1 [modifié : %2]",
+				"%1 [modifié]",
 				"displayed title for a modified project - %1 is a displayable title, -%2 is the project path"
 			)
-		).arg(final_title).arg (file_path_);
+		).arg(final_title);
 	}
 	
 	return(final_title);