Comment files now start with a UTF-8 BOM

Added an "Apply" MessageBox button to handle the convert option asked by fossil
Converted Q_WS_* to Q_OS_* since the first no longer exists in QT5

FossilOrigin-Name: f99bd8ac7960cb1758222d2211937e99708f67f3

intl/convert.bat

@@ -2,14 +2,13 @@
 setlocal EnableDelayedExpansion
 set SCRIPTDIR=%CD%
 set PRJDIR=%SCRIPTDIR%\..
-set QTPATH=C:\Qt\5.3\mingw482_32
+set QTPATH=C:\Qt\Qt5.3.1\5.3\mingw482_32
 
 echo Converting localizations
-del %PRJDIR%\rsrc\intl\*
+del /q %PRJDIR%\rsrc\intl\*
 if not exist %PRJDIR%\rsrc\intl\ mkdir %PRJDIR%\rsrc\intl\
 
-REM Convert all except the en_US which is 
+REM Convert all except the en_US which is the original text in the code
-REM the original text in the code
 
 %QTPATH%\bin\lrelease de_DE.ts -qm ..\rsrc\intl\de_DE.qm
 %QTPATH%\bin\lrelease el_GR.ts -qm ..\rsrc\intl\el_GR.qm

manifest

@@ -1,12 +1,12 @@
-C Simplified\slocalisation\sconversion\sscript
+C Comment\sfiles\snow\sstart\swith\sa\sUTF-8\sBOM\s\nAdded\san\s"Apply"\sMessageBox\sbutton\sto\shandle\sthe\sconvert\soption\sasked\sby\sfossil\nConverted\sQ_WS_*\sto\sQ_OS_*\ssince\sthe\sfirst\sno\slonger\sexists\sin\sQT5
-D 2014-07-15T15:10:02.206
+D 2014-07-28T10:38:37.856
 F dist/arch/PKGBUILD 1d72dad77767f94a6b1a018067188e61927fa564
 F dist/win/fuel.iss ef3558dbba409eb194938b930377fc9ee27d319e
 F doc/Building.txt 7c0f1060d4a08ed330058d4a3a68905c05228381
 F doc/Changes.txt cc626cd9352d7e630c5cd0a74f35fdc6180a8bf9
 F doc/License.txt 4cc77b90af91e615a64ae04893fdffa7939db84c
 F fuel.pro d15cce9435cf605947ae41e53869020e90563336
-F intl/convert.bat bbe13b51e51d01b8f3bf78af4857cf5416b7d036 x
+F intl/convert.bat 90152e8b17c9c9bd79d8bf99fa70b9c4258064ec x
 F intl/convert.sh 5694496585ff5f4363c90ff8b6f48e19e0b6b4aa x
 F intl/de_DE.ts 4acf6f379792a7e425ea143d440e8d5c01b391aa
 F intl/el_GR.ts e8f071623fe4abba239525faffb40c2668213562
@@ -187,13 +187,13 @@ F src/FileTableView.cpp 5ddf8c391c9a3ac449ec61fb1db837b577afeec2
 F src/FileTableView.h 03e56d87c2d46411b9762b87f4d301619aaf18df
 F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
 F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
-F src/MainWindow.cpp f5b550c638659e48dd618d99309261b828fde0e2
+F src/MainWindow.cpp 2db7b4ca002c61985432fcf71c97a6a1ab482f3f
 F src/MainWindow.h 3e0ed4d5f6a531401e0aed92d1cd0eb29543d62b
-F src/SettingsDialog.cpp 91bf5225e85bbe5544ac10d4d1182b09b4dc4c30
+F src/SettingsDialog.cpp effff92f746a71b07f0e6a72a21caac5a9085123
 F src/SettingsDialog.h 01c1f876c64f750ba8820a0d745e377acabe4921
-F src/Utils.cpp caca5268e3194abe77211040bf9511a82909d2e6
+F src/Utils.cpp 9aff456712e4276b49083426301b3b96d3819c77
-F src/Utils.h 5af911147390879176e587fc60fb662490bb9e97
+F src/Utils.h c546e478a1225a28c99cd4c30f70cf9be9804a2a
-F src/main.cpp 8f8790822f82870a12169bcf204e571138adb065
+F src/main.cpp 8db6ff84fc37464645415ef74562b328d2c5abc5
 F tools/pack.sh d7f38a498c4e9327fecd6a6e5ac27be270d43008 x
 F ui/BrowserWidget.ui 5ad98b13773afadb20a1a2c22148aaebe5dbd95d
 F ui/CloneDialog.ui 0fc820804df91f16506ee466a44519fdd44e468f
@@ -201,7 +201,7 @@ F ui/CommitDialog.ui 6200f6cabdcf40a20812e811be28e0793f82516f
 F ui/FileActionDialog.ui 89bb4dc2d0b8adcd41adcb11ec65f2028a09a12d
 F ui/MainWindow.ui 7ede8bbb54513e0771fdf5d5a2566d88c81b73ad
 F ui/SettingsDialog.ui 55aefad7145c40d936c43759789d1b50e361b020
-P e57b41e07e0ab31a1b6a949211352224145a3d44
+P 05251390b4dac6dc122efb007cd84650e410a0d1
-R 06473a96180a1a67aeed741ac68aa542
+R 8e737c57d203e492166f8d579f5e0a13
-U kostas
+U Kostas
-Z 693ca7eab8d1a063fb213e373519b433
+Z 3b353f1973572f26eb2307e7504f1871

manifest.uuid

@@ -1 +1 @@
-05251390b4dac6dc122efb007cd84650e410a0d1
+f99bd8ac7960cb1758222d2211937e99708f67f3

src/MainWindow.cpp

@@ -27,6 +27,7 @@
 #define COUNTOF(array) (sizeof(array)/sizeof(array[0]))
 
 #define PATH_SEP			"/"
+static const unsigned char UTF8_BOM[] = { 0xEF, 0xBB, 0xBF };
 
 //-----------------------------------------------------------------------------
 enum
@@ -211,8 +212,8 @@ MainWindow::MainWindow(Settings &_settings, QWidget *parent, QString *workspaceP
 	ui->statusBar->insertPermanentWidget(0, progressBar);
 	progressBar->setVisible(false);
 
-#ifdef Q_WS_MACX
+#ifdef Q_OS_MACX
-	// Native applications on OSX don't use menu icons
+	// Native applications on OSX don't have menu icons
 	foreach(QAction *a, ui->menuBar->actions())
 		a->setIconVisibleInMenu(false);
 	foreach(QAction *a, ui->menuFile->actions())
@@ -1104,11 +1105,12 @@ bool MainWindow::runFossilRaw(const QStringList &args, QStringList *output, int
 	QString ans_yes = 'y' + EOL_MARK;
 	QString ans_no = 'n' + EOL_MARK;
 	QString ans_always = 'a' + EOL_MARK;
+	QString ans_convert = 'c' + EOL_MARK;
 
 	fossilAbort = false;
 	QString buffer;
 
-#ifdef Q_WS_WIN32
+#ifdef Q_OS_WIN
 	QTextCodec *codec = QTextCodec::codecForName("UTF-8");
 #else
 	QTextCodec *codec = QTextCodec::codecForLocale();
@@ -1129,7 +1131,7 @@ bool MainWindow::runFossilRaw(const QStringList &args, QStringList *output, int
 		if(fossilAbort)
 		{
 			log("\n* "+tr("Terminated")+" *\n");
-			#ifdef Q_WS_WIN
+			#ifdef Q_OS_WIN		// Verify this is still true on Qt5
 				process.kill(); // QT on windows cannot terminate console processes with QProcess::terminate
 			#else
 				process.terminate();
@@ -1200,11 +1202,19 @@ bool MainWindow::runFossilRaw(const QStringList &args, QStringList *output, int
 		buffer = buffer.mid(last_line_start+1) ;
 
 		// Now process any query
-		if(have_query && (have_yna_query || have_acyn_query)) // FIXME: We are not handling the "convert" part
+		if(have_query && (have_yna_query || have_acyn_query))
 		{
 			log(last_line);
 			QString query = ParseFossilQuery(last_line);
-			QMessageBox::StandardButton res = DialogQuery(this, "Fossil", query, QMessageBox::YesToAll|QMessageBox::Yes|QMessageBox::No);
+			QMessageBox::StandardButtons buttons = QMessageBox::YesToAll|QMessageBox::Yes|QMessageBox::No;
+
+			// Map the Convert option to the Apply button
+			if(have_acyn_query)
+			{
+				buttons |= QMessageBox::Apply;
+			}
+
+			QMessageBox::StandardButton res = DialogQuery(this, "Fossil", query, buttons);
 			if(res==QMessageBox::Yes)
 			{
 				process.write(ans_yes.toLatin1());
@@ -1215,6 +1225,11 @@ bool MainWindow::runFossilRaw(const QStringList &args, QStringList *output, int
 				process.write(ans_always.toLatin1());
 				log("A\n");
 			}
+			else if(res==QMessageBox::Apply)
+			{
+				process.write(ans_convert.toLatin1());
+				log("C\n");
+			}
 			else
 			{
 				process.write(ans_no.toLatin1());
@@ -1286,7 +1301,7 @@ QString MainWindow::getFossilPath()
 		return QDir::toNativeSeparators(fossil_path);
 
 	QString fossil_exe = "fossil";
-#ifdef Q_WS_WIN32
+#ifdef Q_OS_WIN
 	fossil_exe += ".exe";
 #endif
 	// Use our fossil if available
@@ -1638,7 +1653,7 @@ void MainWindow::stopUI()
 {
 	if(uiRunning())
 	{
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
 		fossilUI.kill(); // QT on windows cannot terminate console processes with QProcess::terminate
 #else
 		fossilUI.terminate();
@@ -1783,6 +1798,10 @@ void MainWindow::on_actionCommit_triggered()
 		return;
 	}
 
+	// Write BOM
+	comment_file.write(reinterpret_cast<const char *>(UTF8_BOM), sizeof(UTF8_BOM));
+
+	// Write Comment
 	comment_file.write(msg.toUtf8());
 	comment_file.close();
 
@@ -2514,7 +2533,7 @@ void MainWindow::on_textBrowser_customContextMenuRequested(const QPoint &pos)
 void MainWindow::on_tableView_customContextMenuRequested(const QPoint &pos)
 {
 	QPoint gpos = QCursor::pos();
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
 	if(qApp->keyboardModifiers() & Qt::SHIFT)
 	{
 		ui->tableView->selectionModel()->select(ui->tableView->indexAt(pos), QItemSelectionModel::ClearAndSelect|QItemSelectionModel::Rows);
@@ -2525,7 +2544,7 @@ void MainWindow::on_tableView_customContextMenuRequested(const QPoint &pos)
 		{
 			QString fname = getCurrentWorkspace() + PATH_SEP + fnames[0];
 			fname = QDir::toNativeSeparators(fname);
-			if(ShowExplorerMenu(winId(), fname, gpos))
+			if(ShowExplorerMenu((HWND)winId(), fname, gpos))
 				refresh();
 		}
 	}

src/SettingsDialog.cpp

@@ -15,7 +15,7 @@
 QString SettingsDialog::SelectExe(QWidget *parent, const QString &description)
 {
 	QString filter(tr("Applications"));
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
 	filter += " (*.exe)";
 #else
 	filter += " (*)";

src/Utils.cpp

@@ -39,7 +39,7 @@ static bool DialogQueryText(QWidget *parent, const QString &title, const QString
 #endif
 
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
 // Explorer File Context Menu support. Based on http://www.microsoft.com/msj/0497/wicked/wicked0497.aspx
 #include <shlobj.h>
 

src/Utils.h

@@ -6,7 +6,7 @@
 
 QMessageBox::StandardButton DialogQuery(QWidget *parent, const QString &title, const QString &query, QMessageBox::StandardButtons buttons = QMessageBox::Yes|QMessageBox::No);
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
 	bool ShowExplorerMenu(HWND hwnd, const QString &path, const QPoint &qpoint);
 #endif
 

src/main.cpp

@@ -10,8 +10,8 @@ int main(int argc, char *argv[])
 	app.setOrganizationName("Fuel-SCM");
 
 
-	#ifdef Q_WS_MACX
+	#ifdef Q_OS_MACX
-		// Native OSX applications don't use menu icons
+		// Native OSX applications don't have menu icons
 		app.setAttribute(Qt::AA_DontShowIconsInMenus);
 	#endif
 	{